Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c81b812a333818c5cc1be2e086c8509d853ebeeb

Authored by Anton Blanchard
Committed by Benjamin Herrenschmidt
1 parent 46150a050f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

powerpc: cpumask_of_node() should handle -1 as a node 

pcibus_to_node can return -1 if we cannot determine which node a pci bus
is on. If passed -1, cpumask_of_node will negatively index the lookup array
and pull in random data:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
00000000,00000003,00000000,00000000
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
64-65

Change cpumask_of_node to check for -1 and return cpu_all_mask in this
case:

# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpus
ffffffff,ffffffff,ffffffff,ffffffff
# cat /sys/devices/pci0000:00/0000:00:01.0/local_cpulist
0-127

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff

arch/powerpc/include/asm/topology.h
Diff comments   View file @ c81b812
... ... @@ -17,7 +17,9 @@
17 17  
18 18 #define parent_node(node) (node)
19 19  
20   -#define cpumask_of_node(node) (&numa_cpumask_lookup_table[node])
  20 +#define cpumask_of_node(node) ((node) == -1 ? \
  21 + cpu_all_mask : \
  22 + &numa_cpumask_lookup_table[node])
21 23  
22 24 int of_node_to_nid(struct device_node *device);
23 25