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

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

x86/MSI: Clean up unused MSI related code and interfaces 



Now MSI interrupt has been converted to new hierarchical irqdomain
interfaces, so remove legacy MSI related code and interfaces.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
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: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.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: Yijing Wang <wangyijing@huawei.com>
Link: http://lkml.kernel.org/r/1428905519-23704-19-git-send-email-jiang.liu@linux.intel.com


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

arch/x86/include/asm/hpet.h

+0 −9
Original line number Diff line number Diff line
@@ -85,15 +85,6 @@ extern struct irq_domain *hpet_create_irq_domain(int hpet_id); 
extern int hpet_assign_irq(struct irq_domain *domain,

			   struct hpet_dev *dev, int dev_num);



#ifdef CONFIG_PCI_MSI

extern int default_setup_hpet_msi(unsigned int irq, unsigned int id);

#else

static inline int default_setup_hpet_msi(unsigned int irq, unsigned int id)

{

	return -EINVAL;

}

#endif



#ifdef CONFIG_HPET_EMULATE_RTC



#include <linux/interrupt.h>

arch/x86/include/asm/x86_init.h

+0 −4
Original line number Diff line number Diff line
@@ -175,13 +175,9 @@ struct msi_msg; 


struct x86_msi_ops {

	int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);

	void (*compose_msi_msg)(struct pci_dev *dev, unsigned int irq,

				unsigned int dest, struct msi_msg *msg,

			       u8 hpet_id);

	void (*teardown_msi_irq)(unsigned int irq);

	void (*teardown_msi_irqs)(struct pci_dev *dev);

	void (*restore_msi_irqs)(struct pci_dev *dev);

	int  (*setup_hpet_msi)(unsigned int irq, unsigned int id);

};



struct IO_APIC_route_entry;

arch/x86/kernel/apic/msi.c

+4 −51
Original line number Diff line number Diff line
@@ -25,16 +25,12 @@ 


static struct irq_domain *msi_default_domain;



void native_compose_msi_msg(struct pci_dev *pdev,

			    unsigned int irq, unsigned int dest,

			    struct msi_msg *msg, u8 hpet_id)

static void native_compose_msi_msg(struct irq_cfg *cfg, struct msi_msg *msg)

{

	struct irq_cfg *cfg = irq_cfg(irq);



	msg->address_hi = MSI_ADDR_BASE_HI;



	if (x2apic_enabled())

		msg->address_hi |= MSI_ADDR_EXT_DEST_ID(dest);

		msg->address_hi |= MSI_ADDR_EXT_DEST_ID(cfg->dest_apicid);



	msg->address_lo =

		MSI_ADDR_BASE_LO |
@@ -44,7 +40,7 @@ void native_compose_msi_msg(struct pci_dev *pdev, 
		((apic->irq_delivery_mode != dest_LowestPrio) ?

			MSI_ADDR_REDIRECTION_CPU :

			MSI_ADDR_REDIRECTION_LOWPRI) |

		MSI_ADDR_DEST_ID(dest);

		MSI_ADDR_DEST_ID(cfg->dest_apicid);



	msg->data =

		MSI_DATA_TRIGGER_EDGE |
@@ -93,31 +89,6 @@ static void msi_update_msg(struct msi_msg *msg, struct irq_data *irq_data) 
	msg->address_lo |= MSI_ADDR_DEST_ID(cfg->dest_apicid);

}



static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq,

			   struct msi_msg *msg, u8 hpet_id)

{

	struct irq_cfg *cfg;

	int err;

	unsigned dest;



	if (disable_apic)

		return -ENXIO;



	cfg = irq_cfg(irq);

	err = assign_irq_vector(irq, cfg, apic->target_cpus());

	if (err)

		return err;



	err = apic->cpu_mask_to_apicid_and(cfg->domain,

					   apic->target_cpus(), &dest);

	if (err)

		return err;



	x86_msi.compose_msi_msg(pdev, irq, dest, msg, hpet_id);



	return 0;

}



/*

 * IRQ Chip for MSI PCI/PCI-X/PCI-Express Devices,

 * which implement the MSI or MSI-X Capability Structure.
@@ -262,7 +233,7 @@ int arch_setup_dmar_msi(unsigned int irq) 
	struct msi_msg msg;

	struct irq_cfg *cfg = irq_cfg(irq);



	native_compose_msi_msg(NULL, irq, cfg->dest_apicid, &msg, -1);

	native_compose_msi_msg(cfg, &msg);

	dmar_msi_write(irq, &msg);

	irq_set_chip_and_handler_name(irq, &dmar_msi_type, handle_edge_irq,

				      "edge");
@@ -318,24 +289,6 @@ static struct irq_chip hpet_msi_controller = { 
	.flags = IRQCHIP_SKIP_SET_WAKE,

};



int default_setup_hpet_msi(unsigned int irq, unsigned int id)

{

	struct irq_chip *chip = &hpet_msi_controller;

	struct msi_msg msg;

	int ret;



	ret = msi_compose_msg(NULL, irq, &msg, id);

	if (ret < 0)

		return ret;



	hpet_msi_write(irq_get_handler_data(irq), &msg);

	irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);

	setup_remapped_irq(irq, irq_cfg(irq), chip);



	irq_set_chip_and_handler_name(irq, chip, handle_edge_irq, "edge");

	return 0;

}



static int hpet_domain_alloc(struct irq_domain *domain, unsigned int virq,

			     unsigned int nr_irqs, void *arg)

{