diff mbox series

[net-next,v8,2/5] net: phy: Add a helper to return the index for of the internal delay

Message ID 20200618211011.28837-3-dmurphy@ti.com
State Superseded
Headers show
Series RGMII Internal delay common property | expand

Commit Message

Dan Murphy June 18, 2020, 9:10 p.m. UTC 
Add a helper function that will return the index in the array for the
passed in internal delay value.  The helper requires the array, size and
delay value.

The helper will then return the index for the exact match or return the
index for the index to the closest smaller value.

Signed-off-by: Dan Murphy <dmurphy@ti.com>

---

v8 - I did a considerable amount of rework on this patch.  First the device_property
calls needed to be wrapped in IS_ENABLED (CONFIG_OF_MDIO).  Next if the PHY has
a fixed delay like the DP83822 with a bit to turn the delay on and off then
having a device tree property was a bit to much.  The device property should be
used for configurable delays.  If the PHY had a fixed delay then the PHY
interface type was good enough to tell the PHY to turn on the delay for the path.
This helper was tested on both the DP83869 and DP83822 devices.

 drivers/net/phy/phy_device.c | 100 +++++++++++++++++++++++++++++++++++
 include/linux/phy.h          |   4 ++
 2 files changed, 104 insertions(+)

-- 
2.26.2

Comments

kernel test robot June 18, 2020, 11:29 p.m. UTC | #1 
Hi Dan,

I love your patch! Yet something to improve:

[auto build test ERROR on net-next/master]

url:    https://github.com/0day-ci/linux/commits/Dan-Murphy/RGMII-Internal-delay-common-property/20200619-051238
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2
config: i386-defconfig (attached as .config)
compiler: gcc-9 (Debian 9.3.0-13) 9.3.0
reproduce (this is a W=1 build):
        # save the attached .config to linux build tree
        make W=1 ARCH=i386 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   drivers/net/phy/phy_device.c: In function 'phy_get_int_delay_property':
>> drivers/net/phy/phy_device.c:2678:1: error: expected ';' before '}' token

    2678 | }
         | ^

vim +2678 drivers/net/phy/phy_device.c

  2660	
  2661	#if IS_ENABLED(CONFIG_OF_MDIO)
  2662	static int phy_get_int_delay_property(struct device *dev, const char *name)
  2663	{
  2664		s32 int_delay;
  2665		int ret;
  2666	
  2667		ret = device_property_read_u32(dev, name, &int_delay);
  2668		if (ret)
  2669			return ret;
  2670	
  2671		return int_delay;
  2672	}
  2673	#else
  2674	static inline int phy_get_int_delay_property(struct device *dev,
  2675						     const char *name)
  2676	{
  2677		return -EINVAL
> 2678	}

  2679	#endif
  2680	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Dan Murphy June 18, 2020, 11:42 p.m. UTC | #2 
Hello

On 6/18/20 6:29 PM, kernel test robot wrote:
> Hi Dan,
>
> I love your patch! Yet something to improve:
>
> [auto build test ERROR on net-next/master]
>
> url:    https://github.com/0day-ci/linux/commits/Dan-Murphy/RGMII-Internal-delay-common-property/20200619-051238
> base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2
> config: i386-defconfig (attached as .config)
> compiler: gcc-9 (Debian 9.3.0-13) 9.3.0
> reproduce (this is a W=1 build):
>          # save the attached .config to linux build tree
>          make W=1 ARCH=i386
>
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp@intel.com>
>
> All errors (new ones prefixed by >>):
>
>     drivers/net/phy/phy_device.c: In function 'phy_get_int_delay_property':
>>> drivers/net/phy/phy_device.c:2678:1: error: expected ';' before '}' token
>      2678 | }
>           | ^
>
> vim +2678 drivers/net/phy/phy_device.c
>
>    2660	
>    2661	#if IS_ENABLED(CONFIG_OF_MDIO)
>    2662	static int phy_get_int_delay_property(struct device *dev, const char *name)
>    2663	{
>    2664		s32 int_delay;
>    2665		int ret;
>    2666	
>    2667		ret = device_property_read_u32(dev, name, &int_delay);
>    2668		if (ret)
>    2669			return ret;
>    2670	
>    2671		return int_delay;
>    2672	}
>    2673	#else
>    2674	static inline int phy_get_int_delay_property(struct device *dev,
>    2675						     const char *name)
>    2676	{
>    2677		return -EINVAL

Ack missed compiling this use case.

Dan

>> 2678	}
>    2679	#endif
>    2680	
>
> ---
> 0-DAY CI Kernel Test Service, Intel Corporation
> https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
kernel test robot June 19, 2020, 2:36 a.m. UTC | #3 
Hi Dan,

I love your patch! Yet something to improve:

[auto build test ERROR on net-next/master]

