Skip to contentSkip to conversation

i2c: npcm: Bug fixes timeout, spurious interrupts

PATCH Superseded Tyrone Ting 8 participants 41 messages Mar 3, 2022 – Apr 10, 2022

Subsystems (3)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v3 cover i2c: npcm: Bug fixes timeout, spurious interrupts

From: Tyrone Ting <[email protected]>

This patchset includes the following fixes:

- Add dt-bindings description for NPCM845.
- Bug fix for timeout calculation.
- Better handling of spurious interrupts.
- Fix for event type in slave mode.
- Removal of own slave addresses [2:10].
- Support for next gen BMC (NPCM845).

The NPCM I2C driver is tested on NPCM750 and NPCM845 evaluation boards.

Addressed comments from:
- Krzysztof Kozlowski : https://lkml.org/lkml/2022/2/21/129
- Wolfram Sang : https://lore.kernel.org/lkml/Yh536s%2F7bm6Xt6o3@ninjato/
- Rob Herring : https://lkml.org/lkml/2022/2/20/425
- Rob Herring : https://lkml.org/lkml/2022/2/22/945
- Krzysztof Kozlowski : https://www.spinics.net/lists/linux-i2c/

                         msg55903.html

- Jonathan Neuschäfer : https://lkml.org/lkml/2022/2/21/500
- Krzysztof Kozlowski : https://lkml.org/lkml/2022/2/20/49

Changes since version 2:
- Keep old code as fallback, if getting nuvoton,sys-mgr property fails.
- Fix the error reported by running 'make DT_CHECKER_FLAGS=-m dt_binding_check'.
- Make nuvoton,sys-mgr required for nuvoton,npcm845-i2c.
- Correct the patch's subject about changing the way of getting GCR regmap and add the description about keeping old code as fallback if getting nuvoton,sys-mgr property fails.
- Correct the patch title and description about removing the unused variable clk_regmap.
- Use the data field directly instead of the macros since macros are not constants anymore in this patch.

Changes since version 1:
- Add nuvoton,sys-mgr property in NPCM devicetree.
- Describe the commit message in imperative mood.
- Modify the description in i2c binding document to cover NPCM series.
- Add new property in i2c binding document.
- Create a new patch for client address calculation.
- Create a new patch for updating gcr property name.
- Create a new patch for removing unused clock node.
- Explain EOB in the commit description.
- Create a new patch for correcting NPCM register access width.
- Remove some comment since the corresponding logic no longer exists.
- Remove fixes tag while the patch adds an additional feature.
- Use devicetree data field to support NPCM845.

Tali Perry (7):
i2c: npcm: Fix client address calculation
i2c: npcm: Change the way of getting GCR regmap
i2c: npcm: Remove unused variable clk_regmap
i2c: npcm: Fix timeout calculation
i2c: npcm: Add tx complete counter
i2c: npcm: Handle spurious interrupts
i2c: npcm: Remove own slave addresses 2:10

Tyrone Ting (4):
arm: dts: add new property for NPCM i2c module
dt-bindings: i2c: npcm: support NPCM845
i2c: npcm: Correct register access width
i2c: npcm: Support NPCM845

 .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml     |  26 +-
 arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi |  16 +
 drivers/i2c/busses/Kconfig                    |   8 +-
 drivers/i2c/busses/Makefile                   |   2 +-
 drivers/i2c/busses/i2c-npcm7xx.c              | 291 +++++++++++-------
 5 files changed, 221 insertions(+), 122 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH v3 1/11 arm: dts: add new property for NPCM i2c module

From: Tyrone Ting <[email protected]>

Add nuvoton,sys-mgr property for controlling NPCM gcr register.

---
 arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
arch/arm/boot/dts/nuvoton-common-npcm7xx.dtsi +16 -0
index 3696980a3da1..0fee5fc67e02 100644
@@ -371,6 +371,7 @@
 				interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb0_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -383,6 +384,7 @@
 				interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb1_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -395,6 +397,7 @@
 				interrupts = <GIC_SPI 66 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb2_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -407,6 +410,7 @@
 				interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb3_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -419,6 +423,7 @@
 				interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb4_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -431,6 +436,7 @@
 				interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb5_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -443,6 +449,7 @@
 				interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb6_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -455,6 +462,7 @@
 				interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb7_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -467,6 +475,7 @@
 				interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb8_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -479,6 +488,7 @@
 				interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb9_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -491,6 +501,7 @@
 				interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb10_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -503,6 +514,7 @@
 				interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb11_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -515,6 +527,7 @@
 				interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb12_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -527,6 +540,7 @@
 				interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb13_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -539,6 +553,7 @@
 				interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb14_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 
@@ -551,6 +566,7 @@
 				interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
 				pinctrl-names = "default";
 				pinctrl-0 = <&smb15_pins>;
+				nuvoton,sys-mgr = <&gcr>;
 				status = "disabled";
 			};
 		};
Signature · 1 line
2.17.1
#2 lore raw

Re: [PATCH v3 01/11] arm: dts: add new property for NPCM i2c module

Quoted 6 lines · Tyrone Ting

From: Tyrone Ting <[email protected]>

Add nuvoton,sys-mgr property for controlling NPCM gcr register.

There are some comments about this series, so I am expecting a v4 somewhen. However, I already want to state that I usually don't take DTS patches. So, I guess the path forward is that Rob needs to ack the patch which is now patch 2. Once he does this and I apply it, you can take this DTS patch via arm-soc. Sounds good?

#3 lore raw

Re: [PATCH v3 01/11] arm: dts: add new property for NPCM i2c module

Hi Wolfram:

Thank you for your reminder and suggestion.

There are still some discussions for the patch V4 and it might take some time though.

Yes, the dts patch could be submitted via arm-soc.

I really appreciate your comments.

Wolfram Sang <[email protected]> 於 2022年3月19日 週六 上午4:29寫道:

Quoted 6 lines · Tyrone Ting
Quoted 4 lines

From: Tyrone Ting <[email protected]>

Add nuvoton,sys-mgr property for controlling NPCM gcr register.

Quoted 9 lines
Quoted 2 lines

There are some comments about this series, so I am expecting a v4 somewhen. However, I already want to state that I usually don't take DTS patches. So, I guess the path forward is that Rob needs to ack the patch which is now patch 2. Once he does this and I apply it, you can take this DTS patch via arm-soc. Sounds good?

Regards,
Tyrone

#4 lore raw

Re: [PATCH v3 01/11] arm: dts: add new property for NPCM i2c module

Hi Tyrone,

Quoted 2 lines

There are still some discussions for the patch V4 and it might take some time though.

Take your time, I am not in a hurry. Just wanted to outline the best process so it will be easier to apply the new version.

Quoted 1 line

Yes, the dts patch could be submitted via arm-soc.

Great.

Quoted 1 line

I really appreciate your comments.

Thank you and happy hacking,

Wolfram

#5 lore raw

PATCH v3 2/11 dt-bindings: i2c: npcm: support NPCM845

In reply to Tyrone Ting

From: Tyrone Ting <[email protected]>

Add compatible and nuvoton,sys-mgr description for NPCM i2c module.

---
 .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml     | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml +21 -5
index 128444942aec..37976ddcf406 100644
@@ -7,17 +7,18 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: nuvoton NPCM7XX I2C Controller Device Tree Bindings
 
 description: |
-  The NPCM750x includes sixteen I2C bus controllers. All Controllers support
-  both master and slave mode. Each controller can switch between master and slave
-  at run time (i.e. IPMB mode). Each controller has two 16 byte HW FIFO for TX and
-  RX.
+  I2C bus controllers of the NPCM series support both master and
+  slave mode. Each controller can switch between master and slave at run time
+  (i.e. IPMB mode). HW FIFO for TX and RX are supported.
 
 maintainers:
   - Tali Perry <[email protected]>
 
 properties:
   compatible:
-    const: nuvoton,npcm750-i2c
+    enum:
+      - nuvoton,npcm750-i2c
+      - nuvoton,npcm845-i2c
 
   reg:
     maxItems: 1
@@ -36,6 +37,10 @@ properties:
     default: 100000
     enum: [100000, 400000, 1000000]
 
+  nuvoton,sys-mgr:
+    $ref: "/schemas/types.yaml#/definitions/phandle"
+    description: The phandle of system manager register node.
+
 required:
   - compatible
   - reg
@@ -44,6 +49,16 @@ required:
 
 allOf:
   - $ref: /schemas/i2c/i2c-controller.yaml#
+  - if:
+      properties:
+        compatible:
+          contains:
+            const:
+              - nuvoton,npcm845-i2c
+
+    then:
+      required:
+        - nuvoton,sys-mgr
 
 unevaluatedProperties: false
 
@@ -57,6 +72,7 @@ examples:
         clock-frequency = <100000>;
         interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
         compatible = "nuvoton,npcm750-i2c";
+        nuvoton,sys-mgr = <&gcr>;
     };
 
 ...
Signature · 1 line
2.17.1
#6 lore raw

Re: [PATCH v3 02/11] dt-bindings: i2c: npcm: support NPCM845

Quoted 50 lines · Tyrone Ting

From: Tyrone Ting <[email protected]>

Add compatible and nuvoton,sys-mgr description for NPCM i2c module.

---
 .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml     | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml +10 -5
index 128444942aec..37976ddcf406 100644
@@ -7,17 +7,18 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: nuvoton NPCM7XX I2C Controller Device Tree Bindings
 
 description: |
-  The NPCM750x includes sixteen I2C bus controllers. All Controllers support
-  both master and slave mode. Each controller can switch between master and slave
-  at run time (i.e. IPMB mode). Each controller has two 16 byte HW FIFO for TX and
-  RX.
+  I2C bus controllers of the NPCM series support both master and
+  slave mode. Each controller can switch between master and slave at run time
+  (i.e. IPMB mode). HW FIFO for TX and RX are supported.
 
 maintainers:
   - Tali Perry <[email protected]>
 
 properties:
   compatible:
-    const: nuvoton,npcm750-i2c
+    enum:
+      - nuvoton,npcm750-i2c
+      - nuvoton,npcm845-i2c
 
   reg:
     maxItems: 1
@@ -36,6 +37,10 @@ properties:
     default: 100000
     enum: [100000, 400000, 1000000]
 
+  nuvoton,sys-mgr:
+    $ref: "/schemas/types.yaml#/definitions/phandle"
+    description: The phandle of system manager register node.
+
 required:
   - compatible
   - reg

Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml required: · line 57

