Skip to contentSkip to conversation

Implement Shutdown callback for i2c

PATCH Superseded Roja Rani Yarubandi 2 participants 7 messages Aug 14, 2020 – Aug 20, 2020

Subsystems (4)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#1 lore raw

PATCH 1/2 i2c: i2c-qcom-geni: Add tx_dma, rx_dma and xfer_len to geni_i2c_dev struct

In reply to Roja Rani Yarubandi

Adding tx_dma, rx_dma and xfer length in geni_i2c_dev struct to store DMA mapping data to enhance its scope. For example during shutdown callback to unmap DMA mapping, these new struct members can be used as part of geni_se_tx_dma_unprep and geni_se_rx_dma_unprep calls.

---
 drivers/i2c/busses/i2c-qcom-geni.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/i2c/busses/i2c-qcom-geni.c +13 -10
index 7f130829bf01..53ca41f76080 100644
@@ -86,6 +86,9 @@ struct geni_i2c_dev {
 	u32 clk_freq_out;
 	const struct geni_i2c_clk_fld *clk_fld;
 	int suspended;
+	dma_addr_t tx_dma;
+	dma_addr_t rx_dma;
+	u32 xfer_len;
 };
 
 struct geni_i2c_err_log {
@@ -352,12 +355,11 @@ static void geni_i2c_tx_fsm_rst(struct geni_i2c_dev *gi2c)
 static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 				u32 m_param)
 {
-	dma_addr_t rx_dma;
 	unsigned long time_left;
 	void *dma_buf = NULL;
 	struct geni_se *se = &gi2c->se;
-	size_t len = msg->len;
 
+	gi2c->xfer_len = msg->len;
 	if (!of_machine_is_compatible("lenovo,yoga-c630"))
 		dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
 
@@ -366,9 +368,10 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 	else
 		geni_se_select_mode(se, GENI_SE_FIFO);
 
-	writel_relaxed(len, se->base + SE_I2C_RX_TRANS_LEN);
+	writel_relaxed(gi2c->xfer_len, se->base + SE_I2C_RX_TRANS_LEN);
 
-	if (dma_buf && geni_se_rx_dma_prep(se, dma_buf, len, &rx_dma)) {
+	if (dma_buf && geni_se_rx_dma_prep(se, dma_buf, gi2c->xfer_len,
+					   &gi2c->rx_dma)) {
 		geni_se_select_mode(se, GENI_SE_FIFO);
 		i2c_put_dma_safe_msg_buf(dma_buf, msg, false);
 		dma_buf = NULL;
@@ -384,7 +387,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 	if (dma_buf) {
 		if (gi2c->err)
 			geni_i2c_rx_fsm_rst(gi2c);
-		geni_se_rx_dma_unprep(se, rx_dma, len);
+		geni_se_rx_dma_unprep(se, gi2c->rx_dma, gi2c->xfer_len);
 		i2c_put_dma_safe_msg_buf(dma_buf, msg, !gi2c->err);
 	}
 
@@ -394,12 +397,11 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 				u32 m_param)
 {
-	dma_addr_t tx_dma;
 	unsigned long time_left;
 	void *dma_buf = NULL;
 	struct geni_se *se = &gi2c->se;
-	size_t len = msg->len;
 
+	gi2c->xfer_len = msg->len;
 	if (!of_machine_is_compatible("lenovo,yoga-c630"))
 		dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
 
@@ -408,9 +410,10 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 	else
 		geni_se_select_mode(se, GENI_SE_FIFO);
 
-	writel_relaxed(len, se->base + SE_I2C_TX_TRANS_LEN);
+	writel_relaxed(gi2c->xfer_len, se->base + SE_I2C_TX_TRANS_LEN);
 
-	if (dma_buf && geni_se_tx_dma_prep(se, dma_buf, len, &tx_dma)) {
+	if (dma_buf && geni_se_tx_dma_prep(se, dma_buf, gi2c->xfer_len,
+					   &gi2c->tx_dma)) {
 		geni_se_select_mode(se, GENI_SE_FIFO);
 		i2c_put_dma_safe_msg_buf(dma_buf, msg, false);
 		dma_buf = NULL;
@@ -429,7 +432,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 	if (dma_buf) {
 		if (gi2c->err)
 			geni_i2c_tx_fsm_rst(gi2c);
-		geni_se_tx_dma_unprep(se, tx_dma, len);
+		geni_se_tx_dma_unprep(se, gi2c->tx_dma, gi2c->xfer_len);
 		i2c_put_dma_safe_msg_buf(dma_buf, msg, !gi2c->err);
 	}
 
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member 
of Code Aurora Forum, hosted by The Linux Foundation
#4 lore raw

PATCH 2/2 i2c: i2c-qcom-geni: Add shutdown callback for i2c

In reply to Roja Rani Yarubandi

If the hardware is still accessing memory after SMMU translation is disabled(as part of smmu shutdown callback), then the IOVAs(I/O virtual address) which it was using will go on the bus as the physical addresses which will result in unknown crashes like NoC/interconnect errors.

So, adding shutdown callback to i2c driver to unmap DMA mappings during system "reboot" or "shutdown".

---
 drivers/i2c/busses/i2c-qcom-geni.c | 36 ++++++++++++++++++++++++++++++
 include/linux/qcom-geni-se.h       |  5 +++++
 2 files changed, 41 insertions(+)
drivers/i2c/busses/i2c-qcom-geni.c +36 -0
index 53ca41f76080..749c225f95c4 100644
@@ -613,6 +613,41 @@ static int geni_i2c_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static void geni_i2c_shutdown(struct platform_device *pdev)
+{
+	int ret;
+	struct geni_i2c_dev *gi2c = platform_get_drvdata(pdev);
+	struct geni_se *se = &gi2c->se;
+	u32 dma;
+	u32 dma_dbg_reg;
+
+	ret = pm_runtime_get_sync(gi2c->se.dev);
+	if (ret < 0) {
+		dev_err(gi2c->se.dev, "Failed to resume device:%d\n", ret);
+		return;
+	}
+
+	dma = readl_relaxed(se->base + SE_GENI_DMA_MODE_EN);
+	if (dma) {
+		dma_dbg_reg = readl_relaxed(gi2c->se.base + SE_DMA_DEBUG_REG0);
+		if (dma_dbg_reg & DMA_TX_ACTIVE) {
+			geni_i2c_abort_xfer(gi2c);
+			gi2c->cur_wr = 0;
+			if (gi2c->err)
+				geni_i2c_tx_fsm_rst(gi2c);
+			geni_se_tx_dma_unprep(se, gi2c->tx_dma, gi2c->xfer_len);
+		}
+		if (dma_dbg_reg & DMA_RX_ACTIVE) {
+			geni_i2c_abort_xfer(gi2c);
+			gi2c->cur_rd = 0;
+			if (gi2c->err)
+				geni_i2c_rx_fsm_rst(gi2c);
+			geni_se_rx_dma_unprep(se, gi2c->rx_dma, gi2c->xfer_len);
+		}
+	}
+	pm_runtime_put_sync_suspend(gi2c->se.dev);
+}
+
 static int __maybe_unused geni_i2c_runtime_suspend(struct device *dev)
 {
 	int ret;
@@ -673,6 +708,7 @@ MODULE_DEVICE_TABLE(of, geni_i2c_dt_match);
 static struct platform_driver geni_i2c_driver = {
 	.probe  = geni_i2c_probe,
 	.remove = geni_i2c_remove,
+	.shutdown = geni_i2c_shutdown,
 	.driver = {
 		.name = "geni_i2c",
 		.pm = &geni_i2c_pm_ops,
include/linux/qcom-geni-se.h +5 -0
index dd464943f717..acad69be747d 100644
@@ -77,6 +77,7 @@ struct geni_se {
 #define SE_DMA_RX_FSM_RST		0xd58
 #define SE_HW_PARAM_0			0xe24
 #define SE_HW_PARAM_1			0xe28
+#define SE_DMA_DEBUG_REG0		0xe40
 
 /* GENI_FORCE_DEFAULT_REG fields */
 #define FORCE_DEFAULT	BIT(0)
@@ -207,6 +208,10 @@ struct geni_se {
 #define RX_GENI_CANCEL_IRQ		BIT(11)
 #define RX_GENI_GP_IRQ_EXT		GENMASK(13, 12)
 
+/* DMA DEBUG Register fields */
+#define DMA_TX_ACTIVE			BIT(0)
+#define DMA_RX_ACTIVE			BIT(1)
+
 /* SE_HW_PARAM_0 fields */
 #define TX_FIFO_WIDTH_MSK		GENMASK(29, 24)
 #define TX_FIFO_WIDTH_SHFT		24
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member 
of Code Aurora Forum, hosted by The Linux Foundation
#0 lore raw

cover Implement Shutdown callback for i2c

Add tx_dma, rx_dma and xfer_len in geni_i2c_dev struct. Implement Shutdown callback for geni i2c driver.

Roja Rani Yarubandi (2):
i2c: i2c-qcom-geni: Add tx_dma, rx_dma and xfer_len to geni_i2c_dev
struct
i2c: i2c-qcom-geni: Add shutdown callback for i2c

 drivers/i2c/busses/i2c-qcom-geni.c | 59 +++++++++++++++++++++++++-----
 include/linux/qcom-geni-se.h       |  5 +++
 2 files changed, 54 insertions(+), 10 deletions(-)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member 
of Code Aurora Forum, hosted by The Linux Foundation
#2 lore raw

Re: [PATCH 1/2] i2c: i2c-qcom-geni: Add tx_dma, rx_dma and xfer_len to geni_i2c_dev struct

In reply to Roja Rani Yarubandi

Quoting Roja Rani Yarubandi (2020-08-14 02:55:39)

Quoted 5 lines

Adding tx_dma, rx_dma and xfer length in geni_i2c_dev struct to store DMA mapping data to enhance its scope. For example during shutdown callback to unmap DMA mapping, these new struct members can be used as part of geni_se_tx_dma_unprep and geni_se_rx_dma_unprep calls.

Please read about how to write commit text from kernel docs[1]. Hint, use imperative mood.

Quoted 11 lines
---
 drivers/i2c/busses/i2c-qcom-geni.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/i2c/busses/i2c-qcom-geni.c +0 -0
index 7f130829bf01..53ca41f76080 100644

drivers/i2c/busses/i2c-qcom-geni.c struct geni_i2c_dev { · line 91

Quoted 6 lines
drivers/i2c/busses/i2c-qcom-geni.c +3 -0
@@ -86,6 +86,9 @@ struct geni_i2c_dev {
        u32 clk_freq_out;
        const struct geni_i2c_clk_fld *clk_fld;
        int suspended;
+       dma_addr_t tx_dma;
+       dma_addr_t rx_dma;
+       u32 xfer_len;

Why not size_t?

Quoted 4 lines
drivers/i2c/busses/i2c-qcom-geni.c +0 -0
 };
 
 struct geni_i2c_err_log {

drivers/i2c/busses/i2c-qcom-geni.c static void geni_i2c_tx_fsm_rst(struct geni_i2c_dev *gi2c) · line 362

Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +1 -2
@@ -352,12 +355,11 @@ static void geni_i2c_tx_fsm_rst(struct geni_i2c_dev *gi2c)
 static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
                                u32 m_param)
 {
-       dma_addr_t rx_dma;
        unsigned long time_left;
        void *dma_buf = NULL;
        struct geni_se *se = &gi2c->se;
-       size_t len = msg->len;
 
+       gi2c->xfer_len = msg->len;

I'd prefer to keep the local variable and then have

	len = gi2c->xfer_len = msg->len;

drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, · line 371

Quoted 9 lines
drivers/i2c/busses/i2c-qcom-geni.c +1 -1
        if (!of_machine_is_compatible("lenovo,yoga-c630"))
                dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
 
@@ -366,9 +368,10 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
        else
                geni_se_select_mode(se, GENI_SE_FIFO);
 
-       writel_relaxed(len, se->base + SE_I2C_RX_TRANS_LEN);
+       writel_relaxed(gi2c->xfer_len, se->base + SE_I2C_RX_TRANS_LEN);

So that all this doesn't have to change.

Quoted 17 lines
drivers/i2c/busses/i2c-qcom-geni.c +3 -2
-       if (dma_buf && geni_se_rx_dma_prep(se, dma_buf, len, &rx_dma)) {
+       if (dma_buf && geni_se_rx_dma_prep(se, dma_buf, gi2c->xfer_len,
+                                          &gi2c->rx_dma)) {
                geni_se_select_mode(se, GENI_SE_FIFO);
                i2c_put_dma_safe_msg_buf(dma_buf, msg, false);
                dma_buf = NULL;
@@ -384,7 +387,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
        if (dma_buf) {
                if (gi2c->err)
                        geni_i2c_rx_fsm_rst(gi2c);
-               geni_se_rx_dma_unprep(se, rx_dma, len);
+               geni_se_rx_dma_unprep(se, gi2c->rx_dma, gi2c->xfer_len);
                i2c_put_dma_safe_msg_buf(dma_buf, msg, !gi2c->err);
        }
 

drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, · line 404

Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +1 -2
@@ -394,12 +397,11 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
 static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,
                                u32 m_param)
 {
-       dma_addr_t tx_dma;
        unsigned long time_left;
        void *dma_buf = NULL;
        struct geni_se *se = &gi2c->se;
-       size_t len = msg->len;
 
+       gi2c->xfer_len = msg->len;

Same comment.

drivers/i2c/busses/i2c-qcom-geni.c static void geni_i2c_tx_fsm_rst(struct geni_i2c_dev *gi2c) · line 365

Quoted 3 lines
drivers/i2c/busses/i2c-qcom-geni.c +0 -0
        if (!of_machine_is_compatible("lenovo,yoga-c630"))
                dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
 

[1] https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-your-changes

#5 lore raw

Re: [PATCH 2/2] i2c: i2c-qcom-geni: Add shutdown callback for i2c

In reply to Roja Rani Yarubandi

Quoting Roja Rani Yarubandi (2020-08-14 02:55:40)

Quoted 2 lines

If the hardware is still accessing memory after SMMU translation is disabled(as part of smmu shutdown callback), then the

Put a space before (

Quoted 1 line

IOVAs(I/O virtual address) which it was using will go on the bus

Put a space before (

Quoted 6 lines

as the physical addresses which will result in unknown crashes like NoC/interconnect errors.

So, adding shutdown callback to i2c driver to unmap DMA mappings during system "reboot" or "shutdown".

Deserves a Fixes: tag if it's fixing a problem, which it looks like it is.

Quoted 4 lines
---
 drivers/i2c/busses/i2c-qcom-geni.c | 36 ++++++++++++++++++++++++++++++
 include/linux/qcom-geni-se.h       |  5 +++++

I'd prefer this is squashed with the previous patch. The first patch doesn't really stand on its own anyway.

Quoted 7 lines
 2 files changed, 41 insertions(+)
drivers/i2c/busses/i2c-qcom-geni.c +0 -0
index 53ca41f76080..749c225f95c4 100644

drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device *pdev) · line 622

Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +7 -0
@@ -613,6 +613,41 @@ static int geni_i2c_remove(struct platform_device *pdev)
        return 0;
 }
 
+static void geni_i2c_shutdown(struct platform_device *pdev)
+{
+       int ret;
+       struct geni_i2c_dev *gi2c = platform_get_drvdata(pdev);
+       struct geni_se *se = &gi2c->se;
+       u32 dma;
+       u32 dma_dbg_reg;

Typically this is just called 'val'.

drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device *pdev) · line 626

Quoted 4 lines
drivers/i2c/busses/i2c-qcom-geni.c +4 -0
+
+       ret = pm_runtime_get_sync(gi2c->se.dev);
+       if (ret < 0) {
+               dev_err(gi2c->se.dev, "Failed to resume device:%d\n", ret);

Maybe just write: "Failed to resume device\n"? Not sure anyone cares what the error code is. And if they did, it would be connected to the colon so it will be hard to read. Add a space after colon if you want to keep the return value please.

Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +10 -0
+               return;
+       }
+
+       dma = readl_relaxed(se->base + SE_GENI_DMA_MODE_EN);
+       if (dma) {
+               dma_dbg_reg = readl_relaxed(gi2c->se.base + SE_DMA_DEBUG_REG0);
+               if (dma_dbg_reg & DMA_TX_ACTIVE) {
+                       geni_i2c_abort_xfer(gi2c);
+                       gi2c->cur_wr = 0;
+                       if (gi2c->err)

drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device *pdev) · line 646

Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +10 -0
+                               geni_i2c_tx_fsm_rst(gi2c);
+                       geni_se_tx_dma_unprep(se, gi2c->tx_dma, gi2c->xfer_len);
+               }
+               if (dma_dbg_reg & DMA_RX_ACTIVE) {
+                       geni_i2c_abort_xfer(gi2c);
+                       gi2c->cur_rd = 0;
+                       if (gi2c->err)
+                               geni_i2c_rx_fsm_rst(gi2c);
+                       geni_se_rx_dma_unprep(se, gi2c->rx_dma, gi2c->xfer_len);
+               }

Can this be a function? It sort of seems like we should be doing the same sort of stuff if we're canceling a DMA transaction in flight.

Quoted 20 lines
drivers/i2c/busses/i2c-qcom-geni.c +4 -0
+       }
+       pm_runtime_put_sync_suspend(gi2c->se.dev);
+}
+
 static int __maybe_unused geni_i2c_runtime_suspend(struct device *dev)
 {
        int ret;
include/linux/qcom-geni-se.h +1 -0
index dd464943f717..acad69be747d 100644
@@ -77,6 +77,7 @@ struct geni_se {
 #define SE_DMA_RX_FSM_RST              0xd58
 #define SE_HW_PARAM_0                  0xe24
 #define SE_HW_PARAM_1                  0xe28
+#define SE_DMA_DEBUG_REG0              0xe40
 
 /* GENI_FORCE_DEFAULT_REG fields */
 #define FORCE_DEFAULT  BIT(0)

include/linux/qcom-geni-se.h struct geni_se { · line 211

Quoted 4 lines
include/linux/qcom-geni-se.h +1 -0
@@ -207,6 +208,10 @@ struct geni_se {
 #define RX_GENI_CANCEL_IRQ             BIT(11)
 #define RX_GENI_GP_IRQ_EXT             GENMASK(13, 12)
 
+/* DMA DEBUG Register fields */

Please follow other style, ie. SE_DMA_DEBUG_REG0 fields

Quoted 6 lines
include/linux/qcom-geni-se.h +3 -0
+#define DMA_TX_ACTIVE                  BIT(0)
+#define DMA_RX_ACTIVE                  BIT(1)
+
 /* SE_HW_PARAM_0 fields */
 #define TX_FIFO_WIDTH_MSK              GENMASK(29, 24)
 #define TX_FIFO_WIDTH_SHFT             24
#3 lore raw

Re: [PATCH 1/2] i2c: i2c-qcom-geni: Add tx_dma, rx_dma and xfer_len to geni_i2c_dev struct

In reply to Stephen Boyd

Hi Stephen,

Thanks for reviewing the patches.

Quoted 10 lines · Stephen Boyd

Quoting Roja Rani Yarubandi (2020-08-14 02:55:39)

Quoted 5 lines

Adding tx_dma, rx_dma and xfer length in geni_i2c_dev struct to store DMA mapping data to enhance its scope. For example during shutdown callback to unmap DMA mapping, these new struct members can be used as part of geni_se_tx_dma_unprep and geni_se_rx_dma_unprep calls.

Please read about how to write commit text from kernel docs[1]. Hint, use imperative mood.

Ok, will update the commit text.

Quoted 6 lines
Quoted 6 lines
---
 drivers/i2c/busses/i2c-qcom-geni.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)
Quoted 14 lines

drivers/i2c/busses/i2c-qcom-geni.c struct geni_i2c_dev { · line 91

Quoted 11 lines
drivers/i2c/busses/i2c-qcom-geni.c +3 -0
index 7f130829bf01..53ca41f76080 100644
@@ -86,6 +86,9 @@ struct geni_i2c_dev {
        u32 clk_freq_out;
        const struct geni_i2c_clk_fld *clk_fld;
        int suspended;
+       dma_addr_t tx_dma;
+       dma_addr_t rx_dma;
+       u32 xfer_len;

Why not size_t?

Will change it to size_t.

Quoted 15 lines
Quoted 15 lines
drivers/i2c/busses/i2c-qcom-geni.c +0 -2
 };
 
 struct geni_i2c_err_log {
@@ -352,12 +355,11 @@ static void geni_i2c_tx_fsm_rst(struct 
 geni_i2c_dev *gi2c)
 static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct 
 i2c_msg *msg,
                                u32 m_param)
 {
-       dma_addr_t rx_dma;
        unsigned long time_left;
        void *dma_buf = NULL;
        struct geni_se *se = &gi2c->se;
-       size_t len = msg->len;
 
Quoted 6 lines

drivers/i2c/busses/i2c-qcom-geni.c static void geni_i2c_tx_fsm_rst(struct · line 364

Quoted 1 line
drivers/i2c/busses/i2c-qcom-geni.c +1 -0
+       gi2c->xfer_len = msg->len;

I'd prefer to keep the local variable and then have

	len = gi2c->xfer_len = msg->len;

Ok, will keep the local variable.

Quoted 46 lines

drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_rx_one_msg(struct · line 373

Quoted 11 lines
drivers/i2c/busses/i2c-qcom-geni.c +0 -0
        if (!of_machine_is_compatible("lenovo,yoga-c630"))
                dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);
drivers/i2c/busses/i2c-qcom-geni.c +1 -1
@@ -366,9 +368,10 @@ static int geni_i2c_rx_one_msg(struct 
 geni_i2c_dev *gi2c, struct i2c_msg *msg,
        else
                geni_se_select_mode(se, GENI_SE_FIFO);
 
-       writel_relaxed(len, se->base + SE_I2C_RX_TRANS_LEN);
+       writel_relaxed(gi2c->xfer_len, se->base + 
 SE_I2C_RX_TRANS_LEN);

So that all this doesn't have to change.

Quoted 32 lines
drivers/i2c/busses/i2c-qcom-geni.c +2 -1
-       if (dma_buf && geni_se_rx_dma_prep(se, dma_buf, len, &rx_dma)) 
 {
+       if (dma_buf && geni_se_rx_dma_prep(se, dma_buf, 
 gi2c->xfer_len,
+                                          &gi2c->rx_dma)) {
                geni_se_select_mode(se, GENI_SE_FIFO);
                i2c_put_dma_safe_msg_buf(dma_buf, msg, false);
                dma_buf = NULL;
drivers/i2c/busses/i2c-qcom-geni.c +1 -1
@@ -384,7 +387,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev 
 *gi2c, struct i2c_msg *msg,
        if (dma_buf) {
                if (gi2c->err)
                        geni_i2c_rx_fsm_rst(gi2c);
-               geni_se_rx_dma_unprep(se, rx_dma, len);
+               geni_se_rx_dma_unprep(se, gi2c->rx_dma, 
 gi2c->xfer_len);
                i2c_put_dma_safe_msg_buf(dma_buf, msg, !gi2c->err);
        }
drivers/i2c/busses/i2c-qcom-geni.c +0 -2
@@ -394,12 +397,11 @@ static int geni_i2c_rx_one_msg(struct 
 geni_i2c_dev *gi2c, struct i2c_msg *msg,
 static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct 
 i2c_msg *msg,
                                u32 m_param)
 {
-       dma_addr_t tx_dma;
        unsigned long time_left;
        void *dma_buf = NULL;
        struct geni_se *se = &gi2c->se;
-       size_t len = msg->len;
 
Quoted 4 lines

drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_rx_one_msg(struct · line 406

Quoted 1 line
drivers/i2c/busses/i2c-qcom-geni.c +1 -0
+       gi2c->xfer_len = msg->len;

Same comment.

Ok.

Quoted 6 lines
Quoted 3 lines
drivers/i2c/busses/i2c-qcom-geni.c +0 -0
        if (!of_machine_is_compatible("lenovo,yoga-c630"))
                dma_buf = i2c_get_dma_safe_msg_buf(msg, 32);

[1]
https://www.kernel.org/doc/html/latest/process/submitting-patches.html#describe-your-changes

Thanks,
Roja

#6 lore raw

Re: [PATCH 2/2] i2c: i2c-qcom-geni: Add shutdown callback for i2c

In reply to Stephen Boyd
Quoted 6 lines · Stephen Boyd

Quoting Roja Rani Yarubandi (2020-08-14 02:55:40)

Quoted 2 lines

If the hardware is still accessing memory after SMMU translation is disabled(as part of smmu shutdown callback), then the

Put a space before (

Ok.

Quoted 7 lines
Quoted 1 line

IOVAs(I/O virtual address) which it was using will go on the bus

Put a space before (

Quoted 3 lines

as the physical addresses which will result in unknown crashes like NoC/interconnect errors.

Quoted 7 lines
Quoted 3 lines

So, adding shutdown callback to i2c driver to unmap DMA mappings during system "reboot" or "shutdown".

Deserves a Fixes: tag if it's fixing a problem, which it looks like it is.

It is not fixing a problem. We are anticipating a problem and implementing Shutdown callback.

Quoted 9 lines
Quoted 5 lines
---
 drivers/i2c/busses/i2c-qcom-geni.c | 36 
++++++++++++++++++++++++++++++
 include/linux/qcom-geni-se.h       |  5 +++++

I'd prefer this is squashed with the previous patch. The first patch doesn't really stand on its own anyway.

Sorry, I did not understand.
First patch can be compiled independently.

Quoted 11 lines
Quoted 11 lines
 2 files changed, 41 insertions(+)
drivers/i2c/busses/i2c-qcom-geni.c +0 -0
index 53ca41f76080..749c225f95c4 100644
@@ -613,6 +613,41 @@ static int geni_i2c_remove(struct platform_device 
 *pdev)
        return 0;
 }
 
Quoted 10 lines

drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device *pdev) · line 622

Quoted 7 lines
drivers/i2c/busses/i2c-qcom-geni.c +7 -0
+static void geni_i2c_shutdown(struct platform_device *pdev)
+{
+       int ret;
+       struct geni_i2c_dev *gi2c = platform_get_drvdata(pdev);
+       struct geni_se *se = &gi2c->se;
+       u32 dma;
+       u32 dma_dbg_reg;

Typically this is just called 'val'.

Ok.

Quoted 11 lines

drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device *pdev)

Quoted 5 lines
drivers/i2c/busses/i2c-qcom-geni.c +4 -0
+
+       ret = pm_runtime_get_sync(gi2c->se.dev);
+       if (ret < 0) {
+               dev_err(gi2c->se.dev, "Failed to resume device:%d\n", 
 ret);

Maybe just write: "Failed to resume device\n"? Not sure anyone cares what the error code is. And if they did, it would be connected to the colon so it will be hard to read. Add a space after colon if you want to keep the return value please.

Ok, will add space after colon.

Quoted 24 lines
Quoted 21 lines
drivers/i2c/busses/i2c-qcom-geni.c +12 -0
+               return;
+       }
+
+       dma = readl_relaxed(se->base + SE_GENI_DMA_MODE_EN);
+       if (dma) {
+               dma_dbg_reg = readl_relaxed(gi2c->se.base + 
 SE_DMA_DEBUG_REG0);
+               if (dma_dbg_reg & DMA_TX_ACTIVE) {
+                       geni_i2c_abort_xfer(gi2c);
+                       gi2c->cur_wr = 0;
+                       if (gi2c->err)
+                               geni_i2c_tx_fsm_rst(gi2c);
+                       geni_se_tx_dma_unprep(se, gi2c->tx_dma, 

gi2c->xfer_len);

drivers/i2c/busses/i2c-qcom-geni.c +7 -0
+               }
+               if (dma_dbg_reg & DMA_RX_ACTIVE) {
+                       geni_i2c_abort_xfer(gi2c);
+                       gi2c->cur_rd = 0;
+                       if (gi2c->err)
+                               geni_i2c_rx_fsm_rst(gi2c);
+                       geni_se_rx_dma_unprep(se, gi2c->rx_dma, 
Quoted 2 lines

gi2c->xfer_len);
+ }

Quoted 3 lines

Can this be a function? It sort of seems like we should be doing the same sort of stuff if we're canceling a DMA transaction in flight.

Ok. Will make the changes.

Quoted 24 lines
Quoted 24 lines
drivers/i2c/busses/i2c-qcom-geni.c +4 -0
+       }
+       pm_runtime_put_sync_suspend(gi2c->se.dev);
+}
+
 static int __maybe_unused geni_i2c_runtime_suspend(struct device 

*dev)

 {
        int ret;
include/linux/qcom-geni-se.h +1 -0
index dd464943f717..acad69be747d 100644
@@ -77,6 +77,7 @@ struct geni_se {
 #define SE_DMA_RX_FSM_RST              0xd58
 #define SE_HW_PARAM_0                  0xe24
 #define SE_HW_PARAM_1                  0xe28
+#define SE_DMA_DEBUG_REG0              0xe40
 
 /* GENI_FORCE_DEFAULT_REG fields */
 #define FORCE_DEFAULT  BIT(0)
@@ -207,6 +208,10 @@ struct geni_se {
 #define RX_GENI_CANCEL_IRQ             BIT(11)
 #define RX_GENI_GP_IRQ_EXT             GENMASK(13, 12)
 
Quoted 4 lines

include/linux/qcom-geni-se.h struct geni_se { · line 211

Quoted 1 line
include/linux/qcom-geni-se.h +1 -0
+/* DMA DEBUG Register fields */

Please follow other style, ie. SE_DMA_DEBUG_REG0 fields

Ok.

Quoted 6 lines
Quoted 6 lines
include/linux/qcom-geni-se.h +3 -0
+#define DMA_TX_ACTIVE                  BIT(0)
+#define DMA_RX_ACTIVE                  BIT(1)
+
 /* SE_HW_PARAM_0 fields */
 #define TX_FIFO_WIDTH_MSK              GENMASK(29, 24)
 #define TX_FIFO_WIDTH_SHFT             24