From patchwork Fri Mar 20 13:34:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 1258900 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=FtKjXXFV; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kPs54gSFz9sRN for ; Sat, 21 Mar 2020 00:34:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727267AbgCTNeq (ORCPT ); Fri, 20 Mar 2020 09:34:46 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:36491 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726843AbgCTNeq (ORCPT ); Fri, 20 Mar 2020 09:34:46 -0400 Received: by mail-pl1-f195.google.com with SMTP id g2so2502259plo.3; Fri, 20 Mar 2020 06:34:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zHfjWqMdgmsvCcyiUh0cLQzMtqfoMY+xsY6uvUQyywo=; b=FtKjXXFVeA5dFw1V5/sd9FWWkr8zptffNctgijVpRX80w9SjS6sW0stYT8jaOckebc HxEDhTxnrug9CF2c9mwIeqRQd44UnnRDr0EG1MueRCEZBp3Xx2JUpt76hVmdrQ/hepEq gldWEyqsL26VIfAmsi1S+F4/N1p/ed0xw2Nhxdwy4qPRUWceu2JRXfYTmOV8n/AO+9Sj 9nXCTIC1YkrqBXoQuI4xEL93Husa/ks7QUJlVMYbEgYYN9tNyfo7/zA8tSin1xvF7gGl 7RHbRtwH1mFZUcKrEWNBDvRn/luhdlDyy8ce4gSMaF+4XAQJlFxniutSK6BmiZcteUfY 9Siw== 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:mime-version:content-transfer-encoding; bh=zHfjWqMdgmsvCcyiUh0cLQzMtqfoMY+xsY6uvUQyywo=; b=XJCa5Vr355/QCXrXWfdMmGHDg4zbfHzZkbcGqU3ruDjOoMnU7EAndXYTnfVO2gmJr4 xqjW/nahOJDrUNuqEKrlgpmoCeg23rzo4bOvXosfClEqz8tuPFZWoIO6wJC4C9F/tT+M lvcjTKnBPiRQcIjZhLrI0garRiGHb8AIS/poJxXQfBUisj8kVK4xONtJGrsTaQrukgSj FHvTnGMf4PiIMMgtdgQ3OJD5fMGDcKCigRroR4AK1LLGTMo/Psuy6G8kXE5/dQpEuLuC mbyx3fQDQhMQ8Zo2zoUzgU9dA3hECpVrw8apMgIUkX8mGO4itPSFxaHM7cXsNFB/0fZK hX+g== X-Gm-Message-State: ANhLgQ1ddpWPOfb1j63RdO33ssLaIURS2KCzY6MxLfAzGgh0w8g2jCHD 6HhCj6PkdnxSKjz8LFSZubY= X-Google-Smtp-Source: ADFU+vsdUG8xJZPjbd9NuUg+9anBhtR+VYfYiOnvvdVKpSHuosCbkgmQRVDBZNalchdDxqEVlbQryA== X-Received: by 2002:a17:902:e788:: with SMTP id cp8mr8323611plb.343.1584711283582; Fri, 20 Mar 2020 06:34:43 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id h15sm5278912pgd.19.2020.03.20.06.34.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Mar 2020 06:34:43 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, allison@lohutok.net, corbet@lwn.net, alexios.zavras@intel.com, broonie@kernel.org, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v2 1/7] iopoll: introduce read_poll_timeout macro Date: Fri, 20 Mar 2020 21:34:25 +0800 Message-Id: <20200320133431.9354-2-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200320133431.9354-1-zhengdejin5@gmail.com> References: <20200320133431.9354-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org this macro is an extension of readx_poll_timeout macro. the accessor function op just supports only one parameter in the readx_poll_timeout macro, but this macro can supports multiple variable parameters for it. so functions like phy_read(struct phy_device *phydev, u32 regnum) and phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum) can also use this poll timeout framework. Signed-off-by: Dejin Zheng --- v1 -> v2: no changed include/linux/iopoll.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index 35e15dfd4155..7d44a2e20267 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -13,6 +13,46 @@ #include #include +/** + * read_poll_timeout - Periodically poll an address until a condition is + * met or a timeout occurs + * @op: accessor function (takes @args as its arguments) + * @val: Variable to read the value into + * @cond: Break condition (usually involving @val) + * @sleep_us: Maximum time to sleep between reads in us (0 + * tight-loops). Should be less than ~20ms since usleep_range + * is used (see Documentation/timers/timers-howto.rst). + * @timeout_us: Timeout in us, 0 means never timeout + * @args: arguments for @op poll + * + * Returns 0 on success and -ETIMEDOUT upon a timeout. In either + * case, the last read value at @args is stored in @val. Must not + * be called from atomic context if sleep_us or timeout_us are used. + * + * When available, you'll probably want to use one of the specialized + * macros defined below rather than this macro directly. + */ +#define read_poll_timeout(op, val, cond, sleep_us, timeout_us, args...) \ +({ \ + u64 __timeout_us = (timeout_us); \ + unsigned long __sleep_us = (sleep_us); \ + ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \ + might_sleep_if((__sleep_us) != 0); \ + for (;;) { \ + (val) = op(args); \ + if (cond) \ + break; \ + if (__timeout_us && \ + ktime_compare(ktime_get(), __timeout) > 0) { \ + (val) = op(args); \ + break; \ + } \ + if (__sleep_us) \ + usleep_range((__sleep_us >> 2) + 1, __sleep_us); \ + } \ + (cond) ? 0 : -ETIMEDOUT; \ +}) + /** * readx_poll_timeout - Periodically poll an address until a condition is met or a timeout occurs * @op: accessor function (takes @addr as its only argument) From patchwork Fri Mar 20 13:34:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 1258901 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Kkb0Ae+D; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kPs95zPxz9sSL for ; Sat, 21 Mar 2020 00:34:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727303AbgCTNeu (ORCPT ); Fri, 20 Mar 2020 09:34:50 -0400 Received: from mail-pj1-f65.google.com ([209.85.216.65]:35570 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726843AbgCTNet (ORCPT ); Fri, 20 Mar 2020 09:34:49 -0400 Received: by mail-pj1-f65.google.com with SMTP id j20so2470305pjz.0; Fri, 20 Mar 2020 06:34:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5eu/GbCyiZnNjHzfysgXyEqnee5wSOADkQwll/x5vc8=; b=Kkb0Ae+Dtb93ZPx/AViX9EDKFrmUoWFyBqiUMtbajNEN0i4oYP1LFcjp/wuUarf9cO wKMAxaBzZ3bTj7rc6oz7cfpkdCiMwXele0F/BSJJbbrSglrVSD05peY5umEibIcIgukO YS3sUBjKZtSh5OG/pvTjOcFtMEOGX/RMO1pN05N29LahnsX9Mgc1i4e4OpiTqDdlwkK6 ufNWvKAGkD0+vpGwU3ycPDAPnIkxsVa6ruOnDKULB800iBaUiJkjic+kWqhZCPC/Cuzj JKZSEha5usp6azU7nl8HbNLMSseiLbCGoW/G/QHuN+6LmKmLOv4zX2Bv/q/H4K/3bHtw pDQg== 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:mime-version:content-transfer-encoding; bh=5eu/GbCyiZnNjHzfysgXyEqnee5wSOADkQwll/x5vc8=; b=nPYbt1zBB8e5Rdw673ULY8VrAUdXxjcA2GNs12yWbT88XbCkWfKULD4JRZgnoqJq1q iH5PFGjBMcHuthfSI60PkDLrxSDK8of64/sNuLkwpHl/jp6MRReE00F23LDSAFZ4Peez CYPG5x1fe5cqmVPT0QNvZMGC4InIJler2HzGMxcDzsZxbLrv79OE78WIbwRj8xTKFagI AataqXNl/ErqjuCATOOL7CtSIWgWA4UVvw4v7d1m+KHsOjSDA6DWxkp87r1Z+9yRhVh2 m8Mdhvpfbxh8w2GS5M0DwSP/Ug9EXBUIMM816lZs54QwbCboG4V3r1KaUpqcR73FwhWb Vfjg== X-Gm-Message-State: ANhLgQ0GJikyX+4PnCFnG9cDK9co+nD4WgJzDPbYHgkjlWdOQdIsgdTF MeJIgJtzpzU1qxZBeBYSuko= X-Google-Smtp-Source: ADFU+vuMaIEyV/IzK4qcmULmonDMa/U+rDy9qqcLkRTEAzKMJjS28gxA2bXFVRWDITPFhLFo9WVHvA== X-Received: by 2002:a17:90a:24c5:: with SMTP id i63mr9343344pje.177.1584711287966; Fri, 20 Mar 2020 06:34:47 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id r12sm5431447pgu.93.2020.03.20.06.34.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Mar 2020 06:34:47 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, allison@lohutok.net, corbet@lwn.net, alexios.zavras@intel.com, broonie@kernel.org, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v2 2/7] iopoll: redefined readx_poll_timeout macro to simplify the code Date: Fri, 20 Mar 2020 21:34:26 +0800 Message-Id: <20200320133431.9354-3-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200320133431.9354-1-zhengdejin5@gmail.com> References: <20200320133431.9354-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org redefined readx_poll_timeout macro by read_poll_timeout to simplify the code. Signed-off-by: Dejin Zheng --- v1 -> v2: no changed include/linux/iopoll.h | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index 7d44a2e20267..29c016cd6249 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -72,25 +72,7 @@ * macros defined below rather than this macro directly. */ #define readx_poll_timeout(op, addr, val, cond, sleep_us, timeout_us) \ -({ \ - u64 __timeout_us = (timeout_us); \ - unsigned long __sleep_us = (sleep_us); \ - ktime_t __timeout = ktime_add_us(ktime_get(), __timeout_us); \ - might_sleep_if((__sleep_us) != 0); \ - for (;;) { \ - (val) = op(addr); \ - if (cond) \ - break; \ - if (__timeout_us && \ - ktime_compare(ktime_get(), __timeout) > 0) { \ - (val) = op(addr); \ - break; \ - } \ - if (__sleep_us) \ - usleep_range((__sleep_us >> 2) + 1, __sleep_us); \ - } \ - (cond) ? 0 : -ETIMEDOUT; \ -}) + read_poll_timeout(op, val, cond, sleep_us, timeout_us, addr) /** * readx_poll_timeout_atomic - Periodically poll an address until a condition is met or a timeout occurs From patchwork Fri Mar 20 13:34:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 1258902 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=P0+wk6m1; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kPsD0tx1z9sSL for ; Sat, 21 Mar 2020 00:34:56 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727334AbgCTNez (ORCPT ); Fri, 20 Mar 2020 09:34:55 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34160 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726843AbgCTNex (ORCPT ); Fri, 20 Mar 2020 09:34:53 -0400 Received: by mail-pl1-f193.google.com with SMTP id a23so2509574plm.1; Fri, 20 Mar 2020 06:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PL0PTIOm3HjsIV7LXQhTZaFywor65IsPC9pHNSkg178=; b=P0+wk6m1kvn6tYz9FMfXB7JmGXxMGQRhtcof3deUdfIaovAqsHRfJ91C8duEg5kBm9 +bfcajDkSh+qJ498bnZ1zQACFmGcd5IxkhijQHtihO5WXy+fMSl9tw4y+JUCUaioHeYu GvyZSM+sg16TA5H+a6P5l2YcrWB2NJTCRLG9dRLatKUljP8LJkEVx4c7UQ5PaR16jCD5 4IA+rkQ7XQk4LtvgJV8OqqHn5qy84vGOlNW0GmvxzLCmIlVNj5e7PNu7p9aMMLMryjgU 2KpRZRDd0Q37pmuc4TLvYQV4V0Adtxu5A88L7e9dsbPMYyemQdG4zN+CTgCvJeHVeQjY VodQ== 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:mime-version:content-transfer-encoding; bh=PL0PTIOm3HjsIV7LXQhTZaFywor65IsPC9pHNSkg178=; b=V9I/wU2YHx5Qly6cCdME8ero3O29vlUuL9BKFxLYRhKxbf2glICh4JKSaW1CQzvXl8 /Fj6CN29pn4v2qp1bmuwUIXckMaIqnWsgVqNyTk85J9D2pPjH/KWj4Urqhj3CjuGH60s 14OO8oQUeWPsyY+TJB9gogXEYw9wralkXBVv06umzoHJzJPrN4C52H4igtzvlBKfsxj8 tS8k9nrnGe9HoArJXF3zOjLp8q7Z4Z0rRLYm9R91i3eTpfaYRQJq+e8OHBhGISr2T1th ZH8TmYXGRTPNd1soTYZ5+rpAxlsRrcMpeHw9lUmd8Et0JXfuS2hat2GcvjLSDzNf2la6 OgWA== X-Gm-Message-State: ANhLgQ1d17fLFd6T+2Xw9gOH1pjEch49P5mr2Ugf0gld1auChu20sY3F 6fEK9hIAcLc4ikAB4dHG4SM= X-Google-Smtp-Source: ADFU+vssmLcrhF+u23k+YS2vxuAzD5YXcWjLuVq+kOp09b+JoluRoQFZ9vPMiRYHfuc4eKZHXbf7yg== X-Received: by 2002:a17:90a:804c:: with SMTP id e12mr9207405pjw.19.1584711292048; Fri, 20 Mar 2020 06:34:52 -0700 (PDT) Received: from localhost ([216.24.188.11]) by smtp.gmail.com with ESMTPSA id nu13sm4997294pjb.22.2020.03.20.06.34.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Mar 2020 06:34:51 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, allison@lohutok.net, corbet@lwn.net, alexios.zavras@intel.com, broonie@kernel.org, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v2 3/7] net: phy: introduce phy_read_mmd_poll_timeout macro Date: Fri, 20 Mar 2020 21:34:27 +0800 Message-Id: <20200320133431.9354-4-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200320133431.9354-1-zhengdejin5@gmail.com> References: <20200320133431.9354-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org it is sometimes necessary to poll a phy register by phy_read_mmd() function until its value satisfies some condition. introduce phy_read_mmd_poll_timeout() macros that do this. Suggested-by: Andrew Lunn Signed-off-by: Dejin Zheng --- v1 -> v2: - passed a phydev, device address and a reg to replace args... parameter in phy_read_mmd_poll_timeout() by Andrew Lunn 's suggestion. Andrew Lunn , Thanks very much for your help! - handle phy_read_mmd return an error(the return value < 0) in phy_read_mmd_poll_timeout(). Thanks Andrew again. include/linux/phy.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/include/linux/phy.h b/include/linux/phy.h index 36d9dea04016..bb351f8b8769 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -24,6 +24,7 @@ #include #include #include +#include #include @@ -784,6 +785,19 @@ static inline int __phy_modify_changed(struct phy_device *phydev, u32 regnum, */ int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum); +#define phy_read_mmd_poll_timeout(val, cond, sleep_us, timeout_us, \ + phydev, devad, regnum) \ +({ \ + int ret = 0; \ + ret = read_poll_timeout(phy_read_mmd, val, cond || val < 0, sleep_us, \ + timeout_us, phydev, devad, regnum); \ + if (val < 0) \ + ret = val; \ + if (ret) \ + phydev_err(phydev, "%s failed: %d\n", __func__, ret); \ + ret; \ +}) + /** * __phy_read_mmd - Convenience function for reading a register * from an MMD on a given PHY. From patchwork Fri Mar 20 13:34:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 1258903 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=S2hKRur7; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kPsL0kWLz9sSL for ; Sat, 21 Mar 2020 00:35:02 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727377AbgCTNe7 (ORCPT ); Fri, 20 Mar 2020 09:34:59 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:33299 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726843AbgCTNe5 (ORCPT ); Fri, 20 Mar 2020 09:34:57 -0400 Received: by mail-pf1-f196.google.com with SMTP id j1so538524pfe.0; Fri, 20 Mar 2020 06:34:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RswhjvPr5b8vA1NrirXeBdsXcQMYg0zZWrAG+BTT7RM=; b=S2hKRur78Ka42SDCfO39JMUlZ5/2AWep4JDtwrW+qcnn9jBVa5ttZShZiN9PlfHoBK 3y2iMy4fW5Ai40vR9cQeZukTc9FISTYANb8Ft0J0unLydwRH9cKCjhL+AqlXCMSSdZPG gm96WF2qtysmHqDPF/aMItuUxAo1GWyyJ0R9xPbVl7C7+UQgInIAi/Bwf8+QKwMDZBfQ OplstSiOxHHJbpz4VUXfC7p48+CobbxLeRonxGV0Ovz5KZDUkopYRiXp/ScsE4I5xkzV bc6QeAiQDs4zYsFrS/Md2qZYvPoJyKofOmJJxHhDU8E++XnPNwrkgSAaoBXjF7pfhL3e ITwA== 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:mime-version:content-transfer-encoding; bh=RswhjvPr5b8vA1NrirXeBdsXcQMYg0zZWrAG+BTT7RM=; b=Y5x1mql+FiuOd51KLciyJR7CFzmhwP4On8tjsaTzZUPPygiVa8ZGjfBmcustCldZEq APyLxBF4MIFeSvs2HHtZ2IzhJKAdZ4omTNrWj2h05aoQpU0utoyAa47DmIr1OAYfpXO2 gyEeTBPFxeGxXg1sny0HXPq2vlwWNUMuFEVY8BjhUjZC2hsJFfyTEUa/PvZ1/uBSOUzv BlWuNZ8rrIDSrWgp5GO097Nde77ZxcbuqdnQjRbyYexhqYfwx/vgQ9ueMHZxlfqfbMS1 uYE7i+jSA9KEe21ZGw1vfMDWx8oa6cMDJ7Jk5RF8PhEuHd54LoC9pmx4fpwMG9W7bwep weiA== X-Gm-Message-State: ANhLgQ3retmRTdrPXlf1wBt7/a/Wu0Uc87jNXYJLfAurL3YZLScbtt9u WskRfY99dS5UimCl/tEcNZY= X-Google-Smtp-Source: ADFU+vuu9bQZjA9IAnNnVPKiZJRKd/gpVxQ8g/7oJcb20doASt8yWy3ocMJrMU3lLIK+vpuwJiuASQ== X-Received: by 2002:aa7:96ae:: with SMTP id g14mr9398744pfk.216.1584711296647; Fri, 20 Mar 2020 06:34:56 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id k17sm5479096pfp.194.2020.03.20.06.34.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Mar 2020 06:34:56 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, allison@lohutok.net, corbet@lwn.net, alexios.zavras@intel.com, broonie@kernel.org, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v2 4/7] net: phy: bcm84881: use phy_read_mmd_poll_timeout() to simplify the code Date: Fri, 20 Mar 2020 21:34:28 +0800 Message-Id: <20200320133431.9354-5-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200320133431.9354-1-zhengdejin5@gmail.com> References: <20200320133431.9354-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use phy_read_mmd_poll_timeout() to replace the poll codes for simplify the code in bcm84881_wait_init() function. Signed-off-by: Dejin Zheng --- v1 -> v2: - remove the handle of phy_read_mmd's return error. drivers/net/phy/bcm84881.c | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/drivers/net/phy/bcm84881.c b/drivers/net/phy/bcm84881.c index 14d55a77eb28..21df9b00d2b2 100644 --- a/drivers/net/phy/bcm84881.c +++ b/drivers/net/phy/bcm84881.c @@ -22,30 +22,11 @@ enum { static int bcm84881_wait_init(struct phy_device *phydev) { - unsigned int tries = 20; - int ret, val; - - do { - val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_CTRL1); - if (val < 0) { - ret = val; - break; - } - if (!(val & MDIO_CTRL1_RESET)) { - ret = 0; - break; - } - if (!--tries) { - ret = -ETIMEDOUT; - break; - } - msleep(100); - } while (1); + int val; - if (ret) - phydev_err(phydev, "%s failed: %d\n", __func__, ret); - - return ret; + return phy_read_mmd_poll_timeout(val, !(val & MDIO_CTRL1_RESET), + 100000, 2000000, phydev, + MDIO_MMD_PMAPMD, MDIO_CTRL1); } static int bcm84881_config_init(struct phy_device *phydev) From patchwork Fri Mar 20 13:34:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 1258915 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Iuh63tzF; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kPtM2kd4z9sT5 for ; Sat, 21 Mar 2020 00:35:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727407AbgCTNfF (ORCPT ); Fri, 20 Mar 2020 09:35:05 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:45457 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727275AbgCTNfE (ORCPT ); Fri, 20 Mar 2020 09:35:04 -0400 Received: by mail-pg1-f196.google.com with SMTP id m15so3077293pgv.12; Fri, 20 Mar 2020 06:35:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=98UkHK54MJKr9CT41iYYpXXQonjAIYwiHEmxW2wwqMs=; b=Iuh63tzFCrN3CmlrQ69Hv/UBCRif0hQ2CdxxB/iAshYGJ2voHLTf/RLyEngu4jQEpn pjboXeFnj87hfudDFG0MUqSDDGVUm3nUVya1utX+/LqoJGpWbo7WOYo8lH9Any2wecdU 96scoHZdjrq/xuL/6JXvQmHzQcByvbnCcO+gUu4zBYNXbEetquDRhixQ/N9nwbH4zOUB VNoD3d8B5JlqrfqMBeMT5ckryhFiWjKr2lfDQlxsoUjA2ArerawBJxNq+/6V3nLgmS6d qgHY6z2svVOd5diRD7eomcgQjSgJVuNoXExjY3ZXcaDWh+mFnczFVudn1Ifo5ZSL0Zyk K+VQ== 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:mime-version:content-transfer-encoding; bh=98UkHK54MJKr9CT41iYYpXXQonjAIYwiHEmxW2wwqMs=; b=m07ZE6a+Y6NngBbbaTWKVPkJuqYLZFg5czth7x/3pvsUtfTKKLG3hlq1w9aw5HcauM 8fC/a7e476IRCCfJVbCV/mR9hKySYz/hpV078HSIzlXtVu16lhY4o7wyT2iQpiyskvDL 6RDsmFzB8Lo4Yy991Z7OeZBRgeMTXoeN9FuXq4U8m1soMjpufBaagH0AJlzCsvmymyyc sC4yv1j30URMMw9nkD4/Fl1VK3TsRcWZcLGygfwD8e1dInckzA3hhxliqGXiGQgMyRKA KgyG0qmsXUdILXn4PmMOUff3LQdrHtQNZ06esQXBOJExkedS73XBzVQ+9LALcns5sPmi kzCA== X-Gm-Message-State: ANhLgQ1lxO15D8Lr/agX0MHF74Q3jo6rLl8HPCOUx0Q4km+n1IFbm8ab PCgAdoRN5t9Qe6MTDeM8A0E= X-Google-Smtp-Source: ADFU+vuc1HwnZOvWl6kXOOdBCPls63uknpqDfLbz6MKAheeIewV3nvNJB+gbV/W9lhzfRQNqVcgM4w== X-Received: by 2002:a63:6a49:: with SMTP id f70mr8927010pgc.246.1584711303771; Fri, 20 Mar 2020 06:35:03 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id o137sm5699611pfg.34.2020.03.20.06.35.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Mar 2020 06:35:03 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, allison@lohutok.net, corbet@lwn.net, alexios.zavras@intel.com, broonie@kernel.org, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v2 5/7] net: phy: aquantia: use phy_read_mmd_poll_timeout() to simplify the code Date: Fri, 20 Mar 2020 21:34:29 +0800 Message-Id: <20200320133431.9354-6-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200320133431.9354-1-zhengdejin5@gmail.com> References: <20200320133431.9354-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use phy_read_mmd_poll_timeout() to replace the poll codes for simplify the code in aqr107_wait_reset_complete() function. Signed-off-by: Dejin Zheng --- v1 -> v2: - remove the handle of phy_read_mmd's return error. drivers/net/phy/aquantia_main.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/net/phy/aquantia_main.c b/drivers/net/phy/aquantia_main.c index 31927b2c7d5a..5b9d98b05f76 100644 --- a/drivers/net/phy/aquantia_main.c +++ b/drivers/net/phy/aquantia_main.c @@ -451,16 +451,11 @@ static int aqr107_set_tunable(struct phy_device *phydev, */ static int aqr107_wait_reset_complete(struct phy_device *phydev) { - int val, retries = 100; - - do { - val = phy_read_mmd(phydev, MDIO_MMD_VEND1, VEND1_GLOBAL_FW_ID); - if (val < 0) - return val; - msleep(20); - } while (!val && --retries); + int val; - return val ? 0 : -ETIMEDOUT; + return phy_read_mmd_poll_timeout(val, val != 0, 20000, 2000000, + phydev, MDIO_MMD_VEND1, + VEND1_GLOBAL_FW_ID); } static void aqr107_chip_info(struct phy_device *phydev) From patchwork Fri Mar 20 13:34:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 1258912 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Zzb3Tlo1; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kPt72fFZz9sSt for ; Sat, 21 Mar 2020 00:35:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727460AbgCTNfL (ORCPT ); Fri, 20 Mar 2020 09:35:11 -0400 Received: from mail-pj1-f67.google.com ([209.85.216.67]:37600 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727439AbgCTNfK (ORCPT ); Fri, 20 Mar 2020 09:35:10 -0400 Received: by mail-pj1-f67.google.com with SMTP id ca13so2470433pjb.2; Fri, 20 Mar 2020 06:35:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MYgs/zkr6hc7o1ozUKVcYW4sWfXlOXbWmqtVG3HO+jw=; b=Zzb3Tlo1M7+SG+C768Whj1+P8aInEwGWMvUEdJV6m+xJC48pQZVusL6kj8Fo8pkSZ8 9nmVwdFTYo7CBUJGzVUUhsQP3BsJ76iZ0avpaV/cbRqQmVyTMsrmYIMIsl0mMchGS4XB GbkA+5RwOgjZCdmqDrGXKaV/J6kbBabEo0bbftCmtjki25hdEvVybxQ2wQTQm1ECsz/K AywYmJ4c9ZC0I1dWn9jxqxtKwOvC+9JPWEjtfX4fiR7CRiC+vYBwEF/r/zNxM+cRWHq8 pHNa2SpZFWyFPkDfs/Kppv5uacBw2f0u51SeWwxdaVSn6pZzdeE/fU11dnxBS7fJYvpO GNCA== 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:mime-version:content-transfer-encoding; bh=MYgs/zkr6hc7o1ozUKVcYW4sWfXlOXbWmqtVG3HO+jw=; b=ZsqeReb+lSRH6IQYbkaal1QxDD1SunCwXIa89UXjjXkhkaNKyzIRrZKfPLMDG1bFZw s/g5HJglW6gMxq1SSqzMG7cs66w7zaKsj0FJ65Q0RhTCjsdatbprO/vxTZEqUTM4SmO2 LqjWQAxXr7l11qtapMTwKWJf85zMFt+kvnbvHXSvAL7p8+M0P7jBNIEsBztKAMrM2ggJ ffaMB6hZ0zj3zZO6cgWvRwpLi4gXtKVr6w6uuC9HSBbVFdQ8GkYorQhgHrm/ogQPGwM+ Oi02owRJwqddDfKSr2Olfna2nEv0gHPDoZMYxB4lsk+ixrOxuj4DlRIogEwvA8TYYglu 9t9g== X-Gm-Message-State: ANhLgQ1uocOb3hRmVVBOy9EuzMRT+6FuLIkKt7YW5ypMB8qRzbvvW78S s7t1WB4zi2fJZfBqPd/Lspg= X-Google-Smtp-Source: ADFU+vvB3HdUq5aTm5FSckVkFEvQ/V41S5Axr/NDgBis6ch6qkBSRP77+8q0ZGDnIKJBiLIrtj6j0A== X-Received: by 2002:a17:90a:9f96:: with SMTP id o22mr9280844pjp.88.1584711308880; Fri, 20 Mar 2020 06:35:08 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id 11sm5582857pfv.43.2020.03.20.06.35.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Mar 2020 06:35:08 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, allison@lohutok.net, corbet@lwn.net, alexios.zavras@intel.com, broonie@kernel.org, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v2 6/7] net: phy: introduce phy_read_poll_timeout macro Date: Fri, 20 Mar 2020 21:34:30 +0800 Message-Id: <20200320133431.9354-7-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200320133431.9354-1-zhengdejin5@gmail.com> References: <20200320133431.9354-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org it is sometimes necessary to poll a phy register by phy_read() function until its value satisfies some condition. introduce phy_read_poll_timeout() macros that do this. Suggested-by: Andrew Lunn Signed-off-by: Dejin Zheng --- v1 -> v2: - pass a phydev and a regnum to replace args... parameter in the phy_read_poll_timeout(), and also handle the phy_read() function's return error. include/linux/phy.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/linux/phy.h b/include/linux/phy.h index bb351f8b8769..ecee7e436f89 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -714,6 +714,19 @@ static inline int phy_read(struct phy_device *phydev, u32 regnum) return mdiobus_read(phydev->mdio.bus, phydev->mdio.addr, regnum); } +#define phy_read_poll_timeout(val, cond, sleep_us, timeout_us, phydev, regnum) \ +({ \ + int ret = 0; \ + ret = read_poll_timeout(phy_read, val, cond || val < 0, sleep_us, \ + timeout_us, phydev, regnum); \ + if (val < 0) \ + ret = val; \ + if (ret) \ + phydev_err(phydev, "%s failed: %d\n", __func__, ret); \ + ret; \ +}) + + /** * __phy_read - convenience function for reading a given PHY register * @phydev: the phy_device struct From patchwork Fri Mar 20 13:34:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 1258908 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=LJLBVt+O; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48kPt00s8sz9sSy for ; Sat, 21 Mar 2020 00:35:36 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727504AbgCTNfQ (ORCPT ); Fri, 20 Mar 2020 09:35:16 -0400 Received: from mail-pj1-f68.google.com ([209.85.216.68]:37609 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727487AbgCTNfP (ORCPT ); Fri, 20 Mar 2020 09:35:15 -0400 Received: by mail-pj1-f68.google.com with SMTP id ca13so2470526pjb.2; Fri, 20 Mar 2020 06:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WfFHHS6jo8iZrY1Q3mVkHkvmg4vs2kPyprC/yFvbuKo=; b=LJLBVt+OcyGdNCpEgRLEMVyl27HZA4JqEkvd9fTKBjqDQEmL8bCFp+/xZxf/B8LhK4 RbybovpDhlOVk3qhPBuUbhaFfdcddiEOLERWsz7eK93to4UCUFaDDLXdScfz/prgrxEl fkgsjD/4/CPQ8tJNEfl/i4o+XDCp4L2c/MSs5Z8cC+eyfsjGRYCuLPr3fWEpLCdwQd7c S0CCey2apNmqV+Yligu/+mubYSf07+vM/vQq9JrJbOEcIAAMeeZSJ/sdNcI9ZHVv5XFb sRF+ch8kEK4GH0U1OQ4resR/fGkfS2Kowxc4csGh/U96Qj6AZw43HXcn5XpmJCXiXSen cFhw== 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:mime-version:content-transfer-encoding; bh=WfFHHS6jo8iZrY1Q3mVkHkvmg4vs2kPyprC/yFvbuKo=; b=Q/3sD2XWbGXzTD9oJm9qdsoOjKiQojMwa5fqrWPZg6yZOW19xhbKUYtVzW5/7ZsIOp tgsq6qt8pFrkbPuPak7y3AjxqENdlhnL2hrc2az2fS4nJkImlvEtyRw1E7eH+PUb4s/M 4svdSDc4hLNsLwK5R8aBJyJrSFHD+GQTwUByCABzOv/H9h9mZrU5fv6HuaaUCiJrQ8gh 1PnDIxC4T+01T9UoulGpEhkHJRq01383/Q24vPuNgPSa2LWJ094k3TvCKMamIegP+Pg6 7FniPo13oSd0LVM7xHbpJ4i4M9oh15Cn1Aaas5KBYIWLumRuAUYATN9IfhArLIyuJ1Si U7qQ== X-Gm-Message-State: ANhLgQ2cmixxl1dUFdZR1clvCoPoSpi9FeLq9NjK4dG8Ca1vxKi5UDYc j5TKk8ubh0xnAGll1VDHciI= X-Google-Smtp-Source: ADFU+vsnkwyQlAetIoZw3jesRuNLUue3PcnvCMHt7xVuySpu+fuLVeOqLt1d0lrtKgBvfb1euVeJFA== X-Received: by 2002:a17:90a:d205:: with SMTP id o5mr9307963pju.46.1584711313701; Fri, 20 Mar 2020 06:35:13 -0700 (PDT) Received: from localhost (216.24.188.11.16clouds.com. [216.24.188.11]) by smtp.gmail.com with ESMTPSA id c128sm5526246pfa.11.2020.03.20.06.35.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 20 Mar 2020 06:35:13 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, allison@lohutok.net, corbet@lwn.net, alexios.zavras@intel.com, broonie@kernel.org, tglx@linutronix.de, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v2 7/7] net: phy: use phy_read_poll_timeout() to simplify the code Date: Fri, 20 Mar 2020 21:34:31 +0800 Message-Id: <20200320133431.9354-8-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200320133431.9354-1-zhengdejin5@gmail.com> References: <20200320133431.9354-1-zhengdejin5@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org use phy_read_poll_timeout() to replace the poll codes for simplify the code in phy_poll_reset() function. Signed-off-by: Dejin Zheng --- v1 -> v2: - remove the handle of phy_read()'s return error. drivers/net/phy/phy_device.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index a585faf8b844..0de4f03ba90c 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1059,23 +1059,15 @@ EXPORT_SYMBOL(phy_disconnect); static int phy_poll_reset(struct phy_device *phydev) { /* Poll until the reset bit clears (50ms per retry == 0.6 sec) */ - unsigned int retries = 12; - int ret; - - do { - msleep(50); - ret = phy_read(phydev, MII_BMCR); - if (ret < 0) - return ret; - } while (ret & BMCR_RESET && --retries); - if (ret & BMCR_RESET) - return -ETIMEDOUT; + int ret, val; + ret = phy_read_poll_timeout(val, !(val & BMCR_RESET), 50000, 600000, + phydev, MII_BMCR); /* Some chips (smsc911x) may still need up to another 1ms after the * BMCR_RESET bit is cleared before they are usable. */ msleep(1); - return 0; + return ret; } int phy_init_hw(struct phy_device *phydev)