[PATCH v2 0/2] i2c: tegra: allow compiling out support for Tegra's special constrollers

public inbox for linux-tegra@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH v2 0/2] i2c: tegra: allow compiling out support for Tegra's special constrollers
@ 2022-01-18 20:00 Michał Mirosław
  2022-01-18 20:00 ` [PATCH v2 1/2] i2c: tegra: allow DVC support to be compiled out Michał Mirosław
  2022-01-18 20:00 ` [PATCH v2 2/2] i2c: tegra: allow VI " Michał Mirosław
  0 siblings, 2 replies; 6+ messages in thread
From: Michał Mirosław @ 2022-01-18 20:00 UTC (permalink / raw)
  To: Dmitry Osipenko, Jonathan Hunter, Laxman Dewangan, Thierry Reding
  Cc: linux-i2c, linux-kernel, linux-tegra

To patches that, combined, reduce I2C driver's code by ~2kB and a bit
from runtime overhead for non-Tegra20 or non-Tegra210 builds.

v2: remove KConfig symbols as per Dmitry Osipenko's suggestion.
    This assumes that for relevant SoCs the special controller implementations
    will be used anyway.

Michał Mirosław (2):
  i2c: tegra: allow DVC support to be compiled out
  i2c: tegra: allow VI support to be compiled out

 drivers/i2c/busses/i2c-tegra.c | 35 +++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

-- 
2.30.2


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

* [PATCH v2 1/2] i2c: tegra: allow DVC support to be compiled out
  2022-01-18 20:00 [PATCH v2 0/2] i2c: tegra: allow compiling out support for Tegra's special constrollers Michał Mirosław
@ 2022-01-18 20:00 ` Michał Mirosław
  2022-01-18 20:33   ` Dmitry Osipenko
  2022-01-27 21:31   ` Wolfram Sang
  2022-01-18 20:00 ` [PATCH v2 2/2] i2c: tegra: allow VI " Michał Mirosław
  1 sibling, 2 replies; 6+ messages in thread
From: Michał Mirosław @ 2022-01-18 20:00 UTC (permalink / raw)
  To: Laxman Dewangan, Dmitry Osipenko, Thierry Reding, Jonathan Hunter
  Cc: linux-i2c, linux-tegra, linux-kernel

Save a bit of code for newer Tegra platforms by compiling out
DVC's I2C mode support that's used only for Tegra2.

$ size i2c-tegra.o
    text    data     bss     dec     hex filename
-  10385     240       8   10633    2989 i2c-tegra.o
+   9617     240       8    9865    2689 i2c-tegra.o

---
v2: remove KConfig symbol as per Dmitry Osipenko's suggestion.
    (Assuming that for Tegra20 the DVC part will be used anyway.)

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/i2c/busses/i2c-tegra.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index b3184c422826..96bfe7013d85 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -294,6 +294,8 @@ struct tegra_i2c_dev {
 	bool is_vi;
 };
 
+#define IS_DVC(dev) (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && dev->is_dvc)
+
 static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val,
 		       unsigned int reg)
 {
@@ -311,7 +313,7 @@ static u32 dvc_readl(struct tegra_i2c_dev *i2c_dev, unsigned int reg)
  */
 static u32 tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev, unsigned int reg)
 {
-	if (i2c_dev->is_dvc)
+	if (IS_DVC(i2c_dev))
 		reg += (reg >= I2C_TX_FIFO) ? 0x10 : 0x40;
 	else if (i2c_dev->is_vi)
 		reg = 0xc00 + (reg << 2);
@@ -621,7 +623,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
 	err = reset_control_reset(i2c_dev->rst);
 	WARN_ON_ONCE(err);
 
-	if (i2c_dev->is_dvc)
+	if (IS_DVC(i2c_dev))
 		tegra_dvc_init(i2c_dev);
 
 	val = I2C_CNFG_NEW_MASTER_FSM | I2C_CNFG_PACKET_MODE_EN |
@@ -685,7 +687,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
 		return err;
 	}
 
