From patchwork Wed Aug 30 22:38:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reza Arbab X-Patchwork-Id: 807953 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xjL5y0gWTz9s83 for ; Thu, 31 Aug 2017 08:39:18 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xjL5x6x6XzDqZq for ; Thu, 31 Aug 2017 08:39:17 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org 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 3xjL581ZTBzDqNY for ; Thu, 31 Aug 2017 08:38:35 +1000 (AEST) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v7UMaDkT142869 for ; Wed, 30 Aug 2017 18:38:33 -0400 Received: from e18.ny.us.ibm.com (e18.ny.us.ibm.com [129.33.205.208]) by mx0b-001b2d01.pphosted.com with ESMTP id 2cp2emvc7y-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 30 Aug 2017 18:38:33 -0400 Received: from localhost by e18.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 30 Aug 2017 18:38:32 -0400 Received: from b01cxnp22035.gho.pok.ibm.com (9.57.198.25) by e18.ny.us.ibm.com (146.89.104.205) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 30 Aug 2017 18:38:29 -0400 Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v7UMcT1031981820; Wed, 30 Aug 2017 22:38:29 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C0EA012403F; Wed, 30 Aug 2017 18:35:48 -0400 (EDT) Received: from arbab-laptop.localdomain (unknown [9.53.92.213]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP id A63AD124035; Wed, 30 Aug 2017 18:35:48 -0400 (EDT) Received: by arbab-laptop.localdomain (Postfix, from userid 152845) id CBD39460483; Wed, 30 Aug 2017 17:38:27 -0500 (CDT) From: Reza Arbab To: skiboot@lists.ozlabs.org Date: Wed, 30 Aug 2017 17:38:25 -0500 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1504132707-10406-1-git-send-email-arbab@linux.vnet.ibm.com> References: <1504132707-10406-1-git-send-email-arbab@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17083022-0044-0000-0000-000003857BB0 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007638; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000226; SDB=6.00909922; UDB=6.00456405; IPR=6.00690207; BA=6.00005562; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016933; XFM=3.00000015; UTC=2017-08-30 22:38:31 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17083022-0045-0000-0000-000007B3949E Message-Id: <1504132707-10406-2-git-send-email-arbab@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-08-30_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1708300344 Subject: [Skiboot] [PATCH 1/3] npu2: hw-procedures: Add comments denoting procedure number X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Popple MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" There are comments in this file to indicate where each numbered procedure from the programming guide is implemented, for easy searching. Add a couple which were missing. Signed-off-by: Reza Arbab Acked-By: Alistair Popple --- hw/npu2-hw-procedures.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hw/npu2-hw-procedures.c b/hw/npu2-hw-procedures.c index c9e7673..ac5c919 100644 --- a/hw/npu2-hw-procedures.c +++ b/hw/npu2-hw-procedures.c @@ -312,6 +312,7 @@ static uint32_t phy_reset_complete(struct npu2_dev *ndev) } DEFINE_PROCEDURE(phy_reset, phy_reset_wait, phy_reset_complete); +/* Procedure 1.2.6 - I/O PHY Tx Impedance Calibration */ static uint32_t phy_tx_zcal(struct npu2_dev *ndev) { if (ndev->npu->tx_zcal_complete[ndev->index > 2]) @@ -502,6 +503,7 @@ static uint32_t phy_enable_tx_rxcal(struct npu2_dev *ndev) } DEFINE_PROCEDURE(phy_enable_tx_rxcal); +/* Procedure 1.2.9 - Disable Downstream Link Training */ static uint32_t phy_disable_tx_rxcal(struct npu2_dev *ndev) { int lane; From patchwork Wed Aug 30 22:38:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reza Arbab X-Patchwork-Id: 807952 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xjL5l6yQjz9s83 for ; Thu, 31 Aug 2017 08:39:07 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xjL5l62T3zDqZC for ; Thu, 31 Aug 2017 08:39:07 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org 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 3xjL5755cPzDqNc for ; Thu, 31 Aug 2017 08:38:35 +1000 (AEST) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v7UMaK3D113554 for ; Wed, 30 Aug 2017 18:38:33 -0400 Received: from e11.ny.us.ibm.com (e11.ny.us.ibm.com [129.33.205.201]) by mx0a-001b2d01.pphosted.com with ESMTP id 2cnxcrcdf1-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 30 Aug 2017 18:38:31 -0400 Received: from localhost by e11.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 30 Aug 2017 18:38:31 -0400 Received: from b01cxnp22034.gho.pok.ibm.com (9.57.198.24) by e11.ny.us.ibm.com (146.89.104.198) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 30 Aug 2017 18:38:29 -0400 Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v7UMcTti23527576; Wed, 30 Aug 2017 22:38:29 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C29AD124044; Wed, 30 Aug 2017 18:35:48 -0400 (EDT) Received: from arbab-laptop.localdomain (unknown [9.53.92.213]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP id A8596124037; Wed, 30 Aug 2017 18:35:48 -0400 (EDT) Received: by arbab-laptop.localdomain (Postfix, from userid 152845) id D310C46061B; Wed, 30 Aug 2017 17:38:27 -0500 (CDT) From: Reza Arbab To: skiboot@lists.ozlabs.org Date: Wed, 30 Aug 2017 17:38:26 -0500 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1504132707-10406-1-git-send-email-arbab@linux.vnet.ibm.com> References: <1504132707-10406-1-git-send-email-arbab@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17083022-2213-0000-0000-00000211E011 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007638; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000226; SDB=6.00909922; UDB=6.00456405; IPR=6.00690206; BA=6.00005562; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016933; XFM=3.00000015; UTC=2017-08-30 22:38:30 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17083022-2214-0000-0000-000057633411 Message-Id: <1504132707-10406-3-git-send-email-arbab@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-08-30_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1708300344 Subject: [Skiboot] [PATCH 2/3] npu2: hw-procedures: Change rx_pr_phase_step value X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Popple MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Change this value, per the updated programming guide. Signed-off-by: Reza Arbab Acked-By: Alistair Popple --- hw/npu2-hw-procedures.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/npu2-hw-procedures.c b/hw/npu2-hw-procedures.c index ac5c919..5ccc1a0 100644 --- a/hw/npu2-hw-procedures.c +++ b/hw/npu2-hw-procedures.c @@ -304,7 +304,7 @@ static uint32_t phy_reset_complete(struct npu2_dev *ndev) phy_write_lane(ndev, &NPU2_PHY_RX_LANE_ANA_PDWN, lane, 0); phy_write_lane(ndev, &NPU2_PHY_RX_LANE_DIG_PDWN, lane, 0); phy_write_lane(ndev, &NPU2_PHY_RX_PR_IQ_RES_SEL, lane, 0x7); - phy_write_lane(ndev, &NPU2_PHY_RX_PR_PHASE_STEP, lane, 0x8); + phy_write_lane(ndev, &NPU2_PHY_RX_PR_PHASE_STEP, lane, 0xc); phy_write_lane(ndev, &NPU2_PHY_TX_LANE_PDWN, lane, 0); } From patchwork Wed Aug 30 22:38:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reza Arbab X-Patchwork-Id: 807950 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.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xjL5D1J3Mz9s83 for ; Thu, 31 Aug 2017 08:38:40 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3xjL5D0G6yzDqR9 for ; Thu, 31 Aug 2017 08:38:40 +1000 (AEST) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org 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 3xjL563My4zDqNY for ; Thu, 31 Aug 2017 08:38:34 +1000 (AEST) Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id v7UMbTK8007195 for ; Wed, 30 Aug 2017 18:38:31 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 2cnyf57bsg-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 30 Aug 2017 18:38:31 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 30 Aug 2017 16:38:31 -0600 Received: from b03cxnp08025.gho.boulder.ibm.com (9.17.130.17) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 30 Aug 2017 16:38:29 -0600 Received: from b03ledav002.gho.boulder.ibm.com (b03ledav002.gho.boulder.ibm.com [9.17.130.233]) by b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v7UMcTTI65929386; Wed, 30 Aug 2017 15:38:29 -0700 Received: from b03ledav002.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EA8C1136040; Wed, 30 Aug 2017 16:38:28 -0600 (MDT) Received: from arbab-laptop.localdomain (unknown [9.53.92.213]) by b03ledav002.gho.boulder.ibm.com (Postfix) with ESMTP id CBFD813603C; Wed, 30 Aug 2017 16:38:28 -0600 (MDT) Received: by arbab-laptop.localdomain (Postfix, from userid 152845) id DB32746074D; Wed, 30 Aug 2017 17:38:27 -0500 (CDT) From: Reza Arbab To: skiboot@lists.ozlabs.org Date: Wed, 30 Aug 2017 17:38:27 -0500 X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1504132707-10406-1-git-send-email-arbab@linux.vnet.ibm.com> References: <1504132707-10406-1-git-send-email-arbab@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17083022-0020-0000-0000-00000CA3AE6C X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007638; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000226; SDB=6.00909922; UDB=6.00456405; IPR=6.00690206; BA=6.00005562; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016933; XFM=3.00000015; UTC=2017-08-30 22:38:31 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17083022-0021-0000-0000-00005DEF896F Message-Id: <1504132707-10406-4-git-send-email-arbab@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-08-30_09:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000 definitions=main-1708300344 Subject: [Skiboot] [PATCH 3/3] npu2: hw-procedures: Update PHY DC calibration procedure X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alistair Popple MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Per the updated programming guide (procedure 1.2.4), set rx_pr_edge_track_cntl and rx_pr_fw_off appropriately before and after calibration. Signed-off-by: Reza Arbab Reviewed-by: Andrew Donnellan --- hw/npu2-hw-procedures.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/npu2-hw-procedures.c b/hw/npu2-hw-procedures.c index 5ccc1a0..a140aed 100644 --- a/hw/npu2-hw-procedures.c +++ b/hw/npu2-hw-procedures.c @@ -59,6 +59,8 @@ struct npu2_phy_reg NPU2_PHY_TX_UNLOAD_CLK_DISABLE = {0x103, 56, 1}; struct npu2_phy_reg NPU2_PHY_TX_FIFO_INIT = {0x105, 53, 1}; struct npu2_phy_reg NPU2_PHY_TX_RXCAL = {0x103, 57, 1}; struct npu2_phy_reg NPU2_PHY_RX_INIT_DONE = {0x0ca, 48, 1}; +struct npu2_phy_reg NPU2_PHY_RX_PR_EDGE_TRACK_CNTL = {0x092, 48, 2}; +struct npu2_phy_reg NPU2_PHY_RX_PR_FW_OFF = {0x08a, 56, 1}; /* These registers are per-PHY, not per lane */ struct npu2_phy_reg NPU2_PHY_TX_ZCAL_SWO_EN = {0x3c9, 48, 1}; @@ -521,6 +523,9 @@ static uint32_t phy_rx_dccal(struct npu2_dev *ndev) int lane; FOR_EACH_LANE(ndev, lane) + phy_write_lane(ndev, &NPU2_PHY_RX_PR_FW_OFF, lane, 1); + + FOR_EACH_LANE(ndev, lane) phy_write_lane(ndev, &NPU2_PHY_RX_RUN_DCCAL, lane, 1); return PROCEDURE_NEXT; @@ -537,8 +542,11 @@ static uint32_t phy_rx_dccal_complete(struct npu2_dev *ndev) FOR_EACH_LANE(ndev, lane) phy_write_lane(ndev, &NPU2_PHY_RX_RUN_DCCAL, lane, 0); - FOR_EACH_LANE(ndev, lane) + FOR_EACH_LANE(ndev, lane) { phy_write_lane(ndev, &NPU2_PHY_RX_B_BANK_CONTROLS, lane, 0); + phy_write_lane(ndev, &NPU2_PHY_RX_PR_EDGE_TRACK_CNTL, lane, 0); + phy_write_lane(ndev, &NPU2_PHY_RX_PR_FW_OFF, lane, 0); + } return PROCEDURE_NEXT; }