aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/parisc/sba_iommu.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c
index d80ce476189f..e0d6fbc66efd 100644
--- a/drivers/parisc/sba_iommu.c
+++ b/drivers/parisc/sba_iommu.c
@@ -1717,7 +1717,6 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
1717 1717
1718 if (IS_ASTRO(sba_dev->iodc)) { 1718 if (IS_ASTRO(sba_dev->iodc)) {
1719 int err; 1719 int err;
1720 /* PAT_PDC (L-class) also reports the same goofy base */
1721 sba_dev->ioc[0].ioc_hpa = ioc_remap(sba_dev, ASTRO_IOC_OFFSET); 1720 sba_dev->ioc[0].ioc_hpa = ioc_remap(sba_dev, ASTRO_IOC_OFFSET);
1722 num_ioc = 1; 1721 num_ioc = 1;
1723 1722
@@ -1730,10 +1729,6 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
1730 } else if (IS_PLUTO(sba_dev->iodc)) { 1729 } else if (IS_PLUTO(sba_dev->iodc)) {
1731 int err; 1730 int err;
1732 1731
1733 /* We use a negative value for IOC HPA so it gets
1734 * corrected when we add it with IKE's IOC offset.
1735 * Doesnt look clean, but fewer code.
1736 */
1737 sba_dev->ioc[0].ioc_hpa = ioc_remap(sba_dev, PLUTO_IOC_OFFSET); 1732 sba_dev->ioc[0].ioc_hpa = ioc_remap(sba_dev, PLUTO_IOC_OFFSET);
1738 num_ioc = 1; 1733 num_ioc = 1;
1739 1734
@@ -1749,14 +1744,14 @@ printk("sba_hw_init(): mem_boot 0x%x 0x%x 0x%x 0x%x\n", PAGE0->mem_boot.hpa,
1749 err = request_resource(&iomem_resource, &(sba_dev->iommu_resv)); 1744 err = request_resource(&iomem_resource, &(sba_dev->iommu_resv));
1750 WARN_ON(err < 0); 1745 WARN_ON(err < 0);
1751 } else { 1746 } else {
1752 /* IS_IKE (ie N-class, L3000, L1500) */ 1747 /* IKE, REO */
1753 sba_dev->ioc[0].ioc_hpa = ioc_remap(sba_dev, IKE_IOC_OFFSET(0)); 1748 sba_dev->ioc[0].ioc_hpa = ioc_remap(sba_dev, IKE_IOC_OFFSET(0));
1754 sba_dev->ioc[1].ioc_hpa = ioc_remap(sba_dev, IKE_IOC_OFFSET(1)); 1749 sba_dev->ioc[1].ioc_hpa = ioc_remap(sba_dev, IKE_IOC_OFFSET(1));
1755 num_ioc = 2; 1750 num_ioc = 2;
1756 1751
1757 /* TODO - LOOKUP Ike/Stretch chipset mem map */ 1752 /* TODO - LOOKUP Ike/Stretch chipset mem map */
1758 } 1753 }
1759 /* XXX: What about Reo? */ 1754 /* XXX: What about Reo Grande? */
1760 1755
1761 sba_dev->num_ioc = num_ioc; 1756 sba_dev->num_ioc = num_ioc;
1762 for (i = 0; i < num_ioc; i++) { 1757 for (i = 0; i < num_ioc; i++) {