From patchwork Wed Jun 7 08:38:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antoine Tenart X-Patchwork-Id: 9770971 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 088DE60350 for ; Wed, 7 Jun 2017 08:51:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E584328479 for ; Wed, 7 Jun 2017 08:51:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DA4512850D; Wed, 7 Jun 2017 08:51:47 +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 841E028479 for ; Wed, 7 Jun 2017 08:51:47 +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=q9ySCbk7+Wcv8GOyP0flggbGUwjXCsrsY01yxjPcNTA=; b=EQP+oGi/p8OlqXPRYWw+22e/i2 LInAN2GhfQBx6mZUxuUWAAXgY8shJlGaNkFIv/kAr9NslOuUy5fPjalDlJI7CPlXKlgxOwmLN4nKf 62rG5VIOT1/fKSY9ghY36UOnQwfltRK+z+U+LZCb7Wksmj6j9d7WYuOaVfqS4CRb3OgSgiImBCbMV zY99zvjZGevflqLB5Ze4fMQupMHR6MtnqllUJUL7edCh1g1eOLK7H0IrkMwa2RMRIjWgpWzzokRGx 3K5NiIJbTp0QEFth83A2/qam/gbWVaNHEkKIghtLl43VKpefcqavcHrxPqwB3hTseec59IkNeDWr3 Ab63v+dA==; 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 1dIWgs-0002OE-Az; Wed, 07 Jun 2017 08:51:46 +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 1dIWVR-0007Ef-PB for linux-arm-kernel@lists.infradead.org; Wed, 07 Jun 2017 08:40:12 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id DBBB221D33; 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 B2DE121D34; 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 6/9] net: mvmdio: put the poll intervals in the private structure Date: Wed, 7 Jun 2017 10:38:07 +0200 Message-Id: <20170607083810.30922-7-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_013958_310618_E31CC33B X-CRM114-Status: GOOD ( 11.03 ) 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 Put the two poll intervals (min and max) in the driver's private structure. This is needed to add the xmdio support later. Signed-off-by: Antoine Tenart Reviewed-by: Florian Fainelli --- drivers/net/ethernet/marvell/mvmdio.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index 8a71ef93a61b..3cb3dd3331d8 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -63,6 +63,9 @@ struct orion_mdio_dev { int err_interrupt; wait_queue_head_t smi_busy_wait; struct orion_mdio_ops *ops; + + unsigned int poll_interval_min; + unsigned int poll_interval_max; }; struct orion_mdio_ops { @@ -123,8 +126,8 @@ static int orion_mdio_wait_ready(struct mii_bus *bus) break; if (dev->err_interrupt <= 0) { - usleep_range(MVMDIO_SMI_POLL_INTERVAL_MIN, - MVMDIO_SMI_POLL_INTERVAL_MAX); + usleep_range(dev->poll_interval_min, + dev->poll_interval_max); if (time_is_before_jiffies(end)) ++timedout; @@ -279,6 +282,8 @@ static int orion_mdio_probe(struct platform_device *pdev) if (!ops) return -ENOMEM; + dev->poll_interval_min = MVMDIO_SMI_POLL_INTERVAL_MIN; + dev->poll_interval_max = MVMDIO_SMI_POLL_INTERVAL_MAX; 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;