From patchwork Mon Dec 3 16:33:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Douthit X-Patchwork-Id: 1007317 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=osuosl.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=silicom-usa.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=SILICOMLTD.onmicrosoft.com header.i=@SILICOMLTD.onmicrosoft.com header.b="hFM2QG+F"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 437znW6trLz9sBn for ; Tue, 4 Dec 2018 09:14:55 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6871F876E1; Mon, 3 Dec 2018 22:14:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id r7mpJLxW+30r; Mon, 3 Dec 2018 22:14:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 0C77C876FB; Mon, 3 Dec 2018 22:14:52 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 253391BF2F6 for ; Mon, 3 Dec 2018 19:05:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 21D0820794 for ; Mon, 3 Dec 2018 19:05:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fYffGT3rXw4V for ; Mon, 3 Dec 2018 19:05:54 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-eopbgr10107.outbound.protection.outlook.com [40.107.1.107]) by silver.osuosl.org (Postfix) with ESMTPS id 1A84720774 for ; Mon, 3 Dec 2018 19:05:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=SILICOMLTD.onmicrosoft.com; s=selector1-silicomusa-com01i; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XEN8cflwKzNELoWVnUlB1KfSWmKIZSPMHdKGx3RleRQ=; b=hFM2QG+FCF/ufraewHELyFGaK1Tub6cMSiw+2ahooQPYVmsdbpr555nyE+MYk8N/axMxm7GgpGzh/0l4gM46L4tNIf33fuGMFopBzsIbltaxZhDcEjyAyRNxmkf5ZX4SD3pYZIUKV6djT/mo6/DTFwh5ShE5PnSJRoifLc1aWNE= Received: from VI1PR0402MB3853.eurprd04.prod.outlook.com (52.134.16.149) by VI1PR0402MB2751.eurprd04.prod.outlook.com (10.175.22.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1382.22; Mon, 3 Dec 2018 16:33:01 +0000 Received: from VI1PR0402MB3853.eurprd04.prod.outlook.com ([fe80::457b:1a37:563c:a718]) by VI1PR0402MB3853.eurprd04.prod.outlook.com ([fe80::457b:1a37:563c:a718%5]) with mapi id 15.20.1382.020; Mon, 3 Dec 2018 16:33:01 +0000 From: Steve Douthit To: Jeff Kirsher Thread-Topic: [PATCH net-next v2 2/2] ixgbe: use mii_bus to handle MII related ioctls Thread-Index: AQHUiyXbwuOrumjKzU+yUxvrkanAUQ== Date: Mon, 3 Dec 2018 16:33:01 +0000 Message-ID: <20181203163227.5107-3-stephend@silicom-usa.com> References: <20181203163227.5107-1-stephend@silicom-usa.com> In-Reply-To: <20181203163227.5107-1-stephend@silicom-usa.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: BN6PR21CA0002.namprd21.prod.outlook.com (2603:10b6:404:8e::12) To VI1PR0402MB3853.eurprd04.prod.outlook.com (2603:10a6:803:21::21) authentication-results: spf=none (sender IP is ) smtp.mailfrom=stephend@silicom-usa.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [96.82.2.57] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; VI1PR0402MB2751; 6:iWtkp/BGOIOgfJjGzciHvw2EEiljdYTb6YL5lj6snvYcvrAciaPb4bPzR3sA8jzivuHvLKorSZK+g2csLQ/D4Je32xFH4rlplgiDJ6aOo9dlAJgFRYqD744wOf08SwY7aj4feolJZARQjYXN8ZDYCdO02tqziPx3WtyB7jBM2g4ydMh6iUrF2pBrx6uMbm5wXbKpwlWp13H/IYxTC4CbaxlYjGg1zTAJRZWQNhoXnXnH2aVS+xZ5jtG3cVgtsF5UGTjfFRMZg8rF38CAf0vdFcNjER9zDrVacsF/XZeLDSUMUSpJsPBb0ltpmyGE5EZNELlLqafSt4c90zkEhXmfV11o2HHGqhNF2H+LLkpQKFQs7IWIbbJl/XPd+akfKsxo3dqEzp8Cn2yw9gQXnsMlhODWGRLNmPmcnuxuqG0sPtagre40lmsneM4dG972hmY9KNr0wyae09V/U//MpcxBOA==; 5:/lVoz8nj3klm94P2pNNNY1PQaVv1WmD+BuuTAWhT5H1CjnqQCgErHlUdEzaVT7uICBglO8O3lujs+0DiEWwyNHko78T4p1rj2MVBCBhqApjztVPCTi+rF0nk+Dza/clHEWvOzBxUq6LgSUYgnRcj8OuQ44wW7ZN7ZZibYPE+n30=; 7:4CADXDRiDgwMma6t0WxUNUNKi1QEAH7XF9fLh4Fri6lSYCi14Ljtr4sHTgraUGmKfsm0jizK4jJCMdeJLYx2iunltWN2mcifUU9IBKz/6q5gjWE808qiRxroLq9jV4+tPCk8xiEByBJvELAKZiW7gw== x-ms-office365-filtering-correlation-id: 5f94eeb1-3f17-49cb-8da9-08d6593cfdca x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390098)(7020095)(4652040)(8989299)(5600074)(711020)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7153060)(7193020); SRVR:VI1PR0402MB2751; x-ms-traffictypediagnostic: VI1PR0402MB2751: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(3231455)(999002)(944501493)(52105112)(93006095)(93001095)(10201501046)(148016)(149066)(150057)(6041310)(20161123562045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(201708071742011)(7699051)(76991095); SRVR:VI1PR0402MB2751; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0402MB2751; x-forefront-prvs: 08756AC3C8 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(979002)(39850400004)(366004)(136003)(376002)(346002)(396003)(189003)(199004)(102836004)(36756003)(486006)(68736007)(476003)(256004)(8676002)(6506007)(386003)(86362001)(1076002)(6916009)(105586002)(54906003)(66066001)(106356001)(2616005)(52116002)(11346002)(6486002)(97736004)(446003)(6436002)(3846002)(6116002)(316002)(71190400001)(26005)(6512007)(2906002)(53936002)(478600001)(186003)(39060400002)(4326008)(71200400001)(8936002)(99286004)(76176011)(7736002)(305945005)(5660300001)(14454004)(107886003)(25786009)(81166006)(81156014)(42262002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0402MB2751; H:VI1PR0402MB3853.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: silicom-usa.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: /yDANXzXN2sW4TxXSYyBJOPK2uwbUW3TOQKQQ52WWQcDEHkXSG/n2bdvtXfmsT6V6+8AZHZxG2TGJv0xroSptRmL481m53+LdvzxsB4LnHF/1bsldluQ82JsdZ+6+k8tnyh5Z4kPJM7Yqn+J4/UXdnD2ovJ812xMbNXDhBMrMoEEgYoF9VNgcGhwP/JjccqC4cib2z11xAsFgP1+MbSrRNnvLKYNv5CBI2aqeiB+wcQWx675MGkNXyrRPR989uVmQrzaTvx81qIltwnDeSOPwpW7lbgliI/E/zN4wOGlgimzeeQGopuaj7sS4+Ipi8Ecq0HIP5IoFa2QpDljqsofEuu5MXmN/+/DLxHujeCUcJQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: silicom-usa.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5f94eeb1-3f17-49cb-8da9-08d6593cfdca X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Dec 2018 16:33:01.2635 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: c9e326d8-ce47-4930-8612-cc99d3c87ad1 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2751 X-Mailman-Approved-At: Mon, 03 Dec 2018 22:14:49 +0000 Subject: [Intel-wired-lan] [PATCH net-next v2 2/2] ixgbe: use mii_bus to handle MII related ioctls X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Florian Fainelli , "netdev@vger.kernel.org" , "intel-wired-lan@lists.osuosl.org" , "David S. Miller" Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" Use the mii_bus callbacks to address the entire clause 22/45 address space. Enables userspace to poke switch registers instead of a single PHY address. Signed-off-by: Stephen Douthit --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 82af3b24d222..fb066c491abe 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -8790,6 +8790,15 @@ ixgbe_mdio_read(struct net_device *netdev, int prtad, int devad, u16 addr) u16 value; int rc; + if (adapter->mii_bus) { + int regnum = addr; + + if (devad != MDIO_DEVAD_NONE) + regnum |= (devad << 16) | MII_ADDR_C45; + + return mdiobus_read(adapter->mii_bus, prtad, regnum); + } + if (prtad != hw->phy.mdio.prtad) return -EINVAL; rc = hw->phy.ops.read_reg(hw, addr, devad, &value); @@ -8804,6 +8813,15 @@ static int ixgbe_mdio_write(struct net_device *netdev, int prtad, int devad, struct ixgbe_adapter *adapter = netdev_priv(netdev); struct ixgbe_hw *hw = &adapter->hw; + if (adapter->mii_bus) { + int regnum = addr; + + if (devad != MDIO_DEVAD_NONE) + regnum |= (devad << 16) | MII_ADDR_C45; + + return mdiobus_write(adapter->mii_bus, prtad, regnum, value); + } + if (prtad != hw->phy.mdio.prtad) return -EINVAL; return hw->phy.ops.write_reg(hw, addr, devad, value);