Skip to contentSkip to conversation

Improve device tree directory sorting

PATCH New Curt Brune 1 participant 1 message Nov 25, 2015

Subsystems (2)
lore
Share & tools
lore

Curt Brune

author
#0 lore raw

cover Improve device tree directory sorting

This patch improves the device tree directory sorting.

Previously the sorting algorithm would result in the following ordering for a Freescale P2020 SoC device (Rooted under: /proc/device-tree/soc@ffe00000)

#address-cells
#size-cells
.
..
bus-frequency
compatible
device_type
i2c@3000
i2c@3100
mdio@24520
msi@41600
mdio@26520
serial@4600
ethernet@26000
global-utilities@e0000
memory-controller@2000
l2-cache-controller@20000
name
pic@40000
ranges
sdhci@2e000
serial@4500

Ideally 'serial@4500' would come before 'serial@4600'. This would cause the new kexec-ed kernel to have the serial consoles detected in the wrong order, i.e. ttyS0 and ttyS1 are swapped.

Using the attached patch the same directory is ordered as:

#address-cells
#size-cells
.
..
bus-frequency
compatible
device_type
ethernet@26000
global-utilities@e0000
i2c@3000
i2c@3100
l2-cache-controller@20000
mdio@24520
mdio@26520
memory-controller@2000
msi@41600
name
pic@40000
ranges
sdhci@2e000
serial@4500
serial@4600

Curt Brune (1):
Improve device tree directory sorting

 kexec/arch/ppc/fs2dt.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)
Signature · 7 lines
1.9.1


_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec