Implement Shutdown callback for i2c
Subsystems (4)
v2 cover Implement Shutdown callback for i2c
Store DMA mapping data in geni_i2c_dev struct.
Implement Shutdown callback for geni i2c driver.
Changes in V2:
- Changed commit text.
- As per Stephen's comments added separate function for stop transfer.
Roja Rani Yarubandi (2):
i2c: i2c-qcom-geni: Store DMA mapping data in geni_i2c_dev struct
i2c: i2c-qcom-geni: Add shutdown callback for i2c
drivers/i2c/busses/i2c-qcom-geni.c | 50 ++++++++++++++++++++++++++++++ include/linux/qcom-geni-se.h | 5 +++ 2 files changed, 55 insertions(+)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v2 1/2 i2c: i2c-qcom-geni: Store DMA mapping data in geni_i2c_dev struct
Store DMA mapping data in geni_i2c_dev struct to enhance DMA mapping data scope. For example during shutdown callback to unmap DMA mapping, this stored DMA mapping data can be used to call geni_se_tx_dma_unprep and geni_se_rx_dma_unprep functions.
---
Changes in V2:
- As per Stephen's comments, changed commit text, fixed minor nitpicks.
drivers/i2c/busses/i2c-qcom-geni.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/i2c/busses/i2c-qcom-geni.c +7 -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; +size_t xfer_len; };struct geni_i2c_err_log {
@@ -358,6 +361,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,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 );
@@ -384,6 +388,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); + gi2c->rx_dma = rx_dma;geni_se_rx_dma_unprep (se, rx_dma, len);i2c_put_dma_safe_msg_buf (dma_buf, msg, !gi2c->err); }
@@ -400,6 +405,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,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 );
@@ -429,6 +435,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); + gi2c->tx_dma = tx_dma;geni_se_tx_dma_unprep (se, tx_dma, 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
Re: [PATCH V2 1/2] i2c: i2c-qcom-geni: Store DMA mapping data in geni_i2c_dev struct
Quoting Roja Rani Yarubandi (2020-08-20 03:35:21)
Quoted 7 lines
Store DMA mapping data in
geni_i2c_devstruct to enhance DMA mapping data scope. For example during shutdown callback to unmap DMA mapping, this stored DMA mapping data can be used to callgeni_se_tx_dma_unprepandgeni_se_rx_dma_unprepfunctions.Signed-off-by Roja Rani Yarubandi <[email protected]>---
Can this be squashed with the next patch? I don't see how this stands on its own.
Re: [PATCH V2 1/2] i2c: i2c-qcom-geni: Store DMA mapping data in geni_i2c_dev struct
Quoted 11 lines · Stephen Boyd
Quoting Roja Rani Yarubandi (2020-08-20 03:35:21)
Quoted 7 lines
Store DMA mapping data in
geni_i2c_devstruct to enhance DMA mapping data scope. For example during shutdown callback to unmap DMA mapping, this stored DMA mapping data can be used to callgeni_se_tx_dma_unprepandgeni_se_rx_dma_unprepfunctions.Signed-off-by Roja Rani Yarubandi <[email protected]>---
Can this be squashed with the next patch? I don't see how this stands on its own.
Okay.
Re: [PATCH V2 1/2] i2c: i2c-qcom-geni: Store DMA mapping data in geni_i2c_dev struct
In reply to Roja Rani YarubandiHi Roja,
Quoted 28 lines · Roja Rani Yarubandi
Store DMA mapping data in
geni_i2c_devstruct to enhance DMA mapping data scope. For example during shutdown callback to unmap DMA mapping, this stored DMA mapping data can be used to callgeni_se_tx_dma_unprepandgeni_se_rx_dma_unprepfunctions.Signed-off-by Roja Rani Yarubandi <[email protected]>---
Changes in V2:
- As per Stephen's comments, changed commit text, fixed minor nitpicks.drivers/i2c/busses/i2c-qcom-geni.c | 7 +++++++ 1 file changed, 7 insertions(+)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; +size_t xfer_len; };struct geni_i2c_err_log {
drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, · line 364
Quoted 4 lines
drivers/i2c/busses/i2c-qcom-geni.c +1
-0@@ -358,6 +361,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,struct geni_se *se = &gi2c->se;size_t len = msg->len; + gi2c->xfer_len = msg->len;
nit: gi2c->xfer = len, for tx_one_msg as well.
Regards,
Akash
Quoted 27 lines
drivers/i2c/busses/i2c-qcom-geni.c +3
-0if (!of_machine_is_compatible ("lenovo,yoga-c630" )) dma_buf =i2c_get_dma_safe_msg_buf (msg,32 );@@ -384,6 +388,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); + gi2c->rx_dma = rx_dma;geni_se_rx_dma_unprep (se, rx_dma, len);i2c_put_dma_safe_msg_buf (dma_buf, msg, !gi2c->err); }@@ -400,6 +405,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg,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 );@@ -429,6 +435,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); + gi2c->tx_dma = tx_dma;geni_se_tx_dma_unprep (se, tx_dma, len);i2c_put_dma_safe_msg_buf (dma_buf, msg, !gi2c->err); }
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
Re: [PATCH V2 1/2] i2c: i2c-qcom-geni: Store DMA mapping data in geni_i2c_dev struct
Quoted 38 lines · Akash Asthana
Hi Roja,
Quoted 28 lines · Roja Rani Yarubandi
Store DMA mapping data in
geni_i2c_devstruct to enhance DMA mapping data scope. For example during shutdown callback to unmap DMA mapping, this stored DMA mapping data can be used to callgeni_se_tx_dma_unprepandgeni_se_rx_dma_unprepfunctions.Signed-off-by Roja Rani Yarubandi <[email protected]>---
Changes in V2:
- As per Stephen's comments, changed commit text, fixed minor
nitpicks.drivers/i2c/busses/i2c-qcom-geni.c | 7 +++++++ 1 file changed, 7 insertions(+)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; +size_t xfer_len; };struct geni_i2c_err_log {drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_rx_one_msg(struct geni_i2c_dev · line 364
Quoted 4 lines
drivers/i2c/busses/i2c-qcom-geni.c +0
-0@@ -358,6 +361,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, struct geni_se *se = &gi2c->se;size_t len = msg->len; + gi2c->xfer_len = msg->len;nit:
gi2c->xfer= len, fortx_one_msgas well.
Quoted 4 lines
Regards,
Akash
Okay
Quoted 27 lines
Quoted 27 lines
drivers/i2c/busses/i2c-qcom-geni.c +0
-0if (!of_machine_is_compatible ("lenovo,yoga-c630" )) dma_buf =i2c_get_dma_safe_msg_buf (msg,32 ); @@ -384,6 +388,7 @@ static int geni_i2c_rx_one_msg(struct
geni_i2c_dev*gi2c, structi2c_msg*msg,
if (dma_buf) {
if (gi2c->err)
geni_i2c_rx_fsm_rst(gi2c);drivers/i2c/busses/i2c-qcom-geni.c +1
-0+ gi2c->rx_dma = rx_dma;geni_se_rx_dma_unprep (se, rx_dma, len);i2c_put_dma_safe_msg_buf (dma_buf, msg, !gi2c->err); }@@ -400,6 +405,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, 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 ); @@ -429,6 +435,7 @@ static int geni_i2c_tx_one_msg(struct
geni_i2c_dev*gi2c, structi2c_msg*msg,
if (dma_buf) {
if (gi2c->err)
geni_i2c_tx_fsm_rst(gi2c);drivers/i2c/busses/i2c-qcom-geni.c +1
-0+ gi2c->tx_dma = tx_dma;geni_se_tx_dma_unprep (se, tx_dma, len);i2c_put_dma_safe_msg_buf (dma_buf, msg, !gi2c->err); }
Re: [PATCH V2 1/2] i2c: i2c-qcom-geni: Store DMA mapping data in geni_i2c_dev struct
In reply to Akash AsthanaQuoted 38 lines · Akash Asthana
Hi Roja,
Quoted 28 lines · Roja Rani Yarubandi
Store DMA mapping data in
geni_i2c_devstruct to enhance DMA mapping data scope. For example during shutdown callback to unmap DMA mapping, this stored DMA mapping data can be used to callgeni_se_tx_dma_unprepandgeni_se_rx_dma_unprepfunctions.Signed-off-by Roja Rani Yarubandi <[email protected]>---
Changes in V2:
- As per Stephen's comments, changed commit text, fixed minor
nitpicks.drivers/i2c/busses/i2c-qcom-geni.c | 7 +++++++ 1 file changed, 7 insertions(+)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; +size_t xfer_len; };struct geni_i2c_err_log {drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_rx_one_msg(struct geni_i2c_dev · line 364
Quoted 4 lines
drivers/i2c/busses/i2c-qcom-geni.c +0
-0@@ -358,6 +361,7 @@ static int geni_i2c_rx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, struct geni_se *se = &gi2c->se;size_t len = msg->len; + gi2c->xfer_len = msg->len;nit:
gi2c->xfer= len, fortx_one_msgas well.
Quoted 4 lines
Regards,
Akash
Okay
Quoted 19 lines
Quoted 19 lines
drivers/i2c/busses/i2c-qcom-geni.c +0
-0if (!of_machine_is_compatible ("lenovo,yoga-c630" )) dma_buf =i2c_get_dma_safe_msg_buf (msg,32 ); @@ -384,6 +388,7 @@ static int geni_i2c_rx_one_msg(struct
geni_i2c_dev*gi2c, structi2c_msg*msg,
if (dma_buf) {
if (gi2c->err)
geni_i2c_rx_fsm_rst(gi2c);drivers/i2c/busses/i2c-qcom-geni.c +1
-0+ gi2c->rx_dma = rx_dma;geni_se_rx_dma_unprep (se, rx_dma, len);i2c_put_dma_safe_msg_buf (dma_buf, msg, !gi2c->err); }@@ -400,6 +405,7 @@ static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, 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 ); @@ -429,6 +435,7 @@ static int geni_i2c_tx_one_msg(struct
Quoted 8 lines
drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_tx_one_msg(struct geni_i2c_dev *gi2c, struct i2c_msg *msg, · line 441
Quoted 8 lines
geni_i2c_dev*gi2c, structi2c_msg*msg,
if (dma_buf) {
if (gi2c->err)
geni_i2c_tx_fsm_rst(gi2c);drivers/i2c/busses/i2c-qcom-geni.c +1
-0+ gi2c->tx_dma = tx_dma;geni_se_tx_dma_unprep (se, tx_dma, len);i2c_put_dma_safe_msg_buf (dma_buf, msg, !gi2c->err); }
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/2 i2c: i2c-qcom-geni: Add shutdown callback for i2c
In reply to Roja Rani YarubandiIf 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, implement shutdown callback to i2c driver to unmap DMA mappings during system "reboot" or "shutdown".
---
Changes in V2:
- As per Stephen's comments added seperate function for stop transfer, fixed minor nitpicks.
drivers/i2c/busses/i2c-qcom-geni.c | 43 ++++++++++++++++++++++++++++++ include/linux/qcom-geni-se.h | 5 ++++ 2 files changed, 48 insertions(+)
drivers/i2c/busses/i2c-qcom-geni.c +43 -0
@@ -486,6 +486,28 @@ static int geni_i2c_xfer(struct i2c_adapter *adap,return ret; } +static void geni_i2c_stop_xfer (struct geni_i2c_dev *gi2c) +{ +u32 val; +struct geni_se *se = &gi2c->se; + + val =readl_relaxed (gi2c->se.base +SE_DMA_DEBUG_REG0 ); +if (val &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 (val &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); + } +} +static u32 geni_i2c_func (struct i2c_adapter *adap) {return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK );
@@ -617,6 +639,26 @@ static int geni_i2c_remove(struct platform_device *pdev)return 0 ; } +static void geni_i2c_shutdown (struct platform_device *pdev) +{ +int ret; +u32 dma; +struct geni_i2c_dev *gi2c =platform_get_drvdata (pdev); +struct geni_se *se = &gi2c->se; + + 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) +geni_i2c_stop_xfer (gi2c); + +pm_runtime_put_sync_suspend (gi2c->se.dev); +} +static int __maybe_unused geni_i2c_runtime_suspend (struct device *dev) {int ret;
@@ -677,6 +719,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
@@ -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) +/* SE_DMA_DEBUG_REG0 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
Re: [PATCH V2 2/2] i2c: i2c-qcom-geni: Add shutdown callback for i2c
Quoting Roja Rani Yarubandi (2020-08-20 03:35:22)
Quoted 11 lines
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, implement shutdown callback to i2c driver to unmap DMA mappings during system "reboot" or "shutdown".
Signed-off-by Roja Rani Yarubandi <[email protected]>---
I'd still put a Fixes tag because it's fixing the driver when someone runs shutdown.
Quoted 51 lines
Changes in V2:
- As per Stephen's comments added seperate function for stop transfer, fixed minor nitpicks.drivers/i2c/busses/i2c-qcom-geni.c | 43 ++++++++++++++++++++++++++++++ include/linux/qcom-geni-se.h | 5 ++++ 2 files changed, 48 insertions(+)drivers/i2c/busses/i2c-qcom-geni.c +28
-0@@ -486,6 +486,28 @@ static int geni_i2c_xfer(struct i2c_adapter *adap,return ret; } +static void geni_i2c_stop_xfer (struct geni_i2c_dev *gi2c) +{ +u32 val; +struct geni_se *se = &gi2c->se; + + val =readl_relaxed (gi2c->se.base +SE_DMA_DEBUG_REG0 ); +if (val &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 (val &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); + } +} +static u32 geni_i2c_func (struct i2c_adapter *adap) {return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK );@@ -617,6 +639,26 @@ static int geni_i2c_remove(struct platform_device *pdev)return 0 ; } +static void geni_i2c_shutdown (struct platform_device *pdev) +{ +int ret; +u32 dma; +struct geni_i2c_dev *gi2c =platform_get_drvdata (pdev); +struct geni_se *se = &gi2c->se;
drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device *pdev) · line 657
Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +10
-0+ + 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) +geni_i2c_stop_xfer (gi2c);
Any reason the if (dma) check isn't inside geni_i2c_stop_xfer()? Checking for dma and then bailing out early should work and keep the logic in one function. Then the pm_runtime_sync() call could go in there too and if (!dma) goto out. This assumes that we're going to call geni_i2c_stop_xfer() from somewhere else, like if a transfer times out or something?
Quoted 7 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;
Re: [PATCH V2 2/2] i2c: i2c-qcom-geni: Add shutdown callback for i2c
Quoted 7 lines · Stephen Boyd
Quoting Roja Rani Yarubandi (2020-08-20 03:35:22)
Quoted 6 lines
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.
Quoted 9 lines
Quoted 5 lines
So, implement shutdown callback to i2c driver to unmap DMA mappings during system "reboot" or "shutdown".
Signed-off-by Roja Rani Yarubandi <[email protected]>---
I'd still put a Fixes tag because it's fixing the driver when someone runs shutdown.
Okay, will add fixes tag.
Quoted 68 lines
Quoted 68 lines
Changes in V2:
- As per Stephen's comments added seperate function for stop
transfer,
fixed minor nitpicks.drivers/i2c/busses/i2c-qcom-geni.c | 43 ++++++++++++++++++++++++++++++ include/linux/qcom-geni-se.h | 5 ++++ 2 files changed, 48 insertions(+)drivers/i2c/busses/i2c-qcom-geni.c +22
-0@@ -486,6 +486,28 @@ static int geni_i2c_xfer(struct i2c_adapter *adap, return ret; } +static void geni_i2c_stop_xfer (struct geni_i2c_dev *gi2c) +{ +u32 val; +struct geni_se *se = &gi2c->se; + + val =readl_relaxed (gi2c->se.base +SE_DMA_DEBUG_REG0 ); +if (val &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 (val &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); + } +} +static u32
geni_i2c_func(struct i2c_adapter *adap){
returnI2C_FUNC_I2C| (I2C_FUNC_SMBUS_EMUL&
~I2C_FUNC_SMBUS_QUICK);drivers/i2c/busses/i2c-qcom-geni.c +15
-0@@ -617,6 +639,26 @@ static int geni_i2c_remove(struct platform_device *pdev)return 0 ; } +static void geni_i2c_shutdown (struct platform_device *pdev) +{ +int ret; +u32 dma; +struct geni_i2c_dev *gi2c =platform_get_drvdata (pdev); +struct geni_se *se = &gi2c->se; + + 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)
Quoted 9 lines
drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device *pdev) · line 657
Quoted 1 line
drivers/i2c/busses/i2c-qcom-geni.c +1
-0+geni_i2c_stop_xfer (gi2c);Any reason the if (dma) check isn't inside
geni_i2c_stop_xfer()? Checking for dma and then bailing out early should work and keep the logic in one function. Then thepm_runtime_sync()call could go in there too and if (!dma) goto out. This assumes that we're going to callgeni_i2c_stop_xfer()from somewhere else, like if a transfer times out or something?
Okay, will do the changes.
Quoted 8 lines
Quoted 8 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;
Re: [PATCH V2 2/2] i2c: i2c-qcom-geni: Add shutdown callback for i2c
In reply to Roja Rani YarubandiHi Roja,
Quoted 30 lines · 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, implement shutdown callback to i2c driver to unmap DMA mappings during system "reboot" or "shutdown".
Signed-off-by Roja Rani Yarubandi <[email protected]>---
Changes in V2:
- As per Stephen's comments added seperate function for stop transfer, fixed minor nitpicks.drivers/i2c/busses/i2c-qcom-geni.c | 43 ++++++++++++++++++++++++++++++ include/linux/qcom-geni-se.h | 5 ++++ 2 files changed, 48 insertions(+)drivers/i2c/busses/i2c-qcom-geni.c +3
-0@@ -486,6 +486,28 @@ static int geni_i2c_xfer(struct i2c_adapter *adap,return ret; } +static void geni_i2c_stop_xfer (struct geni_i2c_dev *gi2c) +{ +u32 val;
drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_xfer(struct i2c_adapter *adap, · line 501
Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +10
-0+struct geni_se *se = &gi2c->se; + + val =readl_relaxed (gi2c->se.base +SE_DMA_DEBUG_REG0 ); +if (val &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); + }
should be 'else if', because TX and RX can't happen parallel.
Quoted 20 lines
drivers/i2c/busses/i2c-qcom-geni.c +13
-0+if (val &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); + } +} +static u32 geni_i2c_func (struct i2c_adapter *adap) {return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL & ~I2C_FUNC_SMBUS_QUICK );@@ -617,6 +639,26 @@ static int geni_i2c_remove(struct platform_device *pdev)return 0 ; } +static void geni_i2c_shutdown (struct platform_device *pdev) +{ +int ret; +u32 dma;
drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device *pdev) · line 655
Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +10
-0+struct geni_i2c_dev *gi2c =platform_get_drvdata (pdev); +struct geni_se *se = &gi2c->se; + + 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 );
Wrt to current issue context it may be suffice to stop just DMA mode transfers but why not stop all mode of active transfer during shutdown in a generic way.
Regards,
Akash
Quoted 40 lines
drivers/i2c/busses/i2c-qcom-geni.c +7
-0+if (dma) +geni_i2c_stop_xfer (gi2c); + +pm_runtime_put_sync_suspend (gi2c->se.dev); +} +static int __maybe_unused geni_i2c_runtime_suspend (struct device *dev) {int ret;@@ -677,6 +719,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@@ -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) +/* SE_DMA_DEBUG_REG0 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 · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
Re: [PATCH V2 2/2] i2c: i2c-qcom-geni: Add shutdown callback for i2c
Quoted 82 lines · Akash Asthana
Hi Roja,
Quoted 32 lines · 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, implement shutdown callback to i2c driver to unmap DMA mappings during system "reboot" or "shutdown".
Signed-off-by Roja Rani Yarubandi <[email protected]>---
Changes in V2:
- As per Stephen's comments added seperate function for stop
transfer,
fixed minor nitpicks.drivers/i2c/busses/i2c-qcom-geni.c | 43 ++++++++++++++++++++++++++++++ include/linux/qcom-geni-se.h | 5 ++++ 2 files changed, 48 insertions(+)drivers/i2c/busses/i2c-qcom-geni.c +2
-0@@ -486,6 +486,28 @@ static int geni_i2c_xfer(struct i2c_adapter *adap, return ret; } +static void geni_i2c_stop_xfer(struct geni_i2c_dev *gi2c) +{ +u32 val;drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_xfer(struct i2c_adapter · line 501
Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +10
-0+struct geni_se *se = &gi2c->se; + + val =readl_relaxed (gi2c->se.base +SE_DMA_DEBUG_REG0 ); +if (val &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); + }should be 'else if', because TX and RX can't happen parallel.
Quoted 21 lines
drivers/i2c/busses/i2c-qcom-geni.c +9
-0+if (val &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); + } +} +static u32 geni_i2c_func (struct i2c_adapter *adap) { return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL &~I2C_FUNC_SMBUS_QUICK);
drivers/i2c/busses/i2c-qcom-geni.c +3
-0@@ -617,6 +639,26 @@ static int geni_i2c_remove(struct platform_device *pdev)return 0 ; } +static void geni_i2c_shutdown(struct platform_device *pdev) +{ +int ret; +u32 dma;drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device · line 655
Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +10
-0+struct geni_i2c_dev *gi2c =platform_get_drvdata (pdev); +struct geni_se *se = &gi2c->se; + + 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 );Wrt to current issue context it may be suffice to stop just DMA mode transfers but why not stop all mode of active transfer during shutdown in a generic way.
Quoted 4 lines
Regards,
Akash
Okay, I will include FIFO transfer case also in stop_xfer
Quoted 39 lines
Quoted 39 lines
drivers/i2c/busses/i2c-qcom-geni.c +7
-0+if (dma) +geni_i2c_stop_xfer (gi2c); + +pm_runtime_put_sync_suspend (gi2c->se.dev); +} +static int __maybe_unused geni_i2c_runtime_suspend (struct device *dev) {int ret;@@ -677,6 +719,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 +4
-0@@ -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) +/* SE_DMA_DEBUG_REG0 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
Re: [PATCH V2 2/2] i2c: i2c-qcom-geni: Add shutdown callback for i2c
In reply to Akash AsthanaQuoted 82 lines · Akash Asthana
Hi Roja,
Quoted 32 lines · 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, implement shutdown callback to i2c driver to unmap DMA mappings during system "reboot" or "shutdown".
Signed-off-by Roja Rani Yarubandi <[email protected]>---
Changes in V2:
- As per Stephen's comments added seperate function for stop
transfer,
fixed minor nitpicks.drivers/i2c/busses/i2c-qcom-geni.c | 43 ++++++++++++++++++++++++++++++ include/linux/qcom-geni-se.h | 5 ++++ 2 files changed, 48 insertions(+)drivers/i2c/busses/i2c-qcom-geni.c +2
-0@@ -486,6 +486,28 @@ static int geni_i2c_xfer(struct i2c_adapter *adap, return ret; } +static void geni_i2c_stop_xfer(struct geni_i2c_dev *gi2c) +{ +u32 val;drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_xfer(struct i2c_adapter · line 501
Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +10
-0+struct geni_se *se = &gi2c->se; + + val =readl_relaxed (gi2c->se.base +SE_DMA_DEBUG_REG0 ); +if (val &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); + }should be 'else if', because TX and RX can't happen parallel.
Quoted 21 lines
drivers/i2c/busses/i2c-qcom-geni.c +9
-0+if (val &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); + } +} +static u32 geni_i2c_func (struct i2c_adapter *adap) { return I2C_FUNC_I2C | (I2C_FUNC_SMBUS_EMUL &~I2C_FUNC_SMBUS_QUICK);
drivers/i2c/busses/i2c-qcom-geni.c +3
-0@@ -617,6 +639,26 @@ static int geni_i2c_remove(struct platform_device *pdev)return 0 ; } +static void geni_i2c_shutdown(struct platform_device *pdev) +{ +int ret; +u32 dma;drivers/i2c/busses/i2c-qcom-geni.c static int geni_i2c_remove(struct platform_device · line 655
Quoted 10 lines
drivers/i2c/busses/i2c-qcom-geni.c +10
-0+struct geni_i2c_dev *gi2c =platform_get_drvdata (pdev); +struct geni_se *se = &gi2c->se; + + 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 );Wrt to current issue context it may be suffice to stop just DMA mode transfers but why not stop all mode of active transfer during shutdown in a generic way.
Quoted 4 lines
Regards,
Akash
Okay, I will include FIFO transfer case also in stop_xfer
Quoted 31 lines
Quoted 31 lines
drivers/i2c/busses/i2c-qcom-geni.c +7
-0+if (dma) +geni_i2c_stop_xfer (gi2c); + +pm_runtime_put_sync_suspend (gi2c->se.dev); +} +static int __maybe_unused geni_i2c_runtime_suspend (struct device *dev) {int ret;@@ -677,6 +719,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 +1
-0@@ -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)
Quoted 8 lines
include/linux/qcom-geni-se.h struct geni_se { · line 217
Quoted 8 lines
include/linux/qcom-geni-se.h +3
-0#define RX_GENI_GP_IRQ_EXT GENMASK(13, 12) +/* SE_DMA_DEBUG_REG0 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
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel