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

iommu/irq_remapping: Kill function irq_remapping_supported() and related code 

Simplify irq_remapping code by killing irq_remapping_supported() and
related interfaces.

Joerg posted a similar patch at https://lkml.org/lkml/2014/12/15/490

,
so assume an signed-off from Joerg.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
Tested-by: default avatarJoerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: iommu@lists.linux-foundation.org
Cc: H. Peter Anvin <hpa@linux.intel.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: David Rientjes <rientjes@google.com>
Cc: HATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
Cc: Jan Beulich <JBeulich@suse.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Oren Twaig <oren@scalemp.com>
Link: http://lkml.kernel.org/r/1420615903-28253-14-git-send-email-jiang.liu@linux.intel.com


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

arch/x86/include/asm/irq_remapping.h

+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct irq_cfg; 


#ifdef CONFIG_IRQ_REMAP



extern int irq_remapping_supported(void);

extern void set_irq_remapping_broken(void);

extern int irq_remapping_prepare(void);

extern int irq_remapping_enable(void);
@@ -59,7 +58,6 @@ void irq_remap_modify_chip_defaults(struct irq_chip *chip); 


#else  /* CONFIG_IRQ_REMAP */



static inline int irq_remapping_supported(void) { return 0; }

static inline void set_irq_remapping_broken(void) { }

static inline int irq_remapping_prepare(void) { return -ENODEV; }

static inline int irq_remapping_enable(void) { return -ENODEV; }

arch/x86/kernel/apic/apic.c

+1 −6
Original line number Diff line number Diff line
@@ -1575,12 +1575,7 @@ void enable_x2apic(void) 


static int __init try_to_enable_IR(void)

{

#ifdef CONFIG_IRQ_REMAP

	if (!irq_remapping_supported()) {

		pr_debug("intr-remapping not supported\n");

		return -1;

	}



#ifdef CONFIG_X86_IO_APIC

	if (!x2apic_enabled() && skip_ioapic_setup) {

		pr_info("Skipped enabling intr-remap because of skipping "

			"io-apic setup\n");

drivers/iommu/amd_iommu.c

+0 −1
Original line number Diff line number Diff line
@@ -4284,7 +4284,6 @@ static int alloc_hpet_msi(unsigned int irq, unsigned int id) 
}



struct irq_remap_ops amd_iommu_irq_ops = {

	.supported		= amd_iommu_supported,

	.prepare		= amd_iommu_prepare,

	.enable			= amd_iommu_enable,

	.disable		= amd_iommu_disable,

drivers/iommu/amd_iommu_init.c

+0 −5
Original line number Diff line number Diff line
@@ -2129,11 +2129,6 @@ int __init amd_iommu_prepare(void) 
	return iommu_go_to_state(IOMMU_ACPI_FINISHED);

}



int __init amd_iommu_supported(void)

{

	return amd_iommu_irq_remap ? 1 : 0;

}



int __init amd_iommu_enable(void)

{

	int ret;

drivers/iommu/amd_iommu_proto.h

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ extern void amd_iommu_init_notifier(void); 
extern void amd_iommu_init_api(void);



/* Needed for interrupt remapping */

extern int amd_iommu_supported(void);

extern int amd_iommu_prepare(void);

extern int amd_iommu_enable(void);

extern void amd_iommu_disable(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE