| Message ID | 20201124185743.401946-1-bjorn.andersson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 70f16fab5272bfc5b83c24bc1a8e877697bf17cc |
| Headers | show |
| Series | Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630" | expand |
On Tue, Nov 24, 2020 at 12:57:43PM -0600, Bjorn Andersson wrote: > A combination of recent bug fixes by Doug Anderson and the proper > definition of iommu streams means that this hack is no longer needed. > Let's clean up the code by reverting '127068abe85b ("i2c: qcom-geni: > Disable DMA processing on the Lenovo Yoga C630")'. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Acked-by: Shawn Guo <shawn.guo@linaro.org>
On 11/24/20 12:57 PM, Bjorn Andersson wrote: > A combination of recent bug fixes by Doug Anderson and the proper > definition of iommu streams means that this hack is no longer needed. > Let's clean up the code by reverting '127068abe85b ("i2c: qcom-geni: > Disable DMA processing on the Lenovo Yoga C630")'. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > drivers/i2c/busses/i2c-qcom-geni.c | 12 ++++-------- > 1 file changed, 4 insertions(+), 8 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c > index dce75b85253c..046d241183c5 100644 > --- a/drivers/i2c/busses/i2c-qcom-geni.c > +++ b/drivers/i2c/busses/i2c-qcom-geni.c > @@ -353,13 +353,11 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, > { > dma_addr_t rx_dma; > unsigned long time_left; > - void *dma_buf = NULL; > + void *dma_buf; > struct geni_se *se = &gi2c->se; > size_t len = msg->len; > > - if (!of_machine_is_compatible("lenovo,yoga-c630")) > - dma_buf = i2c_get_dma_safe_msg_buf(msg, 32); > - > + dma_buf = i2c_get_dma_safe_msg_buf(msg, 32); > if (dma_buf) > geni_se_select_mode(se, GENI_SE_DMA); > else > @@ -394,13 +392,11 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, > { > dma_addr_t tx_dma; > unsigned long time_left; > - void *dma_buf = NULL; > + void *dma_buf; > struct geni_se *se = &gi2c->se; > size_t len = msg->len; > > - if (!of_machine_is_compatible("lenovo,yoga-c630")) > - dma_buf = i2c_get_dma_safe_msg_buf(msg, 32); > - > + dma_buf = i2c_get_dma_safe_msg_buf(msg, 32); > if (dma_buf) > geni_se_select_mode(se, GENI_SE_DMA); > else Tested-by: Steev Klimaszewski <steev@kali.org>
On 11/25/2020 12:27 AM, Bjorn Andersson wrote: > A combination of recent bug fixes by Doug Anderson and the proper > definition of iommu streams means that this hack is no longer needed. > Let's clean up the code by reverting '127068abe85b ("i2c: qcom-geni: > Disable DMA processing on the Lenovo Yoga C630")'. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Reviewed-by: Akash Asthana <akashast@codeaurora.org>
On Tue, Nov 24, 2020 at 12:57:43PM -0600, Bjorn Andersson wrote: > A combination of recent bug fixes by Doug Anderson and the proper > definition of iommu streams means that this hack is no longer needed. > Let's clean up the code by reverting '127068abe85b ("i2c: qcom-geni: > Disable DMA processing on the Lenovo Yoga C630")'. > > Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- Added another ack from Caleb and applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c index dce75b85253c..046d241183c5 100644 --- a/drivers/i2c/busses/i2c-qcom-geni.c +++ b/drivers/i2c/busses/i2c-qcom-geni.c @@ -353,13 +353,11 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, { dma_addr_t rx_dma; unsigned long time_left; - void *dma_buf = NULL; + void *dma_buf; struct geni_se *se = &gi2c->se; size_t len = msg->len; - if (!of_machine_is_compatible("lenovo,yoga-c630")) - dma_buf = i2c_get_dma_safe_msg_buf(msg, 32); - + dma_buf = i2c_get_dma_safe_msg_buf(msg, 32); if (dma_buf) geni_se_select_mode(se, GENI_SE_DMA); else @@ -394,13 +392,11 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, { dma_addr_t tx_dma; unsigned long time_left; - void *dma_buf = NULL; + void *dma_buf; struct geni_se *se = &gi2c->se; size_t len = msg->len; - if (!of_machine_is_compatible("lenovo,yoga-c630")) - dma_buf = i2c_get_dma_safe_msg_buf(msg, 32); - + dma_buf = i2c_get_dma_safe_msg_buf(msg, 32); if (dma_buf) geni_se_select_mode(se, GENI_SE_DMA); else
A combination of recent bug fixes by Doug Anderson and the proper definition of iommu streams means that this hack is no longer needed. Let's clean up the code by reverting '127068abe85b ("i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630")'. Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> --- drivers/i2c/busses/i2c-qcom-geni.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) -- 2.29.2