All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
@ 2020-11-24 18:57 ` Bjorn Andersson
  0 siblings, 0 replies; 11+ messages in thread
From: Bjorn Andersson @ 2020-11-24 18:57 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Akash Asthana, Mukesh Savaliya,
	Sumit Semwal, Christian König, Wolfram Sang,
	Steev Klimaszewski, Shawn Guo
  Cc: linux-arm-msm, linux-i2c, linux-kernel, linux-media, dri-devel,
	linaro-mm-sig

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
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
@ 2020-11-24 18:57 ` Bjorn Andersson
  0 siblings, 0 replies; 11+ messages in thread
From: Bjorn Andersson @ 2020-11-24 18:57 UTC (permalink / raw)
  To: Andy Gross, Bjorn Andersson, Akash Asthana, Mukesh Savaliya,
	Sumit Semwal, Christian König, Wolfram Sang,
	Steev Klimaszewski, Shawn Guo
  Cc: linux-arm-msm, linux-kernel, dri-devel, linaro-mm-sig, linux-i2c,
	linux-media

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
-- 
2.29.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
  2020-11-24 18:57 ` Bjorn Andersson
@ 2020-11-30  6:20   ` Shawn Guo
  -1 siblings, 0 replies; 11+ messages in thread
From: Shawn Guo @ 2020-11-30  6:20 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: Andy Gross, Akash Asthana, Mukesh Savaliya, Sumit Semwal,
	Christian König, Wolfram Sang, Steev Klimaszewski,
	linux-arm-msm, linux-i2c, linux-kernel, linux-media, dri-devel,
	linaro-mm-sig

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>

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
@ 2020-11-30  6:20   ` Shawn Guo
  0 siblings, 0 replies; 11+ messages in thread
From: Shawn Guo @ 2020-11-30  6:20 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: Wolfram Sang, linux-arm-msm, dri-devel, linux-kernel,
	Steev Klimaszewski, Christian König, Akash Asthana,
	Andy Gross, linux-i2c, Mukesh Savaliya, linaro-mm-sig,
	linux-media

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>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
  2020-11-24 18:57 ` Bjorn Andersson
@ 2020-11-30 16:19   ` Steev Klimaszewski
  -1 siblings, 0 replies; 11+ messages in thread
From: Steev Klimaszewski @ 2020-11-30 16:19 UTC (permalink / raw)
  To: Bjorn Andersson, Andy Gross, Akash Asthana, Mukesh Savaliya,
	Sumit Semwal, Christian König, Wolfram Sang, Shawn Guo
  Cc: linux-arm-msm, linux-i2c, linux-kernel, linux-media, dri-devel,
	linaro-mm-sig


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>



^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
@ 2020-11-30 16:19   ` Steev Klimaszewski
  0 siblings, 0 replies; 11+ messages in thread
From: Steev Klimaszewski @ 2020-11-30 16:19 UTC (permalink / raw)
  To: Bjorn Andersson, Andy Gross, Akash Asthana, Mukesh Savaliya,
	Sumit Semwal, Christian König, Wolfram Sang, Shawn Guo
  Cc: linux-arm-msm, linux-kernel, dri-devel, linaro-mm-sig, linux-i2c,
	linux-media


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>


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
  2020-11-24 18:57 ` Bjorn Andersson
@ 2020-12-02  6:30   ` Akash Asthana
  -1 siblings, 0 replies; 11+ messages in thread
From: Akash Asthana @ 2020-12-02  6:30 UTC (permalink / raw)
  To: Bjorn Andersson, Andy Gross, Mukesh Savaliya, Sumit Semwal,
	Christian König, Wolfram Sang, Steev Klimaszewski,
	Shawn Guo
  Cc: linux-arm-msm, linux-i2c, linux-kernel, linux-media, dri-devel,
	linaro-mm-sig


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>

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
@ 2020-12-02  6:30   ` Akash Asthana
  0 siblings, 0 replies; 11+ messages in thread
From: Akash Asthana @ 2020-12-02  6:30 UTC (permalink / raw)
  To: Bjorn Andersson, Andy Gross, Mukesh Savaliya, Sumit Semwal,
	Christian König, Wolfram Sang, Steev Klimaszewski,
	Shawn Guo
  Cc: linux-arm-msm, linux-kernel, dri-devel, linaro-mm-sig, linux-i2c,
	linux-media


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>

-- 
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
  2020-11-24 18:57 ` Bjorn Andersson
@ 2020-12-03 20:15   ` Wolfram Sang
  -1 siblings, 0 replies; 11+ messages in thread
From: Wolfram Sang @ 2020-12-03 20:15 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: Andy Gross, Akash Asthana, Mukesh Savaliya, Sumit Semwal,
	Christian König, Steev Klimaszewski, Shawn Guo,
	linux-arm-msm, linux-i2c, linux-kernel, linux-media, dri-devel,
	linaro-mm-sig

[-- Attachment #1: Type: text/plain, Size: 475 bytes --]

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!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
@ 2020-12-03 20:15   ` Wolfram Sang
  0 siblings, 0 replies; 11+ messages in thread
From: Wolfram Sang @ 2020-12-03 20:15 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: linaro-mm-sig, linux-arm-msm, dri-devel, linux-kernel,
	Steev Klimaszewski, Christian König, Akash Asthana,
	Andy Gross, linux-i2c, Mukesh Savaliya, linux-media


[-- Attachment #1.1: Type: text/plain, Size: 475 bytes --]

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!


[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
  2020-11-24 18:57 ` Bjorn Andersson
                   ` (4 preceding siblings ...)
  (?)
@ 2020-12-29 20:15 ` patchwork-bot+linux-arm-msm
  -1 siblings, 0 replies; 11+ messages in thread
From: patchwork-bot+linux-arm-msm @ 2020-12-29 20:15 UTC (permalink / raw)
  To: Bjorn Andersson; +Cc: linux-arm-msm

Hello:

This patch was applied to qcom/linux.git (refs/heads/for-next):

On Tue, 24 Nov 2020 12:57:43 -0600 you 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>
> 
> [...]

Here is the summary with links:
  - Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630"
    https://git.kernel.org/qcom/c/70f16fab5272

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2020-12-29 20:18 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-24 18:57 [PATCH] Revert "i2c: qcom-geni: Disable DMA processing on the Lenovo Yoga C630" Bjorn Andersson
2020-11-24 18:57 ` Bjorn Andersson
2020-11-30  6:20 ` Shawn Guo
2020-11-30  6:20   ` Shawn Guo
2020-11-30 16:19 ` Steev Klimaszewski
2020-11-30 16:19   ` Steev Klimaszewski
2020-12-02  6:30 ` Akash Asthana
2020-12-02  6:30   ` Akash Asthana
2020-12-03 20:15 ` Wolfram Sang
2020-12-03 20:15   ` Wolfram Sang
2020-12-29 20:15 ` patchwork-bot+linux-arm-msm

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.