From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753066AbcITCTD (ORCPT ); Mon, 19 Sep 2016 22:19:03 -0400 Received: from lucky1.263xmail.com ([211.157.147.131]:33295 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751888AbcITCTB (ORCPT ); Mon, 19 Sep 2016 22:19:01 -0400 X-263anti-spam: KSV:0;BIG:0;ABS:1;DNS:0;ATT:0;SPF:S; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-ADDR-CHECKED: 0 X-RL-SENDER: ykk@rock-chips.com X-FST-TO: linux-rockchip@lists.infradead.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: ykk@rock-chips.com X-UNIQUE-TAG: <29f2f68e3266b863881ada952b28c9aa> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH v3 2/3] drm/bridge: analogix_dp: use jiffies to simulate timeout loop To: Sean Paul References: <1473306526-4340-1-git-send-email-ykk@rock-chips.com> <1473414290-335-1-git-send-email-ykk@rock-chips.com> Cc: Daniel Vetter , Inki Dae , David Airlie , Tomeu Vizoso , Mika Kahola , =?UTF-8?Q?St=c3=a9phane_Marchesin?= , Tomasz Figa , Douglas Anderson , Thierry Reding , Krzysztof Kozlowski , Heiko Stuebner , Jingoo Han , Javier Martinez Canillas , Linux Kernel Mailing List , dri-devel , linux-samsung-soc , linux-rockchip@lists.infradead.org From: Yakir Yang Message-ID: <01b6f408-ba3b-b2c0-b9f2-097420ef96cb@rock-chips.com> Date: Tue, 20 Sep 2016 10:18:38 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Sean, On 09/12/2016 09:51 PM, Sean Paul wrote: > On Fri, Sep 9, 2016 at 5:44 AM, Yakir Yang wrote: >> Signed-off-by: Yakir Yang >> --- >> Changes in v3: >> - Suggested by Sean >> >> Changes in v2: None >> >> drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 3 ++- >> drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 18 +++++++++--------- >> 2 files changed, 11 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h >> index a15f076..d564e90 100644 >> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h >> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.h >> @@ -16,10 +16,11 @@ >> #include >> #include >> >> -#define DP_TIMEOUT_LOOP_COUNT 100 >> #define MAX_CR_LOOP 5 >> #define MAX_EQ_LOOP 5 >> >> +#define DP_TIMEOUT_LOOP_MS msecs_to_jiffies(1) > The name suggests the units here are ms, but you're storing jiffies. > Do the msecs_to_jiffies conversion down below. I suddenly realized that 'analogix_dp_core.c' also used the 'DP_TIMEOUT_LOOP_COUNT' macros, and 'analogix_dp_core.c' have four kinds of timeout, - DP_TIMEOUT_LOOP_COUNT * 1us - DP_TIMEOUT_LOOP_COUNT * 10us - DP_TIMEOUT_LOOP_COUNT * 100us - DP_TIMEOUT_LOOP_COUNT * 1000us I may guess it's not necessary to replace the 'DP_TIMEOUT_LOOP_COUNT' now :-) - Yakir > >> + >> /* DP_MAX_LANE_COUNT */ >> #define DPCD_ENHANCED_FRAME_CAP(x) (((x) >> 7) & 0x1) >> #define DPCD_MAX_LANE_COUNT(x) ((x) & 0x1f) >> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c >> index a4d17b8..15a4cf0 100644 >> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c >> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c >> @@ -335,7 +335,7 @@ void analogix_dp_set_analog_power_down(struct analogix_dp_device *dp, >> void analogix_dp_init_analog_func(struct analogix_dp_device *dp) >> { >> u32 reg; >> - int timeout_loop = 0; >> + unsigned long timeout; >> >> analogix_dp_set_analog_power_down(dp, POWER_ALL, 0); >> >> @@ -350,9 +350,9 @@ void analogix_dp_init_analog_func(struct analogix_dp_device *dp) >> if (analogix_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) { >> analogix_dp_set_pll_power_down(dp, 0); >> >> + timeout = jiffies + DP_TIMEOUT_LOOP_MS; > timeout = jiffies + msecs_to_jiffies(DP_TIMEOUT_LOOP_MS); > >> while (analogix_dp_get_pll_lock_status(dp) == PLL_UNLOCKED) { >> - timeout_loop++; >> - if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { >> + if (time_after(jiffies, timeout)) { >> dev_err(dp->dev, "failed to get pll lock status\n"); >> return; >> } >> @@ -501,7 +501,7 @@ int analogix_dp_start_aux_transaction(struct analogix_dp_device *dp) >> { >> int reg; >> int retval = 0; >> - int timeout_loop = 0; >> + unsigned long timeout; >> >> /* Enable AUX CH operation */ >> reg = readl(dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2); >> @@ -509,10 +509,10 @@ int analogix_dp_start_aux_transaction(struct analogix_dp_device *dp) >> writel(reg, dp->reg_base + ANALOGIX_DP_AUX_CH_CTL_2); >> >> /* Is AUX CH command reply received? */ >> + timeout = jiffies + DP_TIMEOUT_LOOP_MS; >> reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); >> while (!(reg & RPLY_RECEIV)) { >> - timeout_loop++; >> - if (DP_TIMEOUT_LOOP_COUNT < timeout_loop) { >> + if (time_after(jiffies, timeout)) { >> dev_err(dp->dev, "AUX CH command reply failed!\n"); >> return -ETIMEDOUT; >> } >> @@ -1055,7 +1055,7 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, >> { >> u32 reg; >> u8 *buffer = msg->buffer; >> - int timeout_loop = 0; >> + unsigned long timeout; >> unsigned int i; >> int num_transferred = 0; >> >> @@ -1123,10 +1123,10 @@ ssize_t analogix_dp_transfer(struct analogix_dp_device *dp, >> >> /* Is AUX CH command reply received? */ >> /* TODO: Wait for an interrupt instead of looping? */ >> + timeout = jiffies + DP_TIMEOUT_LOOP_MS; >> reg = readl(dp->reg_base + ANALOGIX_DP_INT_STA); >> while (!(reg & RPLY_RECEIV)) { >> - timeout_loop++; >> - if (timeout_loop > DP_TIMEOUT_LOOP_COUNT) { >> + if (time_after(jiffies, timeout)) { >> dev_err(dp->dev, "AUX CH command reply failed!\n"); >> return -ETIMEDOUT; >> } >> -- >> 1.9.1 >> >> > >