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

x86/htirq: Use new irqdomain interfaces to allocate/free IRQ 



Use new irqdomain interfaces to allocate/free IRQ for HTIRQ, so we can
remove GENERIC_IRQ_LEGACY_ALLOC_HWIRQ later.

This patch changes the interfaces between arch independent PCI driver
and arch specific code. Currently HT_IRQ is only enabled on x86, so it
does not affect other architectures.

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>
Link: http://lkml.kernel.org/r/1428905519-23704-7-git-send-email-jiang.liu@linux.intel.com


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

arch/x86/kernel/apic/htirq.c

+13 −13
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/device.h>

#include <linux/pci.h>

#include <linux/htirq.h>

#include <linux/irqdomain.h>

#include <asm/hw_irq.h>

#include <asm/apic.h>

#include <asm/hypertransport.h>
@@ -61,31 +62,30 @@ static struct irq_chip ht_irq_chip = { 
	.flags			= IRQCHIP_SKIP_SET_WAKE,

};



int arch_alloc_ht_irq(struct pci_dev *dev)

{

	return irq_domain_alloc_irqs(NULL, 1, dev_to_node(&dev->dev), NULL);

}



void arch_free_ht_irq(int irq)

{

	irq_domain_free_irqs(irq, 1);

}



int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)

{

	struct irq_cfg *cfg;

	struct ht_irq_msg msg;

	unsigned dest;

	int err;



	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;



	msg.address_hi = HT_IRQ_HIGH_DEST_ID(dest);

	msg.address_hi = HT_IRQ_HIGH_DEST_ID(cfg->dest_apicid);



	msg.address_lo =

		HT_IRQ_LOW_BASE |

		HT_IRQ_LOW_DEST_ID(dest) |

		HT_IRQ_LOW_DEST_ID(cfg->dest_apicid) |

		HT_IRQ_LOW_VECTOR(cfg->vector) |

		((apic->irq_dest_mode == 0) ?

			HT_IRQ_LOW_DM_PHYSICAL :

drivers/pci/htirq.c

+3 −4
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update) 
	cfg->msg.address_lo = 0xffffffff;

	cfg->msg.address_hi = 0xffffffff;



	irq = irq_alloc_hwirq(dev_to_node(&dev->dev));

	if (!irq) {

	irq = arch_alloc_ht_irq(dev);

	if (irq <= 0) {

		kfree(cfg);

		return -EBUSY;

	}
@@ -163,8 +163,7 @@ void ht_destroy_irq(unsigned int irq) 
	cfg = irq_get_handler_data(irq);

	irq_set_chip(irq, NULL);

	irq_set_handler_data(irq, NULL);

	irq_free_hwirq(irq);



	arch_free_ht_irq(irq);

	kfree(cfg);

}

EXPORT_SYMBOL(ht_destroy_irq);

include/linux/htirq.h

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ void unmask_ht_irq(struct irq_data *data); 


/* The arch hook for getting things started */

int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev);

int arch_alloc_ht_irq(struct pci_dev *dev);

void arch_free_ht_irq(int irq);



/* For drivers of buggy hardware */

typedef void (ht_irq_update_t)(struct pci_dev *dev, int irq,

CRA Git | Maintained and supported by SUSTech CRA and CCSE