| Message ID | 1575984287-26787-4-git-send-email-claudiu.beznea@microchip.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fixes for atmel-hlcdc | expand |
Hi Sam, On 10.12.2019 22:37, Sam Ravnborg wrote: > Hi Claudiu. > > On Tue, Dec 10, 2019 at 03:24:45PM +0200, Claudiu Beznea wrote: >> For HLCDC timing engine configurations bit ATMEL_HLCDC_SIP of >> ATMEL_HLCDC_SR needs to checked if it is equal with zero before applying >> new configuration to timing engine. In case of timeout there is no >> indicator about this, so, return with error in case of timeout in >> regmap_atmel_hlcdc_reg_write() and also print a message about this. >> >> Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> >> --- >> drivers/mfd/atmel-hlcdc.c | 14 ++++++++++---- >> 1 file changed, 10 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/mfd/atmel-hlcdc.c b/drivers/mfd/atmel-hlcdc.c >> index 64013c57a920..19f1dbeb8bcd 100644 >> --- a/drivers/mfd/atmel-hlcdc.c >> +++ b/drivers/mfd/atmel-hlcdc.c >> @@ -39,10 +39,16 @@ static int regmap_atmel_hlcdc_reg_write(void *context, unsigned int reg, >> >> if (reg <= ATMEL_HLCDC_DIS) { >> u32 status; >> - >> - readl_poll_timeout_atomic(hregmap->regs + ATMEL_HLCDC_SR, >> - status, !(status & ATMEL_HLCDC_SIP), >> - 1, 100); >> + int ret; >> + >> + ret = readl_poll_timeout_atomic(hregmap->regs + ATMEL_HLCDC_SR, >> + status, >> + !(status & ATMEL_HLCDC_SIP), >> + 1, 100); >> + if (ret) { >> + pr_err("Timeout waiting for ATMEL_HLCDC_SIP\n"); >> + return ret; > Consider adding device * to atmel_hlcdc_regmap - so you can use > dev_err() here. This makes it obvious what device this comes from. OK! I'll do it in v2. > > Sam > >> + } >> } >> >> writel(val, hregmap->regs + reg); >> -- >> 2.7.4 > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
diff --git a/drivers/mfd/atmel-hlcdc.c b/drivers/mfd/atmel-hlcdc.c index 64013c57a920..19f1dbeb8bcd 100644 --- a/drivers/mfd/atmel-hlcdc.c +++ b/drivers/mfd/atmel-hlcdc.c @@ -39,10 +39,16 @@ static int regmap_atmel_hlcdc_reg_write(void *context, unsigned int reg, if (reg <= ATMEL_HLCDC_DIS) { u32 status; - - readl_poll_timeout_atomic(hregmap->regs + ATMEL_HLCDC_SR, - status, !(status & ATMEL_HLCDC_SIP), - 1, 100); + int ret; + + ret = readl_poll_timeout_atomic(hregmap->regs + ATMEL_HLCDC_SR, + status, + !(status & ATMEL_HLCDC_SIP), + 1, 100); + if (ret) { + pr_err("Timeout waiting for ATMEL_HLCDC_SIP\n"); + return ret; + } } writel(val, hregmap->regs + reg);
For HLCDC timing engine configurations bit ATMEL_HLCDC_SIP of ATMEL_HLCDC_SR needs to checked if it is equal with zero before applying new configuration to timing engine. In case of timeout there is no indicator about this, so, return with error in case of timeout in regmap_atmel_hlcdc_reg_write() and also print a message about this. Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com> --- drivers/mfd/atmel-hlcdc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)