From patchwork Tue Dec 12 22:51:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Harvey X-Patchwork-Id: 847662 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gateworks-com.20150623.gappssmtp.com header.i=@gateworks-com.20150623.gappssmtp.com header.b="jpj5pDbj"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yxFT30p80z9t39 for ; Wed, 13 Dec 2017 09:52:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752777AbdLLWwU (ORCPT ); Tue, 12 Dec 2017 17:52:20 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:44892 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752709AbdLLWwT (ORCPT ); Tue, 12 Dec 2017 17:52:19 -0500 Received: by mail-pg0-f66.google.com with SMTP id j9so336816pgc.11 for ; Tue, 12 Dec 2017 14:52:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gateworks-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=uVBjGToIyeHk7aY4QdZR8uc9Hvx6fXlmK2l5LxQWFzk=; b=jpj5pDbjb81DTG6Wa3DaUEM4g5czT0cfC/30Qz9csSjsxKR9Kjcow540QwkuJttbom GoI7ubrIJIQrCnexlnkgMKe0kGSTW8BnlAsOGS4jsunpE2/qM0r1rVdMDqKRb2GKQbXk rwrYg1j1f9t21FBn3bMBOniKZttC1D5iPH9rL3B82Ux/exd3BV50eoKKUmhd46HCLEWR eWssssddlXo6SRHbtZDUjAeAL0hh7v+CDYTYDvuoxbOkeXz1oDxc+n1fbUAAI5FxSDvr lkxGjP/A7SRPVKZ4kttTFi8a6k6Rtz8zzyRJPO1oNIyFC3MEffUIxtQa5BFOgJxA14bV u77A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=uVBjGToIyeHk7aY4QdZR8uc9Hvx6fXlmK2l5LxQWFzk=; b=HLzxjhzbdihWg7p4djynSVDbWF4cBhWKKNDyrY8MUlsIwj4LxV6dmaGcE3CfvlR0sZ A0VPt80joGoElvD/ok0hfvbWThYaODZw3fTsS3khLPIO2bvRmVnMjKAjvYWU34ZNF+wt RAyzgiSsAgPz8B67DhbimBxgjwI4chxzJMvSqXV/+LFzRBtg1TnOPq1F+VcBNIqY4uY8 sb6FI0nk1yixgc20tKrGlTZCmv2OWvTb+zcwIsdhNSY5mD64S4eRc35g6tCKylEXYADp 0r+lTW3yFCOdN0neVoa1dXbBw6k6NHSsCTAGHMki9ZeJghbGGmcBNiyFLn6o3S2DcfY3 3KoQ== X-Gm-Message-State: AKGB3mK/F3o9uoSi163ZPk5FpHLYWtWekYa2xO3Aw097oN7gV5Fr++Zi MOmq1M62fF5TuGcFqF4Xci/I8A== X-Google-Smtp-Source: ACJfBovXyTjr0yT+MwlFMKLPC4W3aNOkvzD/vyTxxdYBPlMsjd7bg9ty2ftpw+ExV6p5kPT3C+Y6Aw== X-Received: by 10.99.127.25 with SMTP id a25mr3394752pgd.10.1513119139114; Tue, 12 Dec 2017 14:52:19 -0800 (PST) Received: from tharvey.pdc.gateworks.com (68-189-91-139.static.snlo.ca.charter.com. [68.189.91.139]) by smtp.gmail.com with ESMTPSA id k89sm235081pfb.104.2017.12.12.14.52.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 12 Dec 2017 14:52:17 -0800 (PST) From: Tim Harvey To: Sunil Goutham , netdev@vger.kernel.org Subject: [PATCH] net: thunderx: add support for rgmii internal delay Date: Tue, 12 Dec 2017 14:51:54 -0800 Message-Id: <1513119114-17511-1-git-send-email-tharvey@gateworks.com> X-Mailer: git-send-email 2.7.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The XCV_DLL_CTL is being configured with the assumption that phy-mode is rgmii-txid (PHY_INTERFACE_MODE_RGMII_TXID) which is not always the case. This patch parses the phy-mode property and uses it to configure CXV_DLL_CTL properly. Signed-off-by: Tim Harvey --- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 13 +++++++--- drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 2 +- drivers/net/ethernet/cavium/thunder/thunder_xcv.c | 31 ++++++++++++++++++----- 3 files changed, 35 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index 5e5c4d7..805c02a 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -55,6 +55,7 @@ struct bgx { struct pci_dev *pdev; bool is_dlm; bool is_rgx; + int phy_mode; }; static struct bgx *bgx_vnic[MAX_BGX_THUNDER]; @@ -841,12 +842,12 @@ static void bgx_poll_for_link(struct work_struct *work) queue_delayed_work(lmac->check_link, &lmac->dwork, HZ * 2); } -static int phy_interface_mode(u8 lmac_type) +static int phy_interface_mode(struct bgx *bgx, u8 lmac_type) { if (lmac_type == BGX_MODE_QSGMII) return PHY_INTERFACE_MODE_QSGMII; if (lmac_type == BGX_MODE_RGMII) - return PHY_INTERFACE_MODE_RGMII; + return bgx->phy_mode; return PHY_INTERFACE_MODE_SGMII; } @@ -912,7 +913,8 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid) if (phy_connect_direct(&lmac->netdev, lmac->phydev, bgx_lmac_handler, - phy_interface_mode(lmac->lmac_type))) + phy_interface_mode(bgx, + lmac->lmac_type))) return -ENODEV; phy_start_aneg(lmac->phydev); @@ -1287,6 +1289,8 @@ static int bgx_init_of_phy(struct bgx *bgx) bgx->lmac[lmac].lmacid = lmac; phy_np = of_parse_phandle(node, "phy-handle", 0); + if (phy_np) + bgx->phy_mode = of_get_phy_mode(phy_np); /* If there is no phy or defective firmware presents * this cortina phy, for which there is no driver * support, ignore it. @@ -1390,7 +1394,6 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) bgx->max_lmac = 1; bgx->bgx_id = MAX_BGX_PER_CN81XX - 1; bgx_vnic[bgx->bgx_id] = bgx; - xcv_init_hw(); } /* On 81xx all are DLMs and on 83xx there are 3 BGX QLMs and one @@ -1407,6 +1410,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (err) goto err_enable; + if (bgx->is_rgx) + xcv_init_hw(bgx->phy_mode); bgx_init_hw(bgx); /* Enable all LMACs */ diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h index 23acdc5..2bba9d1 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h @@ -226,7 +226,7 @@ void bgx_lmac_internal_loopback(int node, int bgx_idx, void bgx_lmac_get_pfc(int node, int bgx_idx, int lmacid, void *pause); void bgx_lmac_set_pfc(int node, int bgx_idx, int lmacid, void *pause); -void xcv_init_hw(void); +void xcv_init_hw(int phy_mode); void xcv_setup_link(bool link_up, int link_speed); u64 bgx_get_rx_stats(int node, int bgx_idx, int lmac, int idx); diff --git a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c index 578c7f8..7e0c4cb 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c @@ -65,7 +65,7 @@ MODULE_LICENSE("GPL v2"); MODULE_VERSION(DRV_VERSION); MODULE_DEVICE_TABLE(pci, xcv_id_table); -void xcv_init_hw(void) +void xcv_init_hw(int phy_mode) { u64 cfg; @@ -81,12 +81,31 @@ void xcv_init_hw(void) /* Wait for DLL to lock */ msleep(1); - /* Configure DLL - enable or bypass - * TX no bypass, RX bypass - */ + /* enable/bypass DLL providing MAC based internal TX/RX delays */ cfg = readq_relaxed(xcv->reg_base + XCV_DLL_CTL); - cfg &= ~0xFF03; - cfg |= CLKRX_BYP; + cfg &= ~0xffff00; + switch (phy_mode) { + /* RX and TX delays are added by the MAC */ + case PHY_INTERFACE_MODE_RGMII: + break; + /* internal RX and TX delays provided by the PHY */ + case PHY_INTERFACE_MODE_RGMII_ID: + cfg |= CLKRX_BYP; + cfg |= CLKTX_BYP; + break; + /* internal RX delay provided by the PHY, the MAC + * should not add an RX delay in this case + */ + case PHY_INTERFACE_MODE_RGMII_RXID: + cfg |= CLKRX_BYP; + break; + /* internal TX delay provided by the PHY, the MAC + * should not add an TX delay in this case + */ + case PHY_INTERFACE_MODE_RGMII_TXID: + cfg |= CLKRX_BYP; + break; + } writeq_relaxed(cfg, xcv->reg_base + XCV_DLL_CTL); /* Enable compensation controller and force the