From patchwork Sun Mar 22 02:48: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: 222093 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 48B0AC4332E for ; Sun, 22 Mar 2020 02:49:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1B64720724 for ; Sun, 22 Mar 2020 02:49:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rW4b0Y36" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728306AbgCVCt0 (ORCPT ); Sat, 21 Mar 2020 22:49:26 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:39411 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727851AbgCVCt0 (ORCPT ); Sat, 21 Mar 2020 22:49:26 -0400 Received: by mail-pg1-f194.google.com with SMTP id b22so5250288pgb.6; Sat, 21 Mar 2020 19:49:25 -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=Btg4kroL5uDoHzhX6UOjspMfVw/QQeUQppK1EME6qU8=; b=rW4b0Y36Phwhh8TKEs+/U3Q/O5w+ATdCpO4LLqLNKJjlPh1YXtNiam0UTd0sXNreHl 4TEkHhqDHBzZkuvxK/oXLgB+Z5qhQxdpRDPWayPuOS3rjSuz+Q/+hgaI+Yi6cCZAWgZU lhADcwtPLdnswYcQs89ofdTwjqGd5feVSd0H9ZoH6NO08K8EGAWhXpvWBamPDry0VZ65 dZ0gSGv64QkOl3PpmBIOwPkDfFDdKLKd0kjHMbjlK7mUUP40/hLvDGSlOcAg6Ci6EsXZ 0pWtYMNJ8qM9qBhwbk8zCzvirSgivpRYPfaVh2aKbkXhxrqX1GVieV2Yv5xQIL+0tF5Q Mpog== 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=Btg4kroL5uDoHzhX6UOjspMfVw/QQeUQppK1EME6qU8=; b=rbALfUaxDe4JQYr9elktkRgbXaO0kJRtP1Nmzn/gZBJUdp3NIi+lhNKE+5jcQkbXD7 pghMYKspnFwDTZe0SLWN62Mc78Y9NCkqUu0MLdLYloijpKshenFO1c8uJZWfLs/x4iYm ATX1WxluDQp6YTTC+2jeQx2TNQv6YvPTzV8G2Xs2ZEM4TSB/ZiKTAQ81kx9aMikjU65e deLniDAjoYHxgV3OHwLYxelqC2I/LpG+HvrMXDfbqVz8+nZiZMUEDI/Zy4MYxBACsrS5 3qXYZsReU+zzVsC8KV24P+Xnh49tC3wPT+NpjNpGNpdDEV26V2NIY+UnRu02MtrI4uE2 3JRQ== X-Gm-Message-State: ANhLgQ3CkCkzHWwJWNElAiqQjtnUZ5mWOjVEcxvKZsSJJOqpwQ2+2jdM EIkioQKHr+zENm8vm1kYKqE= X-Google-Smtp-Source: ADFU+vumFGuCj9bEwX6xuBcvUJMkFtK5fEACF9AqeufcAZpC/i9Gma3jv642XkcwBKBgwvFPxn9P0w== X-Received: by 2002:a65:5846:: with SMTP id s6mr15836059pgr.179.1584845365232; Sat, 21 Mar 2020 19:49:25 -0700 (PDT) Received: from localhost ([216.24.188.11]) by smtp.gmail.com with ESMTPSA id w15sm9472840pfj.28.2020.03.21.19.49.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Mar 2020 19:49:24 -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, tglx@linutronix.de, gregkh@linuxfoundation.org, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v3 1/7] iopoll: introduce read_poll_timeout macro Date: Sun, 22 Mar 2020 10:48:28 +0800 Message-Id: <20200322024834.31402-2-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200322024834.31402-1-zhengdejin5@gmail.com> References: <20200322024834.31402-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 --- v2 -> v3: no changed 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 Sun Mar 22 02:48: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: 222092 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,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 97FB8C4332D for ; Sun, 22 Mar 2020 02:49:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B81920637 for ; Sun, 22 Mar 2020 02:49:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Sggf9bSJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728374AbgCVCtg (ORCPT ); Sat, 21 Mar 2020 22:49:36 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:34212 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727851AbgCVCtf (ORCPT ); Sat, 21 Mar 2020 22:49:35 -0400 Received: by mail-pg1-f195.google.com with SMTP id t3so5268660pgn.1; Sat, 21 Mar 2020 19:49:34 -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=FS355/DlagMHd1BrxDh8ix1dGSAXXztsH4fyn/7Ndgs=; b=Sggf9bSJmr839qR715Pf5DDl3Hzw4Sq1ViaqXU5gxpE8IuAZ2fu5mVqOMi6pfA/MnD WQccCGLrxVfkFjmsJwP7Rk3K7nADBNEXogYu83hnEyt48tBsZNV3M/fumvKMjJzkIMKZ E+Hy1qNJgMAyUXcb2uru+4upn+ccArcbvOatW1eR+USW1rRIufwbF96j+BFd9MmoFW8/ UUzWPuuhizQmCXSaHRSPuYxYVG9xFjatyFOoRYOx7oMNhhcZq5eMUdbMrL+MSq8OHd9u WyTGaj4EbM9QQc8pX7H2h26D6t8T/bbjUWrQaZG6yb14qFDORBtysQPoOPV/VLgP9ich zPoQ== 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=FS355/DlagMHd1BrxDh8ix1dGSAXXztsH4fyn/7Ndgs=; b=fy3jQaMjlqho33Je9sVL3z/Cxeq2MgS7K9nprJpRPrWQM3gTGgBYgFLjm76gHNAgEw U+ERpm5UQje9UKJ71/aIRGqy3lROta8X2E4QoUd6V0aonuvVhUaH5314xLWEJJz2JGYN FzCNAW0uIXOMLMOXSPhKvGUbkXPOZWX6fMozaRXBZ6ct9xpkUs1ulC7xe/Ivyvj4i0Vz 1LQCBpkaZEmPHGKWubPtyHF90XzK8o5mr1l3pJ0YG+gnmVRiQnzEwmL2PxXt8gqXQDGD Ns3BUgRZsZCAPkxBmbvYMESsep4U4fDeKD4QzEYxiFA7UnsIHYQ7cLYo9Z2nvdK43thO iu/Q== X-Gm-Message-State: ANhLgQ3uw4DBcjYEQnsItjxpG218XnQEoOskj6eSR69HwW6k+v+VPNhD 9AKP7ikZCvr9mEo5o1nDk3o= X-Google-Smtp-Source: ADFU+vsSdmc1359ap+obd/TmugKlDLH1ls5odN6bT1vvKREcdbZfZhv5xF1ZWWL5GFq019eVrCZdbQ== X-Received: by 2002:aa7:92da:: with SMTP id k26mr17668594pfa.139.1584845373549; Sat, 21 Mar 2020 19:49:33 -0700 (PDT) Received: from localhost ([216.24.188.11]) by smtp.gmail.com with ESMTPSA id h64sm9178931pfg.191.2020.03.21.19.49.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Mar 2020 19:49:33 -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, tglx@linutronix.de, gregkh@linuxfoundation.org, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v3 3/7] net: phy: introduce phy_read_mmd_poll_timeout macro Date: Sun, 22 Mar 2020 10:48:30 +0800 Message-Id: <20200322024834.31402-4-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200322024834.31402-1-zhengdejin5@gmail.com> References: <20200322024834.31402-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 --- 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..29718865242d 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) \ +({ \ + int ret = 0; \ + ret = read_poll_timeout(phy_read_mmd, val, cond || val < 0, sleep_us, \ + timeout_us, 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 Sun Mar 22 02:48:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222090 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 1F04CC4332D for ; Sun, 22 Mar 2020 02:49:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EAA552072D for ; Sun, 22 Mar 2020 02:49:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JJF4wN28" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728444AbgCVCtp (ORCPT ); Sat, 21 Mar 2020 22:49:45 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:44710 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728423AbgCVCtm (ORCPT ); Sat, 21 Mar 2020 22:49:42 -0400 Received: by mail-pf1-f193.google.com with SMTP id b72so5574573pfb.11; Sat, 21 Mar 2020 19:49:41 -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=i03boqnLAKIXm7IsxoZ9x9d/wqr8Z5h4zwehOBg1CH8=; b=JJF4wN28ZoiIMynq1XCF6HGHjQ0iAFU6VkAZA0q9p7t5k8SA9vnknlnM2gYaSd/M6Q PMgLTv/Agdb3WWTqpGWx1L/8FaDkcUftRIV4dEo4gB8WU8asnqEBkeissdWSAAA7NNIF X4TC14jcv0OgntonX/0FSFw80yXeLVO3wfNlfm4oQEjvdl7EVQDSnUDJZVvhT7MHDj7L 4jzdVK4vWufh2fOqHE85V5xTh4tY1DhOwyammziLPZt2rZ78rePwlbD54zLxhcC5h6Qo f8Z0MkFxJBQ4dONz56wIgyondFqKQuYjTOLvoxJ4FKZ0RKXsAFQN7YqfOX2nMfkEX1yh BTQA== 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=i03boqnLAKIXm7IsxoZ9x9d/wqr8Z5h4zwehOBg1CH8=; b=VZnpaauyJulsMArkXHIcK507Qb4txTp0j4H0sK6dJGOviSyDrA4Kl/RV0hApQgOHIz eY1m+4R8IxminmxG0qykefxv0OS774N6clQ52bBlDhmYpOtfIMhUNwc4MM3dcPjghvJl WpeC68pE2i5PZmiI5t4PFyiPdQWrmzDx76W9U/3aufHwx7TEcTyQ8IGYW/2t3OyKweUs WOSJxkRBD2KxyjpWYvFd0AFw2IVQ5l9ox5KJnC7L+BfdQeESDTLwVsfASz61sCqzUbxf Ow32MA5pnHNQb1kXOqYSZsxFRJWwrIV+xjSTbYREeyVxgP13KEY/Rz470PJu+lUGRAXR tOwQ== X-Gm-Message-State: ANhLgQ3qVr246KllT56/xxTrkGMwVnQwki9YsEFdGlNNUvQ4sb3/6k39 xPnsROvf5NXqr0elWwRV56c= X-Google-Smtp-Source: ADFU+vtwSMlJtBOGVhF988SWJXiCWsqrt0bMXyGvr4xywpaJZciHg5h2Hc60NPIOays5UYmjedHBag== X-Received: by 2002:a63:334a:: with SMTP id z71mr16454335pgz.305.1584845380977; Sat, 21 Mar 2020 19:49:40 -0700 (PDT) Received: from localhost ([216.24.188.11]) by smtp.gmail.com with ESMTPSA id p4sm9502186pfg.163.2020.03.21.19.49.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Mar 2020 19:49:40 -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, tglx@linutronix.de, gregkh@linuxfoundation.org, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v3 5/7] net: phy: aquantia: use phy_read_mmd_poll_timeout() to simplify the code Date: Sun, 22 Mar 2020 10:48:32 +0800 Message-Id: <20200322024834.31402-6-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200322024834.31402-1-zhengdejin5@gmail.com> References: <20200322024834.31402-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 --- 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..db3e20938729 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); } static void aqr107_chip_info(struct phy_device *phydev) From patchwork Sun Mar 22 02:48:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dejin Zheng X-Patchwork-Id: 222091 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, URIBL_BLOCKED, 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 9E2AEC4332D for ; Sun, 22 Mar 2020 02:49:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 748CE20788 for ; Sun, 22 Mar 2020 02:49:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="roFyt3rs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728467AbgCVCts (ORCPT ); Sat, 21 Mar 2020 22:49:48 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:40293 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728440AbgCVCtq (ORCPT ); Sat, 21 Mar 2020 22:49:46 -0400 Received: by mail-pg1-f195.google.com with SMTP id t24so5249006pgj.7; Sat, 21 Mar 2020 19:49:45 -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=1VcYGik7hKP7sx1O39JIjU063LsYKhPa4fKZoVZkWgw=; b=roFyt3rsBBLqxTgu9tA8nmp6t57gCbc2M5qF9MSofActeFc/Mvh0aFRaXNL37bW9Bh 8S4Bwvn3X2gTCnfrtkGDYtKqFd91lzAMQoSMvfRNjxjO30GGK88LN52L8s7/qnOro/yJ hyHMpujBh+3nt67IDHBXUrmx13eCyd6h9UX1/kfTl1tEb0rwn49Re7Jg4fbvHPvAf7pz rnwhbE6B3qFWiyxpRI4bRlzGsopE89R+P1f5IQbTL+LgkH5CodjB3rjsqyfVmT6BFXX5 iSLR3wIgQgF8djcDYt1T6rbNEa00OA5WulywCIrEjA7g15mrlb0nw1rGgrzLXqHDFuyJ bitQ== 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=1VcYGik7hKP7sx1O39JIjU063LsYKhPa4fKZoVZkWgw=; b=CTAL8dQy8rlVl6fiDdXcKZm47aHIwXAzwybiqiprSoRAkLTswTZJqBn0IIe6PlSs2a 6jcPZnzVn3a1z8FlFgenUPUk3hegNAV7D7l3hMX7BAcBHOscToxP5GjKyALeXHYIYemi RXj6FyejBRcxADg9Tom38kbguQdaFAjPlU0ecNRLOoEHM3h+GLeUv+PV7HyC9KkWbqir VMVZm+nS9PLh00Pjr2LUMikku++ULvPDDWHbMTuEks1PXXJTtvRD8r4O+dCXOWU7iYSw bzTak082TUW7F/4HGvqEAzm+PKSRj7UWQY+SF2qW+lAQ65j9qoVz9Zrvq+R0W/C1mgvI bEwQ== X-Gm-Message-State: ANhLgQ3aYtUD0Jav/Ffhl657DNB7Bh4AnpiJEFXIvay4FElHhXb6T3Ep 2okeaD09xiTlSRs6XPRrAck= X-Google-Smtp-Source: ADFU+vv7l4sVi1SoaniA998s2TLWePk++Us2HUCezuwtpm7IQzjfYMo29yW2EdhOplVUq5SC0GKAyA== X-Received: by 2002:a63:1517:: with SMTP id v23mr15442033pgl.89.1584845385234; Sat, 21 Mar 2020 19:49:45 -0700 (PDT) Received: from localhost ([216.24.188.11]) by smtp.gmail.com with ESMTPSA id f64sm10111279pfb.72.2020.03.21.19.49.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Mar 2020 19:49:44 -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, tglx@linutronix.de, gregkh@linuxfoundation.org, mchehab+samsung@kernel.org, netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Dejin Zheng Subject: [PATCH net-next v3 6/7] net: phy: introduce phy_read_poll_timeout macro Date: Sun, 22 Mar 2020 10:48:33 +0800 Message-Id: <20200322024834.31402-7-zhengdejin5@gmail.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200322024834.31402-1-zhengdejin5@gmail.com> References: <20200322024834.31402-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 --- 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 29718865242d..a23d6caf5c2c 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) \ +({ \ + 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