From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751854AbdG0PLm (ORCPT ); Thu, 27 Jul 2017 11:11:42 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:48112 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751679AbdG0PKw (ORCPT ); Thu, 27 Jul 2017 11:10:52 -0400 From: Suzuki K Poulose To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, will.deacon@arm.com, marc.zyngier@arm.com, mark.rutland@arm.com, sudeep.holla@arm.com, mathieu.poirier@linaro.org, Jonathan.Cameron@huawei.com, Suzuki K Poulose Subject: [PATCH v3 4/6] irqchip: gic-v3: Use of_device_node_get_cpu helper Date: Thu, 27 Jul 2017 16:10:16 +0100 Message-Id: <1501168218-26741-5-git-send-email-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.7.5 In-Reply-To: <1501168218-26741-1-git-send-email-suzuki.poulose@arm.com> References: <1501168218-26741-1-git-send-email-suzuki.poulose@arm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the new generic helper of_device_node_get_cpu() instead of using our own version to map a device node to logical CPU number. Acked-by: Marc Zyngier Signed-off-by: Suzuki K Poulose --- drivers/irqchip/irq-gic-v3.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index dbffb7a..b7ce12b 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -978,31 +979,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 i; - - 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 (i = 0; i < num_possible_cpus(); i++) - if (cpu_logical_map(i) == hwid) - return i; - - return -1; -} - /* Create all possible partitions at boot time */ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) { @@ -1053,8 +1029,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_device_node_get_cpu(cpu_node); + if (WARN_ON(cpu >= nr_cpu_ids)) continue; pr_cont("%s[%d] ", cpu_node->full_name, cpu); -- 2.7.5