Re: [PATCH 1/1] MIPS: DTS: cavium-octeon: provide model attribute

From: Sergei Shtylyov
Date: Mon Feb 15 2016 - 13:12:38 EST


On 02/15/2016 08:52 PM, Heinrich Schuchardt wrote:

Downstream packages like Debian flash-kernel rely on
/proc/device-tree/model
to determine how to install an updated kernel image.

Most dts files provide this property.
It is suggested by IEEE Std 1275-1994.

This patch adds a model attribute for Octeon CPUs.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
---
arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 1 +
arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts | 1 +
2 files changed, 2 insertions(+)

diff --git a/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
b/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
index 9c48e05..a746678 100644
--- a/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
+++ b/arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts
@@ -8,6 +8,7 @@
*/
/ {
compatible = "cavium,octeon-3860";
+ model = "Cavium Octeon 3XXX";
#address-cells = <2>;
#size-cells = <2>;
interrupt-parent = <&ciu>;
diff --git a/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
b/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
index 79b46fc..c8a292a 100644
--- a/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
+++ b/arch/mips/boot/dts/cavium-octeon/octeon_68xx.dts
@@ -8,6 +8,7 @@
*/
/ {
compatible = "cavium,octeon-6880";
+ model = "Cavium Octeon 68XX";
#address-cells = <2>;
#size-cells = <2>;
interrupt-parent = <&ciu2>;

The ePAPR 1.1 standard says:

2.3.2 model

Property: model
Value type: <string>
Description:
The model property value is a <string> that specifies the
manufacturer’s model number of the device.

The recommended format is: “manufacturer,model”, where manufacturer
is a string describing the name of the manufacturer (such as a stock
ticker symbol), and model specifies the model number.

Example:
model = “fsl,MPC8349EMITX”;
[...]

Hello Sergei, hello Arnd,

thank you for reviewing.

IEEE Std 1275-1994 says stock symbols should be in upper case.

I guess international standards should have precedence over papers valid
for a single architecture (power.org).

Would you support a patch having the following strings?

model = "CAVM, Octeon 3860";
model = "CAVM, Octeon 6880";

Otherwise, please, make a suggestion.

Documentation/devicetree/bindings/vendor-prefixes.txt already has the vendor prefix for Cavium, and it's (surprise!) "cavium".
Otherwise, the names look much better -- just remove space after comma please.

Best regards

Heinrich Schuchardt

MBR, Sergei