-	if (!i2c_dev->is_dvc && !i2c_dev->is_vi) {
+	if (!IS_DVC(i2c_dev) && !i2c_dev->is_vi) {
 		u32 sl_cfg = i2c_readl(i2c_dev, I2C_SL_CNFG);
 
 		sl_cfg |= I2C_SL_CNFG_NACK | I2C_SL_CNFG_NEWSL;
@@ -915,7 +917,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
 	}
 
 	i2c_writel(i2c_dev, status, I2C_INT_STATUS);
-	if (i2c_dev->is_dvc)
+	if (IS_DVC(i2c_dev))
 		dvc_writel(i2c_dev, DVC_STATUS_I2C_DONE_INTR, DVC_STATUS);
 
 	/*
@@ -954,7 +956,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
 
 	i2c_writel(i2c_dev, status, I2C_INT_STATUS);
 
-	if (i2c_dev->is_dvc)
+	if (IS_DVC(i2c_dev))
 		dvc_writel(i2c_dev, DVC_STATUS_I2C_DONE_INTR, DVC_STATUS);
 
 	if (i2c_dev->dma_mode) {
@@ -1616,7 +1618,9 @@ static const struct of_device_id tegra_i2c_of_match[] = {
 	{ .compatible = "nvidia,tegra114-i2c", .data = &tegra114_i2c_hw, },
 	{ .compatible = "nvidia,tegra30-i2c", .data = &tegra30_i2c_hw, },
 	{ .compatible = "nvidia,tegra20-i2c", .data = &tegra20_i2c_hw, },
+#if IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC)
 	{ .compatible = "nvidia,tegra20-i2c-dvc", .data = &tegra20_i2c_hw, },
+#endif
 	{},
 };
 MODULE_DEVICE_TABLE(of, tegra_i2c_of_match);
@@ -1635,7 +1639,8 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev)
 	multi_mode = of_property_read_bool(np, "multi-master");
 	i2c_dev->multimaster_mode = multi_mode;
 
-	if (of_device_is_compatible(np, "nvidia,tegra20-i2c-dvc"))
+	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&
+	    of_device_is_compatible(np, "nvidia,tegra20-i2c-dvc"))
 		i2c_dev->is_dvc = true;
 
 	if (of_device_is_compatible(np, "nvidia,tegra210-i2c-vi"))
-- 
2.30.2


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

* Re: [PATCH v2 1/2] i2c: tegra: allow DVC support to be compiled out
  2022-01-18 20:00 ` [PATCH v2 1/2] i2c: tegra: allow DVC support to be compiled out Michał Mirosław
@ 2022-01-18 20:33   ` Dmitry Osipenko
  2022-01-27 21:31   ` Wolfram Sang
  1 sibling, 0 replies; 6+ messages in thread
From: Dmitry Osipenko @ 2022-01-18 20:33 UTC (permalink / raw)
  To: Michał Mirosław, Laxman Dewangan, Thierry Reding,
	Jonathan Hunter
  Cc: linux-i2c, linux-tegra, linux-kernel

18.01.2022 23:00, Michał Mirosław пишет:
> Save a bit of code for newer Tegra platforms by compiling out
> DVC's I2C mode support that's used only for Tegra2.
> 
> $ size i2c-tegra.o
>     text    data     bss     dec     hex filename
> -  10385     240       8   10633    2989 i2c-tegra.o
> +   9617     240       8    9865    2689 i2c-tegra.o
> 
> ---
> v2: remove KConfig symbol as per Dmitry Osipenko's suggestion.
>     (Assuming that for Tegra20 the DVC part will be used anyway.)
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---
>  drivers/i2c/busses/i2c-tegra.c | 17 +++++++++++------
>  1 file changed, 11 insertions(+), 6 deletions(-)

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>

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

* Re: [PATCH v2 1/2] i2c: tegra: allow DVC support to be compiled out
  2022-01-18 20:00 ` [PATCH v2 1/2] i2c: tegra: allow DVC support to be compiled out Michał Mirosław
  2022-01-18 20:33   ` Dmitry Osipenko
@ 2022-01-27 21:31   ` Wolfram Sang
  1 sibling, 0 replies; 6+ messages in thread
From: Wolfram Sang @ 2022-01-27 21:31 UTC (permalink / raw)
  To: Michał Mirosław
  Cc: Laxman Dewangan, Dmitry Osipenko, Thierry Reding, Jonathan Hunter,
	linux-i2c, linux-tegra, linux-kernel

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

Hi Michał,

> ---
> v2: remove KConfig symbol as per Dmitry Osipenko's suggestion.
>     (Assuming that for Tegra20 the DVC part will be used anyway.)
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>

Your SoB should be above the "---" line.

> +#define IS_DVC(dev) (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && dev->is_dvc)

'checkpatch --strict' IMO rightfully mentions that 'dev' should be in
paranthesis when being used.

Both comments apply to patch 2 as well. Otherwise looks good!

Thanks,

   Wolfram


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

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

* [PATCH v2 2/2] i2c: tegra: allow VI support to be compiled out
  2022-01-18 20:00 [PATCH v2 0/2] i2c: tegra: allow compiling out support for Tegra's special constrollers Michał Mirosław
  2022-01-18 20:00 ` [PATCH v2 1/2] i2c: tegra: allow DVC support to be compiled out Michał Mirosław
@ 2022-01-18 20:00 ` Michał Mirosław
  2022-01-18 20:33   ` Dmitry Osipenko
  1 sibling, 1 reply; 6+ messages in thread
From: Michał Mirosław @ 2022-01-18 20:00 UTC (permalink / raw)
  To: Laxman Dewangan, Dmitry Osipenko, Thierry Reding, Jonathan Hunter
  Cc: linux-i2c, linux-tegra, linux-kernel

Save a bit of code for older Tegra platforms by compiling out
VI's I2C mode support that's used only for Tegra210.

$ size i2c-tegra.o
   text    data     bss     dec     hex filename
  10385     240       8   10633    2989 i2c-tegra.o (full)
   9617     240       8    9865    2689 i2c-tegra.o (no-dvc)
   9389     240       8    9637    25a5 i2c-tegra.o (no-vi)
   8617     240       8    8865    22a1 i2c-tegra.o (no-vi,no-dvc)

---
v2: remove KConfig symbol as per Dmitry Osipenko's suggestion.
    (Assuming that for Tegra210 the VI part will be used anyway.)

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/i2c/busses/i2c-tegra.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 96bfe7013d85..6ced964c83b2 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -295,6 +295,7 @@ struct tegra_i2c_dev {
 };
 
 #define IS_DVC(dev) (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) && dev->is_dvc)
+#define IS_VI(dev)  (IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) && dev->is_vi)
 
 static void dvc_writel(struct tegra_i2c_dev *i2c_dev, u32 val,
 		       unsigned int reg)
@@ -315,7 +316,7 @@ static u32 tegra_i2c_reg_addr(struct tegra_i2c_dev *i2c_dev, unsigned int reg)
 {
 	if (IS_DVC(i2c_dev))
 		reg += (reg >= I2C_TX_FIFO) ? 0x10 : 0x40;
-	else if (i2c_dev->is_vi)
+	else if (IS_VI(i2c_dev))
 		reg = 0xc00 + (reg << 2);
 
 	return reg;
@@ -444,7 +445,7 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
 	u32 *dma_buf;
 	int err;
 
-	if (!i2c_dev->hw->has_apb_dma || i2c_dev->is_vi)
+	if (!i2c_dev->hw->has_apb_dma || IS_VI(i2c_dev))
 		return 0;
 
 	if (!IS_ENABLED(CONFIG_TEGRA20_APB_DMA)) {
@@ -635,7 +636,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
 	i2c_writel(i2c_dev, val, I2C_CNFG);
 	i2c_writel(i2c_dev, 0, I2C_INT_MASK);
 
-	if (i2c_dev->is_vi)
+	if (IS_VI(i2c_dev))
 		tegra_i2c_vi_init(i2c_dev);
 
 	switch (i2c_dev->bus_clk_rate) {
@@ -687,7 +688,7 @@ static int tegra_i2c_init(struct tegra_i2c_dev *i2c_dev)
 		return err;
 	}
 
-	if (!IS_DVC(i2c_dev) && !i2c_dev->is_vi) {
+	if (!IS_DVC(i2c_dev) && !IS_VI(i2c_dev)) {
 		u32 sl_cfg = i2c_readl(i2c_dev, I2C_SL_CNFG);
 
 		sl_cfg |= I2C_SL_CNFG_NACK | I2C_SL_CNFG_NEWSL;
@@ -1612,7 +1613,9 @@ static const struct tegra_i2c_hw_feature tegra194_i2c_hw = {
 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, },
+#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
 	{ .compatible = "nvidia,tegra210-i2c-vi", .data = &tegra210_i2c_hw, },
+#endif
 	{ .compatible = "nvidia,tegra210-i2c", .data = &tegra210_i2c_hw, },
 	{ .compatible = "nvidia,tegra124-i2c", .data = &tegra124_i2c_hw, },
 	{ .compatible = "nvidia,tegra114-i2c", .data = &tegra114_i2c_hw, },
@@ -1643,7 +1646,8 @@ static void tegra_i2c_parse_dt(struct tegra_i2c_dev *i2c_dev)
 	    of_device_is_compatible(np, "nvidia,tegra20-i2c-dvc"))
 		i2c_dev->is_dvc = true;
 
-	if (of_device_is_compatible(np, "nvidia,tegra210-i2c-vi"))
+	if (IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC) &&
+	    of_device_is_compatible(np, "nvidia,tegra210-i2c-vi"))
 		i2c_dev->is_vi = true;
 }
 
@@ -1656,7 +1660,7 @@ static int tegra_i2c_init_clocks(struct tegra_i2c_dev *i2c_dev)
 	if (i2c_dev->hw == &tegra20_i2c_hw || i2c_dev->hw == &tegra30_i2c_hw)
 		i2c_dev->clocks[i2c_dev->nclocks++].id = "fast-clk";
 
-	if (i2c_dev->is_vi)
+	if (IS_VI(i2c_dev))
 		i2c_dev->clocks[i2c_dev->nclocks++].id = "slow";
 
 	err = devm_clk_bulk_get(i2c_dev->dev, i2c_dev->nclocks,
@@ -1777,7 +1781,7 @@ static int tegra_i2c_probe(struct platform_device *pdev)
 	 * 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)
+	if (!IS_VI(i2c_dev))
 		pm_runtime_irq_safe(i2c_dev->dev);
 
 	pm_runtime_enable(i2c_dev->dev);
@@ -1850,7 +1854,7 @@ static int __maybe_unused tegra_i2c_runtime_resume(struct device *dev)
 	 * power ON/OFF during runtime PM resume/suspend, meaning that
 	 * controller needs to be re-initialized after power ON.
 	 */
-	if (i2c_dev->is_vi) {
+	if (IS_VI(i2c_dev)) {
 		err = tegra_i2c_init(i2c_dev);
 		if (err)
 			goto disable_clocks;
-- 
2.30.2


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

* Re: [PATCH v2 2/2] i2c: tegra: allow VI support to be compiled out
  2022-01-18 20:00 ` [PATCH v2 2/2] i2c: tegra: allow VI " Michał Mirosław
@ 2022-01-18 20:33   ` Dmitry Osipenko
  0 siblings, 0 replies; 6+ messages in thread
From: Dmitry Osipenko @ 2022-01-18 20:33 UTC (permalink / raw)
  To: Michał Mirosław, Laxman Dewangan, Thierry Reding,
	Jonathan Hunter
  Cc: linux-i2c, linux-tegra, linux-kernel

18.01.2022 23:00, Michał Mirosław пишет:
> Save a bit of code for older Tegra platforms by compiling out
> VI's I2C mode support that's used only for Tegra210.
> 
> $ size i2c-tegra.o
>    text    data     bss     dec     hex filename
>   10385     240       8   10633    2989 i2c-tegra.o (full)
>    9617     240       8    9865    2689 i2c-tegra.o (no-dvc)
>    9389     240       8    9637    25a5 i2c-tegra.o (no-vi)
>    8617     240       8    8865    22a1 i2c-tegra.o (no-vi,no-dvc)
> 
> ---
> v2: remove KConfig symbol as per Dmitry Osipenko's suggestion.
>     (Assuming that for Tegra210 the VI part will be used anyway.)
> 
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> ---
>  drivers/i2c/busses/i2c-tegra.c | 20 ++++++++++++--------
>  1 file changed, 12 insertions(+), 8 deletions(-)

Reviewed-by: Dmitry Osipenko <digetx@gmail.com>



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

end of thread, other threads:[~2022-01-27 21:32 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-18 20:00 [PATCH v2 0/2] i2c: tegra: allow compiling out support for Tegra's special constrollers Michał Mirosław
2022-01-18 20:00 ` [PATCH v2 1/2] i2c: tegra: allow DVC support to be compiled out Michał Mirosław
2022-01-18 20:33   ` Dmitry Osipenko
2022-01-27 21:31   ` Wolfram Sang
2022-01-18 20:00 ` [PATCH v2 2/2] i2c: tegra: allow VI " Michał Mirosław
2022-01-18 20:33   ` Dmitry Osipenko

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox