From patchwork Wed Jan 2 09:17:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 1019930 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="XDZ4Vuv1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43V59b4rrxz9rxp for ; Wed, 2 Jan 2019 20:20:03 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729175AbfABJUC (ORCPT ); Wed, 2 Jan 2019 04:20:02 -0500 Received: from mail.kernel.org ([198.145.29.99]:46918 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729162AbfABJUC (ORCPT ); Wed, 2 Jan 2019 04:20:02 -0500 Received: from localhost.localdomain (unknown [171.76.109.220]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 348F0218CD; Wed, 2 Jan 2019 09:19:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1546420801; bh=ISzi6VIvKOeIXa1T9gbMLQkOrZXT1YJKRukIO9DEgMo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XDZ4Vuv1AxAdbEh8P/LJx0t19sobn6ceSkU1kd5TFUs95ZQNSAyveF403h2IQB4OT cTyFZRIeTGg8wxDNNoQ6wGiPXuiYGQrLJbbuE7uaWuBRdULNza4Symani6QKayGqFs jgy9PEJUw2b4SdtP5Hi3p2tshpLRhJeXEhHdzX18= From: Vinod Koul To: "David S . Miller" Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Niklas Cassel , Bjorn Andersson , Vinod Koul , Andrew Lunn , Florian Fainelli , Vivien Didelot Subject: [PATCH 7/7] net: dsa: qca8k: handle disable tx/rx delay Date: Wed, 2 Jan 2019 14:47:29 +0530 Message-Id: <20190102091729.18582-8-vkoul@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190102091729.18582-1-vkoul@kernel.org> References: <20190102091729.18582-1-vkoul@kernel.org> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org We should disable tx/rx delay in rgmii mode, but driver doesn't do so. Hence add a device tree property to avoid breaking current users and disable only when this property is set Signed-off-by: Vinod Koul --- drivers/net/dsa/qca8k.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index 7e97e620bd44..6dfb390ebe66 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -420,7 +420,9 @@ qca8k_mib_init(struct qca8k_priv *priv) static int qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode) { - u32 reg; + u32 reg, val; + struct dsa_switch *ds = priv->ds; + bool rx_delay_disable, tx_delay_disable; switch (port) { case 0: @@ -439,17 +441,24 @@ qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode) */ switch (mode) { case PHY_INTERFACE_MODE_RGMII: - qca8k_write(priv, reg, - QCA8K_PORT_PAD_RGMII_EN | - QCA8K_PORT_PAD_RGMII_TX_DELAY(3) | - QCA8K_PORT_PAD_RGMII_RX_DELAY(3)); - - /* According to the datasheet, RGMII delay is enabled through + rx_delay_disable = of_property_read_bool(ds->dst->cpu_dp->dn, + "rx-delay-disable"); + tx_delay_disable = of_property_read_bool(ds->dst->cpu_dp->dn, + "tx-delay-disable"); + val = QCA8K_PORT_PAD_RGMII_EN; + if (!rx_delay_disable) + val |= QCA8K_PORT_PAD_RGMII_RX_DELAY(3); + if (!tx_delay_disable) + val |= QCA8K_PORT_PAD_RGMII_TX_DELAY(3); + qca8k_write(priv, reg, val); + + /* According to the datasheet, RGMII rx delay is enabled through * PORT5_PAD_CTRL for all ports, rather than individual port * registers */ - qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL, - QCA8K_PORT_PAD_RGMII_RX_DELAY_EN); + if (!rx_delay_disable) + qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL, + QCA8K_PORT_PAD_RGMII_RX_DELAY_EN); break; case PHY_INTERFACE_MODE_SGMII: qca8k_write(priv, reg, QCA8K_PORT_PAD_SGMII_EN);