From patchwork Mon Jun 12 09:57:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 9780677 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 0720F60212 for ; Mon, 12 Jun 2017 10:02:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED1E02853D for ; Mon, 12 Jun 2017 10:02:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E187E285E9; Mon, 12 Jun 2017 10:02: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 606002853D for ; Mon, 12 Jun 2017 10:02: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=O8Oi43LLRrdh1FvI/FUTWVVMZa5RHjxEa74xGSguRtw=; b=HwvlsnuBOB8Kq7BqdlFtGW+imG tl86F6oHNl7qqfEnfDYUla1I4Bl/l/ae46u0W/lfLn6Krcw4Kd3qDhHZvyzgZKa+uBrDFw4d0wtHD gC/ssRRFcN950DTdSNhzF6HHatz8hKwAYXnOHzCaQaMWVFgLyUKHY1DMs9IfuZF9ovyiTeEiQRidX NY/NFqkZiuDhJwvQ0ANd0C8cmAXpwCu/2feXPv1MTDazv1O47R9hUFr8Xt90HlQU41mok3i09pqdw 8SCgoqP6oBbWVQj87eA4IcGfxqJxbJfWBhsOrzyMtlgqC9c4nWJSQOL4TSY+8j1zfCxk7+9r9Mc8Y sg2mwrrA==; 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 1dKMAu-0004LA-Lp; Mon, 12 Jun 2017 10:02:20 +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 1dKM9Z-0002HT-MB for linux-arm-kernel@lists.infradead.org; Mon, 12 Jun 2017 10:01:04 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 52D6A21E30; Mon, 12 Jun 2017 12:00:19 +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 744AB21E0E; Mon, 12 Jun 2017 12:00:03 +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 v3 6/9] net: mvmdio: put the poll intervals in the ops structure Date: Mon, 12 Jun 2017 11:57:42 +0200 Message-Id: <20170612095745.11300-7-antoine.tenart@free-electrons.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170612095745.11300-1-antoine.tenart@free-electrons.com> References: <20170612095745.11300-1-antoine.tenart@free-electrons.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170612_030058_439188_628CA863 X-CRM114-Status: GOOD ( 11.67 ) 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, nadavh@marvell.com, 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 Put the two poll intervals (min and max) in the driver's ops structure. This is needed to add the xmdio support later. Signed-off-by: Antoine Tenart --- drivers/net/ethernet/marvell/mvmdio.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index 7d2f1b2e1fe1..41c75d7b84fb 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -70,6 +70,9 @@ struct orion_mdio_ops { void (*start_read)(struct orion_mdio_dev *, int, int); u16 (*read)(struct orion_mdio_dev *); void (*write)(struct orion_mdio_dev *, int, int, u16); + + unsigned int poll_interval_min; + unsigned int poll_interval_max; }; static int orion_mdio_smi_is_done(struct orion_mdio_dev *dev) @@ -112,6 +115,9 @@ static const struct orion_mdio_ops orion_mdio_smi_ops = { .start_read = orion_mdio_smi_start_read_op, .read = orion_mdio_smi_read_op, .write = orion_mdio_smi_write_op, + + .poll_interval_min = MVMDIO_SMI_POLL_INTERVAL_MIN, + .poll_interval_max = MVMDIO_SMI_POLL_INTERVAL_MAX, }; /* Wait for the SMI unit to be ready for another operation @@ -131,8 +137,8 @@ static int orion_mdio_wait_ready(const struct orion_mdio_ops *ops, break; if (dev->err_interrupt <= 0) { - usleep_range(MVMDIO_SMI_POLL_INTERVAL_MIN, - MVMDIO_SMI_POLL_INTERVAL_MAX); + usleep_range(ops->poll_interval_min, + ops->poll_interval_max); if (time_is_before_jiffies(end)) ++timedout;