i2c: i2c-qcom-geni: More properly fix the DMA race
Subsystems (4)
cover i2c: i2c-qcom-geni: More properly fix the DMA race
Previously I landed commit 02b9aec59243 ("i2c: i2c-qcom-geni: Fix DMA transfer race") to fix a race we were seeing. While that most definitely fixed the race we were seeing, it looks like it causes problems in the TX path, which we didn't stress test until we started trying to update firmware on devices.
Let's revert that patch and try another way: fix the original problem by disabling the interrupts that aren't relevant to DMA transfers. Now we can stress both TX and RX cases and see no problems. I also can't find any place to put an msleep() that causes problems anymore.
Since this problem only affects i2c, I'm hoping for an Ack from Bjorn and then all these patches can go through the i2c tree. However, if maintainers want to work a different way out to land that's OK too.
NOTE: the 3rd patch in the series could certianly be squashed with patch #1 or I could re-order / rejigger. To me it seemed like a good idea to first fix the probelm (and make the two functions as much of an inverse as possible) and later try to clean things up. Yell if you want something different.
Douglas Anderson (3):
soc: qcom: geni: More properly switch to DMA mode Revert "i2c: i2c-qcom-geni: Fix DMA transfer race"
soc: qcom: geni: Optimize select fifo/dma mode
drivers/i2c/busses/i2c-qcom-geni.c | 6 ++-- drivers/soc/qcom/qcom-geni-se.c | 47 ++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 19 deletions(-)
Signature · 1 line
2.28.0.1011.ga647a8990f-goog
PATCH 1/3 soc: qcom: geni: More properly switch to DMA mode
On geni-i2c transfers using DMA, it was seen that if you program the command (I2C_READ) before calling geni_se_rx_dma_prep() that it could cause interrupts to fire. If we get unlucky, these interrupts can just keep firing (and not be handled) blocking further progress and hanging the system.
In commit 02b9aec59243 ("i2c: i2c-qcom-geni: Fix DMA transfer race") we avoided that by making sure we didn't program the command until after geni_se_rx_dma_prep() was called. While that avoided the problems, it also turns out to be invalid. At least in the TX case we started seeing sporadic corrupted transfers. This is easily seen by adding an msleep() between the DMA prep and the writing of the command, which makes the problem worse. That means we need to revert that commit and find another way to fix the bogus IRQs.
Specifically, after reverting commit 02b9aec59243 ("i2c:
i2c-qcom-geni: Fix DMA transfer race"), I put some traces in. I found that the when the interrupts were firing like crazy:
- "m_stat" had bits for M_RX_IRQ_EN, M_RX_FIFO_WATERMARK_EN set.
- "dma" was set.
Further debugging showed that I could make the problem happen more reliably by adding an "msleep(1)" any time after geni_se_setup_m_cmd() ran up until geni_se_rx_dma_prep() programmed the length.
A rather simple fix is to change geni_se_select_dma_mode() so it's a true inverse of geni_se_select_fifo_mode() and disables all the FIFO related interrupts. Now the problematic interrupts can't fire and we can program things in the correct order without worrying.
As part of this, let's also change the writel_relaxed() in the prepare function to a writel() so that our DMA is guaranteed to be prepared now that we can't rely on geni_se_setup_m_cmd()'s writel().
NOTE: the only current user of GENI_SE_DMA in mainline is i2c.
---
drivers/soc/qcom/qcom-geni-se.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/soc/qcom/qcom-geni-se.c +15 -2
@@ -289,10 +289,23 @@ static void geni_se_select_fifo_mode(struct geni_se *se)static void geni_se_select_dma_mode (struct geni_se *se) { +u32 proto =geni_se_read_proto (se);u32 val;geni_se_irq_clear (se); + val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN ); +if (proto !=GENI_SE_UART ) { + val &= ~(M_CMD_DONE_EN |M_TX_FIFO_WATERMARK_EN ); + val &= ~(M_RX_FIFO_WATERMARK_EN |M_RX_FIFO_LAST_EN ); + } +writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); + + val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN ); +if (proto !=GENI_SE_UART ) + val &= ~S_CMD_DONE_EN ; +writel_relaxed (val, se->base +SE_GENI_S_IRQ_EN ); + val =readl_relaxed (se->base +SE_GENI_DMA_MODE_EN ); val |=GENI_DMA_MODE_EN ;writel_relaxed (val, se->base +SE_GENI_DMA_MODE_EN );
@@ -651,7 +664,7 @@ int geni_se_tx_dma_prep(struct geni_se *se, void *buf, size_t len,writel_relaxed (lower_32_bits (*iova), se->base +SE_DMA_TX_PTR_L );writel_relaxed (upper_32_bits (*iova), se->base +SE_DMA_TX_PTR_H );writel_relaxed (GENI_SE_DMA_EOT_BUF , se->base +SE_DMA_TX_ATTR ); -writel_relaxed (len, se->base +SE_DMA_TX_LEN ); +writel (len, se->base +SE_DMA_TX_LEN );return 0 ; }EXPORT_SYMBOL (geni_se_tx_dma_prep);
@@ -688,7 +701,7 @@ int geni_se_rx_dma_prep(struct geni_se *se, void *buf, size_t len,writel_relaxed (upper_32_bits (*iova), se->base +SE_DMA_RX_PTR_H );/* RX does not have EOT buffer type bit. So just reset RX_ATTR */ writel_relaxed (0 , se->base +SE_DMA_RX_ATTR ); -writel_relaxed (len, se->base +SE_DMA_RX_LEN ); +writel (len, se->base +SE_DMA_RX_LEN );return 0 ; }EXPORT_SYMBOL (geni_se_rx_dma_prep);
Signature · 1 line
2.28.0.1011.ga647a8990f-goog
Re: [PATCH 1/3] soc: qcom: geni: More properly switch to DMA mode
Quoting Douglas Anderson (2020-10-08 15:52:33)
Quoted 34 lines
On geni-i2c transfers using DMA, it was seen that if you program the command (
I2C_READ) before callinggeni_se_rx_dma_prep()that it could cause interrupts to fire. If we get unlucky, these interrupts can just keep firing (and not be handled) blocking further progress and hanging the system.In commit
02b9aec59243("i2c: i2c-qcom-geni: Fix DMA transfer race") we avoided that by making sure we didn't program the command until aftergeni_se_rx_dma_prep()was called. While that avoided the problems, it also turns out to be invalid. At least in the TX case we started seeing sporadic corrupted transfers. This is easily seen by adding anmsleep()between the DMA prep and the writing of the command, which makes the problem worse. That means we need to revert that commit and find another way to fix the bogus IRQs.Specifically, after reverting commit
02b9aec59243("i2c:
i2c-qcom-geni: Fix DMA transfer race"), I put some traces in. I found that the when the interrupts were firing like crazy:
- "m_stat" had bits forM_RX_IRQ_EN,M_RX_FIFO_WATERMARK_ENset.
- "dma" was set.Further debugging showed that I could make the problem happen more reliably by adding an "msleep(1)" any time after
geni_se_setup_m_cmd()ran up untilgeni_se_rx_dma_prep()programmed the length.A rather simple fix is to change
geni_se_select_dma_mode()so it's a true inverse ofgeni_se_select_fifo_mode()and disables all the FIFO related interrupts. Now the problematic interrupts can't fire and we can program things in the correct order without worrying.As part of this, let's also change the
writel_relaxed()in the prepare function to awritel()so that our DMA is guaranteed to be prepared now that we can't rely on geni_se_setup_m_cmd()'swritel().
Quoted 6 lines
NOTE: the only current user of
GENI_SE_DMAin mainline is i2c.Fixes 37692de5d523 ("i2c: i2c-qcom-geni: Add bus driver for the Qualcomm GENI I2C controller")Fixes 02b9aec59243 ("i2c: i2c-qcom-geni: Fix DMA transfer race")Signed-off-by Douglas Anderson <[email protected]>---
Quoted 9 lines
drivers/soc/qcom/qcom-geni-se.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)drivers/soc/qcom/qcom-geni-se.c +0
-0
drivers/soc/qcom/qcom-geni-se.c static void geni_se_select_fifo_mode(struct geni_se *se) · line 298
Quoted 10 lines
drivers/soc/qcom/qcom-geni-se.c +3
-0@@ -289,10 +289,23 @@ static void geni_se_select_fifo_mode(struct geni_se *se)static void geni_se_select_dma_mode (struct geni_se *se) { +u32 proto =geni_se_read_proto (se);u32 val;geni_se_irq_clear (se); + val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN ); +if (proto !=GENI_SE_UART ) {
Not a problem with this patch but it would be great if there was a comment here (and probably in geni_se_select_fifo_mode() too) indicating why GENI_SE_UART is special. Is it because GENI_SE_UART doesn't use the main sequencer? I think that is the reason, but I forgot and reading this code doesn't tell me that.
Splitting the driver in this way where the logic is in the geni wrapper and in the engine driver leads to this confusion.
Quoted 13 lines
drivers/soc/qcom/qcom-geni-se.c +10
-0+ val &= ~(M_CMD_DONE_EN |M_TX_FIFO_WATERMARK_EN ); + val &= ~(M_RX_FIFO_WATERMARK_EN |M_RX_FIFO_LAST_EN ); + } +writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); + + val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN ); +if (proto !=GENI_SE_UART ) + val &= ~S_CMD_DONE_EN ; +writel_relaxed (val, se->base +SE_GENI_S_IRQ_EN ); + val =readl_relaxed (se->base +SE_GENI_DMA_MODE_EN ); val |=GENI_DMA_MODE_EN ;writel_relaxed (val, se->base +SE_GENI_DMA_MODE_EN );
Re: [PATCH 1/3] soc: qcom: geni: More properly switch to DMA mode
Hi Stephen,
Quoted 10 lines
drivers/soc/qcom/qcom-geni-se.c static void geni_se_select_fifo_mode(struct geni_se *se) · line 298
Quoted 10 lines
static void geni_se_select_dma_mode(struct geni_se *se) {drivers/soc/qcom/qcom-geni-se.c +3
-0+u32 proto =geni_se_read_proto (se);u32 val;geni_se_irq_clear (se); + val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN ); +if (proto !=GENI_SE_UART ) {
Quoted 8 lines
Not a problem with this patch but it would be great if there was a comment here (and probably in
geni_se_select_fifo_mode()too) indicating whyGENI_SE_UARTis special. Is it becauseGENI_SE_UARTdoesn't use the main sequencer? I think that is the reason, but I forgot and reading this code doesn't tell me that.Splitting the driver in this way where the logic is in the geni wrapper and in the engine driver leads to this confusion.
GENI_SE_UART uses main sequencer for TX and secondary for RX transfers because it is asynchronous in nature.
That's why RX related bits (M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN) are not enable in main sequencer for UART.
(M_CMD_DONE_EN | M_TX_FIFO_WATERMARK_EN) bits are controlled from UART driver, it's gets enabled and disabled multiple times from start_tx ,stop_tx respectively.
Regards,
Akash
Quoted 14 lines
Quoted 14 lines
drivers/soc/qcom/qcom-geni-se.c +10
-0+ val &= ~(M_CMD_DONE_EN |M_TX_FIFO_WATERMARK_EN ); + val &= ~(M_RX_FIFO_WATERMARK_EN |M_RX_FIFO_LAST_EN ); + } +writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); + + val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN ); +if (proto !=GENI_SE_UART ) + val &= ~S_CMD_DONE_EN ; +writel_relaxed (val, se->base +SE_GENI_S_IRQ_EN ); + val =readl_relaxed (se->base +SE_GENI_DMA_MODE_EN ); val |=GENI_DMA_MODE_EN ;writel_relaxed (val, se->base +SE_GENI_DMA_MODE_EN );
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
Re: [PATCH 1/3] soc: qcom: geni: More properly switch to DMA mode
Hi,
Quoted 26 lines · Akash Asthana
Hi Stephen,
Quoted 10 lines
drivers/soc/qcom/qcom-geni-se.c static void geni_se_select_fifo_mode(struct geni_se *se) · line 298
Quoted 10 lines
static void geni_se_select_dma_mode(struct geni_se *se) {drivers/soc/qcom/qcom-geni-se.c +3
-0+u32 proto =geni_se_read_proto (se);u32 val;geni_se_irq_clear (se); + val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN ); +if (proto !=GENI_SE_UART ) {Quoted 8 lines
Not a problem with this patch but it would be great if there was a comment here (and probably in
geni_se_select_fifo_mode()too) indicating whyGENI_SE_UARTis special. Is it becauseGENI_SE_UARTdoesn't use the main sequencer? I think that is the reason, but I forgot and reading this code doesn't tell me that.Splitting the driver in this way where the logic is in the geni wrapper and in the engine driver leads to this confusion.
GENI_SE_UARTuses main sequencer for TX and secondary for RX transfers because it is asynchronous in nature.
Quoted 6 lines
That's why RX related bits (
M_RX_FIFO_WATERMARK_EN|M_RX_FIFO_LAST_EN) are not enable in main sequencer for UART.(
M_CMD_DONE_EN|M_TX_FIFO_WATERMARK_EN) bits are controlled from UART driver, it's gets enabled and disabled multiple times fromstart_tx,stop_tx respectively.
For now I've "solved" this by adding some comments (in the 3rd patch) basically summarizing what Akash said. I didn't want to go further than that for now because it felt more important to get the i2c bug fixed sooner rather than later and re-organizing would be a big enough change that it'd probably need a few spins.
Our bug trackers don't make it trivially easy to file a public bug tracking this and assign it to Qualcomm, but I've filed a bug asking folks at Qualcomm to help with re-organizing things after my patch series lands. This is internally tracked at Google as b:170766462 ("Rejigger geni_se_select_fifo_mode() / geni_se_select_dma_mode() to not manage interrupt enables").
-Doug
Re: [PATCH 1/3] soc: qcom: geni: More properly switch to DMA mode
In reply to Douglas AndersonQuoted 34 lines · Douglas Anderson
On geni-i2c transfers using DMA, it was seen that if you program the command (
I2C_READ) before callinggeni_se_rx_dma_prep()that it could cause interrupts to fire. If we get unlucky, these interrupts can just keep firing (and not be handled) blocking further progress and hanging the system.In commit
02b9aec59243("i2c: i2c-qcom-geni: Fix DMA transfer race") we avoided that by making sure we didn't program the command until aftergeni_se_rx_dma_prep()was called. While that avoided the problems, it also turns out to be invalid. At least in the TX case we started seeing sporadic corrupted transfers. This is easily seen by adding anmsleep()between the DMA prep and the writing of the command, which makes the problem worse. That means we need to revert that commit and find another way to fix the bogus IRQs.Specifically, after reverting commit
02b9aec59243("i2c:
i2c-qcom-geni: Fix DMA transfer race"), I put some traces in. I found that the when the interrupts were firing like crazy:
- "m_stat" had bits forM_RX_IRQ_EN,M_RX_FIFO_WATERMARK_ENset.
- "dma" was set.Further debugging showed that I could make the problem happen more reliably by adding an "msleep(1)" any time after
geni_se_setup_m_cmd()ran up untilgeni_se_rx_dma_prep()programmed the length.A rather simple fix is to change
geni_se_select_dma_mode()so it's a true inverse ofgeni_se_select_fifo_mode()and disables all the FIFO related interrupts. Now the problematic interrupts can't fire and we can program things in the correct order without worrying.As part of this, let's also change the
writel_relaxed()in the prepare function to awritel()so that our DMA is guaranteed to be prepared now that we can't rely on geni_se_setup_m_cmd()'swritel().
Quoted 5 lines
NOTE: the only current user of
GENI_SE_DMAin mainline is i2c.Fixes 37692de5d523 ("i2c: i2c-qcom-geni: Add bus driver for the Qualcomm GENI I2C controller")Fixes 02b9aec59243 ("i2c: i2c-qcom-geni: Fix DMA transfer race")Signed-off-by Douglas Anderson <[email protected]>
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
PATCH 2/3 Revert "i2c: i2c-qcom-geni: Fix DMA transfer race"
In reply to Douglas AndersonThis reverts commit 02b9aec59243c6240fc42884acc958602146ddf6.
As talked about in the patch ("soc: qcom: geni: More properly switch to DMA mode"), swapping the order of geni_se_setup_m_cmd() and geni_se_xx_dma_prep() can sometimes cause corrupted transfers. Thus we traded one problem for another. Now that we've debugged the problem further and fixed the geni helper functions to more disable FIFO interrupts when we move to DMA mode we can revert it and end up with (hopefully) zero problems!
To be explicit, the patch ("soc: qcom: geni: More properly switch to DMA mode") is a prerequisite for this one.
---
drivers/i2c/busses/i2c-qcom-geni.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-qcom-geni.c +2 -4
@@ -367,6 +367,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,geni_se_select_mode (se,GENI_SE_FIFO );writel_relaxed (len, se->base +SE_I2C_RX_TRANS_LEN ); +geni_se_setup_m_cmd (se,I2C_READ , m_param);if (dma_buf &&geni_se_rx_dma_prep (se, dma_buf, len, &rx_dma)) {geni_se_select_mode (se,GENI_SE_FIFO );
@@ -374,8 +375,6 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, dma_buf =NULL ; } -geni_se_setup_m_cmd (se,I2C_READ , m_param); - time_left =wait_for_completion_timeout (&gi2c->done,XFER_TIMEOUT );if (!time_left)geni_i2c_abort_xfer (gi2c);
@@ -409,6 +408,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,geni_se_select_mode (se,GENI_SE_FIFO );writel_relaxed (len, se->base +SE_I2C_TX_TRANS_LEN ); +geni_se_setup_m_cmd (se,I2C_WRITE , m_param);if (dma_buf &&geni_se_tx_dma_prep (se, dma_buf, len, &tx_dma)) {geni_se_select_mode (se,GENI_SE_FIFO );
@@ -416,8 +416,6 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, dma_buf =NULL ; } -geni_se_setup_m_cmd (se,I2C_WRITE , m_param); -if (!dma_buf)/* Get FIFO IRQ */ writel_relaxed (1 , se->base +SE_GENI_TX_WATERMARK_REG );
Signature · 1 line
2.28.0.1011.ga647a8990f-goog
Re: [PATCH 2/3] Revert "i2c: i2c-qcom-geni: Fix DMA transfer race"
Quoting Douglas Anderson (2020-10-08 15:52:34)
Quoted 10 lines
This reverts commit
02b9aec59243c6240fc42884acc958602146ddf6.As talked about in the patch ("soc: qcom: geni: More properly switch to DMA mode"), swapping the order of
geni_se_setup_m_cmd()andgeni_se_xx_dma_prep()can sometimes cause corrupted transfers. Thus we traded one problem for another. Now that we've debugged the problem further and fixed the geni helper functions to more disable FIFO interrupts when we move to DMA mode we can revert it and end up with (hopefully) zero problems!
Quoted 6 lines
To be explicit, the patch ("soc: qcom: geni: More properly switch to DMA mode") is a prerequisite for this one.
Fixes 02b9aec59243 ("i2c: i2c-qcom-geni: Fix DMA transfer race")Signed-off-by Douglas Anderson <[email protected]>---
Re: [PATCH 2/3] Revert "i2c: i2c-qcom-geni: Fix DMA transfer race"
In reply to Douglas AndersonQuoted 10 lines · Douglas Anderson
This reverts commit
02b9aec59243c6240fc42884acc958602146ddf6.As talked about in the patch ("soc: qcom: geni: More properly switch to DMA mode"), swapping the order of
geni_se_setup_m_cmd()andgeni_se_xx_dma_prep()can sometimes cause corrupted transfers. Thus we traded one problem for another. Now that we've debugged the problem further and fixed the geni helper functions to more disable FIFO interrupts when we move to DMA mode we can revert it and end up with (hopefully) zero problems!
Quoted 5 lines
To be explicit, the patch ("soc: qcom: geni: More properly switch to DMA mode") is a prerequisite for this one.
Fixes 02b9aec59243 ("i2c: i2c-qcom-geni: Fix DMA transfer race")Signed-off-by Douglas Anderson <[email protected]>
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
PATCH 3/3 soc: qcom: geni: Optimize select fifo/dma mode
In reply to Douglas AndersonThe functions geni_se_select_fifo_mode() and geni_se_select_fifo_mode() are a little funny. They read/write a bunch of memory mapped registers even if they don't change or aren't relevant for the current protocol. Let's make them a little more sane.
NOTE: there is no evidence at all that this makes any performance difference and it fixes no bugs. However, it seems (to me) like it makes the functions a little easier to understand. Decreasing the amount of times we read/write memory mapped registers is also nice, even if we are using "relaxed" variants.
---
drivers/soc/qcom/qcom-geni-se.c | 44 ++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 20 deletions(-)
drivers/soc/qcom/qcom-geni-se.c +24 -20
@@ -266,49 +266,53 @@ EXPORT_SYMBOL(geni_se_init);static void geni_se_select_fifo_mode (struct geni_se *se) {u32 proto =geni_se_read_proto (se); -u32 val; +u32 val, val_old;geni_se_irq_clear (se); - val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN );if (proto !=GENI_SE_UART ) { + val_old = val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN ); val |=M_CMD_DONE_EN |M_TX_FIFO_WATERMARK_EN ; val |=M_RX_FIFO_WATERMARK_EN |M_RX_FIFO_LAST_EN ; - } -writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); +if (val != val_old) +writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); - val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN ); -if (proto !=GENI_SE_UART ) - val |=S_CMD_DONE_EN ; -writel_relaxed (val, se->base +SE_GENI_S_IRQ_EN ); + val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN ); +if (!(val &S_CMD_DONE_EN )) +writel_relaxed (val |S_CMD_DONE_EN , + se->base +SE_GENI_S_IRQ_EN ); + } val =readl_relaxed (se->base +SE_GENI_DMA_MODE_EN ); - val &= ~GENI_DMA_MODE_EN ; -writel_relaxed (val, se->base +SE_GENI_DMA_MODE_EN ); +if (val &GENI_DMA_MODE_EN ) +writel_relaxed (val & ~GENI_DMA_MODE_EN , + se->base +SE_GENI_DMA_MODE_EN ); }static void geni_se_select_dma_mode (struct geni_se *se) {u32 proto =geni_se_read_proto (se); -u32 val; +u32 val, val_old;geni_se_irq_clear (se); - val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN );if (proto !=GENI_SE_UART ) { + val_old = val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN ); val &= ~(M_CMD_DONE_EN |M_TX_FIFO_WATERMARK_EN ); val &= ~(M_RX_FIFO_WATERMARK_EN |M_RX_FIFO_LAST_EN ); - } -writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); +if (val != val_old) +writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); - val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN ); -if (proto !=GENI_SE_UART ) - val &= ~S_CMD_DONE_EN ; -writel_relaxed (val, se->base +SE_GENI_S_IRQ_EN ); + val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN ); +if (val &S_CMD_DONE_EN ) +writel_relaxed (val & ~S_CMD_DONE_EN , + se->base +SE_GENI_S_IRQ_EN ); + } val =readl_relaxed (se->base +SE_GENI_DMA_MODE_EN ); - val |=GENI_DMA_MODE_EN ; -writel_relaxed (val, se->base +SE_GENI_DMA_MODE_EN ); +if (!(val &GENI_DMA_MODE_EN )) +writel_relaxed (val |GENI_DMA_MODE_EN , + se->base +SE_GENI_DMA_MODE_EN ); }/**
Signature · 1 line
2.28.0.1011.ga647a8990f-goog
Re: [PATCH 3/3] soc: qcom: geni: Optimize select fifo/dma mode
Quoting Douglas Anderson (2020-10-08 15:52:35)
Quoted 18 lines
drivers/soc/qcom/qcom-geni-se.c +2
-2@@ -266,49 +266,53 @@ EXPORT_SYMBOL(geni_se_init);static void geni_se_select_fifo_mode (struct geni_se *se) {u32 proto =geni_se_read_proto (se); -u32 val; +u32 val, val_old;geni_se_irq_clear (se); - val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN );if (proto !=GENI_SE_UART ) { + val_old = val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN ); val |=M_CMD_DONE_EN |M_TX_FIFO_WATERMARK_EN ; val |=M_RX_FIFO_WATERMARK_EN |M_RX_FIFO_LAST_EN ;
drivers/soc/qcom/qcom-geni-se.c EXPORT_SYMBOL(geni_se_init); · line 280
Quoted 10 lines
drivers/soc/qcom/qcom-geni-se.c +3
-6- } -writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); +if (val != val_old) +writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); - val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN ); -if (proto !=GENI_SE_UART ) - val |=S_CMD_DONE_EN ; -writel_relaxed (val, se->base +SE_GENI_S_IRQ_EN ); + val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN );
Can we use the val_old trick here too?
drivers/soc/qcom/qcom-geni-se.c EXPORT_SYMBOL(geni_se_init); · line 282
Quoted 2 lines
drivers/soc/qcom/qcom-geni-se.c +2
-0+if (!(val &S_CMD_DONE_EN )) + writel_relaxed(val | S_CMD_DONE_EN,
Because this val | S_CMD_DONE_EN thing is just hard to read :/
Quoted 11 lines
drivers/soc/qcom/qcom-geni-se.c +5
-2+ se->base + SE_GENI_S_IRQ_EN); + } val =readl_relaxed (se->base +SE_GENI_DMA_MODE_EN ); - val &= ~GENI_DMA_MODE_EN ; -writel_relaxed (val, se->base +SE_GENI_DMA_MODE_EN ); +if (val &GENI_DMA_MODE_EN ) +writel_relaxed (val & ~GENI_DMA_MODE_EN , + se->base +SE_GENI_DMA_MODE_EN ); }
Re: [PATCH 3/3] soc: qcom: geni: Optimize select fifo/dma mode
Hi,
Quoted 33 lines · Stephen Boyd
Quoting Douglas Anderson (2020-10-08 15:52:35)
Quoted 18 lines
drivers/soc/qcom/qcom-geni-se.c +2
-2@@ -266,49 +266,53 @@ EXPORT_SYMBOL(geni_se_init);static void geni_se_select_fifo_mode (struct geni_se *se) {u32 proto =geni_se_read_proto (se); -u32 val; +u32 val, val_old;geni_se_irq_clear (se); - val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN );if (proto !=GENI_SE_UART ) { + val_old = val =readl_relaxed (se->base +SE_GENI_M_IRQ_EN ); val |=M_CMD_DONE_EN |M_TX_FIFO_WATERMARK_EN ; val |=M_RX_FIFO_WATERMARK_EN |M_RX_FIFO_LAST_EN ;drivers/soc/qcom/qcom-geni-se.c EXPORT_SYMBOL(geni_se_init); · line 280
Quoted 10 lines
drivers/soc/qcom/qcom-geni-se.c +3
-6- } -writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); +if (val != val_old) +writel_relaxed (val, se->base +SE_GENI_M_IRQ_EN ); - val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN ); -if (proto !=GENI_SE_UART ) - val |=S_CMD_DONE_EN ; -writel_relaxed (val, se->base +SE_GENI_S_IRQ_EN ); + val =readl_relaxed (se->base +SE_GENI_S_IRQ_EN );Can we use the
val_oldtrick here too?
Quoted 4 lines
drivers/soc/qcom/qcom-geni-se.c EXPORT_SYMBOL(geni_se_init); · line 282
Quoted 2 lines
drivers/soc/qcom/qcom-geni-se.c +2
-0+if (!(val &S_CMD_DONE_EN )) + writel_relaxed(val | S_CMD_DONE_EN,Because this val |
S_CMD_DONE_ENthing is just hard to read :/
This is done in v2. Thanks for your review!
-Doug
+Roja
Quoting Douglas Anderson (2020-10-08 15:52:32)
Quoted 34 lines
Previously I landed commit
02b9aec59243("i2c: i2c-qcom-geni: Fix DMA transfer race") to fix a race we were seeing. While that most definitely fixed the race we were seeing, it looks like it causes problems in the TX path, which we didn't stress test until we started trying to update firmware on devices.Let's revert that patch and try another way: fix the original problem by disabling the interrupts that aren't relevant to DMA transfers. Now we can stress both TX and RX cases and see no problems. I also can't find any place to put an
msleep()that causes problems anymore.Since this problem only affects i2c, I'm hoping for an Ack from Bjorn and then all these patches can go through the i2c tree. However, if maintainers want to work a different way out to land that's OK too.
NOTE: the 3rd patch in the series could certianly be squashed with patch #1 or I could re-order / rejigger. To me it seemed like a good idea to first fix the probelm (and make the two functions as much of an inverse as possible) and later try to clean things up. Yell if you want something different.
Douglas Anderson (3):
soc: qcom: geni: More properly switch to DMA mode Revert "i2c: i2c-qcom-geni: Fix DMA transfer race"
soc: qcom: geni: Optimize select fifo/dma modedrivers/i2c/busses/i2c-qcom-geni.c | 6 ++-- drivers/soc/qcom/qcom-geni-se.c | 47 ++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 19 deletions(-)Signature · 1 line
2.28.0.1011.ga647a8990f-goog
Quoted 6 lines · Douglas Anderson
Previously I landed commit
02b9aec59243("i2c: i2c-qcom-geni: Fix DMA transfer race") to fix a race we were seeing. While that most definitely fixed the race we were seeing, it looks like it causes problems in the TX path, which we didn't stress test until we started trying to update firmware on devices.
Quoted 8 lines
Let's revert that patch and try another way: fix the original problem by disabling the interrupts that aren't relevant to DMA transfers. Now we can stress both TX and RX cases and see no problems. I also can't find any place to put an
msleep()that causes problems anymore.Since this problem only affects i2c, I'm hoping for an Ack from Bjorn and then all these patches can go through the i2c tree. However, if maintainers want to work a different way out to land that's OK too.
These patches fix I2C DMA issues on SM8250 we were observing
Signature · 2 lines
With best wishes Dmitry