gwj / at91sam9263 · Commits

Commit e5e38121576e57ea4f1f4acae01f58f0386ff0ba

Authored by blueswir1
1 parent e1cb9502

Add TurboSPARC mask ID register (Robert Reif) 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3932 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 11 additions and 1 deletions
hw/iommu.c
  View file @e5e3812
... ... @@ -34,7 +34,7 @@ do { printf("IOMMU: " fmt , ##args); } while (0)
34 34 #define DPRINTF(fmt, args...)
35 35 #endif
36 36  
37   -#define IOMMU_NREGS (3*4096/4)
  37 +#define IOMMU_NREGS (4*4096/4)
38 38 #define IOMMU_CTRL (0x0000 >> 2)
39 39 #define IOMMU_CTRL_IMPL 0xf0000000 /* Implementation */
40 40 #define IOMMU_CTRL_VERS 0x0f000000 /* Version */
... ... @@ -95,6 +95,12 @@ do { printf("IOMMU: " fmt , ##args); } while (0)
95 95 #define IOMMU_ARBEN_MASK 0x001f0000
96 96 #define IOMMU_MID 0x00000008
97 97  
  98 +#define IOMMU_MASK_ID (0x3018 >> 2) /* Mask ID */
  99 +#define IOMMU_MASK_ID_MASK 0x00ffffff
  100 +
  101 +#define IOMMU_MSII_MASK 0x26000000 /* microSPARC II mask number */
  102 +#define IOMMU_TS_MASK 0x23000000 /* turboSPARC mask number */
  103 +
98 104 /* The format of an iopte in the page tables */
99 105 #define IOPTE_PAGE 0xffffff00 /* Physical page number (PA[35:12]) */
100 106 #define IOPTE_CACHE 0x00000080 /* Cached (in vme IOCACHE or
... ... @@ -206,6 +212,9 @@ static void iommu_mem_writel(void *opaque, target_phys_addr_t addr,
206 212 // addresses, fault cause and address stored to MMU/IOMMU
207 213 s->regs[saddr] = (val & IOMMU_ARBEN_MASK) | IOMMU_MID;
208 214 break;
  215 + case IOMMU_MASK_ID:
  216 + s->regs[saddr] |= val & IOMMU_MASK_ID_MASK;
  217 + break;
209 218 default:
210 219 s->regs[saddr] = val;
211 220 break;
... ... @@ -337,6 +346,7 @@ static void iommu_reset(void *opaque)
337 346 s->regs[IOMMU_CTRL] = s->version;
338 347 s->regs[IOMMU_ARBEN] = IOMMU_MID;
339 348 s->regs[IOMMU_AFSR] = IOMMU_AFSR_RESV;
  349 + s->regs[IOMMU_MASK_ID] = IOMMU_TS_MASK;
340 350 qemu_irq_lower(s->irq);
341 351 }
342 352  
... ...