From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CAB9C77B60 for ; Mon, 3 Apr 2023 13:02:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232475AbjDCNCn (ORCPT ); Mon, 3 Apr 2023 09:02:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232496AbjDCNCd (ORCPT ); Mon, 3 Apr 2023 09:02:33 -0400 Received: from fllv0016.ext.ti.com (fllv0016.ext.ti.com [198.47.19.142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C3601DFA2; Mon, 3 Apr 2023 06:02:21 -0700 (PDT) Received: from lelv0266.itg.ti.com ([10.180.67.225]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 333D1u25041728; Mon, 3 Apr 2023 08:01:56 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1680526916; bh=+cCigHI8YAV2AOKp+rk4fY44/paZ71uzC+mgiQhVXt0=; h=Date:CC:Subject:To:References:From:In-Reply-To; b=sBwejyfuKd4hNvOW3KoUklBK0TQCuVvpUaFC/H9Lmk0s/lRlBBV6Qvo6r2Z38hHGW 3MiDShjVIhQdBr1tFa5cZtH6+tKjYqM4N89v+CK7FFGPsfiXmyuS2MBKVlZK801OJJ cs2Cbg1I1WIbypgES8RZXJgPkgLkCXElpwOgYT3o= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 333D1uH1106623 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 3 Apr 2023 08:01:56 -0500 Received: from DFLE100.ent.ti.com (10.64.6.21) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16; Mon, 3 Apr 2023 08:01:56 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DFLE100.ent.ti.com (10.64.6.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.16 via Frontend Transport; Mon, 3 Apr 2023 08:01:55 -0500 Received: from [10.249.131.130] (ileaxei01-snat.itg.ti.com [10.180.69.5]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 333D1qdV067441; Mon, 3 Apr 2023 08:01:53 -0500 Message-ID: <3a62f5cf-ebba-1603-50a0-7a873973534d@ti.com> Date: Mon, 3 Apr 2023 18:31:52 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 CC: , , , , , , , , , Subject: Re: [PATCH net-next v2 1/3] net: ethernet: ti: am65-cpsw: Move mode specific config to mac_config() To: "Russell King (Oracle)" References: <20230403110106.983994-1-s-vadapalli@ti.com> <20230403110106.983994-2-s-vadapalli@ti.com> Content-Language: en-US From: Siddharth Vadapalli In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03-04-2023 16:38, Russell King (Oracle) wrote: > On Mon, Apr 03, 2023 at 04:31:04PM +0530, Siddharth Vadapalli wrote: >> Move the interface mode specific configuration to the mac_config() >> callback am65_cpsw_nuss_mac_config(). >> >> Signed-off-by: Siddharth Vadapalli >> --- >> drivers/net/ethernet/ti/am65-cpsw-nuss.c | 10 +++++++--- >> 1 file changed, 7 insertions(+), 3 deletions(-) >> >> diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c >> index d17757ecbf42..74e099828978 100644 >> --- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c >> +++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c >> @@ -1504,12 +1504,17 @@ static void am65_cpsw_nuss_mac_config(struct phylink_config *config, unsigned in >> phylink_config); >> struct am65_cpsw_port *port = container_of(slave, struct am65_cpsw_port, slave); >> struct am65_cpsw_common *common = port->common; >> + u32 mac_control = 0; >> >> if (common->pdata.extra_modes & BIT(state->interface)) { >> - if (state->interface == PHY_INTERFACE_MODE_SGMII) >> + if (state->interface == PHY_INTERFACE_MODE_SGMII) { >> + mac_control |= CPSW_SL_CTL_EXT_EN; >> writel(ADVERTISE_SGMII, >> port->sgmii_base + AM65_CPSW_SGMII_MR_ADV_ABILITY_REG); >> + } >> >> + if (mac_control) >> + cpsw_sl_ctl_set(port->slave.mac_sl, mac_control); >> writel(AM65_CPSW_SGMII_CONTROL_MR_AN_ENABLE, >> port->sgmii_base + AM65_CPSW_SGMII_CONTROL_REG); >> } >> @@ -1553,8 +1558,7 @@ static void am65_cpsw_nuss_mac_link_up(struct phylink_config *config, struct phy >> >> if (speed == SPEED_1000) >> mac_control |= CPSW_SL_CTL_GIG; >> - if (interface == PHY_INTERFACE_MODE_SGMII) >> - mac_control |= CPSW_SL_CTL_EXT_EN; >> + /* TODO: Verify whether in-band is necessary for 10 Mbps RGMII */ >> if (speed == SPEED_10 && phy_interface_mode_is_rgmii(interface)) >> /* Can be used with in band mode only */ >> mac_control |= CPSW_SL_CTL_EXT_EN; > > I'm afraid I can see you haven't thought this patch through properly. > > am65_cpsw_nuss_mac_link_down() will call > cpsw_sl_ctl_reset(port->slave.mac_sl); which has the effect of clearing > to zero the entire MAC control register. This will clear > CPSW_SL_CTL_EXT_EN that was set in am65_cpsw_nuss_mac_config() which is > not what you want to be doing. > > Given that we have the 10Mbps issue with RGMII, I think what you want > to be doing is: > > 1. Set CPSW_SL_CTL_EXT_EN in am65_cpsw_nuss_mac_config() if in SGMII > mode, otherwise clear this bit. > > 2. Clear the mac_control register in am65_cpsw_nuss_mac_link_down() > if in RMGII mode, otherwise preserve the state of > CPSW_SL_CTL_EXT_EN but clear all other bits. > > 3. Set CPSW_SL_CTL_EXT_EN in am65_cpsw_nuss_mac_link_up() if in > RGMII mode and 10Mbps. I plan to implement it as follows: 1. Add a member "u32 mode_config" to "struct am65_cpsw_slave_data" in "am65-cpsw-nuss.h". 2. In am65_cpsw_nuss_mac_config(), store the value of mac_control in "port->slave.mode_config". 3. In am65_cpsw_nuss_mac_link_down(), after the reset via cpsw_sl_ctl_reset(), execute: cpsw_sl_ctl_set(port->slave.mac_sl, port->slave.mode_config) in order to restore the configuration performed in am65_cpsw_nuss_mac_config(). Please let me know in case of any suggestions to implement it in a better manner. Regards, Siddharth.