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

Commit 532d0d06 authored by Christoph Lameter's avatar Christoph Lameter Committed by Tejun Heo
Browse files

irqchips: Replace __this_cpu_ptr uses 



[ARM specific]

These are generally replaced with raw_cpu_ptr. However, in
gic_get_percpu_base() we immediately dereference the pointer. This is
equivalent to a raw_cpu_read. So use that operation there.

Cc: nicolas.pitre@linaro.org
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarChristoph Lameter <cl@linux.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent eee8492d

drivers/irqchip/irq-gic.c

+5 −5
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static struct gic_chip_data gic_data[MAX_GIC_NR] __read_mostly; 
#ifdef CONFIG_GIC_NON_BANKED

static void __iomem *gic_get_percpu_base(union gic_base *base)

{

	return *__this_cpu_ptr(base->percpu_base);

	return raw_cpu_read(base->percpu_base);

}



static void __iomem *gic_get_common_base(union gic_base *base)
@@ -504,11 +504,11 @@ static void gic_cpu_save(unsigned int gic_nr) 
	if (!dist_base || !cpu_base)

		return;



	ptr = __this_cpu_ptr(gic_data[gic_nr].saved_ppi_enable);

	ptr = raw_cpu_ptr(gic_data[gic_nr].saved_ppi_enable);

	for (i = 0; i < DIV_ROUND_UP(32, 32); i++)

		ptr[i] = readl_relaxed(dist_base + GIC_DIST_ENABLE_SET + i * 4);



	ptr = __this_cpu_ptr(gic_data[gic_nr].saved_ppi_conf);

	ptr = raw_cpu_ptr(gic_data[gic_nr].saved_ppi_conf);

	for (i = 0; i < DIV_ROUND_UP(32, 16); i++)

		ptr[i] = readl_relaxed(dist_base + GIC_DIST_CONFIG + i * 4);
@@ -530,11 +530,11 @@ static void gic_cpu_restore(unsigned int gic_nr) 
	if (!dist_base || !cpu_base)

		return;



	ptr = __this_cpu_ptr(gic_data[gic_nr].saved_ppi_enable);

	ptr = raw_cpu_ptr(gic_data[gic_nr].saved_ppi_enable);

	for (i = 0; i < DIV_ROUND_UP(32, 32); i++)

		writel_relaxed(ptr[i], dist_base + GIC_DIST_ENABLE_SET + i * 4);



	ptr = __this_cpu_ptr(gic_data[gic_nr].saved_ppi_conf);

	ptr = raw_cpu_ptr(gic_data[gic_nr].saved_ppi_conf);

	for (i = 0; i < DIV_ROUND_UP(32, 16); i++)

		writel_relaxed(ptr[i], dist_base + GIC_DIST_CONFIG + i * 4);

kernel/irq/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ void handle_percpu_devid_irq(unsigned int irq, struct irq_desc *desc) 
{

	struct irq_chip *chip = irq_desc_get_chip(desc);

	struct irqaction *action = desc->action;

	void *dev_id = __this_cpu_ptr(action->percpu_dev_id);

	void *dev_id = raw_cpu_ptr(action->percpu_dev_id);

	irqreturn_t res;



	kstat_incr_irqs_this_cpu(irq, desc);