Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84bea5cc authored by Jiang Liu's avatar Jiang Liu Committed by Thomas Gleixner
Browse files

x86/irq: Remove x86_io_apic_ops.print_entries and related interfaces 



Now there is no user of x86_io_apic_ops.print_entries anymore, so remove
it.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Tested-by: default avatarJoerg Roedel <jroedel@suse.de>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: David Cohen <david.a.cohen@linux.intel.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: David Vrabel <david.vrabel@citrix.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: iommu@lists.linux-foundation.org
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dimitri Sivanich <sivanich@sgi.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Yijing Wang <wangyijing@huawei.com>
Cc: Grant Likely <grant.likely@linaro.org>
Link: http://lkml.kernel.org/r/1428978610-28986-4-git-send-email-jiang.liu@linux.intel.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent b75e818f

arch/x86/include/asm/io_apic.h

+0 −3
Original line number Diff line number Diff line
@@ -225,8 +225,6 @@ extern unsigned int native_io_apic_read(unsigned int apic, unsigned int reg); 
extern void native_io_apic_write(unsigned int apic, unsigned int reg, unsigned int val);

extern void native_io_apic_modify(unsigned int apic, unsigned int reg, unsigned int val);

extern void native_disable_io_apic(void);

extern void native_io_apic_print_entries(unsigned int apic, unsigned int nr_entries);

extern void intel_ir_io_apic_print_entries(unsigned int apic, unsigned int nr_entries);

extern int native_ioapic_set_affinity(struct irq_data *,

				      const struct cpumask *,

				      bool);
@@ -290,7 +288,6 @@ static inline void disable_ioapic_support(void) { } 
#define native_io_apic_write		NULL

#define native_io_apic_modify		NULL

#define native_disable_io_apic		NULL

#define native_io_apic_print_entries	NULL

#define native_ioapic_set_affinity	NULL

#define native_setup_ioapic_entry	NULL

#define native_eoi_ioapic_pin		NULL

arch/x86/include/asm/x86_init.h

+0 −1
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ struct x86_io_apic_ops { 
	void		(*write)  (unsigned int apic, unsigned int reg, unsigned int value);

	void		(*modify) (unsigned int apic, unsigned int reg, unsigned int value);

	void		(*disable)(void);

	void		(*print_entries)(unsigned int apic, unsigned int nr_entries);

	int		(*set_affinity)(struct irq_data *data,

					const struct cpumask *mask,

					bool force);

arch/x86/kernel/apic/io_apic.c

+0 −55
Original line number Diff line number Diff line
@@ -1339,61 +1339,6 @@ static void __init setup_IO_APIC_irqs(void) 
	}

}



void native_io_apic_print_entries(unsigned int apic, unsigned int nr_entries)

{

	int i;



	pr_debug(" NR Dst Mask Trig IRR Pol Stat Dmod Deli Vect:\n");



	for (i = 0; i <= nr_entries; i++) {

		struct IO_APIC_route_entry entry;



		entry = ioapic_read_entry(apic, i);



		pr_debug(" %02x %02X  ", i, entry.dest);

		pr_cont("%1d    %1d    %1d   %1d   %1d    "

			"%1d    %1d    %02X\n",

			entry.mask,

			entry.trigger,

			entry.irr,

			entry.polarity,

			entry.delivery_status,

			entry.dest_mode,

			entry.delivery_mode,

			entry.vector);

	}

}



void intel_ir_io_apic_print_entries(unsigned int apic,

				    unsigned int nr_entries)

{

	int i;



	pr_debug(" NR Indx Fmt Mask Trig IRR Pol Stat Indx2 Zero Vect:\n");



	for (i = 0; i <= nr_entries; i++) {

		struct IR_IO_APIC_route_entry *ir_entry;

		struct IO_APIC_route_entry entry;



		entry = ioapic_read_entry(apic, i);



		ir_entry = (struct IR_IO_APIC_route_entry *)&entry;



		pr_debug(" %02x %04X ", i, ir_entry->index);

		pr_cont("%1d   %1d    %1d    %1d   %1d   "

			"%1d    %1d     %X    %02X\n",

			ir_entry->format,

			ir_entry->mask,

			ir_entry->trigger,

			ir_entry->irr,

			ir_entry->polarity,

			ir_entry->delivery_status,

			ir_entry->index2,

			ir_entry->zero,

			ir_entry->vector);

	}

}



void ioapic_zap_locks(void)

{

	raw_spin_lock_init(&ioapic_lock);

arch/x86/kernel/x86_init.c

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ struct x86_io_apic_ops x86_io_apic_ops = { 
	.write			= native_io_apic_write,

	.modify			= native_io_apic_modify,

	.disable		= native_disable_io_apic,

	.print_entries		= native_io_apic_print_entries,

	.set_affinity		= native_ioapic_set_affinity,

	.setup_entry		= native_setup_ioapic_entry,

	.eoi_ioapic_pin		= native_eoi_ioapic_pin,

drivers/iommu/intel_irq_remapping.c

+0 −7
Original line number Diff line number Diff line
@@ -696,13 +696,6 @@ static int __init intel_enable_irq_remapping(void) 


	irq_remapping_enabled = 1;



	/*

	 * VT-d has a different layout for IO-APIC entries when

	 * interrupt remapping is enabled. So it needs a special routine

	 * to print IO-APIC entries for debugging purposes too.

	 */

	x86_io_apic_ops.print_entries = intel_ir_io_apic_print_entries;



	pr_info("Enabled IRQ remapping in %s mode\n", eim ? "x2apic" : "xapic");



	return eim ? IRQ_REMAP_X2APIC_MODE : IRQ_REMAP_XAPIC_MODE;