From patchwork Mon Jan 9 15:30:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 40931 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2222850wrt; Mon, 9 Jan 2023 07:37:36 -0800 (PST) X-Google-Smtp-Source: AMrXdXtXRlgBOy0C+EzKwHK875cVrCV7nu0LkAFKXFfbViBTiB4UHahkIBbCCfwwRgRdteLmVZVv X-Received: by 2002:a05:6a20:c186:b0:af:74f5:93a3 with SMTP id bg6-20020a056a20c18600b000af74f593a3mr78743129pzb.61.1673278656435; Mon, 09 Jan 2023 07:37:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673278656; cv=none; d=google.com; s=arc-20160816; b=vyh62n5qUTuP9FkcVUeJgBjlEOObg0QmhRt9VKEU/9r40e6Ua3yRD0oISPgJLaw5V8 tiaxjpNyaz6lN6KLnIJyN9KJNthtBS2pRikYhMd+irepIdZ6mXJ7u3/KvVi0bn7C7LoN 9MvcdrB4qgIGzwgH4JRN5N2AE1KL8LkH3qU5DdGuIjx4B52FSB4Y82Tg6vBry4yr58RG SaoTWb3mehEF7pY6CmEftHKpyWxwcFe02OeXO4cyqQZCc8yy1HIhE0uBGYMxT4I4DLoI vUVYmxNhLofPSWmp1dmIfsRgkpVVwiJ/gjJxmzFluLtjXLgt930D98DWMj1kGItJw7L2 SEuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=cwldWyFf7CaFTxQBOBymigKCBxPFmfPQFSYXECFA1MQ=; b=IhXlQ/pDrQ1OTlWqBw2QorjWLK4YB1z/NjNTur3cJlF80soNcJtBDVWqJ2622Oh0xr QXgFGWgoyrRNvDPyPPa0fAyp4JQua4AkeI8O7/XbCi/f+6RAdYLwAKRC7m3KKzvg/0lb kY+l7HSGJge8RVL5+JA5o2z5uHSv9+rZqWjz7QgOqwBkSranDFnZVp6hCKF1+MpWDSLF GT4CGnA0DUAP8DgEXQc4P0K5k1YneaoyzpvC3b8F/L/vhGDxvYoPRrdErAMjpbFennhw 2tkN3t47cT30zk1hHW2I7cK1P6mQMxkba404hK9uea8M7A9shVGGWaEHZmfIM4yflj1L lacA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@walle.cc header.s=mail2022082101 header.b="oBe/wDiE"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=walle.cc Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z3-20020a631903000000b0049bef470e05si9247818pgl.528.2023.01.09.07.37.22; Mon, 09 Jan 2023 07:37:36 -0800 (PST) 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=@walle.cc header.s=mail2022082101 header.b="oBe/wDiE"; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=walle.cc Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231876AbjAIPcY (ORCPT + 99 others); Mon, 9 Jan 2023 10:32:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237225AbjAIPbp (ORCPT ); Mon, 9 Jan 2023 10:31:45 -0500 Received: from mail.3ffe.de (0001.3ffe.de [159.69.201.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 594D79598; Mon, 9 Jan 2023 07:30:57 -0800 (PST) Received: from mwalle01.sab.local (unknown [213.135.10.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.3ffe.de (Postfix) with ESMTPSA id 0282E1654; Mon, 9 Jan 2023 16:30:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2022082101; t=1673278255; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cwldWyFf7CaFTxQBOBymigKCBxPFmfPQFSYXECFA1MQ=; b=oBe/wDiEGzYu9Fc30RDGqfOtePnx+5N67Jc8XWAwViJATJbP5JciHihYt08LZ2CPnqoGXm uZArpFXb8LGFjfjAjXXX7S79M2PS+79KJbqSZO69qsWKd3bzRrrLYAYIXYg6ql+KNj6eYf QFLV/7qysP76I17N9ZXUkpM8Co/fADHz8zTv8pRK0+sadsWUa23hOO8F8/TFqbhkDxEDNV Kh4IJzK9xvXaw84ecISSaMUBh90vtEkIuwjqMygFfeNX7aQTRJKU3bGSi62Qh3a0YIRJXQ PD2iEEB36IH2lBcrduXuSgnBMlXDpiUEHLj2BemVjPRj+aiM8jY7HGIZ/J1pvg== From: Michael Walle Date: Mon, 09 Jan 2023 16:30:44 +0100 Subject: [PATCH net-next v3 04/11] net: mdio: C22 is now optional, EOPNOTSUPP if not provided MIME-Version: 1.0 Message-Id: <20221227-v6-2-rc1-c45-seperation-v3-4-ade1deb438da@walle.cc> References: <20221227-v6-2-rc1-c45-seperation-v3-0-ade1deb438da@walle.cc> In-Reply-To: <20221227-v6-2-rc1-c45-seperation-v3-0-ade1deb438da@walle.cc> To: Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Jose Abreu , Sergey Shtylyov , Wei Fang , Shenwei Wang , Clark Wang , NXP Linux Team , Sean Wang , Landen Chao , DENG Qingfang , Florian Fainelli , Vladimir Oltean , Matthias Brugger Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, Andrew Lunn , Geert Uytterhoeven , Michael Walle , Vladimir Oltean X-Mailer: b4 0.11.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1754559840352449343?= X-GMAIL-MSGID: =?utf-8?q?1754559840352449343?= From: Andrew Lunn When performing a C22 operation, check that the bus driver actually provides the methods, and return -EOPNOTSUPP if not. C45 only busses do exist, and in future their C22 methods will be NULL. Signed-off-by: Andrew Lunn Signed-off-by: Michael Walle --- drivers/net/phy/mdio_bus.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index c992a9fd8b01..f71ba6ab85a7 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c @@ -766,7 +766,10 @@ int __mdiobus_read(struct mii_bus *bus, int addr, u32 regnum) lockdep_assert_held_once(&bus->mdio_lock); - retval = bus->read(bus, addr, regnum); + if (bus->read) + retval = bus->read(bus, addr, regnum); + else + retval = -EOPNOTSUPP; trace_mdio_access(bus, 1, addr, regnum, retval, retval); mdiobus_stats_acct(&bus->stats[addr], true, retval); @@ -792,7 +795,10 @@ int __mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val) lockdep_assert_held_once(&bus->mdio_lock); - err = bus->write(bus, addr, regnum, val); + if (bus->write) + err = bus->write(bus, addr, regnum, val); + else + err = -EOPNOTSUPP; trace_mdio_access(bus, 0, addr, regnum, val, err); mdiobus_stats_acct(&bus->stats[addr], false, err);