Quoted 9 lines
Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml +6 -0
@@ -44,6 +49,16 @@ required:
 
 allOf:
   - $ref: /schemas/i2c/i2c-controller.yaml#
+  - if:
+      properties:
+        compatible:
+          contains:
+            const:
+              - nuvoton,npcm845-i2c

This should be one line in const (not an enum).

Rest looks good to me.

Best regards,
Krzysztof

#7 lore raw

Re: [PATCH v3 02/11] dt-bindings: i2c: npcm: support NPCM845

Hi Krzysztof:

Thank you for your comment and it'll be addressed.

Krzysztof Kozlowski <[email protected]> 於 2022年3月3日 週四 下午6:38寫道:

Quoted 64 lines · Tyrone Ting
Quoted 50 lines

From: Tyrone Ting <[email protected]>

Add compatible and nuvoton,sys-mgr description for NPCM i2c module.

---
 .../bindings/i2c/nuvoton,npcm7xx-i2c.yaml     | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml +10 -5
index 128444942aec..37976ddcf406 100644
@@ -7,17 +7,18 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: nuvoton NPCM7XX I2C Controller Device Tree Bindings
 
 description: |
-  The NPCM750x includes sixteen I2C bus controllers. All Controllers support
-  both master and slave mode. Each controller can switch between master and slave
-  at run time (i.e. IPMB mode). Each controller has two 16 byte HW FIFO for TX and
-  RX.
+  I2C bus controllers of the NPCM series support both master and
+  slave mode. Each controller can switch between master and slave at run time
+  (i.e. IPMB mode). HW FIFO for TX and RX are supported.
 
 maintainers:
   - Tali Perry <[email protected]>
 
 properties:
   compatible:
-    const: nuvoton,npcm750-i2c
+    enum:
+      - nuvoton,npcm750-i2c
+      - nuvoton,npcm845-i2c
 
   reg:
     maxItems: 1
@@ -36,6 +37,10 @@ properties:
     default: 100000
     enum: [100000, 400000, 1000000]
 
+  nuvoton,sys-mgr:
+    $ref: "/schemas/types.yaml#/definitions/phandle"
+    description: The phandle of system manager register node.
+
 required:
   - compatible
   - reg

Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml required: · line 57

Quoted 9 lines
Documentation/devicetree/bindings/i2c/nuvoton,npcm7xx-i2c.yaml +6 -0
@@ -44,6 +49,16 @@ required:
 
 allOf:
   - $ref: /schemas/i2c/i2c-controller.yaml#
+  - if:
+      properties:
+        compatible:
+          contains:
+            const:
+              - nuvoton,npcm845-i2c

This should be one line in const (not an enum).

Quoted 4 lines

Rest looks good to me.

Best regards,
Krzysztof

Best regards,
Tyrone

#8 lore raw

PATCH v3 3/11 i2c: npcm: Fix client address calculation

In reply to Tyrone Ting

From: Tali Perry <[email protected]>

Fix i2c client address by left-shifting 1 bit before applying it to the data register.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-npcm7xx.c +1 -1
index 2ad166355ec9..4c225e1a058f 100644
@@ -2131,7 +2131,7 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
 	}
 
 	npcm_i2c_init_params(bus);
-	bus->dest_addr = slave_addr;
+	bus->dest_addr = slave_addr << 1;
 	bus->msgs = msgs;
 	bus->msgs_num = num;
 	bus->cmd_err = 0;
Signature · 1 line
2.17.1
#9 lore raw

Re: [PATCH v3 03/11] i2c: npcm: Fix client address calculation

Quoted 4 lines · Tyrone Ting

From: Tali Perry <[email protected]>

Fix i2c client address by left-shifting 1 bit before applying it to the data register.

...

drivers/i2c/busses/i2c-npcm7xx.c static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, · line 2134

Quoted 2 lines
drivers/i2c/busses/i2c-npcm7xx.c +1 -1
-	bus->dest_addr = slave_addr;
+	bus->dest_addr = slave_addr << 1;

1. Why this is not using i2c_8bit_addr_from_msg() helper?
2. This is duplication of what npcm_i2c_master_start_xmit() does.

Taking 2 into account, what is this exactly fixing? Sounds like a red herring.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#10 lore raw

Re: [PATCH v3 03/11] i2c: npcm: Fix client address calculation

Hi Andy:

Thank you for your comment and it'll be addressed.

Andy Shevchenko <[email protected]> 於 2022年3月3日 週四 下午6:31寫道:

Quoted 15 lines · Tyrone Ting
Quoted 4 lines

From: Tali Perry <[email protected]>

Fix i2c client address by left-shifting 1 bit before applying it to the data register.

...

drivers/i2c/busses/i2c-npcm7xx.c static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, · line 2134

Quoted 2 lines
drivers/i2c/busses/i2c-npcm7xx.c +1 -1
-     bus->dest_addr = slave_addr;
+     bus->dest_addr = slave_addr << 1;

1. Why this is not using i2c_8bit_addr_from_msg() helper?
2. This is duplication of what npcm_i2c_master_start_xmit() does.

Quoted 8 lines

Taking 2 into account, what is this exactly fixing? Sounds like a red herring.

--
With Best Regards,
Andy Shevchenko

Best regards,
Tyrone

#11 lore raw

PATCH v3 4/11 i2c: npcm: Change the way of getting GCR regmap

In reply to Tyrone Ting

From: Tali Perry <[email protected]>

Change the way of getting NPCM system manager reigster (GCR) and still maintain the old mechanism as a fallback if getting nuvoton,sys-mgr fails while working with the legacy devicetree file.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/i2c/busses/i2c-npcm7xx.c +5 -1
index 4c225e1a058f..fa12212b2428 100644
@@ -2236,6 +2236,7 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
 	static struct regmap *clk_regmap;
 	int irq;
 	int ret;
+	struct device_node *np = pdev->dev.of_node;
 
 	bus = devm_kzalloc(&pdev->dev, sizeof(*bus), GFP_KERNEL);
 	if (!bus)
@@ -2250,7 +2251,10 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
 		return PTR_ERR(i2c_clk);
 	bus->apb_clk = clk_get_rate(i2c_clk);
 
-	gcr_regmap = syscon_regmap_lookup_by_compatible("nuvoton,npcm750-gcr");
+	gcr_regmap = syscon_regmap_lookup_by_phandle(np, "nuvoton,sys-mgr");
+	if (IS_ERR(gcr_regmap))
+		gcr_regmap = syscon_regmap_lookup_by_compatible("nuvoton,npcm750-gcr");
+
 	if (IS_ERR(gcr_regmap))
 		return PTR_ERR(gcr_regmap);
 	regmap_write(gcr_regmap, NPCM_I2CSEGCTL, NPCM_I2CSEGCTL_INIT_VAL);
Signature · 1 line
2.17.1
Acked-by on v3 4/11
#12 lore raw

Re: [PATCH v3 04/11] i2c: npcm: Change the way of getting GCR regmap

Quoted 7 lines · Tyrone Ting

From: Tali Perry <[email protected]>

Change the way of getting NPCM system manager reigster (GCR) and still maintain the old mechanism as a fallback if getting nuvoton,sys-mgr fails while working with the legacy devicetree file.

Quoted 7 lines
Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Best regards,
Krzysztof

#13 lore raw

Re: [PATCH v3 04/11] i2c: npcm: Change the way of getting GCR regmap

Hi Krzysztof:

Thank you for your review.

Krzysztof Kozlowski <[email protected]> 於 2022年3月3日 週四 下午6:38寫道:

Quoted 18 lines · Tyrone Ting
Quoted 7 lines

From: Tali Perry <[email protected]>

Change the way of getting NPCM system manager reigster (GCR) and still maintain the old mechanism as a fallback if getting nuvoton,sys-mgr fails while working with the legacy devicetree file.

Quoted 7 lines
Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Quoted 5 lines

Best regards,
Krzysztof

Best regards,
Tyrone

#14 lore raw

PATCH v3 5/11 i2c: npcm: Remove unused variable clk_regmap

In reply to Tyrone Ting

From: Tali Perry <[email protected]>

Remove unused variable clk_regmap.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/i2c/busses/i2c-npcm7xx.c +0 -5
index fa12212b2428..c41de3afcf38 100644
@@ -2233,7 +2233,6 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
 	struct i2c_adapter *adap;
 	struct clk *i2c_clk;
 	static struct regmap *gcr_regmap;
-	static struct regmap *clk_regmap;
 	int irq;
 	int ret;
 	struct device_node *np = pdev->dev.of_node;
@@ -2259,10 +2258,6 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
 		return PTR_ERR(gcr_regmap);
 	regmap_write(gcr_regmap, NPCM_I2CSEGCTL, NPCM_I2CSEGCTL_INIT_VAL);
 
-	clk_regmap = syscon_regmap_lookup_by_compatible("nuvoton,npcm750-clk");
-	if (IS_ERR(clk_regmap))
-		return PTR_ERR(clk_regmap);
-
 	bus->reg = devm_platform_ioremap_resource(pdev, 0);
 	if (IS_ERR(bus->reg))
 		return PTR_ERR(bus->reg);
Signature · 1 line
2.17.1
#15 lore raw

PATCH v3 6/11 i2c: npcm: Fix timeout calculation

In reply to Tyrone Ting

From: Tali Perry <[email protected]>

Use adap.timeout for timeout calculation instead of hard-coded value of 35ms.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-npcm7xx.c +4 -4
index c41de3afcf38..3fd30c38b3bf 100644
@@ -2047,7 +2047,7 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
 	u16 nwrite, nread;
 	u8 *write_data, *read_data;
 	u8 slave_addr;
-	int timeout;
+	unsigned long timeout;
 	int ret = 0;
 	bool read_block = false;
 	bool read_PEC = false;
@@ -2099,13 +2099,13 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
 	 * 9: bits per transaction (including the ack/nack)
 	 */
 	timeout_usec = (2 * 9 * USEC_PER_SEC / bus->bus_freq) * (2 + nread + nwrite);
-	timeout = max(msecs_to_jiffies(35), usecs_to_jiffies(timeout_usec));
+	timeout = max_t(unsigned long, bus->adap.timeout, usecs_to_jiffies(timeout_usec));
 	if (nwrite >= 32 * 1024 || nread >= 32 * 1024) {
 		dev_err(bus->dev, "i2c%d buffer too big\n", bus->num);
 		return -EINVAL;
 	}
 
