From: Florian Fainelli <f.fainelli@gmail.com> To: Darren Stevens <darren@stevens-zone.net>, madalin.bacur@nxp.com, netdev@vger.kernel.org Cc: oss@buserror.net, chzigotzky@xenosoft.de, linuxppc-dev@lists.ozlabs.org Subject: Re: [RFC PATCH dpss_eth] Don't initialise ports with no PHY Date: Fri, 24 Apr 2020 15:50:47 -0700 [thread overview] Message-ID: <b6d84c65-a75a-a64d-463f-b0646862e322@gmail.com> (raw) In-Reply-To: <20200424232938.1a85d353@Cyrus.lan> On 4/24/2020 3:29 PM, Darren Stevens wrote: > Since cbb961ca271e ("Use random MAC address when none is given") > Varisys Cyrus P5020 boards have been listing 5 ethernet ports instead of > the 2 the board has.This is because we were preventing the adding of the > unused ports by not suppling them a MAC address, which this patch now > supplies. > > Prevent them from appearing in the net devices list by checking for a > 'status="disabled"' entry during probe and skipping the port if we find > it. > > Signed-off-by: Darren Stevens <Darren@stevens-zone.net> > > --- > > drivers/net/ethernet/freescale/fman/mac.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c > index 43427c5..c9ed411 100644 > --- a/drivers/net/ethernet/freescale/fman/mac.c > +++ b/drivers/net/ethernet/freescale/fman/mac.c > @@ -606,6 +606,7 @@ static int mac_probe(struct platform_device *_of_dev) > struct resource res; > struct mac_priv_s *priv; > const u8 *mac_addr; > + const char *prop; > u32 val; > u8 fman_id; > phy_interface_t phy_if; > @@ -628,6 +629,16 @@ static int mac_probe(struct platform_device *_of_dev) > mac_dev->priv = priv; > priv->dev = dev; > > + /* check for disabled devices and skip them, as now a missing > + * MAC address will be replaced with a Random one rather than > + * disabling the port > + */ > + prop = of_get_property(mac_node, "status", NULL); > + if (prop && !strncmp(prop, "disabled", 8) { > + err = -ENODEV; > + goto _return > + } There is a sorter version: of_device_is_available(mac_node) which will do the same thing. > + > if (of_device_is_compatible(mac_node, "fsl,fman-dtsec")) { > setup_dtsec(mac_dev); > priv->internal_phy_node = of_parse_phandle(mac_node, > -- Florian
WARNING: multiple messages have this Message-ID (diff)
From: Florian Fainelli <f.fainelli@gmail.com> To: Darren Stevens <darren@stevens-zone.net>, madalin.bacur@nxp.com, netdev@vger.kernel.org Cc: oss@buserror.net, linuxppc-dev@lists.ozlabs.org, chzigotzky@xenosoft.de Subject: Re: [RFC PATCH dpss_eth] Don't initialise ports with no PHY Date: Fri, 24 Apr 2020 15:50:47 -0700 [thread overview] Message-ID: <b6d84c65-a75a-a64d-463f-b0646862e322@gmail.com> (raw) In-Reply-To: <20200424232938.1a85d353@Cyrus.lan> On 4/24/2020 3:29 PM, Darren Stevens wrote: > Since cbb961ca271e ("Use random MAC address when none is given") > Varisys Cyrus P5020 boards have been listing 5 ethernet ports instead of > the 2 the board has.This is because we were preventing the adding of the > unused ports by not suppling them a MAC address, which this patch now > supplies. > > Prevent them from appearing in the net devices list by checking for a > 'status="disabled"' entry during probe and skipping the port if we find > it. > > Signed-off-by: Darren Stevens <Darren@stevens-zone.net> > > --- > > drivers/net/ethernet/freescale/fman/mac.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c > index 43427c5..c9ed411 100644 > --- a/drivers/net/ethernet/freescale/fman/mac.c > +++ b/drivers/net/ethernet/freescale/fman/mac.c > @@ -606,6 +606,7 @@ static int mac_probe(struct platform_device *_of_dev) > struct resource res; > struct mac_priv_s *priv; > const u8 *mac_addr; > + const char *prop; > u32 val; > u8 fman_id; > phy_interface_t phy_if; > @@ -628,6 +629,16 @@ static int mac_probe(struct platform_device *_of_dev) > mac_dev->priv = priv; > priv->dev = dev; > > + /* check for disabled devices and skip them, as now a missing > + * MAC address will be replaced with a Random one rather than > + * disabling the port > + */ > + prop = of_get_property(mac_node, "status", NULL); > + if (prop && !strncmp(prop, "disabled", 8) { > + err = -ENODEV; > + goto _return > + } There is a sorter version: of_device_is_available(mac_node) which will do the same thing. > + > if (of_device_is_compatible(mac_node, "fsl,fman-dtsec")) { > setup_dtsec(mac_dev); > priv->internal_phy_node = of_parse_phandle(mac_node, > -- Florian
next prev parent reply other threads:[~2020-04-24 22:50 UTC|newest] Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-24 22:29 [RFC PATCH dpss_eth] Don't initialise ports with no PHY Darren Stevens 2020-04-24 22:29 ` Darren Stevens 2020-04-24 22:50 ` Florian Fainelli [this message] 2020-04-24 22:50 ` Florian Fainelli 2020-04-25 0:10 ` Andrew Lunn 2020-04-25 0:10 ` Andrew Lunn 2020-04-30 20:45 ` Darren Stevens 2020-04-29 8:26 ` [RFC PATCH dpss_eth] " Christian Zigotzky 2020-04-29 8:26 ` Christian Zigotzky 2020-04-29 13:12 ` Andrew Lunn 2020-04-29 13:12 ` Andrew Lunn 2020-04-29 13:55 ` Christian Zigotzky 2020-04-29 15:22 ` Andrew Lunn 2020-04-29 15:22 ` Andrew Lunn 2020-04-29 15:42 ` Christian Zigotzky 2020-04-29 15:42 ` Christian Zigotzky 2020-04-30 21:32 ` Darren Stevens 2020-05-01 5:35 ` Christian Zigotzky 2020-05-01 5:35 ` Christian Zigotzky
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=b6d84c65-a75a-a64d-463f-b0646862e322@gmail.com \ --to=f.fainelli@gmail.com \ --cc=chzigotzky@xenosoft.de \ --cc=darren@stevens-zone.net \ --cc=linuxppc-dev@lists.ozlabs.org \ --cc=madalin.bacur@nxp.com \ --cc=netdev@vger.kernel.org \ --cc=oss@buserror.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.