From: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
To: Gabriel Fernandez <gabriel.fernandez@linaro.org>,
Phil Reid <preid@electromag.com.au>, <davem@davemloft.net>,
Joachim Eastwood <manabian@gmail.com>,
Vince Bridgers <vbridger@opensource.altera.com>,
Mathieu Olivari <mathieu@codeaurora.org>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<alexandre.torgue@st.com>, <maxime.coquelin@st.com>
Subject: Re: [PATCH] stmmac: Fix 'eth0: No PHY found' regression
Date: Thu, 3 Mar 2016 09:02:39 +0100 [thread overview]
Message-ID: <56D7EF9F.6070900@st.com> (raw)
In-Reply-To: <1456762702-23713-1-git-send-email-gabriel.fernandez@linaro.org>
On 2/29/2016 5:18 PM, Gabriel Fernandez wrote:
> This patch manages the case when you have an Ethernet MAC with
> a "fixed link", and not connected to a normal MDIO-managed PHY device.
>
> The test of phy_bus_name was not helpful because it was never affected
> and replaced by the mdio test node.
>
> Signed-off-by: Gabriel Fernandez <gabriel.fernandez@linaro.org>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 11 +----------
> drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 9 ++++++++-
> include/linux/stmmac.h | 1 +
> 3 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> index 0faf163..efb54f3 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
> @@ -199,21 +199,12 @@ int stmmac_mdio_register(struct net_device *ndev)
> struct stmmac_priv *priv = netdev_priv(ndev);
> struct stmmac_mdio_bus_data *mdio_bus_data = priv->plat->mdio_bus_data;
> int addr, found;
> - struct device_node *mdio_node = NULL;
> - struct device_node *child_node = NULL;
> + struct device_node *mdio_node = priv->plat->mdio_node;
>
> if (!mdio_bus_data)
> return 0;
>
> if (IS_ENABLED(CONFIG_OF)) {
> - for_each_child_of_node(priv->device->of_node, child_node) {
> - if (of_device_is_compatible(child_node,
> - "snps,dwmac-mdio")) {
> - mdio_node = child_node;
> - break;
> - }
> - }
> -
> if (mdio_node) {
> netdev_dbg(ndev, "FOUND MDIO subnode\n");
> } else {
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> index 6a52fa1..4514ba7 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
> @@ -110,6 +110,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
> struct device_node *np = pdev->dev.of_node;
> struct plat_stmmacenet_data *plat;
> struct stmmac_dma_cfg *dma_cfg;
> + struct device_node *child_node = NULL;
>
> plat = devm_kzalloc(&pdev->dev, sizeof(*plat), GFP_KERNEL);
> if (!plat)
> @@ -140,13 +141,19 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac)
> plat->phy_node = of_node_get(np);
> }
>
> + for_each_child_of_node(np, child_node)
> + if (of_device_is_compatible(child_node, "snps,dwmac-mdio")) {
> + plat->mdio_node = child_node;
> + break;
> + }
> +
> /* "snps,phy-addr" is not a standard property. Mark it as deprecated
> * and warn of its use. Remove this when phy node support is added.
> */
> if (of_property_read_u32(np, "snps,phy-addr", &plat->phy_addr) == 0)
> dev_warn(&pdev->dev, "snps,phy-addr property is deprecated\n");
>
> - if ((plat->phy_node && !of_phy_is_fixed_link(np)) || plat->phy_bus_name)
> + if ((plat->phy_node && !of_phy_is_fixed_link(np)) || !plat->mdio_node)
> plat->mdio_bus_data = NULL;
> else
> plat->mdio_bus_data =
> diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
> index eead8ab..881a79d 100644
> --- a/include/linux/stmmac.h
> +++ b/include/linux/stmmac.h
> @@ -100,6 +100,7 @@ struct plat_stmmacenet_data {
> int interface;
> struct stmmac_mdio_bus_data *mdio_bus_data;
> struct device_node *phy_node;
> + struct device_node *mdio_node;
> struct stmmac_dma_cfg *dma_cfg;
> int clk_csr;
> int has_gmac;
>
next prev parent reply other threads:[~2016-03-03 8:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-29 16:18 [PATCH] stmmac: Fix 'eth0: No PHY found' regression Gabriel Fernandez
2016-03-03 8:02 ` Giuseppe CAVALLARO [this message]
2016-03-03 20:02 ` David Miller
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=56D7EF9F.6070900@st.com \
--to=peppe.cavallaro@st.com \
--cc=alexandre.torgue@st.com \
--cc=davem@davemloft.net \
--cc=gabriel.fernandez@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manabian@gmail.com \
--cc=mathieu@codeaurora.org \
--cc=maxime.coquelin@st.com \
--cc=netdev@vger.kernel.org \
--cc=preid@electromag.com.au \
--cc=vbridger@opensource.altera.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).