-	time_left = jiffies + msecs_to_jiffies(DEFAULT_STALL_COUNT) + 1;
+	time_left = jiffies + timeout + 1;
 	do {
 		/*
 		 * we must clear slave address immediately when the bus is not
@@ -2268,7 +2268,7 @@ static int npcm_i2c_probe_bus(struct platform_device *pdev)
 	adap = &bus->adap;
 	adap->owner = THIS_MODULE;
 	adap->retries = 3;
-	adap->timeout = HZ;
+	adap->timeout = msecs_to_jiffies(35);
 	adap->algo = &npcm_i2c_algo;
 	adap->quirks = &npcm_i2c_quirks;
 	adap->algo_data = bus;
Signature · 1 line
2.17.1
#16 lore raw

PATCH v3 7/11 i2c: npcm: Add tx complete counter

In reply to Tyrone Ting

From: Tali Perry <[email protected]>

tx_complete counter is used to indicate successful transaction count.
Similar counters for failed tx were previously added.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/i2c/busses/i2c-npcm7xx.c +4 -0
index 3fd30c38b3bf..237da0ef32ca 100644
@@ -314,6 +314,7 @@ struct npcm_i2c {
 	u64 rec_fail_cnt;
 	u64 nack_cnt;
 	u64 timeout_cnt;
+	u64 tx_complete_cnt;
 };
 
 static inline void npcm_i2c_select_bank(struct npcm_i2c *bus,
@@ -684,6 +685,8 @@ static void npcm_i2c_callback(struct npcm_i2c *bus,
 	switch (op_status) {
 	case I2C_MASTER_DONE_IND:
 		bus->cmd_err = bus->msgs_num;
+		if (bus->tx_complete_cnt < ULLONG_MAX)
+			bus->tx_complete_cnt++;
 		fallthrough;
 	case I2C_BLOCK_BYTES_ERR_IND:
 		/* Master tx finished and all transmit bytes were sent */
@@ -2223,6 +2226,7 @@ static void npcm_i2c_init_debugfs(struct platform_device *pdev,
 	debugfs_create_u64("rec_succ_cnt", 0444, d, &bus->rec_succ_cnt);
 	debugfs_create_u64("rec_fail_cnt", 0444, d, &bus->rec_fail_cnt);
 	debugfs_create_u64("timeout_cnt", 0444, d, &bus->timeout_cnt);
+	debugfs_create_u64("tx_complete_cnt", 0444, d, &bus->tx_complete_cnt);
 
 	bus->debugfs = d;
 }
Signature · 1 line
2.17.1
#17 lore raw

PATCH v3 8/11 i2c: npcm: Correct register access width

In reply to Tyrone Ting

From: Tyrone Ting <[email protected]>

Use ioread8 instead of ioread32 to access the SMBnCTL3 register since the register is only 8-bit wide.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i2c/busses/i2c-npcm7xx.c +2 -2
index 237da0ef32ca..66532c680338 100644
@@ -360,14 +360,14 @@ static int npcm_i2c_get_SCL(struct i2c_adapter *_adap)
 {
 	struct npcm_i2c *bus = container_of(_adap, struct npcm_i2c, adap);
 
-	return !!(I2CCTL3_SCL_LVL & ioread32(bus->reg + NPCM_I2CCTL3));
+	return !!(I2CCTL3_SCL_LVL & ioread8(bus->reg + NPCM_I2CCTL3));
 }
 
 static int npcm_i2c_get_SDA(struct i2c_adapter *_adap)
 {
 	struct npcm_i2c *bus = container_of(_adap, struct npcm_i2c, adap);
 
-	return !!(I2CCTL3_SDA_LVL & ioread32(bus->reg + NPCM_I2CCTL3));
+	return !!(I2CCTL3_SDA_LVL & ioread8(bus->reg + NPCM_I2CCTL3));
 }
 
 static inline u16 npcm_i2c_get_index(struct npcm_i2c *bus)
Signature · 1 line
2.17.1
#18 lore raw

Re: [PATCH v3 08/11] i2c: npcm: Correct register access width

Quoted 6 lines · Tyrone Ting

From: Tyrone Ting <[email protected]>

Use ioread8 instead of ioread32 to access the SMBnCTL3 register since the register is only 8-bit wide.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")

No, this is bad commit message, since you have bitwise masks and there is nothing to fix from functional point of view. So, why is this a fix?

Quoted 2 lines

This is wrong SoB chain.

...

Quoted 2 lines
drivers/i2c/busses/i2c-npcm7xx.c +1 -1
-	return !!(I2CCTL3_SCL_LVL & ioread32(bus->reg + NPCM_I2CCTL3));
+	return !!(I2CCTL3_SCL_LVL & ioread8(bus->reg + NPCM_I2CCTL3));

...

Quoted 2 lines
drivers/i2c/busses/i2c-npcm7xx.c +1 -1
-	return !!(I2CCTL3_SDA_LVL & ioread32(bus->reg + NPCM_I2CCTL3));
+	return !!(I2CCTL3_SDA_LVL & ioread8(bus->reg + NPCM_I2CCTL3));
Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#19 lore raw

Re: [PATCH v3 08/11] i2c: npcm: Correct register access width

Quoted 11 lines · Tyrone Ting
Quoted 6 lines

From: Tyrone Ting <[email protected]>

Use ioread8 instead of ioread32 to access the SMBnCTL3 register since the register is only 8-bit wide.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")

No, this is bad commit message, since you have bitwise masks and there is nothing to fix from functional point of view. So, why is this a fix?

The next gen of this device is a 64 bit cpu.
The module is and was 8 bit.

The ioread32 that seemed to work smoothly on a 32 bit machine was causing a panic on a 64 bit machine.
since the module is 8 bit we changed to ioread8. This is working both for the 32 and 64 CPUs with no issue.

Quoted 10 lines
Quoted 2 lines

This is wrong SoB chain.

...

drivers/i2c/busses/i2c-npcm7xx.c static int npcm_i2c_get_SCL(struct i2c_adapter *_adap) · line 363

Quoted 2 lines
drivers/i2c/busses/i2c-npcm7xx.c +1 -1
-     return !!(I2CCTL3_SCL_LVL & ioread32(bus->reg + NPCM_I2CCTL3));
+     return !!(I2CCTL3_SCL_LVL & ioread8(bus->reg + NPCM_I2CCTL3));
Quoted 8 lines

...

drivers/i2c/busses/i2c-npcm7xx.c static int npcm_i2c_get_SCL(struct i2c_adapter *_adap) · line 370

Quoted 2 lines
drivers/i2c/busses/i2c-npcm7xx.c +1 -1
-     return !!(I2CCTL3_SDA_LVL & ioread32(bus->reg + NPCM_I2CCTL3));
+     return !!(I2CCTL3_SDA_LVL & ioread8(bus->reg + NPCM_I2CCTL3));

--
With Best Regards,
Andy Shevchenko

Thanks Andy,

BR,
Tali Perry

#20 lore raw

Re: [PATCH v3 08/11] i2c: npcm: Correct register access width

Quoted 12 lines · Tali Perry
Quoted 11 lines · Tyrone Ting
Quoted 6 lines

From: Tyrone Ting <[email protected]>

Use ioread8 instead of ioread32 to access the SMBnCTL3 register since the register is only 8-bit wide.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")

No, this is bad commit message, since you have bitwise masks and there is nothing to fix from functional point of view. So, why is this a fix?

Quoted 7 lines

The next gen of this device is a 64 bit cpu.
The module is and was 8 bit.

The ioread32 that seemed to work smoothly on a 32 bit machine was causing a panic on a 64 bit machine.
since the module is 8 bit we changed to ioread8. This is working both for the 32 and 64 CPUs with no issue.

Then the commit message is completely wrong here. And provide necessary (no need to have noisy commit messages) bits of the oops to show what's going on

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#21 lore raw

Re: [PATCH v3 08/11] i2c: npcm: Correct register access width

Hello,

Quoted 16 lines · Andy Shevchenko
Quoted 15 lines · Tali Perry
Quoted 11 lines · Tyrone Ting
Quoted 6 lines

From: Tyrone Ting <[email protected]>

Use ioread8 instead of ioread32 to access the SMBnCTL3 register since the register is only 8-bit wide.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")

No, this is bad commit message, since you have bitwise masks and there is nothing to fix from functional point of view. So, why is this a fix?

The next gen of this device is a 64 bit cpu.
The module is and was 8 bit.

Quoted 6 lines
Quoted 4 lines

The ioread32 that seemed to work smoothly on a 32 bit machine was causing a panic on a 64 bit machine.
since the module is 8 bit we changed to ioread8. This is working both for the 32 and 64 CPUs with no issue.

Then the commit message is completely wrong here.

I disagree: The commit message is perhaps incomplete, but not wrong. The SMBnCTL3 register was specified as 8 bits wide in the datasheets of multiple chip generations, as far as I can tell, but the driver wrongly made a 32-bit access, which just happened not to blow up.

So, indeed, "since the register is only 8-bit wide" seems to be a correct claim.

Quoted 2 lines

And provide necessary (no need to have noisy commit messages) bits of the oops to show what's going on

I guess it's blowing up now because SMBnCTL3 isn't 32-bit aligned (being at offset 0x0e in the controller).

Jonathan

maintainer
#22 lore raw

Re: [PATCH v3 08/11] i2c: npcm: Correct register access width

Quoted 32 lines · Jonathan Neuschäfer

Hello,

Quoted 16 lines · Andy Shevchenko
Quoted 15 lines · Tali Perry
Quoted 11 lines · Tyrone Ting
Quoted 6 lines

From: Tyrone Ting <[email protected]>

Use ioread8 instead of ioread32 to access the SMBnCTL3 register since the register is only 8-bit wide.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")

No, this is bad commit message, since you have bitwise masks and there is nothing to fix from functional point of view. So, why is this a fix?

The next gen of this device is a 64 bit cpu.
The module is and was 8 bit.

Quoted 6 lines
Quoted 4 lines

The ioread32 that seemed to work smoothly on a 32 bit machine was causing a panic on a 64 bit machine.
since the module is 8 bit we changed to ioread8. This is working both for the 32 and 64 CPUs with no issue.

Then the commit message is completely wrong here.

I disagree: The commit message is perhaps incomplete, but not wrong. The SMBnCTL3 register was specified as 8 bits wide in the datasheets of multiple chip generations, as far as I can tell, but the driver wrongly made a 32-bit access, which just happened not to blow up.

Quoted 9 lines

So, indeed, "since the register is only 8-bit wide" seems to be a correct claim.

Quoted 2 lines

And provide necessary (no need to have noisy commit messages) bits of the oops to show what's going on

I guess it's blowing up now because SMBnCTL3 isn't 32-bit aligned (being at offset 0x0e in the controller).

Hi Andy,
After this clarification can you please acknowledge this specific patch? If you think there is a better way to describe this, can you propose one?

Quoted 2 lines

Jonathan

Signature · 2 lines
Regards,
Avi
#23 lore raw

Re: [PATCH v3 08/11] i2c: npcm: Correct register access width

Quoted 40 lines · Avi Fishman
Quoted 38 lines · Jonathan Neuschäfer

Hello,

Quoted 16 lines · Andy Shevchenko
Quoted 15 lines · Tali Perry
Quoted 11 lines · Tyrone Ting
Quoted 6 lines

From: Tyrone Ting <[email protected]>

Use ioread8 instead of ioread32 to access the SMBnCTL3 register since the register is only 8-bit wide.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")

No, this is bad commit message, since you have bitwise masks and there is nothing to fix from functional point of view. So, why is this a fix?

The next gen of this device is a 64 bit cpu.
The module is and was 8 bit.

Quoted 6 lines
Quoted 4 lines

The ioread32 that seemed to work smoothly on a 32 bit machine was causing a panic on a 64 bit machine.
since the module is 8 bit we changed to ioread8. This is working both for the 32 and 64 CPUs with no issue.

Then the commit message is completely wrong here.

I disagree: The commit message is perhaps incomplete, but not wrong. The SMBnCTL3 register was specified as 8 bits wide in the datasheets of multiple chip generations, as far as I can tell, but the driver wrongly made a 32-bit access, which just happened not to blow up.

So, indeed, "since the register is only 8-bit wide" seems to be a correct claim.

Quoted 2 lines

And provide necessary (no need to have noisy commit messages) bits of the oops to show what's going on

Quoted 7 lines
Quoted 3 lines

I guess it's blowing up now because SMBnCTL3 isn't 32-bit aligned (being at offset 0x0e in the controller).

Hi Andy,
After this clarification can you please acknowledge this specific patch? If you think there is a better way to describe this, can you propose one?

To be honest, I think it's probably best to include all the necessary explanations in the next version of this patch, i.e.:

- That the register was always defined as 8-bit in the datasheets, and so the 32-bit access was always incorrect, but simply didn't cause a visible error
- How the 32-bit access caused an error now, perhaps with a trimmed Oops log as Andy suggested

Jonathan

#24 lore raw

PATCH v3 9/11 i2c: npcm: Handle spurious interrupts

In reply to Tyrone Ting

From: Tali Perry <[email protected]>

In order to better handle spurious interrupts:
1. Disable incoming interrupts in master only mode.
2. Clear end of busy (EOB) after every interrupt.
3. Return correct status during interrupt.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 92 ++++++++++++++++++++++----------
 1 file changed, 63 insertions(+), 29 deletions(-)
drivers/i2c/busses/i2c-npcm7xx.c +63 -29
index 66532c680338..73cef76127c9 100644
@@ -564,6 +564,15 @@ static inline void npcm_i2c_nack(struct npcm_i2c *bus)
 	iowrite8(val, bus->reg + NPCM_I2CCTL1);
 }
 
