From patchwork Thu Mar 16 23:33:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 71013 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp51937wrt; Thu, 16 Mar 2023 16:38:39 -0700 (PDT) X-Google-Smtp-Source: AK7set+GOymHbs7fpY4+fhn/AZE6MaoASsp2dqxcQ19kxIOBJpxfFjqcfBU0llFeWQKs8iOOlDqf X-Received: by 2002:a17:902:c713:b0:1a1:8d4e:a71d with SMTP id p19-20020a170902c71300b001a18d4ea71dmr4379392plp.46.1679009919498; Thu, 16 Mar 2023 16:38:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679009919; cv=none; d=google.com; s=arc-20160816; b=VUJUs4/9ka/OlAOQUinpEgv8YZYXQFU5mlc9Zp3LqUD9ZLwCLpqW1AtyOV3T45vyHx aehHSPEKvW+HN/JvKuHRi7p5FjqDX/+DIFJ0Y1PJVjzbwy8hpaC0MveUCqLs8CFYLo3K TWTCX32tUtKmMLPIf+ZHEZLp6UD6jKauE3gaRBfvKQYu5TaNlbvgFI4fq1Ci/OF1Fvct 5KmZVz2Vuq4lp/DNdBHLX5B7ImbdF9i0jq7JNYP9bncQEFFpfblorvMtwQUVtOrV9P68 GaoDt0bCV8ts4XZxNwZpKkjGPADo2RLH7B3JXv5NPBsqvGyNw+orgKpiPY9hhYcrqq0y aXKw== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=J4K0Alwze5WVk+SyveUpIJIy4H5vU2BjyURw6e2he+A=; b=zqlFbOXaGPToahovmTy26QiyFQ4Cn6pss9cML7hfnkI1CWMJPs5LAeMzISn6EKvRMA brnxOmOMrLpnw2/6Fu/jv6yPFCqZxEaZUblHhOlBrSWvGOD+wFIt8U4wHa9b1/85kpbJ 0PC5DWnyzuPW0UGoRVdJFMLi6UwcZ/P30T721nlkh8mc0HF652x/GuBjW4EHLjw5VQ70 OfKtDXh9C9zBPlcTDooQP5RMG6+Ni3a7zKZeQf2MtT3c+5qs5UYCbwDjWH/R1zRz4agz LI//Ly/MAwCXa7lknDIynFQUSkyRMmrVb+9bahsBeRozWUDS5Mbkra8RsFllP6DhSxbA Rnog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kVJaCl5u; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m18-20020a170902db1200b001a042f532besi765462plx.479.2023.03.16.16.38.24; Thu, 16 Mar 2023 16:38:39 -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=@gmail.com header.s=20210112 header.b=kVJaCl5u; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229733AbjCPXdc (ORCPT + 99 others); Thu, 16 Mar 2023 19:33:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229599AbjCPXd3 (ORCPT ); Thu, 16 Mar 2023 19:33:29 -0400 Received: from mail-pj1-x1031.google.com (mail-pj1-x1031.google.com [IPv6:2607:f8b0:4864:20::1031]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D688EB5B5E; Thu, 16 Mar 2023 16:33:27 -0700 (PDT) Received: by mail-pj1-x1031.google.com with SMTP id fy10-20020a17090b020a00b0023b4bcf0727so3244932pjb.0; Thu, 16 Mar 2023 16:33:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679009607; 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=J4K0Alwze5WVk+SyveUpIJIy4H5vU2BjyURw6e2he+A=; b=kVJaCl5u8yTAc3z47TfaSigSgSiadKLEbNWni/pksuix4OqOgDIe9Y6lkOaaEzV8X2 A6Ns9pIBYE5yutwSKC/OUG4qQzp4iOBqkDTxgyXbzJjfQzjaoiw+378H5dYAZXMsgJ+x 6xAwK1NS6wP2sh0ejPq4uPhDo6vtSosjFmg1yUW+9YQSE2zgvocJYEDmAoLnHqM1nA9w nJxU8j1A9feRvksdzp3lhy70TV73z3yHCpO+dho3xRGXRx1EHpReooaMq8He7f9Whdbg HVCXll4f8rccBfHtgb9e0RN9AqKOW3whfqbbDhhbN38buJNNj9KRx13X6ouxAsjwTsCB Qe7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679009607; 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=J4K0Alwze5WVk+SyveUpIJIy4H5vU2BjyURw6e2he+A=; b=XAuP95yWekQoP4g6gw6Lb4jlg3T/LH+KXvdYvvEJLo3S+R5qPvWnYw8c7BeRq5TCmo ARScxFGdDeG4m6sEZE6bNcCwKzdHXWV+Q+KpxcCJGMFTOTRUTHzmVb1Btr08UiMYtuf6 0/bhsZXArNWI2ry7A5zzs/3Aph77eusIccpoQ7D4FrFopP7ZkHJKFCqPWNL49BHK5TXk gP+Vc/ZKGRfa5l3NzQE9r8zlCtIL3MWKv1WG8KvR1mmJw0UOUQiDvi6Mq/ke0Vda7zMs d0fo1fc7+ZnYoFAweyg997kTuuNeCskBidjy7eLdLUVkYD+bDhjFlSmZsg7FQxNM6j87 dapw== X-Gm-Message-State: AO0yUKUnTPkCH80Z0aBIaGNAgimkazspwkRIpnQHAlsTRdhPEJqbYyGm TsfxWBBG1n021hHodpX1HngDdiNwApg= X-Received: by 2002:a17:902:d4c2:b0:1a1:86b4:7207 with SMTP id o2-20020a170902d4c200b001a186b47207mr5940399plg.2.1679009606741; Thu, 16 Mar 2023 16:33:26 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j1-20020a170903024100b0019f3cc3fc99sm260900plh.16.2023.03.16.16.33.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 16:33:26 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Maxime Bizon , Florian Fainelli , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Frank Rowand , "Rafael J. Wysocki" , Calvin Johnson , Grant Likely , Ioana Ciornei , linux-kernel@vger.kernel.org (open list), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v2 1/2] net: mdio: fix owner field for mdio buses registered using device-tree Date: Thu, 16 Mar 2023 16:33:16 -0700 Message-Id: <20230316233317.2169394-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230316233317.2169394-1-f.fainelli@gmail.com> References: <20230316233317.2169394-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760569505127379553?= X-GMAIL-MSGID: =?utf-8?q?1760569505127379553?= From: Maxime Bizon Bus ownership is wrong when using of_mdiobus_register() to register an mdio bus. That function is not inline, so when it calls mdiobus_register() the wrong THIS_MODULE value is captured. Signed-off-by: Maxime Bizon Fixes: 90eff9096c01 ("net: phy: Allow splitting MDIO bus/device support from PHYs") [florian: fix kdoc, added Fixes tag] Signed-off-by: Florian Fainelli Reviewed-by: Simon Horman --- drivers/net/mdio/of_mdio.c | 12 +++++++----- drivers/net/phy/mdio_devres.c | 11 ++++++----- include/linux/of_mdio.h | 22 +++++++++++++++++++--- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/drivers/net/mdio/of_mdio.c b/drivers/net/mdio/of_mdio.c index 510822d6d0d9..1e46e39f5f46 100644 --- a/drivers/net/mdio/of_mdio.c +++ b/drivers/net/mdio/of_mdio.c @@ -139,21 +139,23 @@ bool of_mdiobus_child_is_phy(struct device_node *child) EXPORT_SYMBOL(of_mdiobus_child_is_phy); /** - * of_mdiobus_register - Register mii_bus and create PHYs from the device tree + * __of_mdiobus_register - Register mii_bus and create PHYs from the device tree * @mdio: pointer to mii_bus structure * @np: pointer to device_node of MDIO bus. + * @owner: module owning the @mdio object. * * This function registers the mii_bus structure and registers a phy_device * for each child node of @np. */ -int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) +int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np, + struct module *owner) { struct device_node *child; bool scanphys = false; int addr, rc; if (!np) - return mdiobus_register(mdio); + return __mdiobus_register(mdio, owner); /* Do not continue if the node is disabled */ if (!of_device_is_available(np)) @@ -172,7 +174,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) of_property_read_u32(np, "reset-post-delay-us", &mdio->reset_post_delay_us); /* Register the MDIO bus */ - rc = mdiobus_register(mdio); + rc = __mdiobus_register(mdio, owner); if (rc) return rc; @@ -236,7 +238,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) mdiobus_unregister(mdio); return rc; } -EXPORT_SYMBOL(of_mdiobus_register); +EXPORT_SYMBOL(__of_mdiobus_register); /** * of_mdio_find_device - Given a device tree node, find the mdio_device diff --git a/drivers/net/phy/mdio_devres.c b/drivers/net/phy/mdio_devres.c index b560e99695df..69b829e6ab35 100644 --- a/drivers/net/phy/mdio_devres.c +++ b/drivers/net/phy/mdio_devres.c @@ -98,13 +98,14 @@ EXPORT_SYMBOL(__devm_mdiobus_register); #if IS_ENABLED(CONFIG_OF_MDIO) /** - * devm_of_mdiobus_register - Resource managed variant of of_mdiobus_register() + * __devm_of_mdiobus_register - Resource managed variant of of_mdiobus_register() * @dev: Device to register mii_bus for * @mdio: MII bus structure to register * @np: Device node to parse + * @owner: Owning module */ -int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio, - struct device_node *np) +int __devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio, + struct device_node *np, struct module *owner) { struct mdiobus_devres *dr; int ret; @@ -117,7 +118,7 @@ int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio, if (!dr) return -ENOMEM; - ret = of_mdiobus_register(mdio, np); + ret = __of_mdiobus_register(mdio, np, owner); if (ret) { devres_free(dr); return ret; @@ -127,7 +128,7 @@ int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio, devres_add(dev, dr); return 0; } -EXPORT_SYMBOL(devm_of_mdiobus_register); +EXPORT_SYMBOL(__devm_of_mdiobus_register); #endif /* CONFIG_OF_MDIO */ MODULE_LICENSE("GPL"); diff --git a/include/linux/of_mdio.h b/include/linux/of_mdio.h index da633d34ab86..8a52ef2e6fa6 100644 --- a/include/linux/of_mdio.h +++ b/include/linux/of_mdio.h @@ -14,9 +14,25 @@ #if IS_ENABLED(CONFIG_OF_MDIO) bool of_mdiobus_child_is_phy(struct device_node *child); -int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np); -int devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio, - struct device_node *np); +int __of_mdiobus_register(struct mii_bus *mdio, struct device_node *np, + struct module *owner); + +static inline int of_mdiobus_register(struct mii_bus *mdio, + struct device_node *np) +{ + return __of_mdiobus_register(mdio, np, THIS_MODULE); +} + +int __devm_of_mdiobus_register(struct device *dev, struct mii_bus *mdio, + struct device_node *np, struct module *owner); + +static inline int devm_of_mdiobus_register(struct device *dev, + struct mii_bus *mdio, + struct device_node *np) +{ + return __devm_of_mdiobus_register(dev, mdio, np, THIS_MODULE); +} + struct mdio_device *of_mdio_find_device(struct device_node *np); struct phy_device *of_phy_find_device(struct device_node *phy_np); struct phy_device * From patchwork Thu Mar 16 23:33:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 71016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp54910wrt; Thu, 16 Mar 2023 16:49:16 -0700 (PDT) X-Google-Smtp-Source: AK7set9P7v7sd8i4qX6Ky9D0S9yKKwkqmTEqS0XS8trGXgZAnz2b3RKbXNX78ox4aeX5VkBTWMAD X-Received: by 2002:a17:90b:38d1:b0:234:b03:5a70 with SMTP id nn17-20020a17090b38d100b002340b035a70mr5899942pjb.35.1679010556397; Thu, 16 Mar 2023 16:49:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679010556; cv=none; d=google.com; s=arc-20160816; b=OQN+gldpeFfMpVSvyjMu0MzrTSVtjCAS8OVOEMpGhemmrhWRrOgD2g/tcVn56nhrVa fLVSBwmSkNioxh53s7THuH6THGUqfBiGGKjcplgnET8uiMmGucLbPdbYeYLD+zNcrAjd j/b+X2N+uOHuyuGzQ+FpYsIC8lacuCtPSuRIfTxqM6OCOX0fJLTz46VtkPC1FcjZG0QX HvwzexFHYTa0EWVqc+GU/ET0/QJClYhK6pqrAejOJJobIqdUzokh4AUzFer+jAiUk1J1 sbvvwdxrT+vE6dkyHSh1OrGuSvOI7mUNqnNcbr3ZjBdedeQl9yGM8C6tA455X0K5Q3yG MIjg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aOe0JtBICGgd0kHSmPmJseRqJi3KmhURQwliZoYk24Q=; b=KQWIgAgmisBUrFkdNxQPr4tXPigxpW7AX7UU/SoaOd6/uNr/fjShcqshZXNxL/K6QE cfnkSkYGUaz3EjGJv1clzYbH7WUyibZGwriZNc35s8+qrRYNSPzbEUhm6tfLDLYSsX94 FFL6t+PYK9+t5cTwY6IgeEhz3L2oQojtOzeGKRycHuex+eLsIZ7WWVjhtY/GmQ8jGlD4 L17fJa0NYqEYUJC9ZboaaOR+sMzZY84X4vYUcU6DysgfqlGoh/ddt9TT0Pu4LLmEziy1 Lt/M36f6Bt4YjS/VsVq1b8vMx9OylBl4UY7ijAESu2SIqTTaHzSpjbP2TdxeUhkeQmiM emkw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=StCFPNTq; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k32-20020a17090a4ca300b0023d4a3bec5asi6041715pjh.87.2023.03.16.16.48.55; Thu, 16 Mar 2023 16:49:16 -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=@gmail.com header.s=20210112 header.b=StCFPNTq; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229761AbjCPXdk (ORCPT + 99 others); Thu, 16 Mar 2023 19:33:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229648AbjCPXdb (ORCPT ); Thu, 16 Mar 2023 19:33:31 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB08AB6914; Thu, 16 Mar 2023 16:33:29 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id lr16-20020a17090b4b9000b0023f187954acso3217640pjb.2; Thu, 16 Mar 2023 16:33:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679009609; 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=aOe0JtBICGgd0kHSmPmJseRqJi3KmhURQwliZoYk24Q=; b=StCFPNTqrsFsKhuQ6IBo+ORNHveCFU0dkHDNam1hij53PajDKUqyUXE+FgSiCffTlE EqKPQCVvc6zMytr5/bHD7EyrKO8VRSeGaKvymkxEI0zMZZbMY8lXHwMGHWWEBdIBvA+g xthesPI+97Oqegs5JAgXmrntPXXi3L4aeBNIwvX+bcmeQy4DZ9LDckMU04uCBU0EHmoo z+htJuy2ztY7qKjKph7PVUSgQyJIcBzdMjP04hNHE6IM8LM6meEMN37p6dM3TKBb0tMG +N9fprIeTJS33hFRUPoZLNIB2cFhN8tqb9kQCa27bSygYVYD1mCYpEtx88EBDFPvVVpS zt0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679009609; 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=aOe0JtBICGgd0kHSmPmJseRqJi3KmhURQwliZoYk24Q=; b=7UgQ02TfirlaV3cIWwRVRuJel+GNK8tng62R1D7Bmn7ZYdgvblC6tEkUhFH+TMzEKu gHYJXi9oUTcH+pLtwJUwt5sObLdrPDBLZl+V9dUtr1Yw2T2C+pZhMvPEloG6D9JL8kA4 60YX6KinWwBHQOxiW3xPvTlgDJ0zcpu3F5/+XcfOh0DnRLtZOwKi1hVNDyQ8XKrT9VuA eq4EV4kIC5xiZhfS+vBs8EhU5lmyZzJ6mOvwH65bsAOthgqnCBI/pJ5x04acJZWEFnjI 939wbdUoL8Xgo1XWqs0tjtY06xsaZnVP+5RRMex0pmRI9ErGZVAjZUmEJIDb8Z8/T+VO lFqw== X-Gm-Message-State: AO0yUKUxJRudIH9IDvHBQmoFy7mPF1ZCBGrLB4I63mBh3dtOJr08YXcB epNN1qTNZWWUEs0oeCdzQLLaklSgjYc= X-Received: by 2002:a17:903:1c1:b0:1a0:42c0:b2af with SMTP id e1-20020a17090301c100b001a042c0b2afmr6533788plh.33.1679009608667; Thu, 16 Mar 2023 16:33:28 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j1-20020a170903024100b0019f3cc3fc99sm260900plh.16.2023.03.16.16.33.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Mar 2023 16:33:28 -0700 (PDT) From: Florian Fainelli To: netdev@vger.kernel.org Cc: Florian Fainelli , Maxime Bizon , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Frank Rowand , "Rafael J. Wysocki" , Calvin Johnson , Grant Likely , Ioana Ciornei , linux-kernel@vger.kernel.org (open list), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v2 2/2] net: mdio: fix owner field for mdio buses registered using ACPI Date: Thu, 16 Mar 2023 16:33:17 -0700 Message-Id: <20230316233317.2169394-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230316233317.2169394-1-f.fainelli@gmail.com> References: <20230316233317.2169394-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1760570173166819727?= X-GMAIL-MSGID: =?utf-8?q?1760570173166819727?= Bus ownership is wrong when using acpi_mdiobus_register() to register an mdio bus. That function is not inline, so when it calls mdiobus_register() the wrong THIS_MODULE value is captured. CC: Maxime Bizon Fixes: 803ca24d2f92 ("net: mdio: Add ACPI support code for mdio") Signed-off-by: Florian Fainelli Reviewed-by: Simon Horman --- drivers/net/mdio/acpi_mdio.c | 10 ++++++---- include/linux/acpi_mdio.h | 9 ++++++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/net/mdio/acpi_mdio.c b/drivers/net/mdio/acpi_mdio.c index d77c987fda9c..4630dde01974 100644 --- a/drivers/net/mdio/acpi_mdio.c +++ b/drivers/net/mdio/acpi_mdio.c @@ -18,16 +18,18 @@ MODULE_AUTHOR("Calvin Johnson "); MODULE_LICENSE("GPL"); /** - * acpi_mdiobus_register - Register mii_bus and create PHYs from the ACPI ASL. + * __acpi_mdiobus_register - Register mii_bus and create PHYs from the ACPI ASL. * @mdio: pointer to mii_bus structure * @fwnode: pointer to fwnode of MDIO bus. This fwnode is expected to represent + * @owner: module owning this @mdio object. * an ACPI device object corresponding to the MDIO bus and its children are * expected to correspond to the PHY devices on that bus. * * This function registers the mii_bus structure and registers a phy_device * for each child node of @fwnode. */ -int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode) +int __acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode, + struct module *owner) { struct fwnode_handle *child; u32 addr; @@ -35,7 +37,7 @@ int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode) /* Mask out all PHYs from auto probing. */ mdio->phy_mask = GENMASK(31, 0); - ret = mdiobus_register(mdio); + ret = __mdiobus_register(mdio, owner); if (ret) return ret; @@ -55,4 +57,4 @@ int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode) } return 0; } -EXPORT_SYMBOL(acpi_mdiobus_register); +EXPORT_SYMBOL(__acpi_mdiobus_register); diff --git a/include/linux/acpi_mdio.h b/include/linux/acpi_mdio.h index 0a24ab7cb66f..8e2eefa9fbc0 100644 --- a/include/linux/acpi_mdio.h +++ b/include/linux/acpi_mdio.h @@ -9,7 +9,14 @@ #include #if IS_ENABLED(CONFIG_ACPI_MDIO) -int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode); +int __acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode, + struct module *owner); + +static inline int +acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *handle) +{ + return __acpi_mdiobus_register(mdio, handle, THIS_MODULE); +} #else /* CONFIG_ACPI_MDIO */ static inline int acpi_mdiobus_register(struct mii_bus *mdio, struct fwnode_handle *fwnode)