Skip to content

Commit fd2fa6c

Browse files
bjorn-helgaasKAGA-KOKO
authored andcommitted
x86/PCI: Remove unused HyperTransport interrupt support
There are no in-tree callers of ht_create_irq(), the driver interface for HyperTransport interrupts, left. Remove the unused entry point and all the supporting code. See 8b955b0 ("[PATCH] Initial generic hypertransport interrupt support"). Signed-off-by: Bjorn Helgaas <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: "Eric W. Biederman" <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: [email protected] Cc: Benjamin Herrenschmidt <[email protected]> Link: https://lkml.kernel.org/r/20171122221337.3877.23362.stgit@bhelgaas-glaptop.roam.corp.google.com
1 parent e2a5dca commit fd2fa6c

File tree

11 files changed

+2
-454
lines changed

11 files changed

+2
-454
lines changed

arch/x86/include/asm/hw_irq.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,6 @@ struct irq_alloc_info {
9999
void *dmar_data;
100100
};
101101
#endif
102-
#ifdef CONFIG_HT_IRQ
103-
struct {
104-
int ht_pos;
105-
int ht_idx;
106-
struct pci_dev *ht_dev;
107-
void *ht_update;
108-
};
109-
#endif
110102
#ifdef CONFIG_X86_UV
111103
struct {
112104
int uv_limit;

arch/x86/include/asm/hypertransport.h

Lines changed: 0 additions & 46 deletions
This file was deleted.

arch/x86/include/asm/irqdomain.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,4 @@ extern void arch_init_msi_domain(struct irq_domain *domain);
5656
static inline void arch_init_msi_domain(struct irq_domain *domain) { }
5757
#endif
5858

59-
#ifdef CONFIG_HT_IRQ
60-
extern void arch_init_htirq_domain(struct irq_domain *domain);
61-
#else
62-
static inline void arch_init_htirq_domain(struct irq_domain *domain) { }
63-
#endif
64-
6559
#endif

arch/x86/kernel/apic/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ obj-y += hw_nmi.o
1212

1313
obj-$(CONFIG_X86_IO_APIC) += io_apic.o
1414
obj-$(CONFIG_PCI_MSI) += msi.o
15-
obj-$(CONFIG_HT_IRQ) += htirq.o
1615
obj-$(CONFIG_SMP) += ipi.o
1716

1817
ifeq ($(CONFIG_X86_64),y)

arch/x86/kernel/apic/htirq.c

Lines changed: 0 additions & 198 deletions
This file was deleted.

arch/x86/kernel/apic/vector.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Local APIC related interfaces to support IOAPIC, MSI, HT_IRQ etc.
2+
* Local APIC related interfaces to support IOAPIC, MSI, etc.
33
*
44
* Copyright (C) 1997, 1998, 1999, 2000, 2009 Ingo Molnar, Hajnalka Szabo
55
* Moved from arch/x86/kernel/apic/io_apic.c.
@@ -601,7 +601,7 @@ int __init arch_probe_nr_irqs(void)
601601
nr_irqs = NR_VECTORS * nr_cpu_ids;
602602

603603
nr = (gsi_top + nr_legacy_irqs()) + 8 * nr_cpu_ids;
604-
#if defined(CONFIG_PCI_MSI) || defined(CONFIG_HT_IRQ)
604+
#if defined(CONFIG_PCI_MSI)
605605
/*
606606
* for MSI and HT dyn irq
607607
*/
@@ -663,7 +663,6 @@ int __init arch_early_irq_init(void)
663663
irq_set_default_host(x86_vector_domain);
664664

665665
arch_init_msi_domain(x86_vector_domain);
666-
arch_init_htirq_domain(x86_vector_domain);
667666

668667
BUG_ON(!alloc_cpumask_var(&vector_searchmask, GFP_KERNEL));
669668

drivers/pci/Kconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,6 @@ config XEN_PCIDEV_FRONTEND
7171
The PCI device frontend driver allows the kernel to import arbitrary
7272
PCI devices from a PCI backend to support PCI driver domains.
7373

74-
config HT_IRQ
75-
bool "Interrupts on hypertransport devices"
76-
default y
77-
depends on PCI && X86_LOCAL_APIC
78-
help
79-
This allows native hypertransport devices to use interrupts.
80-
81-
If unsure say Y.
82-
8374
config PCI_ATS
8475
bool
8576

drivers/pci/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ endif
2424
# Build the PCI MSI interrupt support
2525
obj-$(CONFIG_PCI_MSI) += msi.o
2626

27-
# Build the Hypertransport interrupt support
28-
obj-$(CONFIG_HT_IRQ) += htirq.o
29-
3027
obj-$(CONFIG_PCI_ATS) += ats.o
3128
obj-$(CONFIG_PCI_IOV) += iov.o
3229

0 commit comments

Comments
 (0)