+static inline void npcm_i2c_clear_master_status(struct npcm_i2c *bus)
+{
+	u8 val;
+
+	/* Clear NEGACK, STASTR and BER bits */
+	val = NPCM_I2CST_BER | NPCM_I2CST_NEGACK | NPCM_I2CST_STASTR;
+	iowrite8(val, bus->reg + NPCM_I2CST);
+}
+
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
 static void npcm_i2c_slave_int_enable(struct npcm_i2c *bus, bool enable)
 {
@@ -643,8 +652,8 @@ static void npcm_i2c_reset(struct npcm_i2c *bus)
 	iowrite8(NPCM_I2CCST_BB, bus->reg + NPCM_I2CCST);
 	iowrite8(0xFF, bus->reg + NPCM_I2CST);
 
-	/* Clear EOB bit */
-	iowrite8(NPCM_I2CCST3_EO_BUSY, bus->reg + NPCM_I2CCST3);
+	/* Clear and disable EOB */
+	npcm_i2c_eob_int(bus, false);
 
 	/* Clear all fifo bits: */
 	iowrite8(NPCM_I2CFIF_CTS_CLR_FIFO, bus->reg + NPCM_I2CFIF_CTS);
@@ -656,6 +665,9 @@ static void npcm_i2c_reset(struct npcm_i2c *bus)
 	}
 #endif
 
+	/* clear status bits for spurious interrupts */
+	npcm_i2c_clear_master_status(bus);
+
 	bus->state = I2C_IDLE;
 }
 
@@ -818,15 +830,6 @@ static void npcm_i2c_read_fifo(struct npcm_i2c *bus, u8 bytes_in_fifo)
 	}
 }
 
-static inline void npcm_i2c_clear_master_status(struct npcm_i2c *bus)
-{
-	u8 val;
-
-	/* Clear NEGACK, STASTR and BER bits */
-	val = NPCM_I2CST_BER | NPCM_I2CST_NEGACK | NPCM_I2CST_STASTR;
-	iowrite8(val, bus->reg + NPCM_I2CST);
-}
-
 static void npcm_i2c_master_abort(struct npcm_i2c *bus)
 {
 	/* Only current master is allowed to issue a stop condition */
@@ -1234,7 +1237,16 @@ static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus)
 		ret = IRQ_HANDLED;
 	} /* SDAST */
 
-	return ret;
+	/*
+	 * if irq is not one of the above, make sure EOB is disabled and all
+	 * status bits are cleared.
+	 */
+	if (ret == IRQ_NONE) {
+		npcm_i2c_eob_int(bus, false);
+		npcm_i2c_clear_master_status(bus);
+	}
+
+	return IRQ_HANDLED;
 }
 
 static int npcm_i2c_reg_slave(struct i2c_client *client)
@@ -1470,6 +1482,9 @@ static void npcm_i2c_irq_handle_nack(struct npcm_i2c *bus)
 		npcm_i2c_eob_int(bus, false);
 		npcm_i2c_master_stop(bus);
 
+		/* Clear SDA Status bit (by reading dummy byte) */
+		npcm_i2c_rd_byte(bus);
+
 		/*
 		 * The bus is released from stall only after the SW clears
 		 * NEGACK bit. Then a Stop condition is sent.
@@ -1477,6 +1492,8 @@ static void npcm_i2c_irq_handle_nack(struct npcm_i2c *bus)
 		npcm_i2c_clear_master_status(bus);
 		readx_poll_timeout_atomic(ioread8, bus->reg + NPCM_I2CCST, val,
 					  !(val & NPCM_I2CCST_BUSY), 10, 200);
+		/* verify no status bits are still set after bus is released */
+		npcm_i2c_clear_master_status(bus);
 	}
 	bus->state = I2C_IDLE;
 
@@ -1675,10 +1692,10 @@ static int npcm_i2c_recovery_tgclk(struct i2c_adapter *_adap)
 	int              iter = 27;
 
 	if ((npcm_i2c_get_SDA(_adap) == 1) && (npcm_i2c_get_SCL(_adap) == 1)) {
-		dev_dbg(bus->dev, "bus%d recovery skipped, bus not stuck",
-			bus->num);
+		dev_dbg(bus->dev, "bus%d-0x%x recovery skipped, bus not stuck",
+			bus->num, bus->dest_addr);
 		npcm_i2c_reset(bus);
-		return status;
+		return 0;
 	}
 
 	npcm_i2c_int_enable(bus, false);
@@ -1912,6 +1929,7 @@ static int npcm_i2c_init_module(struct npcm_i2c *bus, enum i2c_mode mode,
 	    bus_freq_hz < I2C_FREQ_MIN_HZ || bus_freq_hz > I2C_FREQ_MAX_HZ)
 		return -EINVAL;
 
+	npcm_i2c_int_enable(bus, false);
 	npcm_i2c_disable(bus);
 
 	/* Configure FIFO mode : */
@@ -1940,10 +1958,18 @@ static int npcm_i2c_init_module(struct npcm_i2c *bus, enum i2c_mode mode,
 	val = (val | NPCM_I2CCTL1_NMINTE) & ~NPCM_I2CCTL1_RWS;
 	iowrite8(val, bus->reg + NPCM_I2CCTL1);
 
-	npcm_i2c_int_enable(bus, true);
-
 	npcm_i2c_reset(bus);
 
+	/* check HW is OK: SDA and SCL should be high at this point. */
+	if ((npcm_i2c_get_SDA(&bus->adap) == 0) ||
+	    (npcm_i2c_get_SCL(&bus->adap) == 0)) {
+		dev_err(bus->dev, "I2C%d init fail: lines are low", bus->num);
+		dev_err(bus->dev, "SDA=%d SCL=%d", npcm_i2c_get_SDA(&bus->adap),
+			npcm_i2c_get_SCL(&bus->adap));
+		return -ENXIO;
+	}
+
+	npcm_i2c_int_enable(bus, true);
 	return 0;
 }
 
@@ -1991,10 +2017,14 @@ static irqreturn_t npcm_i2c_bus_irq(int irq, void *dev_id)
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
 	if (bus->slave) {
 		bus->master_or_slave = I2C_SLAVE;
-		return npcm_i2c_int_slave_handler(bus);
+		if (npcm_i2c_int_slave_handler(bus))
+			return IRQ_HANDLED;
 	}
 #endif
-	return IRQ_NONE;
+	/* clear status bits for spurious interrupts */
+	npcm_i2c_clear_master_status(bus);
+
+	return IRQ_HANDLED;
 }
 
 static bool npcm_i2c_master_start_xmit(struct npcm_i2c *bus,
@@ -2051,7 +2081,6 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
 	u8 *write_data, *read_data;
 	u8 slave_addr;
 	unsigned long timeout;
-	int ret = 0;
 	bool read_block = false;
 	bool read_PEC = false;
 	u8 bus_busy;
@@ -2141,12 +2170,12 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
 	bus->read_block_use = read_block;
 
 	reinit_completion(&bus->cmd_complete);
-	if (!npcm_i2c_master_start_xmit(bus, slave_addr, nwrite, nread,
-					write_data, read_data, read_PEC,
-					read_block))
-		ret = -EBUSY;
 
-	if (ret != -EBUSY) {
+	npcm_i2c_int_enable(bus, true);
+
+	if (npcm_i2c_master_start_xmit(bus, slave_addr, nwrite, nread,
+				       write_data, read_data, read_PEC,
+				       read_block)) {
 		time_left = wait_for_completion_timeout(&bus->cmd_complete,
 							timeout);
 
@@ -2160,26 +2189,31 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
 			}
 		}
 	}
