aboutsummaryrefslogtreecommitdiff
path: root/hdata
diff options
context:
space:
mode:
Diffstat (limited to 'hdata')
-rw-r--r--hdata/fsp.c7
-rw-r--r--hdata/iohub.c32
-rw-r--r--hdata/test/op920.wsp.dts20
-rw-r--r--hdata/test/p8-840-spira.dts16
-rw-r--r--hdata/test/p81-811.spira.dts25
5 files changed, 55 insertions, 45 deletions
diff --git a/hdata/fsp.c b/hdata/fsp.c
index 5923f1f..fe36eef 100644
--- a/hdata/fsp.c
+++ b/hdata/fsp.c
@@ -206,7 +206,7 @@ static void fsp_create_links(const void *spss, int index,
chip = fsp_create_link(iopath, i, index);
lp = lcount++;
links = realloc(links, 4 * lcount);
- links[lp] = chip;
+ links[lp] = cpu_to_be32(chip);
}
if (links)
dt_add_property(fsp_node, "ibm,psi-links", links, lcount * 4);
@@ -268,7 +268,7 @@ static void add_uart(const struct spss_iopath *iopath, struct dt_node *lpc)
be32_to_cpu(iopath->lpc.uart_baud));
}
-static void add_chip_id_to_sensors(struct dt_node *sensor_node, __be32 slca_index)
+static void add_chip_id_to_sensors(struct dt_node *sensor_node, uint32_t slca_index)
{
unsigned int i;
const void *hdif;
@@ -347,7 +347,8 @@ static void add_ipmi_sensors(struct dt_node *bmc_node)
dt_add_property_cells(sensor_node, "ipmi-sensor-type",
ipmi_sensors->data[i].type);
- add_chip_id_to_sensors(sensor_node, ipmi_sensors->data[i].slca_index);
+ add_chip_id_to_sensors(sensor_node,
+ be32_to_cpu(ipmi_sensors->data[i].slca_index));
}
}
diff --git a/hdata/iohub.c b/hdata/iohub.c
index 6921d95..6647e6a 100644
--- a/hdata/iohub.c
+++ b/hdata/iohub.c
@@ -20,7 +20,7 @@ static bool io_get_lx_info(const void *kwvpd, unsigned int kwvpd_sz,
{
const void *lxr;
char recname[5];
- uint32_t lxrbuf[2] = { 0, 0 };
+ beint32_t lxrbuf[2] = { 0, 0 };
/* Find LXRn, where n is the index passed in*/
strcpy(recname, "LXR0");
@@ -38,17 +38,17 @@ static bool io_get_lx_info(const void *kwvpd, unsigned int kwvpd_sz,
return false;
}
- memcpy(lxrbuf, lxr, sizeof(uint32_t)*2);
+ memcpy(lxrbuf, lxr, sizeof(beint32_t)*2);
- prlog(PR_DEBUG, "CEC: LXRn=%d LXR=%08x%08x\n", lx_idx, lxrbuf[0], lxrbuf[1]);
+ prlog(PR_DEBUG, "CEC: LXRn=%d LXR=%08x%08x\n", lx_idx, be32_to_cpu(lxrbuf[0]), be32_to_cpu(lxrbuf[1]));
prlog(PR_DEBUG, "CEC: LX Info added to %llx\n", (long long)hn);
/* Add the LX info */
if (!dt_has_node_property(hn, "ibm,vpd-lx-info", NULL)) {
dt_add_property_cells(hn, "ibm,vpd-lx-info",
lx_idx,
- lxrbuf[0],
- lxrbuf[1]);
+ be32_to_cpu(lxrbuf[0]),
+ be32_to_cpu(lxrbuf[1]));
}
return true;
@@ -109,12 +109,12 @@ static struct dt_node *io_add_phb3(const struct cechub_io_hub *hub,
/* "reg" property contains in order the PE, PCI and SPCI XSCOM
* addresses
*/
- reg[0] = pe_xscom;
- reg[1] = 0x20;
- reg[2] = pci_xscom;
- reg[3] = 0x05;
- reg[4] = spci_xscom;
- reg[5] = 0x15;
+ reg[0] = cpu_to_be32(pe_xscom);
+ reg[1] = cpu_to_be32(0x20);
+ reg[2] = cpu_to_be32(pci_xscom);
+ reg[3] = cpu_to_be32(0x05);
+ reg[4] = cpu_to_be32(spci_xscom);
+ reg[5] = cpu_to_be32(0x15);
dt_add_property(pbcq, "reg", reg, sizeof(reg));
/* A couple more things ... */
@@ -214,10 +214,10 @@ static struct dt_node *io_add_phb4(const struct cechub_io_hub *hub,
return NULL;
/* "reg" property contains (in order) the PE and PCI XSCOM addresses */
- reg[0] = pe_xscom;
- reg[1] = 0x100;
- reg[2] = pci_xscom;
- reg[3] = 0x200;
+ reg[0] = cpu_to_be32(pe_xscom);
+ reg[1] = cpu_to_be32(0x100);
+ reg[2] = cpu_to_be32(pci_xscom);
+ reg[3] = cpu_to_be32(0x200);
dt_add_property(pbcq, "reg", reg, sizeof(reg));
/* The hubs themselves go under the stacks */
@@ -322,7 +322,7 @@ static void io_add_p8_cec_vpd(const struct HDIF_common_hdr *sp_iohubs)
}
if (be32_to_cpu(iokids->count) > 1) {
prlog(PR_WARNING, "CEC: WARNING ! More than 1 IO KID !!! (%d)\n",
- iokids->count);
+ be32_to_cpu(iokids->count));
/* Ignoring the additional ones */
}
diff --git a/hdata/test/op920.wsp.dts b/hdata/test/op920.wsp.dts
index 057021f..e26fa12 100644
--- a/hdata/test/op920.wsp.dts
+++ b/hdata/test/op920.wsp.dts
@@ -76,6 +76,7 @@
sensor@8 {
phandle = <0x2b>;
compatible = "ibm,ipmi-sensor";
+ ibm,chip-id = <0x00>;
reg = <0x8>;
ipmi-sensor-type = <0x7>;
};
@@ -83,6 +84,7 @@
sensor@9 {
phandle = <0x3f>;
compatible = "ibm,ipmi-sensor";
+ ibm,chip-id = <0x08>;
reg = <0x9>;
ipmi-sensor-type = <0x7>;
};
@@ -139,6 +141,7 @@
sensor@59 {
phandle = <0x18>;
compatible = "ibm,ipmi-sensor";
+ ibm,chip-id = <0x00>;
reg = <0x59>;
ipmi-sensor-type = <0x1>;
};
@@ -146,6 +149,7 @@
sensor@5a {
phandle = <0x1a>;
compatible = "ibm,ipmi-sensor";
+ ibm,chip-id = <0x00>;
reg = <0x5a>;
ipmi-sensor-type = <0x7>;
};
@@ -153,6 +157,7 @@
sensor@a3 {
phandle = <0x2c>;
compatible = "ibm,ipmi-sensor";
+ ibm,chip-id = <0x08>;
reg = <0xa3>;
ipmi-sensor-type = <0x1>;
};
@@ -160,6 +165,7 @@
sensor@a4 {
phandle = <0x2e>;
compatible = "ibm,ipmi-sensor";
+ ibm,chip-id = <0x08>;
reg = <0xa4>;
ipmi-sensor-type = <0x7>;
};
@@ -433,6 +439,7 @@
sensor@e0 {
phandle = <0x19>;
compatible = "ibm,ipmi-sensor";
+ ibm,chip-id = <0x00>;
reg = <0xe0>;
ipmi-sensor-type = <0x1>;
};
@@ -440,6 +447,7 @@
sensor@e1 {
phandle = <0x2d>;
compatible = "ibm,ipmi-sensor";
+ ibm,chip-id = <0x08>;
reg = <0xe1>;
ipmi-sensor-type = <0x1>;
};
@@ -4166,7 +4174,7 @@
pbcq@4010c00 {
phandle = <0x140>;
- reg = <0xc0104 0x10000 0x8010d 0x20000>;
+ reg = <0x4010c00 0x100 0xd010800 0x200>;
compatible = "ibm,power9-pbcq";
ibm,pec-index = <0x0>;
#address-cells = <0x1>;
@@ -4186,7 +4194,7 @@
pbcq@4011000 {
phandle = <0x142>;
- reg = <0x100104 0x10000 0x8010e 0x20000>;
+ reg = <0x4011000 0x100 0xe010800 0x200>;
compatible = "ibm,power9-pbcq";
ibm,pec-index = <0x1>;
#address-cells = <0x1>;
@@ -4215,7 +4223,7 @@
pbcq@4011400 {
phandle = <0x145>;
- reg = <0x140104 0x10000 0x8010f 0x20000>;
+ reg = <0x4011400 0x100 0xf010800 0x200>;
compatible = "ibm,power9-pbcq";
ibm,pec-index = <0x2>;
#address-cells = <0x1>;
@@ -4796,7 +4804,7 @@
pbcq@4010c00 {
phandle = <0x15c>;
- reg = <0xc0104 0x10000 0x8010d 0x20000>;
+ reg = <0x4010c00 0x100 0xd010800 0x200>;
compatible = "ibm,power9-pbcq";
ibm,pec-index = <0x0>;
#address-cells = <0x1>;
@@ -4816,7 +4824,7 @@
pbcq@4011000 {
phandle = <0x15e>;
- reg = <0x100104 0x10000 0x8010e 0x20000>;
+ reg = <0x4011000 0x100 0xe010800 0x200>;
compatible = "ibm,power9-pbcq";
ibm,pec-index = <0x1>;
#address-cells = <0x1>;
@@ -4845,7 +4853,7 @@
pbcq@4011400 {
phandle = <0x161>;
- reg = <0x140104 0x10000 0x8010f 0x20000>;
+ reg = <0x4011400 0x100 0xf010800 0x200>;
compatible = "ibm,power9-pbcq";
ibm,pec-index = <0x2>;
#address-cells = <0x1>;
diff --git a/hdata/test/p8-840-spira.dts b/hdata/test/p8-840-spira.dts
index dfd2628..625935d 100644
--- a/hdata/test/p8-840-spira.dts
+++ b/hdata/test/p8-840-spira.dts
@@ -1,8 +1,8 @@
/dts-v1/;
-/memreserve/ 0x000070fd07000000 0x0000100000000000;
-/memreserve/ 0x00006afd07000000 0x0000060000000000;
-/memreserve/ 0x000051fd07000000 0x0000190000000000;
+/memreserve/ 0x00000007fd510000 0x0000000000190000;
+/memreserve/ 0x00000007fd6a0000 0x0000000000060000;
+/memreserve/ 0x00000007fd700000 0x0000000000100000;
/ {
phandle = <0x1>;
#address-cells = <0x2>;
@@ -12,7 +12,7 @@
nest-frequency = <0x0 0x77359400>;
vendor = "IBM";
ibm,io-base-loc-code = "U78C9.001.WZS0CWX-P1";
- ibm,vpd-lx-info = <0x0 0x1040031 0x43003000>;
+ ibm,vpd-lx-info = <0x0 0x31000401 0x300043>;
model = "8286-41A";
system-id = "TU00163";
system-brand = "S0";
@@ -991,7 +991,7 @@
pbcq@2012000 {
phandle = <0x4c>;
- reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+ reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x0>;
ibm,hub-id = <0x0>;
@@ -1002,7 +1002,7 @@
pbcq@2012400 {
phandle = <0x4d>;
- reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+ reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x1>;
ibm,hub-id = <0x0>;
@@ -1056,7 +1056,7 @@
pbcq@2012000 {
phandle = <0x4e>;
- reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+ reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x0>;
ibm,hub-id = <0x1>;
@@ -1067,7 +1067,7 @@
pbcq@2012400 {
phandle = <0x4f>;
- reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+ reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x1>;
ibm,hub-id = <0x1>;
diff --git a/hdata/test/p81-811.spira.dts b/hdata/test/p81-811.spira.dts
index cea6a32..ed7bd5d 100644
--- a/hdata/test/p81-811.spira.dts
+++ b/hdata/test/p81-811.spira.dts
@@ -1,8 +1,9 @@
/dts-v1/;
-/memreserve/ 0x000070fd1f000000 0x0000100000000000;
-/memreserve/ 0x00d06bfd1f000000 0x0030040000000000;
-/memreserve/ 0x006058fd1f000000 0x0070130000000000;
+/memreserve/ 0x0000001ffd586000 0x0000000000137000;
+/memreserve/ 0x0000001ffd6bd000 0x0000000000043000;
+/memreserve/ 0x0000001ffd700000 0x0000000000100000;
+
/ {
phandle = <0x1>;
#address-cells = <0x2>;
@@ -12,7 +13,7 @@
nest-frequency = <0x0 0x77359400>;
vendor = "IBM";
ibm,io-base-loc-code = "U78CB.001.WZS00AL-P1";
- ibm,vpd-lx-info = <0x0 0x1040031 0x42003000>;
+ ibm,vpd-lx-info = <0x0 0x31000401 0x300042>;
model = "8247-22L";
system-id = "1010C8A";
system-brand = "S0";
@@ -1401,7 +1402,7 @@
hw-version = <0x2>;
sw-version = <0x1>;
primary;
- ibm,psi-links = <0x0 0x10000000>;
+ ibm,psi-links = <0x0 0x10>;
};
};
@@ -2209,7 +2210,7 @@
pbcq@2012000 {
phandle = <0x95>;
- reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+ reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x0>;
ibm,hub-id = <0x0>;
@@ -2220,7 +2221,7 @@
pbcq@2012400 {
phandle = <0x96>;
- reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+ reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x1>;
ibm,hub-id = <0x0>;
@@ -2273,7 +2274,7 @@
pbcq@2012000 {
phandle = <0x97>;
- reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+ reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x0>;
ibm,hub-id = <0x1>;
@@ -2284,7 +2285,7 @@
pbcq@2012400 {
phandle = <0x98>;
- reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+ reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x1>;
ibm,hub-id = <0x1>;
@@ -2336,7 +2337,7 @@
pbcq@2012000 {
phandle = <0x99>;
- reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+ reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x0>;
ibm,hub-id = <0x2>;
@@ -2388,7 +2389,7 @@
pbcq@2012000 {
phandle = <0x9a>;
- reg = <0x200102 0x20000000 0x200109 0x5000000 0x3c0109 0x15000000>;
+ reg = <0x2012000 0x20 0x9012000 0x05 0x9013c00 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x0>;
ibm,hub-id = <0x3>;
@@ -2399,7 +2400,7 @@
pbcq@2012400 {
phandle = <0x9b>;
- reg = <0x240102 0x20000000 0x240109 0x5000000 0x403c0109 0x15000000>;
+ reg = <0x2012400 0x20 0x9012400 0x05 0x9013c40 0x15>;
compatible = "ibm,power8-pbcq";
ibm,phb-index = <0x1>;
ibm,hub-id = <0x3>;
generated by cgit v1.1 at 2024-10-20 01:47:06 +0000