* [PATCH v1 1/1] i2c: iproc: Fix i2c master read more than 63 bytes
@ 2019-07-24 8:28 Rayagonda Kokatanur
2019-07-30 20:53 ` Ray Jui
2019-08-01 12:31 ` Wolfram Sang
0 siblings, 2 replies; 3+ messages in thread
From: Rayagonda Kokatanur @ 2019-07-24 8:28 UTC (permalink / raw)
To: Wolfram Sang, Rob Herring, Mark Rutland
Cc: linux-i2c, devicetree, linux-arm-kernel, linux-kernel,
bcm-kernel-feedback-list, Ray Jui, Rayagonda Kokatanur,
Florian Fainelli
Use SMBUS_MASTER_DATA_READ.MASTER_RD_STATUS bit to check for RX
FIFO empty condition because SMBUS_MASTER_FIFO_CONTROL.MASTER_RX_PKT_COUNT
is not updated for read >= 64 bytes. This fixes the issue when trying to
read from the I2C slave more than 63 bytes.
Fixes: c24b8d574b7c ("i2c: iproc: Extend I2C read up to 255 bytes")
Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
---
drivers/i2c/busses/i2c-bcm-iproc.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c
index 2c7f145..d7fd76b 100644
--- a/drivers/i2c/busses/i2c-bcm-iproc.c
+++ b/drivers/i2c/busses/i2c-bcm-iproc.c
@@ -392,16 +392,18 @@ static bool bcm_iproc_i2c_slave_isr(struct bcm_iproc_i2c_dev *iproc_i2c,
static void bcm_iproc_i2c_read_valid_bytes(struct bcm_iproc_i2c_dev *iproc_i2c)
{
struct i2c_msg *msg = iproc_i2c->msg;
+ uint32_t val;
/* Read valid data from RX FIFO */
while (iproc_i2c->rx_bytes < msg->len) {
- if (!((iproc_i2c_rd_reg(iproc_i2c, M_FIFO_CTRL_OFFSET) >> M_FIFO_RX_CNT_SHIFT)
- & M_FIFO_RX_CNT_MASK))
+ val = iproc_i2c_rd_reg(iproc_i2c, M_RX_OFFSET);
+
+ /* rx fifo empty */
+ if (!((val >> M_RX_STATUS_SHIFT) & M_RX_STATUS_MASK))
break;
msg->buf[iproc_i2c->rx_bytes] =
- (iproc_i2c_rd_reg(iproc_i2c, M_RX_OFFSET) >>
- M_RX_DATA_SHIFT) & M_RX_DATA_MASK;
+ (val >> M_RX_DATA_SHIFT) & M_RX_DATA_MASK;
iproc_i2c->rx_bytes++;
}
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v1 1/1] i2c: iproc: Fix i2c master read more than 63 bytes
2019-07-24 8:28 [PATCH v1 1/1] i2c: iproc: Fix i2c master read more than 63 bytes Rayagonda Kokatanur
@ 2019-07-30 20:53 ` Ray Jui
2019-08-01 12:31 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Ray Jui @ 2019-07-30 20:53 UTC (permalink / raw)
To: Rayagonda Kokatanur, Wolfram Sang, Rob Herring, Mark Rutland
Cc: linux-i2c, devicetree, linux-arm-kernel, linux-kernel,
bcm-kernel-feedback-list, Florian Fainelli
Hi Rayagonda,
On 7/24/2019 1:28 AM, Rayagonda Kokatanur wrote:
> Use SMBUS_MASTER_DATA_READ.MASTER_RD_STATUS bit to check for RX
> FIFO empty condition because SMBUS_MASTER_FIFO_CONTROL.MASTER_RX_PKT_COUNT
> is not updated for read >= 64 bytes. This fixes the issue when trying to
> read from the I2C slave more than 63 bytes.
>
> Fixes: c24b8d574b7c ("i2c: iproc: Extend I2C read up to 255 bytes")
>
> Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
> ---
> drivers/i2c/busses/i2c-bcm-iproc.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c
> index 2c7f145..d7fd76b 100644
> --- a/drivers/i2c/busses/i2c-bcm-iproc.c
> +++ b/drivers/i2c/busses/i2c-bcm-iproc.c
> @@ -392,16 +392,18 @@ static bool bcm_iproc_i2c_slave_isr(struct bcm_iproc_i2c_dev *iproc_i2c,
> static void bcm_iproc_i2c_read_valid_bytes(struct bcm_iproc_i2c_dev *iproc_i2c)
> {
> struct i2c_msg *msg = iproc_i2c->msg;
> + uint32_t val;
>
> /* Read valid data from RX FIFO */
> while (iproc_i2c->rx_bytes < msg->len) {
> - if (!((iproc_i2c_rd_reg(iproc_i2c, M_FIFO_CTRL_OFFSET) >> M_FIFO_RX_CNT_SHIFT)
> - & M_FIFO_RX_CNT_MASK))
> + val = iproc_i2c_rd_reg(iproc_i2c, M_RX_OFFSET);
> +
> + /* rx fifo empty */
> + if (!((val >> M_RX_STATUS_SHIFT) & M_RX_STATUS_MASK))
> break;
>
> msg->buf[iproc_i2c->rx_bytes] =
> - (iproc_i2c_rd_reg(iproc_i2c, M_RX_OFFSET) >>
> - M_RX_DATA_SHIFT) & M_RX_DATA_MASK;
> + (val >> M_RX_DATA_SHIFT) & M_RX_DATA_MASK;
> iproc_i2c->rx_bytes++;
> }
> }
>
Thanks for the fix. This fix looks good to me!
Reviewed-by: Ray Jui <ray.jui@broadcom.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH v1 1/1] i2c: iproc: Fix i2c master read more than 63 bytes
2019-07-24 8:28 [PATCH v1 1/1] i2c: iproc: Fix i2c master read more than 63 bytes Rayagonda Kokatanur
2019-07-30 20:53 ` Ray Jui
@ 2019-08-01 12:31 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2019-08-01 12:31 UTC (permalink / raw)
To: Rayagonda Kokatanur
Cc: Rob Herring, Mark Rutland, linux-i2c, devicetree,
linux-arm-kernel, linux-kernel, bcm-kernel-feedback-list,
Ray Jui, Florian Fainelli
[-- Attachment #1: Type: text/plain, Size: 527 bytes --]
On Wed, Jul 24, 2019 at 01:58:27PM +0530, Rayagonda Kokatanur wrote:
> Use SMBUS_MASTER_DATA_READ.MASTER_RD_STATUS bit to check for RX
> FIFO empty condition because SMBUS_MASTER_FIFO_CONTROL.MASTER_RX_PKT_COUNT
> is not updated for read >= 64 bytes. This fixes the issue when trying to
> read from the I2C slave more than 63 bytes.
>
> Fixes: c24b8d574b7c ("i2c: iproc: Extend I2C read up to 255 bytes")
>
> Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com>
Applied to for-current, thanks!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-01 12:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-24 8:28 [PATCH v1 1/1] i2c: iproc: Fix i2c master read more than 63 bytes Rayagonda Kokatanur
2019-07-30 20:53 ` Ray Jui
2019-08-01 12:31 ` 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 NNTP newsgroup(s).