-	ret = bus->cmd_err;
 
 	/* if there was BER, check if need to recover the bus: */
 	if (bus->cmd_err == -EAGAIN)
-		ret = i2c_recover_bus(adap);
+		bus->cmd_err = i2c_recover_bus(adap);
 
 	/*
 	 * After any type of error, check if LAST bit is still set,
 	 * due to a HW issue.
 	 * It cannot be cleared without resetting the module.
 	 */
-	if (bus->cmd_err &&
-	    (NPCM_I2CRXF_CTL_LAST_PEC & ioread8(bus->reg + NPCM_I2CRXF_CTL)))
+	else if (bus->cmd_err &&
+		 (NPCM_I2CRXF_CTL_LAST_PEC & ioread8(bus->reg + NPCM_I2CRXF_CTL)))
 		npcm_i2c_reset(bus);
 
+	/* after any xfer, successful or not, stall and EOB must be disabled */
+	npcm_i2c_stall_after_start(bus, false);
+	npcm_i2c_eob_int(bus, false);
+
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
 	/* reenable slave if it was enabled */
 	if (bus->slave)
 		iowrite8((bus->slave->addr & 0x7F) | NPCM_I2CADDR_SAEN,
 			 bus->reg + NPCM_I2CADDR1);
+#else
+	npcm_i2c_int_enable(bus, false);
 #endif
 	return bus->cmd_err;
 }
Signature · 1 line
2.17.1
#25 lore raw

Re: [PATCH v3 09/11] i2c: npcm: Handle spurious interrupts

Quoted 6 lines · Tyrone Ting

From: Tali Perry <[email protected]>

In order to better handle spurious interrupts:
1. Disable incoming interrupts in master only mode.
2. Clear end of busy (EOB) after every interrupt.
3. Return correct status during interrupt.

This is bad commit message, it doesn't explain "why" you are doing these.

...

drivers/i2c/busses/i2c-npcm7xx.c static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus) · line 1242

Quoted 3 lines
drivers/i2c/busses/i2c-npcm7xx.c +3 -0
+	/*
+	 * if irq is not one of the above, make sure EOB is disabled and all
+	 * status bits are cleared.

This does not explain why you hide the spurious interrupt.

Quoted 7 lines
drivers/i2c/busses/i2c-npcm7xx.c +7 -0
+	 */
+	if (ret == IRQ_NONE) {
+		npcm_i2c_eob_int(bus, false);
+		npcm_i2c_clear_master_status(bus);
+	}
+
+	return IRQ_HANDLED;
Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#26 lore raw

Re: [PATCH v3 09/11] i2c: npcm: Handle spurious interrupts

Quoted 5 lines · Andy Shevchenko
Quoted 4 lines · Tyrone Ting
Quoted 2 lines

From: Tali Perry <[email protected]>

Quoted 8 lines
Quoted 8 lines
Quoted 4 lines

In order to better handle spurious interrupts:
1. Disable incoming interrupts in master only mode.
2. Clear end of busy (EOB) after every interrupt.
3. Return correct status during interrupt.

This is bad commit message, it doesn't explain "why" you are doing these.

...

BMC users connect a huge tree of i2c devices and muxes. This tree suffers from spikes, noise and double clocks. All these may cause spurious interrupts to the BMC.

If the driver gets an IRQ which was not expected and was not handled by the IRQ handler,
there is nothing left to do but to clear the interrupt and move on. If the transaction failed, driver has a recovery function. After that, user may retry to send the message.

Indeed the commit message doesn't explain all this. We will fix and add to the next patchset.

Quoted 15 lines
Quoted 15 lines

drivers/i2c/busses/i2c-npcm7xx.c static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus) · line 1242

Quoted 4 lines
drivers/i2c/busses/i2c-npcm7xx.c +3 -0
+     /*
+      * if irq is not one of the above, make sure EOB is disabled and all
+      * status bits are cleared.

This does not explain why you hide the spurious interrupt.

Quoted 7 lines
drivers/i2c/busses/i2c-npcm7xx.c +7 -0
+      */
+     if (ret == IRQ_NONE) {
+             npcm_i2c_eob_int(bus, false);
+             npcm_i2c_clear_master_status(bus);
+     }
+
+     return IRQ_HANDLED;
Quoted 5 lines
Quoted 5 lines

--
With Best Regards,
Andy Shevchenko

Thanks Andy,

BR,
Tali Perry

#27 lore raw

Re: [PATCH v3 09/11] i2c: npcm: Handle spurious interrupts

Quoted 11 lines · Tali Perry
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Tyrone Ting
Quoted 6 lines

From: Tali Perry <[email protected]>

In order to better handle spurious interrupts:
1. Disable incoming interrupts in master only mode.
2. Clear end of busy (EOB) after every interrupt.
3. Return correct status during interrupt.

This is bad commit message, it doesn't explain "why" you are doing these.

...

Quoted 7 lines

BMC users connect a huge tree of i2c devices and muxes. This tree suffers from spikes, noise and double clocks. All these may cause spurious interrupts to the BMC.

If the driver gets an IRQ which was not expected and was not handled by the IRQ handler,
there is nothing left to do but to clear the interrupt and move on.

Yes, the problem is what "move on" means in your case.
If you get a spurious interrupts there are possibilities what's wrong:
1) HW bug(s)
2) FW bug(s)
3) Missed IRQ mask in the driver
4) Improper IRQ mask in the driver

The below approach seems incorrect to me.

Quoted 19 lines

If the transaction failed, driver has a recovery function. After that, user may retry to send the message.

Indeed the commit message doesn't explain all this. We will fix and add to the next patchset.

Quoted 13 lines
Quoted 13 lines

drivers/i2c/busses/i2c-npcm7xx.c static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus) · line 1242

Quoted 3 lines
drivers/i2c/busses/i2c-npcm7xx.c +3 -0
+     /*
+      * if irq is not one of the above, make sure EOB is disabled and all
+      * status bits are cleared.

This does not explain why you hide the spurious interrupt.

Quoted 7 lines
drivers/i2c/busses/i2c-npcm7xx.c +7 -0
+      */
+     if (ret == IRQ_NONE) {
+             npcm_i2c_eob_int(bus, false);
+             npcm_i2c_clear_master_status(bus);
+     }
+
+     return IRQ_HANDLED;
Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#28 lore raw

Re: [PATCH v3 09/11] i2c: npcm: Handle spurious interrupts

Quoted 24 lines · Andy Shevchenko
Quoted 11 lines · Tali Perry
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Tyrone Ting
Quoted 6 lines

From: Tali Perry <[email protected]>

In order to better handle spurious interrupts:
1. Disable incoming interrupts in master only mode.
2. Clear end of busy (EOB) after every interrupt.
3. Return correct status during interrupt.

This is bad commit message, it doesn't explain "why" you are doing these.

...

Quoted 7 lines

BMC users connect a huge tree of i2c devices and muxes. This tree suffers from spikes, noise and double clocks. All these may cause spurious interrupts to the BMC.

If the driver gets an IRQ which was not expected and was not handled by the IRQ handler,
there is nothing left to do but to clear the interrupt and move on.

Quoted 9 lines

Yes, the problem is what "move on" means in your case.
If you get a spurious interrupts there are possibilities what's wrong:
1) HW bug(s)
2) FW bug(s)
3) Missed IRQ mask in the driver
4) Improper IRQ mask in the driver

The below approach seems incorrect to me.

Andy, What about this explanation:
On rare cases the i2c gets a spurious interrupt which means that we enter an interrupt but in
the interrupt handler we don't find any status bit that points to the reason we got this interrupt.
This may be a rare case of HW issue that is still under investigation. In order to overcome this we are doing the following:
1. Disable incoming interrupts in master mode only when slave mode is not enabled.
2. Clear end of busy (EOB) after every interrupt.
3. Clear other status bits (just in case since we found them cleared)
4. Return correct status during the interrupt that will finish the transaction. On next xmit transaction if the bus is still busy the master will issue a recovery process before issuing the new transaction.

Quoted 25 lines
Quoted 19 lines

If the transaction failed, driver has a recovery function. After that, user may retry to send the message.

Indeed the commit message doesn't explain all this. We will fix and add to the next patchset.

Quoted 13 lines
Quoted 13 lines

drivers/i2c/busses/i2c-npcm7xx.c static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus) · line 1242

Quoted 3 lines
drivers/i2c/busses/i2c-npcm7xx.c +3 -0
+     /*
+      * if irq is not one of the above, make sure EOB is disabled and all
+      * status bits are cleared.

This does not explain why you hide the spurious interrupt.

Quoted 7 lines
drivers/i2c/busses/i2c-npcm7xx.c +7 -0
+      */
+     if (ret == IRQ_NONE) {
+             npcm_i2c_eob_int(bus, false);
+             npcm_i2c_clear_master_status(bus);
+     }
+
+     return IRQ_HANDLED;

--
With Best Regards,
Andy Shevchenko

Signature · 2 lines
Regards,
Avi
#29 lore raw

Re: [PATCH v3 09/11] i2c: npcm: Handle spurious interrupts

Quoted 12 lines · Avi Fishman
Quoted 10 lines · Andy Shevchenko
Quoted 9 lines · Tali Perry
Quoted 9 lines · Andy Shevchenko
Quoted 8 lines · Tyrone Ting
Quoted 6 lines

From: Tali Perry <[email protected]>

In order to better handle spurious interrupts:
1. Disable incoming interrupts in master only mode.
2. Clear end of busy (EOB) after every interrupt.
3. Return correct status during interrupt.

Quoted 7 lines
Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

This is bad commit message, it doesn't explain "why" you are doing these.

...

Quoted 3 lines

BMC users connect a huge tree of i2c devices and muxes. This tree suffers from spikes, noise and double clocks. All these may cause spurious interrupts to the BMC.

(1)

Quoted 13 lines
Quoted 4 lines
Quoted 3 lines

If the driver gets an IRQ which was not expected and was not handled by the IRQ handler,
there is nothing left to do but to clear the interrupt and move on.

Quoted 8 lines

Yes, the problem is what "move on" means in your case.
If you get a spurious interrupts there are possibilities what's wrong:
1) HW bug(s)
2) FW bug(s)
3) Missed IRQ mask in the driver
4) Improper IRQ mask in the driver

