aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel
diff options
context:
space:
mode:
authorMuli Ben-Yehuda <muli@il.ibm.com>2007-07-21 17:23:39 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 21:37:14 -0400
commit08f1c192c3c32797068bfe97738babb3295bbf42 (patch)
treee875b7b97b081ddc1eb9db8e4435d5ecf65ebadc /arch/x86_64/kernel
parent7557244ba27f63404236cb27277b98c27d856692 (diff)
x86-64: introduce struct pci_sysdata to facilitate sharing of ->sysdata
This patch introduces struct pci_sysdata to x86 and x86-64, and converts the existing two users (NUMA, Calgary) to use it. This lays the groundwork for having other users of sysdata, such as the PCI domains work. The Calgary bits are tested, the NUMA bits just look ok. Signed-off-by: Jeff Garzik <jeff@garzik.org> Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/x86_64/kernel')
-rw-r--r--arch/x86_64/kernel/pci-calgary.c29
-rw-r--r--arch/x86_64/kernel/tce.c12
2 files changed, 19 insertions, 22 deletions
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c
index 21ded20a3bf4..ba16c968ca3f 100644
--- a/arch/x86_64/kernel/pci-calgary.c
+++ b/arch/x86_64/kernel/pci-calgary.c
@@ -373,7 +373,7 @@ static inline struct iommu_table *find_iommu_table(struct device *dev)
373 else 373 else
374 pbus = pdev->bus; 374 pbus = pdev->bus;
375 375
376 tbl = pbus->self->sysdata; 376 tbl = pci_iommu(pbus);
377 377
378 BUG_ON(pdev->bus->parent && 378 BUG_ON(pdev->bus->parent &&
379 (tbl->it_busno != pdev->bus->parent->number)); 379 (tbl->it_busno != pdev->bus->parent->number));
@@ -716,7 +716,7 @@ static void __init calgary_reserve_mem_region(struct pci_dev *dev, u64 start,
716 limit++; 716 limit++;
717 717
718 numpages = ((limit - start) >> PAGE_SHIFT); 718 numpages = ((limit - start) >> PAGE_SHIFT);
719 iommu_range_reserve(dev->sysdata, start, numpages); 719 iommu_range_reserve(pci_iommu(dev->bus), start, numpages);
720} 720}
721 721
722static void __init calgary_reserve_peripheral_mem_1(struct pci_dev *dev) 722static void __init calgary_reserve_peripheral_mem_1(struct pci_dev *dev)
@@ -724,7 +724,7 @@ static void __init calgary_reserve_peripheral_mem_1(struct pci_dev *dev)
724 void __iomem *target; 724 void __iomem *target;
725 u64 low, high, sizelow; 725 u64 low, high, sizelow;
726 u64 start, limit; 726 u64 start, limit;
727 struct iommu_table *tbl = dev->sysdata; 727 struct iommu_table *tbl = pci_iommu(dev->bus);
728 unsigned char busnum = dev->bus->number; 728 unsigned char busnum = dev->bus->number;
729 void __iomem *bbar = tbl->bbar; 729 void __iomem *bbar = tbl->bbar;
730 730
@@ -748,7 +748,7 @@ static void __init calgary_reserve_peripheral_mem_2(struct pci_dev *dev)
748 u32 val32; 748 u32 val32;
749 u64 low, high, sizelow, sizehigh; 749 u64 low, high, sizelow, sizehigh;
750 u64 start, limit; 750 u64 start, limit;
751 struct iommu_table *tbl = dev->sysdata; 751 struct iommu_table *tbl = pci_iommu(dev->bus);
752 unsigned char busnum = dev->bus->number; 752 unsigned char busnum = dev->bus->number;
753 void __iomem *bbar = tbl->bbar; 753 void __iomem *bbar = tbl->bbar;
754 754
@@ -784,7 +784,7 @@ static void __init calgary_reserve_regions(struct pci_dev *dev)
784{ 784{
785 unsigned int npages; 785 unsigned int npages;
786 u64 start; 786 u64 start;
787 struct iommu_table *tbl = dev->sysdata; 787 struct iommu_table *tbl = pci_iommu(dev->bus);
788 788
789 /* reserve EMERGENCY_PAGES from bad_dma_address and up */ 789 /* reserve EMERGENCY_PAGES from bad_dma_address and up */
790 iommu_range_reserve(tbl, bad_dma_address, EMERGENCY_PAGES); 790 iommu_range_reserve(tbl, bad_dma_address, EMERGENCY_PAGES);
@@ -818,7 +818,7 @@ static int __init calgary_setup_tar(struct pci_dev *dev, void __iomem *bbar)
818 if (ret) 818 if (ret)
819 return ret; 819 return ret;
820 820
821 tbl = dev->sysdata; 821 tbl = pci_iommu(dev->bus);
822 tbl->it_base = (unsigned long)bus_info[dev->bus->number].tce_space; 822 tbl->it_base = (unsigned long)bus_info[dev->bus->number].tce_space;
823 tce_free(tbl, 0, tbl->it_size); 823 tce_free(tbl, 0, tbl->it_size);
824 824
@@ -855,7 +855,7 @@ static int __init calgary_setup_tar(struct pci_dev *dev, void __iomem *bbar)
855static void __init calgary_free_bus(struct pci_dev *dev) 855static void __init calgary_free_bus(struct pci_dev *dev)
856{ 856{
857 u64 val64; 857 u64 val64;
858 struct iommu_table *tbl = dev->sysdata; 858 struct iommu_table *tbl = pci_iommu(dev->bus);
859 void __iomem *target; 859 void __iomem *target;
860 unsigned int bitmapsz; 860 unsigned int bitmapsz;
861 861
@@ -870,7 +870,8 @@ static void __init calgary_free_bus(struct pci_dev *dev)
870 tbl->it_map = NULL; 870 tbl->it_map = NULL;
871 871
872 kfree(tbl); 872 kfree(tbl);
873 dev->sysdata = NULL; 873
874 set_pci_iommu(dev->bus, NULL);
874 875
875 /* Can't free bootmem allocated memory after system is up :-( */ 876 /* Can't free bootmem allocated memory after system is up :-( */
876 bus_info[dev->bus->number].tce_space = NULL; 877 bus_info[dev->bus->number].tce_space = NULL;
@@ -943,7 +944,7 @@ static void calioc2_dump_error_regs(struct iommu_table *tbl)
943static void calgary_watchdog(unsigned long data) 944static void calgary_watchdog(unsigned long data)
944{ 945{
945 struct pci_dev *dev = (struct pci_dev *)data; 946 struct pci_dev *dev = (struct pci_dev *)data;
946 struct iommu_table *tbl = dev->sysdata; 947 struct iommu_table *tbl = pci_iommu(dev->bus);
947 void __iomem *bbar = tbl->bbar; 948 void __iomem *bbar = tbl->bbar;
948 u32 val32; 949 u32 val32;
949 void __iomem *target; 950 void __iomem *target;
@@ -1041,7 +1042,7 @@ static void __init calgary_enable_translation(struct pci_dev *dev)
1041 struct iommu_table *tbl; 1042 struct iommu_table *tbl;
1042 1043
1043 busnum = dev->bus->number; 1044 busnum = dev->bus->number;
1044 tbl = dev->sysdata; 1045 tbl = pci_iommu(dev->bus);
1045 bbar = tbl->bbar; 1046 bbar = tbl->bbar;
1046 1047
1047 /* enable TCE in PHB Config Register */ 1048 /* enable TCE in PHB Config Register */
@@ -1073,7 +1074,7 @@ static void __init calgary_disable_translation(struct pci_dev *dev)
1073 struct iommu_table *tbl; 1074 struct iommu_table *tbl;
1074 1075
1075 busnum = dev->bus->number; 1076 busnum = dev->bus->number;
1076 tbl = dev->sysdata; 1077 tbl = pci_iommu(dev->bus);
1077 bbar = tbl->bbar; 1078 bbar = tbl->bbar;
1078 1079
1079 /* disable TCE in PHB Config Register */ 1080 /* disable TCE in PHB Config Register */
@@ -1091,7 +1092,7 @@ static void __init calgary_disable_translation(struct pci_dev *dev)
1091static void __init calgary_init_one_nontraslated(struct pci_dev *dev) 1092static void __init calgary_init_one_nontraslated(struct pci_dev *dev)
1092{ 1093{
1093 pci_dev_get(dev); 1094 pci_dev_get(dev);
1094 dev->sysdata = NULL; 1095 set_pci_iommu(dev->bus, NULL);
1095 1096
1096 /* is the device behind a bridge? */ 1097 /* is the device behind a bridge? */
1097 if (dev->bus->parent) 1098 if (dev->bus->parent)
@@ -1123,7 +1124,7 @@ static int __init calgary_init_one(struct pci_dev *dev)
1123 } else 1124 } else
1124 dev->bus->self = dev; 1125 dev->bus->self = dev;
1125 1126
1126 tbl = dev->sysdata; 1127 tbl = pci_iommu(dev->bus);
1127 tbl->chip_ops->handle_quirks(tbl, dev); 1128 tbl->chip_ops->handle_quirks(tbl, dev);
1128 1129
1129 calgary_enable_translation(dev); 1130 calgary_enable_translation(dev);
@@ -1520,7 +1521,7 @@ static void __init calgary_fixup_one_tce_space(struct pci_dev *dev)
1520 unsigned int npages; 1521 unsigned int npages;
1521 int i; 1522 int i;
1522 1523
1523 tbl = dev->sysdata; 1524 tbl = pci_iommu(dev->bus);
1524 1525
1525 for (i = 0; i < 4; i++) { 1526 for (i = 0; i < 4; i++) {
1526 struct resource *r = &dev->resource[PCI_BRIDGE_RESOURCES + i]; 1527 struct resource *r = &dev->resource[PCI_BRIDGE_RESOURCES + i];
diff --git a/arch/x86_64/kernel/tce.c b/arch/x86_64/kernel/tce.c
index f61fb8e4f129..3aeae2fa2e24 100644
--- a/arch/x86_64/kernel/tce.c
+++ b/arch/x86_64/kernel/tce.c
@@ -136,9 +136,9 @@ int build_tce_table(struct pci_dev *dev, void __iomem *bbar)
136 struct iommu_table *tbl; 136 struct iommu_table *tbl;
137 int ret; 137 int ret;
138 138
139 if (dev->sysdata) { 139 if (pci_iommu(dev->bus)) {
140 printk(KERN_ERR "Calgary: dev %p has sysdata %p\n", 140 printk(KERN_ERR "Calgary: dev %p has sysdata->iommu %p\n",
141 dev, dev->sysdata); 141 dev, pci_iommu(dev->bus));
142 BUG(); 142 BUG();
143 } 143 }
144 144
@@ -155,11 +155,7 @@ int build_tce_table(struct pci_dev *dev, void __iomem *bbar)
155 155
156 tbl->bbar = bbar; 156 tbl->bbar = bbar;
157 157
158 /* 158 set_pci_iommu(dev->bus, tbl);
159 * NUMA is already using the bus's sysdata pointer, so we use
160 * the bus's pci_dev's sysdata instead.
161 */
162 dev->sysdata = tbl;
163 159
164 return 0; 160 return 0;
165 161