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: 222160 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 927BEC4332E for ; Fri, 20 Mar 2020 13:34:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6905F2076E for ; Fri, 20 Mar 2020 13:34:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kkb0Ae+D" 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: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: 222159 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82F3BC4332E for ; Fri, 20 Mar 2020 13:35:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59B1520739 for ; Fri, 20 Mar 2020 13:35:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="S2hKRur7" 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: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: 222158 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C713C4332D for ; Fri, 20 Mar 2020 13:35:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 739C820782 for ; Fri, 20 Mar 2020 13:35:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Zzb3Tlo1" 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