[v2,1/2] net: phy: at803x: dont inline helpers

Message ID 20190218101853.4290-1-vkoul@kernel.org
State New
Headers show
Series
  • [v2,1/2] net: phy: at803x: dont inline helpers
Related show

Commit Message

Vinod Koul Feb. 18, 2019, 10:18 a.m.
Some helpers were inlined, but makes more sense to allow compiler
to do the right optiomazations instead, so remove inline for
at803x_disable_rx_delay() and at803x_disable_tx_delay()

Signed-off-by: Vinod Koul <vkoul@kernel.org>

---
 drivers/net/phy/at803x.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.20.1

Comments

Niklas Cassel Feb. 18, 2019, 10:28 a.m. | #1
On Mon, Feb 18, 2019 at 03:48:52PM +0530, Vinod Koul wrote:
> Some helpers were inlined, but makes more sense to allow compiler

> to do the right optiomazations instead, so remove inline for

> at803x_disable_rx_delay() and at803x_disable_tx_delay()

> 

> Signed-off-by: Vinod Koul <vkoul@kernel.org>

> ---

>  drivers/net/phy/at803x.c | 4 ++--

>  1 file changed, 2 insertions(+), 2 deletions(-)

> 

> diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c

> index 8ff12938ab47..c6e7d800fd7a 100644

> --- a/drivers/net/phy/at803x.c

> +++ b/drivers/net/phy/at803x.c

> @@ -110,13 +110,13 @@ static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,

>  	return phy_write(phydev, AT803X_DEBUG_DATA, val);

>  }

>  

> -static inline int at803x_disable_rx_delay(struct phy_device *phydev)

> +static int at803x_disable_rx_delay(struct phy_device *phydev)

>  {

>  	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,

>  				     AT803X_DEBUG_RX_CLK_DLY_EN, 0);

>  }

>  

> -static inline int at803x_disable_tx_delay(struct phy_device *phydev)

> +static int at803x_disable_tx_delay(struct phy_device *phydev)

>  {

>  	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,

>  				     AT803X_DEBUG_TX_CLK_DLY_EN, 0);

> -- 

> 2.20.1

> 


Reviewed-by: Niklas Cassel <niklas.cassel@linaro.org>
Peter Ujfalusi Feb. 18, 2019, 2:40 p.m. | #2
Hi Vinod,

On 18/02/2019 12.18, Vinod Koul wrote:
> Per "Documentation/devicetree/bindings/net/ethernet.txt" RGMII mode

> should not have delay in PHY wheras RGMII_ID and RGMII_RXID/RGMII_TXID

> can have delay in phy.

> 

> So disable the delay only for RGMII mode and enable for other modes.

> Also treat the default case as disabled delays.


With https://patchwork.ozlabs.org/project/netdev/list/?series=92672
ethernet is working on am335x-evmsk. thank you:

Tested-by: Peter Ujfalusi <peter.ujflausi@ti.com>


> Fixes: cd28d1d6e52e: ("net: phy: at803x: Disable phy delay for RGMII mode")

> Reported-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

> Signed-off-by: Vinod Koul <vkoul@kernel.org>

> ---

>  drivers/net/phy/at803x.c | 47 ++++++++++++++++++++++++++++++----------

>  1 file changed, 36 insertions(+), 11 deletions(-)

> 

> diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c

> index c6e7d800fd7a..dc1b13f7fc12 100644

> --- a/drivers/net/phy/at803x.c

> +++ b/drivers/net/phy/at803x.c

> @@ -110,6 +110,18 @@ static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,

>  	return phy_write(phydev, AT803X_DEBUG_DATA, val);

>  }

>  

> +static int at803x_enable_rx_delay(struct phy_device *phydev)

> +{

> +	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0, 0,

> +				     AT803X_DEBUG_RX_CLK_DLY_EN);

> +}

> +

> +static int at803x_enable_tx_delay(struct phy_device *phydev)

> +{

> +	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5, 0,

> +				     AT803X_DEBUG_TX_CLK_DLY_EN);

> +}

> +

>  static int at803x_disable_rx_delay(struct phy_device *phydev)

>  {

>  	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,

> @@ -255,23 +267,36 @@ static int at803x_config_init(struct phy_device *phydev)

>  	if (ret < 0)

>  		return ret;

>  

> -	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID ||

> -			phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||

> -			phydev->interface == PHY_INTERFACE_MODE_RGMII) {

> -		ret = at803x_disable_rx_delay(phydev);

> +	/* The hardware register default is RX and TX delay enabled, so lets

> +	 * first disable the RX and TX delays in phy and enable them based

> +	 * on the mode selected

> +	 */

> +	ret = at803x_disable_rx_delay(phydev);

> +	if (ret < 0)

> +		return ret;

> +	ret = at803x_disable_tx_delay(phydev);

> +	if (ret < 0)

> +		return ret;

> +

> +	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||

> +	    phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {

> +		/* If RGMII_ID or RGMII_RXID are specified enable RX delay,

> +		 * otherwise keep it disabled

> +		 */

> +		ret = at803x_enable_rx_delay(phydev);

>  		if (ret < 0)

>  			return ret;

>  	}

>  

> -	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID ||

> -			phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||

> -			phydev->interface == PHY_INTERFACE_MODE_RGMII) {

> -		ret = at803x_disable_tx_delay(phydev);

> -		if (ret < 0)

> -			return ret;

> +	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||

> +	    phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) {

> +		/* If RGMII_ID or RGMII_TXID are specified enable TX delay,

> +		 * otherwise keep it disabled

> +		 */

> +		ret = at803x_enable_tx_delay(phydev);

>  	}

>  

> -	return 0;

> +	return ret;

>  }

>  

>  static int at803x_ack_interrupt(struct phy_device *phydev)

> 


- P├ęter

Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

Patch

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 8ff12938ab47..c6e7d800fd7a 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -110,13 +110,13 @@  static int at803x_debug_reg_mask(struct phy_device *phydev, u16 reg,
 	return phy_write(phydev, AT803X_DEBUG_DATA, val);
 }
 
-static inline int at803x_disable_rx_delay(struct phy_device *phydev)
+static int at803x_disable_rx_delay(struct phy_device *phydev)
 {
 	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_0,
 				     AT803X_DEBUG_RX_CLK_DLY_EN, 0);
 }
 
-static inline int at803x_disable_tx_delay(struct phy_device *phydev)
+static int at803x_disable_tx_delay(struct phy_device *phydev)
 {
 	return at803x_debug_reg_mask(phydev, AT803X_DEBUG_REG_5,
 				     AT803X_DEBUG_TX_CLK_DLY_EN, 0);