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: 760843 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wNSqJ0xMJz9s7y for ; Thu, 11 May 2017 06:42:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=apm.com header.i=@apm.com header.b="MedKBbj0"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754448AbdEJUmd (ORCPT ); Wed, 10 May 2017 16:42:33 -0400 Received: from mail-io0-f172.google.com ([209.85.223.172]:34319 "EHLO mail-io0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753155AbdEJUmY (ORCPT ); Wed, 10 May 2017 16:42:24 -0400 Received: by mail-io0-f172.google.com with SMTP id k91so9466146ioi.1 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=GgZbg4oXORvnDJxAv0+IqB7uYOcP7qHjdtFQpmlwsp4/H5aoh1vsY7X4GCL6JJl9Vb EvyCRS+f7TnSbXWZlRwajzXIxBghQVpNMGLdC9LwjhNzxSuAqTBf7AdRyfMOMp8g/ekW D2eP6KPIom0gZVtp2myUahw3wZ/KXsJkN506B7eASMFvCqHxe1l/DzE8LMy/0AahzD5X t5dfrPfOOAPfYeClZybQT0zpQCcIvHwTTuXjKPHdKf2yYdptp832C0WJt0++c9QZC/K8 42d2zbVthP1SSSgLwEB6JN8B+gQPv4FxMv1YUGgPyI1/Oz6+HXEHrSy0xas7AGfzSxIy AwYg== X-Gm-Message-State: AODbwcDbK7tjQ9L13qC//COLhO5xZUjfUnohZz2zx4gbz+2U99kL27Gx jUzEZCxGLxtUBMwT 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 Cc: linux-arm-kernel@lists.infradead.org, patches@apm.com, Quan Nguyen , Iyappan Subramanian 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> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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;