| Message ID | 20180619160950.6283-2-brgl@bgdev.pl (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/19/2018 09:09 AM, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > This patch reverts commit 3243ff2a05ec ("net: ethernet: davinci_emac: > Deduplicate bus_find_device() by name matching") and adds a comment > which should stop anyone from reintroducing the same "fix" in the future. > > We can't use bus_find_device_by_name() here because the device name is > not guaranteed to be 'davinci_mdio'. On some systems it can be > 'davinci_mdio.0' so we need to use strncmp() against the first part of > the string to correctly match it. > > Fixes: 3243ff2a05ec ("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") > Cc: stable@vger.kernel.org > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > --- > drivers/net/ethernet/ti/davinci_emac.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c > index 06d7c9e4dcda..a1a6445b5a7e 100644 > --- a/drivers/net/ethernet/ti/davinci_emac.c > +++ b/drivers/net/ethernet/ti/davinci_emac.c > @@ -1385,6 +1385,11 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd) > return -EOPNOTSUPP; > } > > +static int match_first_device(struct device *dev, void *data) > +{ > + return !strncmp(dev_name(dev), "davinci_mdio", 12); const char *bus_name = "davinci_mdio"; return !strncmp(dev_name(dev), bus_name, strlen(bus_name)); Or even better yet, if you want to make sure this really is a PHY device that you are trying to match, you could try to use sscanf() with PHY_ID_FMT.
On Tue, Jun 19, 2018 at 06:09:48PM +0200, Bartosz Golaszewski wrote: > From: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > This patch reverts commit 3243ff2a05ec ("net: ethernet: davinci_emac: > Deduplicate bus_find_device() by name matching") and adds a comment > which should stop anyone from reintroducing the same "fix" in the future. > > We can't use bus_find_device_by_name() here because the device name is > not guaranteed to be 'davinci_mdio'. On some systems it can be > 'davinci_mdio.0' so we need to use strncmp() against the first part of > the string to correctly match it. > > Fixes: 3243ff2a05ec ("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") > Cc: stable@vger.kernel.org > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> This is still Acked-by: Lukas Wunner <lukas@wunner.de> given that my patch which is reverted here seems to have been incorrect. Feel free to keep the ack if you respin in response to Florian Fainelli's comments. Thanks, Lukas > --- > drivers/net/ethernet/ti/davinci_emac.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c > index 06d7c9e4dcda..a1a6445b5a7e 100644 > --- a/drivers/net/ethernet/ti/davinci_emac.c > +++ b/drivers/net/ethernet/ti/davinci_emac.c > @@ -1385,6 +1385,11 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd) > return -EOPNOTSUPP; > } > > +static int match_first_device(struct device *dev, void *data) > +{ > + return !strncmp(dev_name(dev), "davinci_mdio", 12); > +} > + > /** > * emac_dev_open - EMAC device open > * @ndev: The DaVinci EMAC network adapter > @@ -1484,8 +1489,14 @@ static int emac_dev_open(struct net_device *ndev) > > /* use the first phy on the bus if pdata did not give us a phy id */ > if (!phydev && !priv->phy_id) { > - phy = bus_find_device_by_name(&mdio_bus_type, NULL, > - "davinci_mdio"); > + /* NOTE: we can't use bus_find_device_by_name() here because > + * the device name is not guaranteed to be 'davinci_mdio'. On > + * some systems it can be 'davinci_mdio.0' so we need to use > + * strncmp() against the first part of the string to correctly > + * match it. > + */ > + phy = bus_find_device(&mdio_bus_type, NULL, NULL, > + match_first_device); > if (phy) { > priv->phy_id = dev_name(phy); > if (!priv->phy_id || !*priv->phy_id) > -- > 2.17.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
2018-06-19 18:55 GMT+02:00 Florian Fainelli <f.fainelli@gmail.com>: > On 06/19/2018 09:09 AM, Bartosz Golaszewski wrote: >> From: Bartosz Golaszewski <bgolaszewski@baylibre.com> >> >> This patch reverts commit 3243ff2a05ec ("net: ethernet: davinci_emac: >> Deduplicate bus_find_device() by name matching") and adds a comment >> which should stop anyone from reintroducing the same "fix" in the future. >> >> We can't use bus_find_device_by_name() here because the device name is >> not guaranteed to be 'davinci_mdio'. On some systems it can be >> 'davinci_mdio.0' so we need to use strncmp() against the first part of >> the string to correctly match it. >> >> Fixes: 3243ff2a05ec ("net: ethernet: davinci_emac: Deduplicate bus_find_device() by name matching") >> Cc: stable@vger.kernel.org >> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> >> --- >> drivers/net/ethernet/ti/davinci_emac.c | 15 +++++++++++++-- >> 1 file changed, 13 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c >> index 06d7c9e4dcda..a1a6445b5a7e 100644 >> --- a/drivers/net/ethernet/ti/davinci_emac.c >> +++ b/drivers/net/ethernet/ti/davinci_emac.c >> @@ -1385,6 +1385,11 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd) >> return -EOPNOTSUPP; >> } >> >> +static int match_first_device(struct device *dev, void *data) >> +{ >> + return !strncmp(dev_name(dev), "davinci_mdio", 12); > > const char *bus_name = "davinci_mdio"; > > return !strncmp(dev_name(dev), bus_name, strlen(bus_name)); > > Or even better yet, if you want to make sure this really is a PHY device > that you are trying to match, you could try to use sscanf() with PHY_ID_FMT. > -- > Florian I don't think this is necessary. This simple function would get too complicated with the additional buffer for the sscanf'ed phy name etc. Thanks, Bart -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/ti/davinci_emac.c b/drivers/net/ethernet/ti/davinci_emac.c index 06d7c9e4dcda..a1a6445b5a7e 100644 --- a/drivers/net/ethernet/ti/davinci_emac.c +++ b/drivers/net/ethernet/ti/davinci_emac.c @@ -1385,6 +1385,11 @@ static int emac_devioctl(struct net_device *ndev, struct ifreq *ifrq, int cmd) return -EOPNOTSUPP; } +static int match_first_device(struct device *dev, void *data) +{ + return !strncmp(dev_name(dev), "davinci_mdio", 12); +} + /** * emac_dev_open - EMAC device open * @ndev: The DaVinci EMAC network adapter @@ -1484,8 +1489,14 @@ static int emac_dev_open(struct net_device *ndev) /* use the first phy on the bus if pdata did not give us a phy id */ if (!phydev && !priv->phy_id) { - phy = bus_find_device_by_name(&mdio_bus_type, NULL, - "davinci_mdio"); + /* NOTE: we can't use bus_find_device_by_name() here because + * the device name is not guaranteed to be 'davinci_mdio'. On + * some systems it can be 'davinci_mdio.0' so we need to use + * strncmp() against the first part of the string to correctly + * match it. + */ + phy = bus_find_device(&mdio_bus_type, NULL, NULL, + match_first_device); if (phy) { priv->phy_id = dev_name(phy); if (!priv->phy_id || !*priv->phy_id)