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

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

x86, irq: Use helpers to access irq_cfg data structure associated with IRQ 



Use helpers to access irq_cfg data structure associated with IRQ,
instead of accessing irq_data->chip_data directly. Later we can
rewrite those helpers to support hierarchy irqdomain.

Signed-off-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Link: http://lkml.kernel.org/r/1414397531-28254-17-git-send-email-jiang.liu@linux.intel.com


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

arch/x86/kernel/apic/htirq.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void target_ht_irq(unsigned int irq, unsigned int dest, u8 vector) 
static int

ht_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)

{

	struct irq_cfg *cfg = data->chip_data;

	struct irq_cfg *cfg = irqd_cfg(data);

	unsigned int dest;

	int ret;

arch/x86/kernel/apic/io_apic.c

+5 −5
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static void mask_ioapic(struct irq_cfg *cfg) 


static void mask_ioapic_irq(struct irq_data *data)

{

	mask_ioapic(data->chip_data);

	mask_ioapic(irqd_cfg(data));

}



static void __unmask_ioapic(struct irq_cfg *cfg)
@@ -520,7 +520,7 @@ static void unmask_ioapic(struct irq_cfg *cfg) 


static void unmask_ioapic_irq(struct irq_data *data)

{

	unmask_ioapic(data->chip_data);

	unmask_ioapic(irqd_cfg(data));

}



/*
@@ -1801,7 +1801,7 @@ static unsigned int startup_ioapic_irq(struct irq_data *data) 
		if (legacy_pic->irq_pending(irq))

			was_pending = 1;

	}

	__unmask_ioapic(data->chip_data);

	__unmask_ioapic(irqd_cfg(data));

	raw_spin_unlock_irqrestore(&ioapic_lock, flags);



	return was_pending;
@@ -1852,7 +1852,7 @@ int native_ioapic_set_affinity(struct irq_data *data, 
	if (!ret) {

		/* Only the high 8 bits are valid. */

		dest = SET_APIC_LOGICAL_ID(dest);

		__target_IO_APIC_irq(irq, dest, data->chip_data);

		__target_IO_APIC_irq(irq, dest, irqd_cfg(data));

		ret = IRQ_SET_MASK_OK_NOCOPY;

	}

	raw_spin_unlock_irqrestore(&ioapic_lock, flags);
@@ -1943,7 +1943,7 @@ static inline void ioapic_irqd_unmask(struct irq_data *data, 


static void ack_ioapic_level(struct irq_data *data)

{

	struct irq_cfg *cfg = data->chip_data;

	struct irq_cfg *cfg = irqd_cfg(data);

	int i, irq = data->irq;

	unsigned long v;

	bool masked;

arch/x86/kernel/apic/msi.c

+3 −3
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, 
static int

msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)

{

	struct irq_cfg *cfg = data->chip_data;

	struct irq_cfg *cfg = irqd_cfg(data);

	struct msi_msg msg;

	unsigned int dest;

	int ret;
@@ -180,7 +180,7 @@ static int 
dmar_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,

		      bool force)

{

	struct irq_cfg *cfg = data->chip_data;

	struct irq_cfg *cfg = irqd_cfg(data);

	unsigned int dest, irq = data->irq;

	struct msi_msg msg;

	int ret;
@@ -235,7 +235,7 @@ int arch_setup_dmar_msi(unsigned int irq) 
static int hpet_msi_set_affinity(struct irq_data *data,

				 const struct cpumask *mask, bool force)

{

	struct irq_cfg *cfg = data->chip_data;

	struct irq_cfg *cfg = irqd_cfg(data);

	struct msi_msg msg;

	unsigned int dest;

	int ret;

arch/x86/kernel/apic/vector.c

+3 −3
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ void setup_vector_irq(int cpu) 


int apic_retrigger_irq(struct irq_data *data)

{

	struct irq_cfg *cfg = data->chip_data;

	struct irq_cfg *cfg = irqd_cfg(data);

	unsigned long flags;

	int cpu;
@@ -335,7 +335,7 @@ int apic_retrigger_irq(struct irq_data *data) 


void apic_ack_edge(struct irq_data *data)

{

	irq_complete_move(data->chip_data);

	irq_complete_move(irqd_cfg(data));

	irq_move_irq(data);

	ack_APIC_irq();

}
@@ -348,7 +348,7 @@ void apic_ack_edge(struct irq_data *data) 
int apic_set_affinity(struct irq_data *data, const struct cpumask *mask,

		      unsigned int *dest_id)

{

	struct irq_cfg *cfg = data->chip_data;

	struct irq_cfg *cfg = irqd_cfg(data);

	unsigned int irq = data->irq;

	int err;

arch/x86/platform/uv/uv_irq.c

+2 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, 
		       unsigned long mmr_offset, int limit)

{

	const struct cpumask *eligible_cpu = cpumask_of(cpu);

	struct irq_cfg *cfg = irq_get_chip_data(irq);

	struct irq_cfg *cfg = irq_cfg(irq);

	unsigned long mmr_value;

	struct uv_IO_APIC_route_entry *entry;

	int mmr_pnode, err;
@@ -198,7 +198,7 @@ static int 
uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask,

		    bool force)

{

	struct irq_cfg *cfg = data->chip_data;

	struct irq_cfg *cfg = irqd_cfg(data);

	unsigned int dest;

	unsigned long mmr_value, mmr_offset;

	struct uv_IO_APIC_route_entry *entry;