diff options
| author | Frederic Barrat <fbarrat@linux.ibm.com> | 2020-01-22 16:03:35 +0100 |
|---|---|---|
| committer | Oliver O'Halloran <oohall@gmail.com> | 2020-01-29 13:51:35 +1100 |
| commit | bbb4777f682dab0f1411a493861af9e340e81229 (patch) | |
| tree | 0a12906250c7baed218a7a2467b0f8e35c3323e4 /hdata | |
| parent | 57d43efd6bbb052b467df3a19ca84feccdd0649b (diff) | |
| download | skiboot-bbb4777f682dab0f1411a493861af9e340e81229.zip skiboot-bbb4777f682dab0f1411a493861af9e340e81229.tar.gz skiboot-bbb4777f682dab0f1411a493861af9e340e81229.tar.bz2 | |
npu2, npu3: Remove ibm, phb-index property from the NPU dt node
The 'ibm,phb-index' property of the NPU node is now useless, as we can
have multiple PHBs associated to the same NPU on P9. Let's remove it
to avoid confusion.
Reviewed-by: Reza Arbab <arbab@linux.ibm.com>
Reviewed-by: Andrew Donnellan <ajd@linux.ibm.com>
Signed-off-by: Frederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Diffstat (limited to 'hdata')
| -rw-r--r-- | hdata/spira.c | 6 | ||||
| -rw-r--r-- | hdata/test/op920.wsp.dts | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/hdata/spira.c b/hdata/spira.c index 77c937b..7c5918d 100644 --- a/hdata/spira.c +++ b/hdata/spira.c @@ -1451,7 +1451,7 @@ static void add_stop_levels(void) #define NPU_INDIRECT1 0x800000000c010c3fULL static void add_npu(struct dt_node *xscom, const struct HDIF_array_hdr *links, - int npu_index, int phb_index) + int npu_index) { const struct sppcrd_smp_link *link; struct dt_node *npu; @@ -1472,7 +1472,6 @@ static void add_npu(struct dt_node *xscom, const struct HDIF_array_hdr *links, dt_add_property_cells(npu, "#address-cells", 1); dt_add_property_strings(npu, "compatible", "ibm,power9-npu"); - dt_add_property_cells(npu, "ibm,phb-index", phb_index); dt_add_property_cells(npu, "ibm,npu-index", npu_index); HDIF_iarray_for_each(links, i, link) { @@ -1622,7 +1621,6 @@ static void add_npu(struct dt_node *xscom, const struct HDIF_array_hdr *links, static void add_npus(void) { struct dt_node *xscom; - int phb_index = 7; /* Start counting from 7, for no reason */ int npu_index = 0; /* Only consult HDAT for npu2 */ @@ -1647,7 +1645,7 @@ static void add_npus(void) /* some hostboots will give us an empty array */ if (be32_to_cpu(links->ecnt)) - add_npu(xscom, links, npu_index++, phb_index++); + add_npu(xscom, links, npu_index++); } } diff --git a/hdata/test/op920.wsp.dts b/hdata/test/op920.wsp.dts index e26fa12..f9ead92 100644 --- a/hdata/test/op920.wsp.dts +++ b/hdata/test/op920.wsp.dts @@ -4065,7 +4065,6 @@ #size-cells = <0x0>; #address-cells = <0x1>; compatible = "ibm,power9-npu"; - ibm,phb-index = <0x7>; ibm,npu-index = <0x0>; ibm,npu-links = <0x6>; @@ -4695,7 +4694,6 @@ #size-cells = <0x0>; #address-cells = <0x1>; compatible = "ibm,power9-npu"; - ibm,phb-index = <0x8>; ibm,npu-index = <0x1>; ibm,npu-links = <0x6>; |