File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -225,7 +225,6 @@ config X86
225225 select NEED_SG_DMA_LENGTH
226226 select PCI_DOMAINS if PCI
227227 select PCI_LOCKLESS_CONFIG if PCI
228- select PCI_MSI_ARCH_FALLBACKS
229228 select PERF_EVENTS
230229 select RTC_LIB
231230 select RTC_MC146818_LIB
Original file line number Diff line number Diff line change @@ -105,17 +105,6 @@ static inline void early_quirks(void) { }
105105
106106extern void pci_iommu_alloc (void );
107107
108- #ifdef CONFIG_PCI_MSI
109- /* implemented in arch/x86/kernel/apic/io_apic. */
110- struct msi_desc ;
111- int native_setup_msi_irqs (struct pci_dev * dev , int nvec , int type );
112- void native_teardown_msi_irq (unsigned int irq );
113- void native_restore_msi_irqs (struct pci_dev * dev );
114- #else
115- #define native_setup_msi_irqs NULL
116- #define native_teardown_msi_irq NULL
117- #endif
118-
119108/* generic pci stuff */
120109#include <asm-generic/pci.h>
121110
Original file line number Diff line number Diff line change @@ -277,7 +277,6 @@ struct pci_dev;
277277
278278struct x86_msi_ops {
279279 int (* setup_msi_irqs )(struct pci_dev * dev , int nvec , int type );
280- void (* teardown_msi_irq )(unsigned int irq );
281280 void (* teardown_msi_irqs )(struct pci_dev * dev );
282281 void (* restore_msi_irqs )(struct pci_dev * dev );
283282};
Original file line number Diff line number Diff line change @@ -181,28 +181,6 @@ static struct irq_chip pci_msi_controller = {
181181 .flags = IRQCHIP_SKIP_SET_WAKE ,
182182};
183183
184- int native_setup_msi_irqs (struct pci_dev * dev , int nvec , int type )
185- {
186- struct irq_domain * domain ;
187- struct irq_alloc_info info ;
188-
189- init_irq_alloc_info (& info , NULL );
190- info .type = X86_IRQ_ALLOC_TYPE_PCI_MSI ;
191-
192- domain = irq_remapping_get_irq_domain (& info );
193- if (domain == NULL )
194- domain = x86_pci_msi_default_domain ;
195- if (domain == NULL )
196- return - ENOSYS ;
197-
198- return msi_domain_alloc_irqs (domain , & dev -> dev , nvec );
199- }
200-
201- void native_teardown_msi_irq (unsigned int irq )
202- {
203- irq_domain_free_irqs (irq , 1 );
204- }
205-
206184int pci_msi_prepare (struct irq_domain * domain , struct device * dev , int nvec ,
207185 msi_alloc_info_t * arg )
208186{
Original file line number Diff line number Diff line change @@ -146,28 +146,10 @@ EXPORT_SYMBOL_GPL(x86_platform);
146146
147147#if defined(CONFIG_PCI_MSI )
148148struct x86_msi_ops x86_msi __ro_after_init = {
149- .setup_msi_irqs = native_setup_msi_irqs ,
150- .teardown_msi_irq = native_teardown_msi_irq ,
151- .teardown_msi_irqs = default_teardown_msi_irqs ,
152149 .restore_msi_irqs = default_restore_msi_irqs ,
153150};
154151
155152/* MSI arch specific hooks */
156- int arch_setup_msi_irqs (struct pci_dev * dev , int nvec , int type )
157- {
158- return x86_msi .setup_msi_irqs (dev , nvec , type );
159- }
160-
161- void arch_teardown_msi_irqs (struct pci_dev * dev )
162- {
163- x86_msi .teardown_msi_irqs (dev );
164- }
165-
166- void arch_teardown_msi_irq (unsigned int irq )
167- {
168- x86_msi .teardown_msi_irq (irq );
169- }
170-
171153void arch_restore_msi_irqs (struct pci_dev * dev )
172154{
173155 x86_msi .restore_msi_irqs (dev );
Original file line number Diff line number Diff line change @@ -402,11 +402,6 @@ static void xen_pv_teardown_msi_irqs(struct pci_dev *dev)
402402 xen_teardown_msi_irqs (dev );
403403}
404404
405- static void xen_teardown_msi_irq (unsigned int irq )
406- {
407- WARN_ON_ONCE (1 );
408- }
409-
410405static int xen_msi_domain_alloc_irqs (struct irq_domain * domain ,
411406 struct device * dev , int nvec )
412407{
@@ -483,8 +478,6 @@ static __init void xen_setup_pci_msi(void)
483478 return ;
484479 }
485480
486- x86_msi .teardown_msi_irq = xen_teardown_msi_irq ;
487-
488481 /*
489482 * Override the PCI/MSI irq domain init function. No point
490483 * in allocating the native domain and never use it.
You can’t perform that action at this time.
0 commit comments