| Message ID | 20200617182019.6790-3-dmurphy@ti.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next,v7,1/6] dt-bindings: net: Add tx and rx internal delays | expand |
On Wed, Jun 17, 2020 at 01:20:15PM -0500, Dan Murphy wrote: > 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> > --- > drivers/net/phy/phy_device.c | 68 ++++++++++++++++++++++++++++++++++++ > include/linux/phy.h | 4 +++ > 2 files changed, 72 insertions(+) > > diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c > index 04946de74fa0..611d4e68e3c6 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,73 @@ void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause) > } > EXPORT_SYMBOL(phy_get_pause); > > +/** > + * 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. > + * Or if size == 0 then the delay read from the firmware is returned. > + * The array must be in ascending order. > + * Return errno 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 ret; > + int i; > + s32 delay; > + > + if (is_rx) > + ret = device_property_read_u32(dev, "rx-internal-delay-ps", > + &delay); > + else > + ret = device_property_read_u32(dev, "tx-internal-delay-ps", > + &delay); > + if (ret) { > + phydev_err(phydev, "internal delay not defined\n"); This is an optional property. So printing an error message seems heavy handed. Maybe it would be better to default to 0 if the property is not found, and continue with the lookup in the table to find what value should be written for a 0ps delay? Andrew
Andrew On 6/17/20 8:51 PM, Andrew Lunn wrote: > On Wed, Jun 17, 2020 at 01:20:15PM -0500, Dan Murphy wrote: >> 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> >> --- >> drivers/net/phy/phy_device.c | 68 ++++++++++++++++++++++++++++++++++++ >> include/linux/phy.h | 4 +++ >> 2 files changed, 72 insertions(+) >> >> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c >> index 04946de74fa0..611d4e68e3c6 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,73 @@ void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause) >> } >> EXPORT_SYMBOL(phy_get_pause); >> >> +/** >> + * 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. >> + * Or if size == 0 then the delay read from the firmware is returned. >> + * The array must be in ascending order. >> + * Return errno 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 ret; >> + int i; >> + s32 delay; >> + >> + if (is_rx) >> + ret = device_property_read_u32(dev, "rx-internal-delay-ps", >> + &delay); >> + else >> + ret = device_property_read_u32(dev, "tx-internal-delay-ps", >> + &delay); >> + if (ret) { >> + phydev_err(phydev, "internal delay not defined\n"); > This is an optional property. So printing an error message seems heavy > handed. I will change this to phydev_info > Maybe it would be better to default to 0 if the property is not found, > and continue with the lookup in the table to find what value should be > written for a 0ps delay? If the property is not found what would we look up? The property missing to me indicates that the phy is not adding the delay for that path. If these properties are not present then the delay should not be set by the device driver. This is why I return -EINVAL. Maybe I should return -ENODATA instead. Dan > > Andrew
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 04946de74fa0..611d4e68e3c6 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,73 @@ void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause) } EXPORT_SYMBOL(phy_get_pause); +/** + * 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. + * Or if size == 0 then the delay read from the firmware is returned. + * The array must be in ascending order. + * Return errno 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 ret; + int i; + s32 delay; + + if (is_rx) + ret = device_property_read_u32(dev, "rx-internal-delay-ps", + &delay); + else + ret = device_property_read_u32(dev, "tx-internal-delay-ps", + &delay); + if (ret) { + phydev_err(phydev, "internal delay not defined\n"); + return -EINVAL; + } + + if (delay < 0) + return -EINVAL; + + if (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);
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> --- drivers/net/phy/phy_device.c | 68 ++++++++++++++++++++++++++++++++++++ include/linux/phy.h | 4 +++ 2 files changed, 72 insertions(+) -- 2.26.2