From patchwork Mon Mar 23 15:05:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222038 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 F0562C3F2CD for ; Mon, 23 Mar 2020 15:06:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C8345206C3 for ; Mon, 23 Mar 2020 15:06:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="N1ACwCYl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727267AbgCWPGW (ORCPT ); Mon, 23 Mar 2020 11:06:22 -0400 Received: from mail-pj1-f68.google.com ([209.85.216.68]:50286 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbgCWPGV (ORCPT ); Mon, 23 Mar 2020 11:06:21 -0400 Received: by mail-pj1-f68.google.com with SMTP id v13so6312358pjb.0; Mon, 23 Mar 2020 08:06:20 -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=GmXKgcJDZee4jC3cNKHKWCJhJ0kS9L2vONq2fIA+AaY=; b=N1ACwCYlon7WkTCOGFsGWeQq6lNeUjbuQa8UGIBK7O82wFqYoTVzGY8MUnU/tEjer9 AtZt9996i6pDsvhpbunlFffuKPui1YOisSe6Xcn6Ur2AiFvfJr1DMpWE2PdmlLGH2bkH /Oiqbikpi9dSUfgFJ7JfIyISqKyP15jsdhhl8xtA30gWb6CuhlhBuWuLV5CqTAZKGWab LMFipg2GDKlx0udJoUoNAPi/hcypdWJW8DtamDxwH/OmZk2evJsfhm2MwG/1qAb95nJ0 rU/60e4BhqadPHfO9cyvgdbR+xcCJkuSIqKWH6utfd9RamZDS2djU3XDWhFW2blmcVLb Ue5w== 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=GmXKgcJDZee4jC3cNKHKWCJhJ0kS9L2vONq2fIA+AaY=; b=AwMmzIpdEKD6duSw3Dl9aQkzxRMmPOysumBp0nIE9FvhZJ+67auGBvMa7G80/DyF4x BbrwsUrYoDLXs7fuLEjjZgxKwSCtYfWyPDdM/ezShIx9KZIfPiXhn6uH3eXP+g4feJN4 IlWVwvJMDzRJOhdZVzg934FJeMs4bW7XNm07jKxjsqksHGcw5JoHsP53xNegPbIpNb8X h7+AwHXYAKzVC9aGYTA8bgxSD0d+SlO7CJ4nY+lHXcBR266/rt7rDFOwCdv9TUUAMCkY rXrgSb8vThpKY/wZ8rK3SyJcPdvDt6TnmdZO7LqTbbzAHjzJml7s+5vYhk3CSOvjGTHt KcMA== X-Gm-Message-State: ANhLgQ1lOBl50y5dc6fz/BIFJrpgXnM0GF/1DvoZm8oJbZIt2H9n38WA pBi6LVse2n2Ed5tvz68N8x8= X-Google-Smtp-Source: ADFU+vtPoQt/0UFiy7Bq0L9uIMvQbBOJzH8+jTojBCcjj2V26XqJvxqSMSsy9g8ZZ96F/Q8I4cpXYw== X-Received: by 2002:a17:902:9a09:: with SMTP id v9mr21358610plp.341.1584975980336; Mon, 23 Mar 2020 08:06:20 -0700 (PDT) Received: from localhost (176.122.158.203.16clouds.com. [176.122.158.203]) by smtp.gmail.com with ESMTPSA id j19sm13485589pfe.102.2020.03.23.08.06.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Mar 2020 08:06:19 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, corbet@lwn.net, tglx@linutronix.de, gregkh@linuxfoundation.org, allison@lohutok.net, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v7 01/10] iopoll: introduce read_poll_timeout macro Date: Mon, 23 Mar 2020 23:05:51 +0800 Message-Id: <20200323150600.21382-2-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200323150600.21382-1-zhengdejin5@gmail.com> References: <20200323150600.21382-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 core. and also expand it can sleep some time before read operation. Signed-off-by: Dejin Zheng --- v6 -> v7: - add a parameter sleep_before_read to support that it can sleep some time before read operation in read_poll_timeout macro. v5 -> v6: - no changed v4 -> v5: - no changed v3 -> v4: - no changed v2 -> v3: - no changed v1 -> v2: - no changed include/linux/iopoll.h | 44 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/include/linux/iopoll.h b/include/linux/iopoll.h index 35e15dfd4155..70f89b389648 100644 --- a/include/linux/iopoll.h +++ b/include/linux/iopoll.h @@ -13,6 +13,50 @@ #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 + * @sleep_before_read: if it is true, sleep @sleep_us before read. + * @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, \ + sleep_before_read, 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); \ + if (sleep_before_read && __sleep_us) \ + usleep_range((__sleep_us >> 2) + 1, __sleep_us); \ + 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 Mon Mar 23 15:05:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222037 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 EB88FC54FCE for ; Mon, 23 Mar 2020 15:06:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C25C520781 for ; Mon, 23 Mar 2020 15:06:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lgEAuSmS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727389AbgCWPGj (ORCPT ); Mon, 23 Mar 2020 11:06:39 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:35674 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbgCWPGj (ORCPT ); Mon, 23 Mar 2020 11:06:39 -0400 Received: by mail-pl1-f193.google.com with SMTP id g6so6031935plt.2; Mon, 23 Mar 2020 08:06:37 -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=QyLLQh4P4dJqNnMm7BJBkrejcs2c7VMgmgImcGrT3yg=; b=lgEAuSmSe1JBlVHjD/ekRSbfGdLKu++79JD5kGWu9enrz8PHu+PEQwgQHebhymAzIm DhxDpH2GofbNnHN+2VTaUy37RM7tw4Is7aXM7EQd9/ddEh8eJAvE4eKAqTn00MQuBENF /d9LgVQaFQ3ByU77W0zcJMiP128nbNZ5fg+p7h3oALoc0WuUDMT5nJtaabJMNhu2Ik3Q TeesF0Ig0Hmzz24z8tIo3XjO+hYcZy3W2vtJR7YI4vwdaFEYmICAgRZuvrXDY2RFq+/V cSMt1m8bAkuwQwT9hBKx91KJHSsX4jzbq47i3xU4Bt4yEDWp7zFUAEf1CfrA6pb1ScUC pHMA== 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=QyLLQh4P4dJqNnMm7BJBkrejcs2c7VMgmgImcGrT3yg=; b=VECVSJK+Bio4IHkiu+y2vjaJMOhWqKIy+Nuw2DyFE6qx8IzPne31/0Pgew8tD6gWG6 TFuu3j4to5sWNAkswW5UDaDM5HqHMwyntTeRNsyJKamiQoxMx3QTsglGgl03mAXiEeyC yFwikvoHotbCASe6emMB1WmXW94rLw5yF/aJWuYHE2pmVO2CLQw5Nm+5hrqyz/eIcgCf 0E2wQzjBt0b9bB+ffE4dz/UcJG0+Ba1zRoGCvzYTeqonWSvw2zpDCDOQcYnNHhklvOlo E5NSLWrhH1hL6cHXsiTsD5cSOkYCCgpry1uixR/TiXLqMbqSEjN8DfZix7CKscUkFmPi oPLQ== X-Gm-Message-State: ANhLgQ1HJutsqwRPluqyd1BCCERypUOBDLx/Jg1K2S9wWkxPZxiWT//O 3SUMwiyXbHp4FZ48ni75Qts= X-Google-Smtp-Source: ADFU+vvYtChrhw/oVd7fxzTKtdnlhOVC8RjZJLGEV+UZEISuAL7ucrb/iIt/S6JEKl3rOZU7oOUuQg== X-Received: by 2002:a17:902:8f8e:: with SMTP id z14mr22423787plo.195.1584975996882; Mon, 23 Mar 2020 08:06:36 -0700 (PDT) Received: from localhost (176.122.158.203.16clouds.com. [176.122.158.203]) by smtp.gmail.com with ESMTPSA id bx1sm12827062pjb.5.2020.03.23.08.06.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Mar 2020 08:06:36 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, corbet@lwn.net, tglx@linutronix.de, gregkh@linuxfoundation.org, allison@lohutok.net, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v7 03/10] net: phy: introduce phy_read_mmd_poll_timeout macro Date: Mon, 23 Mar 2020 23:05:53 +0800 Message-Id: <20200323150600.21382-4-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200323150600.21382-1-zhengdejin5@gmail.com> References: <20200323150600.21382-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 Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: Dejin Zheng --- v6 -> v7: - adapt to a newly added parameter sleep_before_read. - add prefix with double underscores for the variable ret to avoid any variable re-declaration or shadowing. v5 -> v6: - no changed v4 -> v5: - no changed v3 -> v4: - deal with precedence issues for parameter cond. v2 -> v3: - modify the parameter order of newly added functions. phy_read_mmd_poll_timeout(val, cond, sleep_us, timeout_us, \ phydev, devaddr, regnum) || \/ phy_read_mmd_poll_timeout(phydev, devaddr regnum, val, cond, \ sleep_us, timeout_us) 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..c172747b4ab2 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(phydev, devaddr, regnum, val, cond, \ + sleep_us, timeout_us, sleep_before_read) \ +({ \ + int __ret = read_poll_timeout(phy_read_mmd, val, (cond) || val < 0, \ + sleep_us, timeout_us, sleep_before_read, \ + phydev, devaddr, 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 Mon Mar 23 15:05:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222036 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 9D6F1C3F2CD for ; Mon, 23 Mar 2020 15:06:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7554420714 for ; Mon, 23 Mar 2020 15:06:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KouZ1u0M" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727468AbgCWPGx (ORCPT ); Mon, 23 Mar 2020 11:06:53 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:33108 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbgCWPGx (ORCPT ); Mon, 23 Mar 2020 11:06:53 -0400 Received: by mail-pl1-f196.google.com with SMTP id g18so6037597plq.0; Mon, 23 Mar 2020 08:06: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=1HUb4AeGuA2g7c/unfMsKtYIp8g+5knhSs9R57JNtH4=; b=KouZ1u0Mj1k5eEV1NnNHk+oS3OUnarKwDPPMF4o04MgXWTrmqghhofCNycRRg9w9Zi TcLjaV8B1A63XzJrcKY1ECt35XOCiyzezDOeqqoxoW+O18li0TDSKxPv9dL2vxIOvKeQ 6W60/Hm3F+zWXNAUBoix0xZlOYKhMQEyib0zMTMlKo4MdSv/asDkllGVOTWQY2+ZG5eR RyIkMs6tm8A8GGouX6a1e8WsWgPqvG5lOt2TPXlV8cIrRpVAv1E26Yqq/xuoV2yiUcio j/m9oLQRUm0BgM09zTMKv4f91C1DpCzuoiREadTumTfCH3axXlsYpBYNJpGhry7rU9LG o3iA== 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=1HUb4AeGuA2g7c/unfMsKtYIp8g+5knhSs9R57JNtH4=; b=jbiJIZMwdVyjxOzYVhLW9yGKOFOpba26M70VE2970P6i6B4yK35wM+AeyCSBZdr41n Naju9wUeyMf3dhKAGSDWSB2vV1NAtboBq3U4WYqLUx+hvHoepkqcl85cLTNiX6f9Wpyt kbFohQrfGA8SBtxGw1+k7ybYHfufF1R2SaaHtOMfQYdoU+tfKKisCZgA+OdRXQS/JSSq /PdRL8i0Au6hUqzGSdj0g8Ao+TRGc++pnBV9JsMm4+GDMvpypX/wNZcFC2VIdV7abFOP GXW+U55HbyBnWrJ/cccy1cMwPq9isJA+BFuLgoox/dSQoYwq+V7TuYxGsBSN1jp1zHD1 zKww== X-Gm-Message-State: ANhLgQ2p7yTQYMaQJRPyElCp+8gVrSrL9FzzKo+D/pgQMc4rQkkNC2Ni R6DV5JBFiA+jNmwurEF0Q7p/h7pl X-Google-Smtp-Source: ADFU+vtlO1XgD5CECuh8IzNbnSjrxlBg4gjjwqsN4cBoSEqiMi/n50Rz4XR9ndWr3lr+f7a0EBkZ+g== X-Received: by 2002:a17:90a:208:: with SMTP id c8mr25825941pjc.153.1584976012130; Mon, 23 Mar 2020 08:06:52 -0700 (PDT) Received: from localhost (176.122.158.203.16clouds.com. [176.122.158.203]) by smtp.gmail.com with ESMTPSA id h11sm13796776pfn.103.2020.03.23.08.06.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Mar 2020 08:06:51 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, corbet@lwn.net, tglx@linutronix.de, gregkh@linuxfoundation.org, allison@lohutok.net, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v7 05/10] net: phy: aquantia: use phy_read_mmd_poll_timeout() to simplify the code Date: Mon, 23 Mar 2020 23:05:55 +0800 Message-Id: <20200323150600.21382-6-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200323150600.21382-1-zhengdejin5@gmail.com> References: <20200323150600.21382-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 aqr107_wait_reset_complete() function. Reviewed-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: Dejin Zheng --- v6 -> v7: - adapt to a newly added parameter sleep_before_read. v5 -> v6: - no changed v4 -> v5: - no changed v3 -> v4: - no changed v2 -> v3: - adapt to it after modifying the parameter order of the newly added function 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..d6829839ba60 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(phydev, MDIO_MMD_VEND1, + VEND1_GLOBAL_FW_ID, val, val != 0, + 20000, 2000000, false); } static void aqr107_chip_info(struct phy_device *phydev) From patchwork Mon Mar 23 15:05:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222035 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 020EDC3F2CD for ; Mon, 23 Mar 2020 15:07:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CDC26206C3 for ; Mon, 23 Mar 2020 15:07:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cBTpEDKc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727537AbgCWPHH (ORCPT ); Mon, 23 Mar 2020 11:07:07 -0400 Received: from mail-pj1-f68.google.com ([209.85.216.68]:40317 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbgCWPHH (ORCPT ); Mon, 23 Mar 2020 11:07:07 -0400 Received: by mail-pj1-f68.google.com with SMTP id kx8so420243pjb.5; Mon, 23 Mar 2020 08:07:06 -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=8MpbsxkMsipQtpohRydTulbwXff0/qt3sQOmvykiETg=; b=cBTpEDKcnhGaqQ3exc/WXly55OBJhCzB4vTUuDwDkiNniYZIRXg+HcXkH0ApjOptUZ IW7qelhh1g11fRGmmG8Co+qqOkllZlPon8RMbZxONvGfrNbwO7ihCZG8WOcyYwXUA+vv GHNg2+LUaAJjhZZsNkZABSb3PrBxq+7CT7aqQG4SSNsAdzVrcff34cYRQxUoX2CSEdhF IS2IdO5AtCT+97418Kspv0dMA0gJU9UGIkOs7eXlrI+qSpHPl9xFeexGM5JIS7i7ZYkX WBOa1ovJOPJPs6okGq3q3OZdwyrU8gvnhbucXE1eF+9Iby8mxy4uyGudMehIGIULO5SG zYuQ== 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=8MpbsxkMsipQtpohRydTulbwXff0/qt3sQOmvykiETg=; b=Moh6JAoUzsT38ZLFEctXOYnERn3JnbryCXAy1+2tMuGLNpoHAUnvbegZijZBrl3bHS ROMLkPuA7VkvTa79S9CErjGdyomUxu10ETn3NyqXJZBOjCm40YXH2NbXH2SvIONWNXNg JXZL2nxgIczfbYYKP0lVRGdHpe+XbTYrrjPwkNW1iQZ6pKXUIyQYvTt/GYwX1DEHtTLz QYQKgcsfXd2X3vxjWXLxIIdZVBk/nteDxbM4xkwMCoYunxglyTSoAzTta0RU/IfjYZQZ LBnmPrfRPWY9cxmobbr7U9as9AfOkTxuP3MAnR4rN30resQdzDIq1AuC47M584T17gie oBKA== X-Gm-Message-State: ANhLgQ1n5rleLoCtziooAOsz/yIMddNktoLOLMfk/ZvatbBEl4tWkA+l kQblgMB4btdQ6yad3SW1D3Q= X-Google-Smtp-Source: ADFU+vvvPxaT4CQ43h7NdFMwkLdZHch1N0nnHVzcMOt4VAZkBHV+1Xttxe69vfei63CLU1MY8+cuCg== X-Received: by 2002:a17:902:ab83:: with SMTP id f3mr22680569plr.197.1584976025978; Mon, 23 Mar 2020 08:07:05 -0700 (PDT) Received: from localhost (176.122.158.203.16clouds.com. [176.122.158.203]) by smtp.gmail.com with ESMTPSA id z12sm14729572pfj.144.2020.03.23.08.07.04 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Mar 2020 08:07:05 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, corbet@lwn.net, tglx@linutronix.de, gregkh@linuxfoundation.org, allison@lohutok.net, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v7 07/10] net: phy: introduce phy_read_poll_timeout macro Date: Mon, 23 Mar 2020 23:05:57 +0800 Message-Id: <20200323150600.21382-8-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200323150600.21382-1-zhengdejin5@gmail.com> References: <20200323150600.21382-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 Reviewed-by: Andrew Lunn Signed-off-by: Dejin Zheng --- v6 -> v7: - adapt to a newly added parameter sleep_before_read. - add prefix with double underscores for the variable ret to avoid any variable re-declaration or shadowing. v5 -> v6: - no changed. v4 -> v5: - no changed. v3 -> v4: - deal with precedence issues for parameter cond. v2 -> v3: - modify the parameter order of newly added functions. phy_read_poll_timeout(val, cond, sleep_us, timeout_us, \ phydev, regnum) || \/ phy_read_poll_timeout(phydev, regnum, val, cond, sleep_us, \ timeout_us) 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 c172747b4ab2..4f5b9dbc551d 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(phydev, regnum, val, cond, sleep_us, \ + timeout_us, sleep_before_read) \ +({ \ + int __ret = read_poll_timeout(phy_read, val, (cond) || val < 0, \ + sleep_us, timeout_us, sleep_before_read, 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 Mon Mar 23 15:05:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222034 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 767DFC54FCE for ; Mon, 23 Mar 2020 15:07:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4CCC720663 for ; Mon, 23 Mar 2020 15:07:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OKHWLJRJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727572AbgCWPHV (ORCPT ); Mon, 23 Mar 2020 11:07:21 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:41819 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727024AbgCWPHV (ORCPT ); Mon, 23 Mar 2020 11:07:21 -0400 Received: by mail-pl1-f194.google.com with SMTP id t16so6016719plr.8; Mon, 23 Mar 2020 08:07:20 -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=1chrW1p6r783D8IVsf1Wd8VGJ5DUqrzj1FnJUn6rv18=; b=OKHWLJRJ3iWJXECf4enlLUs9TazfI+iienfWxXOsqDTd7Usgzub7vIfnbq0DNZpxnA 2Ng8go/HxaFTqMTZJJNMDIOOOhm/GtWQh4DfxGaTGcLdqjtkhEzCz75Bs6qwqk+95s9W lLJ6lkMJWKio9STOaQ7RlD10sOT8dUXGfkTN+jCv0ShxPYWNWnLgouyBiF/r7IV762BU btq/4zsk0/4Q41UamTKu686pdwVZuI25s3gC88YYG7YP1TjA2+X0eh9cVhJZFo6sqGU8 Da3UE7FLtw6F1j4Zb+vnahprtC/OHWGjfYt7BkKgq9dx3aJmx2RlVoSkIOmFAPAmBTbN Ly2w== 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=1chrW1p6r783D8IVsf1Wd8VGJ5DUqrzj1FnJUn6rv18=; b=NjhDpzqYHflu0eHf1l8Akn5Ab1oBoZSirKkqzbgWQ7u4YYJaDaTEI/GWRz+H5Rny97 ek/97zr/GwiRKLElx+50heOoRjYhh47a3EPqw4+Rd9BBJKvwPOni20FiGIkp7O5Nv46d AuwYkYktwXKIlL04+8Lyfi9QHEhd+WKf041B/UkyuVZ4XP9T3oLxLGJqauf6n8TaIUQw kguh1TpNlDs2UVML+JPADx4sCgMaVT0xI+Xh0+vPA/Ad4xdRcTbEwcREsh69lkBd429p H1XavUJwAPPW83XwvFmlz/mVlVoyBCPt2dcjj60DJf0oL+yM8QpmLjVBDpIfgonKgUNu escQ== X-Gm-Message-State: ANhLgQ0iQOlefGd9BQHKnlT5s3RMCgDLo9UGpb1WQOONt+9RWoTJos+T qS8nTvEL8/777STQoqW8NIg= X-Google-Smtp-Source: ADFU+vszx04TiPqNUvmapICvLgTBDHHeK2xFhvmYKm6Gu/RotSPQ4EXWAvNd6k4iKs7h/qng8lfgJQ== X-Received: by 2002:a17:902:5a44:: with SMTP id f4mr22130142plm.306.1584976040020; Mon, 23 Mar 2020 08:07:20 -0700 (PDT) Received: from localhost (176.122.158.203.16clouds.com. [176.122.158.203]) by smtp.gmail.com with ESMTPSA id n100sm12050147pjc.38.2020.03.23.08.07.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Mar 2020 08:07:19 -0700 (PDT) From: Dejin Zheng To: andrew@lunn.ch, f.fainelli@gmail.com, hkallweit1@gmail.com, linux@armlinux.org.uk, davem@davemloft.net, corbet@lwn.net, tglx@linutronix.de, gregkh@linuxfoundation.org, allison@lohutok.net, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v7 09/10] net: phy: smsc: use phy_read_poll_timeout() to simplify the code Date: Mon, 23 Mar 2020 23:05:59 +0800 Message-Id: <20200323150600.21382-10-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200323150600.21382-1-zhengdejin5@gmail.com> References: <20200323150600.21382-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 lan87xx_read_status() function. Suggested-by: Andrew Lunn Reviewed-by: Florian Fainelli Signed-off-by: Dejin Zheng --- v6 -> v7: - adapt to a newly added parameter sleep_before_read. v5 -> v6: - no changed. v4 -> v5: - add msleep before phy_read_poll_timeout() to keep the code more similar v3 -> v4: - add this patch by Andrew's suggestion. Thanks Andrew! drivers/net/phy/smsc.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index b73298250793..93da7d3d0954 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -112,8 +112,6 @@ static int lan87xx_read_status(struct phy_device *phydev) int err = genphy_read_status(phydev); if (!phydev->link && priv->energy_enable) { - int i; - /* Disable EDPD to wake up PHY */ int rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); if (rc < 0) @@ -125,15 +123,11 @@ static int lan87xx_read_status(struct phy_device *phydev) return rc; /* Wait max 640 ms to detect energy */ - for (i = 0; i < 64; i++) { - /* Sleep to allow link test pulses to be sent */ - msleep(10); - rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS); - if (rc < 0) - return rc; - if (rc & MII_LAN83C185_ENERGYON) - break; - } + phy_read_poll_timeout(phydev, MII_LAN83C185_CTRL_STATUS, rc, + rc & MII_LAN83C185_ENERGYON, 10000, + 640000, true); + if (rc < 0) + return rc; /* Re-enable EDPD */ rc = phy_read(phydev, MII_LAN83C185_CTRL_STATUS);