RGMII Internal delay common property
Subsystems (4)
v8 cover RGMII Internal delay common property
Hello
The RGMII internal delay is a common setting found in most RGMII capable PHY devices. It was found that many vendor specific device tree properties exist to do the same function. This creates a common property to be used for PHY's that have internal delays for the Rx and Tx paths.
If the internal delay is tunable then the caller needs to pass the internal delay array and the return will be the index in the array that was found in the firmware node.
If the internal delay is fixed then the caller only needs to indicate which delay to return. There is no need for a fixed delay to add device properties since the value is not configurable. Per the ethernet-controller.yaml the interface type indicates that the PHY should provide the delay.
This series contains examples of both a configurable delay and a fixed delay.
Dan Murphy (5):
dt-bindings: net: Add tx and rx internal delays
net: phy: Add a helper to return the index for of the internal delay
dt-bindings: net: Add RGMII internal delay for DP83869
net: dp83869: Add RGMII internal delay configuration
net: phy: DP83822: Add setting the fixed internal delay
.../devicetree/bindings/net/ethernet-phy.yaml | 13 +++ .../devicetree/bindings/net/ti,dp83869.yaml | 16 ++- drivers/net/phy/dp83822.c | 78 ++++++++++++-- drivers/net/phy/dp83869.c | 53 +++++++++- drivers/net/phy/phy_device.c | 100 ++++++++++++++++++ include/linux/phy.h | 4 + 6 files changed, 250 insertions(+), 14 deletions(-)
Signature · 1 line
2.26.2
PATCH v8 1/5 dt-bindings: net: Add tx and rx internal delays
tx-internal-delays and rx-internal-delays are a common setting for RGMII capable devices.
These properties are used when the phy-mode or phy-controller is set to rgmii-id, rgmii-rxid or rgmii-txid. These modes indicate to the controller that the PHY will add the internal delay for the connection.
--- .../devicetree/bindings/net/ethernet-phy.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+)
Documentation/devicetree/bindings/net/ethernet-phy.yaml +13 -0
@@ -162,6 +162,19 @@ properties: description: Specifies a reference to a node representing a SFP cage. + + rx-internal-delay-ps: + description: | + RGMII Receive PHY Clock Delay defined in pico seconds. This is used for + PHY's that have configurable RX internal delays. If this property is + present then the PHY applies the RX delay. + + tx-internal-delay-ps: + description: | + RGMII Transmit PHY Clock Delay defined in pico seconds. This is used for + PHY's that have configurable TX internal delays. If this property is + present then the PHY applies the TX delay. + required: - reg
Signature · 1 line
2.26.2
PATCH v8 2/5 net: phy: Add a helper to return the index for of the internal delay
In reply to Dan MurphyAdd 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.
---
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(+)
drivers/net/phy/phy_device.c +100 -0
@@ -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;
include/linux/phy.h +4 -0
@@ -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);
Signature · 1 line
2.26.2
kernel test robot
build botRe: [PATCH net-next v8 2/5] net: phy: Add a helper to return the index for of the internal delay
I love your patch! Yet something to improve:
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
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(a)lists.01.org
Re: [PATCH net-next v8 2/5] net: phy: Add a helper to return the index for of the internal delay
Hello
Quoted 36 lines · kernel test robot
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=i386If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All errors (new ones prefixed by >>):
drivers/net/phy/phy_device.c: In function 'phy_get_int_delay_property':Quoted 1 line
Quoted 1 line
drivers/net/phy/phy_device.c:2678:1: error: expected ';' before '}' token2678 | } | ^vim +2678
drivers/net/phy/phy_device.c2660 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;
Quoted 8 lines
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 -EINVALAck missed compiling this use case.
Dan
Quoted 7 lines
Quoted 1 line
2678 }
2679 #endif
2680---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH net-next v8 2/5] net: phy: Add a helper to return the index for of the internal delay
In reply to Dan MurphyI love your patch! Yet something to improve:
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
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(a)lists.01.org
PATCH v8 3/5 dt-bindings: net: Add RGMII internal delay for DP83869
In reply to Dan MurphyAdd the internal delay values into the header and update the binding with the internal delay properties.
--- .../devicetree/bindings/net/ti,dp83869.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/ti,dp83869.yaml +15 -1
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#" title: TI DP83869 ethernet PHY allOf: - - $ref: "ethernet-controller.yaml#" + - $ref: "ethernet-phy.yaml#" maintainers: - Dan Murphy <[email protected]>
@@ -64,6 +64,18 @@ properties: Operational mode for the PHY. If this is not set then the operational mode is set by the straps. see dt-bindings/net/ti-dp83869.h for values + rx-internal-delay-ps: + description: Delay is in pico seconds + enum: [ 250, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000, + 3250, 3500, 3750, 4000 ] + default: 2000 + + tx-internal-delay-ps: + description: Delay is in pico seconds + enum: [ 250, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000, + 3250, 3500, 3750, 4000 ] + default: 2000 + required: - reg
@@ -80,5 +92,7 @@ examples: ti,op-mode = <DP83869_RGMII_COPPER_ETHERNET>; ti,max-output-impedance = "true"; ti,clk-output-sel = <DP83869_CLK_O_SEL_CHN_A_RCLK>; + rx-internal-delay-ps = <2000>; + tx-internal-delay-ps = <2000>; }; };
Signature · 1 line
2.26.2
PATCH v8 4/5 net: dp83869: Add RGMII internal delay configuration
In reply to Dan MurphyAdd RGMII internal delay configuration for Rx and Tx.
--- drivers/net/phy/dp83869.c | 53 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 3 deletions(-)
drivers/net/phy/dp83869.c +50 -3
@@ -64,6 +64,10 @@#define DP83869_RGMII_TX_CLK_DELAY_EN BIT(1)#define DP83869_RGMII_RX_CLK_DELAY_EN BIT(0) +/* RGMIIDCTL */ +#define DP83869_RGMII_CLK_DELAY_SHIFT 4 +#define DP83869_CLK_DELAY_DEF 7 +/* STRAP_STS1 bits */ #define DP83869_STRAP_OP_MODE_MASK GENMASK(2, 0)#define DP83869_STRAP_STS1_RESERVED BIT(11)
@@ -78,9 +82,6 @@#define DP83869_PHYCR_FIFO_DEPTH_MASK GENMASK(15, 12)#define DP83869_PHYCR_RESERVED_MASK BIT(11) -/* RGMIIDCTL bits */ -#define DP83869_RGMII_TX_CLK_DELAY_SHIFT 4 -/* IO_MUX_CFG bits */ #define DP83869_IO_MUX_CFG_IO_IMPEDANCE_CTRL 0x1f
@@ -99,6 +100,10 @@#define DP83869_OP_MODE_MII BIT(5)#define DP83869_SGMII_RGMII_BRIDGE BIT(6) +static const int dp83869_internal_delay[] = {250 ,500 ,750 ,1000 ,1250 ,1500 , +1750 ,2000 ,2250 ,2500 ,2750 ,3000 , +3250 ,3500 ,3750 ,4000 }; +enum {DP83869_PORT_MIRRORING_KEEP ,DP83869_PORT_MIRRORING_EN ,
@@ -108,6 +113,8 @@ enum {struct dp83869_private {int tx_fifo_depth;int rx_fifo_depth; +s32 rx_int_delay; +s32 tx_int_delay;int io_impedance;int port_mirroring;bool rxctrl_strap_quirk;
@@ -182,6 +189,7 @@ static int dp83869_of_init(struct phy_device *phydev)struct dp83869_private *dp83869 = phydev->priv;struct device *dev = &phydev->mdio.dev;struct device_node *of_node = dev->of_node; +int delay_size =ARRAY_SIZE (dp83869_internal_delay);int ret;if (!of_node)
@@ -235,6 +243,20 @@ static int dp83869_of_init(struct phy_device *phydev) &dp83869->tx_fifo_depth)) dp83869->tx_fifo_depth =DP83869_PHYCR_FIFO_DEPTH_4_B_NIB ; + dp83869->rx_int_delay =phy_get_internal_delay (phydev, dev, + &dp83869_internal_delay[0 ], + delay_size, true); +if (dp83869->rx_int_delay <0 ) + dp83869->rx_int_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ]; + + dp83869->tx_int_delay =phy_get_internal_delay (phydev, dev, + &dp83869_internal_delay[0 ], + delay_size, false); +if (dp83869->tx_int_delay <0 ) + dp83869->tx_int_delay = + dp83869_internal_delay[DP83869_CLK_DELAY_DEF ]; + return ret; }#else
@@ -397,6 +419,31 @@ static int dp83869_config_init(struct phy_device *phydev) dp83869->clk_output_sel << DP83869_IO_MUX_CFG_CLK_O_SEL_SHIFT); +if (phy_interface_is_rgmii (phydev)) { + ret =phy_write_mmd (phydev,DP83869_DEVADDR ,DP83869_RGMIIDCTL , + dp83869->rx_int_delay | + dp83869->tx_int_delay <<DP83869_RGMII_CLK_DELAY_SHIFT ); +if (ret) +return ret; + + val =phy_read_mmd (phydev,DP83869_DEVADDR ,DP83869_RGMIICTL ); + val &= ~(DP83869_RGMII_TX_CLK_DELAY_EN | +DP83869_RGMII_RX_CLK_DELAY_EN ); + +if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_ID ) + val |= (DP83869_RGMII_TX_CLK_DELAY_EN | +DP83869_RGMII_RX_CLK_DELAY_EN ); + +if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_TXID ) + val |=DP83869_RGMII_TX_CLK_DELAY_EN ; + +if (phydev->interface ==PHY_INTERFACE_MODE_RGMII_RXID ) + val |=DP83869_RGMII_RX_CLK_DELAY_EN ; + + ret =phy_write_mmd (phydev,DP83869_DEVADDR ,DP83869_RGMIICTL , + val); + } +return ret; }
Signature · 1 line
2.26.2
kernel test robot
build botRe: [PATCH net-next v8 4/5] net: dp83869: Add RGMII internal delay configuration
I love your patch! Perhaps something to improve:
Hi Dan,
I love your patch! Perhaps something to improve:
[auto build test WARNING 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: s390-randconfig-r014-20200618 (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 s390 cross compiling tool for clang build
# apt-get install binutils-s390-linux-gnu
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=s390
If you fix the issue, kindly add following tag as appropriate
All warnings (new ones prefixed by >>, old ones prefixed by <<):
#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
^include/uapi/linux/swab.h:119:21: note: expanded from macro '__swab32'___constant_swab32(x) : ^include/uapi/linux/swab.h:20:12: note: expanded from macro '___constant_swab32'
(((__u32)(x) & (__u32)0x0000ff00UL) << 8) | ^
In file included from drivers/net/phy/dp83869.c:6:
In file included from include/linux/ethtool.h:18:
In file included from include/uapi/linux/ethtool.h:19:
In file included from include/linux/if_ether.h:19:
In file included from include/linux/skbuff.h:31:
In file included from include/linux/dma-mapping.h:11:
In file included from include/linux/scatterlist.h:9:
In file included from arch/s390/include/asm/io.h:72:include/asm-generic/io.h:492:45: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] val = __le32_to_cpu(__raw_readl(PCI_IOBASE + addr));
~~~~~~~~~~ ^include/uapi/linux/byteorder/big_endian.h:34:59: note: expanded from macro '__le32_to_cpu'
#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
^include/uapi/linux/swab.h:119:21: note: expanded from macro '__swab32'___constant_swab32(x) : ^include/uapi/linux/swab.h:21:12: note: expanded from macro '___constant_swab32'
(((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | ^
In file included from drivers/net/phy/dp83869.c:6:
In file included from include/linux/ethtool.h:18:
In file included from include/uapi/linux/ethtool.h:19:
In file included from include/linux/if_ether.h:19:
In file included from include/linux/skbuff.h:31:
In file included from include/linux/dma-mapping.h:11:
In file included from include/linux/scatterlist.h:9:
In file included from arch/s390/include/asm/io.h:72:include/asm-generic/io.h:492:45: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] val = __le32_to_cpu(__raw_readl(PCI_IOBASE + addr));
~~~~~~~~~~ ^include/uapi/linux/byteorder/big_endian.h:34:59: note: expanded from macro '__le32_to_cpu'
#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
^include/uapi/linux/swab.h:119:21: note: expanded from macro '__swab32'___constant_swab32(x) : ^include/uapi/linux/swab.h:22:12: note: expanded from macro '___constant_swab32'
(((__u32)(x) & (__u32)0xff000000UL) >> 24)))
^
In file included from drivers/net/phy/dp83869.c:6:
In file included from include/linux/ethtool.h:18:
In file included from include/uapi/linux/ethtool.h:19:
In file included from include/linux/if_ether.h:19:
In file included from include/linux/skbuff.h:31:
In file included from include/linux/dma-mapping.h:11:
In file included from include/linux/scatterlist.h:9:
In file included from arch/s390/include/asm/io.h:72:include/asm-generic/io.h:492:45: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] val = __le32_to_cpu(__raw_readl(PCI_IOBASE + addr));
~~~~~~~~~~ ^include/uapi/linux/byteorder/big_endian.h:34:59: note: expanded from macro '__le32_to_cpu'
#define __le32_to_cpu(x) __swab32((__force __u32)(__le32)(x))
^include/uapi/linux/swab.h:120:12: note: expanded from macro '__swab32'__fswab32(x))
^
In file included from drivers/net/phy/dp83869.c:6:
In file included from include/linux/ethtool.h:18:
In file included from include/uapi/linux/ethtool.h:19:
In file included from include/linux/if_ether.h:19:
In file included from include/linux/skbuff.h:31:
In file included from include/linux/dma-mapping.h:11:
In file included from include/linux/scatterlist.h:9:
In file included from arch/s390/include/asm/io.h:72:include/asm-generic/io.h:503:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] __raw_writeb(value, PCI_IOBASE + addr);
~~~~~~~~~~ ^include/asm-generic/io.h:513:46: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] __raw_writew(cpu_to_le16(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^include/asm-generic/io.h:523:46: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] __raw_writel(cpu_to_le32(value), PCI_IOBASE + addr);
~~~~~~~~~~ ^include/asm-generic/io.h:585:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] readsb(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^include/asm-generic/io.h:593:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] readsw(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^include/asm-generic/io.h:601:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] readsl(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^include/asm-generic/io.h:610:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] writesb(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^include/asm-generic/io.h:619:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] writesw(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^include/asm-generic/io.h:628:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] writesl(PCI_IOBASE + addr, buffer, count);
~~~~~~~~~~ ^
>> drivers/net/phy/dp83869.c:103:18: warning: unused variable 'dp83869_internal_delay' [-Wunused-const-variable]
static const int dp83869_internal_delay[] = {250, 500, 750, 1000, 1250, 1500, ^
21 warnings generated.
vim +/dp83869_internal_delay +103 drivers/net/phy/dp83869.c
102
> 103 static const int dp83869_internal_delay[] = {250, 500, 750, 1000, 1250, 1500, 104 1750, 2000, 2250, 2500, 2750, 3000,
105 3250, 3500, 3750, 4000};
106
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v8 5/5 net: phy: DP83822: Add setting the fixed internal delay
In reply to Dan MurphyThe DP83822 can be configured to use the RGMII interface. There are independent fixed 3.5ns clock shift (aka internal delay) for the TX and RX paths. This allow either one to be set if the MII interface is RGMII and the value is set in the firmware node.
--- drivers/net/phy/dp83822.c | 78 ++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 10 deletions(-)
drivers/net/phy/dp83822.c +68 -10
@@ -26,7 +26,9 @@#define MII_DP83822_PHYSCR 0x11#define MII_DP83822_MISR1 0x12#define MII_DP83822_MISR2 0x13 +#define MII_DP83822_RCSR 0x17#define MII_DP83822_RESET_CTRL 0x1f +#define MII_DP83822_GENCFG 0x465#define DP83822_HW_RESET BIT(15)#define DP83822_SW_RESET BIT(14)
@@ -77,6 +79,10 @@#define DP83822_WOL_INDICATION_SEL BIT(8)#define DP83822_WOL_CLR_INDICATION BIT(11) +/* RSCR bits */ +#define DP83822_RX_CLK_SHIFT BIT(12) +#define DP83822_TX_CLK_SHIFT BIT(11) +static int dp83822_ack_interrupt (struct phy_device *phydev) {int err;
@@ -255,7 +261,7 @@ static int dp83822_config_intr(struct phy_device *phydev)return phy_write (phydev,MII_DP83822_PHYSCR , physcr_status); } -static int dp83822_config_init (struct phy_device *phydev) +static int dp8382x_disable_wol (struct phy_device *phydev) {int value =DP83822_WOL_EN |DP83822_WOL_MAGIC_EN |DP83822_WOL_SECURE_ON ;
@@ -264,6 +270,45 @@ static int dp83822_config_init(struct phy_device *phydev) MII_DP83822_WOL_CFG, value); } +static int dp83822_config_init (struct phy_device *phydev) +{ +struct device *dev = &phydev->mdio.dev; +int rgmii_delay; +s32 rx_int_delay; +s32 tx_int_delay; +int err =0 ; + +if (phy_interface_is_rgmii (phydev)) { + rx_int_delay =phy_get_internal_delay (phydev, dev,NULL ,0 , + true); +if (rx_int_delay <=0 ) + rx_int_delay =0 ; +else + rgmii_delay =DP83822_RX_CLK_SHIFT ; + + tx_int_delay =phy_get_internal_delay (phydev, dev,NULL ,0 , + false); +if (tx_int_delay <=0 ) + tx_int_delay =0 ; +else + rgmii_delay |=DP83822_TX_CLK_SHIFT ; + +if (rgmii_delay) { + err =phy_set_bits_mmd (phydev,DP83822_DEVADDR , +MII_DP83822_RCSR , rgmii_delay); +if (err) +return err; + } + } + +return dp8382x_disable_wol (phydev); +} + +static int dp8382x_config_init (struct phy_device *phydev) +{ +return dp8382x_disable_wol (phydev); +} +static int dp83822_phy_reset (struct phy_device *phydev) {int err;
@@ -272,9 +317,7 @@ static int dp83822_phy_reset(struct phy_device *phydev)if (err <0 )return err; -dp83822_config_init (phydev); - -return 0 ; +return phydev->drv->config_init (phydev); }static int dp83822_suspend (struct phy_device *phydev)
@@ -318,14 +361,29 @@ static int dp83822_resume(struct phy_device *phydev) .resume = dp83822_resume, \ } +#define DP8382X_PHY_DRIVER(_id, _name) \ + { \ + PHY_ID_MATCH_MODEL(_id), \ + .name = (_name), \ + /* PHY_BASIC_FEATURES */ \ + .soft_reset = dp83822_phy_reset, \ + .config_init = dp8382x_config_init, \ + .get_wol = dp83822_get_wol, \ + .set_wol = dp83822_set_wol, \ + .ack_interrupt = dp83822_ack_interrupt, \ + .config_intr = dp83822_config_intr, \ + .suspend = dp83822_suspend, \ + .resume = dp83822_resume, \ + } +static struct phy_driver dp83822_driver[] = {DP83822_PHY_DRIVER (DP83822_PHY_ID ,"TI DP83822" ), -DP83822_PHY_DRIVER (DP83825I_PHY_ID ,"TI DP83825I" ), -DP83822_PHY_DRIVER (DP83826C_PHY_ID ,"TI DP83826C" ), -DP83822_PHY_DRIVER (DP83826NC_PHY_ID ,"TI DP83826NC" ), -DP83822_PHY_DRIVER (DP83825S_PHY_ID ,"TI DP83825S" ), -DP83822_PHY_DRIVER (DP83825CM_PHY_ID ,"TI DP83825M" ), -DP83822_PHY_DRIVER (DP83825CS_PHY_ID ,"TI DP83825CS" ), +DP8382X_PHY_DRIVER (DP83825I_PHY_ID ,"TI DP83825I" ), +DP8382X_PHY_DRIVER (DP83826C_PHY_ID ,"TI DP83826C" ), +DP8382X_PHY_DRIVER (DP83826NC_PHY_ID ,"TI DP83826NC" ), +DP8382X_PHY_DRIVER (DP83825S_PHY_ID ,"TI DP83825S" ), +DP8382X_PHY_DRIVER (DP83825CM_PHY_ID ,"TI DP83825M" ), +DP8382X_PHY_DRIVER (DP83825CS_PHY_ID ,"TI DP83825CS" ), };module_phy_driver (dp83822_driver);
Signature · 1 line
2.26.2
kernel test robot
build botRe: [PATCH net-next v8 5/5] net: phy: DP83822: Add setting the fixed internal delay
I love your patch! Perhaps something to improve:
Hi Dan,
I love your patch! Perhaps something to improve:
[auto build test WARNING 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-allyesconfig (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
All warnings (new ones prefixed by >>, old ones prefixed by <<):
>> drivers/net/phy/dp83822.c:284:7: warning: variable 'rgmii_delay' is used uninitialized whenever 'if' condition is true [-Wsometimes-uninitialized]
if (rx_int_delay <= 0)
^~~~~~~~~~~~~~~~~drivers/net/phy/dp83822.c:296:7: note: uninitialized use occurs here
if (rgmii_delay) {
^~~~~~~~~~~drivers/net/phy/dp83822.c:284:3: note: remove the 'if' if its condition is always false if (rx_int_delay <= 0)
^~~~~~~~~~~~~~~~~~~~~~drivers/net/phy/dp83822.c:276:17: note: initialize the variable 'rgmii_delay' to silence this warning int rgmii_delay;
^
= 0
1 warning generated.
vim +284 drivers/net/phy/dp83822.c
272
273 static int dp83822_config_init(struct phy_device *phydev)
274 {
275 struct device *dev = &phydev->mdio.dev;
276 int rgmii_delay;
277 s32 rx_int_delay;
278 s32 tx_int_delay;
279 int err = 0;
280
281 if (phy_interface_is_rgmii(phydev)) {
282 rx_int_delay = phy_get_internal_delay(phydev, dev, NULL, 0,
283 true);
> 284 if (rx_int_delay <= 0)
285 rx_int_delay = 0;
286 else
287 rgmii_delay = DP83822_RX_CLK_SHIFT;
288
289 tx_int_delay = phy_get_internal_delay(phydev, dev, NULL, 0,
290 false);
291 if (tx_int_delay <= 0)
292 tx_int_delay = 0;
293 else
294 rgmii_delay |= DP83822_TX_CLK_SHIFT;
295
296 if (rgmii_delay) {
297 err = phy_set_bits_mmd(phydev, DP83822_DEVADDR,
298 MII_DP83822_RCSR, rgmii_delay);
299 if (err)
300 return err;
301 }
302 }
303
304 return dp8382x_disable_wol(phydev);
305 }
306
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]