The below approach seems incorrect to me.

Quoted 14 lines

Andy, What about this explanation:
On rare cases the i2c gets a spurious interrupt which means that we enter an interrupt but in
the interrupt handler we don't find any status bit that points to the reason we got this interrupt.
This may be a rare case of HW issue that is still under investigation. In order to overcome this we are doing the following:
1. Disable incoming interrupts in master mode only when slave mode is not enabled.
2. Clear end of busy (EOB) after every interrupt.
3. Clear other status bits (just in case since we found them cleared)
4. Return correct status during the interrupt that will finish the transaction. On next xmit transaction if the bus is still busy the master will issue a recovery process before issuing the new transaction.

This sounds better, thanks.

One thing to clarify, the (1) states that the HW "issue" is known and becomes a PCB level one, i.e. noisy environment that has not been properly shielded. So, if it is known, please put the reason in the commit message.

Also would be good to see numbers of "rare". Is it 0.1%?

Quoted 13 lines
Quoted 13 lines
Quoted 13 lines

If the transaction failed, driver has a recovery function. After that, user may retry to send the message.

Indeed the commit message doesn't explain all this. We will fix and add to the next patchset.

Quoted 7 lines
Quoted 7 lines

drivers/i2c/busses/i2c-npcm7xx.c static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus) · line 1242

Quoted 3 lines
drivers/i2c/busses/i2c-npcm7xx.c +3 -0
+     /*
+      * if irq is not one of the above, make sure EOB is disabled and all
+      * status bits are cleared.

This does not explain why you hide the spurious interrupt.

Quoted 1 line

+ */

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#30 lore raw

Re: [PATCH v3 09/11] i2c: npcm: Handle spurious interrupts

Quoted 16 lines · Andy Shevchenko
Quoted 14 lines · Avi Fishman
Quoted 12 lines · Andy Shevchenko
Quoted 10 lines · Tali Perry
Quoted 10 lines · Andy Shevchenko
Quoted 9 lines · Tyrone Ting
Quoted 6 lines

From: Tali Perry <[email protected]>

In order to better handle spurious interrupts:
1. Disable incoming interrupts in master only mode.
2. Clear end of busy (EOB) after every interrupt.
3. Return correct status during interrupt.

This is bad commit message, it doesn't explain "why" you are doing these.

Quoted 27 lines
Quoted 5 lines
Quoted 5 lines

...

Quoted 3 lines

BMC users connect a huge tree of i2c devices and muxes. This tree suffers from spikes, noise and double clocks. All these may cause spurious interrupts to the BMC.

(1)

Quoted 19 lines
Quoted 4 lines
Quoted 3 lines

If the driver gets an IRQ which was not expected and was not handled by the IRQ handler,
there is nothing left to do but to clear the interrupt and move on.

Quoted 8 lines

Yes, the problem is what "move on" means in your case.
If you get a spurious interrupts there are possibilities what's wrong:
1) HW bug(s)
2) FW bug(s)
3) Missed IRQ mask in the driver
4) Improper IRQ mask in the driver

The below approach seems incorrect to me.

Andy, What about this explanation:
On rare cases the i2c gets a spurious interrupt which means that we enter an interrupt but in
the interrupt handler we don't find any status bit that points to the reason we got this interrupt.
This may be a rare case of HW issue that is still under investigation

About 1 to 100,000 transactions

Quoted 9 lines
Quoted 8 lines

In order to overcome this we are doing the following:
1. Disable incoming interrupts in master mode only when slave mode is not enabled.
2. Clear end of busy (EOB) after every interrupt.
3. Clear other status bits (just in case since we found them cleared)
4. Return correct status during the interrupt that will finish the transaction. On next xmit transaction if the bus is still busy the master will issue a recovery process before issuing the new transaction.

Quoted 6 lines

This sounds better, thanks.

One thing to clarify, the (1) states that the HW "issue" is known and becomes a PCB level one, i.e. noisy environment that has not been properly shielded. So, if it is known, please put the reason in the commit message.

The HW issue is not known yet, we see it on few platforms and in other platforms we don't, so the first assumption was this.
So eventually we don't want to claim this without proving it.

Quoted 1 line

Also would be good to see numbers of "rare". Is it 0.1%?

I added above the known statistics.

Quoted 20 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

If the transaction failed, driver has a recovery function. After that, user may retry to send the message.

Indeed the commit message doesn't explain all this. We will fix and add to the next patchset.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 7 lines

drivers/i2c/busses/i2c-npcm7xx.c static irqreturn_t npcm_i2c_int_slave_handler(struct npcm_i2c *bus) · line 1242

Quoted 3 lines
drivers/i2c/busses/i2c-npcm7xx.c +3 -0
+     /*
+      * if irq is not one of the above, make sure EOB is disabled and all
+      * status bits are cleared.

This does not explain why you hide the spurious interrupt.

Quoted 1 line

+ */

--
With Best Regards,
Andy Shevchenko

Signature · 2 lines
Regards,
Avi
#31 lore raw

PATCH v3 10/11 i2c: npcm: Remove own slave addresses 2:10

In reply to Tyrone Ting

From: Tali Perry <[email protected]>

NPCM can support up to 10 own slave addresses. In practice, only one address is actually being used. In order to access addresses 2 and above, need to switch register banks. The switch needs spinlock.
To avoid using spinlock for this useless feature removed support of SA >= 2.

Also fix returned slave event enum.

Remove some comment since the bank selection is not required. The bank selection is not required since the supported slave addresses are reduced.

Fixes 56a1485b102e ("i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver")
---
 drivers/i2c/busses/i2c-npcm7xx.c | 46 ++++++++++++++++----------------
 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/i2c/busses/i2c-npcm7xx.c +23 -23
index 73cef76127c9..5c0bbc134f9d 100644
@@ -124,6 +124,8 @@ enum i2c_addr {
  * use this array to get the address or each register.
  */
 #define I2C_NUM_OWN_ADDR 10
+#define I2C_NUM_OWN_ADDR_SUPPORTED 2
+
 static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = {
 	NPCM_I2CADDR1, NPCM_I2CADDR2, NPCM_I2CADDR3, NPCM_I2CADDR4,
 	NPCM_I2CADDR5, NPCM_I2CADDR6, NPCM_I2CADDR7, NPCM_I2CADDR8,
@@ -392,14 +394,10 @@ static void npcm_i2c_disable(struct npcm_i2c *bus)
 #if IS_ENABLED(CONFIG_I2C_SLAVE)
 	int i;
 
-	/* select bank 0 for I2C addresses */
-	npcm_i2c_select_bank(bus, I2C_BANK_0);
-
 	/* Slave addresses removal */
-	for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR; i++)
+	for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR_SUPPORTED; i++)
 		iowrite8(0, bus->reg + npcm_i2caddr[i]);
 
-	npcm_i2c_select_bank(bus, I2C_BANK_1);
 #endif
 	/* Disable module */
 	i2cctl2 = ioread8(bus->reg + NPCM_I2CCTL2);
@@ -604,8 +602,7 @@ static int npcm_i2c_slave_enable(struct npcm_i2c *bus, enum i2c_addr addr_type,
 			i2cctl1 &= ~NPCM_I2CCTL1_GCMEN;
 		iowrite8(i2cctl1, bus->reg + NPCM_I2CCTL1);
 		return 0;
-	}
-	if (addr_type == I2C_ARP_ADDR) {
+	} else if (addr_type == I2C_ARP_ADDR) {
 		i2cctl3 = ioread8(bus->reg + NPCM_I2CCTL3);
 		if (enable)
 			i2cctl3 |= I2CCTL3_ARPMEN;
@@ -614,16 +611,18 @@ static int npcm_i2c_slave_enable(struct npcm_i2c *bus, enum i2c_addr addr_type,
 		iowrite8(i2cctl3, bus->reg + NPCM_I2CCTL3);
 		return 0;
 	}
+	if (addr_type > I2C_SLAVE_ADDR2 && addr_type <= I2C_SLAVE_ADDR10) {
+		dev_err(bus->dev,
+			"try to enable more then 2 SA not supported\n");
+	}
 	if (addr_type >= I2C_ARP_ADDR)
 		return -EFAULT;
 	/* select bank 0 for address 3 to 10 */
-	if (addr_type > I2C_SLAVE_ADDR2)
-		npcm_i2c_select_bank(bus, I2C_BANK_0);
+
 	/* Set and enable the address */
 	iowrite8(sa_reg, bus->reg + npcm_i2caddr[addr_type]);
 	npcm_i2c_slave_int_enable(bus, enable);
-	if (addr_type > I2C_SLAVE_ADDR2)
-		npcm_i2c_select_bank(bus, I2C_BANK_1);
+
 	return 0;
 }
 #endif
@@ -846,15 +845,13 @@ static u8 npcm_i2c_get_slave_addr(struct npcm_i2c *bus, enum i2c_addr addr_type)
 {
 	u8 slave_add;
 
-	/* select bank 0 for address 3 to 10 */
-	if (addr_type > I2C_SLAVE_ADDR2)
-		npcm_i2c_select_bank(bus, I2C_BANK_0);
+	if (addr_type > I2C_SLAVE_ADDR2 && addr_type <= I2C_SLAVE_ADDR10) {
+		dev_err(bus->dev,
+			"get slave: try to use more then 2 slave addresses not supported\n");
+	}
 
 	slave_add = ioread8(bus->reg + npcm_i2caddr[(int)addr_type]);
 
-	if (addr_type > I2C_SLAVE_ADDR2)
-		npcm_i2c_select_bank(bus, I2C_BANK_1);
-
 	return slave_add;
 }
 
@@ -864,12 +861,12 @@ static int npcm_i2c_remove_slave_addr(struct npcm_i2c *bus, u8 slave_add)
 
 	/* Set the enable bit */
 	slave_add |= 0x80;
-	npcm_i2c_select_bank(bus, I2C_BANK_0);
-	for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR; i++) {
+
+	for (i = I2C_SLAVE_ADDR1; i < I2C_NUM_OWN_ADDR_SUPPORTED; i++) {
 		if (ioread8(bus->reg + npcm_i2caddr[i]) == slave_add)
 			iowrite8(0, bus->reg + npcm_i2caddr[i]);
 	}
-	npcm_i2c_select_bank(bus, I2C_BANK_1);
+
 	return 0;
 }
 
