* [PATCH v1 1/1] i2c: designware: Adjust bus_freq_hz when refuse high speed mode set
@ 2021-03-31 11:05 Andy Shevchenko
2021-03-31 21:37 ` Song Bao Hua (Barry Song)
2021-04-05 20:50 ` Wolfram Sang
0 siblings, 2 replies; 4+ messages in thread
From: Andy Shevchenko @ 2021-03-31 11:05 UTC (permalink / raw)
To: Andy Shevchenko, Serge Semin, linux-i2c, linux-kernel
Cc: Jarkko Nikula, Mika Westerberg, wsa, Yicong Yang,
Song Bao Hua (Barry Song)
When hardware doesn't support High Speed Mode, we forget bus_freq_hz
timing adjustment. This makes the timings and real registers being
unsynchronized. Adjust bus_freq_hz when refuse high speed mode set.
Fixes: b6e67145f149 ("i2c: designware: Enable high speed mode")
Reported-by: "Song Bao Hua (Barry Song)" <song.bao.hua@hisilicon.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/i2c/busses/i2c-designware-master.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c
index 34bb4e21bcc3..9bfa06e31eec 100644
--- a/drivers/i2c/busses/i2c-designware-master.c
+++ b/drivers/i2c/busses/i2c-designware-master.c
@@ -129,6 +129,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev *dev)
if ((comp_param1 & DW_IC_COMP_PARAM_1_SPEED_MODE_MASK)
!= DW_IC_COMP_PARAM_1_SPEED_MODE_HIGH) {
dev_err(dev->dev, "High Speed not supported!\n");
+ t->bus_freq_hz = I2C_MAX_FAST_MODE_FREQ;
dev->master_cfg &= ~DW_IC_CON_SPEED_MASK;
dev->master_cfg |= DW_IC_CON_SPEED_FAST;
dev->hs_hcnt = 0;
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* RE: [PATCH v1 1/1] i2c: designware: Adjust bus_freq_hz when refuse high speed mode set
2021-03-31 11:05 [PATCH v1 1/1] i2c: designware: Adjust bus_freq_hz when refuse high speed mode set Andy Shevchenko
@ 2021-03-31 21:37 ` Song Bao Hua (Barry Song)
2021-04-05 11:55 ` Andy Shevchenko
2021-04-05 20:50 ` Wolfram Sang
1 sibling, 1 reply; 4+ messages in thread
From: Song Bao Hua (Barry Song) @ 2021-03-31 21:37 UTC (permalink / raw)
To: Andy Shevchenko, Serge Semin, linux-i2c@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Jarkko Nikula, Mika Westerberg, wsa@kernel.org, yangyicong
> -----Original Message-----
> From: Andy Shevchenko [mailto:andriy.shevchenko@linux.intel.com]
> Sent: Thursday, April 1, 2021 12:05 AM
> To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>; Serge Semin
> <Sergey.Semin@baikalelectronics.ru>; linux-i2c@vger.kernel.org;
> linux-kernel@vger.kernel.org
> Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>; Mika Westerberg
> <mika.westerberg@linux.intel.com>; wsa@kernel.org; yangyicong
> <yangyicong@huawei.com>; Song Bao Hua (Barry Song) <song.bao.hua@hisilicon.com>
> Subject: [PATCH v1 1/1] i2c: designware: Adjust bus_freq_hz when refuse high
> speed mode set
>
> When hardware doesn't support High Speed Mode, we forget bus_freq_hz
> timing adjustment. This makes the timings and real registers being
> unsynchronized. Adjust bus_freq_hz when refuse high speed mode set.
>
> Fixes: b6e67145f149 ("i2c: designware: Enable high speed mode")
> Reported-by: "Song Bao Hua (Barry Song)" <song.bao.hua@hisilicon.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
Thanks for fixing that.
Reviewed-by: Barry Song <song.bao.hua@hisilicon.com>
> drivers/i2c/busses/i2c-designware-master.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/i2c/busses/i2c-designware-master.c
> b/drivers/i2c/busses/i2c-designware-master.c
> index 34bb4e21bcc3..9bfa06e31eec 100644
> --- a/drivers/i2c/busses/i2c-designware-master.c
> +++ b/drivers/i2c/busses/i2c-designware-master.c
> @@ -129,6 +129,7 @@ static int i2c_dw_set_timings_master(struct dw_i2c_dev
> *dev)
> if ((comp_param1 & DW_IC_COMP_PARAM_1_SPEED_MODE_MASK)
> != DW_IC_COMP_PARAM_1_SPEED_MODE_HIGH) {
> dev_err(dev->dev, "High Speed not supported!\n");
> + t->bus_freq_hz = I2C_MAX_FAST_MODE_FREQ;
> dev->master_cfg &= ~DW_IC_CON_SPEED_MASK;
> dev->master_cfg |= DW_IC_CON_SPEED_FAST;
> dev->hs_hcnt = 0;
> --
> 2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1 1/1] i2c: designware: Adjust bus_freq_hz when refuse high speed mode set
2021-03-31 21:37 ` Song Bao Hua (Barry Song)
@ 2021-04-05 11:55 ` Andy Shevchenko
0 siblings, 0 replies; 4+ messages in thread
From: Andy Shevchenko @ 2021-04-05 11:55 UTC (permalink / raw)
To: Song Bao Hua (Barry Song)
Cc: Serge Semin, linux-i2c@vger.kernel.org,
linux-kernel@vger.kernel.org, Jarkko Nikula, Mika Westerberg,
wsa@kernel.org, yangyicong
On Wed, Mar 31, 2021 at 09:37:41PM +0000, Song Bao Hua (Barry Song) wrote:
> > From: Andy Shevchenko [mailto:andriy.shevchenko@linux.intel.com]
> > Sent: Thursday, April 1, 2021 12:05 AM
> > To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>; Serge Semin
> > <Sergey.Semin@baikalelectronics.ru>; linux-i2c@vger.kernel.org;
> > linux-kernel@vger.kernel.org
...
> > Fixes: b6e67145f149 ("i2c: designware: Enable high speed mode")
> > Reported-by: "Song Bao Hua (Barry Song)" <song.bao.hua@hisilicon.com>
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
> Thanks for fixing that.
>
> Reviewed-by: Barry Song <song.bao.hua@hisilicon.com>
Thanks!
Wolfram, can be this applied for v5.12-rc7?
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1 1/1] i2c: designware: Adjust bus_freq_hz when refuse high speed mode set
2021-03-31 11:05 [PATCH v1 1/1] i2c: designware: Adjust bus_freq_hz when refuse high speed mode set Andy Shevchenko
2021-03-31 21:37 ` Song Bao Hua (Barry Song)
@ 2021-04-05 20:50 ` Wolfram Sang
1 sibling, 0 replies; 4+ messages in thread
From: Wolfram Sang @ 2021-04-05 20:50 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Serge Semin, linux-i2c, linux-kernel, Jarkko Nikula,
Mika Westerberg, Yicong Yang, Song Bao Hua (Barry Song)
[-- Attachment #1: Type: text/plain, Size: 530 bytes --]
On Wed, Mar 31, 2021 at 02:05:10PM +0300, Andy Shevchenko wrote:
> When hardware doesn't support High Speed Mode, we forget bus_freq_hz
> timing adjustment. This makes the timings and real registers being
> unsynchronized. Adjust bus_freq_hz when refuse high speed mode set.
>
> Fixes: b6e67145f149 ("i2c: designware: Enable high speed mode")
> Reported-by: "Song Bao Hua (Barry Song)" <song.bao.hua@hisilicon.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Applied to for-current, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-04-05 20:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-31 11:05 [PATCH v1 1/1] i2c: designware: Adjust bus_freq_hz when refuse high speed mode set Andy Shevchenko
2021-03-31 21:37 ` Song Bao Hua (Barry Song)
2021-04-05 11:55 ` Andy Shevchenko
2021-04-05 20:50 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).