linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Suzuki K Poulose <suzuki.poulose@arm.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, marc.zyngier@arm.com,
	mark.rutland@arm.com, will.deacon@arm.com,
	catalin.marinas@arm.com, robh@kernel.org, sudeep.holla@arm.com,
	peterz@infradead.org, mathieu.poirier@linaro.org,
	leo.yan@linaro.org, frowand.list@gmail.com,
	Jonathan.Cameron@huawei.com, devicetree@vger.kernel.org,
	Suzuki K Poulose <suzuki.poulose@arm.com>
Subject: [PATCH v9 4/8] irqchip: gic-v3: Use of_cpu_node_to_id helper
Date: Tue, 31 Oct 2017 17:23:14 +0000	[thread overview]
Message-ID: <20171031172318.11823-5-suzuki.poulose@arm.com> (raw)
In-Reply-To: <20171031172318.11823-1-suzuki.poulose@arm.com>

Use the new generic helper of_cpu_node_to_id() instead
of using our own version to map a device node to logical CPU
number.

Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
Changes since V3:
 - Reflect the change in the helper name and return value.
---
 drivers/irqchip/irq-gic-v3.c | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c
index b5df99c6f680..04cecab71597 100644
--- a/drivers/irqchip/irq-gic-v3.c
+++ b/drivers/irqchip/irq-gic-v3.c
@@ -1038,31 +1038,6 @@ static int __init gic_validate_dist_version(void __iomem *dist_base)
 	return 0;
 }
 
-static int get_cpu_number(struct device_node *dn)
-{
-	const __be32 *cell;
-	u64 hwid;
-	int cpu;
-
-	cell = of_get_property(dn, "reg", NULL);
-	if (!cell)
-		return -1;
-
-	hwid = of_read_number(cell, of_n_addr_cells(dn));
-
-	/*
-	 * Non affinity bits must be set to 0 in the DT
-	 */
-	if (hwid & ~MPIDR_HWID_BITMASK)
-		return -1;
-
-	for_each_possible_cpu(cpu)
-		if (cpu_logical_map(cpu) == hwid)
-			return cpu;
-
-	return -1;
-}
-
 /* Create all possible partitions at boot time */
 static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
 {
@@ -1113,8 +1088,8 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node)
 			if (WARN_ON(!cpu_node))
 				continue;
 
-			cpu = get_cpu_number(cpu_node);
-			if (WARN_ON(cpu == -1))
+			cpu = of_cpu_node_to_id(cpu_node);
+			if (WARN_ON(cpu < 0))
 				continue;
 
 			pr_cont("%pOF[%d] ", cpu_node, cpu);
-- 
2.13.6

  parent reply	other threads:[~2017-10-31 17:25 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-31 17:23 [PATCH v9 0/8] perf: Support for ARM DynamIQ Shared Unit Suzuki K Poulose
2017-10-31 17:23 ` [PATCH v9 1/8] perf: Export perf_event_update_userpage Suzuki K Poulose
2017-11-03 11:16   ` Mark Rutland
2017-10-31 17:23 ` [PATCH v9 2/8] of: Add helper for mapping device node to logical CPU number Suzuki K Poulose
2017-10-31 17:23 ` [PATCH v9 3/8] coresight: of: Use of_cpu_node_to_id helper Suzuki K Poulose
2017-10-31 17:23 ` Suzuki K Poulose [this message]
2017-10-31 17:23 ` [PATCH v9 5/8] arm64: Use of_cpu_node_to_id helper for CPU topology parsing Suzuki K Poulose
2017-10-31 17:23 ` [PATCH v9 6/8] arm_pmu: Use of_cpu_node_to_id helper Suzuki K Poulose
2017-10-31 17:23 ` [PATCH v9 7/8] dt-bindings: Document devicetree binding for ARM DSU PMU Suzuki K Poulose
2017-10-31 17:23 ` [PATCH v9 8/8] perf: ARM DynamIQ Shared Unit PMU support Suzuki K Poulose
2017-11-03 12:20   ` Mark Rutland
2017-11-03 14:34     ` Suzuki K Poulose

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171031172318.11823-5-suzuki.poulose@arm.com \
    --to=suzuki.poulose@arm.com \
    --cc=Jonathan.Cameron@huawei.com \
    --cc=catalin.marinas@arm.com \
    --cc=devicetree@vger.kernel.org \
    --cc=frowand.list@gmail.com \
    --cc=leo.yan@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=mathieu.poirier@linaro.org \
    --cc=peterz@infradead.org \
    --cc=robh@kernel.org \
    --cc=sudeep.holla@arm.com \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).