aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMuli Ben-Yehuda <muli@il.ibm.com>2007-07-21 11:10:50 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 21:37:11 -0400
commitff297b8c081bdc60507eaeb1838996e0c67141c8 (patch)
tree9bbf72551be697bda605322a2d3af3e6190bacf2 /arch
parentb8d2ea1b87b02fc94ffcab58b29c83fbbb6a1e4e (diff)
x86_64: introduce chipset specific ops
Calgary and CalIOC2 share most of the same logic. Introduce struct cal_chipset_ops for quirks and tce flush logic which are [akpm@linux-foundation.org: make calgary_chip_ops static] Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86_64/kernel/pci-calgary.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/arch/x86_64/kernel/pci-calgary.c b/arch/x86_64/kernel/pci-calgary.c
index 9f6dd4453705..7218b5b51e08 100644
--- a/arch/x86_64/kernel/pci-calgary.c
+++ b/arch/x86_64/kernel/pci-calgary.c
@@ -155,9 +155,15 @@ struct calgary_bus_info {
155 void __iomem *bbar; 155 void __iomem *bbar;
156}; 156};
157 157
158static struct calgary_bus_info bus_info[MAX_PHB_BUS_NUM] = { { NULL, 0, 0 }, }; 158static void calgary_handle_quirks(struct iommu_table *tbl, struct pci_dev *dev);
159static void calgary_tce_cache_blast(struct iommu_table *tbl);
160
161static struct cal_chipset_ops calgary_chip_ops = {
162 .handle_quirks = calgary_handle_quirks,
163 .tce_cache_blast = calgary_tce_cache_blast
164};
159 165
160static void tce_cache_blast(struct iommu_table *tbl); 166static struct calgary_bus_info bus_info[MAX_PHB_BUS_NUM] = { { NULL, 0, 0 }, };
161 167
162/* enable this to stress test the chip's TCE cache */ 168/* enable this to stress test the chip's TCE cache */
163#ifdef CONFIG_IOMMU_DEBUG 169#ifdef CONFIG_IOMMU_DEBUG
@@ -243,7 +249,7 @@ static unsigned long iommu_range_alloc(struct iommu_table *tbl,
243 offset = find_next_zero_string(tbl->it_map, tbl->it_hint, 249 offset = find_next_zero_string(tbl->it_map, tbl->it_hint,
244 tbl->it_size, npages); 250 tbl->it_size, npages);
245 if (offset == ~0UL) { 251 if (offset == ~0UL) {
246 tce_cache_blast(tbl); 252 tbl->chip_ops->tce_cache_blast(tbl);
247 offset = find_next_zero_string(tbl->it_map, 0, 253 offset = find_next_zero_string(tbl->it_map, 0,
248 tbl->it_size, npages); 254 tbl->it_size, npages);
249 if (offset == ~0UL) { 255 if (offset == ~0UL) {
@@ -552,7 +558,7 @@ static inline void __iomem* calgary_reg(void __iomem *bar, unsigned long offset)
552 return (void __iomem*)target; 558 return (void __iomem*)target;
553} 559}
554 560
555static void tce_cache_blast(struct iommu_table *tbl) 561static void calgary_tce_cache_blast(struct iommu_table *tbl)
556{ 562{
557 u64 val; 563 u64 val;
558 u32 aer; 564 u32 aer;
@@ -698,6 +704,8 @@ static int __init calgary_setup_tar(struct pci_dev *dev, void __iomem *bbar)
698 tbl->it_base = (unsigned long)bus_info[dev->bus->number].tce_space; 704 tbl->it_base = (unsigned long)bus_info[dev->bus->number].tce_space;
699 tce_free(tbl, 0, tbl->it_size); 705 tce_free(tbl, 0, tbl->it_size);
700 706
707 tbl->chip_ops = &calgary_chip_ops;
708
701 calgary_reserve_regions(dev); 709 calgary_reserve_regions(dev);
702 710
703 /* set TARs for each PHB */ 711 /* set TARs for each PHB */
@@ -807,10 +815,10 @@ static void __init calgary_set_split_completion_timeout(void __iomem *bbar,
807 readq(target); /* flush */ 815 readq(target); /* flush */
808} 816}
809 817
810static void __init calgary_handle_quirks(struct pci_dev* dev) 818static void __init calgary_handle_quirks(struct iommu_table *tbl,
819 struct pci_dev *dev)
811{ 820{
812 unsigned char busnum = dev->bus->number; 821 unsigned char busnum = dev->bus->number;
813 struct iommu_table *tbl = dev->sysdata;
814 822
815 /* 823 /*
816 * Give split completion a longer timeout on bus 1 for aic94xx 824 * Give split completion a longer timeout on bus 1 for aic94xx
@@ -885,6 +893,7 @@ static void __init calgary_init_one_nontraslated(struct pci_dev *dev)
885static int __init calgary_init_one(struct pci_dev *dev) 893static int __init calgary_init_one(struct pci_dev *dev)
886{ 894{
887 void __iomem *bbar; 895 void __iomem *bbar;
896 struct iommu_table *tbl;
888 int ret; 897 int ret;
889 898
890 BUG_ON(dev->bus->number >= MAX_PHB_BUS_NUM); 899 BUG_ON(dev->bus->number >= MAX_PHB_BUS_NUM);
@@ -897,7 +906,8 @@ static int __init calgary_init_one(struct pci_dev *dev)
897 pci_dev_get(dev); 906 pci_dev_get(dev);
898 dev->bus->self = dev; 907 dev->bus->self = dev;
899 908
900 calgary_handle_quirks(dev); 909 tbl = dev->sysdata;
910 tbl->chip_ops->handle_quirks(tbl, dev);
901 911
902 calgary_enable_translation(dev); 912 calgary_enable_translation(dev);
903 913