@@ -924,11 +921,15 @@ static int npcm_i2c_slave_get_wr_buf(struct npcm_i2c *bus)
 	for (i = 0; i < I2C_HW_FIFO_SIZE; i++) {
 		if (bus->slv_wr_size >= I2C_HW_FIFO_SIZE)
 			break;
-		i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value);
+		if (bus->state == I2C_SLAVE_MATCH) {
+			i2c_slave_event(bus->slave, I2C_SLAVE_READ_REQUESTED, &value);
+			bus->state = I2C_OPER_STARTED;
+		} else {
+			i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value);
+		}
 		ind = (bus->slv_wr_ind + bus->slv_wr_size) % I2C_HW_FIFO_SIZE;
 		bus->slv_wr_buf[ind] = value;
 		bus->slv_wr_size++;
-		i2c_slave_event(bus->slave, I2C_SLAVE_READ_PROCESSED, &value);
 	}
 	return I2C_HW_FIFO_SIZE - ret;
 }
@@ -976,7 +977,6 @@ static void npcm_i2c_slave_xmit(struct npcm_i2c *bus, u16 nwrite,
 	if (nwrite == 0)
 		return;
 
-	bus->state = I2C_OPER_STARTED;
 	bus->operation = I2C_WRITE_OPER;
 
 	/* get the next buffer */
Signature · 1 line
2.17.1
#32 lore raw

PATCH v3 11/11 i2c: npcm: Support NPCM845

In reply to Tyrone Ting

From: Tyrone Ting <[email protected]>

Add NPCM8XX I2C support.
The NPCM8XX uses a similar i2c module as NPCM7XX. The internal HW FIFO is larger in NPCM8XX.

---
 drivers/i2c/busses/Kconfig       |   8 +-
 drivers/i2c/busses/Makefile      |   2 +-
 drivers/i2c/busses/i2c-npcm7xx.c | 126 +++++++++++++++++++------------
 3 files changed, 83 insertions(+), 53 deletions(-)
drivers/i2c/busses/Kconfig +4 -4
index 8a6c6ee28556..ea0b63274442 100644
@@ -817,13 +817,13 @@ config I2C_NOMADIK
 	  I2C interface from ST-Ericsson's Nomadik and Ux500 architectures,
 	  as well as the STA2X11 PCIe I/O HUB.
 
-config I2C_NPCM7XX
+config I2C_NPCM
 	tristate "Nuvoton I2C Controller"
-	depends on ARCH_NPCM7XX || COMPILE_TEST
+	depends on ARCH_NPCM || COMPILE_TEST
 	help
 	  If you say yes to this option, support will be included for the
-	  Nuvoton I2C controller, which is available on the NPCM7xx BMC
-	  controller.
+	  Nuvoton I2C controller, which is available on the NPCM BMC
+	  controllers.
 	  Driver can also support slave mode (select I2C_SLAVE).
 
 config I2C_OCORES
drivers/i2c/busses/Makefile +1 -1
index 1d00dce77098..01fdf74a5565 100644
@@ -80,7 +80,7 @@ obj-$(CONFIG_I2C_MT7621)	+= i2c-mt7621.o
 obj-$(CONFIG_I2C_MV64XXX)	+= i2c-mv64xxx.o
 obj-$(CONFIG_I2C_MXS)		+= i2c-mxs.o
 obj-$(CONFIG_I2C_NOMADIK)	+= i2c-nomadik.o
-obj-$(CONFIG_I2C_NPCM7XX)	+= i2c-npcm7xx.o
+obj-$(CONFIG_I2C_NPCM)		+= i2c-npcm7xx.o
 obj-$(CONFIG_I2C_OCORES)	+= i2c-ocores.o
 obj-$(CONFIG_I2C_OMAP)		+= i2c-omap.o
 obj-$(CONFIG_I2C_OWL)		+= i2c-owl.o
drivers/i2c/busses/i2c-npcm7xx.c +78 -48

322 lines not on this page · raw message

Signature · 1 line
2.17.1
#33 lore raw

Re: [PATCH v3 11/11] i2c: npcm: Support NPCM845

Quoted 8 lines · Tyrone Ting

From: Tyrone Ting <[email protected]>

Add NPCM8XX I2C support.
The NPCM8XX uses a similar i2c module as NPCM7XX. The internal HW FIFO is larger in NPCM8XX.

Wrong SoB chain.

...

drivers/i2c/busses/i2c-npcm7xx.c static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = { · line 281

Quoted 6 lines
drivers/i2c/busses/i2c-npcm7xx.c +6 -0
+static const struct npcm_i2c_data npxm7xx_i2c_data = {
+	.fifo_size = 16,
+	.segctl_init_val = 0x0333F000,
+	.txf_sts_tx_bytes = GENMASK(4, 0),
+	.rxf_sts_rx_bytes = GENMASK(4, 0),
+	.rxf_ctl_last_pec = BIT(5)

+ Comma.

drivers/i2c/busses/i2c-npcm7xx.c static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = { · line 289

Quoted 8 lines
drivers/i2c/busses/i2c-npcm7xx.c +8 -0
+};
+
+static const struct npcm_i2c_data npxm8xx_i2c_data = {
+	.fifo_size = 32,
+	.segctl_init_val = 0x9333F000,
+	.txf_sts_tx_bytes = GENMASK(5, 0),
+	.rxf_sts_rx_bytes = GENMASK(5, 0),
+	.rxf_ctl_last_pec = BIT(7)

Ditto.

Quoted 1 line

+};

...

drivers/i2c/busses/i2c-npcm7xx.c static void npcm_i2c_slave_wr_buf_sync(struct npcm_i2c *bus) · line 1023

Quoted 4 lines
drivers/i2c/busses/i2c-npcm7xx.c +2 -2
-	left_in_fifo = FIELD_GET(NPCM_I2CTXF_STS_TX_BYTES,
-				 ioread8(bus->reg + NPCM_I2CTXF_STS));
+	left_in_fifo = (bus->data->txf_sts_tx_bytes &
+			ioread8(bus->reg + NPCM_I2CTXF_STS));

Besides too many parentheses, this is an interesting change. So, in different versions of IP the field is on different bits? Perhaps it means that you need something like internal ops structure for all these, where you will have been using the statically defined masks?

...

drivers/i2c/busses/i2c-npcm7xx.c static int npcm_i2c_probe_bus(struct platform_device *pdev) · line 2318

Quoted 6 lines
drivers/i2c/busses/i2c-npcm7xx.c +6 -0
+	match = of_match_device(npcm_i2c_bus_of_table, dev);
+	if (!match) {
+		dev_err(dev, "OF data missing\n");
+		return -EINVAL;
+	}
+	bus->data = match->data;

This is NIH of_device_get_match_data().

...

drivers/i2c/busses/i2c-npcm7xx.c static int npcm_i2c_remove_bus(struct platform_device *pdev) · line 2363

Quoted 6 lines
drivers/i2c/busses/i2c-npcm7xx.c +0 -6
-static const struct of_device_id npcm_i2c_bus_of_table[] = {
-	{ .compatible = "nuvoton,npcm750-i2c", },
-	{}
-};
-MODULE_DEVICE_TABLE(of, npcm_i2c_bus_of_table);
-

Redundant change, leave this as is.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#34 lore raw

Re: [PATCH v3 11/11] i2c: npcm: Support NPCM845

Quoted 45 lines · Andy Shevchenko
Quoted 44 lines · Tyrone Ting
Quoted 8 lines

From: Tyrone Ting <[email protected]>

Add NPCM8XX I2C support.
The NPCM8XX uses a similar i2c module as NPCM7XX. The internal HW FIFO is larger in NPCM8XX.

Wrong SoB chain.

...

drivers/i2c/busses/i2c-npcm7xx.c static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = { · line 281

Quoted 6 lines
drivers/i2c/busses/i2c-npcm7xx.c +6 -0
+static const struct npcm_i2c_data npxm7xx_i2c_data = {
+     .fifo_size = 16,
+     .segctl_init_val = 0x0333F000,
+     .txf_sts_tx_bytes = GENMASK(4, 0),
+     .rxf_sts_rx_bytes = GENMASK(4, 0),
+     .rxf_ctl_last_pec = BIT(5)

+ Comma.

drivers/i2c/busses/i2c-npcm7xx.c static const int npcm_i2caddr[I2C_NUM_OWN_ADDR] = { · line 289

Quoted 8 lines
drivers/i2c/busses/i2c-npcm7xx.c +8 -0
+};
+
+static const struct npcm_i2c_data npxm8xx_i2c_data = {
+     .fifo_size = 32,
+     .segctl_init_val = 0x9333F000,
+     .txf_sts_tx_bytes = GENMASK(5, 0),
+     .rxf_sts_rx_bytes = GENMASK(5, 0),
+     .rxf_ctl_last_pec = BIT(7)

Ditto.

Quoted 1 line

+};

...

Quoted 4 lines
drivers/i2c/busses/i2c-npcm7xx.c +2 -2
-     left_in_fifo = FIELD_GET(NPCM_I2CTXF_STS_TX_BYTES,
-                              ioread8(bus->reg + NPCM_I2CTXF_STS));
+     left_in_fifo = (bus->data->txf_sts_tx_bytes &
+                     ioread8(bus->reg + NPCM_I2CTXF_STS));
Quoted 5 lines
Quoted 5 lines

Besides too many parentheses, this is an interesting change. So, in different versions of IP the field is on different bits? Perhaps it means that you need something like internal ops structure for all these, where you will have been using the statically defined masks?

Those are two very similar modules. The first generation had a 16 bytes HW FIFO and the second generation has 32 bytes.
In V1 of this patchset the masks were defined under
CONFIG but we were asked to change the approach:

the entire discussion can be found here:

https://www.spinics.net/lists/linux-i2c/msg55566.html

Did we understand the request change right?

Quoted 22 lines
Quoted 22 lines

...

drivers/i2c/busses/i2c-npcm7xx.c static int npcm_i2c_probe_bus(struct platform_device *pdev) · line 2318

Quoted 6 lines
drivers/i2c/busses/i2c-npcm7xx.c +6 -0
+     match = of_match_device(npcm_i2c_bus_of_table, dev);
+     if (!match) {
+             dev_err(dev, "OF data missing\n");
+             return -EINVAL;
+     }
+     bus->data = match->data;

This is NIH of_device_get_match_data().

...

drivers/i2c/busses/i2c-npcm7xx.c static int npcm_i2c_remove_bus(struct platform_device *pdev) · line 2363

Quoted 6 lines
drivers/i2c/busses/i2c-npcm7xx.c +0 -6
-static const struct of_device_id npcm_i2c_bus_of_table[] = {
-     { .compatible = "nuvoton,npcm750-i2c", },
-     {}
-};
-MODULE_DEVICE_TABLE(of, npcm_i2c_bus_of_table);
-

Redundant change, leave this as is.

Quoted 5 lines
Quoted 5 lines

--
With Best Regards,
Andy Shevchenko

Thanks for the detailed review, Andy!

BR,
Tali Perry
Nuvoton Technologies

#35 lore raw

Re: [PATCH v3 11/11] i2c: npcm: Support NPCM845

Quoted 2 lines · Tali Perry
Quoted 2 lines · Andy Shevchenko
Quoted 1 line · Tyrone Ting

...

Quoted 16 lines
Quoted 10 lines
Quoted 10 lines

drivers/i2c/busses/i2c-npcm7xx.c static void npcm_i2c_slave_wr_buf_sync(struct npcm_i2c *bus) · line 1023

Quoted 4 lines
drivers/i2c/busses/i2c-npcm7xx.c +2 -2
-     left_in_fifo = FIELD_GET(NPCM_I2CTXF_STS_TX_BYTES,
-                              ioread8(bus->reg + NPCM_I2CTXF_STS));
+     left_in_fifo = (bus->data->txf_sts_tx_bytes &
+                     ioread8(bus->reg + NPCM_I2CTXF_STS));

Besides too many parentheses, this is an interesting change. So, in different versions of IP the field is on different bits? Perhaps it means that you need something like internal ops structure for all these, where you will have been using the statically defined masks?

Those are two very similar modules. The first generation had a 16 bytes HW FIFO and the second generation has 32 bytes.
In V1 of this patchset the masks were defined under
CONFIG but we were asked to change the approach:

Quoted 5 lines

the entire discussion can be found here:

https://www.spinics.net/lists/linux-i2c/msg55566.html

Did we understand the request change right?

Not really. If you have not simply "one (MSB) bit more" for FIFO size, then I proposed to create a specific operations structure and use callbacks (see drivers/dma/dw/ case for iDMA 32-bit vs. DesignWare).

But hold on and read set of questions below.

Previously it was a fixed field with the NPCM_I2CTXF_STS_TX_BYTES mask applied, right? From above I have got that FIFO is growing twice. Is it correct? Does the LSB stay at the same offset? What is the meaning of the MSB in 32 byte case? If it's reserved then why not to always use 32 byte approach?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#36 lore raw

Re: [PATCH v3 11/11] i2c: npcm: Support NPCM845

Hi Andy,

Thanks for your review,

Quoted 38 lines · Andy Shevchenko
Quoted 1 line · Tali Perry
Quoted 1 line

On Thu, Mar 3, 2022 at 12:45 PM Andy Shevchenko <

Quoted 1 line · [email protected]> wrote:
Quoted 1 line
Quoted 1 line · Tyrone Ting

...

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

Review

Quoted 2 lines
(quoted diff) +0 -2
-     left_in_fifo = FIELD_GET(NPCM_I2CTXF_STS_TX_BYTES,
-                              ioread8(bus->reg +

NPCM_I2CTXF_STS));

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

drivers/i2c/busses/i2c-npcm7xx.c static void npcm_i2c_slave_wr_buf_sync(struct npcm_i2c *bus) · line 1023

Quoted 2 lines
drivers/i2c/busses/i2c-npcm7xx.c +2 -0
+     left_in_fifo = (bus->data->txf_sts_tx_bytes &
+                     ioread8(bus->reg + NPCM_I2CTXF_STS));

Besides too many parentheses, this is an interesting change. So, in

different

Quoted 1 line
Quoted 1 line
Quoted 1 line

versions of IP the field is on different bits? Perhaps it means that

you need

Quoted 1 line
Quoted 1 line
Quoted 1 line

something like internal ops structure for all these, where you will

have been

Quoted 4 lines
Quoted 2 lines
Quoted 2 lines

using the statically defined masks?

Those are two very similar modules. The first generation had a 16 bytes

HW FIFO

Quoted 9 lines

and the second generation has 32 bytes.
In V1 of this patchset the masks were defined under CONFIG but we were asked to change the approach:

the entire discussion can be found here:

https://www.spinics.net/lists/linux-i2c/msg55566.html

Did we understand the request change right?

Not really. If you have not simply "one (MSB) bit more" for FIFO size, then I proposed to create a specific operations structure and use callbacks (see drivers/dma/dw/ case for iDMA 32-bit vs. DesignWare).

Quoted 6 lines

But hold on and read set of questions below.

Previously it was a fixed field with the NPCM_I2CTXF_STS_TX_BYTES mask applied,
right? From above I have got that FIFO is growing twice. Is it correct?

What do you mean by growing twice? TX and RX?

Quoted 4 lines

Does the LSB stay at the same offset? What is the meaning of the MSB in 32 byte
case? If it's reserved then why not to always use 32 byte approach?

Yes, the LSB stays in the same place, and bit 5 is reserved in the NPCM7XX SoC.
Unfortunately, the I2C test failed when we tried to use the 32 bytes approach at NPCM7XX Soc, this is why we added NPCM_I2CTXF_STS_TX_BYTES and NPCM_I2C_STSRXF_RX_BYTES to the data structure.

The device tree data structure pass data for each specific device, so I don't understand why not use device tree data for supporting the I2C specific device? this is not the case here?

Quoted 6 lines

--
With Best Regards,
Andy Shevchenko

Best Regards,

Tomer Maimon

#37 lore raw

Re: [PATCH v3 11/11] i2c: npcm: Support NPCM845

Quoted 5 lines · Tomer Maimon
Quoted 3 lines · Andy Shevchenko
Quoted 1 line · Tali Perry
Quoted 1 line

On Thu, Mar 3, 2022 at 12:45 PM Andy Shevchenko <

[email protected]> wrote:

...

Quoted 7 lines
Quoted 5 lines

But hold on and read set of questions below.

Previously it was a fixed field with the NPCM_I2CTXF_STS_TX_BYTES mask applied,
right? From above I have got that FIFO is growing twice. Is it correct?

What do you mean by growing twice? TX and RX?

I meant from 16 bytes to 32 bytes.

Quoted 10 lines
Quoted 3 lines

Does the LSB stay at the same offset? What is the meaning of the MSB in 32 byte
case? If it's reserved then why not to always use 32 byte approach?

Yes, the LSB stays in the same place, and bit 5 is reserved in the NPCM7XX SoC.
Unfortunately, the I2C test failed when we tried to use the 32 bytes approach at NPCM7XX Soc, this is why we added NPCM_I2CTXF_STS_TX_BYTES and NPCM_I2C_STSRXF_RX_BYTES to the data structure.

Quoted 3 lines

The device tree data structure pass data for each specific device, so I don't understand why not use device tree data for supporting the I2C specific device? this is not the case here?

Basically we use compatible strings for that, but in any case if something can be autodetected from hardware, it's better to use autodetection.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#38 lore raw

Re: [PATCH v3 11/11] i2c: npcm: Support NPCM845

Hi Andy,

Quoted 11 lines · Andy Shevchenko
Quoted 5 lines · Tomer Maimon
Quoted 3 lines · Andy Shevchenko
Quoted 1 line · Tali Perry
Quoted 1 line

On Thu, Mar 3, 2022 at 12:45 PM Andy Shevchenko <

[email protected]> wrote:

...

Quoted 2 lines
Quoted 2 lines

But hold on and read set of questions below.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Previously it was a fixed field with the NPCM_I2CTXF_STS_TX_BYTES mask applied,
right? From above I have got that FIFO is growing twice. Is it correct?

What do you mean by growing twice? TX and RX?

I meant from 16 bytes to 32 bytes.

Yes, the FIFO grow to 32 byte

Quoted 12 lines
Quoted 2 lines
Quoted 2 lines

Does the LSB stay at the same offset? What is the meaning of the MSB

in 32

Quoted 4 lines
Quoted 2 lines

byte
case? If it's reserved then why not to always use 32 byte approach?

Yes, the LSB stays in the same place, and bit 5 is reserved in the

NPCM7XX

Quoted 3 lines

SoC.
Unfortunately, the I2C test failed when we tried to use the 32 bytes approach at NPCM7XX Soc, this is why we added NPCM_I2CTXF_STS_TX_BYTES

and

Quoted 8 lines
Quoted 5 lines

NPCM_I2C_STSRXF_RX_BYTES to the data structure.

The device tree data structure pass data for each specific device, so I don't understand why not use device tree data for supporting the I2C specific device? this is not the case here?

Basically we use compatible strings for that, but in any case if something can be autodetected from hardware, it's better to use autodetection.

Thanks for the clarification, in our case we don't autodetect from the hardware...

Quoted 10 lines

--
With Best Regards,
Andy Shevchenko

We will send a new version soon, highly appreciate your help!

Best regards,

Tomer

#39 lore raw
In reply to Tyrone Ting
Quoted 4 lines · Tyrone Ting

From: Tyrone Ting <[email protected]>

This patchset includes the following fixes:

Quoted 8 lines

- Add dt-bindings description for NPCM845.
- Bug fix for timeout calculation.
- Better handling of spurious interrupts.
- Fix for event type in slave mode.
- Removal of own slave addresses [2:10].
- Support for next gen BMC (NPCM845).

The NPCM I2C driver is tested on NPCM750 and NPCM845 evaluation boards.

Overall my impression that the code was never tested for this driver and somehow appears in the upstream and hence this series.

Anyway, I'm going to review the changes here.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
maintainer
#40 lore raw
Quoted 13 lines · Andy Shevchenko
Quoted 11 lines · Tyrone Ting

From: Tyrone Ting <[email protected]>

This patchset includes the following fixes:

- Add dt-bindings description for NPCM845.
- Bug fix for timeout calculation.
- Better handling of spurious interrupts.
- Fix for event type in slave mode.
- Removal of own slave addresses [2:10].
- Support for next gen BMC (NPCM845).

Quoted 8 lines
Quoted 1 line

The NPCM I2C driver is tested on NPCM750 and NPCM845 evaluation boards.

Overall my impression that the code was never tested for this driver and somehow appears in the upstream and hence this series.

Anyway, I'm going to review the changes here.

--

Actually it was and is being used by multiple users in lots of BMCs. We haven't submitted patches for this driver for a while and accumulated them all on Nuvoton Github repo, but now we wanted to clear the table.

All your comments will be addressed and fixed for the next patchset. As always, we really appreciate your review and taking the time to go through all these changes.

Quoted 4 lines

With Best Regards,
Andy Shevchenko

Thanks!

Tali Perry