1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
Date: Tue, 21 Jan 2014 13:49:35 +1100
From: Anton Blanchard <anton@samba.org>
Subject: [PATCH] dtc: Sort unit addresses by number
The sort option in dtc treats unit addresses as strings. This causes
cpu nodes to end up out of order:
# dtc -s -I fs -O dts /proc/device-tree | grep PowerPC,POWER7
PowerPC,POWER7@30 {
PowerPC,POWER7@68 {
PowerPC,POWER7@70 {
PowerPC,POWER7@828 {
PowerPC,POWER7@860 {
PowerPC,POWER7@868 {
PowerPC,POWER7@8a0 {
PowerPC,POWER7@8b0 {
PowerPC,POWER7@8f0 {
PowerPC,POWER7@a0 {
PowerPC,POWER7@a8 {
PowerPC,POWER7@e0 {
If we use this device tree for a kexec boot we end up with a confusing
layout of logical CPUs:
node 0 cpus: 0-23 72-95
node 0 size: 32633 MB
node 1 cpus: 24-71
node 1 size: 32631 MB
The reason for this is that we allocate logical CPU ids as we walk
through the device tree.
In cmp_subnode, if both nodes have a hex unit address and the
basenames match, then compare by number.
This fixes the issue:
# dtc -s -I fs -O dts /proc/device-tree | grep PowerPC,POWER7
PowerPC,POWER7@30 {
PowerPC,POWER7@68 {
PowerPC,POWER7@70 {
PowerPC,POWER7@a0 {
PowerPC,POWER7@a8 {
PowerPC,POWER7@e0 {
PowerPC,POWER7@828 {
PowerPC,POWER7@860 {
PowerPC,POWER7@868 {
PowerPC,POWER7@8a0 {
PowerPC,POWER7@8b0 {
PowerPC,POWER7@8f0 {
And the CPU layout is as expected:
node 0 cpus: 0-47
node 0 size: 32633 MB
node 1 cpus: 48-95
node 1 size: 32631 MB
Signed-off-by: Anton Blanchard <anton@samba.org>
--
Index: b/livetree.c
===================================================================
--- a/livetree.c
+++ b/livetree.c
@@ -656,12 +656,38 @@ static void sort_properties(struct node
free(tbl);
}
+static bool is_hex(const char *str)
+{
+ while (*str) {
+ if (!isxdigit(*str++))
+ return false;
+ }
+
+ return true;
+}
+
static int cmp_subnode(const void *ax, const void *bx)
{
- const struct node *a, *b;
+ struct node *a, *b;
+ const char *a_unit, *b_unit;
+
+ a = *((struct node * const *)ax);
+ b = *((struct node * const *)bx);
+
+ a_unit = get_unitname(a);
+ b_unit = get_unitname(b);
+
+ /* Sort hex unit addresses by number */
+ if (a_unit && b_unit && (a->basenamelen == b->basenamelen) &&
+ !strncmp(a->name, b->name, a->basenamelen) &&
+ is_hex(a_unit) && is_hex(b_unit)) {
+ unsigned long long a_num, b_num;
+
+ a_num = strtoull(a_unit, NULL, 16);
+ b_num = strtoull(b_unit, NULL, 16);
- a = *((const struct node * const *)ax);
- b = *((const struct node * const *)bx);
+ return (a_num > b_num) - (a_num < b_num);
+ }
return strcmp(a->name, b->name);
}
|
