Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 38534
b: refs/heads/master
c: 7886089
h: refs/heads/master
v: v3
  • Loading branch information
Matthew Wilcox authored and Matthew Wilcox committed Oct 4, 2006
1 parent 1d33d0d commit 58b83f6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8a63674f70ac443d166b746d6c04154f8ee9de7b
refs/heads/master: 7886089e3c06518c5e65675a932922f915e20e77
9 changes: 2 additions & 7 deletions trunk/drivers/parisc/sba_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -1717,7 +1717,6 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,

if (IS_ASTRO(sba_dev->iodc)) {
int err;
/* PAT_PDC (L-class) also reports the same goofy base */
sba_dev->ioc[0].ioc_hpa = ioc_remap(sba_dev, ASTRO_IOC_OFFSET);
num_ioc = 1;

Expand All @@ -1730,10 +1729,6 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
} else if (IS_PLUTO(sba_dev->iodc)) {
int err;

/* We use a negative value for IOC HPA so it gets
* corrected when we add it with IKE's IOC offset.
* Doesnt look clean, but fewer code.
*/
sba_dev->ioc[0].ioc_hpa = ioc_remap(sba_dev, PLUTO_IOC_OFFSET);
num_ioc = 1;

Expand All @@ -1749,14 +1744,14 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
err = request_resource(&iomem_resource, &(sba_dev->iommu_resv));
WARN_ON(err < 0);
} else {
/* IS_IKE (ie N-class, L3000, L1500) */
/* IKE, REO */
sba_dev->ioc[0].ioc_hpa = ioc_remap(sba_dev, IKE_IOC_OFFSET(0));
sba_dev->ioc[1].ioc_hpa = ioc_remap(sba_dev, IKE_IOC_OFFSET(1));
num_ioc = 2;

/* TODO - LOOKUP Ike/Stretch chipset mem map */
}
/* XXX: What about Reo? */
/* XXX: What about Reo Grande? */

sba_dev->num_ioc = num_ioc;
for (i = 0; i < num_ioc; i++) {
Expand Down

0 comments on commit 58b83f6

Please sign in to comment.