Commit 5c2837fb authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

dmar: Convert to new irq chip functions 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarDavid Woodhouse <dwmw2@infradead.org>
parent d0fbca8f

arch/ia64/kernel/msi_ia64.c

+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask) 


static struct irq_chip dmar_msi_type = {

	.name = "DMAR_MSI",

	.unmask = dmar_msi_unmask,

	.mask = dmar_msi_mask,

	.irq_unmask = dmar_msi_unmask,

	.irq_mask = dmar_msi_mask,

	.ack = ia64_ack_msi_irq,

#ifdef CONFIG_SMP

	.set_affinity = dmar_msi_set_affinity,

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -3578,8 +3578,8 @@ static int dmar_msi_set_affinity(unsigned int irq, const struct cpumask *mask) 


static struct irq_chip dmar_msi_type = {

	.name = "DMAR_MSI",

	.unmask = dmar_msi_unmask,

	.mask = dmar_msi_mask,

	.irq_unmask = dmar_msi_unmask,

	.irq_mask = dmar_msi_mask,

	.irq_ack = ack_apic_edge,

#ifdef CONFIG_SMP

	.set_affinity = dmar_msi_set_affinity,

drivers/pci/dmar.c

+4 −4
Original line number Diff line number Diff line
@@ -1221,9 +1221,9 @@ const char *dmar_get_fault_reason(u8 fault_reason, int *fault_type) 
	}

}



void dmar_msi_unmask(unsigned int irq)

void dmar_msi_unmask(struct irq_data *data)

{

	struct intel_iommu *iommu = get_irq_data(irq);

	struct intel_iommu *iommu = irq_data_get_irq_data(data);

	unsigned long flag;



	/* unmask it */
@@ -1234,10 +1234,10 @@ void dmar_msi_unmask(unsigned int irq) 
	spin_unlock_irqrestore(&iommu->register_lock, flag);

}



void dmar_msi_mask(unsigned int irq)

void dmar_msi_mask(struct irq_data *data)

{

	unsigned long flag;

	struct intel_iommu *iommu = get_irq_data(irq);

	struct intel_iommu *iommu = irq_data_get_irq_data(data);



	/* mask it */

	spin_lock_irqsave(&iommu->register_lock, flag);

include/linux/dmar.h

+3 −2
Original line number Diff line number Diff line
@@ -187,8 +187,9 @@ static inline int set_msi_sid(struct irte *irte, struct pci_dev *dev) 
/* Can't use the common MSI interrupt functions

 * since DMAR is not a pci device

 */

extern void dmar_msi_unmask(unsigned int irq);

extern void dmar_msi_mask(unsigned int irq);

struct irq_data;

extern void dmar_msi_unmask(struct irq_data *data);

extern void dmar_msi_mask(struct irq_data *data);

extern void dmar_msi_read(int irq, struct msi_msg *msg);

extern void dmar_msi_write(int irq, struct msi_msg *msg);

extern int dmar_set_interrupt(struct intel_iommu *iommu);