Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8076669ybl; Thu, 16 Jan 2020 10:12:56 -0800 (PST) X-Google-Smtp-Source: APXvYqw/oOF6AxrQAQuAhrEHbA4abfD5FHDwzWXwB0p3A6J6VuexPqgC7JZQAAPu+r/LsyfPKlQx X-Received: by 2002:aca:b60a:: with SMTP id g10mr283522oif.102.1579198376148; Thu, 16 Jan 2020 10:12:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579198376; cv=none; d=google.com; s=arc-20160816; b=Uq+nLnkIDolu3ErPpIKevpo1iPO+5dEW9Sp2Zbz5VZkHtmJf45v4FqKlTx0SIugKv7 Al2ts99xrVgl8ViGywUPGCiL/Kh+GhK04t2ClDkdy+c8dh8y7wprXU2mXYFStQNGpyF1 MEeTH8zzvH7Jdri1Ow8ZKNxsVw9n+APPxHcQ3nb/k1nIxYkXP/EOXGg/CYk+K2rJT/P5 EYlw3WTOA0FAmSUC5ytZzqAgiF2KZxLflRv5WehWF6nxMVsIquQ6utyaYtl10P5MS/gT Ojh7krkD7U6+zLCgnP6Jh3cqL6trRJLYnSOgLo37UB1RJqR4qwrDZxnLooE99CrciH0I M5rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7US1I9aL6U9L9aScSNCEVFtW9F0qHHK3U6pDpMz8wbA=; b=qr9BHewxfeR8h9U9rPkDMkoOlqereVZK9MuVKPfXyxH32UnFE3dOcg8gr4nvhjqdBY 6zjCsjESddEr86/WHF/JL9w4SrLyOItWTPMdb5TqQ2YCQJQos8bdR0VKfV11Bf1+uV+u tG/kfLNRKIktGH0g9n5HBFs/8fVIUm9YnofSbu/JIWjO+7sFs94rW2qCTsMtDt0yREV4 UYmRCmtLGW89VHkK4D80camfhZo+iVwLzpMfgOs2OwmFMK4HEjqQNutkyI3RlgFalKJb 9pyPA9phVxYcCuOiWY56gDPGflWy8rvKVbr1appl+yPjQmK6eA0eACpkNM8AXiSt5PZg /eww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Jk268xBC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y140si12228446oia.49.2020.01.16.10.12.43; Thu, 16 Jan 2020 10:12:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Jk268xBC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2395147AbgAPSLZ (ORCPT + 99 others); Thu, 16 Jan 2020 13:11:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:52906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405390AbgAPRhc (ORCPT ); Thu, 16 Jan 2020 12:37:32 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1AEFA246CE; Thu, 16 Jan 2020 17:37:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196252; bh=UiFLDXQzkZC+4y3mCWG74laBULrP/ebxQwss1ZNv54s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jk268xBCL34Gg0b36UHsUOHNomzQ4OYsnRK98/wrcd+kAPBYdsMsu8KSazqqidNOn 4JbyQN3TrmR73uQpAIM0alYtY7VjJHdF0c8RdRNCl4o4VEV/+/IdsS+iJoGf9rBswG 00yl38YSR6D/Fx00F9cYaxW7saH6kdlNAmt3/62I= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vinod Koul , =?UTF-8?q?Michal=20Vok=C3=A1=C4=8D?= , Andrew Lunn , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 079/251] net: dsa: qca8k: Enable delay for RGMII_ID mode Date: Thu, 16 Jan 2020 12:33:48 -0500 Message-Id: <20200116173641.22137-39-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vinod Koul [ Upstream commit a968b5e9d5879f9535d6099505f9e14abcafb623 ] RGMII_ID specifies that we should have internal delay, so resurrect the delay addition routine but under the RGMII_ID mode. Fixes: 40269aa9f40a ("net: dsa: qca8k: disable delay for RGMII mode") Tested-by: Michal Vokáč Signed-off-by: Vinod Koul Reviewed-by: Andrew Lunn Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/dsa/qca8k.c | 12 ++++++++++++ drivers/net/dsa/qca8k.h | 1 + 2 files changed, 13 insertions(+) diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca8k.c index ebfbaf8597f4..3bbe85aae49b 100644 --- a/drivers/net/dsa/qca8k.c +++ b/drivers/net/dsa/qca8k.c @@ -460,6 +460,18 @@ qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode) qca8k_write(priv, QCA8K_REG_PORT5_PAD_CTRL, QCA8K_PORT_PAD_RGMII_RX_DELAY_EN); break; + case PHY_INTERFACE_MODE_RGMII_ID: + /* RGMII_ID needs internal delay. This is enabled through + * PORT5_PAD_CTRL for all ports, rather than individual port + * registers + */ + qca8k_write(priv, reg, + QCA8K_PORT_PAD_RGMII_EN | + QCA8K_PORT_PAD_RGMII_TX_DELAY(QCA8K_MAX_DELAY) | + QCA8K_PORT_PAD_RGMII_RX_DELAY(QCA8K_MAX_DELAY)); + 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); break; diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca8k.h index 9c22bc3210cd..db95168ca111 100644 --- a/drivers/net/dsa/qca8k.h +++ b/drivers/net/dsa/qca8k.h @@ -40,6 +40,7 @@ ((0x8 + (x & 0x3)) << 22) #define QCA8K_PORT_PAD_RGMII_RX_DELAY(x) \ ((0x10 + (x & 0x3)) << 20) +#define QCA8K_MAX_DELAY 3 #define QCA8K_PORT_PAD_RGMII_RX_DELAY_EN BIT(24) #define QCA8K_PORT_PAD_SGMII_EN BIT(7) #define QCA8K_REG_MODULE_EN 0x030 -- 2.20.1