From patchwork Mon Aug 7 19:31:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 711270 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id F26B5C001DF for ; Mon, 7 Aug 2023 19:31:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230364AbjHGTbk (ORCPT ); Mon, 7 Aug 2023 15:31:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229773AbjHGTbi (ORCPT ); Mon, 7 Aug 2023 15:31:38 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC80B171A for ; Mon, 7 Aug 2023 12:31:36 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-317f1c480eeso610491f8f.2 for ; Mon, 07 Aug 2023 12:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20221208.gappssmtp.com; s=20221208; t=1691436695; x=1692041495; 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; bh=gUv2dCmaY1HQ3Em9YoZBFw+fysyiFKPhrXvqJWxPFfc=; b=fwYEVPozF0KvOAt3mvF2iWylh9QmqRqt6P7UQtmErMGi7zH3ak4HGMUMpMJ2bZ1lXm VYM/qx/GA1gZswRwl/BrgW8MPuzikyAs9Uxg3IBlbTWatJ03xBxshTdi4JF1qsKXjU1Z /irX6Ft5wQ+jIRnRo1aHiCGv3cgH7YDlBandU2g9jE10W7Khmwr/xqTS4Fj3vUO9DuL0 JwJ2sEeD3P7L1CiXMTb1Sjq0RnceQPtkEL4ODMK8QJzK7EQlNwG4r2u8V2vuZ4wfRueI HkX0Rlz77K+vIPk4wurJ+N4egWqsykC0CyJYc+WeeM9z8hzqB5rMFP7iOL9imijzAxEK AUug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691436695; x=1692041495; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gUv2dCmaY1HQ3Em9YoZBFw+fysyiFKPhrXvqJWxPFfc=; b=Kh5lcSVX7PYFgK5zAGGP6hUbhgoewIkWzW/M7Ir4tjM4Edc93SF65FZ0N77k0Rh8J4 5yHAP23QCr5LCIkfpruadhxtEY4SZbiMa9uVsjcnZAKQ2fgrLWOF7yWGWxng2QQU5P9H Cg/fViTC33wMGgD16ibuqQ6yHHpmCvIrW/3IpS55obT44eN3yc6lJ8KcLzhjW7u4w6mj KCH99qmICCPtMCuwAB+bRXgpsa+XzbtIEyc8sjqW3K85fqit4+Ne+IU/8HkMMWQA5wKZ M+c2fvaciKGMEnFnR8Hcud0B0gEB+ipVajcBHq6NMvXKgjrTsfa68l0Sd0+VLlHk/GMq 7vJg== X-Gm-Message-State: AOJu0YwX+lUcWy8MK1oVOkyWDEnXo5eYT/gjW3QaejnExUODoF8cxExv qPLZjaQn0aEOQy/FArctVH5nlQ== X-Google-Smtp-Source: AGHT+IGKHNN7HjiGFusOQDWkTj+8K7D28pYI8N1+cBGqCVE35V0LUQ9gkEQ2lEJmnrAT6utfK07xtA== X-Received: by 2002:a5d:5912:0:b0:317:606d:c767 with SMTP id v18-20020a5d5912000000b00317606dc767mr5959349wrd.44.1691436694877; Mon, 07 Aug 2023 12:31:34 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:b3d6:9e6:79d9:37cd]) by smtp.gmail.com with ESMTPSA id l7-20020a7bc347000000b003fbdbd0a7desm15985654wmj.27.2023.08.07.12.31.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Aug 2023 12:31:34 -0700 (PDT) From: Bartosz Golaszewski To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alexandre Torgue , Jose Abreu , Maxime Coquelin , Andrew Halaney , Alex Elder , Srini Kandagatla Cc: netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Bartosz Golaszewski Subject: [PATCH 2/2] net: stmmac: support shared MDIO Date: Mon, 7 Aug 2023 21:31:02 +0200 Message-Id: <20230807193102.6374-3-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230807193102.6374-1-brgl@bgdev.pl> References: <20230807193102.6374-1-brgl@bgdev.pl> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Bartosz Golaszewski When two MACs share the MDIO lines to their respective PHYs, one is considered the logical "owner" of the bus. The secondary controller must wait until the MDIO bus is registered before trying to attach to the PHY. If the mdio node is not defined for given MAC, try to read the "snps,shared-mdio" property on its node. If it exists, parse the phandle and store the result as the MAC's mdio device-tree node. When registering the MDIO bus: if we know that we share it with another MAC, lookup the MDIO bus and if it's not up yet, defer probe until it is. Signed-off-by: Bartosz Golaszewski --- drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 8 ++++++++ drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 6 ++++++ include/linux/stmmac.h | 1 + 3 files changed, 15 insertions(+) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c index dd9e2fec5328..6a74b91595d0 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c @@ -543,6 +543,14 @@ int stmmac_mdio_register(struct net_device *ndev) if (!mdio_bus_data) return 0; + if (priv->plat->flags & STMMAC_FLAG_SHARED_MDIO) { + new_bus = of_mdio_find_bus(mdio_node); + if (!new_bus) + return -EPROBE_DEFER; + + goto bus_register_done; + } + new_bus = mdiobus_alloc(); if (!new_bus) return -ENOMEM; diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index be8e79c7aa34..11a24b1c7beb 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -340,6 +340,12 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, } } + if (!plat->mdio_node) { + plat->mdio_node = of_parse_phandle(np, "snps,shared-mdio", 0); + if (plat->mdio_node) + plat->flags |= STMMAC_FLAG_SHARED_MDIO; + } + if (plat->mdio_node) { dev_dbg(dev, "Found MDIO subnode\n"); mdio = true; diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 3d0702510224..892f61051002 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h @@ -218,6 +218,7 @@ struct dwmac4_addrs { #define STMMAC_FLAG_INT_SNAPSHOT_EN BIT(9) #define STMMAC_FLAG_RX_CLK_RUNS_IN_LPI BIT(10) #define STMMAC_FLAG_EN_TX_LPI_CLOCKGATING BIT(11) +#define STMMAC_FLAG_SHARED_MDIO BIT(12) struct plat_stmmacenet_data { int bus_id;