diff options
Diffstat (limited to 'arch/powerpc/platforms/pseries')
-rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/eeh.c | 30 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/lpar.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/msi.c | 270 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/pci_dlpar.c | 1 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/xics.c | 4 |
8 files changed, 313 insertions, 5 deletions
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile index 90235d59875..ae1fc92dc1c 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile | |||
@@ -11,6 +11,7 @@ obj-$(CONFIG_SCANLOG) += scanlog.o | |||
11 | obj-$(CONFIG_EEH) += eeh.o eeh_cache.o eeh_driver.o eeh_event.o | 11 | obj-$(CONFIG_EEH) += eeh.o eeh_cache.o eeh_driver.o eeh_event.o |
12 | obj-$(CONFIG_KEXEC) += kexec.o | 12 | obj-$(CONFIG_KEXEC) += kexec.o |
13 | obj-$(CONFIG_PCI) += pci.o pci_dlpar.o | 13 | obj-$(CONFIG_PCI) += pci.o pci_dlpar.o |
14 | obj-$(CONFIG_PCI_MSI) += msi.o | ||
14 | 15 | ||
15 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug-cpu.o | 16 | obj-$(CONFIG_HOTPLUG_CPU) += hotplug-cpu.o |
16 | 17 | ||
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c index 48fbd442e9d..63e23062e98 100644 --- a/arch/powerpc/platforms/pseries/eeh.c +++ b/arch/powerpc/platforms/pseries/eeh.c | |||
@@ -580,6 +580,36 @@ rtas_pci_slot_reset(struct pci_dn *pdn, int state) | |||
580 | } | 580 | } |
581 | 581 | ||
582 | /** | 582 | /** |
583 | * pcibios_set_pcie_slot_reset - Set PCI-E reset state | ||
584 | * @dev: pci device struct | ||
585 | * @state: reset state to enter | ||
586 | * | ||
587 | * Return value: | ||
588 | * 0 if success | ||
589 | **/ | ||
590 | int pcibios_set_pcie_reset_state(struct pci_dev *dev, enum pcie_reset_state state) | ||
591 | { | ||
592 | struct device_node *dn = pci_device_to_OF_node(dev); | ||
593 | struct pci_dn *pdn = PCI_DN(dn); | ||
594 | |||
595 | switch (state) { | ||
596 | case pcie_deassert_reset: | ||
597 | rtas_pci_slot_reset(pdn, 0); | ||
598 | break; | ||
599 | case pcie_hot_reset: | ||
600 | rtas_pci_slot_reset(pdn, 1); | ||
601 | break; | ||
602 | case pcie_warm_reset: | ||
603 | rtas_pci_slot_reset(pdn, 3); | ||
604 | break; | ||
605 | default: | ||
606 | return -EINVAL; | ||
607 | }; | ||
608 | |||
609 | return 0; | ||
610 | } | ||
611 | |||
612 | /** | ||
583 | * rtas_set_slot_reset -- assert the pci #RST line for 1/4 second | 613 | * rtas_set_slot_reset -- assert the pci #RST line for 1/4 second |
584 | * @pdn: pci device node to be reset. | 614 | * @pdn: pci device node to be reset. |
585 | * | 615 | * |
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index 66665c82415..eec684a8e44 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
@@ -504,6 +504,12 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev) | |||
504 | break; | 504 | break; |
505 | } | 505 | } |
506 | 506 | ||
507 | if (!pdn || !PCI_DN(pdn)) { | ||
508 | printk(KERN_WARNING "pci_dma_dev_setup_pSeriesLP: " | ||
509 | "no DMA window found for pci dev=%s dn=%s\n", | ||
510 | pci_name(dev), dn? dn->full_name : "<null>"); | ||
511 | return; | ||
512 | } | ||
507 | DBG(" parent is %s\n", pdn->full_name); | 513 | DBG(" parent is %s\n", pdn->full_name); |
508 | 514 | ||
509 | /* Check for parent == NULL so we don't try to setup the empty EADS | 515 | /* Check for parent == NULL so we don't try to setup the empty EADS |
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 3a70e8ad7bc..362dfbc260a 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c | |||
@@ -231,13 +231,13 @@ void __init find_udbg_vterm(void) | |||
231 | goto out; | 231 | goto out; |
232 | vtermno = termno[0]; | 232 | vtermno = termno[0]; |
233 | 233 | ||
234 | if (device_is_compatible(stdout_node, "hvterm1")) { | 234 | if (of_device_is_compatible(stdout_node, "hvterm1")) { |
235 | udbg_putc = udbg_putcLP; | 235 | udbg_putc = udbg_putcLP; |
236 | udbg_getc = udbg_getcLP; | 236 | udbg_getc = udbg_getcLP; |
237 | udbg_getc_poll = udbg_getc_pollLP; | 237 | udbg_getc_poll = udbg_getc_pollLP; |
238 | if (add_console) | 238 | if (add_console) |
239 | add_preferred_console("hvc", termno[0] & 0xff, NULL); | 239 | add_preferred_console("hvc", termno[0] & 0xff, NULL); |
240 | } else if (device_is_compatible(stdout_node, "hvterm-protocol")) { | 240 | } else if (of_device_is_compatible(stdout_node, "hvterm-protocol")) { |
241 | vtermno = termno[0]; | 241 | vtermno = termno[0]; |
242 | udbg_putc = udbg_hvsi_putc; | 242 | udbg_putc = udbg_hvsi_putc; |
243 | udbg_getc = udbg_hvsi_getc; | 243 | udbg_getc = udbg_hvsi_getc; |
diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c new file mode 100644 index 00000000000..6063ea2f67a --- /dev/null +++ b/arch/powerpc/platforms/pseries/msi.c | |||
@@ -0,0 +1,270 @@ | |||
1 | /* | ||
2 | * Copyright 2006 Jake Moilanen <moilanen@austin.ibm.com>, IBM Corp. | ||
3 | * Copyright 2006-2007 Michael Ellerman, IBM Corp. | ||
4 | * | ||
5 | * This program is free software; you can redistribute it and/or | ||
6 | * modify it under the terms of the GNU General Public License | ||
7 | * as published by the Free Software Foundation; version 2 of the | ||
8 | * License. | ||
9 | * | ||
10 | */ | ||
11 | |||
12 | #include <linux/device.h> | ||
13 | #include <linux/irq.h> | ||
14 | #include <linux/msi.h> | ||
15 | |||
16 | #include <asm/rtas.h> | ||
17 | #include <asm/hw_irq.h> | ||
18 | #include <asm/ppc-pci.h> | ||
19 | |||
20 | static int query_token, change_token; | ||
21 | |||
22 | #define RTAS_QUERY_FN 0 | ||
23 | #define RTAS_CHANGE_FN 1 | ||
24 | #define RTAS_RESET_FN 2 | ||
25 | #define RTAS_CHANGE_MSI_FN 3 | ||
26 | #define RTAS_CHANGE_MSIX_FN 4 | ||
27 | |||
28 | static struct pci_dn *get_pdn(struct pci_dev *pdev) | ||
29 | { | ||
30 | struct device_node *dn; | ||
31 | struct pci_dn *pdn; | ||
32 | |||
33 | dn = pci_device_to_OF_node(pdev); | ||
34 | if (!dn) { | ||
35 | dev_dbg(&pdev->dev, "rtas_msi: No OF device node\n"); | ||
36 | return NULL; | ||
37 | } | ||
38 | |||
39 | pdn = PCI_DN(dn); | ||
40 | if (!pdn) { | ||
41 | dev_dbg(&pdev->dev, "rtas_msi: No PCI DN\n"); | ||
42 | return NULL; | ||
43 | } | ||
44 | |||
45 | return pdn; | ||
46 | } | ||
47 | |||
48 | /* RTAS Helpers */ | ||
49 | |||
50 | static int rtas_change_msi(struct pci_dn *pdn, u32 func, u32 num_irqs) | ||
51 | { | ||
52 | u32 addr, seq_num, rtas_ret[3]; | ||
53 | unsigned long buid; | ||
54 | int rc; | ||
55 | |||
56 | addr = rtas_config_addr(pdn->busno, pdn->devfn, 0); | ||
57 | buid = pdn->phb->buid; | ||
58 | |||
59 | seq_num = 1; | ||
60 | do { | ||
61 | if (func == RTAS_CHANGE_MSI_FN || func == RTAS_CHANGE_MSIX_FN) | ||
62 | rc = rtas_call(change_token, 6, 4, rtas_ret, addr, | ||
63 | BUID_HI(buid), BUID_LO(buid), | ||
64 | func, num_irqs, seq_num); | ||
65 | else | ||
66 | rc = rtas_call(change_token, 6, 3, rtas_ret, addr, | ||
67 | BUID_HI(buid), BUID_LO(buid), | ||
68 | func, num_irqs, seq_num); | ||
69 | |||
70 | seq_num = rtas_ret[1]; | ||
71 | } while (rtas_busy_delay(rc)); | ||
72 | |||
73 | if (rc == 0) /* Success */ | ||
74 | rc = rtas_ret[0]; | ||
75 | |||
76 | pr_debug("rtas_msi: ibm,change_msi(func=%d,num=%d) = (%d)\n", | ||
77 | func, num_irqs, rc); | ||
78 | |||
79 | return rc; | ||
80 | } | ||
81 | |||
82 | static void rtas_disable_msi(struct pci_dev *pdev) | ||
83 | { | ||
84 | struct pci_dn *pdn; | ||
85 | |||
86 | pdn = get_pdn(pdev); | ||
87 | if (!pdn) | ||
88 | return; | ||
89 | |||
90 | if (rtas_change_msi(pdn, RTAS_CHANGE_FN, 0) != 0) | ||
91 | pr_debug("rtas_msi: Setting MSIs to 0 failed!\n"); | ||
92 | } | ||
93 | |||
94 | static int rtas_query_irq_number(struct pci_dn *pdn, int offset) | ||
95 | { | ||
96 | u32 addr, rtas_ret[2]; | ||
97 | unsigned long buid; | ||
98 | int rc; | ||
99 | |||
100 | addr = rtas_config_addr(pdn->busno, pdn->devfn, 0); | ||
101 | buid = pdn->phb->buid; | ||
102 | |||
103 | do { | ||
104 | rc = rtas_call(query_token, 4, 3, rtas_ret, addr, | ||
105 | BUID_HI(buid), BUID_LO(buid), offset); | ||
106 | } while (rtas_busy_delay(rc)); | ||
107 | |||
108 | if (rc) { | ||
109 | pr_debug("rtas_msi: error (%d) querying source number\n", rc); | ||
110 | return rc; | ||
111 | } | ||
112 | |||
113 | return rtas_ret[0]; | ||
114 | } | ||
115 | |||
116 | static void rtas_teardown_msi_irqs(struct pci_dev *pdev) | ||
117 | { | ||
118 | struct msi_desc *entry; | ||
119 | |||
120 | list_for_each_entry(entry, &pdev->msi_list, list) { | ||
121 | if (entry->irq == NO_IRQ) | ||
122 | continue; | ||
123 | |||
124 | set_irq_msi(entry->irq, NULL); | ||
125 | irq_dispose_mapping(entry->irq); | ||
126 | } | ||
127 | |||
128 | rtas_disable_msi(pdev); | ||
129 | } | ||
130 | |||
131 | static int check_req_msi(struct pci_dev *pdev, int nvec) | ||
132 | { | ||
133 | struct device_node *dn; | ||
134 | struct pci_dn *pdn; | ||
135 | const u32 *req_msi; | ||
136 | |||
137 | pdn = get_pdn(pdev); | ||
138 | if (!pdn) | ||
139 | return -ENODEV; | ||
140 | |||
141 | dn = pdn->node; | ||
142 | |||
143 | req_msi = of_get_property(dn, "ibm,req#msi", NULL); | ||
144 | if (!req_msi) { | ||
145 | pr_debug("rtas_msi: No ibm,req#msi on %s\n", dn->full_name); | ||
146 | return -ENOENT; | ||
147 | } | ||
148 | |||
149 | if (*req_msi < nvec) { | ||
150 | pr_debug("rtas_msi: ibm,req#msi requests < %d MSIs\n", nvec); | ||
151 | return -ENOSPC; | ||
152 | } | ||
153 | |||
154 | return 0; | ||
155 | } | ||
156 | |||
157 | static int rtas_msi_check_device(struct pci_dev *pdev, int nvec, int type) | ||
158 | { | ||
159 | if (type == PCI_CAP_ID_MSIX) | ||
160 | pr_debug("rtas_msi: MSI-X untested, trying anyway.\n"); | ||
161 | |||
162 | return check_req_msi(pdev, nvec); | ||
163 | } | ||
164 | |||
165 | static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) | ||
166 | { | ||
167 | struct pci_dn *pdn; | ||
168 | int hwirq, virq, i, rc; | ||
169 | struct msi_desc *entry; | ||
170 | |||
171 | pdn = get_pdn(pdev); | ||
172 | if (!pdn) | ||
173 | return -ENODEV; | ||
174 | |||
175 | /* | ||
176 | * Try the new more explicit firmware interface, if that fails fall | ||
177 | * back to the old interface. The old interface is known to never | ||
178 | * return MSI-Xs. | ||
179 | */ | ||
180 | if (type == PCI_CAP_ID_MSI) { | ||
181 | rc = rtas_change_msi(pdn, RTAS_CHANGE_MSI_FN, nvec); | ||
182 | |||
183 | if (rc != nvec) { | ||
184 | pr_debug("rtas_msi: trying the old firmware call.\n"); | ||
185 | rc = rtas_change_msi(pdn, RTAS_CHANGE_FN, nvec); | ||
186 | } | ||
187 | } else | ||
188 | rc = rtas_change_msi(pdn, RTAS_CHANGE_MSIX_FN, nvec); | ||
189 | |||
190 | if (rc != nvec) { | ||
191 | pr_debug("rtas_msi: rtas_change_msi() failed\n"); | ||
192 | |||
193 | /* | ||
194 | * In case of an error it's not clear whether the device is | ||
195 | * left with MSI enabled or not, so we explicitly disable. | ||
196 | */ | ||
197 | goto out_free; | ||
198 | } | ||
199 | |||
200 | i = 0; | ||
201 | list_for_each_entry(entry, &pdev->msi_list, list) { | ||
202 | hwirq = rtas_query_irq_number(pdn, i); | ||
203 | if (hwirq < 0) { | ||
204 | rc = hwirq; | ||
205 | pr_debug("rtas_msi: error (%d) getting hwirq\n", rc); | ||
206 | goto out_free; | ||
207 | } | ||
208 | |||
209 | virq = irq_create_mapping(NULL, hwirq); | ||
210 | |||
211 | if (virq == NO_IRQ) { | ||
212 | pr_debug("rtas_msi: Failed mapping hwirq %d\n", hwirq); | ||
213 | rc = -ENOSPC; | ||
214 | goto out_free; | ||
215 | } | ||
216 | |||
217 | dev_dbg(&pdev->dev, "rtas_msi: allocated virq %d\n", virq); | ||
218 | set_irq_msi(virq, entry); | ||
219 | unmask_msi_irq(virq); | ||
220 | } | ||
221 | |||
222 | return 0; | ||
223 | |||
224 | out_free: | ||
225 | rtas_teardown_msi_irqs(pdev); | ||
226 | return rc; | ||
227 | } | ||
228 | |||
229 | static void rtas_msi_pci_irq_fixup(struct pci_dev *pdev) | ||
230 | { | ||
231 | /* No LSI -> leave MSIs (if any) configured */ | ||
232 | if (pdev->irq == NO_IRQ) { | ||
233 | dev_dbg(&pdev->dev, "rtas_msi: no LSI, nothing to do.\n"); | ||
234 | return; | ||
235 | } | ||
236 | |||
237 | /* No MSI -> MSIs can't have been assigned by fw, leave LSI */ | ||
238 | if (check_req_msi(pdev, 1)) { | ||
239 | dev_dbg(&pdev->dev, "rtas_msi: no req#msi, nothing to do.\n"); | ||
240 | return; | ||
241 | } | ||
242 | |||
243 | dev_dbg(&pdev->dev, "rtas_msi: disabling existing MSI.\n"); | ||
244 | rtas_disable_msi(pdev); | ||
245 | } | ||
246 | |||
247 | static int rtas_msi_init(void) | ||
248 | { | ||
249 | query_token = rtas_token("ibm,query-interrupt-source-number"); | ||
250 | change_token = rtas_token("ibm,change-msi"); | ||
251 | |||
252 | if ((query_token == RTAS_UNKNOWN_SERVICE) || | ||
253 | (change_token == RTAS_UNKNOWN_SERVICE)) { | ||
254 | pr_debug("rtas_msi: no RTAS tokens, no MSI support.\n"); | ||
255 | return -1; | ||
256 | } | ||
257 | |||
258 | pr_debug("rtas_msi: Registering RTAS MSI callbacks.\n"); | ||
259 | |||
260 | WARN_ON(ppc_md.setup_msi_irqs); | ||
261 | ppc_md.setup_msi_irqs = rtas_setup_msi_irqs; | ||
262 | ppc_md.teardown_msi_irqs = rtas_teardown_msi_irqs; | ||
263 | ppc_md.msi_check_device = rtas_msi_check_device; | ||
264 | |||
265 | WARN_ON(ppc_md.pci_irq_fixup); | ||
266 | ppc_md.pci_irq_fixup = rtas_msi_pci_irq_fixup; | ||
267 | |||
268 | return 0; | ||
269 | } | ||
270 | arch_initcall(rtas_msi_init); | ||
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c index fdc1a369f76..ffaf6c5c517 100644 --- a/arch/powerpc/platforms/pseries/pci_dlpar.c +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c | |||
@@ -79,6 +79,7 @@ pcibios_remove_pci_devices(struct pci_bus *bus) | |||
79 | pci_remove_bus_device(dev); | 79 | pci_remove_bus_device(dev); |
80 | } | 80 | } |
81 | } | 81 | } |
82 | EXPORT_SYMBOL_GPL(pcibios_remove_pci_devices); | ||
82 | 83 | ||
83 | /* Must be called before pci_bus_add_devices */ | 84 | /* Must be called before pci_bus_add_devices */ |
84 | void | 85 | void |
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 33eec2822c6..470db6efaeb 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -168,7 +168,7 @@ static void __init pseries_mpic_init_IRQ(void) | |||
168 | 168 | ||
169 | /* Look for cascade */ | 169 | /* Look for cascade */ |
170 | for_each_node_by_type(np, "interrupt-controller") | 170 | for_each_node_by_type(np, "interrupt-controller") |
171 | if (device_is_compatible(np, "chrp,iic")) { | 171 | if (of_device_is_compatible(np, "chrp,iic")) { |
172 | cascade = np; | 172 | cascade = np; |
173 | break; | 173 | break; |
174 | } | 174 | } |
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 896cbf340c4..b854e7f1001 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c | |||
@@ -477,7 +477,7 @@ static int xics_host_match(struct irq_host *h, struct device_node *node) | |||
477 | * like vdevices, events, etc... The trick we use here is to match | 477 | * like vdevices, events, etc... The trick we use here is to match |
478 | * everything here except the legacy 8259 which is compatible "chrp,iic" | 478 | * everything here except the legacy 8259 which is compatible "chrp,iic" |
479 | */ | 479 | */ |
480 | return !device_is_compatible(node, "chrp,iic"); | 480 | return !of_device_is_compatible(node, "chrp,iic"); |
481 | } | 481 | } |
482 | 482 | ||
483 | static int xics_host_map_direct(struct irq_host *h, unsigned int virq, | 483 | static int xics_host_map_direct(struct irq_host *h, unsigned int virq, |
@@ -618,7 +618,7 @@ static void __init xics_setup_8259_cascade(void) | |||
618 | unsigned long intack = 0; | 618 | unsigned long intack = 0; |
619 | 619 | ||
620 | for_each_node_by_type(np, "interrupt-controller") | 620 | for_each_node_by_type(np, "interrupt-controller") |
621 | if (device_is_compatible(np, "chrp,iic")) { | 621 | if (of_device_is_compatible(np, "chrp,iic")) { |
622 | found = np; | 622 | found = np; |
623 | break; | 623 | break; |
624 | } | 624 | } |