Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965328AbcLVPmS (ORCPT ); Thu, 22 Dec 2016 10:42:18 -0500 Received: from anchovy2.45ru.net.au ([203.30.46.146]:41781 "EHLO anchovy.45ru.net.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753928AbcLVPmQ (ORCPT ); Thu, 22 Dec 2016 10:42:16 -0500 Subject: Re: [PATCH v2] stmmac: CSR clock configuration fix To: Joao Pinto , peppe.cavallaro@st.com, davem@davemloft.net, seraphin.bonnaffe@st.com References: <7b395fd7dfd0c808243a744393473cbbf89b268a.1482410161.git.jpinto@synopsys.com> Cc: hock.leong.kweh@intel.com, niklas.cassel@axis.com, pavel@ucw.cz, linux-kernel@vger.kernel.org, netdev@vger.kernel.org From: Phil Reid Message-ID: <15975894-6a5e-1706-ff9e-660c0bac3971@electromag.com.au> Date: Thu, 22 Dec 2016 23:42:01 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 In-Reply-To: <7b395fd7dfd0c808243a744393473cbbf89b268a.1482410161.git.jpinto@synopsys.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3277 Lines: 81 G'day Joao, On 22/12/2016 20:38, Joao Pinto wrote: > When testing stmmac with my QoS reference design I checked a problem in the > CSR clock configuration that was impossibilitating the phy discovery, since > every read operation returned 0x0000ffff. This patch fixes the issue. > > Signed-off-by: Joao Pinto > --- > changes v1->v2 (David Miller) > - DWMAC100 and DWMAC1000 csr clocks masks should also be fixed for the patch > to make sense > > drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 2 +- > drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c | 2 +- > drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 8 ++++---- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c > index b21d03f..94223c8 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c > @@ -539,7 +539,7 @@ struct mac_device_info *dwmac1000_setup(void __iomem *ioaddr, int mcbins, > mac->mii.reg_shift = 6; > mac->mii.reg_mask = 0x000007C0; > mac->mii.clk_csr_shift = 2; > - mac->mii.clk_csr_mask = 0xF; > + mac->mii.clk_csr_mask = GENMASK(4, 2); Should this not be GENMASK(5,2) > > /* Get and dump the chip ID */ > *synopsys_id = stmmac_get_synopsys_id(hwid); > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c > index a1d582f..8a40e69 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac100_core.c > @@ -197,7 +197,7 @@ struct mac_device_info *dwmac100_setup(void __iomem *ioaddr, int *synopsys_id) > mac->mii.reg_shift = 6; > mac->mii.reg_mask = 0x000007C0; > mac->mii.clk_csr_shift = 2; > - mac->mii.clk_csr_mask = 0xF; > + mac->mii.clk_csr_mask = GENMASK(4, 2); same as above? > > /* Synopsys Id is not available on old chips */ > *synopsys_id = 0; > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > index 23322fd..fda01f7 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c > @@ -81,8 +81,8 @@ static int stmmac_mdio_read(struct mii_bus *bus, int phyaddr, int phyreg) > value |= (phyaddr << priv->hw->mii.addr_shift) > & priv->hw->mii.addr_mask; > value |= (phyreg << priv->hw->mii.reg_shift) & priv->hw->mii.reg_mask; > - value |= (priv->clk_csr & priv->hw->mii.clk_csr_mask) > - << priv->hw->mii.clk_csr_shift; > + value |= (priv->clk_csr << priv->hw->mii.clk_csr_shift) > + & priv->hw->mii.clk_csr_mask; > if (priv->plat->has_gmac4) > value |= MII_GMAC4_READ; > > @@ -122,8 +122,8 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg, > & priv->hw->mii.addr_mask; > value |= (phyreg << priv->hw->mii.reg_shift) & priv->hw->mii.reg_mask; > > - value |= ((priv->clk_csr & priv->hw->mii.clk_csr_mask) > - << priv->hw->mii.clk_csr_shift); > + value |= (priv->clk_csr << priv->hw->mii.clk_csr_shift) > + & priv->hw->mii.clk_csr_mask; > if (priv->plat->has_gmac4) > value |= MII_GMAC4_WRITE; > > -- Regards Phil Reid