From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752123AbdEEKbH (ORCPT ); Fri, 5 May 2017 06:31:07 -0400 Received: from mailout4.w1.samsung.com ([210.118.77.14]:46504 "EHLO mailout4.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751085AbdEEKbG (ORCPT ); Fri, 5 May 2017 06:31:06 -0400 X-AuditID: cbfec7ef-f796a6d00000373c-2e-590c546955ab Subject: Re: [PATCH v4 3/3] mfd: arizona: Refactor arizona_poll_reg To: Charles Keepax , lee.jones@linaro.org Cc: linux-kernel@vger.kernel.org, patches@opensource.wolfsonmicro.com Newsgroups: gmane.linux.kernel From: Andrzej Hajda Message-id: <0ba51aef-4529-0c60-8d77-6c04fe8a30df@samsung.com> Date: Fri, 05 May 2017 12:31:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-version: 1.0 In-reply-to: <1489589918-27088-3-git-send-email-ckeepax@opensource.wolfsonmicro.com> Content-type: text/plain; charset=windows-1252 Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42LZduznOd3MEJ5Ig/N3lS3+TbnBbnH/61FG i8u75rBZLH/7n82BxePOtT1sHi8n/mbz+LxJLoA5issmJTUnsyy1SN8ugSvjy4TrzAUNchVL 5s1lamDcJ97FyMkhIWAicaz7HCuELSZx4d56ti5GLg4hgWWMEveXTWeFcD4zSsxcvJYZpmPB hZsscFWNj39AtTxjlNjx+BIbSJWwgLPEpovTgWwODhGBAIkDbY4gYWYBV4nGnt1gg/gE5CQm bn0GZrMJaEr83XwTrJVXwE7i1vvpTCCtLAKqEk03ykDCogIREtfnbGGEKBGU+DH5HguIzSkQ JnHwzkNGiPEGEjOmHGaCsOUlNq95ywxymoRAN7vE9Hvd7CAzJQRkJTYdgPrFRaL1wGI2CFtY 4tXxLewQtozE5cndLFC9jBKf+k+wQzhTGCX+fZgB1W0tcfj4RVaIbXwSk7ZNZ4ZYwCvR0SYE YXpIfL1QBVHtKHFuy3RoUH1klLhwfDfrBEaFWUj+mYXkh1lIfljAyLyKUSS1tDg3PbXYUK84 Mbe4NC9dLzk/dxMjMGmc/nf8/Q7Gp80hhxgFOBiVeHg9XLgjhVgTy4orcw8xSnAwK4nw8svw RArxpiRWVqUW5ccXleakFh9ilOZgURLn5T11LUJIID2xJDU7NbUgtQgmy8TBKdXAyNFq/s2Y 2dGV//guDj9jn+/Xzn0/e9bl3MI3DIa7jV9zR8Zc/+HpEcNwJnRlYUBC8qMEvrm7mgpfRjYs N7gg+q6yXHCt84rsjTFfpf9/9nm/3mlX8jKFSau8+piXqUwMPJ3/ldl+VYf2f6P+LiFTvr/6 v6r2WDMsZpKOfr1LdesW+SVJCZdMlViKMxINtZiLihMBaVwGoBYDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrIIsWRmVeSWpSXmKPExsVy+t/xq7rNITyRBiu2W1r8m3KD3eL+16OM Fpd3zWGzWP72P5sDi8eda3vYPF5O/M3m8XmTXABzlJtNRmpiSmqRQmpecn5KZl66rVJoiJuu hZJCXmJuqq1ShK5vSJCSQlliTimQZ2SABhycA9yDlfTtEtwyvky4zlzQIFexZN5cpgbGfeJd jJwcEgImEgsu3GSBsMUkLtxbzwZiCwksYZSYu0Gti5ELyH7GKPGiYyUTSEJYwFli08XpYEUi An4SH3beZYEoms8o8bljB1gRs4CrRGPPbmYQm09ATmLi1mdgNpuApsTfzTfBmnkF7CRuvZ8O VM/BwSKgKtF0owwkLCoQIfGwcxc7RImgxI/J98CO4xQIk1hz7Q8rSDmzgJ7E/YtaEJvkJTav ecs8gVFwFpKOWQhVs5BULWBkXsUoklpanJueW2ykV5yYW1yal66XnJ+7iREYPduO/dyyg7Hr XfAhRgEORiUeXg8X7kgh1sSy4srcQ4wSHMxKIrz8MjyRQrwpiZVVqUX58UWlOanFhxhNgT6Y yCwlmpwPjOy8knhDE0NzS0MjYwsLcyMjJXHeqR+uhAsJpCeWpGanphakFsH0MXFwSjUwaulv 0GVVn1fy9wDfw1f2ij1uAetfHHk2+ei3Er74Z5NmfjaKXZm6b9nLd8qBopeWX9Lrttmzjv1r zQvd0mUiUo7itU9FpeX/iKcqTff7zD1NV9tplujRuIwUmXvz1h17KscYrv+36vcVB9mMj4zf VaufTggV9F87cWvfwneTv35q8c5bP599iRJLcUaioRZzUXEiALAh9OK0AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170505103102eucas1p20e8a4a84d4bafd39939166aa21def227 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRvsgrw=?= =?UTF-8?B?7ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?QW5kcnplaiBIYWpkYRtTUlBPTC1LZXJuZWwgKFRQKRtTYW1z?= =?UTF-8?B?dW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170505103102eucas1p20e8a4a84d4bafd39939166aa21def227 X-RootMTR: 20170505103102eucas1p20e8a4a84d4bafd39939166aa21def227 References: <1489589918-27088-1-git-send-email-ckeepax@opensource.wolfsonmicro.com> <1489589918-27088-3-git-send-email-ckeepax@opensource.wolfsonmicro.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Charles, On 15.03.2017 15:58, Charles Keepax wrote: > Currently, we specify the timeout in terms of the number of polls but it > is more clear from a user of the functions perspective to specify the > timeout directly in milliseconds, as such update the function to these new > semantics. > > Additionally, arizona_poll_reg essentially hard-codes > regmap_read_poll_timeout, update the implementation to use > regmap_read_poll_timeout. We still keep arizona_poll_reg around as > regmap_read_poll_timeout is a macro so rather than expand this for each > caller keep it wrapped in arizona_poll_reg. > > Whilst we are doing this make the timeouts a little more generous as > the previous system had a bit more slack as it was done as a delay per > iteration of the loop whereas regmap_read_poll_timeout compares ktime's. > > Signed-off-by: Charles Keepax > --- > > Changes since v3: > - Squashed together patches 3/4 from the v3 chain. > > Thanks, > Charles > > drivers/mfd/arizona-core.c | 36 ++++++++++++++++-------------------- > 1 file changed, 16 insertions(+), 20 deletions(-) > > diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c > index 4cb34c3..75488e6 100644 > --- a/drivers/mfd/arizona-core.c > +++ b/drivers/mfd/arizona-core.c > @@ -235,29 +235,25 @@ static irqreturn_t arizona_overclocked(int irq, void *data) > return IRQ_HANDLED; > } > > +#define ARIZONA_REG_POLL_DELAY_US 7500 > + > static int arizona_poll_reg(struct arizona *arizona, > - int timeout, unsigned int reg, > + int timeout_ms, unsigned int reg, > unsigned int mask, unsigned int target) > { > unsigned int val = 0; > - int ret, i; > - > - for (i = 0; i < timeout; i++) { > - ret = regmap_read(arizona->regmap, reg, &val); > - if (ret != 0) { > - dev_err(arizona->dev, "Failed to read reg 0x%x: %d\n", > - reg, ret); > - continue; > - } > - > - if ((val & mask) == target) > - return 0; > + int ret; > > - usleep_range(1000, 5000); > - } > + ret = regmap_read_poll_timeout(arizona->regmap, > + ARIZONA_INTERRUPT_RAW_STATUS_5, val, s/ARIZONA_INTERRUPT_RAW_STATUS_5/reg/; Regards Andrzej > + ((val & mask) == target), > + ARIZONA_REG_POLL_DELAY_US, > + timeout_ms * 1000); > + if (ret) > + dev_err(arizona->dev, "Polling reg 0x%x timed out: %x\n", > + reg, val); > > - dev_err(arizona->dev, "Polling reg 0x%x timed out: %x\n", reg, val); > - return -ETIMEDOUT; > + return ret; > } > > static int arizona_wait_for_boot(struct arizona *arizona) > @@ -269,7 +265,7 @@ static int arizona_wait_for_boot(struct arizona *arizona) > * we won't race with the interrupt handler as it'll be blocked on > * runtime resume. > */ > - ret = arizona_poll_reg(arizona, 5, ARIZONA_INTERRUPT_RAW_STATUS_5, > + ret = arizona_poll_reg(arizona, 30, ARIZONA_INTERRUPT_RAW_STATUS_5, > ARIZONA_BOOT_DONE_STS, ARIZONA_BOOT_DONE_STS); > > if (!ret) > @@ -339,7 +335,7 @@ static int arizona_enable_freerun_sysclk(struct arizona *arizona, > ret); > return ret; > } > - ret = arizona_poll_reg(arizona, 25, ARIZONA_INTERRUPT_RAW_STATUS_5, > + ret = arizona_poll_reg(arizona, 180, ARIZONA_INTERRUPT_RAW_STATUS_5, > ARIZONA_FLL1_CLOCK_OK_STS, > ARIZONA_FLL1_CLOCK_OK_STS); > if (ret) > @@ -403,7 +399,7 @@ static int wm5102_apply_hardware_patch(struct arizona *arizona) > goto err; > } > > - ret = arizona_poll_reg(arizona, 5, ARIZONA_WRITE_SEQUENCER_CTRL_1, > + ret = arizona_poll_reg(arizona, 30, ARIZONA_WRITE_SEQUENCER_CTRL_1, > ARIZONA_WSEQ_BUSY, 0); > if (ret) > regmap_write(arizona->regmap, ARIZONA_WRITE_SEQUENCER_CTRL_0, >