url:    https://github.com/0day-ci/linux/commits/Dan-Murphy/RGMII-Internal-delay-common-property/20200619-051238
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git cb8e59cc87201af93dfbb6c3dccc8fcad72a09c2
config: x86_64-defconfig (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project 487ca07fcc75d52755c9fe2ee05bcb3b6eeeec44)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install x86_64 cross compiling tool for clang build
        # apt-get install binutils-x86-64-linux-gnu
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> drivers/net/phy/phy_device.c:2677:16: error: expected ';' after return statement

           return -EINVAL
                         ^
                         ;
   1 error generated.

vim +2677 drivers/net/phy/phy_device.c

  2660	
  2661	#if IS_ENABLED(CONFIG_OF_MDIO)
  2662	static int phy_get_int_delay_property(struct device *dev, const char *name)
  2663	{
  2664		s32 int_delay;
  2665		int ret;
  2666	
  2667		ret = device_property_read_u32(dev, name, &int_delay);
  2668		if (ret)
  2669			return ret;
  2670	
  2671		return int_delay;
  2672	}
  2673	#else
  2674	static inline int phy_get_int_delay_property(struct device *dev,
  2675						     const char *name)
  2676	{
> 2677		return -EINVAL

  2678	}
  2679	#endif
  2680	

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 04946de74fa0..55f9953bcd1d 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -31,6 +31,7 @@ 
 #include <linux/mdio.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
+#include <linux/property.h>
 
 MODULE_DESCRIPTION("PHY library");
 MODULE_AUTHOR("Andy Fleming");
@@ -2657,6 +2658,105 @@  void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause)
 }
 EXPORT_SYMBOL(phy_get_pause);
 
+#if IS_ENABLED(CONFIG_OF_MDIO)
+static int phy_get_int_delay_property(struct device *dev, const char *name)
+{
+	s32 int_delay;
+	int ret;
+
+	ret = device_property_read_u32(dev, name, &int_delay);
+	if (ret)
+		return ret;
+
+	return int_delay;
+}
+#else
+static inline int phy_get_int_delay_property(struct device *dev,
+					     const char *name)
+{
+	return -EINVAL
+}
+#endif
+
+/**
+ * phy_get_delay_index - returns the index of the internal delay
+ * @phydev: phy_device struct
+ * @dev: pointer to the devices device struct
+ * @delay_values: array of delays the PHY supports
+ * @size: the size of the delay array
+ * @is_rx: boolean to indicate to get the rx internal delay
+ *
+ * Returns the index within the array of internal delay passed in.
+ * If the device property is not present then the interface type is checked
+ * if the interface defines use of internal delay then a 1 is returned otherwise
+ * a 0 is returned.
+ * The array must be in ascending order. If PHY does not have an ascending order
+ * array then size = 0 and the value of the delay property is returned.
+ * Return -EINVAL if the delay is invalid or cannot be found.
+ */
+s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev,
+			   const int *delay_values, int size, bool is_rx)
+{
+	int i;
+	s32 delay;
+
+	if (is_rx) {
+		delay = phy_get_int_delay_property(dev, "rx-internal-delay-ps");
+		if (delay < 0 && size == 0) {
+			if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+			    phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+				return 1;
+			else
+				return 0;
+		}
+
+	} else {
+		delay = phy_get_int_delay_property(dev, "tx-internal-delay-ps");
+		if (delay < 0 && size == 0) {
+			if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID ||
+			    phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+				return 1;
+			else
+				return 0;
+		}
+	}
+
+	if (delay < 0)
+		return delay;
+
+	if (delay && size == 0)
+		return delay;
+
+	if (delay < delay_values[0] || delay > delay_values[size - 1]) {
+		phydev_err(phydev, "Delay %d is out of range\n", delay);
+		return -EINVAL;
+	}
+
+	if (delay == delay_values[0])
+		return 0;
+
+	for (i = 1; i < size; i++) {
+		if (delay == delay_values[i])
+			return i;
+
+		/* Find an approximate index by looking up the table */
+		if (delay > delay_values[i - 1] &&
+		    delay < delay_values[i]) {
+			if (delay - delay_values[i - 1] <
+			    delay_values[i] - delay)
+				return i - 1;
+			else
+				return i;
+		}
+	}
+
+	phydev_err(phydev, "error finding internal delay index for %d\n",
+		   delay);
+
+	return -EINVAL;
+}
+EXPORT_SYMBOL(phy_get_internal_delay);
+
 static bool phy_drv_supports_irq(struct phy_driver *phydrv)
 {
 	return phydrv->config_intr && phydrv->ack_interrupt;
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 8c05d0fb5c00..917bfd422e06 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1430,6 +1430,10 @@  void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx);
 bool phy_validate_pause(struct phy_device *phydev,
 			struct ethtool_pauseparam *pp);
 void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause);
+
+s32 phy_get_internal_delay(struct phy_device *phydev, struct device *dev,
+			   const int *delay_values, int size, bool is_rx);
+
 void phy_resolve_pause(unsigned long *local_adv, unsigned long *partner_adv,
 		       bool *tx_pause, bool *rx_pause);