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=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM autolearn=ham autolearn_force=no version=3.4.1 X-Yandex-Fwd: 2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1653064203; bh=3tr//uNHb0fNaIKte1dxUGx9/2EAbhNcdtFpD/d0IHY=; h=Reply-To:In-Reply-To:References:Date:Subject:Cc:To:From: Message-Id; b=lpVz9T6L+DlLUlz6H1h9WU7r8g14yJraXbXdcfxJFl7W+V/cX2nN6ntHVaiKLMoVa 3celKW/phpVOiVM4M4fG7WJIdAu2TrK4X/52MwTdYBrr6r1rSDrVAkRQ0C2kxyD93a J679N0MqOX04oYRi/lJ1U3Qk/8PC7nhc5xR1WscM= Authentication-Results: sas1-521fc86eeedc.qloud-c.yandex.net; dkim=pass header.i=@yandex.ru From: asheplyakov@yandex.ru To: devel@lists.altlinux.org Date: Fri, 20 May 2022 20:28:38 +0400 Message-Id: <20220520162849.1554351-25-asheplyakov@yandex.ru> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220520162849.1554351-1-asheplyakov@yandex.ru> References: <20220520162849.1554351-1-asheplyakov@yandex.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: Vitaly Chikunov , Igor Chudov , Alexey Sheplyakov , Evgeny Sinelnikov Subject: [devel] [PATCH 24/35] net: fwnode_get_phy_id: consider all compatible strings X-BeenThere: devel@lists.altlinux.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: ALT Linux Team development discussions List-Id: ALT Linux Team development discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 May 2022 16:30:15 -0000 Archived-At: List-Archive: List-Post: From: Alexey Sheplyakov 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. 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 ce0bb5951b81..27cf041fafb1 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -840,18 +840,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.32.0