From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on sa.local.altlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,BAYES_00, RP_MATCHES_RCVD autolearn=unavailable autolearn_force=no version=3.4.1 From: Alexey Sheplyakov To: devel-kernel@lists.altlinux.org Date: Wed, 14 Dec 2022 17:18:57 +0400 Message-Id: <20221214131919.681481-10-asheplyakov@basealt.ru> X-Mailer: git-send-email 2.33.5 In-Reply-To: <20221214131919.681481-1-asheplyakov@basealt.ru> References: <20221214131919.681481-1-asheplyakov@basealt.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=A1=D1=82=D0=B0=D0=B2=D1=86=D0=B5=D0=B2?= , =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=A7=D1=83=D0=B4=D0=BE=D0=B2?= , =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=A1=D0=B8=D0=BD=D0=B5=D0=BB=D1=8C=D0=BD=D0=B8=D0=BA=D0=BE=D0=B2?= , =?UTF-8?q?=D0=94=D0=BC=D0=B8=D1=82=D1=80=D0=B8=D0=B9=20=D0=A2=D0=B5=D1=80=D1=91=D1=85=D0=B8=D0=BD?= Subject: [d-kernel] [PATCH 10/32] net: fwnode_get_phy_id: consider all compatible strings X-BeenThere: devel-kernel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux kernel packages development List-Id: ALT Linux kernel packages development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Dec 2022 13:20:14 -0000 Archived-At: List-Archive: List-Post: Commit cf99686072a1b7037a1d782b66037b2b722bf2c9 ("of: mdio: Refactor of_get_phy_id()") has broken Ethernet on TF307 board (and possibly other boards based on Baikal-M/T1 SoCs). That commit replaces `of_get_phy_id` with `fwnode_get_phy_id`. And `fwnode_get_phy_id` considers only the 1st compatible string to find out phy_id. This works well for all schema compliant device trees, since the `compatible` property of PHY nodes is supposed to be "ethernet-phy-idNNNN.MMMM". However DTB embedded in TF307 firmware describes PHY like this: gmac0_phy: ethernet-phy@3 { compatible = "micrel,ksz9031", "ethernet-phy-id0022.1620", "ethernet-phy-ieee802.3-c22"; reg = <0x3>; }; That is, the 1st compatible string is "micrel,ksz9031". Thus `fwnode_get_phy_id` is unable to parse phy_id, and `stmmac_mdio_register` fails. As a result Ethernet driver is unable to attach to PHY, and can't send/receive anything. To avoid the problem this patch adjusts `fwnode_get_phy_id` to consider *all* compatible strings. Signed-off-by: Alexey Sheplyakov X-DONTUPSTREAM X-feature-Baikal-M --- drivers/net/phy/phy_device.c | 41 ++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 11 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 8cff61dbc4b5..2431a320c5ee 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -875,18 +875,37 @@ static int get_phy_c22_id(struct mii_bus *bus, int addr, u32 *phy_id) int fwnode_get_phy_id(struct fwnode_handle *fwnode, u32 *phy_id) { unsigned int upper, lower; - const char *cp; - int ret; - - ret = fwnode_property_read_string(fwnode, "compatible", &cp); - if (ret) - return ret; - - if (sscanf(cp, "ethernet-phy-id%4x.%4x", &upper, &lower) != 2) - return -EINVAL; + const char **compat; + int ret, count, i; + + /* FIXME: where is fwnode_property_for_each_string? */ + count = fwnode_property_read_string_array(fwnode, "compatible", NULL, 0); + if (count < 0) + return count; + else if (count == 0) + return -ENODATA; + + compat = kcalloc(count, sizeof(*compat), GFP_KERNEL); + if (!compat) + return -ENOMEM; + ret = fwnode_property_read_string_array(fwnode, "compatible", compat, count); + if (ret < 0) + goto out; - *phy_id = ((upper & GENMASK(15, 0)) << 16) | (lower & GENMASK(15, 0)); - return 0; + ret = -EINVAL; + for (i = 0; i < count; i++) { + pr_info("%s: considering '%s'\n", __func__, compat[i]); + if (sscanf(compat[i], "ethernet-phy-id%4x.%4x", &upper, &lower) != 2) + continue; + else { + *phy_id = ((upper & GENMASK(15, 0)) << 16) | (lower & GENMASK(15, 0)); + ret = 0; + break; + } + } +out: + kfree(compat); + return ret; } EXPORT_SYMBOL(fwnode_get_phy_id); -- 2.33.5