From patchwork Wed Jun 7 08:38:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 9770917 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 7140060364 for ; Wed, 7 Jun 2017 08:40:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 57F2D2847D for ; Wed, 7 Jun 2017 08:40:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4C85D28520; Wed, 7 Jun 2017 08:40:36 +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 C86FE2847D for ; Wed, 7 Jun 2017 08:40:35 +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=0SbhKodqyfjjHqQ+7P5L5yyL/xb5pplaAKsqHiGWMrA=; b=tY1p8MEkzsi3YmoauBUj9iZMYf 1yCAV1r2WNVWyC+YXKLlXtZigEgbk81xDmNNQmeKY4Dc/f0tY1T5JxRa/a4VNbI4R3hqia/udPA5g ug8hg8DCp61TROgb9supZWzHnnrx0CAxZnzq89us1jfpaIkEnaJYJ/v75cSpeW7NGEg/AwqOsMbcy zV63T80pDJADQqg7XZNN4pkfrdBBiTs5srIeMTYY+AqH9I5AtiBnYqnVJU+yeLqXYASE/+50y/HNk bulAJ9T54FOqUt8XetScdP5DsVnIpRrPnJNBSdPTjWnhHhir1AF8pt3x/uPrAiZEPx2rGc8cHpH3e g//J4EXg==; 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 1dIWW2-0001Em-A6; Wed, 07 Jun 2017 08:40:34 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dIWV5-0007B8-GQ for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2017 08:39:38 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 8B21C21D30; Wed, 7 Jun 2017 10:39:12 +0200 (CEST) Received: from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 5EA4821D33; Wed, 7 Jun 2017 10:39:02 +0200 (CEST) From: Antoine Tenart To: davem@davemloft.net, jason@lakedaemon.net, andrew@lunn.ch, gregory.clement@free-electrons.com, sebastian.hesselbarth@gmail.com, f.fainelli@gmail.com Subject: [PATCH 5/9] net: mvmdio: introduce an ops structure Date: Wed, 7 Jun 2017 10:38:06 +0200 Message-Id: <20170607083810.30922-6-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607083810.30922-1-antoine.tenart@free-electrons.com> References: <20170607083810.30922-1-antoine.tenart@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170607_013935_926320_BD921754 X-CRM114-Status: GOOD ( 14.38 ) 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: thomas.petazzoni@free-electrons.com, netdev@vger.kernel.org, Antoine Tenart , linux@armlinux.org.uk, mw@semihalf.com, linux-arm-kernel@lists.infradead.org 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 Introduce an ops structure to add an indirection on functions accessing the registers. This is needed to add the xMDIO support later. Signed-off-by: Antoine Tenart --- drivers/net/ethernet/marvell/mvmdio.c | 65 +++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 14 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index 56bbe3990590..8a71ef93a61b 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -62,6 +62,15 @@ struct orion_mdio_dev { */ int err_interrupt; wait_queue_head_t smi_busy_wait; + struct orion_mdio_ops *ops; +}; + +struct orion_mdio_ops { + int (*is_done)(struct orion_mdio_dev *); + int (*is_read_valid)(struct orion_mdio_dev *); + void (*start_read)(struct orion_mdio_dev *, int, int); + u16 (*read)(struct orion_mdio_dev *); + void (*write)(struct orion_mdio_dev *, int, int, u16); }; static int orion_mdio_smi_is_done(struct orion_mdio_dev *dev) @@ -74,6 +83,30 @@ static int orion_mdio_smi_is_read_valid(struct orion_mdio_dev *dev) return !(readl(dev->regs) & MVMDIO_SMI_READ_VALID); } +static void orion_mdio_start_read_op(struct orion_mdio_dev *dev, int mii_id, + int regnum) +{ + writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) | + (regnum << MVMDIO_SMI_PHY_REG_SHIFT) | + MVMDIO_SMI_READ_OPERATION), + dev->regs); +} + +static u16 orion_mdio_read_op(struct orion_mdio_dev *dev) +{ + return readl(dev->regs) & GENMASK(15,0); +} + +static void orion_mdio_write_op(struct orion_mdio_dev *dev, int mii_id, + int regnum, u16 value) +{ + writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) | + (regnum << MVMDIO_SMI_PHY_REG_SHIFT) | + MVMDIO_SMI_WRITE_OPERATION | + (value << MVMDIO_SMI_DATA_SHIFT)), + dev->regs); +} + /* Wait for the SMI unit to be ready for another operation */ static int orion_mdio_wait_ready(struct mii_bus *bus) @@ -84,7 +117,7 @@ static int orion_mdio_wait_ready(struct mii_bus *bus) int timedout = 0; while (1) { - if (orion_mdio_smi_is_done(dev)) + if (dev->ops->is_done(dev)) return 0; else if (timedout) break; @@ -103,8 +136,7 @@ static int orion_mdio_wait_ready(struct mii_bus *bus) if (timeout < 2) timeout = 2; wait_event_timeout(dev->smi_busy_wait, - orion_mdio_smi_is_done(dev), - timeout); + dev->ops->is_done(dev), timeout); ++timedout; } @@ -126,22 +158,19 @@ static int orion_mdio_read(struct mii_bus *bus, int mii_id, if (ret < 0) goto out; - writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) | - (regnum << MVMDIO_SMI_PHY_REG_SHIFT) | - MVMDIO_SMI_READ_OPERATION), - dev->regs); + dev->ops->start_read(dev, mii_id, regnum); ret = orion_mdio_wait_ready(bus); if (ret < 0) goto out; - if (orion_mdio_smi_is_read_valid(dev)) { + if (dev->ops->is_read_valid(dev)) { dev_err(bus->parent, "SMI bus read not valid\n"); ret = -ENODEV; goto out; } - ret = readl(dev->regs) & GENMASK(15,0); + ret = dev->ops->read(dev); out: mutex_unlock(&dev->lock); return ret; @@ -159,11 +188,7 @@ static int orion_mdio_write(struct mii_bus *bus, int mii_id, if (ret < 0) goto out; - writel(((mii_id << MVMDIO_SMI_PHY_ADDR_SHIFT) | - (regnum << MVMDIO_SMI_PHY_REG_SHIFT) | - MVMDIO_SMI_WRITE_OPERATION | - (value << MVMDIO_SMI_DATA_SHIFT)), - dev->regs); + dev->ops->write(dev, mii_id, regnum, value); out: mutex_unlock(&dev->lock); @@ -190,6 +215,7 @@ static int orion_mdio_probe(struct platform_device *pdev) struct resource *r; struct mii_bus *bus; struct orion_mdio_dev *dev; + struct orion_mdio_ops *ops; int i, ret; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -249,6 +275,17 @@ static int orion_mdio_probe(struct platform_device *pdev) mutex_init(&dev->lock); + ops = devm_kzalloc(&pdev->dev, sizeof(*ops), GFP_KERNEL); + if (!ops) + return -ENOMEM; + + ops->is_done = orion_mdio_smi_is_done; + ops->is_read_valid = orion_mdio_smi_is_read_valid; + ops->start_read = orion_mdio_start_read_op; + ops->read = orion_mdio_read_op; + ops->write = orion_mdio_write_op; + dev->ops = ops; + if (pdev->dev.of_node) ret = of_mdiobus_register(bus, pdev->dev.of_node); else