Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1694611 > unrolled thread
| Started by | Suzuki K Poulose <suzuki.poulose@arm.com> |
|---|---|
| First post | 2017-07-24 12:40 +0200 |
| Last post | 2017-07-24 15:20 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[PATCH v2 4/6] irqchip: gic-v3: Use of_device_node_get_cpu helper Suzuki K Poulose <suzuki.poulose@arm.com> - 2017-07-24 12:40 +0200
Re: [PATCH v2 4/6] irqchip: gic-v3: Use of_device_node_get_cpu helper Marc Zyngier <marc.zyngier@arm.com> - 2017-07-24 15:20 +0200
| From | Suzuki K Poulose <suzuki.poulose@arm.com> |
|---|---|
| Date | 2017-07-24 12:40 +0200 |
| Subject | [PATCH v2 4/6] irqchip: gic-v3: Use of_device_node_get_cpu helper |
| Message-ID | <u6IWm-3vE-9@gated-at.bofh.it> |
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.
Cc: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
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 <linux/irqdomain.h>
#include <linux/of.h>
#include <linux/of_address.h>
+#include <linux/of_device.h>
#include <linux/of_irq.h>
#include <linux/percpu.h>
#include <linux/slab.h>
@@ -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
[toc] | [next] | [standalone]
| From | Marc Zyngier <marc.zyngier@arm.com> |
|---|---|
| Date | 2017-07-24 15:20 +0200 |
| Message-ID | <u6Lrc-5li-3@gated-at.bofh.it> |
| In reply to | #1694611 |
On 24/07/17 11:29, Suzuki K Poulose wrote:
> 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.
>
> Cc: Marc Zyngier <marc.zyngier@arm.com>
> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
> ---
> 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 <linux/irqdomain.h>
> #include <linux/of.h>
> #include <linux/of_address.h>
> +#include <linux/of_device.h>
> #include <linux/of_irq.h>
> #include <linux/percpu.h>
> #include <linux/slab.h>
> @@ -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);
>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
M.
--
Jazz is not dead. It just smells funny...
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web