From patchwork Wed May 10 20:45:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 9720655 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D21E860364 for ; Wed, 10 May 2017 20:43:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E85E92862B for ; Wed, 10 May 2017 20:43:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DBB1828645; Wed, 10 May 2017 20:43:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5EF392862B for ; Wed, 10 May 2017 20:43:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=p2XDGXC63Y/prZUjNQ2P+qZ4yaKSQzORYA8fS3nI5u4=; b=o5p6T/XI3soq53I0rD5xeguy60 qLGkLrv/bvP3xtr6zzpPoKxN6fv7xZFgJZlwmAwYt9e621k9cVIzFczQ9jx9Y6iN6zy07GhrT+Fd6 tZBIF9w9xXvSEx0eyrUCbQkjOXfUkzEPequn2pqEgylwkbwJi/9aQtE9o6Ab5ZGQ37YcVGnTKrawG i7T2LP0sCa19EBuwSLUX0K+lOMv9lfKrSNfo20lmZ149ssQZw4hj28CiVxELWToaDuTNR8QUd1dAd JP0bNccD2taFzpwNASiGaS3mPQDZ1lug0rFpVDvwXPDh6l0+Y7FM5LmE7tjOhCrtcajPMQm0dRNyu HeNv2qEA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1d8YS9-0002D9-8D; Wed, 10 May 2017 20:43:21 +0000 Received: from mail-io0-x229.google.com ([2607:f8b0:4001:c06::229]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1d8YRY-0001NP-PX for linux-arm-kernel@lists.infradead.org; Wed, 10 May 2017 20:42:47 +0000 Received: by mail-io0-x229.google.com with SMTP id o12so9456550iod.3 for ; Wed, 10 May 2017 13:42:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apm.com; s=apm; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sOTl7iigzE6cpP2SQf533yM4ScoDcb69Es8rPpe1SKc=; b=MedKBbj0YUVl0YAuApuz4FRLWNh05ia7uCbsL1A3mwFTlk9E5cHd3BVNLcLTRKoZCJ 5fpRjPNtS3BiOG8nQPuG/NJAmnzwKmBoQTqdHq/Z/HyzYeI4a0O5+VJEGHnWxaVZrvNX Wj5KLCJ0J1ptL6GDVXzG+iEnOlN6LvM/lvRy4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sOTl7iigzE6cpP2SQf533yM4ScoDcb69Es8rPpe1SKc=; b=HFGgnZR0bww+DsYeS+foAwdO4gEJRtaCa/P2OZGas7KphX2mjEubSB/By3HraGIHNR hoZCtgbqUzJL5Wy0z2iE0NT8v0q19VwoiUKtlKhArgMT5ejk0OmVB8/SwHisAzoCGMXa 9d+wq2sWMAlfZ3yTtSZ1SQTPzGAuTw2LzJK/+6GMAUlzOoenr6G2lAl+Fld3LPa+9bRG eFS+cfv/iGE7MvVKQl/KnESo5o4gZIAyA0Um6fe2r7wL3ILjoEyeqQVYX+muuEf7lJzi wiDEg1C2MA9GVyoy0BB4FZh581X3qzzLKPCQwVfDKtDBbCTq3tXXuqB8IJaATsbJgXSU pwlw== X-Gm-Message-State: AODbwcBF+qLk+8h2pxVEM0tjVYZxwl3WTy4q6/1NFnIWMufLpJqcPVgJ dSodTypHwxFDDzs9 X-Received: by 10.107.36.71 with SMTP id k68mr5846548iok.130.1494448943857; Wed, 10 May 2017 13:42:23 -0700 (PDT) Received: from isubrama-dev.amcc.com ([206.80.4.98]) by smtp.gmail.com with ESMTPSA id q65sm17889ioi.61.2017.05.10.13.42.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 May 2017 13:42:23 -0700 (PDT) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH v2 net-next 03/12] drivers: net: xgene: Use rgmii mdio mac access Date: Wed, 10 May 2017 13:45:01 -0700 Message-Id: <1494449110-23785-4-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1494449110-23785-1-git-send-email-isubramanian@apm.com> References: <1494449110-23785-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170510_134244_907088_7A170BE9 X-CRM114-Status: GOOD ( 10.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Quan Nguyen , patches@apm.com, linux-arm-kernel@lists.infradead.org, Iyappan Subramanian MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Quan Nguyen This patch switches to use rgmii mdio mac access routines if available, as they share the same HW. Signed-off-by: Quan Nguyen Signed-off-by: Iyappan Subramanian --- drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c index 2050c58..47c5b75 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_hw.c @@ -277,6 +277,13 @@ void xgene_enet_wr_mac(struct xgene_enet_pdata *pdata, u32 wr_addr, u32 wr_data) u8 wait = 10; u32 done; + if (pdata->mdio_driver && ndev->phydev && + pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) { + struct mii_bus *bus = ndev->phydev->mdio.bus; + + return xgene_mdio_wr_mac(bus->priv, wr_addr, wr_data); + } + addr = pdata->mcx_mac_addr + MAC_ADDR_REG_OFFSET; wr = pdata->mcx_mac_addr + MAC_WRITE_REG_OFFSET; cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET; @@ -328,6 +335,13 @@ u32 xgene_enet_rd_mac(struct xgene_enet_pdata *pdata, u32 rd_addr) u32 done, rd_data; u8 wait = 10; + if (pdata->mdio_driver && pdata->ndev->phydev && + pdata->phy_mode == PHY_INTERFACE_MODE_RGMII) { + struct mii_bus *bus = pdata->ndev->phydev->mdio.bus; + + return xgene_mdio_rd_mac(bus->priv, rd_addr); + } + addr = pdata->mcx_mac_addr + MAC_ADDR_REG_OFFSET; rd = pdata->mcx_mac_addr + MAC_READ_REG_OFFSET; cmd = pdata->mcx_mac_addr + MAC_COMMAND_REG_OFFSET;