From patchwork Tue Aug 8 12:02:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 132543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2229475vqr; Tue, 8 Aug 2023 09:15:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEW/dQtXGrZJ1E3bscotItraVWk2UN57NkAk1BX3ontj3HHoVBNA9+EGKaFsYXsUJ2L3I+f X-Received: by 2002:aa7:d3ca:0:b0:523:2919:635e with SMTP id o10-20020aa7d3ca000000b005232919635emr244634edr.14.1691511347456; Tue, 08 Aug 2023 09:15:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691511347; cv=none; d=google.com; s=arc-20160816; b=mXkudK/AOpMtaq5HF8SEeUGSXoDndsEGNg2Zf9R9M1OdaruzBpRr8tyWf9P/kciQh7 DRUbucq4OpwfiH1aFW8Q3GL1T3nWOt2vPR35eCruoYTtkA3ueKUTw39G+9zTRevkR7LD UsS0YPrglcyFut2u9W+m9t+FjolmTO5vJUnFW4duWR2JBF5K2i4RasGdF4bhuwteZWlQ OJzIO2PQBGZrprX5IA3mlXRYlZpWSOx17d67c/ey5QQw0muTm3bGtNqDkAjsHoRcIMdD ySbtTTqTFhjM4tHss7Tw/OIlt+Y0fk8UxO0yz/54MFMNSfl6hQWi1UTfWvv3YgredgxX lVWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Ie3WcAqbCuJwn+bSe+8uiPLhrE9XYV8epIzLQ3pbcL4=; fh=JasQq+/aE4n2J4NVk4DcfWN/7M+L8rj/44xknio81SM=; b=gHy/GH/cLPXwT5aDZ8GDxECnARMdKAd9bLNLg9kmeLiqGurDCc7GCBhfk7kY/GLPGz G2ittuuMBDQMwlq18L8J5uOquPCua1tOIoOdlHe4pTA3ImS6OxE9kZk45vV958a6Jx2Y vCYB8zna9w6V0KWilkMjBKkK+k7zsrvp9T4Eadrmdj6wb1B4rB8kKxnWHUT9/kRsZM0K o1rti42uYeUATcEEH7kdInGV+hrxVSitRovAYcitgwrSIBGOk4bTbwycFXGkbIJZOq6m Yzt1rCWRCZ2J6lDMcKcCzaI3NDrDiuzcf4QoBlhzDywme0jjUU3QkOPSnpdlCig03aTw /Ekg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bgdev-pl.20221208.gappssmtp.com header.s=20221208 header.b=vr81aoTY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q20-20020aa7d454000000b00522b0c92f4csi7559711edr.353.2023.08.08.09.15.22; Tue, 08 Aug 2023 09:15:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@bgdev-pl.20221208.gappssmtp.com header.s=20221208 header.b=vr81aoTY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232156AbjHHQO1 (ORCPT + 99 others); Tue, 8 Aug 2023 12:14:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232130AbjHHQNI (ORCPT ); Tue, 8 Aug 2023 12:13:08 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC02D7EC5 for ; Tue, 8 Aug 2023 08:47:14 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-99357737980so848116666b.2 for ; Tue, 08 Aug 2023 08:47:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20221208.gappssmtp.com; s=20221208; t=1691509633; x=1692114433; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ie3WcAqbCuJwn+bSe+8uiPLhrE9XYV8epIzLQ3pbcL4=; b=vr81aoTYCnVftLlvwc8eEqGW2PKR2AJvxKFAJwSRtDiOD6hSFoy2VjX9y6DAQkvZs+ /0kChAVrTq8dN3ruHgKOST1WpvDV1XMSjb9M6o3P2kpmPFOqES0AxQ/bZ8MV2l7UXmUT huQC/hCpjO9FLTAC9fXDpkQsv6x+yI8EISREb4aX+bZDFGugkTfEIgkwH/clYJ3GswdC Ad8/BZsbtoRnwCBWh2Pfm6mugS6Egb8GGTot/IZTxk7dv83Ryeiv+fXpnUMYyqGuFGbC ZXWe4hzkzFeznu0hCu5JHfPv4/+pnFvrTe/w4Ff9pHJLADZ7LUcamJP7jB5xtitVIzdP SM4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691509633; x=1692114433; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ie3WcAqbCuJwn+bSe+8uiPLhrE9XYV8epIzLQ3pbcL4=; b=iMeILgKvIbbWb1BUKh89tJV7+ZfO73tYFo9Pz9TPF9bssGadcgL4GIF7LQITzs/j+P TnTN9bdQjDBUgg9enYUFu68C5y4j8KBjUk/qkFNLLmzRYJ40zeo0J5cAwaAy6DAVx9QL qZP3jo5zlYqHFJ9NOEqMBG+xGFSUqTGFSOu2e3UH6e0K/LwwNYGMI4Dy8oHjqB/7pE0p viz+8GJXTcrOJJiwJ0LsnmxnTYhBx1o0Gbil1aL6nVQQdpyL+xWcRrqxiyq/qbwpiHUc amd51iNVn7fGmz0Nvk2vry4TqX24GUeTFFa93CrnLzAjC5Ojb++lTHSxV1VGURnK6EBE Cq/w== X-Gm-Message-State: AOJu0YwbEP4VLr6CmbuYHA+vJmlFM63Qnekic0D3KiB5oYOlKmnwgc7H 8MAmZXgbYhtUEdBSmqZLRg0K0PIDN6aAy4liaRORUw== X-Received: by 2002:adf:ea11:0:b0:313:f1c8:a968 with SMTP id q17-20020adfea11000000b00313f1c8a968mr8055326wrm.2.1691496185883; Tue, 08 Aug 2023 05:03:05 -0700 (PDT) Received: from brgl-uxlite.home ([2a01:cb1d:334:ac00:6a08:bcc0:ae83:e1dc]) by smtp.gmail.com with ESMTPSA id v8-20020adfe4c8000000b00317046f21f9sm13499726wrm.114.2023.08.08.05.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Aug 2023 05:03:05 -0700 (PDT) From: Bartosz Golaszewski To: Alexandre Torgue , Jose Abreu , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , Alex Elder , Srini Kandagatla , Andrew Halaney Cc: netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH net-next] net: stmmac: don't create the MDIO bus if there's no mdio node on DT Date: Tue, 8 Aug 2023 14:02:54 +0200 Message-Id: <20230808120254.11653-1-brgl@bgdev.pl> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773678202527785439 X-GMAIL-MSGID: 1773678202527785439 From: Bartosz Golaszewski The stmmac_dt_phy() function that parses the device-tree node of the MAC and allocates the MDIO and PHY resources misses one use-case: when the MAC doesn't have a fixed link but also doesn't define its own mdio bus on the device tree and instead shares the MDIO lines with a different MAC with its PHY phandle reaching over into a different node. As this function could also use some more readability, rework it to handle this use-case and simplify the code. Signed-off-by: Bartosz Golaszewski Acked-by: Alexandre TORGUE --- .../ethernet/stmicro/stmmac/stmmac_platform.c | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index be8e79c7aa34..91844673df43 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -320,12 +320,14 @@ static int stmmac_mtl_setup(struct platform_device *pdev, static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, struct device_node *np, struct device *dev) { - bool mdio = !of_phy_is_fixed_link(np); static const struct of_device_id need_mdio_ids[] = { { .compatible = "snps,dwc-qos-ethernet-4.10" }, {}, }; + if (of_phy_is_fixed_link(np)) + return 0; + if (of_match_node(need_mdio_ids, np)) { plat->mdio_node = of_get_child_by_name(np, "mdio"); } else { @@ -340,20 +342,18 @@ static int stmmac_dt_phy(struct plat_stmmacenet_data *plat, } } - if (plat->mdio_node) { - dev_dbg(dev, "Found MDIO subnode\n"); - mdio = true; - } + if (!plat->mdio_node) + return 0; - if (mdio) { - plat->mdio_bus_data = - devm_kzalloc(dev, sizeof(struct stmmac_mdio_bus_data), - GFP_KERNEL); - if (!plat->mdio_bus_data) - return -ENOMEM; + dev_dbg(dev, "Found MDIO subnode\n"); - plat->mdio_bus_data->needs_reset = true; - } + plat->mdio_bus_data = devm_kzalloc(dev, + sizeof(struct stmmac_mdio_bus_data), + GFP_KERNEL); + if (!plat->mdio_bus_data) + return -ENOMEM; + + plat->mdio_bus_data->needs_reset = true; return 0; }