Skip to content

Commit

Permalink
npu2, npu3: Remove ibm, phb-index property from the NPU dt node
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
@fbarrat @oohal
fbarrat authored and oohal committed Jan 29, 2020
1 parent 57d43ef commit bbb4777
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 14 deletions.
1 change: 0 additions & 1 deletion doc/device-tree/opencapi.rst
View file
Expand Up @@ -19,7 +19,6 @@ NVLink links are currently unsupported.
npu@5011000 {
compatible = "ibm,power9-npu";
phandle = <0xe6>;
ibm,phb-index = <0x7>;
reg = <0x5011000 0x2c>;
ibm,npu-index = <0x0>;
ibm,npu-links = <0x2>; /* Number of links wired up to this npu. */
Expand Down
6 changes: 2 additions & 4 deletions hdata/spira.c
View file
Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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 */
Expand All @@ -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++);
}
}

Expand Down
2 changes: 0 additions & 2 deletions hdata/test/op920.wsp.dts
View file
Expand Up @@ -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>;

Expand Down Expand Up @@ -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>;

Expand Down
1 change: 0 additions & 1 deletion hw/npu3.c
View file
Expand Up @@ -101,7 +101,6 @@ static void npu3_dt_create_npu(struct dt_node *xscom, uint32_t npu_index)
dt_add_property_cells(npu, "reg", npu_base[npu_index], 0x2c);
dt_add_property_string(npu, "compatible", "ibm,power9-npu3");
dt_add_property_cells(npu, "ibm,npu-index", npu_index);
dt_add_property_cells(npu, "ibm,phb-index", 7 + npu_index);

for (uint32_t i = 0; i < NPU3_LINKS_PER_NPU; i++)
npu3_dt_create_link(npu, npu_index, i);
Expand Down
2 changes: 0 additions & 2 deletions platforms/astbmc/mihawk.c
View file
Expand Up @@ -184,7 +184,6 @@ static void mihawk_create_npu(void)
{
struct dt_node *xscom, *npu;
int npu_index = 0;
int phb_index = 7;
char namebuf[32];

/* Return if there's already an NPU in the device tree */
Expand All @@ -198,7 +197,6 @@ static void mihawk_create_npu(void)
dt_add_property_cells(npu, "reg", NPU_BASE, NPU_SIZE);
dt_add_property_strings(npu, "compatible", "ibm,power9-npu");
dt_add_property_cells(npu, "ibm,npu-index", npu_index++);
dt_add_property_cells(npu, "ibm,phb-index", phb_index++);
dt_add_property_cells(npu, "ibm,npu-links", 2);
create_link(npu, 1, 2);
create_link(npu, 2, 3);
Expand Down
2 changes: 0 additions & 2 deletions platforms/astbmc/zaius.c
View file
Expand Up @@ -157,7 +157,6 @@ static void zaius_create_npu(void)
{
struct dt_node *xscom, *npu;
int npu_index = 0;
int phb_index = 7;
char namebuf[32];

/* Abort if there's already an NPU in the device tree */
Expand All @@ -171,7 +170,6 @@ static void zaius_create_npu(void)
dt_add_property_cells(npu, "reg", NPU_BASE, NPU_SIZE);
dt_add_property_strings(npu, "compatible", "ibm,power9-npu");
dt_add_property_cells(npu, "ibm,npu-index", npu_index++);
dt_add_property_cells(npu, "ibm,phb-index", phb_index++);
dt_add_property_cells(npu, "ibm,npu-links", 2);
create_link(npu, 1, 2);
create_link(npu, 2, 3);
Expand Down
2 changes: 0 additions & 2 deletions platforms/ibm-fsp/zz.c
View file
Expand Up @@ -65,7 +65,6 @@ static void add_opencapi_dt_nodes(void)
{
struct dt_node *npu, *xscom;
int npu_index = 0;
int phb_index = 7;

/*
* In an ideal world, we should get all the NPU links
Expand Down Expand Up @@ -115,7 +114,6 @@ static void add_opencapi_dt_nodes(void)
dt_add_property_cells(npu, "reg", NPU_BASE, NPU_SIZE);
dt_add_property_strings(npu, "compatible", "ibm,power9-npu");
dt_add_property_cells(npu, "ibm,npu-index", npu_index++);
dt_add_property_cells(npu, "ibm,phb-index", phb_index++);
dt_add_property_cells(npu, "ibm,npu-links", 2);

create_link(npu, 1, 2);
Expand Down

0 comments on commit bbb4777

Please sign in to comment.