Commit c14e3673 authored Sep 21, 2015 by Robert Richter Committed by Thomas Gleixner Sep 29, 2015

irqchip/gicv3-its: Read typer register outside the loop



No need to read the typer register in the loop. Values do not change.

This patch is basically a prerequisite for a follow-on patch that adds
errata code for Cavium ThunderX. It moves the calculation of the
number of id entries to the beginning of the function close to other
setup values that are needed to allocate the its table. Now we have a
central location to modify the setup parameters and the errata code
can be implemented in a single block.

Signed-off-by: Robert Richter <rrichter@cavium.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Cc: Tirumalesh Chalamarla <tchalamarla@cavium.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Jason Cooper <jason@lakedaemon.net>
Link: http://lkml.kernel.org/r/1442869119-1814-4-git-send-email-rric@kernel.org


Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 6d4e11c5

drivers/irqchip/irq-gic-v3-its.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -815,6 +815,8 @@ static int its_alloc_tables(const char node_name, struct its_node its)
		int psz = SZ_64K;
		u64 shr = GITS_BASER_InnerShareable;
		u64 cache = GITS_BASER_WaWb;
		u64 typer = readq_relaxed(its->base + GITS_TYPER);
		u32 ids = GITS_TYPER_DEVBITS(typer);

		for (i = 0; i < GITS_BASER_NR_REGS; i++) {
		u64 val = readq_relaxed(its->base + GITS_BASER + i * 8);
		@@ -838,9 +840,6 @@ static int its_alloc_tables(const char node_name, struct its_node its)
		* For other tables, only allocate a single page.
		*/
		if (type == GITS_BASER_TYPE_DEVICE) {
		u64 typer = readq_relaxed(its->base + GITS_TYPER);
		u32 ids = GITS_TYPER_DEVBITS(typer);

		/*
		* 'order' was initialized earlier to the default page
		* granule of the the ITS. We can't have an allocation