From patchwork Sat Apr 16 20:35:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 611398 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 3qnR5K2Wzpz9t5C for ; Sun, 17 Apr 2016 06:36:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752111AbcDPUgE (ORCPT ); Sat, 16 Apr 2016 16:36:04 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:49899 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751711AbcDPUgC (ORCPT ); Sat, 16 Apr 2016 16:36:02 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue003) with ESMTPA (Nemesis) id 0MZysF-1bCEcn1CwR-00Lp4k; Sat, 16 Apr 2016 22:35:46 +0200 From: Arnd Bergmann To: Jeff Kirsher Cc: Arnd Bergmann , Jesse Brandeburg , Shannon Nelson , Carolyn Wyborny , Don Skidmore , Bruce Allan , John Ronciak , Mitch Williams , Mark Rustad , intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] ixgbe: use msleep for long delays Date: Sat, 16 Apr 2016 22:35:08 +0200 Message-Id: <1460838941-1251989-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:MEYvR4pKzOlLo8nRXk7LdLj8tvIXlSVuSEORCn8LMXI0+pT539G dlN7CxtOkxgKMVrJsRn7gef2Ix4mb4Avg4kDRssIkkxg+fUyGpZ0wzv5n0hRl8epDSBfmdf OmUSL4c/JQaQjtqhkbXLS/uwu1pLuOtsSYBfO7p6va7HUrLfv6Gum3RMiLd28phdSqpEkk+ vQdmGV/ulL9qZ7g3kxybw== X-UI-Out-Filterresults: notjunk:1; V01:K0:bVNQ2Sh9wnQ=:7n6kmxPizYGM3AKyESQmTq mXp5a2exExHg9glwheQH3kO9Bw/ra43WeY8OZQstII05cFh+cXU6UUNFDX7eSzC6UotWr2fcv lRb8yYyy3T3BOVzrLnTFzGP1NjFCpdBgXcxZoR1ys4LcY1ANnRp8ChdjiAvcJTMAzEhqS262q QDvgequM2aE4dpNeWDy8JgcYfNtqszufFRxfPK1OgC8LNPLHYm47RaAz2PUY7nhvFzMslfGYx IFiJ6XNsg0zHecQP8Z0LkrssWElK0Nw2r5uFKnmkPxHOMA12344XWkfj0VaUbXNeU7C+DSsrn O9FdPoPHGTh6XPQyyrfgSztYpEdVzxhllfvdbWzq99+89claS93CRPfBaSEuleCl1p1g7Wj6V FZMQufatWXUtn18xOO/iabGc9I4GTKg3dqUlHhRvhhowmTCtBp5IJnc4oUjnre4b3hR966kCX r4/m8Yxp1Q/U3UiKaRaXAMbhiT2xUZqj7crDXoN02Ce52jkvX7GeKNXBu3IA8On74TWs5IV0F X0+5OSegcJlJEptpKMtBF+lLxj2jEi7r840wYlBW9CKO3upVaUQSOUcG0+vYLkL2/Ya7x9eUR RcrsGIN6C9RA0sa/6ClWxNdW3xOyR74gul69UBaMETKK9BGai4oD3joUkug1vQVEnPuFrZ+qW 5f/zVWsNnuvdT0OgRRLzCsK9HYwQXSlfjepC4NvGOECSGiY4YazjaxiOd9YbnZ2+cDO0= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The newly added x550em_a support causes a link failure on ARM because of an overly long time passed into udelay(): ERROR: "__bad_udelay" [drivers/net/ethernet/intel/ixgbe/ixgbe.ko] undefined! There are multiple variants of the ixgbe_acquire_swfw_sync_*() function, and the other ones all use msleep(), so we can safely assume that all callers are allowed to sleep, which makes msleep() a better replacement than mdelay(). Signed-off-by: Arnd Bergmann Fixes: 49425dfc7451 ("ixgbe: Add support for x550em_a 10G MAC type") --- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c index c71e93ed4451..21c0fce47e15 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c @@ -2765,7 +2765,7 @@ static s32 ixgbe_acquire_swfw_sync_x550em_a(struct ixgbe_hw *hw, u32 mask) ixgbe_release_swfw_sync_X540(hw, hmask); if (status != IXGBE_ERR_TOKEN_RETRY) return status; - udelay(FW_PHY_TOKEN_DELAY * 1000); + msleep(FW_PHY_TOKEN_DELAY); } return status;