From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.216.99 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795050006; b=z8qfJ2yu/N65NzQ/hlib6h0oLbkP09Sczk58iuA8wXCaomBTmaoscTy9g/GnLIqyuXid I9hwVvWJZLaQ6WbLakoB+4kF6O9IZdHmZsAh1cFKMc8kTqGIbNhLP/CDd8Ov4rg5u6rPu 1XWVu7WThqDbMUoTrJW6qhBT4D3Lj/29PEgGieDOqR8fg4tlYtqGGEgmGfKRs3OVkLjah mLy5vRlyiTXeQylXaPfh/4Haa/0F5FhOjcD580vhQeS3rmPE680WKB+WJqvWIE6oxD6SK ZZNW5W9CnamZh7Olxym8GpV2BWThyhIAz6RnpEEybkcwR5mwTpBTfcGd0Oxp9VnzZwg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795050006; h=DMARC-Filter:Received:X-Google-DKIM-Signature:X-Gm-Message-State: X-Gm-Gg:X-Received:Received:X-Relaying-Domain:X-CFilter-Loop:Received: DKIM-Signature:X-Received:X-Received:Received:From:To:Cc:Subject:Date: Message-Id:X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-DetectorID-Processed; bh=QuYseT61ITMpaGhIYRTbXXLxXNObKQrY9rERRFsxjrM=; b=F655+eYVPt1YAJSedjsu/RduCruMsWO3pIIFgjuRXtgYmuZaT49HYsJaXe5t3+xXglHr V4wWmE1N6LA2H3TFPT1WoTvpr9ELq8qYJ6tw7rOVmesOd3X/176NzkwnCmjDbydWqcP7N nCFYp/AQPkT2ZVPzG9BAYuSRl1OeORE16CqdjQuOLKP+n+3UZG3L5CFiL3En9CaSuF7vz IUfxUz16/YGNRrSzCPoV8WFtdCNr+NftEyh26oeO/NfZ1DzLmzN6AkM58C5SkTZz2sRbV 4j/7+7w6M+X8GiCur9v59qiitQa6vzike3ZGRCZNNDObItYGPtr0Di7llcFOVumDQdg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass header.d=broadcom.com header.i=@broadcom.com header.a=rsa-sha256 header.s=google header.b=OQnHwK+A; arc=none smtp.remote-ip=209.85.216.99 Received: from mail-pj1-f99.google.com (mail-pj1-f99.google.com [209.85.216.99]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E37C660A382C for ; Thu, 19 Nov 2026 01:00:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org E37C660A382C Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.a=rsa-sha256 header.s=google header.b=OQnHwK+A Received: by mail-pj1-f99.google.com with SMTP id 98e67ed59e1d1-3b3a914e4c8so1080817a91.0 for ; Wed, 18 Nov 2026 17:00:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1795050005; x=1795654805; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=QuYseT61ITMpaGhIYRTbXXLxXNObKQrY9rERRFsxjrM=; b=BbY+Ws6qzD1q3W7Em0J6nJucZOQ7tursjFAnExSQTP5unFWdfMAGSjAou4+WXZFtls IVXOoa/qij2WIBbfJrUYbFw6tfyBX1taWKTfa83rIw3vH8a99+JU6Fndlh2BNmzGTsY9 hH1FCpHmkyKXl3R9Upyy7quLpbH5lq5IZIU0sAUICOgt4TwE/2UaB7n8TxIqqurD4pGn x1vzx6a9FeS6pnnncg1YhtheJ6JNknM97IAHTdB4s4gxeda8tWHhblktz9eyACeQ9smO 8DkjwFRS5F8F+9gROxr1h4dnd1JTa//OvtYy34yW9nRevpwt2hcWFqUqkTmO9zEfFKjM wtnQ== X-Gm-Message-State: APuU4Z8y/5ibzGm9n6KOAmBaEtxyzPjs9TkKmiDswYKWTpaKqg2Z+OIn iHGSwH9NDML8wtTfSj18WSWYPUwDTom8e9MyM3UQbcZnh23F1plkoFcmr5XJqBuiKWgyzlGPOp1 b6gZgkqOMs/HTUODYmkucv3lKq5ve80tHuLR25OuGmAlA1qV0331wXsNSg50h1KhePJNyaqGsJU SM58OkINYMhdDHEa7kR/TfIvp8UXfZ2LrO90VFS1g/7uuPTnO2ApeC3Qn+O1w8L+gj9Pbz5E/kM fKvmUQlGrBY/jxE X-Gm-Gg: AZFdTZdtOH0RtURs7c8HO2vscqKiKa7aZdTtDDQUJqtQCkTCQZ5MQVk85rccCzBMNNA SinYKNqLbVo4zMCypC4Zr6El0rpBMPDMz/3JPcFRftdRTPQLQHW7wCaRg84q30jyHO02PaU8kIz lO3CiF6tFElE3qFZkCWsvkUgp2VARxhCqldz9ZBDdL9lPcfHylx7fMXEDUEb8k+G66jzRObCfj9 tMcR8g6laWLnTyw/NTMkvxVSf7HH34lZn3zOhISRGk2b/yoBV+u5l0fazH79zX+XUiaFyqcb4WX WOst4Gw94LRvY3IFZlwlkbB+bqKvHMyg8P+lTrzSw0mAW6inxvV2mEXnXIfGrsESmXYxZFIeKP4 MqabVrQQZvpZN9C7KktEQ6d5IjzUqderqnQRmxx/GUEAj+nWp2haHu2gH9wefu108g4wIB58PMb 3sCBvFlEdA841YDAZUCFtDHBgCCy7vlADh9P0jnclp5JQ= X-Received: by 2002:a17:90b:164d:b0:3b1:647b:769e with SMTP id 98e67ed59e1d1-3b3d07e160emr4076204a91.57.1795050005080; Wed, 18 Nov 2026 17:00:05 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-123.dlp.protect.broadcom.com. [144.49.247.123]) by smtp-relay.gmail.com with ESMTPS id 98e67ed59e1d1-3b3fdef65ffsm373790a91.4.2026.11.18.17.00.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Nov 2026 17:00:05 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-92101559a2bso27966346d6.3 for ; Wed, 18 Nov 2026 17:00:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1795050004; x=1795654804; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=QuYseT61ITMpaGhIYRTbXXLxXNObKQrY9rERRFsxjrM=; b=OQnHwK+A1nevL5OEEouCi0evRs25YI88u8qUUc2DZqneyxeV97/ZD9XO+NimgogDTQ qiaDu/6T6362pKayYGxmjg6G0hyxXkj7eocE7Yselh/4dfP+SottZZh4K+DyuPaaV95Y eRqtQXh+tU1fGpddZv8syQI4qJ7EQ88fOhxEU= X-Received: by 2002:a05:6214:4806:b0:921:27a1:a4e5 with SMTP id 6a1803df08f44-92127a1b798mr12064266d6.28.1795050003610; Wed, 18 Nov 2026 17:00:03 -0800 (PST) X-Received: by 2002:a05:6214:4806:b0:921:27a1:a4e5 with SMTP id 6a1803df08f44-92127a1b798mr12063596d6.28.1795050002747; Wed, 18 Nov 2026 17:00:02 -0800 (PST) Received: from stbirv-lnx-1.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-92114d10f89sm35861216d6.13.2026.11.18.17.00.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2026 17:00:02 -0800 (PST) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Carlos Soto , Justin Chen , Doug Berger , Nicolai Buchwitz , Broadcom internal kernel review list , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , linux-kernel@vger.kernel.org (open list), Mlody12 mlody12 Subject: [PATCH net-next v4 4/4] net: mdio: mdio-bcm-unimac: Add Clause 45 support Date: Wed, 18 Nov 2026 16:59:43 -0800 Message-Id: <20261119005943.999981-5-florian.fainelli@broadcom.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20261119005943.999981-1-florian.fainelli@broadcom.com> References: <20261119005943.999981-1-florian.fainelli@broadcom.com> X-Mailing-List: netdev@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Add Clause 45 read/write support to the UniMAC MDIO bus controller driver by implementing the read_c45/write_c45 bus callbacks. Each access performs the two-step C45 sequence (ADDR cycle followed by a READ/WRITE cycle) under the bus lock and switches MDIO_CFG between C22 and C45 mode as needed; MDIO_CFG is only written when the mode actually changes. Also skip the BMSR workaround read in unimac_mdio_reset() for children compatible with "ethernet-phy-ieee802.3-c45", since such PHYs are not expected to respond to C22 accesses. Note that providing read_c45/write_c45 also makes the MDIO core scan for C45 PHYs at registration time, on addresses that are not masked and do not already have a C22 device. This includes the platform device that GENET instantiates when it is probed without a Device Tree node (e.g.: ACPI), which does not mask any address. Signed-off-by: Florian Fainelli Co-developed-by: Carlos Soto Signed-off-by: Carlos Soto Co-developed-by: Justin Chen Signed-off-by: Justin Chen --- drivers/net/mdio/mdio-bcm-unimac.c | 125 +++++++++++++++++++++++++++-- 1 file changed, 117 insertions(+), 8 deletions(-) diff --git a/drivers/net/mdio/mdio-bcm-unimac.c b/drivers/net/mdio/mdio-bcm-unimac.c index f8e5c1811d96..a79830566abb 100644 --- a/drivers/net/mdio/mdio-bcm-unimac.c +++ b/drivers/net/mdio/mdio-bcm-unimac.c @@ -24,10 +24,16 @@ #define MDIO_OP_SHIFT 26 #define MDIO_RD_C22 (2 << MDIO_OP_SHIFT) #define MDIO_WR_C22 (1 << MDIO_OP_SHIFT) +#define MDIO_ADDR_C45 (0 << MDIO_OP_SHIFT) +#define MDIO_WR_C45 (1 << MDIO_OP_SHIFT) +#define MDIO_RD_C45 (3 << MDIO_OP_SHIFT) #define MDIO_PMD_SHIFT 21 #define MDIO_PMD_MASK 0x1F #define MDIO_REG_SHIFT 16 #define MDIO_REG_MASK 0x1F +#define MDIO_DEVAD_SHIFT 16 +#define MDIO_DEVAD_MASK GENMASK(20, 16) +#define MDIO_C45_REG_MASK GENMASK(15, 0) #define MDIO_CFG 0x04 #define MDIO_C22 (1 << 0) @@ -97,7 +103,53 @@ static int unimac_mdio_poll(void *wait_func_data) MDIO_CMD); } -static int unimac_mdio_read(struct mii_bus *bus, int phy_id, int reg) +static u32 unimac_mdio_c45_devad(int devad) +{ + return ((u32)devad << MDIO_DEVAD_SHIFT) & MDIO_DEVAD_MASK; +} + +static int unimac_mdio_addr_c45(struct unimac_mdio_priv *priv, + int phy_id, int devad, int reg) +{ + u32 cmd; + int ret; + + /* Prepare the addr c45 operation */ + cmd = MDIO_ADDR_C45 | (phy_id << MDIO_PMD_SHIFT) | + unimac_mdio_c45_devad(devad) | (reg & MDIO_C45_REG_MASK); + unimac_mdio_writel(priv, cmd, MDIO_CMD); + + /* Start MDIO transaction */ + unimac_mdio_start(priv); + + ret = priv->wait_func(priv->wait_func_data); + if (ret) + return ret; + + /* Some wait_func implementations (e.g.: bcmgenet_mii_wait()) return 0 + * even when they timed out with the controller still busy. The data + * cycle must not be started before the ADDR cycle has completed, so + * make sure the controller is idle. + */ + return unimac_mdio_poll(priv); +} + +static void unimac_mdio_set_clause(struct unimac_mdio_priv *priv, bool is_c45) +{ + u32 cfg = unimac_mdio_readl(priv, MDIO_CFG); + u32 new_cfg = cfg; + + if (is_c45) + new_cfg &= ~MDIO_C22; + else + new_cfg |= MDIO_C22; + + if (new_cfg != cfg) + unimac_mdio_writel(priv, new_cfg, MDIO_CFG); +} + +static int unimac_mdio_do_read(struct mii_bus *bus, int phy_id, int devad, + int reg, bool is_c45) { struct unimac_mdio_priv *priv = bus->priv; int ret; @@ -108,8 +160,19 @@ static int unimac_mdio_read(struct mii_bus *bus, int phy_id, int reg) return ret; /* Prepare the read operation */ - cmd = MDIO_RD_C22 | (phy_id << MDIO_PMD_SHIFT) | - (reg << MDIO_REG_SHIFT); + unimac_mdio_set_clause(priv, is_c45); + if (is_c45) { + ret = unimac_mdio_addr_c45(priv, phy_id, devad, reg); + if (ret) + goto out; + + cmd = MDIO_RD_C45 | (phy_id << MDIO_PMD_SHIFT) | + unimac_mdio_c45_devad(devad) | + (reg & MDIO_C45_REG_MASK); + } else { + cmd = MDIO_RD_C22 | (phy_id << MDIO_PMD_SHIFT) | + (reg << MDIO_REG_SHIFT); + } unimac_mdio_writel(priv, cmd, MDIO_CMD); /* Start MDIO transaction */ @@ -137,8 +200,8 @@ static int unimac_mdio_read(struct mii_bus *bus, int phy_id, int reg) return ret; } -static int unimac_mdio_write(struct mii_bus *bus, int phy_id, - int reg, u16 val) +static int unimac_mdio_do_write(struct mii_bus *bus, int phy_id, int devad, + int reg, u16 val, bool is_c45) { struct unimac_mdio_priv *priv = bus->priv; u32 cmd; @@ -149,18 +212,50 @@ static int unimac_mdio_write(struct mii_bus *bus, int phy_id, return ret; /* Prepare the write operation */ - cmd = MDIO_WR_C22 | (phy_id << MDIO_PMD_SHIFT) | - (reg << MDIO_REG_SHIFT) | (0xffff & val); + unimac_mdio_set_clause(priv, is_c45); + if (is_c45) { + ret = unimac_mdio_addr_c45(priv, phy_id, devad, reg); + if (ret) + goto out; + + cmd = MDIO_WR_C45 | (phy_id << MDIO_PMD_SHIFT) | + unimac_mdio_c45_devad(devad) | (0xffff & val); + } else { + cmd = MDIO_WR_C22 | (phy_id << MDIO_PMD_SHIFT) | + (reg << MDIO_REG_SHIFT) | (0xffff & val); + } unimac_mdio_writel(priv, cmd, MDIO_CMD); unimac_mdio_start(priv); ret = priv->wait_func(priv->wait_func_data); +out: clk_disable_unprepare(priv->clk); return ret; } +static int unimac_mdio_read(struct mii_bus *bus, int phy_id, int reg) +{ + return unimac_mdio_do_read(bus, phy_id, 0, reg, false); +} + +static int unimac_mdio_write(struct mii_bus *bus, int phy_id, int reg, u16 val) +{ + return unimac_mdio_do_write(bus, phy_id, 0, reg, val, false); +} + +static int unimac_mdio_read_c45(struct mii_bus *bus, int addr, int dev, int reg) +{ + return unimac_mdio_do_read(bus, addr, dev, reg, true); +} + +static int unimac_mdio_write_c45(struct mii_bus *bus, int addr, int dev, + int reg, u16 val) +{ + return unimac_mdio_do_write(bus, addr, dev, reg, val, true); +} + /* Workaround for integrated BCM7xxx Gigabit PHYs which have a problem with * their internal MDIO management controller making them fail to successfully * be read from or written to for the first transaction. We insert a dummy @@ -191,6 +286,10 @@ static int unimac_mdio_reset(struct mii_bus *bus) if (addr < 0) continue; + if (of_device_is_compatible(child, + "ethernet-phy-ieee802.3-c45")) + continue; + read_mask |= 1 << addr; } } @@ -302,6 +401,8 @@ static int unimac_mdio_probe(struct platform_device *pdev) bus->parent = &pdev->dev; bus->read = unimac_mdio_read; bus->write = unimac_mdio_write; + bus->read_c45 = unimac_mdio_read_c45; + bus->write_c45 = unimac_mdio_write_c45; bus->reset = unimac_mdio_reset; snprintf(bus->id, MII_BUS_ID_SIZE, "%s-%d", pdev->name, pdev->id); @@ -337,8 +438,16 @@ static void unimac_mdio_remove(struct platform_device *pdev) static int __maybe_unused unimac_mdio_resume(struct device *d) { struct unimac_mdio_priv *priv = dev_get_drvdata(d); + int ret; + + /* MDIO_CFG is also modified by the MDIO accessors to switch between + * Clause 22 and Clause 45, which run under the bus lock. + */ + mutex_lock(&priv->mii_bus->mdio_lock); + ret = unimac_mdio_clk_set(priv); + mutex_unlock(&priv->mii_bus->mdio_lock); - return unimac_mdio_clk_set(priv); + return ret; } static SIMPLE_DEV_PM_OPS(unimac_mdio_pm_ops, -- 2.34.1