Improvements for Tegra I2C driver
Dmitry Osipenko
reviewerv6 cover Improvements for Tegra I2C driver
Hello!
This series performs refactoring of the Tegra I2C driver code and hardens the atomic-transfer mode.
Changelog:
v6: - Added new patch that adds missing RPM puts, thanks to Andy Shevchenko
for the suggestion.
- Improved commit messages by extending them with more a more detailed explanation of the changes.
- Added clarifying comment to the "Use reset_control_reset()" change, which was asked by Andy Shevchenko.
- Refactored the "Clean up probe function" patch by moving the dev_err_probe() change into the "Use clk-bulk helpers" patch, which was suggested by Andy Shevchenko.
- Improved ordering of the patches like it was suggested by Andy Shevchenko.
- Added Andy Shevchenko to suggested-by of the "Use clk-bulk helpers" patch.
- Improved "Remove i2c_dev.clk_divisor_non_hs_mode member" patch by making the case-switch to use "fast plus mode" timing if clock rate is out-of-range. Just to make it more consistent.
- The "Improve tegra_i2c_dev structure" patch is squashed into "Improve formatting of variables" and "Clean up types/names" patches.
- All variable-renaming changes are squashed into a single "Clean up variable names" patch.
- Made extra minor improvement to various patches, like more comments and indentations improved.
v5: - Dropped the "Factor out runtime PM and hardware initialization"
patch, like it was suggested by Michał Mirosław. Instead a less invasive "Factor out hardware initialization into separate function" patch added, it doesn't touch the RPM initialization.
- The "Remove outdated barrier()" patch now removes outdated comments.
- Updated commit description of the "Remove "dma" variable" patch, saying that the transfer mode may be changed by a callee. This was suggested by Michał Mirosław.
- Reworked the "Clean up and improve comments" patch. Couple more comments are corrected and reworded now.
- Added r-b's from Michał Mirosław.
- New patches:
i2c: tegra: Mask interrupt in tegra_i2c_issue_bus_clear()
i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear()
i2c: tegra: Don't fall back to PIO mode if DMA configuration fails
i2c: tegra: Clean up variable types
i2c: tegra: Improve tegra_i2c_dev structure
v4: - Reordered patches in the fixes/features/cleanups order like it was
suggested by Andy Shevchenko.
- Now using clk-bulk API, which was suggested by Andy Shevchenko.
- Reworked "Make tegra_i2c_flush_fifos() usable in atomic transfer" patch to use iopoll API, which was suggested by Andy Shevchenko.
- Separated "Clean up probe function" into several smaller patches.
- Squashed "Add missing newline before returns" patch into "Clean up whitespaces, newlines and indentation".
- The "Drop '_timeout' from wait/poll function names" is renamed to "Rename wait/poll functions".
- The "Use reset_control_reset()" is changed to not fail tegra_i2c_init(), but only emit warning. This should be more friendly behaviour in oppose to having a non-bootable machine if reset-control fails.
- New patches:
i2c: tegra: Remove error message used for devm_request_irq() failure
i2c: tegra: Use devm_platform_get_and_ioremap_resource()
i2c: tegra: Use platform_get_irq()
i2c: tegra: Use clk-bulk helpers
i2c: tegra: Remove bogus barrier()
i2c: tegra: Factor out register polling into separate function
i2c: tegra: Consolidate error handling in tegra_i2c_xfer_msg()
i2c: tegra: Clean up and improve comments
i2c: tegra: Rename couple "ret" variables to "err"
v3: - Optimized "Make tegra_i2c_flush_fifos() usable in atomic transfer"
patch by pre-checking FIFO state before starting to poll using ktime API, which may be expensive under some circumstances.
- The "Clean up messages in the code" patch now makes all messages to use proper capitalization of abbreviations. Thanks to Andy Shevchenko and Michał Mirosław for the suggestion.
- The "Remove unnecessary whitespaces and newlines" patch is transformed into "Clean up whitespaces and newlines", it now also adds missing newlines and spaces.
- Reworked the "Clean up probe function" patch in accordance to suggestion from Michał Mirosław by factoring out only parts of the code that make error unwinding cleaner.
- Added r-b from Michał Mirosław.
- Added more patches:
i2c: tegra: Reorder location of functions in the code
i2c: tegra: Factor out packet header setup from tegra_i2c_xfer_msg()
i2c: tegra: Remove "dma" variable
i2c: tegra: Initialization div-clk rate unconditionally
i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member
v2: - Cleaned more messages in the "Clean up messages in the code" patch.
- The error code of reset_control_reset() is checked now.
- Added these new patches to clean up couple more things:
i2c: tegra: Check errors for both positive and negative values
i2c: tegra: Improve coding style of tegra_i2c_wait_for_config_load()
i2c: tegra: Remove unnecessary whitespaces and newlines
i2c: tegra: Rename variable in tegra_i2c_issue_bus_clear()
i2c: tegra: Improve driver module description
Dmitry Osipenko (35):
i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer
i2c: tegra: Add missing runtime PM put
i2c: tegra: Handle potential error of tegra_i2c_flush_fifos()
i2c: tegra: Mask interrupt in tegra_i2c_issue_bus_clear()
i2c: tegra: Initialize div-clk rate unconditionally
i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member
i2c: tegra: Runtime PM always available on Tegra
i2c: tegra: Remove error message used for devm_request_irq() failure
i2c: tegra: Use reset_control_reset()
i2c: tegra: Use devm_platform_get_and_ioremap_resource()
i2c: tegra: Use platform_get_irq()
i2c: tegra: Use clk-bulk helpers
i2c: tegra: Move out all device-tree parsing into tegra_i2c_parse_dt()
i2c: tegra: Clean up probe function
i2c: tegra: Clean up variable types
i2c: tegra: Reorder location of functions in the code
i2c: tegra: Remove likely/unlikely from the code
i2c: tegra: Remove outdated barrier()
i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear()
i2c: tegra: Remove "dma" variable from tegra_i2c_xfer_msg()
i2c: tegra: Don't fall back to PIO mode if DMA configuration fails
i2c: tegra: Improve formatting of variables
i2c: tegra: Improve coding style of tegra_i2c_wait_for_config_load()
i2c: tegra: Rename wait/poll functions
i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg()
i2c: tegra: Factor out packet header setup from tegra_i2c_xfer_msg()
i2c: tegra: Factor out register polling into separate function
i2c: tegra: Factor out hardware initialization into separate function
i2c: tegra: Check errors for both positive and negative values
i2c: tegra: Consolidate error handling in tegra_i2c_xfer_msg()
i2c: tegra: Clean up variable names
i2c: tegra: Clean up printk messages
i2c: tegra: Clean up and improve comments
i2c: tegra: Clean up whitespaces, newlines and indentation
i2c: tegra: Improve driver module description
drivers/i2c/busses/i2c-tegra.c | 1428 ++++++++++++++++---------------- 1 file changed, 698 insertions(+), 730 deletions(-)
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 1/35 i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer
The tegra_i2c_flush_fifos() shouldn't sleep in atomic transfer and jiffies are not updating if interrupts are disabled. Let's switch to use iopoll API helpers for register-polling. The iopoll API provides helpers for both atomic and non-atomic cases.
Note that this patch doesn't fix any known problem because normally FIFO is flushed at the time of starting a new transfer.
--- drivers/i2c/busses/i2c-tegra.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-)
drivers/i2c/busses/i2c-tegra.c +16 -9
@@ -470,9 +470,9 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)static int tegra_i2c_flush_fifos (struct tegra_i2c_dev *i2c_dev) { -unsigned long timeout = jiffies +HZ ; -unsigned int offset; -u32 mask, val; +u32 mask, val, offset, reg_offset; +void __iomem *addr; +int err;if (i2c_dev->hw->has_mst_fifo) { mask = I2C_MST_FIFO_CONTROL_TX_FLUSH |
@@ -488,12 +488,19 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev) val |= mask;i2c_writel (i2c_dev, val, offset); -while (i2c_readl (i2c_dev, offset) & mask) { -if (time_after (jiffies, timeout)) { -dev_warn (i2c_dev->dev,"timeout waiting for fifo flush\n" ); -return -ETIMEDOUT ; - } -usleep_range (1000 ,2000 ); + reg_offset =tegra_i2c_reg_addr (i2c_dev, offset); + addr = i2c_dev->base + reg_offset; + +if (i2c_dev->is_curr_atomic_xfer) + err =readl_relaxed_poll_timeout_atomic (addr, val, !(val & mask), +1000 ,1000000 ); +else + err =readl_relaxed_poll_timeout (addr, val, !(val & mask), +1000 ,1000000 ); + +if (err) { +dev_err (i2c_dev->dev,"failed to flush FIFO\n" ); +return err; }return 0 ; }
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 2/35 i2c: tegra: Add missing runtime PM put
In reply to Dmitry OsipenkoThe pm_runtime_get_sync() always bumps refcount regardless of whether it succeeds or fails. Hence driver is responsible for restoring of the RPM refcounting. This patch adds missing RPM puts which restore refcounting in a case of pm_runtime_get_sync() error.
--- drivers/i2c/busses/i2c-tegra.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-tegra.c +2 -2
@@ -1375,6 +1375,7 @@ static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], ret =pm_runtime_get_sync (i2c_dev->dev);if (ret <0 ) {dev_err (i2c_dev->dev,"runtime resume failed %d\n" , ret); +pm_runtime_put_noidle (i2c_dev->dev);return ret; }
@@ -1786,7 +1787,7 @@ static int tegra_i2c_probe(struct platform_device *pdev) ret =pm_runtime_get_sync (i2c_dev->dev);if (ret <0 ) {dev_err (&pdev->dev,"runtime resume failed\n" ); - goto disable_rpm; + goto put_rpm; } }
@@ -1851,7 +1852,6 @@ static int tegra_i2c_probe(struct platform_device *pdev)else tegra_i2c_runtime_suspend (&pdev->dev); -disable_rpm:if (pm_runtime_enabled (&pdev->dev))pm_runtime_disable (&pdev->dev);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 3/35 i2c: tegra: Handle potential error of tegra_i2c_flush_fifos()
In reply to Dmitry OsipenkoTechnically the tegra_i2c_flush_fifos() may fail and transfer should be aborted in this case, but this shouldn't ever happen in practice unless there is a bug somewhere in the driver. Let's add the error check just for completeness.
--- drivers/i2c/busses/i2c-tegra.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-tegra.c +3 -1
@@ -1177,7 +1177,9 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,bool dma;u16 xfer_time =100 ; -tegra_i2c_flush_fifos (i2c_dev); + err =tegra_i2c_flush_fifos (i2c_dev); +if (err) +return err; i2c_dev->msg_buf = msg->buf; i2c_dev->msg_buf_remaining = msg->len;
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 4/35 i2c: tegra: Mask interrupt in tegra_i2c_issue_bus_clear()
In reply to Dmitry OsipenkoThe tegra_i2c_issue_bus_clear() may fail and in this case BUS_CLR_DONE stays unmasked. Hence let's mask it for consistency. This patch doesn't fix any known problems.
--- drivers/i2c/busses/i2c-tegra.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/i2c/busses/i2c-tegra.c +2 -0
@@ -1149,6 +1149,8 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap) time_left =tegra_i2c_wait_completion_timeout ( i2c_dev, &i2c_dev->msg_complete,50 ); +tegra_i2c_mask_irq (i2c_dev,I2C_INT_BUS_CLR_DONE ); +if (time_left ==0 ) {dev_err (i2c_dev->dev,"timed out for bus clear\n" );return -ETIMEDOUT ;
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 5/35 i2c: tegra: Initialize div-clk rate unconditionally
In reply to Dmitry OsipenkoIt doesn't make sense to conditionalize the div-clk rate changes because rate is fixed and it won't ever change once it's set at the driver's probe time. All further changes are NO-OPs because CCF caches rate and skips rate-change if rate is unchanged.
--- drivers/i2c/busses/i2c-tegra.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)
drivers/i2c/busses/i2c-tegra.c +16 -18
@@ -293,7 +293,7 @@ struct tegra_i2c_dev {bool is_curr_atomic_xfer; }; -static int tegra_i2c_init (struct tegra_i2c_dev *i2c_dev,bool clk_reinit); +static int tegra_i2c_init (struct tegra_i2c_dev *i2c_dev);static void dvc_writel (struct tegra_i2c_dev *i2c_dev,u32 val,unsigned long reg)
@@ -691,7 +691,7 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)* domain ON. */ if (i2c_dev->is_vi) { - ret =tegra_i2c_init (i2c_dev, true); + ret =tegra_i2c_init (i2c_dev);if (ret) goto disable_div_clk; }
@@ -778,7 +778,7 @@ static void tegra_i2c_vi_init(struct tegra_i2c_dev *i2c_dev)i2c_writel (i2c_dev,0x0 ,I2C_TLOW_SEXT ); } -static int tegra_i2c_init (struct tegra_i2c_dev *i2c_dev,bool clk_reinit) +static int tegra_i2c_init (struct tegra_i2c_dev *i2c_dev) {u32 val;int err;
@@ -836,16 +836,14 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev, bool clk_reinit)if (i2c_dev->hw->has_interface_timing_reg && tsu_thd)i2c_writel (i2c_dev, tsu_thd,I2C_INTERFACE_TIMING_1 ); -if (!clk_reinit) { - clk_multiplier = (tlow + thigh +2 ); - clk_multiplier *= (i2c_dev->clk_divisor_non_hs_mode +1 ); - err =clk_set_rate (i2c_dev->div_clk, - i2c_dev->bus_clk_rate * clk_multiplier); -if (err) { -dev_err (i2c_dev->dev, -"failed changing clock rate: %d\n" , err); -return err; - } + clk_multiplier = tlow + thigh +2 ; + clk_multiplier *= i2c_dev->clk_divisor_non_hs_mode +1 ; + + err =clk_set_rate (i2c_dev->div_clk, + i2c_dev->bus_clk_rate * clk_multiplier); +if (err) { +dev_err (i2c_dev->dev,"failed to set div-clk rate: %d\n" , err); +return err; }if (!i2c_dev->is_dvc && !i2c_dev->is_vi) {
@@ -1319,7 +1317,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (!time_left && !completion_done (&i2c_dev->dma_complete)) {dev_err (i2c_dev->dev,"DMA transfer timeout\n" ); -tegra_i2c_init (i2c_dev, true); +tegra_i2c_init (i2c_dev);return -ETIMEDOUT ; }
@@ -1340,7 +1338,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (time_left ==0 ) {dev_err (i2c_dev->dev,"i2c transfer timed out\n" ); -tegra_i2c_init (i2c_dev, true); +tegra_i2c_init (i2c_dev);return -ETIMEDOUT ; }
@@ -1352,7 +1350,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (likely (i2c_dev->msg_err ==I2C_ERR_NONE ))return 0 ; -tegra_i2c_init (i2c_dev, true); +tegra_i2c_init (i2c_dev);/* start recovery upon arbitration loss in single master mode */ if (i2c_dev->msg_err ==I2C_ERR_ARBITRATION_LOST ) {if (!i2c_dev->is_multimaster_mode)
@@ -1811,7 +1809,7 @@ static int tegra_i2c_probe(struct platform_device *pdev)if (ret <0 ) goto disable_div_clk; - ret =tegra_i2c_init (i2c_dev, false); + ret =tegra_i2c_init (i2c_dev);if (ret) {dev_err (&pdev->dev,"Failed to initialize i2c controller\n" ); goto release_dma;
@@ -1918,7 +1916,7 @@ static int __maybe_unused tegra_i2c_resume(struct device *dev)if (err)return err; - err =tegra_i2c_init (i2c_dev, false); + err =tegra_i2c_init (i2c_dev);if (err)return err;
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 6/35 i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member
In reply to Dmitry OsipenkoThe "non_hs_mode" divisor value is fixed, thus there is no need to have the variable i2c_dev.clk_divisor_non_hs_mode struct member. Let's remove it and move the mode selection into tegra_i2c_init() where it can be united with the timing selection.
--- drivers/i2c/busses/i2c-tegra.c | 46 ++++++++++++++++------------------ 1 file changed, 21 insertions(+), 25 deletions(-)
drivers/i2c/busses/i2c-tegra.c +21 -25
@@ -250,7 +250,6 @@ struct tegra_i2c_hw_feature {* @msg_buf_remaining: size of unsent data in the message buffer * @msg_read: identifies read transfers * @bus_clk_rate: current I2C bus clock rate -* @clk_divisor_non_hs_mode: clock divider for non-high-speed modes * @is_multimaster_mode: track if I2C controller is in multi-master mode * @tx_dma_chan: DMA transmit channel * @rx_dma_chan: DMA receive channel
@@ -281,7 +280,6 @@ struct tegra_i2c_dev {size_t msg_buf_remaining;int msg_read;u32 bus_clk_rate; -u16 clk_divisor_non_hs_mode;bool is_multimaster_mode;struct dma_chan *tx_dma_chan;struct dma_chan *rx_dma_chan;
@@ -783,6 +781,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)u32 val;int err;u32 clk_divisor, clk_multiplier; +u32 non_hs_mode;u32 tsu_thd;u8 tlow, thigh;
@@ -805,24 +804,33 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)if (i2c_dev->is_vi)tegra_i2c_vi_init (i2c_dev); -/* Make sure clock divisor programmed correctly */ - clk_divisor =FIELD_PREP (I2C_CLK_DIVISOR_HSMODE , - i2c_dev->hw->clk_divisor_hs_mode) | -FIELD_PREP (I2C_CLK_DIVISOR_STD_FAST_MODE , - i2c_dev->clk_divisor_non_hs_mode); -i2c_writel (i2c_dev, clk_divisor,I2C_CLK_DIVISOR ); - -if (i2c_dev->bus_clk_rate >I2C_MAX_STANDARD_MODE_FREQ && - i2c_dev->bus_clk_rate <=I2C_MAX_FAST_MODE_PLUS_FREQ ) { +switch (i2c_dev->bus_clk_rate) { + case I2C_MAX_STANDARD_MODE_FREQ + 1 ... I2C_MAX_FAST_MODE_PLUS_FREQ: +default : tlow = i2c_dev->hw->tlow_fast_fastplus_mode; thigh = i2c_dev->hw->thigh_fast_fastplus_mode; tsu_thd = i2c_dev->hw->setup_hold_time_fast_fast_plus_mode; - }else { + +if (i2c_dev->bus_clk_rate >I2C_MAX_FAST_MODE_FREQ ) + non_hs_mode = i2c_dev->hw->clk_divisor_fast_plus_mode; +else + non_hs_mode = i2c_dev->hw->clk_divisor_fast_mode; +break ; + + case 0 ... I2C_MAX_STANDARD_MODE_FREQ: tlow = i2c_dev->hw->tlow_std_mode; thigh = i2c_dev->hw->thigh_std_mode; tsu_thd = i2c_dev->hw->setup_hold_time_std_mode; + non_hs_mode = i2c_dev->hw->clk_divisor_std_mode; +break ; } +/* Make sure clock divisor programmed correctly */ + clk_divisor =FIELD_PREP (I2C_CLK_DIVISOR_HSMODE , + i2c_dev->hw->clk_divisor_hs_mode) | +FIELD_PREP (I2C_CLK_DIVISOR_STD_FAST_MODE , non_hs_mode); +i2c_writel (i2c_dev, clk_divisor,I2C_CLK_DIVISOR ); +if (i2c_dev->hw->has_interface_timing_reg) { val =FIELD_PREP (I2C_INTERFACE_TIMING_THIGH , thigh) |FIELD_PREP (I2C_INTERFACE_TIMING_TLOW , tlow);
@@ -837,7 +845,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)i2c_writel (i2c_dev, tsu_thd,I2C_INTERFACE_TIMING_1 ); clk_multiplier = tlow + thigh +2 ; - clk_multiplier *= i2c_dev->clk_divisor_non_hs_mode +1 ; + clk_multiplier *= non_hs_mode +1 ; err =clk_set_rate (i2c_dev->div_clk, i2c_dev->bus_clk_rate * clk_multiplier);
@@ -1751,18 +1759,6 @@ static int tegra_i2c_probe(struct platform_device *pdev) goto unprepare_fast_clk; } -if (i2c_dev->bus_clk_rate >I2C_MAX_FAST_MODE_FREQ && - i2c_dev->bus_clk_rate <=I2C_MAX_FAST_MODE_PLUS_FREQ ) - i2c_dev->clk_divisor_non_hs_mode = - i2c_dev->hw->clk_divisor_fast_plus_mode; -else if (i2c_dev->bus_clk_rate >I2C_MAX_STANDARD_MODE_FREQ && - i2c_dev->bus_clk_rate <=I2C_MAX_FAST_MODE_FREQ ) - i2c_dev->clk_divisor_non_hs_mode = - i2c_dev->hw->clk_divisor_fast_mode; -else - i2c_dev->clk_divisor_non_hs_mode = - i2c_dev->hw->clk_divisor_std_mode; - ret =clk_prepare (i2c_dev->div_clk);if (ret <0 ) {dev_err (i2c_dev->dev,"Clock prepare failed %d\n" , ret);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 7/35 i2c: tegra: Runtime PM always available on Tegra
In reply to Dmitry OsipenkoThe runtime PM is guaranteed to be always available on Tegra after commit 40b2bb1b132a ("ARM: tegra: enforce PM requirement"). Hence let's remove all the RPM-availability checking and handling from the code.
--- drivers/i2c/busses/i2c-tegra.c | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-)
drivers/i2c/busses/i2c-tegra.c +6 -23
@@ -1775,18 +1775,10 @@ static int tegra_i2c_probe(struct platform_device *pdev)if (!i2c_dev->is_vi)pm_runtime_irq_safe (&pdev->dev);pm_runtime_enable (&pdev->dev); -if (!pm_runtime_enabled (&pdev->dev)) { - ret =tegra_i2c_runtime_resume (&pdev->dev); -if (ret <0 ) { -dev_err (&pdev->dev,"runtime resume failed\n" ); - goto unprepare_div_clk; - } - }else { - ret =pm_runtime_get_sync (i2c_dev->dev); -if (ret <0 ) { -dev_err (&pdev->dev,"runtime resume failed\n" ); - goto put_rpm; - } + ret =pm_runtime_get_sync (i2c_dev->dev); +if (ret <0 ) { +dev_err (dev,"runtime resume failed\n" ); + goto put_rpm; }if (i2c_dev->is_multimaster_mode) {
@@ -1845,15 +1837,8 @@ static int tegra_i2c_probe(struct platform_device *pdev)clk_disable (i2c_dev->div_clk); put_rpm: -if (pm_runtime_enabled (&pdev->dev)) -pm_runtime_put_sync (&pdev->dev); -else -tegra_i2c_runtime_suspend (&pdev->dev); - -if (pm_runtime_enabled (&pdev->dev)) -pm_runtime_disable (&pdev->dev); - -unprepare_div_clk: +pm_runtime_put_sync (&pdev->dev); +pm_runtime_disable (&pdev->dev);clk_unprepare (i2c_dev->div_clk); unprepare_slow_clk:
@@ -1875,8 +1860,6 @@ static int tegra_i2c_remove(struct platform_device *pdev)clk_disable (i2c_dev->div_clk);pm_runtime_disable (&pdev->dev); -if (!pm_runtime_status_suspended (&pdev->dev)) -tegra_i2c_runtime_suspend (&pdev->dev);clk_unprepare (i2c_dev->div_clk);clk_unprepare (i2c_dev->slow_clk);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 8/35 i2c: tegra: Remove error message used for devm_request_irq() failure
In reply to Dmitry OsipenkoThe error message prints number of vIRQ, which isn't a useful information. In practice devm_request_irq() never fails, hence let's remove the bogus message in order to make code cleaner.
--- drivers/i2c/busses/i2c-tegra.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/i2c/busses/i2c-tegra.c +1 -3
@@ -1807,10 +1807,8 @@ static int tegra_i2c_probe(struct platform_device *pdev) ret =devm_request_irq (&pdev->dev, i2c_dev->irq, tegra_i2c_isr,IRQF_NO_SUSPEND ,dev_name (&pdev->dev), i2c_dev); -if (ret) { -dev_err (&pdev->dev,"Failed to request irq %i\n" , i2c_dev->irq); +if (ret) goto release_dma; - }i2c_set_adapdata (&i2c_dev->adapter, i2c_dev); i2c_dev->adapter.owner =THIS_MODULE ;
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 9/35 i2c: tegra: Use reset_control_reset()
In reply to Dmitry OsipenkoUse a single reset_control_reset() instead of assert/deasset couple in order to make code cleaner a tad. Note that the reset_control_reset() uses 1 microsecond delay instead of 2 that was used previously, but this shouldn't matter because one microsecond is a default reset time for most of Tegra peripherals and TRM doesn't mention anything special in regards to I2C controller's reset propagation time.
In addition don't ignore potential error of the reset control by emitting a noisy warning if it fails, which will indicate an existence of a severe problem, while still allow machine to boot up.
--- drivers/i2c/busses/i2c-tegra.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-tegra.c +10 -3
@@ -785,9 +785,16 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)u32 tsu_thd;u8 tlow, thigh; -reset_control_assert (i2c_dev->rst); -udelay (2 ); -reset_control_deassert (i2c_dev->rst); +/* +* The reset shouldn't ever fail in practice. The failure will be a +* sign of a severe problem that needs to be resolved. Still we don't +* want to fail the initialization completely because this may break +* kernel boot up since voltage regulators use I2C. Hence, we will +* emit a noisy warning on error, which won't stay unnoticed and +* won't hose machine entirely. +*/ + err =reset_control_reset (i2c_dev->rst); +WARN_ON_ONCE (err);if (i2c_dev->is_dvc)tegra_dvc_init (i2c_dev);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 10/35 i2c: tegra: Use devm_platform_get_and_ioremap_resource()
In reply to Dmitry OsipenkoDriver now uses devm_platform_get_and_ioremap_resource() which replaces the typical boilerplate code and makes code cleaner.
--- drivers/i2c/busses/i2c-tegra.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-tegra.c +3 -3
@@ -1678,12 +1678,12 @@ static int tegra_i2c_probe(struct platform_device *pdev)int irq;int ret; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); - base_phys = res->start; - base =devm_ioremap_resource (&pdev->dev, res); + base =devm_platform_get_and_ioremap_resource (pdev,0 , &res);if (IS_ERR (base))return PTR_ERR (base); + base_phys = res->start; + res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 );if (!res) {dev_err (&pdev->dev,"no irq resource\n" );
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 11/35 i2c: tegra: Use platform_get_irq()
In reply to Dmitry OsipenkoUse common helper for retrieval of the interrupt number in order to make code cleaner. Note that platform_get_irq() prints error message by itself.
--- drivers/i2c/busses/i2c-tegra.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/i2c/busses/i2c-tegra.c +3 -6
@@ -1684,12 +1684,9 @@ static int tegra_i2c_probe(struct platform_device *pdev) base_phys = res->start; - res =platform_get_resource (pdev,IORESOURCE_IRQ ,0 ); -if (!res) { -dev_err (&pdev->dev,"no irq resource\n" ); -return -EINVAL ; - } - irq = res->start; + irq =platform_get_irq (pdev,0 ); +if (irq <0 ) +return irq; div_clk =devm_clk_get (&pdev->dev,"div-clk" );if (IS_ERR (div_clk)) {
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 12/35 i2c: tegra: Use clk-bulk helpers
In reply to Dmitry OsipenkoUse clk-bulk helpers and factor out clocks initialization into separate function in order to make code cleaner.
The clocks initialization now performed after reset-control initialization in order to avoid a noisy -PROBE_DEFER errors on T186+ from the clk-bulk helper which doesn't silence this error code. Hence reset_control_get() now may return -EPROBE_DEFER on newer Tegra SoCs because they use BPMP driver that provides reset controls and BPMP doesn't come up early during boot. Previously rst was protected by the clocks retrieval and now this patch makes dev_err_probe() to be used for the rst error handling.
--- drivers/i2c/busses/i2c-tegra.c | 187 ++++++++++++--------------------- 1 file changed, 67 insertions(+), 120 deletions(-)
drivers/i2c/busses/i2c-tegra.c +67 -120
@@ -165,9 +165,6 @@ enum msg_end_type {* @has_continue_xfer_support: Continue transfer supports. * @has_per_pkt_xfer_complete_irq: Has enable/disable capability for transfer * complete interrupt per packet basis. -* @has_single_clk_source: The I2C controller has single clock source. Tegra30 -* and earlier SoCs have two clock sources i.e. div-clk and -* fast-clk. * @has_config_load_reg: Has the config load register to load the new * configuration. * @clk_divisor_hs_mode: Clock divisor in HS mode.
@@ -208,7 +205,6 @@ enum msg_end_type {struct tegra_i2c_hw_feature {bool has_continue_xfer_support;bool has_per_pkt_xfer_complete_irq; -bool has_single_clk_source;bool has_config_load_reg;int clk_divisor_hs_mode;int clk_divisor_std_mode;
@@ -236,7 +232,8 @@ struct tegra_i2c_hw_feature {* @hw: Tegra I2C HW feature * @adapter: core I2C layer adapter information * @div_clk: clock reference for div clock of I2C controller -* @fast_clk: clock reference for fast clock of I2C controller +* @clocks: array of I2C controller clocks +* @nclocks: number of clocks in the array * @rst: reset control for the I2C controller * @base: ioremapped registers cookie * @base_phys: physical base address of the I2C controller
@@ -265,8 +262,8 @@ struct tegra_i2c_dev {const struct tegra_i2c_hw_feature *hw;struct i2c_adapter adapter;struct clk *div_clk; -struct clk *fast_clk; -struct clk *slow_clk; +struct clk_bulk_data *clocks; +unsigned int nclocks;struct reset_control *rst;void __iomem *base;phys_addr_t base_phys;
@@ -662,25 +659,9 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)if (ret)return ret; - ret =clk_enable (i2c_dev->fast_clk); -if (ret <0 ) { -dev_err (i2c_dev->dev, -"Enabling fast clk failed, err %d\n" , ret); + ret =clk_bulk_enable (i2c_dev->nclocks, i2c_dev->clocks); +if (ret)return ret; - } - - ret =clk_enable (i2c_dev->slow_clk); -if (ret <0 ) { -dev_err (dev,"failed to enable slow clock: %d\n" , ret); - goto disable_fast_clk; - } - - ret =clk_enable (i2c_dev->div_clk); -if (ret <0 ) { -dev_err (i2c_dev->dev, -"Enabling div clk failed, err %d\n" , ret); - goto disable_slow_clk; - }/* * VI I2C device is attached to VE power domain which goes through
@@ -691,17 +672,14 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)if (i2c_dev->is_vi) { ret =tegra_i2c_init (i2c_dev);if (ret) - goto disable_div_clk; + goto disable_clocks; }return 0 ; -disable_div_clk: -clk_disable (i2c_dev->div_clk); -disable_slow_clk: -clk_disable (i2c_dev->slow_clk); -disable_fast_clk: -clk_disable (i2c_dev->fast_clk); +disable_clocks: +clk_bulk_disable (i2c_dev->nclocks, i2c_dev->clocks); +return ret; }
@@ -709,9 +687,7 @@ static int __maybe_unused tegra_i2c_runtime_suspend(struct device *dev) {struct tegra_i2c_dev *i2c_dev =dev_get_drvdata (dev); -clk_disable (i2c_dev->div_clk); -clk_disable (i2c_dev->slow_clk); -clk_disable (i2c_dev->fast_clk); +clk_bulk_disable (i2c_dev->nclocks, i2c_dev->clocks);return pinctrl_pm_select_idle_state (i2c_dev->dev); }
@@ -1479,7 +1455,6 @@ static struct i2c_bus_recovery_info tegra_i2c_recovery_info = {static const struct tegra_i2c_hw_feature tegra20_i2c_hw = { .has_continue_xfer_support = false, .has_per_pkt_xfer_complete_irq = false, - .has_single_clk_source = false, .clk_divisor_hs_mode =3 , .clk_divisor_std_mode =0 , .clk_divisor_fast_mode =0 ,
@@ -1504,7 +1479,6 @@ static const struct tegra_i2c_hw_feature tegra20_i2c_hw = {static const struct tegra_i2c_hw_feature tegra30_i2c_hw = { .has_continue_xfer_support = true, .has_per_pkt_xfer_complete_irq = false, - .has_single_clk_source = false, .clk_divisor_hs_mode =3 , .clk_divisor_std_mode =0 , .clk_divisor_fast_mode =0 ,
@@ -1529,7 +1503,6 @@ static const struct tegra_i2c_hw_feature tegra30_i2c_hw = {static const struct tegra_i2c_hw_feature tegra114_i2c_hw = { .has_continue_xfer_support = true, .has_per_pkt_xfer_complete_irq = true, - .has_single_clk_source = true, .clk_divisor_hs_mode =1 , .clk_divisor_std_mode =0x19 , .clk_divisor_fast_mode =0x19 ,
@@ -1554,7 +1527,6 @@ static const struct tegra_i2c_hw_feature tegra114_i2c_hw = {static const struct tegra_i2c_hw_feature tegra124_i2c_hw = { .has_continue_xfer_support = true, .has_per_pkt_xfer_complete_irq = true, - .has_single_clk_source = true, .clk_divisor_hs_mode =1 , .clk_divisor_std_mode =0x19 , .clk_divisor_fast_mode =0x19 ,
@@ -1579,7 +1551,6 @@ static const struct tegra_i2c_hw_feature tegra124_i2c_hw = {static const struct tegra_i2c_hw_feature tegra210_i2c_hw = { .has_continue_xfer_support = true, .has_per_pkt_xfer_complete_irq = true, - .has_single_clk_source = true, .clk_divisor_hs_mode =1 , .clk_divisor_std_mode =0x19 , .clk_divisor_fast_mode =0x19 ,
@@ -1604,7 +1575,6 @@ static const struct tegra_i2c_hw_feature tegra210_i2c_hw = {static const struct tegra_i2c_hw_feature tegra186_i2c_hw = { .has_continue_xfer_support = true, .has_per_pkt_xfer_complete_irq = true, - .has_single_clk_source = true, .clk_divisor_hs_mode =1 , .clk_divisor_std_mode =0x16 , .clk_divisor_fast_mode =0x19 ,
@@ -1629,7 +1599,6 @@ static const struct tegra_i2c_hw_feature tegra186_i2c_hw = {static const struct tegra_i2c_hw_feature tegra194_i2c_hw = { .has_continue_xfer_support = true, .has_per_pkt_xfer_complete_irq = true, - .has_single_clk_source = true, .clk_divisor_hs_mode =1 , .clk_divisor_std_mode =0x4f , .clk_divisor_fast_mode =0x3c ,
@@ -1666,13 +1635,58 @@ static const struct of_device_id tegra_i2c_of_match[] = { };MODULE_DEVICE_TABLE (of, tegra_i2c_of_match); +static int tegra_i2c_init_clocks (struct tegra_i2c_dev *i2c_dev) +{ +unsigned int i; +int err; + + err =devm_clk_bulk_get_all (i2c_dev->dev, &i2c_dev->clocks); +if (err <0 ) +return err; + + i2c_dev->nclocks = err; + + err =clk_bulk_prepare (i2c_dev->nclocks, i2c_dev->clocks); +if (err) +return err; + +for (i =0 ; i < i2c_dev->nclocks; i++) { +if (!strcmp (i2c_dev->clocks[i].id,"div-clk" )) { + i2c_dev->div_clk = i2c_dev->clocks[i].clk; +break ; + } + } + +if (!i2c_dev->is_multimaster_mode) +return 0 ; + + err =clk_enable (i2c_dev->div_clk); +if (err) { +dev_err (i2c_dev->dev,"failed to enable div-clk: %d\n" , err); + goto unprepare_clocks; + } + +return 0 ; + +unprepare_clocks: +clk_bulk_unprepare (i2c_dev->nclocks, i2c_dev->clocks); + +return err; +} + +static void tegra_i2c_release_clocks (struct tegra_i2c_dev *i2c_dev) +{ +if (i2c_dev->is_multimaster_mode) +clk_disable (i2c_dev->div_clk); + +clk_bulk_unprepare (i2c_dev->nclocks, i2c_dev->clocks); +} +static int tegra_i2c_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;struct tegra_i2c_dev *i2c_dev;struct resource *res; -struct clk *div_clk; -struct clk *fast_clk;void __iomem *base;phys_addr_t base_phys;int irq;
@@ -1688,21 +1702,12 @@ static int tegra_i2c_probe(struct platform_device *pdev)if (irq <0 )return irq; - div_clk =devm_clk_get (&pdev->dev,"div-clk" ); -if (IS_ERR (div_clk)) { -if (PTR_ERR (div_clk) != -EPROBE_DEFER ) -dev_err (&pdev->dev,"missing controller clock\n" ); - -return PTR_ERR (div_clk); - } - i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL );if (!i2c_dev)return -ENOMEM ; i2c_dev->base = base; i2c_dev->base_phys = base_phys; - i2c_dev->div_clk = div_clk; i2c_dev->adapter.algo = &tegra_i2c_algo; i2c_dev->adapter.retries =1 ; i2c_dev->adapter.timeout =6 *HZ ;
@@ -1712,12 +1717,17 @@ static int tegra_i2c_probe(struct platform_device *pdev) i2c_dev->rst =devm_reset_control_get_exclusive (&pdev->dev,"i2c" );if (IS_ERR (i2c_dev->rst)) { -dev_err (&pdev->dev,"missing controller reset\n" ); +dev_err_probe (i2c_dev->dev,PTR_ERR (i2c_dev->rst), +"failed to get reset control\n" );return PTR_ERR (i2c_dev->rst); }tegra_i2c_parse_dt (i2c_dev); + ret =tegra_i2c_init_clocks (i2c_dev); +if (ret) +return ret; + i2c_dev->hw =of_device_get_match_data (&pdev->dev); i2c_dev->is_dvc =of_device_is_compatible (pdev->dev.of_node,"nvidia,tegra20-i2c-dvc" );
@@ -1729,46 +1739,8 @@ static int tegra_i2c_probe(struct platform_device *pdev)init_completion (&i2c_dev->msg_complete);init_completion (&i2c_dev->dma_complete); -if (!i2c_dev->hw->has_single_clk_source) { - fast_clk =devm_clk_get (&pdev->dev,"fast-clk" ); -if (IS_ERR (fast_clk)) { -dev_err (&pdev->dev,"missing fast clock\n" ); -return PTR_ERR (fast_clk); - } - i2c_dev->fast_clk = fast_clk; - } - -if (i2c_dev->is_vi) { - i2c_dev->slow_clk =devm_clk_get (dev,"slow" ); -if (IS_ERR (i2c_dev->slow_clk)) { -if (PTR_ERR (i2c_dev->slow_clk) != -EPROBE_DEFER ) -dev_err (dev,"failed to get slow clock: %ld\n" , -PTR_ERR (i2c_dev->slow_clk)); - -return PTR_ERR (i2c_dev->slow_clk); - } - } -platform_set_drvdata (pdev, i2c_dev); - ret =clk_prepare (i2c_dev->fast_clk); -if (ret <0 ) { -dev_err (i2c_dev->dev,"Clock prepare failed %d\n" , ret); -return ret; - } - - ret =clk_prepare (i2c_dev->slow_clk); -if (ret <0 ) { -dev_err (dev,"failed to prepare slow clock: %d\n" , ret); - goto unprepare_fast_clk; - } - - ret =clk_prepare (i2c_dev->div_clk); -if (ret <0 ) { -dev_err (i2c_dev->dev,"Clock prepare failed %d\n" , ret); - goto unprepare_slow_clk; - } -/* * VI I2C is in VE power domain which is not always on and not * an IRQ safe. So, IRQ safe device can't be attached to a non-IRQ
@@ -1785,21 +1757,12 @@ static int tegra_i2c_probe(struct platform_device *pdev) goto put_rpm; } -if (i2c_dev->is_multimaster_mode) { - ret =clk_enable (i2c_dev->div_clk); -if (ret <0 ) { -dev_err (i2c_dev->dev,"div_clk enable failed %d\n" , - ret); - goto put_rpm; - } - } -if (i2c_dev->hw->supports_bus_clear) i2c_dev->adapter.bus_recovery_info = &tegra_i2c_recovery_info; ret =tegra_i2c_init_dma (i2c_dev);if (ret <0 ) - goto disable_div_clk; + goto put_rpm; ret =tegra_i2c_init (i2c_dev);if (ret) {
@@ -1834,20 +1797,10 @@ static int tegra_i2c_probe(struct platform_device *pdev) release_dma:tegra_i2c_release_dma (i2c_dev); -disable_div_clk: -if (i2c_dev->is_multimaster_mode) -clk_disable (i2c_dev->div_clk); - put_rpm:pm_runtime_put_sync (&pdev->dev);pm_runtime_disable (&pdev->dev); -clk_unprepare (i2c_dev->div_clk); - -unprepare_slow_clk: -clk_unprepare (i2c_dev->slow_clk); - -unprepare_fast_clk: -clk_unprepare (i2c_dev->fast_clk); +tegra_i2c_release_clocks (i2c_dev);return ret; }
@@ -1858,16 +1811,10 @@ static int tegra_i2c_remove(struct platform_device *pdev)i2c_del_adapter (&i2c_dev->adapter); -if (i2c_dev->is_multimaster_mode) -clk_disable (i2c_dev->div_clk); -pm_runtime_disable (&pdev->dev); -clk_unprepare (i2c_dev->div_clk); -clk_unprepare (i2c_dev->slow_clk); -clk_unprepare (i2c_dev->fast_clk); -tegra_i2c_release_dma (i2c_dev); +tegra_i2c_release_clocks (i2c_dev);return 0 ; }
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 13/35 i2c: tegra: Move out all device-tree parsing into tegra_i2c_parse_dt()
In reply to Dmitry OsipenkoMove out code related to device-tree parsing from the probe function into tegra_i2c_parse_dt() in order to make code more consistent.
--- drivers/i2c/busses/i2c-tegra.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-tegra.c +6 -4
@@ -1428,6 +1428,12 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev) multi_mode =of_property_read_bool (np,"multi-master" ); i2c_dev->is_multimaster_mode = multi_mode; + +if (of_device_is_compatible (np,"nvidia,tegra20-i2c-dvc" )) + i2c_dev->is_dvc = true; + +if (of_device_is_compatible (np,"nvidia,tegra210-i2c-vi" )) + i2c_dev->is_vi = true; }static const struct i2c_algorithm tegra_i2c_algo = {
@@ -1729,10 +1735,6 @@ static int tegra_i2c_probe(struct platform_device *pdev)return ret; i2c_dev->hw =of_device_get_match_data (&pdev->dev); - i2c_dev->is_dvc =of_device_is_compatible (pdev->dev.of_node, -"nvidia,tegra20-i2c-dvc" ); - i2c_dev->is_vi =of_device_is_compatible (dev->of_node, -"nvidia,tegra210-i2c-vi" ); i2c_dev->adapter.quirks = i2c_dev->hw->quirks; i2c_dev->dma_buf_size = i2c_dev->adapter.quirks->max_write_len +I2C_PACKET_HEADER_SIZE ;
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 14/35 i2c: tegra: Clean up probe function
In reply to Dmitry OsipenkoThe driver's probe function code is a bit difficult to read. This patch reorders code of the probe function, forming groups of code that are easy to work with.
The probe tear-down order now matches the driver-removal order.
All dev/&pdev->dev are replaced with i2c_dev->dev in order to have uniform code style across the driver.
The "ret" variable renamed to "err" since it only carries error code and the new name clearly shows that.
--- drivers/i2c/busses/i2c-tegra.c | 141 +++++++++++++++++---------------- 1 file changed, 71 insertions(+), 70 deletions(-)
drivers/i2c/busses/i2c-tegra.c +71 -70
@@ -440,6 +440,9 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev) i2c_dev->tx_dma_chan = chan; + i2c_dev->dma_buf_size = i2c_dev->hw->quirks->max_write_len + +I2C_PACKET_HEADER_SIZE ; + dma_buf =dma_alloc_coherent (i2c_dev->dev, i2c_dev->dma_buf_size, &dma_phys,GFP_KERNEL | __GFP_NOWARN);if (!dma_buf) {
@@ -1690,38 +1693,45 @@ static void tegra_i2c_release_clocks(struct tegra_i2c_dev *i2c_dev)static int tegra_i2c_probe (struct platform_device *pdev) { -struct device *dev = &pdev->dev;struct tegra_i2c_dev *i2c_dev;struct resource *res; -void __iomem *base; -phys_addr_t base_phys; -int irq; -int ret; - - base =devm_platform_get_and_ioremap_resource (pdev,0 , &res); -if (IS_ERR (base)) -return PTR_ERR (base); - - base_phys = res->start; - - irq =platform_get_irq (pdev,0 ); -if (irq <0 ) -return irq; +int err; i2c_dev =devm_kzalloc (&pdev->dev,sizeof (*i2c_dev),GFP_KERNEL );if (!i2c_dev)return -ENOMEM ; - i2c_dev->base = base; - i2c_dev->base_phys = base_phys; - i2c_dev->adapter.algo = &tegra_i2c_algo; - i2c_dev->adapter.retries =1 ; - i2c_dev->adapter.timeout =6 *HZ ; - i2c_dev->irq = irq; +platform_set_drvdata (pdev, i2c_dev); + +init_completion (&i2c_dev->msg_complete); +init_completion (&i2c_dev->dma_complete); + + i2c_dev->hw =of_device_get_match_data (&pdev->dev); i2c_dev->cont_id = pdev->id; i2c_dev->dev = &pdev->dev; - i2c_dev->rst =devm_reset_control_get_exclusive (&pdev->dev,"i2c" ); + i2c_dev->base =devm_platform_get_and_ioremap_resource (pdev,0 , &res); +if (IS_ERR (i2c_dev->base)) +return PTR_ERR (i2c_dev->base); + + i2c_dev->base_phys = res->start; + + err =platform_get_irq (pdev,0 ); +if (err <0 ) +return err; + + i2c_dev->irq = err; + +/* interrupt will be enabled during of transfer time */ +irq_set_status_flags (i2c_dev->irq,IRQ_NOAUTOEN ); + + err =devm_request_irq (i2c_dev->dev, i2c_dev->irq, tegra_i2c_isr, +IRQF_NO_SUSPEND ,dev_name (i2c_dev->dev), + i2c_dev); +if (err) +return err; + + i2c_dev->rst =devm_reset_control_get_exclusive (i2c_dev->dev,"i2c" );if (IS_ERR (i2c_dev->rst)) {dev_err_probe (i2c_dev->dev,PTR_ERR (i2c_dev->rst),"failed to get reset control\n" );
@@ -1730,18 +1740,13 @@ static int tegra_i2c_probe(struct platform_device *pdev)tegra_i2c_parse_dt (i2c_dev); - ret =tegra_i2c_init_clocks (i2c_dev); -if (ret) -return ret; - - i2c_dev->hw =of_device_get_match_data (&pdev->dev); - i2c_dev->adapter.quirks = i2c_dev->hw->quirks; - i2c_dev->dma_buf_size = i2c_dev->adapter.quirks->max_write_len + -I2C_PACKET_HEADER_SIZE ; -init_completion (&i2c_dev->msg_complete); -init_completion (&i2c_dev->dma_complete); + err =tegra_i2c_init_clocks (i2c_dev); +if (err) +return err; -platform_set_drvdata (pdev, i2c_dev); + err =tegra_i2c_init_dma (i2c_dev); +if (err) + goto release_clocks;/* * VI I2C is in VE power domain which is not always on and not
@@ -1751,60 +1756,56 @@ static int tegra_i2c_probe(struct platform_device *pdev)* not be used for atomic transfers. */ if (!i2c_dev->is_vi) -pm_runtime_irq_safe (&pdev->dev); -pm_runtime_enable (&pdev->dev); - ret =pm_runtime_get_sync (i2c_dev->dev); -if (ret <0 ) { -dev_err (dev,"runtime resume failed\n" ); - goto put_rpm; - } +pm_runtime_irq_safe (i2c_dev->dev); -if (i2c_dev->hw->supports_bus_clear) - i2c_dev->adapter.bus_recovery_info = &tegra_i2c_recovery_info; +pm_runtime_enable (i2c_dev->dev); - ret =tegra_i2c_init_dma (i2c_dev); -if (ret <0 ) + err =pm_runtime_get_sync (i2c_dev->dev); +if (err <0 ) { +dev_err (i2c_dev->dev,"runtime resume failed: %d\n" , err); goto put_rpm; - - ret =tegra_i2c_init (i2c_dev); -if (ret) { -dev_err (&pdev->dev,"Failed to initialize i2c controller\n" ); - goto release_dma; } -irq_set_status_flags (i2c_dev->irq,IRQ_NOAUTOEN ); - - ret =devm_request_irq (&pdev->dev, i2c_dev->irq, tegra_i2c_isr, -IRQF_NO_SUSPEND ,dev_name (&pdev->dev), i2c_dev); -if (ret) - goto release_dma; +/* initialize hardware state */ + err =tegra_i2c_init (i2c_dev); +if (err) + goto put_rpm; -i2c_set_adapdata (&i2c_dev->adapter, i2c_dev); + i2c_dev->adapter.dev.of_node = i2c_dev->dev->of_node; + i2c_dev->adapter.dev.parent = i2c_dev->dev; + i2c_dev->adapter.retries =1 ; + i2c_dev->adapter.timeout =6 *HZ ; + i2c_dev->adapter.quirks = i2c_dev->hw->quirks; i2c_dev->adapter.owner =THIS_MODULE ; i2c_dev->adapter.class =I2C_CLASS_DEPRECATED ; -strlcpy (i2c_dev->adapter.name,dev_name (&pdev->dev), + i2c_dev->adapter.algo = &tegra_i2c_algo; + i2c_dev->adapter.nr = i2c_dev->cont_id; + +if (i2c_dev->hw->supports_bus_clear) + i2c_dev->adapter.bus_recovery_info = &tegra_i2c_recovery_info; + +strlcpy (i2c_dev->adapter.name,dev_name (i2c_dev->dev),sizeof (i2c_dev->adapter.name)); - i2c_dev->adapter.dev.parent = &pdev->dev; - i2c_dev->adapter.nr = pdev->id; - i2c_dev->adapter.dev.of_node = pdev->dev.of_node; - ret =i2c_add_numbered_adapter (&i2c_dev->adapter); -if (ret) - goto release_dma; +i2c_set_adapdata (&i2c_dev->adapter, i2c_dev); -pm_runtime_put (&pdev->dev); + err =i2c_add_numbered_adapter (&i2c_dev->adapter); +if (err) + goto put_rpm; -return 0 ; +pm_runtime_put (i2c_dev->dev); -release_dma: -tegra_i2c_release_dma (i2c_dev); +return 0 ; put_rpm: -pm_runtime_put_sync (&pdev->dev); -pm_runtime_disable (&pdev->dev); +pm_runtime_put (i2c_dev->dev); +pm_runtime_disable (i2c_dev->dev); + +tegra_i2c_release_dma (i2c_dev); +release_clocks:tegra_i2c_release_clocks (i2c_dev); -return ret; +return err; }static int tegra_i2c_remove (struct platform_device *pdev)
Signature · 1 line
2.27.0
Re: [PATCH v6 14/35] i2c: tegra: Clean up probe function
Quoted 9 lines · Dmitry Osipenko
The driver's probe function code is a bit difficult to read. This patch reorders code of the probe function, forming groups of code that are easy to work with.
The probe tear-down order now matches the driver-removal order.
All dev/&pdev->dev are replaced with
i2c_dev->devin order to have uniform code style across the driver.
You see, below is my point why leaving a temporary variable can reduce a churn.
Quoted 2 lines
The "ret" variable renamed to "err" since it only carries error code and the new name clearly shows that.
Overall it sounds like you need to split this into a few patches.
...
drivers/i2c/busses/i2c-tegra.c static void tegra_i2c_release_clocks(struct tegra_i2c_dev *i2c_dev) · line 1734
Quoted 5 lines
drivers/i2c/busses/i2c-tegra.c +1
-2-struct device *dev = &pdev->dev; - i2c_dev->rst =devm_reset_control_get_exclusive (&pdev->dev,"i2c" ); + i2c_dev->rst =devm_reset_control_get_exclusive (i2c_dev->dev,"i2c" );
You see, if it had been simple 'dev', this line would have not been changed.
And so on.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Dmitry Osipenko
reviewerRe: [PATCH v6 14/35] i2c: tegra: Clean up probe function
08.09.2020 11:40, Andy Shevchenko пишет:
Quoted 22 lines · Dmitry Osipenko
Quoted 9 lines
The driver's probe function code is a bit difficult to read. This patch reorders code of the probe function, forming groups of code that are easy to work with.
The probe tear-down order now matches the driver-removal order.
All dev/&pdev->dev are replaced with
i2c_dev->devin order to have uniform code style across the driver.You see, below is my point why leaving a temporary variable can reduce a churn.
Quoted 2 lines
The "ret" variable renamed to "err" since it only carries error code and the new name clearly shows that.
Overall it sounds like you need to split this into a few patches.
...
Quoted 1 line
- struct device *dev =
&pdev->dev;
Quoted 8 lines
drivers/i2c/busses/i2c-tegra.c static void tegra_i2c_release_clocks(struct tegra_i2c_dev *i2c_dev) · line 1734
Quoted 3 lines
drivers/i2c/busses/i2c-tegra.c +1
-1- i2c_dev->rst =devm_reset_control_get_exclusive (&pdev->dev,"i2c" ); + i2c_dev->rst =devm_reset_control_get_exclusive (i2c_dev->dev,"i2c" );You see, if it had been simple 'dev', this line would have not been changed.
And so on.
Alright, I'll move all the renamings into the "Clean up variable names" patch, thanks.
Dmitry Osipenko
reviewerPATCH v6 15/35 i2c: tegra: Clean up variable types
In reply to Dmitry OsipenkoDon't use signed types for unsigned values and use consistent types for sibling variables.
--- drivers/i2c/busses/i2c-tegra.c | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/i2c/busses/i2c-tegra.c +19 -19
@@ -206,20 +206,20 @@ struct tegra_i2c_hw_feature {bool has_continue_xfer_support;bool has_per_pkt_xfer_complete_irq;bool has_config_load_reg; -int clk_divisor_hs_mode; -int clk_divisor_std_mode; -int clk_divisor_fast_mode; -u16 clk_divisor_fast_plus_mode; +u32 clk_divisor_hs_mode; +u32 clk_divisor_std_mode; +u32 clk_divisor_fast_mode; +u32 clk_divisor_fast_plus_mode;bool has_multi_master_mode;bool has_slcg_override_reg;bool has_mst_fifo;const struct i2c_adapter_quirks *quirks;bool supports_bus_clear;bool has_apb_dma; -u8 tlow_std_mode; -u8 thigh_std_mode; -u8 tlow_fast_fastplus_mode; -u8 thigh_fast_fastplus_mode; +u32 tlow_std_mode; +u32 thigh_std_mode; +u32 tlow_fast_fastplus_mode; +u32 thigh_fast_fastplus_mode;u32 setup_hold_time_std_mode;u32 setup_hold_time_fast_fast_plus_mode;u32 setup_hold_time_hs_mode;
@@ -267,15 +267,15 @@ struct tegra_i2c_dev {struct reset_control *rst;void __iomem *base;phys_addr_t base_phys; -int cont_id; -int irq; -int is_dvc; +unsigned int cont_id; +unsigned int irq; +bool is_dvc;bool is_vi;struct completion msg_complete;int msg_err;u8 *msg_buf;size_t msg_buf_remaining; -int msg_read; +bool msg_read;u32 bus_clk_rate;bool is_multimaster_mode;struct dma_chan *tx_dma_chan;
@@ -331,13 +331,13 @@ static u32 i2c_readl(struct tegra_i2c_dev *i2c_dev, unsigned long reg) }static void i2c_writesl (struct tegra_i2c_dev *i2c_dev,void *data, -unsigned long reg,int len) +unsigned long reg,unsigned int len) {writesl (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg), data, len); }static void i2c_readsl (struct tegra_i2c_dev *i2c_dev,void *data, -unsigned long reg,int len) +unsigned long reg,unsigned int len) {readsl (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg), data, len); }
@@ -506,10 +506,10 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)static int tegra_i2c_empty_rx_fifo (struct tegra_i2c_dev *i2c_dev) {u32 val; -int rx_fifo_avail; +unsigned int rx_fifo_avail;u8 *buf = i2c_dev->msg_buf;size_t buf_remaining = i2c_dev->msg_buf_remaining; -int words_to_transfer; +unsigned int words_to_transfer;/* * Catch overflow due to message fully sent
@@ -567,10 +567,10 @@ static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev)static int tegra_i2c_fill_tx_fifo (struct tegra_i2c_dev *i2c_dev) {u32 val; -int tx_fifo_avail; +unsigned int tx_fifo_avail;u8 *buf = i2c_dev->msg_buf;size_t buf_remaining = i2c_dev->msg_buf_remaining; -int words_to_transfer; +unsigned int words_to_transfer;if (i2c_dev->hw->has_mst_fifo) { val =i2c_readl (i2c_dev,I2C_MST_FIFO_STATUS );
@@ -1178,7 +1178,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, i2c_dev->msg_buf = msg->buf; i2c_dev->msg_buf_remaining = msg->len; i2c_dev->msg_err =I2C_ERR_NONE ; - i2c_dev->msg_read = (msg->flags &I2C_M_RD ); + i2c_dev->msg_read = !!(msg->flags &I2C_M_RD );reinit_completion (&i2c_dev->msg_complete);if (i2c_dev->msg_read)
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 16/35 i2c: tegra: Reorder location of functions in the code
In reply to Dmitry OsipenkoReorder location of functions in the code in order to have definition of functions closer to the place of the invocation. This change makes easier to navigate around the code and removes the need to have a prototype for tegra_i2c_init().
--- drivers/i2c/busses/i2c-tegra.c | 486 ++++++++++++++++----------------- 1 file changed, 242 insertions(+), 244 deletions(-)
drivers/i2c/busses/i2c-tegra.c +242 -244
@@ -288,8 +288,6 @@ struct tegra_i2c_dev {bool is_curr_atomic_xfer; }; -static int tegra_i2c_init (struct tegra_i2c_dev *i2c_dev); -static void dvc_writel (struct tegra_i2c_dev *i2c_dev,u32 val,unsigned long reg) {
@@ -466,6 +464,56 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)return err; } +/* +* One of the Tegra I2C blocks is inside the DVC (Digital Voltage Controller) +* block. This block is identical to the rest of the I2C blocks, except that +* it only supports master mode, it has registers moved around, and it needs +* some extra init to get it into I2C mode. The register moves are handled +* by i2c_readl and i2c_writel +*/ +static void tegra_dvc_init (struct tegra_i2c_dev *i2c_dev) +{ +u32 val; + + val =dvc_readl (i2c_dev,DVC_CTRL_REG3 ); + val |=DVC_CTRL_REG3_SW_PROG ; + val |=DVC_CTRL_REG3_I2C_DONE_INTR_EN ; +dvc_writel (i2c_dev, val,DVC_CTRL_REG3 ); + + val =dvc_readl (i2c_dev,DVC_CTRL_REG1 ); + val |=DVC_CTRL_REG1_INTR_EN ; +dvc_writel (i2c_dev, val,DVC_CTRL_REG1 ); +} + +static void tegra_i2c_vi_init (struct tegra_i2c_dev *i2c_dev) +{ +u32 value; + + value =FIELD_PREP (I2C_INTERFACE_TIMING_THIGH ,2 ) | +FIELD_PREP (I2C_INTERFACE_TIMING_TLOW ,4 ); +i2c_writel (i2c_dev, value,I2C_INTERFACE_TIMING_0 ); + + value =FIELD_PREP (I2C_INTERFACE_TIMING_TBUF ,4 ) | +FIELD_PREP (I2C_INTERFACE_TIMING_TSU_STO ,7 ) | +FIELD_PREP (I2C_INTERFACE_TIMING_THD_STA ,4 ) | +FIELD_PREP (I2C_INTERFACE_TIMING_TSU_STA ,4 ); +i2c_writel (i2c_dev, value,I2C_INTERFACE_TIMING_1 ); + + value =FIELD_PREP (I2C_HS_INTERFACE_TIMING_THIGH ,3 ) | +FIELD_PREP (I2C_HS_INTERFACE_TIMING_TLOW ,8 ); +i2c_writel (i2c_dev, value,I2C_HS_INTERFACE_TIMING_0 ); + + value =FIELD_PREP (I2C_HS_INTERFACE_TIMING_TSU_STO ,11 ) | +FIELD_PREP (I2C_HS_INTERFACE_TIMING_THD_STA ,11 ) | +FIELD_PREP (I2C_HS_INTERFACE_TIMING_TSU_STA ,11 ); +i2c_writel (i2c_dev, value,I2C_HS_INTERFACE_TIMING_1 ); + + value =FIELD_PREP (I2C_BC_SCLK_THRESHOLD ,9 ) |I2C_BC_STOP_COND ; +i2c_writel (i2c_dev, value,I2C_BUS_CLEAR_CNFG ); + +i2c_writel (i2c_dev,0x0 ,I2C_TLOW_SEXT ); +} +static int tegra_i2c_flush_fifos (struct tegra_i2c_dev *i2c_dev) {u32 mask, val, offset, reg_offset;
@@ -503,198 +551,6 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)return 0 ; } -static int tegra_i2c_empty_rx_fifo (struct tegra_i2c_dev *i2c_dev) -{ -u32 val; -unsigned int rx_fifo_avail; -u8 *buf = i2c_dev->msg_buf; -size_t buf_remaining = i2c_dev->msg_buf_remaining; -unsigned int words_to_transfer; - -/* -* Catch overflow due to message fully sent -* before the check for RX FIFO availability. -*/ -if (WARN_ON_ONCE (!(i2c_dev->msg_buf_remaining))) -return -EINVAL ; - -if (i2c_dev->hw->has_mst_fifo) { - val =i2c_readl (i2c_dev,I2C_MST_FIFO_STATUS ); - rx_fifo_avail =FIELD_GET (I2C_MST_FIFO_STATUS_RX , val); - }else { - val =i2c_readl (i2c_dev,I2C_FIFO_STATUS ); - rx_fifo_avail =FIELD_GET (I2C_FIFO_STATUS_RX , val); - } - -/* Rounds down to not include partial word at the end of buf */ - words_to_transfer = buf_remaining /BYTES_PER_FIFO_WORD ; -if (words_to_transfer > rx_fifo_avail) - words_to_transfer = rx_fifo_avail; - -i2c_readsl (i2c_dev, buf,I2C_RX_FIFO , words_to_transfer); - - buf += words_to_transfer *BYTES_PER_FIFO_WORD ; - buf_remaining -= words_to_transfer *BYTES_PER_FIFO_WORD ; - rx_fifo_avail -= words_to_transfer; - -/* -* If there is a partial word at the end of buf, handle it manually to -* prevent overwriting past the end of buf -*/ -if (rx_fifo_avail >0 && buf_remaining >0 ) { -/* -* buf_remaining > 3 check not needed as rx_fifo_avail == 0 -* when (words_to_transfer was > rx_fifo_avail) earlier -* in this function. -*/ - val =i2c_readl (i2c_dev,I2C_RX_FIFO ); - val =cpu_to_le32 (val); -memcpy (buf, &val, buf_remaining); - buf_remaining =0 ; - rx_fifo_avail--; - } - -/* RX FIFO must be drained, otherwise it's an Overflow case. */ -if (WARN_ON_ONCE (rx_fifo_avail)) -return -EINVAL ; - - i2c_dev->msg_buf_remaining = buf_remaining; - i2c_dev->msg_buf = buf; - -return 0 ; -} - -static int tegra_i2c_fill_tx_fifo (struct tegra_i2c_dev *i2c_dev) -{ -u32 val; -unsigned int tx_fifo_avail; -u8 *buf = i2c_dev->msg_buf; -size_t buf_remaining = i2c_dev->msg_buf_remaining; -unsigned int words_to_transfer; - -if (i2c_dev->hw->has_mst_fifo) { - val =i2c_readl (i2c_dev,I2C_MST_FIFO_STATUS ); - tx_fifo_avail =FIELD_GET (I2C_MST_FIFO_STATUS_TX , val); - }else { - val =i2c_readl (i2c_dev,I2C_FIFO_STATUS ); - tx_fifo_avail =FIELD_GET (I2C_FIFO_STATUS_TX , val); - } - -/* Rounds down to not include partial word at the end of buf */ - words_to_transfer = buf_remaining /BYTES_PER_FIFO_WORD ; - -/* It's very common to have < 4 bytes, so optimize that case. */ -if (words_to_transfer) { -if (words_to_transfer > tx_fifo_avail) - words_to_transfer = tx_fifo_avail; - -/* -* Update state before writing to FIFO. If this casues us -* to finish writing all bytes (AKA buf_remaining goes to 0) we -* have a potential for an interrupt (PACKET_XFER_COMPLETE is -* not maskable). We need to make sure that the isr sees -* buf_remaining as 0 and doesn't call us back re-entrantly. -*/ - buf_remaining -= words_to_transfer *BYTES_PER_FIFO_WORD ; - tx_fifo_avail -= words_to_transfer; - i2c_dev->msg_buf_remaining = buf_remaining; - i2c_dev->msg_buf = buf + - words_to_transfer *BYTES_PER_FIFO_WORD ; -barrier (); - -i2c_writesl (i2c_dev, buf,I2C_TX_FIFO , words_to_transfer); - - buf += words_to_transfer *BYTES_PER_FIFO_WORD ; - } - -/* -* If there is a partial word at the end of buf, handle it manually to -* prevent reading past the end of buf, which could cross a page -* boundary and fault. -*/ -if (tx_fifo_avail >0 && buf_remaining >0 ) { -/* -* buf_remaining > 3 check not needed as tx_fifo_avail == 0 -* when (words_to_transfer was > tx_fifo_avail) earlier -* in this function for non-zero words_to_transfer. -*/ -memcpy (&val, buf, buf_remaining); - val =le32_to_cpu (val); - -/* Again update before writing to FIFO to make sure isr sees. */ - i2c_dev->msg_buf_remaining =0 ; - i2c_dev->msg_buf =NULL ; -barrier (); - -i2c_writel (i2c_dev, val,I2C_TX_FIFO ); - } - -return 0 ; -} - -/* -* One of the Tegra I2C blocks is inside the DVC (Digital Voltage Controller) -* block. This block is identical to the rest of the I2C blocks, except that -* it only supports master mode, it has registers moved around, and it needs -* some extra init to get it into I2C mode. The register moves are handled -* by i2c_readl and i2c_writel -*/ -static void tegra_dvc_init (struct tegra_i2c_dev *i2c_dev) -{ -u32 val; - - val =dvc_readl (i2c_dev,DVC_CTRL_REG3 ); - val |=DVC_CTRL_REG3_SW_PROG ; - val |=DVC_CTRL_REG3_I2C_DONE_INTR_EN ; -dvc_writel (i2c_dev, val,DVC_CTRL_REG3 ); - - val =dvc_readl (i2c_dev,DVC_CTRL_REG1 ); - val |=DVC_CTRL_REG1_INTR_EN ; -dvc_writel (i2c_dev, val,DVC_CTRL_REG1 ); -} - -static int __maybe_unused tegra_i2c_runtime_resume (struct device *dev) -{ -struct tegra_i2c_dev *i2c_dev =dev_get_drvdata (dev); -int ret; - - ret =pinctrl_pm_select_default_state (i2c_dev->dev); -if (ret) -return ret; - - ret =clk_bulk_enable (i2c_dev->nclocks, i2c_dev->clocks); -if (ret) -return ret; - -/* -* VI I2C device is attached to VE power domain which goes through -* power ON/OFF during PM runtime resume/suspend. So, controller -* should go through reset and need to re-initialize after power -* domain ON. -*/ -if (i2c_dev->is_vi) { - ret =tegra_i2c_init (i2c_dev); -if (ret) - goto disable_clocks; - } - -return 0 ; - -disable_clocks: -clk_bulk_disable (i2c_dev->nclocks, i2c_dev->clocks); - -return ret; -} - -static int __maybe_unused tegra_i2c_runtime_suspend (struct device *dev) -{ -struct tegra_i2c_dev *i2c_dev =dev_get_drvdata (dev); - -clk_bulk_disable (i2c_dev->nclocks, i2c_dev->clocks); - -return pinctrl_pm_select_idle_state (i2c_dev->dev); -} -static int tegra_i2c_wait_for_config_load (struct tegra_i2c_dev *i2c_dev) {unsigned long reg_offset;
@@ -726,35 +582,6 @@ static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev)return 0 ; } -static void tegra_i2c_vi_init (struct tegra_i2c_dev *i2c_dev) -{ -u32 value; - - value =FIELD_PREP (I2C_INTERFACE_TIMING_THIGH ,2 ) | -FIELD_PREP (I2C_INTERFACE_TIMING_TLOW ,4 ); -i2c_writel (i2c_dev, value,I2C_INTERFACE_TIMING_0 ); - - value =FIELD_PREP (I2C_INTERFACE_TIMING_TBUF ,4 ) | -FIELD_PREP (I2C_INTERFACE_TIMING_TSU_STO ,7 ) | -FIELD_PREP (I2C_INTERFACE_TIMING_THD_STA ,4 ) | -FIELD_PREP (I2C_INTERFACE_TIMING_TSU_STA ,4 ); -i2c_writel (i2c_dev, value,I2C_INTERFACE_TIMING_1 ); - - value =FIELD_PREP (I2C_HS_INTERFACE_TIMING_THIGH ,3 ) | -FIELD_PREP (I2C_HS_INTERFACE_TIMING_TLOW ,8 ); -i2c_writel (i2c_dev, value,I2C_HS_INTERFACE_TIMING_0 ); - - value =FIELD_PREP (I2C_HS_INTERFACE_TIMING_TSU_STO ,11 ) | -FIELD_PREP (I2C_HS_INTERFACE_TIMING_THD_STA ,11 ) | -FIELD_PREP (I2C_HS_INTERFACE_TIMING_TSU_STA ,11 ); -i2c_writel (i2c_dev, value,I2C_HS_INTERFACE_TIMING_1 ); - - value =FIELD_PREP (I2C_BC_SCLK_THRESHOLD ,9 ) |I2C_BC_STOP_COND ; -i2c_writel (i2c_dev, value,I2C_BUS_CLEAR_CNFG ); - -i2c_writel (i2c_dev,0x0 ,I2C_TLOW_SEXT ); -} -static int tegra_i2c_init (struct tegra_i2c_dev *i2c_dev) {u32 val;
@@ -882,6 +709,135 @@ static int tegra_i2c_disable_packet_mode(struct tegra_i2c_dev *i2c_dev)return tegra_i2c_wait_for_config_load (i2c_dev); } +static int tegra_i2c_empty_rx_fifo (struct tegra_i2c_dev *i2c_dev) +{ +u32 val; +unsigned int rx_fifo_avail; +u8 *buf = i2c_dev->msg_buf; +size_t buf_remaining = i2c_dev->msg_buf_remaining; +unsigned int words_to_transfer; + +/* +* Catch overflow due to message fully sent +* before the check for RX FIFO availability. +*/ +if (WARN_ON_ONCE (!(i2c_dev->msg_buf_remaining))) +return -EINVAL ; + +if (i2c_dev->hw->has_mst_fifo) { + val =i2c_readl (i2c_dev,I2C_MST_FIFO_STATUS ); + rx_fifo_avail =FIELD_GET (I2C_MST_FIFO_STATUS_RX , val); + }else { + val =i2c_readl (i2c_dev,I2C_FIFO_STATUS ); + rx_fifo_avail =FIELD_GET (I2C_FIFO_STATUS_RX , val); + } + +/* Rounds down to not include partial word at the end of buf */ + words_to_transfer = buf_remaining /BYTES_PER_FIFO_WORD ; +if (words_to_transfer > rx_fifo_avail) + words_to_transfer = rx_fifo_avail; + +i2c_readsl (i2c_dev, buf,I2C_RX_FIFO , words_to_transfer); + + buf += words_to_transfer *BYTES_PER_FIFO_WORD ; + buf_remaining -= words_to_transfer *BYTES_PER_FIFO_WORD ; + rx_fifo_avail -= words_to_transfer; + +/* +* If there is a partial word at the end of buf, handle it manually to +* prevent overwriting past the end of buf +*/ +if (rx_fifo_avail >0 && buf_remaining >0 ) { +/* +* buf_remaining > 3 check not needed as rx_fifo_avail == 0 +* when (words_to_transfer was > rx_fifo_avail) earlier +* in this function. +*/ + val =i2c_readl (i2c_dev,I2C_RX_FIFO ); + val =cpu_to_le32 (val); +memcpy (buf, &val, buf_remaining); + buf_remaining =0 ; + rx_fifo_avail--; + } + +/* RX FIFO must be drained, otherwise it's an Overflow case. */ +if (WARN_ON_ONCE (rx_fifo_avail)) +return -EINVAL ; + + i2c_dev->msg_buf_remaining = buf_remaining; + i2c_dev->msg_buf = buf; + +return 0 ; +} + +static int tegra_i2c_fill_tx_fifo (struct tegra_i2c_dev *i2c_dev) +{ +u32 val; +unsigned int tx_fifo_avail; +u8 *buf = i2c_dev->msg_buf; +size_t buf_remaining = i2c_dev->msg_buf_remaining; +unsigned int words_to_transfer; + +if (i2c_dev->hw->has_mst_fifo) { + val =i2c_readl (i2c_dev,I2C_MST_FIFO_STATUS ); + tx_fifo_avail =FIELD_GET (I2C_MST_FIFO_STATUS_TX , val); + }else { + val =i2c_readl (i2c_dev,I2C_FIFO_STATUS ); + tx_fifo_avail =FIELD_GET (I2C_FIFO_STATUS_TX , val); + } + +/* Rounds down to not include partial word at the end of buf */ + words_to_transfer = buf_remaining /BYTES_PER_FIFO_WORD ; + +/* It's very common to have < 4 bytes, so optimize that case. */ +if (words_to_transfer) { +if (words_to_transfer > tx_fifo_avail) + words_to_transfer = tx_fifo_avail; + +/* +* Update state before writing to FIFO. If this casues us +* to finish writing all bytes (AKA buf_remaining goes to 0) we +* have a potential for an interrupt (PACKET_XFER_COMPLETE is +* not maskable). We need to make sure that the isr sees +* buf_remaining as 0 and doesn't call us back re-entrantly. +*/ + buf_remaining -= words_to_transfer *BYTES_PER_FIFO_WORD ; + tx_fifo_avail -= words_to_transfer; + i2c_dev->msg_buf_remaining = buf_remaining; + i2c_dev->msg_buf = buf + + words_to_transfer *BYTES_PER_FIFO_WORD ; +barrier (); + +i2c_writesl (i2c_dev, buf,I2C_TX_FIFO , words_to_transfer); + + buf += words_to_transfer *BYTES_PER_FIFO_WORD ; + } + +/* +* If there is a partial word at the end of buf, handle it manually to +* prevent reading past the end of buf, which could cross a page +* boundary and fault. +*/ +if (tx_fifo_avail >0 && buf_remaining >0 ) { +/* +* buf_remaining > 3 check not needed as tx_fifo_avail == 0 +* when (words_to_transfer was > tx_fifo_avail) earlier +* in this function for non-zero words_to_transfer. +*/ +memcpy (&val, buf, buf_remaining); + val =le32_to_cpu (val); + +/* Again update before writing to FIFO to make sure isr sees. */ + i2c_dev->msg_buf_remaining =0 ; + i2c_dev->msg_buf =NULL ; +barrier (); + +i2c_writel (i2c_dev, val,I2C_TX_FIFO ); + } + +return 0 ; +} +static irqreturn_t tegra_i2c_isr (int irq,void *dev_id) {u32 status;
@@ -1418,27 +1374,6 @@ static u32 tegra_i2c_func(struct i2c_adapter *adap)return ret; } -static void tegra_i2c_parse_dt (struct tegra_i2c_dev *i2c_dev) -{ -struct device_node *np = i2c_dev->dev->of_node; -int ret; -bool multi_mode; - - ret =of_property_read_u32 (np,"clock-frequency" , - &i2c_dev->bus_clk_rate); -if (ret) - i2c_dev->bus_clk_rate =I2C_MAX_STANDARD_MODE_FREQ ;/* default clock rate */ - - multi_mode =of_property_read_bool (np,"multi-master" ); - i2c_dev->is_multimaster_mode = multi_mode; - -if (of_device_is_compatible (np,"nvidia,tegra20-i2c-dvc" )) - i2c_dev->is_dvc = true; - -if (of_device_is_compatible (np,"nvidia,tegra210-i2c-vi" )) - i2c_dev->is_vi = true; -} -static const struct i2c_algorithm tegra_i2c_algo = { .master_xfer = tegra_i2c_xfer, .master_xfer_atomic = tegra_i2c_xfer_atomic,
@@ -1644,6 +1579,27 @@ static const struct of_device_id tegra_i2c_of_match[] = { };MODULE_DEVICE_TABLE (of, tegra_i2c_of_match); +static void tegra_i2c_parse_dt (struct tegra_i2c_dev *i2c_dev) +{ +struct device_node *np = i2c_dev->dev->of_node; +int ret; +bool multi_mode; + + ret =of_property_read_u32 (np,"clock-frequency" , + &i2c_dev->bus_clk_rate); +if (ret) + i2c_dev->bus_clk_rate =I2C_MAX_STANDARD_MODE_FREQ ;/* default clock rate */ + + multi_mode =of_property_read_bool (np,"multi-master" ); + i2c_dev->is_multimaster_mode = multi_mode; + +if (of_device_is_compatible (np,"nvidia,tegra20-i2c-dvc" )) + i2c_dev->is_dvc = true; + +if (of_device_is_compatible (np,"nvidia,tegra210-i2c-vi" )) + i2c_dev->is_vi = true; +} +static int tegra_i2c_init_clocks (struct tegra_i2c_dev *i2c_dev) {unsigned int i;
@@ -1821,6 +1777,48 @@ static int tegra_i2c_remove(struct platform_device *pdev)return 0 ; } +static int __maybe_unused tegra_i2c_runtime_resume (struct device *dev) +{ +struct tegra_i2c_dev *i2c_dev =dev_get_drvdata (dev); +int ret; + + ret =pinctrl_pm_select_default_state (i2c_dev->dev); +if (ret) +return ret; + + ret =clk_bulk_enable (i2c_dev->nclocks, i2c_dev->clocks); +if (ret) +return ret; + +/* +* VI I2C device is attached to VE power domain which goes through +* power ON/OFF during PM runtime resume/suspend. So, controller +* should go through reset and need to re-initialize after power +* domain ON. +*/ +if (i2c_dev->is_vi) { + ret =tegra_i2c_init (i2c_dev); +if (ret) + goto disable_clocks; + } + +return 0 ; + +disable_clocks: +clk_bulk_disable (i2c_dev->nclocks, i2c_dev->clocks); + +return ret; +} + +static int __maybe_unused tegra_i2c_runtime_suspend (struct device *dev) +{ +struct tegra_i2c_dev *i2c_dev =dev_get_drvdata (dev); + +clk_bulk_disable (i2c_dev->nclocks, i2c_dev->clocks); + +return pinctrl_pm_select_idle_state (i2c_dev->dev); +} +static int __maybe_unused tegra_i2c_suspend (struct device *dev) {struct tegra_i2c_dev *i2c_dev =dev_get_drvdata (dev);
Signature · 1 line
2.27.0
Re: [PATCH v6 16/35] i2c: tegra: Reorder location of functions in the code
Quoted 5 lines · Dmitry Osipenko
Reorder location of functions in the code in order to have definition of functions closer to the place of the invocation. This change makes easier to navigate around the code and removes the need to have a prototype for
tegra_i2c_init().
Still seems to have ordering issues (it moves pieces you actually change in the next patches).
Have you considered which one looks neat this variant or if you move it closer to the end of the series?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Dmitry Osipenko
reviewerRe: [PATCH v6 16/35] i2c: tegra: Reorder location of functions in the code
08.09.2020 11:43, Andy Shevchenko пишет:
Quoted 9 lines · Dmitry Osipenko
Quoted 5 lines
Reorder location of functions in the code in order to have definition of functions closer to the place of the invocation. This change makes easier to navigate around the code and removes the need to have a prototype for
tegra_i2c_init().Still seems to have ordering issues (it moves pieces you actually change in the next patches).
It's unavoidable that this patch either touches previous or next changes. You actually had an opposite complaint to v5.
This diver has a long overdue for the refactoring. I think it's a good time to do it right now because driver works stable and it's quite unlikely that there will ever be fixes for the older code. Hence it should be good to have the code reordered now, so that we could have a nicer code base for the future changes.
Quoted 3 lines
Have you considered which one looks neat this variant or if you move it closer to the end of the series?
This variant should be more logical because changes have this order:
1. fixes
2. features
3. code reorder
4. more important cleanups
5. less important cleanups
The 3 merely shuffles code around without any changes to the code, hence it's a safe change.
The 4 has a potential danger since there are cleanups of the outdated features and some changes may change semantic in a case of a bug. Hence, if in the future we'll happen to find a problem in one of the 4 patches, then there is a better chance that the problem could be fixed with a simple revert. If 3 is placed after 4, then the chance is completely gone.
Re: [PATCH v6 16/35] i2c: tegra: Reorder location of functions in the code
Quoted 8 lines · Dmitry Osipenko
08.09.2020 11:43, Andy Shevchenko пишет:
Quoted 7 lines · Dmitry Osipenko
Quoted 5 lines
Reorder location of functions in the code in order to have definition of functions closer to the place of the invocation. This change makes easier to navigate around the code and removes the need to have a prototype for
tegra_i2c_init().
Quoted 5 lines
Quoted 2 lines
Still seems to have ordering issues (it moves pieces you actually change in the next patches).
It's unavoidable that this patch either touches previous or next changes. You actually had an opposite complaint to v5.
Nice :-)
Quoted 5 lines
This diver has a long overdue for the refactoring. I think it's a good time to do it right now because driver works stable and it's quite unlikely that there will ever be fixes for the older code. Hence it should be good to have the code reordered now, so that we could have a nicer code base for the future changes.
I agree.
Quoted 11 lines
Quoted 2 lines
Have you considered which one looks neat this variant or if you move it closer to the end of the series?
This variant should be more logical because changes have this order:
1. fixes
2. features
3. code reorder
4. more important cleanups
5. less important cleanups
Quoted 8 lines
The 3 merely shuffles code around without any changes to the code, hence it's a safe change.
The 4 has a potential danger since there are cleanups of the outdated features and some changes may change semantic in a case of a bug. Hence, if in the future we'll happen to find a problem in one of the 4 patches, then there is a better chance that the problem could be fixed with a simple revert. If 3 is placed after 4, then the chance is completely gone.
Thanks for elaboration. If you think so (and I guess you are), go ahead!
Signature · 2 lines
With Best Regards, Andy Shevchenko
Dmitry Osipenko
reviewerPATCH v6 17/35 i2c: tegra: Remove likely/unlikely from the code
In reply to Dmitry OsipenkoThe likely/unlikely annotations should be used only in a hot paths of performance-critical code. The I2C driver doesn't have such paths, and thus, there is no justification for usage of likely/unlikely annotations in the code. Hence remove them.
--- drivers/i2c/busses/i2c-tegra.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-tegra.c +2 -2
@@ -855,7 +855,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id) goto err; } -if (unlikely (status & status_err)) { +if (status & status_err) {tegra_i2c_disable_packet_mode (i2c_dev);if (status &I2C_INT_NO_ACK ) i2c_dev->msg_err |=I2C_ERR_NO_ACK ;
@@ -1297,7 +1297,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, i2c_dev->msg_err); i2c_dev->is_curr_dma_xfer = false; -if (likely (i2c_dev->msg_err ==I2C_ERR_NONE )) +if (i2c_dev->msg_err ==I2C_ERR_NONE )return 0 ;tegra_i2c_init (i2c_dev);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 18/35 i2c: tegra: Remove outdated barrier()
In reply to Dmitry OsipenkoThe barrier() was intended to reduce possibility of racing with the interrupt handler, but driver's code evolved significantly and today's driver enables interrupt only when it waits for completion notification. Hence barrier() has no good use anymore, let's remove it.
--- drivers/i2c/busses/i2c-tegra.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
drivers/i2c/busses/i2c-tegra.c +5 -8
@@ -795,18 +795,17 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev) words_to_transfer = tx_fifo_avail;/* -* Update state before writing to FIFO. If this casues us -* to finish writing all bytes (AKA buf_remaining goes to 0) we -* have a potential for an interrupt (PACKET_XFER_COMPLETE is -* not maskable). We need to make sure that the isr sees -* buf_remaining as 0 and doesn't call us back re-entrantly. +* Update state before writing to FIFO. Note that this may +* cause us to finish writing all bytes (AKA buf_remaining +* goes to 0), hence we have a potential for an interrupt +* (PACKET_XFER_COMPLETE is not maskable), but GIC interrupt +* is disabled at this point. */ buf_remaining -= words_to_transfer *BYTES_PER_FIFO_WORD ; tx_fifo_avail -= words_to_transfer; i2c_dev->msg_buf_remaining = buf_remaining; i2c_dev->msg_buf = buf + words_to_transfer *BYTES_PER_FIFO_WORD ; -barrier ();i2c_writesl (i2c_dev, buf,I2C_TX_FIFO , words_to_transfer);
@@ -827,10 +826,8 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev)memcpy (&val, buf, buf_remaining); val =le32_to_cpu (val); -/* Again update before writing to FIFO to make sure isr sees. */ i2c_dev->msg_buf_remaining =0 ; i2c_dev->msg_buf =NULL ; -barrier ();i2c_writel (i2c_dev, val,I2C_TX_FIFO ); }
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 19/35 i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear()
In reply to Dmitry OsipenkoThe tegra_i2c_wait_for_config_load() checks for 'has_config_load_reg' by itself, hence there is no need to duplicate the check.
--- drivers/i2c/busses/i2c-tegra.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
drivers/i2c/busses/i2c-tegra.c +4 -5
@@ -1082,11 +1082,10 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap) reg =FIELD_PREP (I2C_BC_SCLK_THRESHOLD ,9 ) |I2C_BC_STOP_COND |I2C_BC_TERMINATE ;i2c_writel (i2c_dev, reg,I2C_BUS_CLEAR_CNFG ); -if (i2c_dev->hw->has_config_load_reg) { - err =tegra_i2c_wait_for_config_load (i2c_dev); -if (err) -return err; - } + + err =tegra_i2c_wait_for_config_load (i2c_dev); +if (err) +return err; reg |=I2C_BC_ENABLE ;i2c_writel (i2c_dev, reg,I2C_BUS_CLEAR_CNFG );
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 20/35 i2c: tegra: Remove "dma" variable from tegra_i2c_xfer_msg()
In reply to Dmitry OsipenkoThe "dma" variable of tegra_i2c_xfer_msg() function doesn't bring much in regards to readability and generation of the code.
Besides readability, it's also not very nice that the is_curr_dma_xfer is initialized in tegra_i2c_xfer_msg() and then could be overridden by tegra_i2c_config_fifo_trig(). In a result, the "dma" variable creates slight confusion since it's not instantly obvious why it's set after tegra_i2c_config_fifo_trig().
Hence should be better to have the variable removed. This makes code more consistent.
--- drivers/i2c/busses/i2c-tegra.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
drivers/i2c/busses/i2c-tegra.c +8 -9
@@ -1120,7 +1120,6 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,size_t xfer_size;u32 *buffer =NULL ;int err =0 ; -bool dma;u16 xfer_time =100 ; err =tegra_i2c_flush_fifos (i2c_dev);
@@ -1143,7 +1142,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, i2c_dev->dma_buf && !i2c_dev->is_curr_atomic_xfer;tegra_i2c_config_fifo_trig (i2c_dev, xfer_size); - dma = i2c_dev->is_curr_dma_xfer; +/* * Transfer time in mSec = Total bits / transfer rate * Total bits = 9 bits per byte (including ACK bit) + Start & stop bits
@@ -1153,7 +1152,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, int_mask =I2C_INT_NO_ACK |I2C_INT_ARBITRATION_LOST ;tegra_i2c_unmask_irq (i2c_dev, int_mask); -if (dma) { +if (i2c_dev->is_curr_dma_xfer) {if (i2c_dev->msg_read) { dma_sync_single_for_device(i2c_dev->dev, i2c_dev->dma_phys,
@@ -1181,13 +1180,13 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, PACKET_HEADER0_PROTOCOL_I2C) |FIELD_PREP (PACKET_HEADER0_CONT_ID , i2c_dev->cont_id) |FIELD_PREP (PACKET_HEADER0_PACKET_ID ,1 ); -if (dma && !i2c_dev->msg_read) +if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) *buffer++ = packet_header;else i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO ); packet_header = msg->len -1 ; -if (dma && !i2c_dev->msg_read) +if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) *buffer++ = packet_header;else i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO );
@@ -1207,13 +1206,13 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, packet_header |=I2C_HEADER_CONT_ON_NAK ;if (msg->flags &I2C_M_RD ) packet_header |=I2C_HEADER_READ ; -if (dma && !i2c_dev->msg_read) +if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) *buffer++ = packet_header;else i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO );if (!i2c_dev->msg_read) { -if (dma) { +if (i2c_dev->is_curr_dma_xfer) {memcpy (buffer, msg->buf, msg->len); dma_sync_single_for_device(i2c_dev->dev, i2c_dev->dma_phys,
@@ -1233,7 +1232,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (i2c_dev->hw->has_per_pkt_xfer_complete_irq) int_mask |=I2C_INT_PACKET_XFER_COMPLETE ; -if (!dma) { +if (!i2c_dev->is_curr_dma_xfer) {if (msg->flags &I2C_M_RD ) int_mask |=I2C_INT_RX_FIFO_DATA_REQ ;else if (i2c_dev->msg_buf_remaining)
@@ -1244,7 +1243,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,dev_dbg (i2c_dev->dev,"unmasked irq: %02x\n" ,i2c_readl (i2c_dev,I2C_INT_MASK )); -if (dma) { +if (i2c_dev->is_curr_dma_xfer) { time_left =tegra_i2c_wait_completion_timeout ( i2c_dev, &i2c_dev->dma_complete, xfer_time);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 21/35 i2c: tegra: Don't fall back to PIO mode if DMA configuration fails
In reply to Dmitry OsipenkoThe DMA code path has been tested well enough and the DMA configuration performed by tegra_i2c_config_fifo_trig() shouldn't ever fail in practice. Hence let's remove the obscure transfer-mode switching in order to have a cleaner and simpler code. Now I2C transfer will be failed if DMA configuration fails.
--- drivers/i2c/busses/i2c-tegra.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/i2c/busses/i2c-tegra.c +10 -8
@@ -940,8 +940,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)return IRQ_HANDLED ; } -static void tegra_i2c_config_fifo_trig (struct tegra_i2c_dev *i2c_dev, -size_t len) +static int tegra_i2c_config_fifo_trig (struct tegra_i2c_dev *i2c_dev,size_t len) {u32 val, reg;u8 dma_burst;
@@ -992,12 +991,10 @@ static void tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev,if (ret <0 ) {dev_err (i2c_dev->dev,"DMA slave config failed: %d\n" , ret); -dev_err (i2c_dev->dev,"falling back to PIO\n" ); -tegra_i2c_release_dma (i2c_dev); - i2c_dev->is_curr_dma_xfer = false; - }else { - goto out; +return ret; } + + goto out; }if (i2c_dev->hw->has_mst_fifo)
@@ -1008,6 +1005,8 @@ static void tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev,I2C_FIFO_CONTROL_RX_TRIG (1 ); out:i2c_writel (i2c_dev, val, reg); + +return 0 ; } static unsigned long
@@ -1141,7 +1140,10 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, i2c_dev->is_curr_dma_xfer = (xfer_size >I2C_PIO_MODE_PREFERRED_LEN ) && i2c_dev->dma_buf && !i2c_dev->is_curr_atomic_xfer; -tegra_i2c_config_fifo_trig (i2c_dev, xfer_size); + + err =tegra_i2c_config_fifo_trig (i2c_dev, xfer_size); +if (err) +return err;/* * Transfer time in mSec = Total bits / transfer rate
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 22/35 i2c: tegra: Improve formatting of variables
In reply to Dmitry OsipenkoReorder definition of variables in the code to have them sorted by length and grouped logically, also replace "unsigned long" with "u32". Do this in order to make code easier to read.
--- drivers/i2c/busses/i2c-tegra.c | 100 +++++++++++++++------------------ 1 file changed, 46 insertions(+), 54 deletions(-)
drivers/i2c/busses/i2c-tegra.c +46 -54
@@ -259,42 +259,48 @@ struct tegra_i2c_hw_feature {*/ struct tegra_i2c_dev {struct device *dev; -const struct tegra_i2c_hw_feature *hw;struct i2c_adapter adapter; -struct clk *div_clk; -struct clk_bulk_data *clocks; -unsigned int nclocks; + +const struct tegra_i2c_hw_feature *hw;struct reset_control *rst; -void __iomem *base; -phys_addr_t base_phys;unsigned int cont_id;unsigned int irq; -bool is_dvc; -bool is_vi; + +phys_addr_t base_phys; +void __iomem *base; + +struct clk_bulk_data *clocks; +unsigned int nclocks; + +struct clk *div_clk; +u32 bus_clk_rate; +struct completion msg_complete; +size_t msg_buf_remaining;int msg_err;u8 *msg_buf; -size_t msg_buf_remaining; -bool msg_read; -u32 bus_clk_rate; -bool is_multimaster_mode; + +struct completion dma_complete;struct dma_chan *tx_dma_chan;struct dma_chan *rx_dma_chan; +unsigned int dma_buf_size;dma_addr_t dma_phys;u32 *dma_buf; -unsigned int dma_buf_size; -bool is_curr_dma_xfer; -struct completion dma_complete; + +bool is_multimaster_mode;bool is_curr_atomic_xfer; +bool is_curr_dma_xfer; +bool msg_read; +bool is_dvc; +bool is_vi; }; -static void dvc_writel (struct tegra_i2c_dev *i2c_dev,u32 val, -unsigned long reg) +static void dvc_writel (struct tegra_i2c_dev *i2c_dev,u32 val,u32 reg) {writel_relaxed (val, i2c_dev->base + reg); } -static u32 dvc_readl (struct tegra_i2c_dev *i2c_dev,unsigned long reg) +static u32 dvc_readl (struct tegra_i2c_dev *i2c_dev,u32 reg) {return readl_relaxed (i2c_dev->base + reg); }
@@ -303,8 +309,7 @@ static u32 dvc_readl(struct tegra_i2c_dev *i2c_dev, unsigned long reg)* i2c_writel and i2c_readl will offset the register if necessary to talk * to the I2C block inside the DVC block */ -static unsigned long tegra_i2c_reg_addr (struct tegra_i2c_dev *i2c_dev, -unsigned long reg) +static u32 tegra_i2c_reg_addr (struct tegra_i2c_dev *i2c_dev,u32 reg) {if (i2c_dev->is_dvc) reg += (reg >=I2C_TX_FIFO ) ?0x10 :0x40 ;
@@ -313,8 +318,7 @@ static unsigned long tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev,return reg; } -static void i2c_writel (struct tegra_i2c_dev *i2c_dev,u32 val, -unsigned long reg) +static void i2c_writel (struct tegra_i2c_dev *i2c_dev,u32 val,u32 reg) {writel_relaxed (val, i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg));
@@ -323,19 +327,19 @@ static void i2c_writel(struct tegra_i2c_dev *i2c_dev, u32 val,readl_relaxed (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg)); } -static u32 i2c_readl (struct tegra_i2c_dev *i2c_dev,unsigned long reg) +static u32 i2c_readl (struct tegra_i2c_dev *i2c_dev,u32 reg) {return readl_relaxed (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg)); }static void i2c_writesl (struct tegra_i2c_dev *i2c_dev,void *data, -unsigned long reg,unsigned int len) +u32 reg,unsigned int len) {writesl (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg), data, len); }static void i2c_readsl (struct tegra_i2c_dev *i2c_dev,void *data, -unsigned long reg,unsigned int len) +u32 reg,unsigned int len) {readsl (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg), data, len); }
@@ -410,8 +414,8 @@ static void tegra_i2c_release_dma(struct tegra_i2c_dev *i2c_dev)static int tegra_i2c_init_dma (struct tegra_i2c_dev *i2c_dev) {struct dma_chan *chan; -u32 *dma_buf;dma_addr_t dma_phys; +u32 *dma_buf;int err;if (!i2c_dev->hw->has_apb_dma || i2c_dev->is_vi)
@@ -584,12 +588,8 @@ static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev)static int tegra_i2c_init (struct tegra_i2c_dev *i2c_dev) { -u32 val; +u32 val, clk_divisor, clk_multiplier, tsu_thd, tlow, thigh, non_hs_mode;int err; -u32 clk_divisor, clk_multiplier; -u32 non_hs_mode; -u32 tsu_thd; -u8 tlow, thigh;/* * The reset shouldn't ever fail in practice. The failure will be a
@@ -711,11 +711,10 @@ static int tegra_i2c_disable_packet_mode(struct tegra_i2c_dev *i2c_dev)static int tegra_i2c_empty_rx_fifo (struct tegra_i2c_dev *i2c_dev) { -u32 val; -unsigned int rx_fifo_avail; -u8 *buf = i2c_dev->msg_buf;size_t buf_remaining = i2c_dev->msg_buf_remaining; -unsigned int words_to_transfer; +unsigned int words_to_transfer, rx_fifo_avail; +u8 *buf = i2c_dev->msg_buf; +u32 val;/* * Catch overflow due to message fully sent
@@ -772,11 +771,10 @@ static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev)static int tegra_i2c_fill_tx_fifo (struct tegra_i2c_dev *i2c_dev) { -u32 val; -unsigned int tx_fifo_avail; -u8 *buf = i2c_dev->msg_buf;size_t buf_remaining = i2c_dev->msg_buf_remaining; -unsigned int words_to_transfer; +unsigned int words_to_transfer, tx_fifo_avail; +u8 *buf = i2c_dev->msg_buf; +u32 val;if (i2c_dev->hw->has_mst_fifo) { val =i2c_readl (i2c_dev,I2C_MST_FIFO_STATUS );
@@ -837,9 +835,9 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev)static irqreturn_t tegra_i2c_isr (int irq,void *dev_id) { -u32 status;const u32 status_err =I2C_INT_NO_ACK |I2C_INT_ARBITRATION_LOST ;struct tegra_i2c_dev *i2c_dev = dev_id; +u32 status; status =i2c_readl (i2c_dev,I2C_INT_STATUS );
@@ -942,12 +940,10 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)static int tegra_i2c_config_fifo_trig (struct tegra_i2c_dev *i2c_dev,size_t len) { -u32 val, reg; -u8 dma_burst;struct dma_slave_config slv_config = {0 }; +u32 val, reg, dma_burst, reg_offset;struct dma_chan *chan;int ret; -unsigned long reg_offset;if (i2c_dev->hw->has_mst_fifo) reg =I2C_MST_FIFO_CONTROL ;
@@ -1073,9 +1069,8 @@ tegra_i2c_wait_completion_timeout(struct tegra_i2c_dev *i2c_dev,static int tegra_i2c_issue_bus_clear (struct i2c_adapter *adap) {struct tegra_i2c_dev *i2c_dev =i2c_get_adapdata (adap); +u32 reg, time_left;int err; -unsigned long time_left; -u32 reg;reinit_completion (&i2c_dev->msg_complete); reg = FIELD_PREP(I2C_BC_SCLK_THRESHOLD, 9) | I2C_BC_STOP_COND |
@@ -1113,13 +1108,11 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,struct i2c_msg *msg, enum msg_end_type end_state) { - u32 packet_header; -u32 int_mask; -unsigned long time_left; -size_t xfer_size; + unsigned long time_left, xfer_time = 100; +u32 packet_header, int_mask;u32 *buffer =NULL ; -int err =0 ; -u16 xfer_time =100 ; +size_t xfer_size; +int err; err =tegra_i2c_flush_fifos (i2c_dev);if (err)
@@ -1318,8 +1311,7 @@ static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) {struct tegra_i2c_dev *i2c_dev =i2c_get_adapdata (adap); -int i; -int ret; +int i, ret; ret =pm_runtime_get_sync (i2c_dev->dev);if (ret <0 ) {
@@ -1579,8 +1571,8 @@ MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);static void tegra_i2c_parse_dt (struct tegra_i2c_dev *i2c_dev) {struct device_node *np = i2c_dev->dev->of_node; -int ret;bool multi_mode; +int ret; ret =of_property_read_u32 (np,"clock-frequency" , &i2c_dev->bus_clk_rate);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 23/35 i2c: tegra: Improve coding style of tegra_i2c_wait_for_config_load()
In reply to Dmitry OsipenkoImprove coding style of the tegra_i2c_wait_for_config_load() function by removing need to wrap code in order make it more readable and to adhere to the common kernel coding style.
--- drivers/i2c/busses/i2c-tegra.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-)
drivers/i2c/busses/i2c-tegra.c +16 -18
@@ -562,25 +562,23 @@ static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev)u32 val;int err; -if (i2c_dev->hw->has_config_load_reg) { - reg_offset =tegra_i2c_reg_addr (i2c_dev,I2C_CONFIG_LOAD ); - addr = i2c_dev->base + reg_offset; -i2c_writel (i2c_dev,I2C_MSTR_CONFIG_LOAD ,I2C_CONFIG_LOAD ); - -if (i2c_dev->is_curr_atomic_xfer) - err =readl_relaxed_poll_timeout_atomic ( - addr, val, val ==0 ,1000 , -I2C_CONFIG_LOAD_TIMEOUT ); -else - err =readl_relaxed_poll_timeout ( - addr, val, val ==0 ,1000 , -I2C_CONFIG_LOAD_TIMEOUT ); +if (!i2c_dev->hw->has_config_load_reg) +return 0 ; -if (err) { -dev_warn (i2c_dev->dev, -"timeout waiting for config load\n" ); -return err; - } + reg_offset =tegra_i2c_reg_addr (i2c_dev,I2C_CONFIG_LOAD ); + addr = i2c_dev->base + reg_offset; +i2c_writel (i2c_dev,I2C_MSTR_CONFIG_LOAD ,I2C_CONFIG_LOAD ); + +if (i2c_dev->is_curr_atomic_xfer) + err =readl_relaxed_poll_timeout_atomic (addr, val, val ==0 ,1000 , +I2C_CONFIG_LOAD_TIMEOUT ); +else + err =readl_relaxed_poll_timeout (addr, val, val ==0 ,1000 , +I2C_CONFIG_LOAD_TIMEOUT ); + +if (err) { +dev_warn (i2c_dev->dev,"timeout waiting for config load\n" ); +return err; }return 0 ;
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 24/35 i2c: tegra: Rename wait/poll functions
In reply to Dmitry OsipenkoDrop '_timeout' postfix from the wait/poll completion function names in order to make the names shorter, making code cleaner a tad.
--- drivers/i2c/busses/i2c-tegra.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-)
drivers/i2c/busses/i2c-tegra.c +15 -18
@@ -1003,10 +1003,9 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len)return 0 ; } -static unsigned long -tegra_i2c_poll_completion_timeout (struct tegra_i2c_dev *i2c_dev, -struct completion *complete, -unsigned int timeout_ms) +static unsigned long tegra_i2c_poll_completion (struct tegra_i2c_dev *i2c_dev, +struct completion *complete, +unsigned int timeout_ms) {ktime_t ktime =ktime_get ();ktime_t ktimeout =ktime_add_ms (ktime, timeout_ms);
@@ -1030,16 +1029,14 @@ tegra_i2c_poll_completion_timeout(struct tegra_i2c_dev *i2c_dev,return 0 ; } -static unsigned long -tegra_i2c_wait_completion_timeout (struct tegra_i2c_dev *i2c_dev, -struct completion *complete, -unsigned int timeout_ms) +static unsigned long tegra_i2c_wait_completion (struct tegra_i2c_dev *i2c_dev, +struct completion *complete, +unsigned int timeout_ms) {unsigned long ret;if (i2c_dev->is_curr_atomic_xfer) { - ret =tegra_i2c_poll_completion_timeout (i2c_dev, complete, - timeout_ms); + ret =tegra_i2c_poll_completion (i2c_dev, complete, timeout_ms); }else {enable_irq (i2c_dev->irq); ret = wait_for_completion_timeout(complete,
@@ -1057,8 +1054,7 @@ tegra_i2c_wait_completion_timeout(struct tegra_i2c_dev *i2c_dev,* needs to be checked after timeout. */ if (ret ==0 ) - ret =tegra_i2c_poll_completion_timeout (i2c_dev, - complete,0 ); + ret =tegra_i2c_poll_completion (i2c_dev, complete,0 ); }return ret;
@@ -1083,8 +1079,8 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)i2c_writel (i2c_dev, reg,I2C_BUS_CLEAR_CNFG );tegra_i2c_unmask_irq (i2c_dev,I2C_INT_BUS_CLR_DONE ); - time_left =tegra_i2c_wait_completion_timeout ( - i2c_dev, &i2c_dev->msg_complete,50 ); + time_left =tegra_i2c_wait_completion (i2c_dev, &i2c_dev->msg_complete, +50 );tegra_i2c_mask_irq (i2c_dev,I2C_INT_BUS_CLR_DONE );if (time_left ==0 ) {
@@ -1237,8 +1233,9 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, i2c_readl(i2c_dev, I2C_INT_MASK));if (i2c_dev->is_curr_dma_xfer) { - time_left =tegra_i2c_wait_completion_timeout ( - i2c_dev, &i2c_dev->dma_complete, xfer_time); + time_left =tegra_i2c_wait_completion (i2c_dev, + &i2c_dev->dma_complete, + xfer_time);/* * Synchronize DMA first, since dmaengine_terminate_sync()
@@ -1269,8 +1266,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, } } - time_left =tegra_i2c_wait_completion_timeout ( - i2c_dev, &i2c_dev->msg_complete, xfer_time); + time_left =tegra_i2c_wait_completion (i2c_dev, &i2c_dev->msg_complete, + xfer_time);tegra_i2c_mask_irq (i2c_dev, int_mask);
Signature · 1 line
2.27.0
Re: [PATCH v6 24/35] i2c: tegra: Rename wait/poll functions
Quoted 3 lines · Dmitry Osipenko
Drop '
_timeout' postfix from the wait/poll completion function names in order to make the names shorter, making code cleaner a tad.
...
drivers/i2c/busses/i2c-tegra.c static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap) · line 1083
Quoted 2 lines
drivers/i2c/busses/i2c-tegra.c +2
-0+ time_left =tegra_i2c_wait_completion (i2c_dev, &i2c_dev->msg_complete, +50 );
Why not one line?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Dmitry Osipenko
reviewerRe: [PATCH v6 24/35] i2c: tegra: Rename wait/poll functions
08.09.2020 11:45, Andy Shevchenko пишет:
Quoted 5 lines · Dmitry Osipenko
Quoted 3 lines
Drop '
_timeout' postfix from the wait/poll completion function names in order to make the names shorter, making code cleaner a tad.
Quoted 7 lines
...
drivers/i2c/busses/i2c-tegra.c static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap) · line 1083
Quoted 2 lines
drivers/i2c/busses/i2c-tegra.c +2
-0+ time_left =tegra_i2c_wait_completion (i2c_dev, &i2c_dev->msg_complete, +50 );Why not one line?
It goes over 80 chars, which is still a preferred max-length, although it's not a mandatory limit anymore. For example I have a code editor setup that is tuned for 80 chars, allowing to have multiple files viewed and edited simultaneously.
But I think in the case of this particular hunk of the code, the indentation improvement would indeed overweight the code-length. I'll change it in v6, thanks!
Dmitry Osipenko
reviewerPATCH v6 25/35 i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg()
In reply to Dmitry OsipenkoFactor out error recovery code from tegra_i2c_xfer_msg() in order to make this function easier to read and follow.
--- drivers/i2c/busses/i2c-tegra.c | 46 ++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 16 deletions(-)
drivers/i2c/busses/i2c-tegra.c +30 -16
@@ -1098,6 +1098,32 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)return -EAGAIN ; } +static int tegra_i2c_error_recover (struct tegra_i2c_dev *i2c_dev, +struct i2c_msg *msg) +{ +if (i2c_dev->msg_err ==I2C_ERR_NONE ) +return 0 ; + +tegra_i2c_init (i2c_dev); + +/* start recovery upon arbitration loss in single master mode */ +if (i2c_dev->msg_err ==I2C_ERR_ARBITRATION_LOST ) { +if (!i2c_dev->is_multimaster_mode) +return i2c_recover_bus (&i2c_dev->adapter); + +return -EAGAIN ; + } + +if (i2c_dev->msg_err ==I2C_ERR_NO_ACK ) { +if (msg->flags &I2C_M_IGNORE_NAK ) +return 0 ; + +return -EREMOTEIO ; + } + +return -EIO ; +} +static int tegra_i2c_xfer_msg (struct tegra_i2c_dev *i2c_dev,struct i2c_msg *msg,enum msg_end_type end_state)
@@ -1282,24 +1308,12 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, i2c_dev->msg_err); i2c_dev->is_curr_dma_xfer = false; -if (i2c_dev->msg_err ==I2C_ERR_NONE ) -return 0 ; -tegra_i2c_init (i2c_dev); -/* start recovery upon arbitration loss in single master mode */ -if (i2c_dev->msg_err ==I2C_ERR_ARBITRATION_LOST ) { -if (!i2c_dev->is_multimaster_mode) -return i2c_recover_bus (&i2c_dev->adapter); -return -EAGAIN ; - } - -if (i2c_dev->msg_err ==I2C_ERR_NO_ACK ) { -if (msg->flags &I2C_M_IGNORE_NAK ) -return 0 ; -return -EREMOTEIO ; - } + err =tegra_i2c_error_recover (i2c_dev, msg); +if (err) +return err; -return -EIO ; +return 0 ; } static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
Signature · 1 line
2.27.0
Re: [PATCH v6 25/35] i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg()
Quoted 3 lines · Dmitry Osipenko
Factor out error recovery code from
tegra_i2c_xfer_msg()in order to make this function easier to read and follow.
Ordering issue.
You have a patch that replaces int -> unsigned int or so, which obviously has less impact (severity) than this one.
Can you revisit the entire series and rethink ordering one more time?
Signature · 2 lines
With Best Regards, Andy Shevchenko
Dmitry Osipenko
reviewerRe: [PATCH v6 25/35] i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg()
08.09.2020 11:49, Andy Shevchenko пишет:
Quoted 8 lines · Dmitry Osipenko
Quoted 3 lines
Factor out error recovery code from
tegra_i2c_xfer_msg()in order to make this function easier to read and follow.Ordering issue.
You have a patch that replaces int -> unsigned int or so, which obviously has less impact (severity) than this one.
I guess you meant s/less/more/.
Quoted 2 lines
Can you revisit the entire series and rethink ordering one more time?
I'll try to improve the ordering a bit more, thanks.
Dmitry Osipenko
reviewerPATCH v6 26/35 i2c: tegra: Factor out packet header setup from tegra_i2c_xfer_msg()
In reply to Dmitry OsipenkoThe code related to packet header setting up is a bit messy and makes tegra_i2c_xfer_msg() more difficult to read than it could be. Let's factor the packet header setup from tegra_i2c_xfer_msg() into separate function in order to make code easier to read and follow.
--- drivers/i2c/busses/i2c-tegra.c | 93 ++++++++++++++++++++-------------- 1 file changed, 54 insertions(+), 39 deletions(-)
drivers/i2c/busses/i2c-tegra.c +54 -39
@@ -1098,6 +1098,57 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)return -EAGAIN ; } +static void tegra_i2c_push_packet_header (struct tegra_i2c_dev *i2c_dev, +struct i2c_msg *msg, +enum msg_end_type end_state) +{ +u32 *dma_buf = i2c_dev->dma_buf; +u32 packet_header; + + packet_header =FIELD_PREP (PACKET_HEADER0_HEADER_SIZE ,0 ) | +FIELD_PREP (PACKET_HEADER0_PROTOCOL , +PACKET_HEADER0_PROTOCOL_I2C ) | +FIELD_PREP (PACKET_HEADER0_CONT_ID , i2c_dev->cont_id) | +FIELD_PREP (PACKET_HEADER0_PACKET_ID ,1 ); + +if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) + *dma_buf++ = packet_header; +else +i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO ); + + packet_header = msg->len -1 ; + +if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) + *dma_buf++ = packet_header; +else +i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO ); + + packet_header =I2C_HEADER_IE_ENABLE ; + +if (end_state ==MSG_END_CONTINUE ) + packet_header |=I2C_HEADER_CONTINUE_XFER ; +else if (end_state ==MSG_END_REPEAT_START ) + packet_header |=I2C_HEADER_REPEAT_START ; + +if (msg->flags &I2C_M_TEN ) { + packet_header |= msg->addr; + packet_header |=I2C_HEADER_10BIT_ADDR ; + }else { + packet_header |= msg->addr <<I2C_HEADER_SLAVE_ADDR_SHIFT ; + } + +if (msg->flags &I2C_M_IGNORE_NAK ) + packet_header |=I2C_HEADER_CONT_ON_NAK ; + +if (msg->flags &I2C_M_RD ) + packet_header |=I2C_HEADER_READ ; + +if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) + *dma_buf++ = packet_header; +else +i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO ); +} +static int tegra_i2c_error_recover (struct tegra_i2c_dev *i2c_dev,struct i2c_msg *msg) {
@@ -1129,9 +1180,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, enum msg_end_type end_state) {unsigned long time_left, xfer_time =100 ; -u32 packet_header, int_mask; -u32 *buffer =NULL ;size_t xfer_size; +u32 int_mask;int err; err =tegra_i2c_flush_fifos (i2c_dev);
@@ -1186,49 +1236,14 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, i2c_dev->dma_phys, xfer_size, DMA_TO_DEVICE); - buffer = i2c_dev->dma_buf; } } - packet_header =FIELD_PREP (PACKET_HEADER0_HEADER_SIZE ,0 ) | -FIELD_PREP (PACKET_HEADER0_PROTOCOL , -PACKET_HEADER0_PROTOCOL_I2C ) | -FIELD_PREP (PACKET_HEADER0_CONT_ID , i2c_dev->cont_id) | -FIELD_PREP (PACKET_HEADER0_PACKET_ID ,1 ); -if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) - *buffer++ = packet_header; -else -i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO ); - - packet_header = msg->len -1 ; -if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) - *buffer++ = packet_header; -else -i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO ); - - packet_header =I2C_HEADER_IE_ENABLE ; -if (end_state ==MSG_END_CONTINUE ) - packet_header |=I2C_HEADER_CONTINUE_XFER ; -else if (end_state ==MSG_END_REPEAT_START ) - packet_header |=I2C_HEADER_REPEAT_START ; -if (msg->flags &I2C_M_TEN ) { - packet_header |= msg->addr; - packet_header |=I2C_HEADER_10BIT_ADDR ; - }else { - packet_header |= msg->addr <<I2C_HEADER_SLAVE_ADDR_SHIFT ; - } -if (msg->flags &I2C_M_IGNORE_NAK ) - packet_header |=I2C_HEADER_CONT_ON_NAK ; -if (msg->flags &I2C_M_RD ) - packet_header |=I2C_HEADER_READ ; -if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) - *buffer++ = packet_header; -else -i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO ); +tegra_i2c_push_packet_header (i2c_dev, msg, end_state);if (!i2c_dev->msg_read) {if (i2c_dev->is_curr_dma_xfer) { -memcpy (buffer, msg->buf, msg->len); +memcpy (i2c_dev->dma_buf, msg->buf, msg->len); dma_sync_single_for_device(i2c_dev->dev, i2c_dev->dma_phys, xfer_size,
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 27/35 i2c: tegra: Factor out register polling into separate function
In reply to Dmitry OsipenkoFactor out register polling into a separate function in order to remove boilerplate code and make code cleaner.
--- drivers/i2c/busses/i2c-tegra.c | 43 +++++++++++++++------------------- 1 file changed, 19 insertions(+), 24 deletions(-)
drivers/i2c/busses/i2c-tegra.c +19 -24
@@ -518,10 +518,24 @@ static void tegra_i2c_vi_init(struct tegra_i2c_dev *i2c_dev)i2c_writel (i2c_dev,0x0 ,I2C_TLOW_SEXT ); } +static int tegra_i2c_poll_register (struct tegra_i2c_dev *i2c_dev, +u32 reg,u32 mask,u32 delay_us, +u32 timeout_us) +{ +void __iomem *addr = i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg); +u32 val; + +if (!i2c_dev->is_curr_atomic_xfer) +return readl_relaxed_poll_timeout (addr, val, !(val & mask), + delay_us, timeout_us); + +return readl_relaxed_poll_timeout_atomic (addr, val, !(val & mask), + delay_us, timeout_us); +} +static int tegra_i2c_flush_fifos (struct tegra_i2c_dev *i2c_dev) { -u32 mask, val, offset, reg_offset; -void __iomem *addr; +u32 mask, val, offset;int err;if (i2c_dev->hw->has_mst_fifo) {
@@ -538,16 +552,7 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev) val |= mask;i2c_writel (i2c_dev, val, offset); - reg_offset =tegra_i2c_reg_addr (i2c_dev, offset); - addr = i2c_dev->base + reg_offset; - -if (i2c_dev->is_curr_atomic_xfer) - err =readl_relaxed_poll_timeout_atomic (addr, val, !(val & mask), -1000 ,1000000 ); -else - err =readl_relaxed_poll_timeout (addr, val, !(val & mask), -1000 ,1000000 ); - + err =tegra_i2c_poll_register (i2c_dev, offset, mask,1000 ,1000000 );if (err) {dev_err (i2c_dev->dev,"failed to flush FIFO\n" );return err;
@@ -557,25 +562,15 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)static int tegra_i2c_wait_for_config_load (struct tegra_i2c_dev *i2c_dev) { -unsigned long reg_offset; -void __iomem *addr; -u32 val;int err;if (!i2c_dev->hw->has_config_load_reg)return 0 ; - reg_offset =tegra_i2c_reg_addr (i2c_dev,I2C_CONFIG_LOAD ); - addr = i2c_dev->base + reg_offset;i2c_writel (i2c_dev,I2C_MSTR_CONFIG_LOAD ,I2C_CONFIG_LOAD ); -if (i2c_dev->is_curr_atomic_xfer) - err =readl_relaxed_poll_timeout_atomic (addr, val, val ==0 ,1000 , -I2C_CONFIG_LOAD_TIMEOUT ); -else - err =readl_relaxed_poll_timeout (addr, val, val ==0 ,1000 , -I2C_CONFIG_LOAD_TIMEOUT ); - + err =tegra_i2c_poll_register (i2c_dev,I2C_CONFIG_LOAD ,0xffffffff , +1000 ,I2C_CONFIG_LOAD_TIMEOUT );if (err) {dev_warn (i2c_dev->dev,"timeout waiting for config load\n" );return err;
Signature · 1 line
2.27.0
Re: [PATCH v6 27/35] i2c: tegra: Factor out register polling into separate function
Quoted 3 lines · Dmitry Osipenko
Factor out register polling into a separate function in order to remove boilerplate code and make code cleaner.
I'm wondering if you can make it before the patch that touches one of these conditionals.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Dmitry Osipenko
reviewerRe: [PATCH v6 27/35] i2c: tegra: Factor out register polling into separate function
08.09.2020 11:51, Andy Shevchenko пишет:
Quoted 8 lines · Dmitry Osipenko
Quoted 3 lines
Factor out register polling into a separate function in order to remove boilerplate code and make code cleaner.
I'm wondering if you can make it before the patch that touches one of these conditionals.
I guess you're meaning the "Improve coding style of tegra_i2c_wait_for_config_load()" patch.
If yes, then it should be fine to swap the order. Although, I'm not sure what's benefit.
Dmitry Osipenko
reviewerPATCH v6 28/35 i2c: tegra: Factor out hardware initialization into separate function
In reply to Dmitry OsipenkoFactor out hardware initialization into a separate function from the probe function. The only place where runtime PM needs to be resumed during probe is the place of hardware initialization, hence it makes sense to factor out it in order to have a bit cleaner error handling in tegra_i2c_probe().
--- drivers/i2c/busses/i2c-tegra.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
drivers/i2c/busses/i2c-tegra.c +19 -14
@@ -1655,6 +1655,21 @@ static void tegra_i2c_release_clocks(struct tegra_i2c_dev *i2c_dev)clk_bulk_unprepare (i2c_dev->nclocks, i2c_dev->clocks); } +static int tegra_i2c_init_hardware (struct tegra_i2c_dev *i2c_dev) +{ +int ret; + + ret =pm_runtime_get_sync (i2c_dev->dev); +if (ret <0 ) +dev_err (i2c_dev->dev,"runtime resume failed: %d\n" , ret); +else + ret =tegra_i2c_init (i2c_dev); + +pm_runtime_put (i2c_dev->dev); + +return ret; +} +static int tegra_i2c_probe (struct platform_device *pdev) {struct tegra_i2c_dev *i2c_dev;
@@ -1724,16 +1739,9 @@ static int tegra_i2c_probe(struct platform_device *pdev)pm_runtime_enable (i2c_dev->dev); - err =pm_runtime_get_sync (i2c_dev->dev); -if (err <0 ) { -dev_err (i2c_dev->dev,"runtime resume failed: %d\n" , err); - goto put_rpm; - } - -/* initialize hardware state */ - err =tegra_i2c_init (i2c_dev); + err =tegra_i2c_init_hardware (i2c_dev);if (err) - goto put_rpm; + goto release_rpm; i2c_dev->adapter.dev.of_node = i2c_dev->dev->of_node; i2c_dev->adapter.dev.parent = i2c_dev->dev;
@@ -1755,14 +1763,11 @@ static int tegra_i2c_probe(struct platform_device *pdev) err =i2c_add_numbered_adapter (&i2c_dev->adapter);if (err) - goto put_rpm; - -pm_runtime_put (i2c_dev->dev); + goto release_rpm;return 0 ; -put_rpm: -pm_runtime_put (i2c_dev->dev); +release_rpm:pm_runtime_disable (i2c_dev->dev);tegra_i2c_release_dma (i2c_dev);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 29/35 i2c: tegra: Check errors for both positive and negative values
In reply to Dmitry OsipenkoThe driver's code is inconsistent in regards to the error values checking. The correct way should be to check both positive and negative values. This patch cleans up the error-checks in the code. Note that the pm_runtime_get_sync() could return positive value on success, hence only relevant parts of the code are changed by this patch.
--- drivers/i2c/busses/i2c-tegra.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-tegra.c +3 -3
@@ -977,7 +977,7 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len) slv_config.device_fc = true; ret =dmaengine_slave_config (chan, &slv_config); -if (ret <0 ) { +if (ret) {dev_err (i2c_dev->dev,"DMA slave config failed: %d\n" , ret);return ret;
@@ -1219,7 +1219,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, xfer_size, DMA_FROM_DEVICE); err =tegra_i2c_dma_submit (i2c_dev, xfer_size); -if (err <0 ) { +if (err) {dev_err (i2c_dev->dev,"starting RX DMA failed, err %d\n" , err);
@@ -1244,7 +1244,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, xfer_size, DMA_TO_DEVICE); err =tegra_i2c_dma_submit (i2c_dev, xfer_size); -if (err <0 ) { +if (err) {dev_err (i2c_dev->dev,"starting TX DMA failed, err %d\n" , err);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 30/35 i2c: tegra: Consolidate error handling in tegra_i2c_xfer_msg()
In reply to Dmitry OsipenkoConsolidate error handling in tegra_i2c_xfer_msg() into a common code path in order to make code cleaner.
--- drivers/i2c/busses/i2c-tegra.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-tegra.c +9 -4
@@ -1288,8 +1288,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (!time_left && !completion_done (&i2c_dev->dma_complete)) {dev_err (i2c_dev->dev,"DMA transfer timeout\n" ); -tegra_i2c_init (i2c_dev); -return -ETIMEDOUT ; + err = -ETIMEDOUT ; + goto reset_hardware; }if (i2c_dev->msg_read && i2c_dev->msg_err ==I2C_ERR_NONE ) {
@@ -1309,8 +1309,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (time_left ==0 ) {dev_err (i2c_dev->dev,"i2c transfer timed out\n" ); -tegra_i2c_init (i2c_dev); -return -ETIMEDOUT ; + err = -ETIMEDOUT ; + goto reset_hardware; } dev_dbg(i2c_dev->dev, "transfer complete: %lu %d %d\n",
@@ -1324,6 +1324,11 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,return err;return 0 ; + +reset_hardware: +tegra_i2c_init (i2c_dev); + +return err; } static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 31/35 i2c: tegra: Clean up variable names
In reply to Dmitry OsipenkoRename "ret" variables to "err" in order to make code a bit more expressive, emphasizing that the returned value is an error code.
Rename variable "reg" to "val" in order to better reflect the actual usage of the variable in the code and to make naming consistent with the rest of the code.
Use briefer names for a few members of the tegra_i2c_dev structure in order to improve readability of the code.
--- drivers/i2c/busses/i2c-tegra.c | 109 ++++++++++++++++----------------- 1 file changed, 54 insertions(+), 55 deletions(-)
drivers/i2c/busses/i2c-tegra.c +54 -55
@@ -247,15 +247,15 @@ struct tegra_i2c_hw_feature {* @msg_buf_remaining: size of unsent data in the message buffer * @msg_read: identifies read transfers * @bus_clk_rate: current I2C bus clock rate -* @is_multimaster_mode: track if I2C controller is in multi-master mode +* @multimaster_mode: indicates that I2C controller is in multi-master mode * @tx_dma_chan: DMA transmit channel * @rx_dma_chan: DMA receive channel * @dma_phys: handle to DMA resources * @dma_buf: pointer to allocated DMA buffer * @dma_buf_size: DMA buffer size -* @is_curr_dma_xfer: indicates active DMA transfer +* @dma_mode: indicates active DMA transfer * @dma_complete: DMA completion notifier -* @is_curr_atomic_xfer: indicates active atomic transfer +* @atomic_mode: indicates active atomic transfer */ struct tegra_i2c_dev {struct device *dev;
@@ -287,9 +287,9 @@ struct tegra_i2c_dev {dma_addr_t dma_phys;u32 *dma_buf; -bool is_multimaster_mode; -bool is_curr_atomic_xfer; -bool is_curr_dma_xfer; +bool multimaster_mode; +bool atomic_mode; +bool dma_mode;bool msg_read;bool is_dvc;bool is_vi;
@@ -525,7 +525,7 @@ static int tegra_i2c_poll_register(struct tegra_i2c_dev *i2c_dev,void __iomem *addr = i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg);u32 val; -if (!i2c_dev->is_curr_atomic_xfer) +if (!i2c_dev->atomic_mode)return readl_relaxed_poll_timeout (addr, val, !(val & mask), delay_us, timeout_us);
@@ -673,7 +673,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)if (err)return err; -if (i2c_dev->is_multimaster_mode && i2c_dev->hw->has_slcg_override_reg) +if (i2c_dev->multimaster_mode && i2c_dev->hw->has_slcg_override_reg)i2c_writel (i2c_dev,I2C_MST_CORE_CLKEN_OVR ,I2C_CLKEN_OVERRIDE ); err =tegra_i2c_wait_for_config_load (i2c_dev);
@@ -859,7 +859,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)if (i2c_dev->hw->supports_bus_clear && (status &I2C_INT_BUS_CLR_DONE )) goto err; -if (!i2c_dev->is_curr_dma_xfer) { +if (!i2c_dev->dma_mode) {if (i2c_dev->msg_read && (status &I2C_INT_RX_FIFO_DATA_REQ )) {if (tegra_i2c_empty_rx_fifo (i2c_dev)) {/*
@@ -893,7 +893,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)* so forcing msg_buf_remaining to 0 in DMA mode. */ if (status &I2C_INT_PACKET_XFER_COMPLETE ) { -if (i2c_dev->is_curr_dma_xfer) +if (i2c_dev->dma_mode) i2c_dev->msg_buf_remaining =0 ;/* * Underflow error condition: XFER_COMPLETE before message
@@ -917,7 +917,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)if (i2c_dev->is_dvc)dvc_writel (i2c_dev,DVC_STATUS_I2C_DONE_INTR ,DVC_STATUS ); -if (i2c_dev->is_curr_dma_xfer) { +if (i2c_dev->dma_mode) {if (i2c_dev->msg_read)dmaengine_terminate_async (i2c_dev->rx_dma_chan);else
@@ -936,14 +936,14 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len)struct dma_slave_config slv_config = {0 };u32 val, reg, dma_burst, reg_offset;struct dma_chan *chan; -int ret; +int err;if (i2c_dev->hw->has_mst_fifo) reg =I2C_MST_FIFO_CONTROL ;else reg =I2C_FIFO_CONTROL ; -if (i2c_dev->is_curr_dma_xfer) { +if (i2c_dev->dma_mode) {if (len &0xF ) dma_burst =1 ;else if (len &0x10 )
@@ -976,11 +976,11 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len) } slv_config.device_fc = true; - ret =dmaengine_slave_config (chan, &slv_config); -if (ret) { + err =dmaengine_slave_config (chan, &slv_config); +if (err) {dev_err (i2c_dev->dev,"DMA slave config failed: %d\n" , - ret); -return ret; + err); +return err; } goto out;
@@ -1030,7 +1030,7 @@ static unsigned long tegra_i2c_wait_completion(struct tegra_i2c_dev *i2c_dev, {unsigned long ret; -if (i2c_dev->is_curr_atomic_xfer) { +if (i2c_dev->atomic_mode) { ret =tegra_i2c_poll_completion (i2c_dev, complete, timeout_ms); }else {enable_irq (i2c_dev->irq);
@@ -1058,20 +1058,20 @@ static unsigned long tegra_i2c_wait_completion(struct tegra_i2c_dev *i2c_dev,static int tegra_i2c_issue_bus_clear (struct i2c_adapter *adap) {struct tegra_i2c_dev *i2c_dev =i2c_get_adapdata (adap); -u32 reg, time_left; +u32 val, time_left;int err;reinit_completion (&i2c_dev->msg_complete); - reg =FIELD_PREP (I2C_BC_SCLK_THRESHOLD ,9 ) |I2C_BC_STOP_COND | + val =FIELD_PREP (I2C_BC_SCLK_THRESHOLD ,9 ) |I2C_BC_STOP_COND |I2C_BC_TERMINATE ; -i2c_writel (i2c_dev, reg,I2C_BUS_CLEAR_CNFG ); +i2c_writel (i2c_dev, val,I2C_BUS_CLEAR_CNFG ); err =tegra_i2c_wait_for_config_load (i2c_dev);if (err)return err; - reg |=I2C_BC_ENABLE ; -i2c_writel (i2c_dev, reg,I2C_BUS_CLEAR_CNFG ); + val |=I2C_BC_ENABLE ; +i2c_writel (i2c_dev, val,I2C_BUS_CLEAR_CNFG );tegra_i2c_unmask_irq (i2c_dev,I2C_INT_BUS_CLR_DONE ); time_left = tegra_i2c_wait_completion(i2c_dev, &i2c_dev->msg_complete,
@@ -1083,8 +1083,8 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)return -ETIMEDOUT ; } - reg =i2c_readl (i2c_dev,I2C_BUS_CLEAR_STATUS ); -if (!(reg &I2C_BC_STATUS )) { + val =i2c_readl (i2c_dev,I2C_BUS_CLEAR_STATUS ); +if (!(val &I2C_BC_STATUS )) {dev_err (i2c_dev->dev,"un-recovered arbitration lost\n" );return -EIO ;
@@ -1106,14 +1106,14 @@ static void tegra_i2c_push_packet_header(struct tegra_i2c_dev *i2c_dev,FIELD_PREP (PACKET_HEADER0_CONT_ID , i2c_dev->cont_id) |FIELD_PREP (PACKET_HEADER0_PACKET_ID ,1 ); -if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) +if (i2c_dev->dma_mode && !i2c_dev->msg_read) *dma_buf++ = packet_header;else i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO ); packet_header = msg->len -1 ; -if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) +if (i2c_dev->dma_mode && !i2c_dev->msg_read) *dma_buf++ = packet_header;else i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO );
@@ -1138,7 +1138,7 @@ static void tegra_i2c_push_packet_header(struct tegra_i2c_dev *i2c_dev,if (msg->flags &I2C_M_RD ) packet_header |=I2C_HEADER_READ ; -if (i2c_dev->is_curr_dma_xfer && !i2c_dev->msg_read) +if (i2c_dev->dma_mode && !i2c_dev->msg_read) *dma_buf++ = packet_header;else i2c_writel (i2c_dev, packet_header,I2C_TX_FIFO );
@@ -1154,7 +1154,7 @@ static int tegra_i2c_error_recover(struct tegra_i2c_dev *i2c_dev,/* start recovery upon arbitration loss in single master mode */ if (i2c_dev->msg_err ==I2C_ERR_ARBITRATION_LOST ) { -if (!i2c_dev->is_multimaster_mode) +if (!i2c_dev->multimaster_mode)return i2c_recover_bus (&i2c_dev->adapter);return -EAGAIN ;
@@ -1195,9 +1195,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, xfer_size = msg->len +I2C_PACKET_HEADER_SIZE ; xfer_size =ALIGN (xfer_size,BYTES_PER_FIFO_WORD ); - i2c_dev->is_curr_dma_xfer = (xfer_size >I2C_PIO_MODE_PREFERRED_LEN ) && - i2c_dev->dma_buf && - !i2c_dev->is_curr_atomic_xfer; + i2c_dev->dma_mode = (xfer_size >I2C_PIO_MODE_PREFERRED_LEN ) && + i2c_dev->dma_buf && !i2c_dev->atomic_mode; err =tegra_i2c_config_fifo_trig (i2c_dev, xfer_size);if (err)
@@ -1212,7 +1211,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, int_mask =I2C_INT_NO_ACK |I2C_INT_ARBITRATION_LOST ;tegra_i2c_unmask_irq (i2c_dev, int_mask); -if (i2c_dev->is_curr_dma_xfer) { +if (i2c_dev->dma_mode) {if (i2c_dev->msg_read) { dma_sync_single_for_device(i2c_dev->dev, i2c_dev->dma_phys,
@@ -1237,7 +1236,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,tegra_i2c_push_packet_header (i2c_dev, msg, end_state);if (!i2c_dev->msg_read) { -if (i2c_dev->is_curr_dma_xfer) { +if (i2c_dev->dma_mode) {memcpy (i2c_dev->dma_buf, msg->buf, msg->len); dma_sync_single_for_device(i2c_dev->dev, i2c_dev->dma_phys,
@@ -1257,7 +1256,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (i2c_dev->hw->has_per_pkt_xfer_complete_irq) int_mask |=I2C_INT_PACKET_XFER_COMPLETE ; -if (!i2c_dev->is_curr_dma_xfer) { +if (!i2c_dev->dma_mode) {if (msg->flags &I2C_M_RD ) int_mask |=I2C_INT_RX_FIFO_DATA_REQ ;else if (i2c_dev->msg_buf_remaining)
@@ -1268,7 +1267,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,dev_dbg (i2c_dev->dev,"unmasked irq: %02x\n" ,i2c_readl (i2c_dev,I2C_INT_MASK )); -if (i2c_dev->is_curr_dma_xfer) { +if (i2c_dev->dma_mode) { time_left =tegra_i2c_wait_completion (i2c_dev, &i2c_dev->dma_complete, xfer_time);
@@ -1317,7 +1316,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, time_left,completion_done (&i2c_dev->msg_complete), i2c_dev->msg_err); - i2c_dev->is_curr_dma_xfer = false; + i2c_dev->dma_mode = false; err =tegra_i2c_error_recover (i2c_dev, msg);if (err)
@@ -1369,9 +1368,9 @@ static int tegra_i2c_xfer_atomic(struct i2c_adapter *adap,struct tegra_i2c_dev *i2c_dev =i2c_get_adapdata (adap);int ret; - i2c_dev->is_curr_atomic_xfer = true; + i2c_dev->atomic_mode = true; ret =tegra_i2c_xfer (adap, msgs, num); - i2c_dev->is_curr_atomic_xfer = false; + i2c_dev->atomic_mode = false;return ret; }
@@ -1596,15 +1595,15 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev) {struct device_node *np = i2c_dev->dev->of_node;bool multi_mode; -int ret; +int err; - ret =of_property_read_u32 (np,"clock-frequency" , + err =of_property_read_u32 (np,"clock-frequency" , &i2c_dev->bus_clk_rate); -if (ret) +if (err) i2c_dev->bus_clk_rate =I2C_MAX_STANDARD_MODE_FREQ ;/* default clock rate */ multi_mode =of_property_read_bool (np,"multi-master" ); - i2c_dev->is_multimaster_mode = multi_mode; + i2c_dev->multimaster_mode = multi_mode;if (of_device_is_compatible (np,"nvidia,tegra20-i2c-dvc" )) i2c_dev->is_dvc = true;
@@ -1635,7 +1634,7 @@ static int tegra_i2c_init_clocks(struct tegra_i2c_dev *i2c_dev) } } -if (!i2c_dev->is_multimaster_mode) +if (!i2c_dev->multimaster_mode)return 0 ; err =clk_enable (i2c_dev->div_clk);
@@ -1654,7 +1653,7 @@ static int tegra_i2c_init_clocks(struct tegra_i2c_dev *i2c_dev)static void tegra_i2c_release_clocks (struct tegra_i2c_dev *i2c_dev) { -if (i2c_dev->is_multimaster_mode) +if (i2c_dev->multimaster_mode)clk_disable (i2c_dev->div_clk);clk_bulk_unprepare (i2c_dev->nclocks, i2c_dev->clocks);
@@ -1798,15 +1797,15 @@ static int tegra_i2c_remove(struct platform_device *pdev)static int __maybe_unused tegra_i2c_runtime_resume (struct device *dev) {struct tegra_i2c_dev *i2c_dev =dev_get_drvdata (dev); -int ret; +int err; - ret =pinctrl_pm_select_default_state (i2c_dev->dev); -if (ret) -return ret; + err =pinctrl_pm_select_default_state (i2c_dev->dev); +if (err) +return err; - ret =clk_bulk_enable (i2c_dev->nclocks, i2c_dev->clocks); -if (ret) -return ret; + err =clk_bulk_enable (i2c_dev->nclocks, i2c_dev->clocks); +if (err) +return err;/* * VI I2C device is attached to VE power domain which goes through
@@ -1815,8 +1814,8 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)* domain ON. */ if (i2c_dev->is_vi) { - ret =tegra_i2c_init (i2c_dev); -if (ret) + err =tegra_i2c_init (i2c_dev); +if (err) goto disable_clocks; }
@@ -1825,7 +1824,7 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev) disable_clocks:clk_bulk_disable (i2c_dev->nclocks, i2c_dev->clocks); -return ret; +return err; }static int __maybe_unused tegra_i2c_runtime_suspend (struct device *dev)
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 32/35 i2c: tegra: Clean up printk messages
In reply to Dmitry OsipenkoThis patch unifies style of all messages in the driver by starting them with a lowercase letter and using consistent capitalization and wording for all messages.
--- drivers/i2c/busses/i2c-tegra.c | 37 +++++++++++++--------------------- 1 file changed, 14 insertions(+), 23 deletions(-)
drivers/i2c/busses/i2c-tegra.c +14 -23
@@ -381,7 +381,8 @@ static int tegra_i2c_dma_submit(struct tegra_i2c_dev *i2c_dev, size_t len) len, dir,DMA_PREP_INTERRUPT | DMA_CTRL_ACK);if (!dma_desc) { -dev_err (i2c_dev->dev,"failed to get DMA descriptor\n" ); +dev_err (i2c_dev->dev,"failed to get %s DMA descriptor\n" , + i2c_dev->msg_read ?"RX" :"TX" );return -EINVAL ; }
@@ -422,7 +423,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)return 0 ;if (!IS_ENABLED (CONFIG_TEGRA20_APB_DMA )) { -dev_dbg (i2c_dev->dev,"Support for APB DMA not enabled!\n" ); +dev_dbg (i2c_dev->dev,"DMA support not enabled\n" );return 0 ; }
@@ -448,7 +449,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev) dma_buf =dma_alloc_coherent (i2c_dev->dev, i2c_dev->dma_buf_size, &dma_phys,GFP_KERNEL | __GFP_NOWARN);if (!dma_buf) { -dev_err (i2c_dev->dev,"failed to allocate the DMA buffer\n" ); +dev_err (i2c_dev->dev,"failed to allocate DMA buffer\n" ); err = -ENOMEM ; goto err_out; }
@@ -572,7 +573,7 @@ static int tegra_i2c_wait_for_config_load(struct tegra_i2c_dev *i2c_dev) err =tegra_i2c_poll_register (i2c_dev,I2C_CONFIG_LOAD ,0xffffffff ,1000 ,I2C_CONFIG_LOAD_TIMEOUT );if (err) { -dev_warn (i2c_dev->dev,"timeout waiting for config load\n" ); +dev_err (i2c_dev->dev,"failed to load config\n" );return err; }
@@ -835,7 +836,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id) status =i2c_readl (i2c_dev,I2C_INT_STATUS );if (status ==0 ) { -dev_warn (i2c_dev->dev,"irq status 0 %08x %08x %08x\n" , +dev_warn (i2c_dev->dev,"IRQ status 0 %08x %08x %08x\n" ,i2c_readl (i2c_dev,I2C_PACKET_TRANSFER_STATUS ),i2c_readl (i2c_dev,I2C_STATUS ),i2c_readl (i2c_dev,I2C_CNFG ));
@@ -978,8 +979,7 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len) slv_config.device_fc = true; err =dmaengine_slave_config (chan, &slv_config);if (err) { -dev_err (i2c_dev->dev,"DMA slave config failed: %d\n" , - err); +dev_err (i2c_dev->dev,"DMA config failed: %d\n" , err);return err; }
@@ -1079,14 +1079,13 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)tegra_i2c_mask_irq (i2c_dev,I2C_INT_BUS_CLR_DONE );if (time_left ==0 ) { -dev_err (i2c_dev->dev,"timed out for bus clear\n" ); +dev_err (i2c_dev->dev,"failed to clear bus\n" );return -ETIMEDOUT ; } val =i2c_readl (i2c_dev,I2C_BUS_CLEAR_STATUS );if (!(val &I2C_BC_STATUS )) { -dev_err (i2c_dev->dev, -"un-recovered arbitration lost\n" ); +dev_err (i2c_dev->dev,"un-recovered arbitration lost\n" );return -EIO ; }
@@ -1218,12 +1217,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, xfer_size, DMA_FROM_DEVICE); err =tegra_i2c_dma_submit (i2c_dev, xfer_size); -if (err) { -dev_err (i2c_dev->dev, -"starting RX DMA failed, err %d\n" , - err); +if (err)return err; - } }else { dma_sync_single_for_cpu(i2c_dev->dev,
@@ -1243,12 +1238,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, xfer_size, DMA_TO_DEVICE); err =tegra_i2c_dma_submit (i2c_dev, xfer_size); -if (err) { -dev_err (i2c_dev->dev, -"starting TX DMA failed, err %d\n" , - err); +if (err)return err; - } }else {tegra_i2c_fill_tx_fifo (i2c_dev); }
@@ -1264,7 +1255,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, }tegra_i2c_unmask_irq (i2c_dev, int_mask); -dev_dbg (i2c_dev->dev,"unmasked irq: %02x\n" , +dev_dbg (i2c_dev->dev,"unmasked IRQ: %02x\n" ,i2c_readl (i2c_dev,I2C_INT_MASK ));if (i2c_dev->dma_mode) {
@@ -1286,7 +1277,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, i2c_dev->tx_dma_chan);if (!time_left && !completion_done (&i2c_dev->dma_complete)) { -dev_err (i2c_dev->dev,"DMA transfer timeout\n" ); +dev_err (i2c_dev->dev,"DMA transfer timed out\n" ); err = -ETIMEDOUT ; goto reset_hardware; }
@@ -1307,7 +1298,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,tegra_i2c_mask_irq (i2c_dev, int_mask);if (time_left ==0 ) { -dev_err (i2c_dev->dev,"i2c transfer timed out\n" ); +dev_err (i2c_dev->dev,"I2C transfer timed out\n" ); err = -ETIMEDOUT ; goto reset_hardware; }
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 33/35 i2c: tegra: Clean up and improve comments
In reply to Dmitry OsipenkoMake all comments to be consistent in regards to capitalization and punctuation, correct spelling and grammar errors, improve wording.
--- drivers/i2c/busses/i2c-tegra.c | 88 ++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 41 deletions(-)
drivers/i2c/busses/i2c-tegra.c +47 -41
@@ -136,7 +136,7 @@/* configuration load timeout in microseconds */ #define I2C_CONFIG_LOAD_TIMEOUT 1000000 -/* Packet header size in bytes */ +/* packet header size in bytes */ #define I2C_PACKET_HEADER_SIZE 12/*
@@ -148,11 +148,10 @@#define I2C_PIO_MODE_PREFERRED_LEN 32/* -* msg_end_type: The bus control which need to be send at end of transfer. -* @MSG_END_STOP: Send stop pulse at end of transfer. -* @MSG_END_REPEAT_START: Send repeat start at end of transfer. -* @MSG_END_CONTINUE: The following on message is coming and so do not send -* stop or repeat start. +* msg_end_type: The bus control which needs to be sent at end of transfer. +* @MSG_END_STOP: Send stop pulse. +* @MSG_END_REPEAT_START: Send repeat-start. +* @MSG_END_CONTINUE: Don't send stop or repeat-start. */ enum msg_end_type {MSG_END_STOP ,
@@ -161,10 +160,10 @@ enum msg_end_type { };/** -* struct tegra_i2c_hw_feature : Different HW support on Tegra -* @has_continue_xfer_support: Continue transfer supports. +* struct tegra_i2c_hw_feature : per hardware generation features +* @has_continue_xfer_support: Continue-transfer supported. * @has_per_pkt_xfer_complete_irq: Has enable/disable capability for transfer -* complete interrupt per packet basis. +* completion interrupt on per packet basis. * @has_config_load_reg: Has the config load register to load the new * configuration. * @clk_divisor_hs_mode: Clock divisor in HS mode.
@@ -184,7 +183,7 @@ enum msg_end_type {* @has_mst_fifo: The I2C controller contains the new MST FIFO interface that * provides additional features and allows for longer messages to * be transferred in one go. -* @quirks: i2c adapter quirks for limiting write/read transfer size and not +* @quirks: I2C adapter quirks for limiting write/read transfer size and not * allowing 0 length transfers. * @supports_bus_clear: Bus Clear support to recover from bus hang during * SDA stuck low from device for some unknown reasons.
@@ -245,7 +244,7 @@ struct tegra_i2c_hw_feature {* @msg_err: error code for completed message * @msg_buf: pointer to current message data * @msg_buf_remaining: size of unsent data in the message buffer -* @msg_read: identifies read transfers +* @msg_read: indicates read direction of a transfer * @bus_clk_rate: current I2C bus clock rate * @multimaster_mode: indicates that I2C controller is in multi-master mode * @tx_dma_chan: DMA transmit channel
@@ -306,8 +305,8 @@ static u32 dvc_readl(struct tegra_i2c_dev *i2c_dev, u32 reg) }/* -* i2c_writel and i2c_readl will offset the register if necessary to talk -* to the I2C block inside the DVC block +* If necessary, i2c_writel() and i2c_readl() will offset the register +* in order to talk to the I2C block inside the DVC block. */ static u32 tegra_i2c_reg_addr (struct tegra_i2c_dev *i2c_dev,u32 reg) {
@@ -322,7 +321,7 @@ static void i2c_writel(struct tegra_i2c_dev *i2c_dev, u32 val, u32 reg) {writel_relaxed (val, i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg)); -/* Read back register to make sure that register writes completed */ +/* read back register to make sure that register writes completed */ if (reg !=I2C_TX_FIFO )readl_relaxed (i2c_dev->base +tegra_i2c_reg_addr (i2c_dev, reg)); }
@@ -474,7 +473,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)* block. This block is identical to the rest of the I2C blocks, except that * it only supports master mode, it has registers moved around, and it needs * some extra init to get it into I2C mode. The register moves are handled -* by i2c_readl and i2c_writel +* by i2c_readl() and i2c_writel(). */ static void tegra_dvc_init (struct tegra_i2c_dev *i2c_dev) {
@@ -632,7 +631,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)break ; } -/* Make sure clock divisor programmed correctly */ +/* make sure clock divisor programmed correctly */ clk_divisor =FIELD_PREP (I2C_CLK_DIVISOR_HSMODE , i2c_dev->hw->clk_divisor_hs_mode) |FIELD_PREP (I2C_CLK_DIVISOR_STD_FAST_MODE , non_hs_mode);
@@ -645,8 +644,8 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev) }/* -* configure setup and hold times only when tsu_thd is non-zero. -* otherwise, preserve the chip default values +* Configure setup and hold times only when tsu_thd is non-zero. +* Otherwise, preserve the chip default values. */ if (i2c_dev->hw->has_interface_timing_reg && tsu_thd)i2c_writel (i2c_dev, tsu_thd,I2C_INTERFACE_TIMING_1 );
@@ -690,7 +689,7 @@ static int tegra_i2c_disable_packet_mode(struct tegra_i2c_dev *i2c_dev)/* * NACK interrupt is generated before the I2C controller generates -* the STOP condition on the bus. So wait for 2 clock periods +* the STOP condition on the bus. So, wait for 2 clock periods * before disabling the controller so that the STOP condition has * been delivered properly. */
@@ -711,8 +710,8 @@ static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev)u32 val;/* -* Catch overflow due to message fully sent -* before the check for RX FIFO availability. +* Catch overflow due to message fully sent before the check for +* RX FIFO availability. */ if (WARN_ON_ONCE (!(i2c_dev->msg_buf_remaining)))return -EINVAL ;
@@ -725,7 +724,7 @@ static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev) rx_fifo_avail =FIELD_GET (I2C_FIFO_STATUS_RX , val); } -/* Rounds down to not include partial word at the end of buf */ +/* round down to exclude partial word at the end of buffer */ words_to_transfer = buf_remaining /BYTES_PER_FIFO_WORD ;if (words_to_transfer > rx_fifo_avail) words_to_transfer = rx_fifo_avail;
@@ -737,8 +736,8 @@ static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev) rx_fifo_avail -= words_to_transfer;/* -* If there is a partial word at the end of buf, handle it manually to -* prevent overwriting past the end of buf +* If there is a partial word at the end of buffer, handle it +* manually to prevent overwriting past the end of buffer. */ if (rx_fifo_avail >0 && buf_remaining >0 ) {/*
@@ -778,10 +777,15 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev) tx_fifo_avail =FIELD_GET (I2C_FIFO_STATUS_TX , val); } -/* Rounds down to not include partial word at the end of buf */ +/* round down to exclude partial word at the end of buffer */ words_to_transfer = buf_remaining /BYTES_PER_FIFO_WORD ; -/* It's very common to have < 4 bytes, so optimize that case. */ +/* +* This hunk pushes 4 bytes at a time into the TX FIFO. +* +* It's very common to have < 4 bytes, hence there is no word +* to push if we have less than 4 bytes to transfer. +*/ if (words_to_transfer) {if (words_to_transfer > tx_fifo_avail) words_to_transfer = tx_fifo_avail;
@@ -805,8 +809,8 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev) }/* -* If there is a partial word at the end of buf, handle it manually to -* prevent reading past the end of buf, which could cross a page +* If there is a partial word at the end of buffer, handle it manually +* to prevent reading past the end of buffer, which could cross a page * boundary and fault. */ if (tx_fifo_avail >0 && buf_remaining >0 ) {
@@ -854,7 +858,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id) }/* -* I2C transfer is terminated during the bus clear so skip +* I2C transfer is terminated during the bus clear, so skip * processing the other interrupts. */ if (i2c_dev->hw->supports_bus_clear && (status &I2C_INT_BUS_CLR_DONE ))
@@ -890,7 +894,8 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)* During message read XFER_COMPLETE interrupt is triggered prior to * DMA completion and during message write XFER_COMPLETE interrupt is * triggered after DMA completion. -* PACKETS_XFER_COMPLETE indicates completion of all bytes of transfer. +* +* PACKETS_XFER_COMPLETE indicates completion of all bytes of transfer, * so forcing msg_buf_remaining to 0 in DMA mode. */ if (status &I2C_INT_PACKET_XFER_COMPLETE ) {
@@ -908,7 +913,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id) } goto done; err: -/* An error occurred, mask all interrupts */ +/* mask all interrupts on error */ tegra_i2c_mask_irq (i2c_dev,I2C_INT_NO_ACK |I2C_INT_ARBITRATION_LOST |I2C_INT_PACKET_XFER_COMPLETE |I2C_INT_TX_FIFO_DATA_REQ |I2C_INT_RX_FIFO_DATA_REQ );
@@ -1338,6 +1343,7 @@ static int tegra_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[],enum msg_end_type end_type =MSG_END_STOP ;if (i < (num -1 )) { +/* check whether follow up message is coming */ if (msgs[i +1 ].flags &I2C_M_NOSTART ) end_type =MSG_END_CONTINUE ;else
@@ -1567,7 +1573,6 @@ static const struct tegra_i2c_hw_feature tegra194_i2c_hw = { .has_interface_timing_reg = true, }; -/* Match table for of_platform binding */ static const struct of_device_id tegra_i2c_of_match[] = { { .compatible ="nvidia,tegra194-i2c" , .data = &tegra194_i2c_hw, }, { .compatible ="nvidia,tegra186-i2c" , .data = &tegra186_i2c_hw, },
@@ -1591,7 +1596,7 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev) err =of_property_read_u32 (np,"clock-frequency" , &i2c_dev->bus_clk_rate);if (err) - i2c_dev->bus_clk_rate =I2C_MAX_STANDARD_MODE_FREQ ;/* default clock rate */ + i2c_dev->bus_clk_rate =I2C_MAX_STANDARD_MODE_FREQ ; multi_mode =of_property_read_bool (np,"multi-master" ); i2c_dev->multimaster_mode = multi_mode;
@@ -1723,11 +1728,13 @@ static int tegra_i2c_probe(struct platform_device *pdev) goto release_clocks;/* -* VI I2C is in VE power domain which is not always on and not -* an IRQ safe. So, IRQ safe device can't be attached to a non-IRQ -* safe domain as it prevents powering off the PM domain. -* Also, VI I2C device don't need to use runtime IRQ safe as it will -* not be used for atomic transfers. +* VI I2C is in VE power domain which is not always ON and not +* IRQ-safe. Thus, IRQ-safe device shouldn't be attached to a +* non IRQ-safe domain because this prevents powering off the power +* domain. +* +* VI I2C device shouldn't be marked as IRQ-safe because VI I2C won't +* be used for atomic transfers. */ if (!i2c_dev->is_vi)pm_runtime_irq_safe (i2c_dev->dev);
@@ -1800,9 +1807,8 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)/* * VI I2C device is attached to VE power domain which goes through -* power ON/OFF during PM runtime resume/suspend. So, controller -* should go through reset and need to re-initialize after power -* domain ON. +* power ON/OFF during of runtime PM resume/suspend, meaning that +* controller needs to be re-initialized after power ON. */ if (i2c_dev->is_vi) { err =tegra_i2c_init (i2c_dev);
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 34/35 i2c: tegra: Clean up whitespaces, newlines and indentation
In reply to Dmitry OsipenkoSome places in the code are missing newlines or have unnecessary whitespaces and newlines. This creates inconsistency of the code and hurts readability. This patch removes the unnecessary and adds necessary whitespaces / newlines, clears indentation of the code.
--- drivers/i2c/busses/i2c-tegra.c | 72 +++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 28 deletions(-)
drivers/i2c/busses/i2c-tegra.c +44 -28
@@ -314,6 +314,7 @@ static u32 tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev, u32 reg) reg += (reg >=I2C_TX_FIFO ) ?0x10 :0x40 ; else if (i2c_dev->is_vi) reg =0xc00 + (reg <<2 ); +return reg; }
@@ -373,9 +374,12 @@ static int tegra_i2c_dma_submit(struct tegra_i2c_dev *i2c_dev, size_t len)struct dma_chan *chan;dev_dbg (i2c_dev->dev,"starting DMA for length: %zu\n" , len); +reinit_completion (&i2c_dev->dma_complete); + dir = i2c_dev->msg_read ?DMA_DEV_TO_MEM :DMA_MEM_TO_DEV ; chan = i2c_dev->msg_read ? i2c_dev->rx_dma_chan : i2c_dev->tx_dma_chan; + dma_desc =dmaengine_prep_slave_single (chan, i2c_dev->dma_phys, len, dir,DMA_PREP_INTERRUPT |DMA_CTRL_ACK );
@@ -387,8 +391,10 @@ static int tegra_i2c_dma_submit(struct tegra_i2c_dev *i2c_dev, size_t len) dma_desc->callback = tegra_i2c_dma_complete; dma_desc->callback_param = i2c_dev; +dmaengine_submit (dma_desc);dma_async_issue_pending (chan); +return 0 ; }
@@ -557,6 +563,7 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)dev_err (i2c_dev->dev,"failed to flush FIFO\n" );return err; } +return 0 ; }
@@ -650,8 +657,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)if (i2c_dev->hw->has_interface_timing_reg && tsu_thd)i2c_writel (i2c_dev, tsu_thd,I2C_INTERFACE_TIMING_1 ); - clk_multiplier = tlow + thigh +2 ; - clk_multiplier *= non_hs_mode +1 ; + clk_multiplier = (tlow + thigh +2 ) * (non_hs_mode +1 ); err =clk_set_rate (i2c_dev->div_clk, i2c_dev->bus_clk_rate * clk_multiplier);
@@ -799,9 +805,9 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev)*/ buf_remaining -= words_to_transfer *BYTES_PER_FIFO_WORD ; tx_fifo_avail -= words_to_transfer; + i2c_dev->msg_buf_remaining = buf_remaining; - i2c_dev->msg_buf = buf + - words_to_transfer *BYTES_PER_FIFO_WORD ; + i2c_dev->msg_buf = buf + words_to_transfer *BYTES_PER_FIFO_WORD ;i2c_writesl (i2c_dev, buf,I2C_TX_FIFO , words_to_transfer);
@@ -914,12 +920,18 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id) goto done; err:/* mask all interrupts on error */ -tegra_i2c_mask_irq (i2c_dev,I2C_INT_NO_ACK |I2C_INT_ARBITRATION_LOST | -I2C_INT_PACKET_XFER_COMPLETE |I2C_INT_TX_FIFO_DATA_REQ | -I2C_INT_RX_FIFO_DATA_REQ ); +tegra_i2c_mask_irq (i2c_dev, +I2C_INT_NO_ACK | +I2C_INT_ARBITRATION_LOST | +I2C_INT_PACKET_XFER_COMPLETE | +I2C_INT_TX_FIFO_DATA_REQ | +I2C_INT_RX_FIFO_DATA_REQ ); +if (i2c_dev->hw->supports_bus_clear)tegra_i2c_mask_irq (i2c_dev,I2C_INT_BUS_CLR_DONE ); +i2c_writel (i2c_dev, status,I2C_INT_STATUS ); +if (i2c_dev->is_dvc)dvc_writel (i2c_dev,DVC_STATUS_I2C_DONE_INTR ,DVC_STATUS );
@@ -960,6 +972,7 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len)if (i2c_dev->msg_read) { chan = i2c_dev->rx_dma_chan; reg_offset =tegra_i2c_reg_addr (i2c_dev,I2C_RX_FIFO ); + slv_config.src_addr = i2c_dev->base_phys + reg_offset; slv_config.src_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; slv_config.src_maxburst = dma_burst;
@@ -971,6 +984,7 @@ static int tegra_i2c_config_fifo_trig(struct tegra_i2c_dev *i2c_dev, size_t len) }else { chan = i2c_dev->tx_dma_chan; reg_offset =tegra_i2c_reg_addr (i2c_dev,I2C_TX_FIFO ); + slv_config.dst_addr = i2c_dev->base_phys + reg_offset; slv_config.dst_addr_width =DMA_SLAVE_BUSWIDTH_4_BYTES ; slv_config.dst_maxburst = dma_burst;
@@ -1067,6 +1081,7 @@ static int tegra_i2c_issue_bus_clear(struct i2c_adapter *adap)int err;reinit_completion (&i2c_dev->msg_complete); + val =FIELD_PREP (I2C_BC_SCLK_THRESHOLD ,9 ) |I2C_BC_STOP_COND |I2C_BC_TERMINATE ;i2c_writel (i2c_dev, val,I2C_BUS_CLEAR_CNFG );
@@ -1199,7 +1214,8 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev, xfer_size = msg->len +I2C_PACKET_HEADER_SIZE ; xfer_size =ALIGN (xfer_size,BYTES_PER_FIFO_WORD ); - i2c_dev->dma_mode = (xfer_size >I2C_PIO_MODE_PREFERRED_LEN ) && + + i2c_dev->dma_mode = xfer_size >I2C_PIO_MODE_PREFERRED_LEN && i2c_dev->dma_buf && !i2c_dev->atomic_mode; err =tegra_i2c_config_fifo_trig (i2c_dev, xfer_size);
@@ -1211,25 +1227,24 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,* Total bits = 9 bits per byte (including ACK bit) + Start & stop bits */ xfer_time +=DIV_ROUND_CLOSEST (((xfer_size *9 ) +2 ) *MSEC_PER_SEC , - i2c_dev->bus_clk_rate); + i2c_dev->bus_clk_rate); int_mask =I2C_INT_NO_ACK |I2C_INT_ARBITRATION_LOST ;tegra_i2c_unmask_irq (i2c_dev, int_mask); +if (i2c_dev->dma_mode) {if (i2c_dev->msg_read) {dma_sync_single_for_device (i2c_dev->dev, i2c_dev->dma_phys, - xfer_size, -DMA_FROM_DEVICE ); + xfer_size,DMA_FROM_DEVICE ); + err =tegra_i2c_dma_submit (i2c_dev, xfer_size);if (err)return err; - }else {dma_sync_single_for_cpu (i2c_dev->dev, i2c_dev->dma_phys, - xfer_size, -DMA_TO_DEVICE ); + xfer_size,DMA_TO_DEVICE ); } }
@@ -1238,10 +1253,11 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (!i2c_dev->msg_read) {if (i2c_dev->dma_mode) {memcpy (i2c_dev->dma_buf, msg->buf, msg->len); +dma_sync_single_for_device (i2c_dev->dev, i2c_dev->dma_phys, - xfer_size, -DMA_TO_DEVICE ); + xfer_size,DMA_TO_DEVICE ); + err =tegra_i2c_dma_submit (i2c_dev, xfer_size);if (err)return err;
@@ -1252,6 +1268,7 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (i2c_dev->hw->has_per_pkt_xfer_complete_irq) int_mask |=I2C_INT_PACKET_XFER_COMPLETE ; +if (!i2c_dev->dma_mode) {if (msg->flags &I2C_M_RD ) int_mask |=I2C_INT_RX_FIFO_DATA_REQ ;
@@ -1290,10 +1307,9 @@ static int tegra_i2c_xfer_msg(struct tegra_i2c_dev *i2c_dev,if (i2c_dev->msg_read && i2c_dev->msg_err ==I2C_ERR_NONE ) {dma_sync_single_for_cpu (i2c_dev->dev, i2c_dev->dma_phys, - xfer_size, -DMA_FROM_DEVICE ); -memcpy (i2c_dev->msg_buf, i2c_dev->dma_buf, - msg->len); + xfer_size,DMA_FROM_DEVICE ); + +memcpy (i2c_dev->msg_buf, i2c_dev->dma_buf, msg->len); } }
@@ -1380,6 +1396,7 @@ static u32 tegra_i2c_func(struct i2c_adapter *adap)if (i2c_dev->hw->has_continue_xfer_support) ret |=I2C_FUNC_NOSTART ; +return ret; }
@@ -1784,11 +1801,11 @@ static int tegra_i2c_remove(struct platform_device *pdev)struct tegra_i2c_dev *i2c_dev =platform_get_drvdata (pdev);i2c_del_adapter (&i2c_dev->adapter); - -pm_runtime_disable (&pdev->dev); +pm_runtime_disable (i2c_dev->dev);tegra_i2c_release_dma (i2c_dev);tegra_i2c_release_clocks (i2c_dev); +return 0 ; }
@@ -1886,15 +1903,14 @@ static const struct dev_pm_ops tegra_i2c_pm = { };static struct platform_driver tegra_i2c_driver = { - .probe = tegra_i2c_probe, - .remove = tegra_i2c_remove, - .driver = { - .name ="tegra-i2c" , + .probe = tegra_i2c_probe, + .remove = tegra_i2c_remove, + .driver = { + .name ="tegra-i2c" , .of_match_table = tegra_i2c_of_match, - .pm = &tegra_i2c_pm, + .pm = &tegra_i2c_pm, }, }; -module_platform_driver (tegra_i2c_driver);MODULE_DESCRIPTION ("nVidia Tegra2 I2C Bus Controller driver" );
Signature · 1 line
2.27.0
Dmitry Osipenko
reviewerPATCH v6 35/35 i2c: tegra: Improve driver module description
In reply to Dmitry OsipenkoUse proper spelling of "NVIDIA" and don't designate driver as Tegra2-only since newer SoC generations are supported as well.
--- drivers/i2c/busses/i2c-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-tegra.c +1 -1
@@ -1913,6 +1913,6 @@ static struct platform_driver tegra_i2c_driver = { };module_platform_driver (tegra_i2c_driver); -MODULE_DESCRIPTION ("nVidia Tegra2 I2C Bus Controller driver" ); +MODULE_DESCRIPTION ("NVIDIA Tegra I2C Bus Controller driver" );MODULE_AUTHOR ("Colin Cross" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
2.27.0