From patchwork Thu Aug 1 08:54:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Barrat X-Patchwork-Id: 1140357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45zkf21hLLz9s7T for ; Thu, 1 Aug 2019 18:55:38 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45zkf153Z7zDqjM for ; Thu, 1 Aug 2019 18:55:37 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.156.1; helo=mx0a-001b2d01.pphosted.com; envelope-from=fbarrat@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 45zkdW4fQyzDqQ8 for ; Thu, 1 Aug 2019 18:55:11 +1000 (AEST) Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x718pMN2105507 for ; Thu, 1 Aug 2019 04:55:08 -0400 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0a-001b2d01.pphosted.com with ESMTP id 2u3v82syj9-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 01 Aug 2019 04:55:07 -0400 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 1 Aug 2019 09:55:05 +0100 Received: from b06avi18878370.portsmouth.uk.ibm.com (9.149.26.194) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 1 Aug 2019 09:55:02 +0100 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06avi18878370.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x718t0R928836182 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 1 Aug 2019 08:55:00 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 981A0A405C; Thu, 1 Aug 2019 08:55:00 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 61F24A4062; Thu, 1 Aug 2019 08:55:00 +0000 (GMT) Received: from bali.lab.toulouse-stg.fr.ibm.com (unknown [9.101.4.17]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 1 Aug 2019 08:55:00 +0000 (GMT) From: Frederic Barrat To: skiboot@lists.ozlabs.org, andrew.donnellan@au1.ibm.com, clombard@linux.ibm.com, arbab@linux.ibm.com, alistair@popple.id.au Date: Thu, 1 Aug 2019 10:54:59 +0200 X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19080108-0016-0000-0000-000002983CCB X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19080108-0017-0000-0000-000032F73FB6 Message-Id: <20190801085500.12505-1-fbarrat@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-01_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908010092 Subject: [Skiboot] [PATCH 1/2] npu2: Rework phb-index assignments for virtual PHBs X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Until now, opencapi PHBs were not using the 'ibm,phb-index' property, as it was thought unnecessary. For nvlink, a phb-index was associated to the npu when parsing hdat data, and the nvlink PHB was reusing the same value. It turns out it helps to have the 'ibm,phb-index' property for opencapi PHBs after all. Otherwise it can lead to wrong results on platforms like mihawk when trying to match entries in the slot table. We end up with an opencapi device inheriting wrong properties in the device tree, because match_slot_phb_entry() default to phb-index 0 if it cannot find the property. Though it doesn't seem to cause any harm, it's wrong and a future patch is expected to start using the slot table for opencapi, so it needs fixing. The twist is that with opencapi, we can have multiple virtual PHBs for a single NPU, at least on P9. Therefore there's no 1-to-1 mapping between the NPU and PHB index. It doesn't really make sense to associate a phb-index to a npu. With this patch, opencapi PHBs created under a NPU use a fixed mapping for their phb-index, based on the brick index. The range of possible values is 7 to 12. Because there can only be one nvlink PHB per NPU, it is always using a phb-index of 7. A side effect is that 2 virtual PHBs on 2 different chips can have the same phb-index, which is similar to what happens for 'real' PCI PHBs, but is different from what was happening on a nvlink-only witherspoon so far. This doesn't really affect Axone, where we have a 1-to-1 mapping between NPU and PHB for nvlink (and it will remain true with opencapi), but to be consistent, we define the phb-index when creating the PHB like on P9. Signed-off-by: Frederic Barrat Reviewed-by: Andrew Donnellan --- Reza, Alistair: see the blurb above about the phb-index of the nvlink PHBs changing from 7 and 8 on witherspoon, to 7 and 7. My understanding is that 1) it's not really used on witherspoon and 2) when it is used, the phb-index is associated to the chip ID, as it's needed for real PHBs anyway, but I thought I should highlight it. hw/npu2-common.c | 1 - hw/npu2-opencapi.c | 2 ++ hw/npu2.c | 2 +- hw/npu3-nvlink.c | 2 +- include/npu2.h | 2 +- include/npu3.h | 2 ++ 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/npu2-common.c b/hw/npu2-common.c index 6d5c35af..7326e165 100644 --- a/hw/npu2-common.c +++ b/hw/npu2-common.c @@ -530,7 +530,6 @@ static struct npu2 *setup_npu(struct dt_node *dn) npu->index = dt_prop_get_u32(dn, "ibm,npu-index"); npu->chip_id = gcid; npu->xscom_base = dt_get_address(dn, 0, NULL); - npu->phb_index = dt_prop_get_u32(dn, "ibm,phb-index"); init_lock(&npu->i2c_lock); npu->i2c_pin_mode = ~0; // input mode by default diff --git a/hw/npu2-opencapi.c b/hw/npu2-opencapi.c index 9a391bb0..106ce0ac 100644 --- a/hw/npu2-opencapi.c +++ b/hw/npu2-opencapi.c @@ -1665,6 +1665,8 @@ static void setup_device(struct npu2_dev *dev) dt_add_property_strings(dn_phb, "device_type", "pciex"); dt_add_property(dn_phb, "reg", mm_win, sizeof(mm_win)); dt_add_property_cells(dn_phb, "ibm,npu-index", dev->npu->index); + dt_add_property_cells(dn_phb, "ibm,phb-index", + NPU2_PHB_INDEX_BASE + dev->brick_index); dt_add_property_cells(dn_phb, "ibm,chip-id", dev->npu->chip_id); dt_add_property_cells(dn_phb, "ibm,xscom-base", dev->npu->xscom_base); dt_add_property_cells(dn_phb, "ibm,npcq", dev->npu->dt_node->phandle); diff --git a/hw/npu2.c b/hw/npu2.c index 29c998f6..19ca70a4 100644 --- a/hw/npu2.c +++ b/hw/npu2.c @@ -1478,7 +1478,7 @@ int npu2_nvlink_init_npu(struct npu2 *npu) "ibm,ioda2-npu2-phb"); dt_add_property_strings(np, "device_type", "pciex"); dt_add_property(np, "reg", reg, sizeof(reg)); - dt_add_property_cells(np, "ibm,phb-index", npu->phb_index); + dt_add_property_cells(np, "ibm,phb-index", NPU2_PHB_INDEX_BASE); dt_add_property_cells(np, "ibm,npu-index", npu->index); dt_add_property_cells(np, "ibm,chip-id", npu->chip_id); dt_add_property_cells(np, "ibm,xscom-base", npu->xscom_base); diff --git a/hw/npu3-nvlink.c b/hw/npu3-nvlink.c index 7e7a10e8..a4e633e6 100644 --- a/hw/npu3-nvlink.c +++ b/hw/npu3-nvlink.c @@ -1461,7 +1461,7 @@ static void npu3_dt_add_props(struct npu3 *npu) "ibm,ioda2-npu2-phb"); dt_add_property_cells(dn, "ibm,phb-index", - dt_prop_get_u32(npu->dt_node, "ibm,phb-index")); + NPU3_PHB_INDEX_BASE + npu->index); dt_add_property_cells(dn, "ibm,phb-diag-data-size", 0); dt_add_property_cells(dn, "ibm,opal-num-pes", NPU3_MAX_PE_NUM); dt_add_property_cells(dn, "ibm,opal-reserved-pe", NPU3_RESERVED_PE_NUM); diff --git a/include/npu2.h b/include/npu2.h index 92b58988..47317c8c 100644 --- a/include/npu2.h +++ b/include/npu2.h @@ -53,6 +53,7 @@ #define NPU2_OCAPI_PE(ndev) ((ndev)->brick_index + NPU2_MAX_PE_NUM) #define NPU2_LINKS_PER_CHIP 6 +#define NPU2_PHB_INDEX_BASE 7 // enough to avoid conflicts with PCI /* Link flags */ #define NPU2_DEV_PCI_LINKED 0x1 @@ -175,7 +176,6 @@ struct npu2 { /* NVLink */ struct phb phb_nvlink; - uint32_t phb_index; /* OCAPI */ uint64_t i2c_port_id_ocapi; diff --git a/include/npu3.h b/include/npu3.h index 1c657f94..417756c4 100644 --- a/include/npu3.h +++ b/include/npu3.h @@ -78,6 +78,8 @@ struct npu3_dev { struct npu3_dev_nvlink nvlink; }; +#define NPU3_PHB_INDEX_BASE 7 // enough to avoid conflicts with PCI + struct npu3_nvlink { struct phb phb; uint32_t ctx_ref[NPU3_XTS_BDF_MAP_MAX]; From patchwork Thu Aug 1 08:55:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frederic Barrat X-Patchwork-Id: 1140356 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45zkdh48Wxz9s7T for ; Thu, 1 Aug 2019 18:55:20 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45zkdh0CkxzDqjH for ; Thu, 1 Aug 2019 18:55:20 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=fbarrat@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 45zkdW3lDQzDqFS for ; Thu, 1 Aug 2019 18:55:10 +1000 (AEST) Received: from pps.filterd (m0098420.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x718pOo9146729 for ; Thu, 1 Aug 2019 04:55:07 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0b-001b2d01.pphosted.com with ESMTP id 2u3u38ctk7-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 01 Aug 2019 04:55:06 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 1 Aug 2019 09:55:04 +0100 Received: from b06avi18626390.portsmouth.uk.ibm.com (9.149.26.192) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 1 Aug 2019 09:55:02 +0100 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06avi18626390.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x718siLg38666542 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 1 Aug 2019 08:54:44 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id E6606A4067; Thu, 1 Aug 2019 08:55:00 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B0D64A406A; Thu, 1 Aug 2019 08:55:00 +0000 (GMT) Received: from bali.lab.toulouse-stg.fr.ibm.com (unknown [9.101.4.17]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 1 Aug 2019 08:55:00 +0000 (GMT) From: Frederic Barrat To: skiboot@lists.ozlabs.org, andrew.donnellan@au1.ibm.com, clombard@linux.ibm.com, arbab@linux.ibm.com, alistair@popple.id.au Date: Thu, 1 Aug 2019 10:55:00 +0200 X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190801085500.12505-1-fbarrat@linux.ibm.com> References: <20190801085500.12505-1-fbarrat@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 x-cbid: 19080108-0008-0000-0000-000003033D4F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19080108-0009-0000-0000-000022723F61 Message-Id: <20190801085500.12505-2-fbarrat@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-01_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908010092 Subject: [Skiboot] [PATCH 2/2] npu2: Remove ibm, phb-index property from the NPU dt node X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" 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. Signed-off-by: Frederic Barrat Reviewed-by: Andrew Donnellan --- doc/device-tree/opencapi.rst | 1 - hdata/spira.c | 6 ++---- hdata/test/op920.wsp.dts | 2 -- hw/npu3.c | 1 - platforms/astbmc/mihawk.c | 2 -- platforms/astbmc/zaius.c | 2 -- platforms/ibm-fsp/zz.c | 2 -- 7 files changed, 2 insertions(+), 14 deletions(-) diff --git a/doc/device-tree/opencapi.rst b/doc/device-tree/opencapi.rst index 80ff9963..497654ac 100644 --- a/doc/device-tree/opencapi.rst +++ b/doc/device-tree/opencapi.rst @@ -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. */ diff --git a/hdata/spira.c b/hdata/spira.c index f6003ea0..01c881ee 100644 --- a/hdata/spira.c +++ b/hdata/spira.c @@ -1333,7 +1333,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; @@ -1354,7 +1354,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) { @@ -1504,7 +1503,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 */ @@ -1529,7 +1527,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 b9aa0f20..f5fd684a 100644 --- a/hdata/test/op920.wsp.dts +++ b/hdata/test/op920.wsp.dts @@ -4055,7 +4055,6 @@ #size-cells = <0x0>; #address-cells = <0x1>; compatible = "ibm,power9-npu"; - ibm,phb-index = <0x7>; ibm,npu-index = <0x0>; ibm,npu-links = <0x6>; @@ -4685,7 +4684,6 @@ #size-cells = <0x0>; #address-cells = <0x1>; compatible = "ibm,power9-npu"; - ibm,phb-index = <0x8>; ibm,npu-index = <0x1>; ibm,npu-links = <0x6>; diff --git a/hw/npu3.c b/hw/npu3.c index e49e9bef..f2dff16d 100644 --- a/hw/npu3.c +++ b/hw/npu3.c @@ -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); diff --git a/platforms/astbmc/mihawk.c b/platforms/astbmc/mihawk.c index feae205f..3e7310d4 100644 --- a/platforms/astbmc/mihawk.c +++ b/platforms/astbmc/mihawk.c @@ -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 */ @@ -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); diff --git a/platforms/astbmc/zaius.c b/platforms/astbmc/zaius.c index ab355888..36dee632 100644 --- a/platforms/astbmc/zaius.c +++ b/platforms/astbmc/zaius.c @@ -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 */ @@ -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); diff --git a/platforms/ibm-fsp/zz.c b/platforms/ibm-fsp/zz.c index 2bde315c..92f4fcb2 100644 --- a/platforms/ibm-fsp/zz.c +++ b/platforms/ibm-fsp/zz.c @@ -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 @@ -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);