From patchwork Thu Jan 19 13:06:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 45749 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp317794wrn; Thu, 19 Jan 2023 05:11:35 -0800 (PST) X-Google-Smtp-Source: AMrXdXulFH55j3TU8FpTJuLACKbLNZivKEb7NBBWrPfJ0fFE9fyYDE/p+GhVgseczYP9turEVv7t X-Received: by 2002:a17:907:20db:b0:7c1:7226:c936 with SMTP id qq27-20020a17090720db00b007c17226c936mr10715185ejb.64.1674133895151; Thu, 19 Jan 2023 05:11:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674133895; cv=none; d=google.com; s=arc-20160816; b=n4uK/qlFT77Q34pxEi1jGaMMQ/dzB2i7btAXiymXdA9VwGjYTU1rNCaBufJshgXBsc 9+WMhILdb3v5i5ZJua5MV16gssMXSG86EA6HWq/LYnkjEi7jiR89Y3b5smACe9ETODYK r+QqmTM72/ivjYxSnypmGibhLCRi/gyZDUhkwl3EjTkdx0uHpQwlnDdfs6HXZu+5v/UD TnycnkLhknqtTWHz99gPq+mCm/YItjhGOHoZZP5jDdE/Rhdsa8SH/0Ci515PmtlR+IVb A9rX3MJYMh641kRfUobg4GN0FTpfGxBvO8ZPaOeCQyPBYJbTQKXyoIbrqLmXUyIvRdAp LXYQ== 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=8ucNqQrBv58FmJgsbqN8x3M/G1cfrpq7tqtLwGp8Zts=; b=ywyIPY+qI77In6tC/chBy8MfWMhH0QWTEo10FI9861ZsibcBI16JHNIvj2S1R86iFC rys9jNHde8eTcxZ3mKJ0bYdDlCh2N4/kFlhLkXin0pMkzSYz7KRRSP9lQbiXzLbd/sJG 1wfuN37dUxpzp6XbJRax4DRwaIu+dsKhOYYXd0e360+N6T5PkCEExtdrYGmngvtiCq54 9Z3ttZKlHONjKfXP8haMq10Ls+c6fnO75SCFwXoVlkwdjyDzq9lYftSa/PMSdSQJYf0W kee1gk05Bv0ucFkncOJngNnANyf0rMUfH+ZAuNW0L8B0c/OqrDYqK8hoprGUDYhLgTVE jk1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@walle.cc header.s=mail2022082101 header.b="BO/W7ryv"; 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 xc2-20020a170907074200b0078c3197bf86si44662028ejb.533.2023.01.19.05.11.11; Thu, 19 Jan 2023 05:11:35 -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="BO/W7ryv"; 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 S230246AbjASNJG (ORCPT + 99 others); Thu, 19 Jan 2023 08:09:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230463AbjASNIF (ORCPT ); Thu, 19 Jan 2023 08:08:05 -0500 Received: from mail.3ffe.de (0001.3ffe.de [IPv6:2a01:4f8:c0c:9d57::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57AD2613C1; Thu, 19 Jan 2023 05:08:01 -0800 (PST) Received: from mwalle01.kontron.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 17FA41A00; Thu, 19 Jan 2023 14:07:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2022082101; t=1674133679; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8ucNqQrBv58FmJgsbqN8x3M/G1cfrpq7tqtLwGp8Zts=; b=BO/W7ryvR8JDotAf4gWdeS8Dhl59cGsFoi2/VnxatK00UV12d84+KVEVwGfDL8trZQBnc+ 49hLDoUSNcQCQtN4ZVeOAI0dyEb+tNHVH1L8GNuYlK+07FEsRD3IRwEQZ5B/adTcnrzazY HmDIqU/fUL97iMbwdSjzRRA0kOypKtd15rrc/7qZAdyJRUQumxYBxBGm6d53iZtp4z6V3n HwP+BjH8gf176YsJHMPazgLiq1kx4TNoXJTop86c7QkTOAueyZsuTW7tzMcpeJRYRRXmkH RV1t7L68Q23HalVppN3uKO0DLIapfih8QyyqhJ5svBPlhCLRnlxVS4vNivCqiQ== From: Michael Walle To: Woojung Huh , UNGLinuxDriver@microchip.com, Andrew Lunn , Florian Fainelli , Vladimir Oltean , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , =?utf-8?q?And?= =?utf-8?q?reas_F=C3=A4rber?= , Manivannan Sadhasivam , Felix Fietkau , John Crispin , Sean Wang , Mark Lee , Lorenzo Bianconi , Matthias Brugger , Wells Lu , Jiawen Wu , Mengyuan Lou , Heiner Kallweit , Russell King , Tobias Waldekranz Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-actions@lists.infradead.org, linux-mediatek@lists.infradead.org, Michael Walle Subject: [PATCH RESEND net-next 2/4] net: ngbe: Drop mdiobus_c45_regad() Date: Thu, 19 Jan 2023 14:06:58 +0100 Message-Id: <20230119130700.440601-3-michael@walle.cc> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230119130700.440601-1-michael@walle.cc> References: <20230119130700.440601-1-michael@walle.cc> MIME-Version: 1.0 X-Spam: Yes 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?1755456623188413071?= X-GMAIL-MSGID: =?utf-8?q?1755456623188413071?= With the new C45 MDIO access API, there is no encoding of the register number anymore and thus the masking isn't necessary anymore. Remove it. Signed-off-by: Michael Walle --- drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c b/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c index ba33a57b42c2..c9ddbbc3fa4f 100644 --- a/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c +++ b/drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c @@ -92,7 +92,7 @@ static int ngbe_phy_read_reg_mdi_c45(struct mii_bus *bus, int phy_addr, int devn wr32(wx, NGBE_MDIO_CLAUSE_SELECT, 0x0); /* setup and write the address cycle command */ - command = NGBE_MSCA_RA(mdiobus_c45_regad(regnum)) | + command = NGBE_MSCA_RA(regnum) | NGBE_MSCA_PA(phy_addr) | NGBE_MSCA_DA(devnum); wr32(wx, NGBE_MSCA, command); @@ -121,7 +121,7 @@ static int ngbe_phy_write_reg_mdi_c45(struct mii_bus *bus, int phy_addr, wr32(wx, NGBE_MDIO_CLAUSE_SELECT, 0x0); /* setup and write the address cycle command */ - command = NGBE_MSCA_RA(mdiobus_c45_regad(regnum)) | + command = NGBE_MSCA_RA(regnum) | NGBE_MSCA_PA(phy_addr) | NGBE_MSCA_DA(devnum); wr32(wx, NGBE_MSCA, command);