| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame] | 1 | From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> |
| 2 | Date: Sun, 7 Nov 2021 14:20:40 +0100 |
| 3 | Subject: [PATCH] net: bgmac: connect to PHY even if it is BGMAC_PHY_NOREGS |
| 4 | MIME-Version: 1.0 |
| 5 | Content-Type: text/plain; charset=UTF-8 |
| 6 | Content-Transfer-Encoding: 8bit |
| 7 | |
| 8 | Recent bgmac change was meant to just fix a race between "Generic PHY" |
| 9 | and "bcm53xx" drivers after -EPROBE_DEFER. It modified bgmac to use |
| 10 | phy_connect() only if there is a real PHY device connected. |
| 11 | |
| 12 | That change broke bgmac on bcm47xx. bcma_phy_connect() now registers a |
| 13 | fixed PHY with the bgmac_phy_connect_direct(). That fails as another |
| 14 | fixed PHY (also using address 0) is already registered - by bcm47xx arch |
| 15 | code bcm47xx_register_bus_complete(). |
| 16 | |
| 17 | This change brings origial behaviour. It connects Ethernet interface |
| 18 | with pseudo-PHY (switch device) and adjusts Ethernet interface link to |
| 19 | match connected switch. |
| 20 | |
| 21 | This fixes: |
| 22 | [ 2.548098] bgmac_bcma bcma0:1: Failed to register fixed PHY device |
| 23 | [ 2.554584] bgmac_bcma bcma0:1: Cannot connect to phy |
| 24 | |
| 25 | Fixes: b5375509184d ("net: bgmac: improve handling PHY") |
| 26 | Link: https://lore.kernel.org/netdev/3639116e-9292-03ca-b9d9-d741118a4541@gmail.com/T/#u |
| 27 | Signed-off-by: Rafał Miłecki <rafal@milecki.pl> |
| 28 | --- |
| 29 | drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +- |
| 30 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 31 | |
| 32 | --- a/drivers/net/ethernet/broadcom/bgmac-bcma.c |
| 33 | +++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c |
| 34 | @@ -94,7 +94,7 @@ static int bcma_phy_connect(struct bgmac |
| 35 | return 0; |
| 36 | |
| 37 | /* Connect to the PHY */ |
| 38 | - if (bgmac->mii_bus && bgmac->phyaddr != BGMAC_PHY_NOREGS) { |
| 39 | + if (bgmac->mii_bus) { |
| 40 | snprintf(bus_id, sizeof(bus_id), PHY_ID_FMT, bgmac->mii_bus->id, |
| 41 | bgmac->phyaddr); |
| 42 | phy_dev = phy_connect(bgmac->net_dev, bus_id, bgmac_adjust_link, |