From patchwork Mon Jun 24 13:26:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serge Semin X-Patchwork-Id: 13709507 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 459721411D3; Mon, 24 Jun 2024 13:28:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719235724; cv=none; b=fRFIFuBjfI30f0fz69XCqYjwNjfk69jQH6De42aXCAgzf+F0WPMlSgKuDFY4QflGi2ypJePoTXtF47UnM5Ue/OD+veaL8Wr0FZ0OJO56rHHdzd2H+4sNfdXODrfZU9plnoEHN5JDWdHdcp9YgXrgQrOrINReJkK64vB+X5Qe05E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719235724; c=relaxed/simple; bh=6POb5W1RI+/9TNlT1foE0fWiDxIDRIQiUlN44x1xRXw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c/Qlu16qZ+120vSYMuSFh3WM03EVy67ovIz2K5jInWn1p9AimhcoJT6yRUsCGQegUNOKERV9Y2bWtAx5LNl74vFo86cE4riH8MK+sUgzNDJJuXgNsA75bKN4ivZpYrHTqptGNumcx1odTs5gSuEWHI6CtY5cT974ot3FQ1Lfj/g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=N4JyiDVk; arc=none smtp.client-ip=209.85.167.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N4JyiDVk" Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-52ce0140416so1847068e87.0; Mon, 24 Jun 2024 06:28:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1719235720; x=1719840520; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YtZp0AbrnXQs3O13v2d6+EuVN6MSe7p8ad/hbNOPJWI=; b=N4JyiDVkjXYrbR2nSbwdVqIUqzWhHUa1PKJWAL6FhAXWZSv5sJmpH5hADUmc/QEzeA m9JKhWRKKI09u3SInEsTTtKgMclEvyuqD1SZkcQWB+NBc2S0xLuh6p8VQameDnvHLJJd OZhKm/3KcbZWeBwYrwbSohPLCIPH3Ujqc44vFz6r0CTpB2hWwhM3paunxURy/eVWxBES nLGy8kvxtOtmv+dfdfk9OzUjzp5774Yil+vr0zjJ4HrPZnPCHz4LVRMZmyNpxXSx2xkB ENaG6txh88Z9hUxp3T9uqByrL+w1L1H2vDqrfMWtm5iYYPJstmOQyXIF7p2qXhx4tqd5 paqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719235720; x=1719840520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YtZp0AbrnXQs3O13v2d6+EuVN6MSe7p8ad/hbNOPJWI=; b=ehlF2r8AkfOLexl1I5RBKdYwXZvL54pdyu1dGQxh1Y5AFvpIiif8U0J+IgfLr0WZVW 37M7UcQwA8Wog7t3FDTqL5p9LY26Q4Pw5h0UWBtTlrnyhXUEuUZcblgQcR4UX5X6DdwU zCKTy45sOq3jGZMe0Nl5x1KJPz5iQo7zdiB2zh8mv/EL3BppoVgw4Ws8BWiFQERXKgn/ agi4JvFKrLWE+wwhHrcj6itQ3HVvYpQ/C/KJlmFoNtlj1zLaJBFcu1y+cauqowQK1Ebb yChbUGJetjtbHvvOhIgqXqyfL5FMzsl5OgHNjPofFfNfF18eKD8mrs2Qb8kbUYsaRg1m gINQ== X-Forwarded-Encrypted: i=1; AJvYcCVUMqv6msihSTjUtTR8h3I1IdG3d0bTJtTpAuYaJujWQiI5eUKrmkQLDgZi+p6bxh6574QWIc+zVKu55wcjCQuya+kpgUYJtHYiPt8BjNaD1esGjkiul0XkYmTWo+f3hlfw3QjFDO9/jjUAMx5Z/1sNZ2psOPK2J42aUCItGTYjcJNIU8IMG4PWyCPpsGBQYhFnDyW/htkyqQ== X-Gm-Message-State: AOJu0YyuvnqO3Ew+pkuiPdZmsHseY4vNTngMZOu/Ttm7NNy91GGWPYFE UgtXtcEPS0Zt2EEPZv+xQUckbKyrIEnG5H4g1MT+WI2EXl5QXNEt X-Google-Smtp-Source: AGHT+IGnD5pCpdtBAgEV0LPviNccHChm0nS52nkrjh8YxukL2E9OFJq+KfJaFse+52g2ituyaoatpQ== X-Received: by 2002:a19:4310:0:b0:52c:b479:902d with SMTP id 2adb3069b0e04-52ce06105efmr3684613e87.4.1719235720181; Mon, 24 Jun 2024 06:28:40 -0700 (PDT) Received: from localhost ([213.79.110.82]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-52cd643342dsm982999e87.231.2024.06.24.06.28.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jun 2024 06:28:39 -0700 (PDT) From: Serge Semin To: Russell King , Andrew Halaney , Vinod Koul , Alexandre Torgue , Jose Abreu , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin Cc: Alexei Starovoitov , Jesper Dangaard Brouer , John Fastabend , Daniel Borkmann , linux-arm-kernel@lists.infradead.org, linux-stm32@st-md-mailman.stormreply.com, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH RFC net-next v2 13/17] net: stmmac: Move internal PCS ANE-control method to dwmac-qcom-ethqos.c Date: Mon, 24 Jun 2024 16:26:30 +0300 Message-ID: <20240624132802.14238-5-fancer.lancer@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The dwmac_ctrl_ane() method is not going to be utilized in the internal PCS implementation. Simplify the DW *MAC HW-abstraction interface by moving the method definition to the only user of it - dwmac-qcom-ethqos.c. Signed-off-by: Serge Semin --- .../stmicro/stmmac/dwmac-qcom-ethqos.c | 31 ++++++++++++++--- .../ethernet/stmicro/stmmac/dwmac1000_core.c | 7 ---- .../net/ethernet/stmicro/stmmac/dwmac4_core.c | 9 ----- drivers/net/ethernet/stmicro/stmmac/hwif.h | 4 --- .../net/ethernet/stmicro/stmmac/stmmac_pcs.h | 33 ------------------- 5 files changed, 27 insertions(+), 57 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index d0bcebe87ee8..fcd13a9afd59 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c @@ -615,6 +615,29 @@ static void ethqos_set_serdes_speed(struct qcom_ethqos *ethqos, int speed) } } +static inline void ethqos_ctrl_ane(void __iomem *pcsaddr, bool ane, + bool srgmi_ral, bool loopback) +{ + u32 value = readl(pcsaddr + PCS_AN_CTRL); + + /* Enable and restart the Auto-Negotiation */ + if (ane) + value |= PCS_AN_CTRL_ANE | PCS_AN_CTRL_RAN; + else + value &= ~PCS_AN_CTRL_ANE; + + /* In case of MAC-2-MAC connection, block is configured to operate + * according to MAC conf register. + */ + if (srgmi_ral) + value |= PCS_AN_CTRL_SGMRAL; + + if (loopback) + value |= PCS_AN_CTRL_ELE; + + writel(value, pcsaddr + PCS_AN_CTRL); +} + /* On interface toggle MAC registers gets reset. * Configure MAC block for SGMII on ethernet phy link up */ @@ -633,7 +656,7 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos) RGMII_CONFIG2_RGMII_CLK_SEL_CFG, RGMII_IO_MACRO_CONFIG2); ethqos_set_serdes_speed(ethqos, SPEED_2500); - stmmac_pcs_ctrl_ane(priv, priv->pcsaddr, 0, 0, 0); + ethqos_ctrl_ane(priv->pcsaddr, 0, 0, 0); break; case SPEED_1000: val &= ~ETHQOS_MAC_CTRL_PORT_SEL; @@ -641,12 +664,12 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos) RGMII_CONFIG2_RGMII_CLK_SEL_CFG, RGMII_IO_MACRO_CONFIG2); ethqos_set_serdes_speed(ethqos, SPEED_1000); - stmmac_pcs_ctrl_ane(priv, priv->pcsaddr, 1, 0, 0); + ethqos_ctrl_ane(priv->pcsaddr, 1, 0, 0); break; case SPEED_100: val |= ETHQOS_MAC_CTRL_PORT_SEL | ETHQOS_MAC_CTRL_SPEED_MODE; ethqos_set_serdes_speed(ethqos, SPEED_1000); - stmmac_pcs_ctrl_ane(priv, priv->pcsaddr, 1, 0, 0); + ethqos_ctrl_ane(priv->pcsaddr, 1, 0, 0); break; case SPEED_10: val |= ETHQOS_MAC_CTRL_PORT_SEL; @@ -656,7 +679,7 @@ static int ethqos_configure_sgmii(struct qcom_ethqos *ethqos) SGMII_10M_RX_CLK_DVDR), RGMII_IO_MACRO_CONFIG); ethqos_set_serdes_speed(ethqos, SPEED_1000); - stmmac_pcs_ctrl_ane(priv, priv->pcsaddr, 1, 0, 0); + ethqos_ctrl_ane(priv->pcsaddr, 1, 0, 0); break; } diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c index 99f0bbb318ec..9511ea753da7 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c @@ -395,12 +395,6 @@ static u16 dwmac1000_pcs_get_config_reg(struct mac_device_info *hw) return FIELD_GET(GMAC_RGSMIIIS_CONFIG_REG, val); } -static void dwmac1000_ctrl_ane(void __iomem *pcsaddr, bool ane, bool srgmi_ral, - bool loopback) -{ - dwmac_ctrl_ane(pcsaddr, ane, srgmi_ral, loopback); -} - static int dwmac1000_mii_pcs_validate(struct phylink_pcs *pcs, unsigned long *supported, const struct phylink_link_state *state) @@ -593,7 +587,6 @@ const struct stmmac_ops dwmac1000_ops = { .pcs_enable_irq = dwmac1000_pcs_enable_irq, .pcs_disable_irq = dwmac1000_pcs_disable_irq, .pcs_get_config_reg = dwmac1000_pcs_get_config_reg, - .pcs_ctrl_ane = dwmac1000_ctrl_ane, .set_mac_loopback = dwmac1000_set_mac_loopback, }; diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c index 5dc8d59d3a8f..1e73c14f36ce 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c @@ -780,12 +780,6 @@ static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex, } } -static void dwmac4_ctrl_ane(void __iomem *pcsaddr, bool ane, bool srgmi_ral, - bool loopback) -{ - dwmac_ctrl_ane(pcsaddr, ane, srgmi_ral, loopback); -} - static int dwmac4_mii_pcs_validate(struct phylink_pcs *pcs, unsigned long *supported, const struct phylink_link_state *state) @@ -1294,7 +1288,6 @@ const struct stmmac_ops dwmac4_ops = { .set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer, .set_eee_timer = dwmac4_set_eee_timer, .set_eee_pls = dwmac4_set_eee_pls, - .pcs_ctrl_ane = dwmac4_ctrl_ane, .debug = dwmac4_debug, .pcs_enable_irq = dwmac4_pcs_enable_irq, .pcs_disable_irq = dwmac4_pcs_disable_irq, @@ -1341,7 +1334,6 @@ const struct stmmac_ops dwmac410_ops = { .set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer, .set_eee_timer = dwmac4_set_eee_timer, .set_eee_pls = dwmac4_set_eee_pls, - .pcs_ctrl_ane = dwmac4_ctrl_ane, .debug = dwmac4_debug, .pcs_enable_irq = dwmac4_pcs_enable_irq, .pcs_disable_irq = dwmac4_pcs_disable_irq, @@ -1392,7 +1384,6 @@ const struct stmmac_ops dwmac510_ops = { .set_eee_lpi_entry_timer = dwmac4_set_eee_lpi_entry_timer, .set_eee_timer = dwmac4_set_eee_timer, .set_eee_pls = dwmac4_set_eee_pls, - .pcs_ctrl_ane = dwmac4_ctrl_ane, .debug = dwmac4_debug, .pcs_enable_irq = dwmac4_pcs_enable_irq, .pcs_disable_irq = dwmac4_pcs_disable_irq, diff --git a/drivers/net/ethernet/stmicro/stmmac/hwif.h b/drivers/net/ethernet/stmicro/stmmac/hwif.h index 2caa946a92f9..3d39417e906d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/hwif.h +++ b/drivers/net/ethernet/stmicro/stmmac/hwif.h @@ -379,8 +379,6 @@ struct stmmac_ops { void (*pcs_enable_irq)(struct mac_device_info *hw); void (*pcs_disable_irq)(struct mac_device_info *hw); u16 (*pcs_get_config_reg)(struct mac_device_info *hw); - void (*pcs_ctrl_ane)(void __iomem *pcsaddr, bool ane, bool srgmi_ral, - bool loopback); /* Safety Features */ int (*safety_feat_config)(void __iomem *ioaddr, unsigned int asp, struct stmmac_safety_feature_cfg *safety_cfg); @@ -501,8 +499,6 @@ struct stmmac_ops { stmmac_do_void_callback(__priv, mac, pcs_disable_irq, __args) #define stmmac_pcs_get_config_reg(__priv, __args...) \ stmmac_do_callback(__priv, mac, pcs_get_config_reg, __args) -#define stmmac_pcs_ctrl_ane(__priv, __args...) \ - stmmac_do_void_callback(__priv, mac, pcs_ctrl_ane, __args) #define stmmac_safety_feat_config(__priv, __args...) \ stmmac_do_callback(__priv, mac, safety_feat_config, __args) #define stmmac_safety_feat_irq_status(__priv, __args...) \ diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h index 62be3921ac91..76badfd208b6 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h @@ -76,39 +76,6 @@ static inline void dwmac_pcs_isr(void __iomem *pcsaddr, } } -/** - * dwmac_ctrl_ane - To program the AN Control Register. - * @ioaddr: IO registers pointer - * @ane: to enable the auto-negotiation - * @srgmi_ral: to manage MAC-2-MAC SGMII connections. - * @loopback: to cause the PHY to loopback tx data into rx path. - * Description: this is the main function to configure the AN control register - * and init the ANE, select loopback (usually for debugging purpose) and - * configure SGMII RAL. - */ -static inline void dwmac_ctrl_ane(void __iomem *pcsaddr, bool ane, - bool srgmi_ral, bool loopback) -{ - u32 value = readl(pcsaddr + PCS_AN_CTRL); - - /* Enable and restart the Auto-Negotiation */ - if (ane) - value |= PCS_AN_CTRL_ANE | PCS_AN_CTRL_RAN; - else - value &= ~PCS_AN_CTRL_ANE; - - /* In case of MAC-2-MAC connection, block is configured to operate - * according to MAC conf register. - */ - if (srgmi_ral) - value |= PCS_AN_CTRL_SGMRAL; - - if (loopback) - value |= PCS_AN_CTRL_ELE; - - writel(value, pcsaddr + PCS_AN_CTRL); -} - int dwmac_pcs_config(struct mac_device_info *hw, unsigned int neg_mode, phy_interface_t interface, const unsigned long *advertising);