* [PATCH v4 0/3] Add ASPEED AST2600 I2C new controller driver
@ 2023-02-01 10:33 Ryan Chen
2023-02-01 10:33 ` [PATCH v4 1/3] dt-bindings: i2c-ast2600: Add support for AST2600 I2C global controller Ryan Chen
` (2 more replies)
0 siblings, 3 replies; 18+ messages in thread
From: Ryan Chen @ 2023-02-01 10:33 UTC (permalink / raw)
To: Ryan Chen, Rob Herring, Krzysztof Kozlowski, Joel Stanley,
Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel,
linux-aspeed, linux-kernel
This series add AST2600 i2c new register set driver. The i2c new
register set have new clock divider option for more flexiable generation.
And also have separate i2c master and slave register set for control.
v4:
-fix i2c-ast2600.c driver buffer mode use single buffer conflit in
master slave mode both enable.
-fix kmemleak issue when use dma mode.
-fix typo aspeed,i2c-ast2600.yaml compatible is "aspeed,ast2600-i2c"
-fix typo aspeed,i2c-ast2600.ymal to aspeed,i2c-ast2600.yaml
v3:
-fix i2c global clock divide default value.
-remove i2c slave no used dev_dbg info.
v2:
-add i2c global ymal file commit.
-rename file name from new to ast2600.
aspeed-i2c-new-global.c -> i2c-ast2600-global.c
aspeed-i2c-new-global.h -> i2c-ast2600-global.h
i2c-new-aspeed.c -> i2c-ast2600.c
-rename all driver function name to ast2600.
Ryan Chen (3):
dt-bindings: i2c-ast2600: Add support for AST2600 I2C global
controller
dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver
i2c: aspeed: support ast2600 i2c new register mode driver
.../i2c/aspeed,i2c-ast2600-global.yaml | 44 +
.../bindings/i2c/aspeed,i2c-ast2600.yaml | 78 +
MAINTAINERS | 10 +
drivers/i2c/busses/Kconfig | 11 +
drivers/i2c/busses/Makefile | 1 +
drivers/i2c/busses/i2c-ast2600-global.c | 94 +
drivers/i2c/busses/i2c-ast2600-global.h | 19 +
drivers/i2c/busses/i2c-ast2600.c | 1811 +++++++++++++++++
8 files changed, 2068 insertions(+)
create mode 100644 Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600-global.yaml
create mode 100644 Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml
create mode 100644 drivers/i2c/busses/i2c-ast2600-global.c
create mode 100644 drivers/i2c/busses/i2c-ast2600-global.h
create mode 100644 drivers/i2c/busses/i2c-ast2600.c
--
2.34.1
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v4 1/3] dt-bindings: i2c-ast2600: Add support for AST2600 I2C global controller 2023-02-01 10:33 [PATCH v4 0/3] Add ASPEED AST2600 I2C new controller driver Ryan Chen @ 2023-02-01 10:33 ` Ryan Chen 2023-02-02 4:25 ` Jeremy Kerr 2023-02-01 10:33 ` [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver Ryan Chen 2023-02-01 10:33 ` [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver Ryan Chen 2 siblings, 1 reply; 18+ messages in thread From: Ryan Chen @ 2023-02-01 10:33 UTC (permalink / raw) To: Ryan Chen, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel AST2600 I2C global register controller, add bindings document to support driver of i2c global register set. Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> --- .../i2c/aspeed,i2c-ast2600-global.yaml | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600-global.yaml diff --git a/Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600-global.yaml b/Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600-global.yaml new file mode 100644 index 000000000000..d92a0878d03b --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600-global.yaml @@ -0,0 +1,44 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/i2c/aspeed,i2c-ast2600-global.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: AST2600 I2C Global Register on the AST26XX SoCs Device Tree Bindings + +maintainers: + - Ryan Chen <ryan_chen@aspeedtech.com> + +allOf: + - $ref: /schemas/i2c/i2c-controller.yaml# + +properties: + compatible: + enum: + - aspeed,ast2600-i2c-global + + reg: + minItems: 1 + items: + - description: address offset and range of bus + - description: address offset and range of bus buffer + + resets: + maxItems: 1 + +required: + - reg + - compatible + - resets + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/clock/ast2600-clock.h> + + i2c_gr: i2c-global-regs@0 { + compatible = "aspeed,ast2600-i2c-global", "syscon"; + reg = <0x0 0x20>; + resets = <&syscon ASPEED_RESET_I2C>; + }; -- 2.34.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v4 1/3] dt-bindings: i2c-ast2600: Add support for AST2600 I2C global controller 2023-02-01 10:33 ` [PATCH v4 1/3] dt-bindings: i2c-ast2600: Add support for AST2600 I2C global controller Ryan Chen @ 2023-02-02 4:25 ` Jeremy Kerr 2023-02-02 5:15 ` Ryan Chen 0 siblings, 1 reply; 18+ messages in thread From: Jeremy Kerr @ 2023-02-02 4:25 UTC (permalink / raw) To: Ryan Chen, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hi Ryan, > AST2600 I2C global register controller, add bindings document > to support driver of i2c global register set. [...] > +allOf: > + - $ref: /schemas/i2c/i2c-controller.yaml# Are you sure about this? This particular binding doesn't describe the i2c controller. > + > +properties: > + compatible: > + enum: > + - aspeed,ast2600-i2c-global > + > + reg: > + minItems: 1 > + items: > + - description: address offset and range of bus > + - description: address offset and range of bus buffer Seems to be a duplicate here. Cheers, Jeremy ^ permalink raw reply [flat|nested] 18+ messages in thread
* RE: [PATCH v4 1/3] dt-bindings: i2c-ast2600: Add support for AST2600 I2C global controller 2023-02-02 4:25 ` Jeremy Kerr @ 2023-02-02 5:15 ` Ryan Chen 0 siblings, 0 replies; 18+ messages in thread From: Ryan Chen @ 2023-02-02 5:15 UTC (permalink / raw) To: Jeremy Kerr, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Jeremy > > > AST2600 I2C global register controller, add bindings document to > > support driver of i2c global register set. > > [...] > > > +allOf: > > + - $ref: /schemas/i2c/i2c-controller.yaml# > > Are you sure about this? This particular binding doesn't describe the i2c > controller. Due to this is i2c driver global register setting. I think I will remove this ref: But instead add description for understanding. Is it ok? > > > + > > +properties: > > + compatible: > > + enum: > > + - aspeed,ast2600-i2c-global > > + > > + reg: > > + minItems: 1 > > + items: > > + - description: address offset and range of bus > > + - description: address offset and range of bus buffer > > Seems to be a duplicate here. > The same, will remove items, keep minItems:1. Thanks Ryan > > > Jeremy ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver 2023-02-01 10:33 [PATCH v4 0/3] Add ASPEED AST2600 I2C new controller driver Ryan Chen 2023-02-01 10:33 ` [PATCH v4 1/3] dt-bindings: i2c-ast2600: Add support for AST2600 I2C global controller Ryan Chen @ 2023-02-01 10:33 ` Ryan Chen [not found] ` <b0f55494-3a17-4d87-7b8f-5b078503cb53@linaro.org> 2023-02-01 10:33 ` [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver Ryan Chen 2 siblings, 1 reply; 18+ messages in thread From: Ryan Chen @ 2023-02-01 10:33 UTC (permalink / raw) To: Ryan Chen, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel AST2600 support new register set for I2C controller, add bindings document to support driver of i2c new register mode controller. Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> --- .../bindings/i2c/aspeed,i2c-ast2600.yaml | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml diff --git a/Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml b/Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml new file mode 100644 index 000000000000..b7d7bc303e77 --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml @@ -0,0 +1,78 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/i2c/aspeed,i2c-ast2600.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: AST2600 I2C Controller on the AST26XX SoCs Device Tree Bindings + +maintainers: + - Ryan Chen <ryan_chen@aspeedtech.com> + +allOf: + - $ref: /schemas/i2c/i2c-controller.yaml# + +properties: + compatible: + enum: + - aspeed,ast2600-i2c + + reg: + minItems: 1 + items: + - description: address offset and range of bus + - description: address offset and range of bus buffer + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + description: + root clock of bus, should reference the APB + clock in the second cell + + resets: + maxItems: 1 + + bus-frequency: + minimum: 500 + maximum: 2000000 + default: 100000 + description: frequency of the bus clock in Hz defaults to 100 kHz when not + specified + + multi-master: + type: boolean + description: + states that there is another master active on this bus + +required: + - reg + - compatible + - clocks + - resets + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/ast2600-clock.h> + + i2c_gr: i2c-global-regs@0 { + compatible = "aspeed,ast2600-i2c-global", "syscon"; + reg = <0x0 0x20>; + resets = <&syscon ASPEED_RESET_I2C>; + }; + + i2c0: i2c-bus@80 { + #address-cells = <1>; + #size-cells = <0>; + #interrupt-cells = <1>; + compatible = "aspeed,ast2600-i2c"; + reg = <0x80 0x80>, <0xC00 0x20>; + clocks = <&syscon ASPEED_CLK_APB2>; + resets = <&syscon ASPEED_RESET_I2C>; + bus-frequency = <100000>; + }; -- 2.34.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
[parent not found: <b0f55494-3a17-4d87-7b8f-5b078503cb53@linaro.org>]
* RE: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver [not found] ` <b0f55494-3a17-4d87-7b8f-5b078503cb53@linaro.org> @ 2023-02-15 5:43 ` Ryan Chen 2023-02-16 4:17 ` Dhananjay Phadke [not found] ` <b58fad13-12d5-346b-9452-d345c7bf5327@linaro.org> 0 siblings, 2 replies; 18+ messages in thread From: Ryan Chen @ 2023-02-15 5:43 UTC (permalink / raw) To: Krzysztof Kozlowski, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Krzysztof, > -----Original Message----- > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Sent: Thursday, February 2, 2023 4:58 PM > To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > <robh+dt@kernel.org>; Krzysztof Kozlowski > <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; Andrew > Jeffery <andrew@aj.id.au>; Philipp Zabel <p.zabel@pengutronix.de>; > openbmc@lists.ozlabs.org; linux-arm-kernel@lists.infradead.org; > linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 > i2C driver > > On 01/02/2023 11:33, Ryan Chen wrote: > > AST2600 support new register set for I2C controller, add bindings > > document to support driver of i2c new register mode controller. > > > > Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> > > --- > > .../bindings/i2c/aspeed,i2c-ast2600.yaml | 78 > +++++++++++++++++++ > > 1 file changed, 78 insertions(+) > > create mode 100644 > > Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml > > > > diff --git > > a/Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml > > b/Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml > > new file mode 100644 > > index 000000000000..b7d7bc303e77 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml > > @@ -0,0 +1,78 @@ > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 > > +--- > > +$id: http://devicetree.org/schemas/i2c/aspeed,i2c-ast2600.yaml# > > +$schema: http://devicetree.org/meta-schemas/core.yaml# > > + > > +title: AST2600 I2C Controller on the AST26XX SoCs Device Tree > > +Bindings > > + > > +maintainers: > > + - Ryan Chen <ryan_chen@aspeedtech.com> > > + > > +allOf: > > + - $ref: /schemas/i2c/i2c-controller.yaml# > > + > > +properties: > > + compatible: > > + enum: > > + - aspeed,ast2600-i2c > > NAK. It's already there. Please do not waste our time in submitting duplicated > drivers. It is not duplicated, as my description in cover " This series add AST2600 i2c new register set driver" So, this will be different driver compatible. The original compatible is - aspeed,ast2400-i2c-bus - aspeed,ast2500-i2c-bus - aspeed,ast2600-i2c-bus So the new register set compatible is "- aspeed,ast2600-i2c", remove "bus". Best regards, Ryan Chen ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver 2023-02-15 5:43 ` Ryan Chen @ 2023-02-16 4:17 ` Dhananjay Phadke 2023-02-16 9:17 ` Ryan Chen [not found] ` <b58fad13-12d5-346b-9452-d345c7bf5327@linaro.org> 1 sibling, 1 reply; 18+ messages in thread From: Dhananjay Phadke @ 2023-02-16 4:17 UTC (permalink / raw) To: Ryan Chen, Krzysztof Kozlowski, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hi Ryan, On 2/14/2023 9:43 PM, Ryan Chen wrote: > It is not duplicated, as my description in cover " This series add AST2600 i2c new register set driver" > So, this will be different driver compatible. > The original compatible is > - aspeed,ast2400-i2c-bus > - aspeed,ast2500-i2c-bus > - aspeed,ast2600-i2c-bus > So the new register set compatible is "- aspeed,ast2600-i2c", remove "bus". Is it possible to keep existing driver drivers/i2c/busses/i2c-aspeed.c for ast2400/ast2500, while move ast2600 support to new driver altogether, say i2c-ast2600.c along with new register mode? By default new driver can support legacy mode with same compatible "aspeed,ast2600- i2c-bus", additionally driven by dt props, switch to new mode. Regards, Dhananjay ^ permalink raw reply [flat|nested] 18+ messages in thread
* RE: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver 2023-02-16 4:17 ` Dhananjay Phadke @ 2023-02-16 9:17 ` Ryan Chen 0 siblings, 0 replies; 18+ messages in thread From: Ryan Chen @ 2023-02-16 9:17 UTC (permalink / raw) To: Dhananjay Phadke, Krzysztof Kozlowski, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Dhananjay, > -----Original Message----- > From: Dhananjay Phadke <dphadke@linux.microsoft.com> > Sent: Thursday, February 16, 2023 12:17 PM > To: Ryan Chen <ryan_chen@aspeedtech.com>; Krzysztof Kozlowski > <krzysztof.kozlowski@linaro.org>; Rob Herring <robh+dt@kernel.org>; Krzysztof > Kozlowski <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; > Andrew Jeffery <andrew@aj.id.au>; Philipp Zabel <p.zabel@pengutronix.de>; > openbmc@lists.ozlabs.org; linux-arm-kernel@lists.infradead.org; > linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 > i2C driver > > Hi Ryan, > > On 2/14/2023 9:43 PM, Ryan Chen wrote: > > It is not duplicated, as my description in cover " This series add AST2600 i2c > new register set driver" > > So, this will be different driver compatible. > > The original compatible is > > - aspeed,ast2400-i2c-bus > > - aspeed,ast2500-i2c-bus > > - aspeed,ast2600-i2c-bus > > So the new register set compatible is "- aspeed,ast2600-i2c", remove "bus". > > Is it possible to keep existing driver drivers/i2c/busses/i2c-aspeed.c for > ast2400/ast2500, while move ast2600 support to new driver altogether, say > i2c-ast2600.c along with new register mode? By default new driver can > support legacy mode with same compatible "aspeed,ast2600- i2c-bus", > additionally driven by dt props, switch to new mode. No, as the patch cover latter description, it is two different register offsets. Pure new register control, and also different control sequence. Regards, Ryan ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <b58fad13-12d5-346b-9452-d345c7bf5327@linaro.org>]
* RE: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver [not found] ` <b58fad13-12d5-346b-9452-d345c7bf5327@linaro.org> @ 2023-02-16 9:20 ` Ryan Chen [not found] ` <c5aa358d-6fb8-9d4d-eef7-d3a8268229e8@linaro.org> 0 siblings, 1 reply; 18+ messages in thread From: Ryan Chen @ 2023-02-16 9:20 UTC (permalink / raw) To: Krzysztof Kozlowski, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Krzysztof > -----Original Message----- > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Sent: Thursday, February 16, 2023 4:18 AM > To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > <robh+dt@kernel.org>; Krzysztof Kozlowski > <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; Andrew > Jeffery <andrew@aj.id.au>; Philipp Zabel <p.zabel@pengutronix.de>; > openbmc@lists.ozlabs.org; linux-arm-kernel@lists.infradead.org; > linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 > i2C driver > > On 15/02/2023 06:43, Ryan Chen wrote: > >>> + - $ref: /schemas/i2c/i2c-controller.yaml# > >>> + > >>> +properties: > >>> + compatible: > >>> + enum: > >>> + - aspeed,ast2600-i2c > >> > >> NAK. It's already there. Please do not waste our time in submitting > >> duplicated drivers. > > > > It is not duplicated, as my description in cover " This series add AST2600 i2c > new register set driver" > > So, this will be different driver compatible. > > The original compatible is > > - aspeed,ast2400-i2c-bus > > - aspeed,ast2500-i2c-bus > > - aspeed,ast2600-i2c-bus > > So the new register set compatible is "- aspeed,ast2600-i2c", remove "bus". > > Bindings are documenting hardware, so I claim - we already have this > hardware described and this is duplicated. Otherwise - what are these two I2C > controllers and what are the differences? Why they do not have really different > name? Bus looks more like a mistake than a differentiating name. For misunderstanding, or mistaken. I purpose to be aspeed,ast2600-i2cv2, will it more clear way ? Best regards, Ryan Chen ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <c5aa358d-6fb8-9d4d-eef7-d3a8268229e8@linaro.org>]
* RE: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver [not found] ` <c5aa358d-6fb8-9d4d-eef7-d3a8268229e8@linaro.org> @ 2023-02-16 9:26 ` Ryan Chen [not found] ` <bb73393c-d642-0128-9e63-1a751f090a85@linaro.org> 0 siblings, 1 reply; 18+ messages in thread From: Ryan Chen @ 2023-02-16 9:26 UTC (permalink / raw) To: Krzysztof Kozlowski, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Krzysztof > -----Original Message----- > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Sent: Thursday, February 16, 2023 5:22 PM > To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > <robh+dt@kernel.org>; Krzysztof Kozlowski > <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; Andrew > Jeffery <andrew@aj.id.au>; Philipp Zabel <p.zabel@pengutronix.de>; > openbmc@lists.ozlabs.org; linux-arm-kernel@lists.infradead.org; > linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 > i2C driver > > On 16/02/2023 10:20, Ryan Chen wrote: > > Hello Krzysztof > > > >> -----Original Message----- > >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >> Sent: Thursday, February 16, 2023 4:18 AM > >> To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > >> <robh+dt@kernel.org>; Krzysztof Kozlowski > >> <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; > >> Andrew Jeffery <andrew@aj.id.au>; Philipp Zabel > >> <p.zabel@pengutronix.de>; openbmc@lists.ozlabs.org; > >> linux-arm-kernel@lists.infradead.org; > >> linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > >> Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for > >> AST2600 i2C driver > >> > >> On 15/02/2023 06:43, Ryan Chen wrote: > >>>>> + - $ref: /schemas/i2c/i2c-controller.yaml# > >>>>> + > >>>>> +properties: > >>>>> + compatible: > >>>>> + enum: > >>>>> + - aspeed,ast2600-i2c > >>>> > >>>> NAK. It's already there. Please do not waste our time in submitting > >>>> duplicated drivers. > >>> > >>> It is not duplicated, as my description in cover " This series add > >>> AST2600 i2c > >> new register set driver" > >>> So, this will be different driver compatible. > >>> The original compatible is > >>> - aspeed,ast2400-i2c-bus > >>> - aspeed,ast2500-i2c-bus > >>> - aspeed,ast2600-i2c-bus > >>> So the new register set compatible is "- aspeed,ast2600-i2c", remove > "bus". > >> > >> Bindings are documenting hardware, so I claim - we already have this > >> hardware described and this is duplicated. Otherwise - what are these > >> two I2C controllers and what are the differences? Why they do not > >> have really different name? Bus looks more like a mistake than a > differentiating name. > > For misunderstanding, or mistaken. > > I purpose to be aspeed,ast2600-i2cv2, will it more clear way ? > > I don't know. I still did not get answers. I asked here several questions. Those are different i2c controller, as I description in cover letter. The i2c new register mode, there have two separate slave/master register. And different register with old register. So now, avoid misunderstanding, or mistaken. I purpose to be aspeed,ast2600-i2cv2. Best regards, Ryan Chen ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <bb73393c-d642-0128-9e63-1a751f090a85@linaro.org>]
* RE: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver [not found] ` <bb73393c-d642-0128-9e63-1a751f090a85@linaro.org> @ 2023-02-18 1:19 ` Ryan Chen [not found] ` <861da92e-c1a0-f08c-1241-8e833c32674e@linaro.org> 0 siblings, 1 reply; 18+ messages in thread From: Ryan Chen @ 2023-02-18 1:19 UTC (permalink / raw) To: Krzysztof Kozlowski, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Krzysztof, > -----Original Message----- > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Sent: Friday, February 17, 2023 4:37 PM > To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > <robh+dt@kernel.org>; Krzysztof Kozlowski > <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; Andrew > Jeffery <andrew@aj.id.au>; Philipp Zabel <p.zabel@pengutronix.de>; > openbmc@lists.ozlabs.org; linux-arm-kernel@lists.infradead.org; > linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 > i2C driver > > On 16/02/2023 10:26, Ryan Chen wrote: > > Hello Krzysztof > > > >> -----Original Message----- > >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >> Sent: Thursday, February 16, 2023 5:22 PM > >> To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > >> <robh+dt@kernel.org>; Krzysztof Kozlowski > >> <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; > >> Andrew Jeffery <andrew@aj.id.au>; Philipp Zabel > >> <p.zabel@pengutronix.de>; openbmc@lists.ozlabs.org; > >> linux-arm-kernel@lists.infradead.org; > >> linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > >> Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for > >> AST2600 i2C driver > >> > >> On 16/02/2023 10:20, Ryan Chen wrote: > >>> Hello Krzysztof > >>> > >>>> -----Original Message----- > >>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >>>> Sent: Thursday, February 16, 2023 4:18 AM > >>>> To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > >>>> <robh+dt@kernel.org>; Krzysztof Kozlowski > >>>> <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; > >>>> Andrew Jeffery <andrew@aj.id.au>; Philipp Zabel > >>>> <p.zabel@pengutronix.de>; openbmc@lists.ozlabs.org; > >>>> linux-arm-kernel@lists.infradead.org; > >>>> linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > >>>> Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support > >>>> for > >>>> AST2600 i2C driver > >>>> > >>>> On 15/02/2023 06:43, Ryan Chen wrote: > >>>>>>> + - $ref: /schemas/i2c/i2c-controller.yaml# > >>>>>>> + > >>>>>>> +properties: > >>>>>>> + compatible: > >>>>>>> + enum: > >>>>>>> + - aspeed,ast2600-i2c > >>>>>> > >>>>>> NAK. It's already there. Please do not waste our time in > >>>>>> submitting duplicated drivers. > >>>>> > >>>>> It is not duplicated, as my description in cover " This series add > >>>>> AST2600 i2c > >>>> new register set driver" > >>>>> So, this will be different driver compatible. > >>>>> The original compatible is > >>>>> - aspeed,ast2400-i2c-bus > >>>>> - aspeed,ast2500-i2c-bus > >>>>> - aspeed,ast2600-i2c-bus > >>>>> So the new register set compatible is "- aspeed,ast2600-i2c", > >>>>> remove > >> "bus". > >>>> > >>>> Bindings are documenting hardware, so I claim - we already have > >>>> this hardware described and this is duplicated. Otherwise - what > >>>> are these two I2C controllers and what are the differences? Why > >>>> they do not have really different name? Bus looks more like a > >>>> mistake than a > >> differentiating name. > >>> For misunderstanding, or mistaken. > >>> I purpose to be aspeed,ast2600-i2cv2, will it more clear way ? > >> > >> I don't know. I still did not get answers. I asked here several questions. > > Those are different i2c controller, as I description in cover letter. > > The cover letter does not explain here anything. It barely mentions "new > register set" and "separate register set". This is really short, so without proper > explanations you will get all these questions. Are they compatible? Do they > overlap? Are they completely different? If so, why datasheet uses same name > for them? So many questions but cover letter is basically two sentences and > here: Sorry my misunderstanding. The legacy register layout is mix master/slave register control together. So will let confuse about register. The following is add more detail description about new register layout. And new feature set add for register. -Add new clock divider option for more flexible and accurate clock rate generation -Add tCKHighMin timing to guarantee SCL high pulse width. -Add support dual pool buffer mode, split 32 bytes pool buffer of each device into 2 x 16 bytes for Tx and Rx individually. -Increase DMA buffer size to 4096 bytes and support byte alignment. -Re-define the base address of BUS1 ~ BUS16 and Pool buffer. -Re-define registers for separating master and slave mode control. -Support 4 individual DMA buffers for master Tx and Rx, slave Tx and Rx. And following is new register set for package transfer sequence. New Master operation mode: S -> Aw -> P {S: Start, Sr: Repeat Start, Aw/r: Address for write/read, P: Stop}. New Master operation mode: S -> Aw -> TxD -> P New Master operation mode: S -> Ar -> RxD -> P New Slave operation mode: S -> Aw -> RxD -> Sr -> Ar -> TxD -> P. -Bus SDA lock auto-release capability for new master DMA command mode. -Bus auto timeout for new master/slave DMA mode. The following is two versus register layout. Old: {I2CD00}: Function Control Register {I2CD04}: Clock and AC Timing Control Register \#1 {I2CD08}: Clock and AC Timing Control Register \#2 {I2CD0C}: Interrupt Control Register {I2CD10}: Interrupt Status Register {I2CD14}: Command/Status Register {I2CD18}: Slave Device Address Register {I2CD1C}: Pool Buffer Control Register {I2CD20}: Transmit/Receive Byte Buffer Register {I2CD24}: DMA Mode Buffer Address Register {I2CD28}: DMA Transfer Length Register {I2CD2C}: Original DMA Mode Buffer Address Setting {I2CD30}: Original DMA Transfer Length Setting and Final Status New Register mode {I2CC00}: Master/Slave Function Control Register {I2CC04}: Master/Slave Clock and AC Timing Control Register {I2CC08}: Master/Slave Transmit/Receive Byte Buffer Register {I2CC0C}: Master/Slave Pool Buffer Control Register {I2CM10}: Master Interrupt Control Register {I2CM14}: Master Interrupt Status Register {I2CM18}: Master Command/Status Register {I2CM1C}: Master DMA Buffer Length Register {I2CS20}: Slave~ Interrupt Control Register {I2CS24}: Slave~ Interrupt Status Register {I2CS28}: Slave~ Command/Status Register {I2CS2C}: Slave~ DMA Buffer Length Register {I2CM30}: Master DMA Mode Tx Buffer Base Address {I2CM34}: Master DMA Mode Rx Buffer Base Address {I2CS38}: Slave~ DMA Mode Tx Buffer Base Address {I2CS3C}: Slave~ DMA Mode Rx Buffer Base Address {I2CS40}: Slave Device Address Register {I2CM48}: Master DMA Length Status Register {I2CS4C}: Slave DMA Length Status Register {I2CC50}: Current DMA Operating Address Status {I2CC54}: Current DMA Operating Length Status Sorry Krzysztof, I will add those in cover letter, it will more clear picture for review. Thanks a lot. > > The i2c new register mode, there have two separate slave/master register. > > And different register with old register. > > you repeat the same. > > > So now, avoid misunderstanding, or mistaken. > > I purpose to be aspeed,ast2600-i2cv2. > > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <861da92e-c1a0-f08c-1241-8e833c32674e@linaro.org>]
* RE: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver [not found] ` <861da92e-c1a0-f08c-1241-8e833c32674e@linaro.org> @ 2023-02-20 9:14 ` Ryan Chen 0 siblings, 0 replies; 18+ messages in thread From: Ryan Chen @ 2023-02-20 9:14 UTC (permalink / raw) To: Krzysztof Kozlowski, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Krzysztof, > -----Original Message----- > From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > Sent: Monday, February 20, 2023 3:59 PM > To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > <robh+dt@kernel.org>; Krzysztof Kozlowski > <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; Andrew > Jeffery <andrew@aj.id.au>; Philipp Zabel <p.zabel@pengutronix.de>; > openbmc@lists.ozlabs.org; linux-arm-kernel@lists.infradead.org; > linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 > i2C driver > > On 18/02/2023 02:19, Ryan Chen wrote: > > Hello Krzysztof, > > > > > >> -----Original Message----- > >> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >> Sent: Friday, February 17, 2023 4:37 PM > >> To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > >> <robh+dt@kernel.org>; Krzysztof Kozlowski > >> <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; > >> Andrew Jeffery <andrew@aj.id.au>; Philipp Zabel > >> <p.zabel@pengutronix.de>; openbmc@lists.ozlabs.org; > >> linux-arm-kernel@lists.infradead.org; > >> linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > >> Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for > >> AST2600 i2C driver > >> > >> On 16/02/2023 10:26, Ryan Chen wrote: > >>> Hello Krzysztof > >>> > >>>> -----Original Message----- > >>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >>>> Sent: Thursday, February 16, 2023 5:22 PM > >>>> To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > >>>> <robh+dt@kernel.org>; Krzysztof Kozlowski > >>>> <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley <joel@jms.id.au>; > >>>> Andrew Jeffery <andrew@aj.id.au>; Philipp Zabel > >>>> <p.zabel@pengutronix.de>; openbmc@lists.ozlabs.org; > >>>> linux-arm-kernel@lists.infradead.org; > >>>> linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > >>>> Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support > >>>> for > >>>> AST2600 i2C driver > >>>> > >>>> On 16/02/2023 10:20, Ryan Chen wrote: > >>>>> Hello Krzysztof > >>>>> > >>>>>> -----Original Message----- > >>>>>> From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > >>>>>> Sent: Thursday, February 16, 2023 4:18 AM > >>>>>> To: Ryan Chen <ryan_chen@aspeedtech.com>; Rob Herring > >>>>>> <robh+dt@kernel.org>; Krzysztof Kozlowski > >>>>>> <krzysztof.kozlowski+dt@linaro.org>; Joel Stanley > >>>>>> <joel@jms.id.au>; Andrew Jeffery <andrew@aj.id.au>; Philipp Zabel > >>>>>> <p.zabel@pengutronix.de>; openbmc@lists.ozlabs.org; > >>>>>> linux-arm-kernel@lists.infradead.org; > >>>>>> linux-aspeed@lists.ozlabs.org; linux-kernel@vger.kernel.org > >>>>>> Subject: Re: [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support > >>>>>> for > >>>>>> AST2600 i2C driver > >>>>>> > >>>>>> On 15/02/2023 06:43, Ryan Chen wrote: > >>>>>>>>> + - $ref: /schemas/i2c/i2c-controller.yaml# > >>>>>>>>> + > >>>>>>>>> +properties: > >>>>>>>>> + compatible: > >>>>>>>>> + enum: > >>>>>>>>> + - aspeed,ast2600-i2c > >>>>>>>> > >>>>>>>> NAK. It's already there. Please do not waste our time in > >>>>>>>> submitting duplicated drivers. > >>>>>>> > >>>>>>> It is not duplicated, as my description in cover " This series > >>>>>>> add > >>>>>>> AST2600 i2c > >>>>>> new register set driver" > >>>>>>> So, this will be different driver compatible. > >>>>>>> The original compatible is > >>>>>>> - aspeed,ast2400-i2c-bus > >>>>>>> - aspeed,ast2500-i2c-bus > >>>>>>> - aspeed,ast2600-i2c-bus > >>>>>>> So the new register set compatible is "- aspeed,ast2600-i2c", > >>>>>>> remove > >>>> "bus". > >>>>>> > >>>>>> Bindings are documenting hardware, so I claim - we already have > >>>>>> this hardware described and this is duplicated. Otherwise - what > >>>>>> are these two I2C controllers and what are the differences? Why > >>>>>> they do not have really different name? Bus looks more like a > >>>>>> mistake than a > >>>> differentiating name. > >>>>> For misunderstanding, or mistaken. > >>>>> I purpose to be aspeed,ast2600-i2cv2, will it more clear way ? > >>>> > >>>> I don't know. I still did not get answers. I asked here several questions. > >>> Those are different i2c controller, as I description in cover letter. > >> > >> The cover letter does not explain here anything. It barely mentions > >> "new register set" and "separate register set". This is really short, > >> so without proper explanations you will get all these questions. Are > >> they compatible? Do they overlap? Are they completely different? If > >> so, why datasheet uses same name for them? So many questions but > >> cover letter is basically two sentences and > >> here: > > > > Sorry my misunderstanding. > > The legacy register layout is mix master/slave register control together. > > So will let confuse about register. > > The following is add more detail description about new register layout. > > And new feature set add for register. > > > > -Add new clock divider option for more flexible and accurate clock > > rate generation -Add tCKHighMin timing to guarantee SCL high pulse width. > > -Add support dual pool buffer mode, split 32 bytes pool buffer of each device > into 2 x 16 bytes for Tx and Rx individually. > > -Increase DMA buffer size to 4096 bytes and support byte alignment. > > -Re-define the base address of BUS1 ~ BUS16 and Pool buffer. > > -Re-define registers for separating master and slave mode control. > > -Support 4 individual DMA buffers for master Tx and Rx, slave Tx and Rx. > > > > And following is new register set for package transfer sequence. > > New Master operation mode: S -> Aw -> P {S: Start, Sr: Repeat Start, Aw/r: > Address for write/read, P: Stop}. > > New Master operation mode: S -> Aw -> TxD -> P New Master operation > > mode: S -> Ar -> RxD -> P New Slave operation mode: S -> Aw -> RxD -> > > Sr -> Ar -> TxD -> P. > > -Bus SDA lock auto-release capability for new master DMA command mode. > > -Bus auto timeout for new master/slave DMA mode. > > > > The following is two versus register layout. > > Old: > > {I2CD00}: Function Control Register > > {I2CD04}: Clock and AC Timing Control Register \#1 > > {I2CD08}: Clock and AC Timing Control Register \#2 > > {I2CD0C}: Interrupt Control Register > > {I2CD10}: Interrupt Status Register > > {I2CD14}: Command/Status Register > > {I2CD18}: Slave Device Address Register > > {I2CD1C}: Pool Buffer Control Register > > {I2CD20}: Transmit/Receive Byte Buffer Register > > {I2CD24}: DMA Mode Buffer Address Register > > {I2CD28}: DMA Transfer Length Register > > {I2CD2C}: Original DMA Mode Buffer Address Setting > > {I2CD30}: Original DMA Transfer Length Setting and Final Status > > > > New Register mode > > {I2CC00}: Master/Slave Function Control Register > > {I2CC04}: Master/Slave Clock and AC Timing Control Register > > {I2CC08}: Master/Slave Transmit/Receive Byte Buffer Register > > {I2CC0C}: Master/Slave Pool Buffer Control Register > > {I2CM10}: Master Interrupt Control Register > > {I2CM14}: Master Interrupt Status Register > > {I2CM18}: Master Command/Status Register > > {I2CM1C}: Master DMA Buffer Length Register > > {I2CS20}: Slave~ Interrupt Control Register > > {I2CS24}: Slave~ Interrupt Status Register > > {I2CS28}: Slave~ Command/Status Register > > {I2CS2C}: Slave~ DMA Buffer Length Register > > {I2CM30}: Master DMA Mode Tx Buffer Base Address > > {I2CM34}: Master DMA Mode Rx Buffer Base Address > > {I2CS38}: Slave~ DMA Mode Tx Buffer Base Address > > {I2CS3C}: Slave~ DMA Mode Rx Buffer Base Address > > {I2CS40}: Slave Device Address Register > > {I2CM48}: Master DMA Length Status Register > > {I2CS4C}: Slave DMA Length Status Register > > {I2CC50}: Current DMA Operating Address Status > > {I2CC54}: Current DMA Operating Length Status > > Thanks for explanation, yet still I don't get whether these are separate devices > or not. So again, you got several questions and you should answer them, not > only parts of them. > > Are they compatible? Do they overlap? Are they completely different? If so, > why datasheet uses same name for them? They are not compatible. The register offset is overlap. Old register is from 0x00 ~ 0x30 New register is from 0x00 ~ 0x54 The new design has another register, call global register that do 1 bit to set switch register decode to be new or old register layout. For example, old register AC timing have two setting I2CD04/08 but new is I2CC04. And now register setting for AC timing. And also master/slave register separate control. Not mix at I2CD14. About naming in datasheet, due to you can see the new design concept is the same. So most use the same name to be offset register name. From mix to separate master/slave control. The following an example. IER 1 to 2 {I2CD0C}: Interrupt Control Register to 2 set {I2CM10}: Master Interrupt Control Register, {I2CS20}: Slave~ Interrupt Control Register ISR, 1 to 2 {I2CD0C}: Interrupt Control Register -> {I2CM14}: Master Interrupt Status Register, {I2CS24}: Slave~ Interrupt Status Register And so on... > > I don't understand why we struggle so much to get basic info justifying this > patchset. > > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver 2023-02-01 10:33 [PATCH v4 0/3] Add ASPEED AST2600 I2C new controller driver Ryan Chen 2023-02-01 10:33 ` [PATCH v4 1/3] dt-bindings: i2c-ast2600: Add support for AST2600 I2C global controller Ryan Chen 2023-02-01 10:33 ` [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver Ryan Chen @ 2023-02-01 10:33 ` Ryan Chen 2023-02-02 6:04 ` Jeremy Kerr 2 siblings, 1 reply; 18+ messages in thread From: Ryan Chen @ 2023-02-01 10:33 UTC (permalink / raw) To: Ryan Chen, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Add i2c new register mode driver to support AST2600 i2c new register mode. AST2600 i2c controller have legacy and new register mode. The new register mode have global register support 4 base clock for scl clock selection, and new clock divider mode. The i2c new register mode have separate register set to control i2c master and slave. Signed-off-by: Ryan Chen <ryan_chen@aspeedtech.com> --- MAINTAINERS | 10 + drivers/i2c/busses/Kconfig | 11 + drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-ast2600-global.c | 94 ++ drivers/i2c/busses/i2c-ast2600-global.h | 19 + drivers/i2c/busses/i2c-ast2600.c | 1811 +++++++++++++++++++++++ 6 files changed, 1946 insertions(+) create mode 100644 drivers/i2c/busses/i2c-ast2600-global.c create mode 100644 drivers/i2c/busses/i2c-ast2600-global.h create mode 100644 drivers/i2c/busses/i2c-ast2600.c diff --git a/MAINTAINERS b/MAINTAINERS index 749710e22b4d..67d338d834b4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3209,6 +3209,16 @@ S: Maintained F: Documentation/devicetree/bindings/usb/aspeed,ast2600-udc.yaml F: drivers/usb/gadget/udc/aspeed_udc.c +ASPEED AST2600 I2C DRIVER +M: Ryan Chen <ryan_chen@aspeedtech.com> +L: linux-aspeed@lists.ozlabs.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600-global.yaml +F: Documentation/devicetree/bindings/i2c/aspeed,i2c-ast2600.yaml +F: drivers/i2c/busses/i2c-ast2600-global.c +F: drivers/i2c/busses/i2c-ast2600-global.h +F: drivers/i2c/busses/i2c-ast2600.c + ASPEED XDMA ENGINE DRIVER M: Eddie James <eajames@linux.ibm.com> L: linux-aspeed@lists.ozlabs.org (moderated for non-subscribers) diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig index 7284206b278b..5ef3ee6aa70f 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig @@ -389,6 +389,17 @@ config I2C_ALTERA This driver can also be built as a module. If so, the module will be called i2c-altera. +config I2C_AST2600 + tristate "Aspeed AST2600 I2C Controller" + depends on ARCH_ASPEED || MACH_ASPEED_G6 || COMPILE_TEST + select I2C_SMBUS + help + If you say yes to this option, support will be included for the + Aspeed I2C controller with new register set. + + This driver can also be built as a module. If so, the module + will be called i2c-new-aspeed. + config I2C_ASPEED tristate "Aspeed I2C Controller" depends on ARCH_ASPEED || COMPILE_TEST diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index c5cac15f075c..ce83dfdc2094 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -38,6 +38,7 @@ obj-$(CONFIG_I2C_POWERMAC) += i2c-powermac.o obj-$(CONFIG_I2C_ALTERA) += i2c-altera.o obj-$(CONFIG_I2C_AMD_MP2) += i2c-amd-mp2-pci.o i2c-amd-mp2-plat.o obj-$(CONFIG_I2C_ASPEED) += i2c-aspeed.o +obj-$(CONFIG_I2C_AST2600) += i2c-ast2600-global.o i2c-ast2600.o obj-$(CONFIG_I2C_AT91) += i2c-at91.o i2c-at91-objs := i2c-at91-core.o i2c-at91-master.o ifeq ($(CONFIG_I2C_AT91_SLAVE_EXPERIMENTAL),y) diff --git a/drivers/i2c/busses/i2c-ast2600-global.c b/drivers/i2c/busses/i2c-ast2600-global.c new file mode 100644 index 000000000000..951f20f6673d --- /dev/null +++ b/drivers/i2c/busses/i2c-ast2600-global.c @@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Aspeed I2C Global Controller Driver. + * + * Copyright (c) 2023 ASPEED Technology Inc. + */ + +#include <linux/platform_device.h> +#include <linux/of_platform.h> +#include <linux/of_address.h> +#include <linux/module.h> +#include <linux/reset.h> +#include <linux/delay.h> +#include <linux/io.h> +#include "i2c-ast2600-global.h" + +struct ast2600_i2c_global { + void __iomem *base; + struct reset_control *rst; +}; + +static const struct of_device_id ast2600_i2c_global_of_match[] = { + { .compatible = "aspeed,ast2600-i2c-global", }, + { }, +}; +MODULE_DEVICE_TABLE(of, ast2600_i2c_global_of_match); + +#define AST2600_GLOBAL_INIT \ + (AST2600_I2CG_CTRL_NEW_REG | \ + AST2600_I2CG_CTRL_NEW_CLK_DIV) +#define I2CCG_DIV_CTRL 0xC6411208 +/* + * APB clk : 100Mhz + * div : scl : baseclk [APB/((div/2) + 1)] : tBuf [1/bclk * 16] + * I2CG10[31:24] base clk4 for i2c auto recovery timeout counter (0xC6) + * I2CG10[23:16] base clk3 for Standard-mode (100Khz) min tBuf 4.7us + * 0x3c : 100.8Khz : 3.225Mhz : 4.96us + * 0x3d : 99.2Khz : 3.174Mhz : 5.04us + * 0x3e : 97.65Khz : 3.125Mhz : 5.12us + * 0x40 : 97.75Khz : 3.03Mhz : 5.28us + * 0x41 : 99.5Khz : 2.98Mhz : 5.36us (default) + * I2CG10[15:8] base clk2 for Fast-mode (400Khz) min tBuf 1.3us + * 0x12 : 400Khz : 10Mhz : 1.6us + * I2CG10[7:0] base clk1 for Fast-mode Plus (1Mhz) min tBuf 0.5us + * 0x08 : 1Mhz : 20Mhz : 0.8us + */ + +static int ast2600_i2c_global_probe(struct platform_device *pdev) +{ + struct ast2600_i2c_global *i2c_global; + struct resource *res; + + i2c_global = devm_kzalloc(&pdev->dev, sizeof(*i2c_global), GFP_KERNEL); + if (IS_ERR(i2c_global)) + return PTR_ERR(i2c_global); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + i2c_global->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(i2c_global->base)) + return PTR_ERR(i2c_global->base); + + i2c_global->rst = devm_reset_control_get_exclusive(&pdev->dev, NULL); + if (IS_ERR(i2c_global->rst)) + return IS_ERR(i2c_global->rst); + + reset_control_assert(i2c_global->rst); + udelay(3); + reset_control_deassert(i2c_global->rst); + + writel(AST2600_GLOBAL_INIT, i2c_global->base + AST2600_I2CG_CTRL); + writel(I2CCG_DIV_CTRL, i2c_global->base + AST2600_I2CG_CLK_DIV_CTRL); + + pr_info("i2c global registered\n"); + + return 0; +} + +static struct platform_driver ast2600_i2c_global_driver = { + .probe = ast2600_i2c_global_probe, + .driver = { + .name = KBUILD_MODNAME, + .of_match_table = ast2600_i2c_global_of_match, + }, +}; + +static int __init ast2600_i2c_global_init(void) +{ + return platform_driver_register(&ast2600_i2c_global_driver); +} +device_initcall(ast2600_i2c_global_init); + +MODULE_AUTHOR("Ryan Chen"); +MODULE_DESCRIPTION("AST2600 I2C Global Driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/i2c/busses/i2c-ast2600-global.h b/drivers/i2c/busses/i2c-ast2600-global.h new file mode 100644 index 000000000000..c2c55971f32a --- /dev/null +++ b/drivers/i2c/busses/i2c-ast2600-global.h @@ -0,0 +1,19 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#ifndef I2C_AST2600_GLOBAL_H +#define I2C_AST2600_GLOBAL_H + +#include <linux/bits.h> + +#define AST2600_I2CG_ISR 0x00 +#define AST2600_I2CG_SLAVE_ISR 0x04 +#define AST2600_I2CG_OWNER 0x08 +#define AST2600_I2CG_CTRL 0x0C +#define AST2600_I2CG_CLK_DIV_CTRL 0x10 + +#define AST2600_I2CG_SLAVE_PKT_NAK BIT(4) +#define AST2600_I2CG_M_S_SEPARATE_INTR BIT(3) +#define AST2600_I2CG_CTRL_NEW_REG BIT(2) +#define AST2600_I2CG_CTRL_NEW_CLK_DIV BIT(1) + +#endif /* I2C_AST2600_GLOBAL_H */ diff --git a/drivers/i2c/busses/i2c-ast2600.c b/drivers/i2c/busses/i2c-ast2600.c new file mode 100644 index 000000000000..014b6f002985 --- /dev/null +++ b/drivers/i2c/busses/i2c-ast2600.c @@ -0,0 +1,1811 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * ASPEED AST2600 new register set I2C controller driver + * + * Copyright (c) 2023 ASPEED Technology Inc. + */ + +#include <linux/clk.h> +#include <linux/err.h> +#include <linux/i2c.h> +#include <linux/io.h> +#include <linux/slab.h> +#include <linux/delay.h> +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/completion.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/mfd/syscon.h> +#include <linux/regmap.h> +#include <linux/of_device.h> +#include <linux/dma-mapping.h> +#include <linux/i2c-smbus.h> +#include "i2c-ast2600-global.h" + +/* 0x00 : I2CC Master/Slave Function Control Register */ +#define AST2600_I2CC_FUN_CTRL 0x00 +#define AST2600_I2CC_SLAVE_ADDR_RX_EN BIT(20) +#define AST2600_I2CC_MASTER_RETRY_MASK GENMASK(19, 18) +#define AST2600_I2CC_MASTER_RETRY(x) (((x) & GENMASK(1, 0)) << 18) +#define AST2600_I2CC_BUS_AUTO_RELEASE BIT(17) +#define AST2600_I2CC_M_SDA_LOCK_EN BIT(16) +#define AST2600_I2CC_MULTI_MASTER_DIS BIT(15) +#define AST2600_I2CC_M_SCL_DRIVE_EN BIT(14) +#define AST2600_I2CC_MSB_STS BIT(9) +#define AST2600_I2CC_SDA_DRIVE_1T_EN BIT(8) +#define AST2600_I2CC_M_SDA_DRIVE_1T_EN BIT(7) +#define AST2600_I2CC_M_HIGH_SPEED_EN BIT(6) +/* reserved 5 : 2 */ +#define AST2600_I2CC_SLAVE_EN BIT(1) +#define AST2600_I2CC_MASTER_EN BIT(0) + +/* 0x04 : I2CC Master/Slave Clock and AC Timing Control Register #1 */ +#define AST2600_I2CC_AC_TIMING 0x04 +#define AST2600_I2CC_TTIMEOUT(x) (((x) & GENMASK(4, 0)) << 24) +#define AST2600_I2CC_TCKHIGHMIN(x) (((x) & GENMASK(3, 0)) << 20) +#define AST2600_I2CC_TCKHIGH(x) (((x) & GENMASK(3, 0)) << 16) +#define AST2600_I2CC_TCKLOW(x) (((x) & GENMASK(3, 0)) << 12) +#define AST2600_I2CC_THDDAT(x) (((x) & GENMASK(1, 0)) << 10) +#define AST2600_I2CC_TOUTBASECLK(x) (((x) & GENMASK(1, 0)) << 8) +#define AST2600_I2CC_TBASECLK(x) ((x) & GENMASK(3, 0)) + +/* 0x08 : I2CC Master/Slave Transmit/Receive Byte Buffer Register */ +#define AST2600_I2CC_STS_AND_BUFF 0x08 +#define AST2600_I2CC_TX_DIR_MASK GENMASK(31, 29) +#define AST2600_I2CC_SDA_OE BIT(28) +#define AST2600_I2CC_SDA_O BIT(27) +#define AST2600_I2CC_SCL_OE BIT(26) +#define AST2600_I2CC_SCL_O BIT(25) + +#define AST2600_I2CC_SCL_LINE_STS BIT(18) +#define AST2600_I2CC_SDA_LINE_STS BIT(17) +#define AST2600_I2CC_BUS_BUSY_STS BIT(16) + +#define AST2600_I2CC_GET_RX_BUFF(x) (((x) >> 8) & GENMASK(7, 0)) + +/* 0x0C : I2CC Master/Slave Pool Buffer Control Register */ +#define AST2600_I2CC_BUFF_CTRL 0x0C +#define AST2600_I2CC_GET_RX_BUF_LEN(x) (((x) >> 24) & GENMASK(5, 0)) +#define AST2600_I2CC_SET_RX_BUF_LEN(x) (((((x) - 1) & GENMASK(4, 0)) << 16) | BIT(0)) +#define AST2600_I2CC_SET_TX_BUF_LEN(x) (((((x) - 1) & GENMASK(4, 0)) << 8) | BIT(0)) +#define AST2600_I2CC_GET_TX_BUF_LEN(x) ((((x) >> 8) & GENMASK(4, 0)) + 1) + +/* 0x10 : I2CM Master Interrupt Control Register */ +#define AST2600_I2CM_IER 0x10 +/* 0x14 : I2CM Master Interrupt Status Register : WC */ +#define AST2600_I2CM_ISR 0x14 + +#define AST2600_I2CM_PKT_TIMEOUT BIT(18) +#define AST2600_I2CM_PKT_ERROR BIT(17) +#define AST2600_I2CM_PKT_DONE BIT(16) + +#define AST2600_I2CM_BUS_RECOVER_FAIL BIT(15) +#define AST2600_I2CM_SDA_DL_TO BIT(14) +#define AST2600_I2CM_BUS_RECOVER BIT(13) +#define AST2600_I2CM_SMBUS_ALT BIT(12) + +#define AST2600_I2CM_SCL_LOW_TO BIT(6) +#define AST2600_I2CM_ABNORMAL BIT(5) +#define AST2600_I2CM_NORMAL_STOP BIT(4) +#define AST2600_I2CM_ARBIT_LOSS BIT(3) +#define AST2600_I2CM_RX_DONE BIT(2) +#define AST2600_I2CM_TX_NAK BIT(1) +#define AST2600_I2CM_TX_ACK BIT(0) + +/* 0x18 : I2CM Master Command/Status Register */ +#define AST2600_I2CM_CMD_STS 0x18 +#define AST2600_I2CM_PKT_ADDR(x) (((x) & GENMASK(6, 0)) << 24) +#define AST2600_I2CM_PKT_EN BIT(16) +#define AST2600_I2CM_SDA_OE_OUT_DIR BIT(15) +#define AST2600_I2CM_SDA_O_OUT_DIR BIT(14) +#define AST2600_I2CM_SCL_OE_OUT_DIR BIT(13) +#define AST2600_I2CM_SCL_O_OUT_DIR BIT(12) +#define AST2600_I2CM_RECOVER_CMD_EN BIT(11) + +#define AST2600_I2CM_RX_DMA_EN BIT(9) +#define AST2600_I2CM_TX_DMA_EN BIT(8) +/* Command Bit */ +#define AST2600_I2CM_RX_BUFF_EN BIT(7) +#define AST2600_I2CM_TX_BUFF_EN BIT(6) +#define AST2600_I2CM_STOP_CMD BIT(5) +#define AST2600_I2CM_RX_CMD_LAST BIT(4) +#define AST2600_I2CM_RX_CMD BIT(3) + +#define AST2600_I2CM_TX_CMD BIT(1) +#define AST2600_I2CM_START_CMD BIT(0) + +/* 0x1C : I2CM Master DMA Transfer Length Register */ +#define AST2600_I2CM_DMA_LEN 0x1C +/* Tx Rx support length 1 ~ 4096 */ +#define AST2600_I2CM_SET_RX_DMA_LEN(x) ((((x) & GENMASK(11, 0)) << 16) | BIT(31)) +#define AST2600_I2CM_SET_TX_DMA_LEN(x) (((x) & GENMASK(11, 0)) | BIT(15)) + +/* 0x20 : I2CS Slave Interrupt Control Register */ +#define AST2600_I2CS_IER 0x20 +/* 0x24 : I2CS Slave Interrupt Status Register */ +#define AST2600_I2CS_ISR 0x24 + +#define AST2600_I2CS_ADDR_INDICATE_MASK GENMASK(31, 30) +#define AST2600_I2CS_SLAVE_PENDING BIT(29) + +#define AST2600_I2CS_WAIT_TX_DMA BIT(25) +#define AST2600_I2CS_WAIT_RX_DMA BIT(24) + +#define AST2600_I2CS_ADDR3_NAK BIT(22) +#define AST2600_I2CS_ADDR2_NAK BIT(21) +#define AST2600_I2CS_ADDR1_NAK BIT(20) + +#define AST2600_I2CS_ADDR_MASK GENMASK(19, 18) +#define AST2600_I2CS_PKT_ERROR BIT(17) +#define AST2600_I2CS_PKT_DONE BIT(16) +#define AST2600_I2CS_INACTIVE_TO BIT(15) + +#define AST2600_I2CS_SLAVE_MATCH BIT(7) +#define AST2600_I2CS_ABNOR_STOP BIT(5) +#define AST2600_I2CS_STOP BIT(4) +#define AST2600_I2CS_RX_DONE_NAK BIT(3) +#define AST2600_I2CS_RX_DONE BIT(2) +#define AST2600_I2CS_TX_NAK BIT(1) +#define AST2600_I2CS_TX_ACK BIT(0) + +/* 0x28 : I2CS Slave CMD/Status Register */ +#define AST2600_I2CS_CMD_STS 0x28 +#define AST2600_I2CS_ACTIVE_ALL GENMASK(18, 17) +#define AST2600_I2CS_PKT_MODE_EN BIT(16) +#define AST2600_I2CS_AUTO_NAK_NOADDR BIT(15) +#define AST2600_I2CS_AUTO_NAK_EN BIT(14) + +#define AST2600_I2CS_ALT_EN BIT(10) +#define AST2600_I2CS_RX_DMA_EN BIT(9) +#define AST2600_I2CS_TX_DMA_EN BIT(8) +#define AST2600_I2CS_RX_BUFF_EN BIT(7) +#define AST2600_I2CS_TX_BUFF_EN BIT(6) +#define AST2600_I2CS_RX_CMD_LAST BIT(4) + +#define AST2600_I2CS_TX_CMD BIT(2) + +#define AST2600_I2CS_DMA_LEN 0x2C +#define AST2600_I2CS_SET_RX_DMA_LEN(x) (((((x) - 1) & GENMASK(11, 0)) << 16) | BIT(31)) +#define AST2600_I2CS_RX_DMA_LEN_MASK (GENMASK(11, 0) << 16) + +#define AST2600_I2CS_SET_TX_DMA_LEN(x) ((((x) - 1) & GENMASK(11, 0)) | BIT(15)) +#define AST2600_I2CS_TX_DMA_LEN_MASK GENMASK(11, 0) + +/* I2CM Master DMA Tx Buffer Register */ +#define AST2600_I2CM_TX_DMA 0x30 +/* I2CM Master DMA Rx Buffer Register */ +#define AST2600_I2CM_RX_DMA 0x34 +/* I2CS Slave DMA Tx Buffer Register */ +#define AST2600_I2CS_TX_DMA 0x38 +/* I2CS Slave DMA Rx Buffer Register */ +#define AST2600_I2CS_RX_DMA 0x3C + +#define AST2600_I2CS_ADDR_CTRL 0x40 + +#define AST2600_I2CS_ADDR3_MASK GENMASK(22, 16) +#define AST2600_I2CS_ADDR2_MASK GENMASK(14, 8) +#define AST2600_I2CS_ADDR1_MASK GENMASK(6, 0) + +#define AST2600_I2CM_DMA_LEN_STS 0x48 +#define AST2600_I2CS_DMA_LEN_STS 0x4C + +#define AST2600_I2C_GET_TX_DMA_LEN(x) ((x) & GENMASK(12, 0)) +#define AST2600_I2C_GET_RX_DMA_LEN(x) (((x) >> 16) & GENMASK(12, 0)) + +/* 0x40 : Slave Device Address Register */ +#define AST2600_I2CS_ADDR3_ENABLE BIT(23) +#define AST2600_I2CS_ADDR3(x) ((x) << 16) + +#define AST2600_I2CS_ADDR2_ENABLE BIT(15) +#define AST2600_I2CS_ADDR2(x) ((x) << 8) +#define AST2600_I2CS_ADDR1_ENABLE BIT(7) +#define AST2600_I2CS_ADDR1(x) (x) + +#define I2C_SLAVE_MSG_BUF_SIZE 256 + +#define AST2600_I2C_DMA_SIZE 4096 + +#define MASTER_TRIGGER_LAST_STOP (AST2600_I2CM_RX_CMD_LAST | AST2600_I2CM_STOP_CMD) +#define SLAVE_TRIGGER_CMD (AST2600_I2CS_ACTIVE_ALL | AST2600_I2CS_PKT_MODE_EN) + +/* i2c timeout counter: use base clk4 1Mhz + * 1/(1000/4096) = 4.096ms * 8 = 32.768ms + */ +#define AST_I2C_TIMEOUT_CLK 0x2 +#define AST_I2C_TIMEOUT_COUNT 0x8 + +struct ast2600_i2c_timing_table { + u32 divisor; + u32 timing; +}; + +static struct ast2600_i2c_timing_table i2c_legacy_timing_table[] = { + /* Divisor : Base Clock : tCKHighMin : tCK High : tCK Low */ + /* Divisor : [3:0] : [23: 20] : [19:16]: [15:12] */ + { 6, 0x00000300 | (0x0) | (0x2 << 20) | (0x2 << 16) | (0x2 << 12) }, + { 7, 0x00000300 | (0x0) | (0x3 << 20) | (0x3 << 16) | (0x2 << 12) }, + { 8, 0x00000300 | (0x0) | (0x3 << 20) | (0x3 << 16) | (0x3 << 12) }, + { 9, 0x00000300 | (0x0) | (0x4 << 20) | (0x4 << 16) | (0x3 << 12) }, + { 10, 0x00000300 | (0x0) | (0x4 << 20) | (0x4 << 16) | (0x4 << 12) }, + { 11, 0x00000300 | (0x0) | (0x5 << 20) | (0x5 << 16) | (0x4 << 12) }, + { 12, 0x00000300 | (0x0) | (0x5 << 20) | (0x5 << 16) | (0x5 << 12) }, + { 13, 0x00000300 | (0x0) | (0x6 << 20) | (0x6 << 16) | (0x5 << 12) }, + { 14, 0x00000300 | (0x0) | (0x6 << 20) | (0x6 << 16) | (0x6 << 12) }, + { 15, 0x00000300 | (0x0) | (0x7 << 20) | (0x7 << 16) | (0x6 << 12) }, + { 16, 0x00000300 | (0x0) | (0x7 << 20) | (0x7 << 16) | (0x7 << 12) }, + { 17, 0x00000300 | (0x0) | (0x8 << 20) | (0x8 << 16) | (0x7 << 12) }, + { 18, 0x00000300 | (0x0) | (0x8 << 20) | (0x8 << 16) | (0x8 << 12) }, + { 19, 0x00000300 | (0x0) | (0x9 << 20) | (0x9 << 16) | (0x8 << 12) }, + { 20, 0x00000300 | (0x0) | (0x9 << 20) | (0x9 << 16) | (0x9 << 12) }, + { 21, 0x00000300 | (0x0) | (0xa << 20) | (0xa << 16) | (0x9 << 12) }, + { 22, 0x00000300 | (0x0) | (0xa << 20) | (0xa << 16) | (0xa << 12) }, + { 23, 0x00000300 | (0x0) | (0xb << 20) | (0xb << 16) | (0xa << 12) }, + { 24, 0x00000300 | (0x0) | (0xb << 20) | (0xb << 16) | (0xb << 12) }, + { 25, 0x00000300 | (0x0) | (0xc << 20) | (0xc << 16) | (0xb << 12) }, + { 26, 0x00000300 | (0x0) | (0xc << 20) | (0xc << 16) | (0xc << 12) }, + { 27, 0x00000300 | (0x0) | (0xd << 20) | (0xd << 16) | (0xc << 12) }, + { 28, 0x00000300 | (0x0) | (0xd << 20) | (0xd << 16) | (0xd << 12) }, + { 29, 0x00000300 | (0x0) | (0xe << 20) | (0xe << 16) | (0xd << 12) }, + { 30, 0x00000300 | (0x0) | (0xe << 20) | (0xe << 16) | (0xe << 12) }, + { 31, 0x00000300 | (0x0) | (0xf << 20) | (0xf << 16) | (0xe << 12) }, + { 32, 0x00000300 | (0x0) | (0xf << 20) | (0xf << 16) | (0xf << 12) }, + + { 34, 0x00000300 | (0x1) | (0x8 << 20) | (0x8 << 16) | (0x7 << 12) }, + { 36, 0x00000300 | (0x1) | (0x8 << 20) | (0x8 << 16) | (0x8 << 12) }, + { 38, 0x00000300 | (0x1) | (0x9 << 20) | (0x9 << 16) | (0x8 << 12) }, + { 40, 0x00000300 | (0x1) | (0x9 << 20) | (0x9 << 16) | (0x9 << 12) }, + { 42, 0x00000300 | (0x1) | (0xa << 20) | (0xa << 16) | (0x9 << 12) }, + { 44, 0x00000300 | (0x1) | (0xa << 20) | (0xa << 16) | (0xa << 12) }, + { 46, 0x00000300 | (0x1) | (0xb << 20) | (0xb << 16) | (0xa << 12) }, + { 48, 0x00000300 | (0x1) | (0xb << 20) | (0xb << 16) | (0xb << 12) }, + { 50, 0x00000300 | (0x1) | (0xc << 20) | (0xc << 16) | (0xb << 12) }, + { 52, 0x00000300 | (0x1) | (0xc << 20) | (0xc << 16) | (0xc << 12) }, + { 54, 0x00000300 | (0x1) | (0xd << 20) | (0xd << 16) | (0xc << 12) }, + { 56, 0x00000300 | (0x1) | (0xd << 20) | (0xd << 16) | (0xd << 12) }, + { 58, 0x00000300 | (0x1) | (0xe << 20) | (0xe << 16) | (0xd << 12) }, + { 60, 0x00000300 | (0x1) | (0xe << 20) | (0xe << 16) | (0xe << 12) }, + { 62, 0x00000300 | (0x1) | (0xf << 20) | (0xf << 16) | (0xe << 12) }, + { 64, 0x00000300 | (0x1) | (0xf << 20) | (0xf << 16) | (0xf << 12) }, + + { 68, 0x00000300 | (0x2) | (0x8 << 20) | (0x8 << 16) | (0x7 << 12) }, + { 72, 0x00000300 | (0x2) | (0x8 << 20) | (0x8 << 16) | (0x8 << 12) }, + { 76, 0x00000300 | (0x2) | (0x9 << 20) | (0x9 << 16) | (0x8 << 12) }, + { 80, 0x00000300 | (0x2) | (0x9 << 20) | (0x9 << 16) | (0x9 << 12) }, + { 84, 0x00000300 | (0x2) | (0xa << 20) | (0xa << 16) | (0x9 << 12) }, + { 88, 0x00000300 | (0x2) | (0xa << 20) | (0xa << 16) | (0xa << 12) }, + { 92, 0x00000300 | (0x2) | (0xb << 20) | (0xb << 16) | (0xa << 12) }, + { 96, 0x00000300 | (0x2) | (0xb << 20) | (0xb << 16) | (0xb << 12) }, + { 100, 0x00000300 | (0x2) | (0xc << 20) | (0xc << 16) | (0xb << 12) }, + { 104, 0x00000300 | (0x2) | (0xc << 20) | (0xc << 16) | (0xc << 12) }, + { 108, 0x00000300 | (0x2) | (0xd << 20) | (0xd << 16) | (0xc << 12) }, + { 112, 0x00000300 | (0x2) | (0xd << 20) | (0xd << 16) | (0xd << 12) }, + { 116, 0x00000300 | (0x2) | (0xe << 20) | (0xe << 16) | (0xd << 12) }, + { 120, 0x00000300 | (0x2) | (0xe << 20) | (0xe << 16) | (0xe << 12) }, + { 124, 0x00000300 | (0x2) | (0xf << 20) | (0xf << 16) | (0xe << 12) }, + { 128, 0x00000300 | (0x2) | (0xf << 20) | (0xf << 16) | (0xf << 12) }, + + { 136, 0x00000300 | (0x3) | (0x8 << 20) | (0x8 << 16) | (0x7 << 12) }, + { 144, 0x00000300 | (0x3) | (0x8 << 20) | (0x8 << 16) | (0x8 << 12) }, + { 152, 0x00000300 | (0x3) | (0x9 << 20) | (0x9 << 16) | (0x8 << 12) }, + { 160, 0x00000300 | (0x3) | (0x9 << 20) | (0x9 << 16) | (0x9 << 12) }, + { 168, 0x00000300 | (0x3) | (0xa << 20) | (0xa << 16) | (0x9 << 12) }, + { 176, 0x00000300 | (0x3) | (0xa << 20) | (0xa << 16) | (0xa << 12) }, + { 184, 0x00000300 | (0x3) | (0xb << 20) | (0xb << 16) | (0xa << 12) }, + { 192, 0x00000300 | (0x3) | (0xb << 20) | (0xb << 16) | (0xb << 12) }, + { 200, 0x00000300 | (0x3) | (0xc << 20) | (0xc << 16) | (0xb << 12) }, + { 208, 0x00000300 | (0x3) | (0xc << 20) | (0xc << 16) | (0xc << 12) }, + { 216, 0x00000300 | (0x3) | (0xd << 20) | (0xd << 16) | (0xc << 12) }, + { 224, 0x00000300 | (0x3) | (0xd << 20) | (0xd << 16) | (0xd << 12) }, + { 232, 0x00000300 | (0x3) | (0xe << 20) | (0xe << 16) | (0xd << 12) }, + { 240, 0x00000300 | (0x3) | (0xe << 20) | (0xe << 16) | (0xe << 12) }, + { 248, 0x00000300 | (0x3) | (0xf << 20) | (0xf << 16) | (0xe << 12) }, + { 256, 0x00000300 | (0x3) | (0xf << 20) | (0xf << 16) | (0xf << 12) }, + + { 272, 0x00000300 | (0x4) | (0x8 << 20) | (0x8 << 16) | (0x7 << 12) }, + { 288, 0x00000300 | (0x4) | (0x8 << 20) | (0x8 << 16) | (0x8 << 12) }, + { 304, 0x00000300 | (0x4) | (0x9 << 20) | (0x9 << 16) | (0x8 << 12) }, + { 320, 0x00000300 | (0x4) | (0x9 << 20) | (0x9 << 16) | (0x9 << 12) }, + { 336, 0x00000300 | (0x4) | (0xa << 20) | (0xa << 16) | (0x9 << 12) }, + { 352, 0x00000300 | (0x4) | (0xa << 20) | (0xa << 16) | (0xa << 12) }, + { 368, 0x00000300 | (0x4) | (0xb << 20) | (0xb << 16) | (0xa << 12) }, + { 384, 0x00000300 | (0x4) | (0xb << 20) | (0xb << 16) | (0xb << 12) }, + { 400, 0x00000300 | (0x4) | (0xc << 20) | (0xc << 16) | (0xb << 12) }, + { 416, 0x00000300 | (0x4) | (0xc << 20) | (0xc << 16) | (0xc << 12) }, + { 432, 0x00000300 | (0x4) | (0xd << 20) | (0xd << 16) | (0xc << 12) }, + { 448, 0x00000300 | (0x4) | (0xd << 20) | (0xd << 16) | (0xd << 12) }, + { 464, 0x00000300 | (0x4) | (0xe << 20) | (0xe << 16) | (0xd << 12) }, + { 480, 0x00000300 | (0x4) | (0xe << 20) | (0xe << 16) | (0xe << 12) }, + { 496, 0x00000300 | (0x4) | (0xf << 20) | (0xf << 16) | (0xe << 12) }, + { 512, 0x00000300 | (0x4) | (0xf << 20) | (0xf << 16) | (0xf << 12) }, + + { 544, 0x00000300 | (0x5) | (0x8 << 20) | (0x8 << 16) | (0x7 << 12) }, + { 576, 0x00000300 | (0x5) | (0x8 << 20) | (0x8 << 16) | (0x8 << 12) }, + { 608, 0x00000300 | (0x5) | (0x9 << 20) | (0x9 << 16) | (0x8 << 12) }, + { 640, 0x00000300 | (0x5) | (0x9 << 20) | (0x9 << 16) | (0x9 << 12) }, + { 672, 0x00000300 | (0x5) | (0xa << 20) | (0xa << 16) | (0x9 << 12) }, + { 704, 0x00000300 | (0x5) | (0xa << 20) | (0xa << 16) | (0xa << 12) }, + { 736, 0x00000300 | (0x5) | (0xb << 20) | (0xb << 16) | (0xa << 12) }, + { 768, 0x00000300 | (0x5) | (0xb << 20) | (0xb << 16) | (0xb << 12) }, + { 800, 0x00000300 | (0x5) | (0xc << 20) | (0xc << 16) | (0xb << 12) }, + { 832, 0x00000300 | (0x5) | (0xc << 20) | (0xc << 16) | (0xc << 12) }, + { 864, 0x00000300 | (0x5) | (0xd << 20) | (0xd << 16) | (0xc << 12) }, + { 896, 0x00000300 | (0x5) | (0xd << 20) | (0xd << 16) | (0xd << 12) }, + { 928, 0x00000300 | (0x5) | (0xe << 20) | (0xe << 16) | (0xd << 12) }, + { 960, 0x00000300 | (0x5) | (0xe << 20) | (0xe << 16) | (0xe << 12) }, + { 992, 0x00000300 | (0x5) | (0xf << 20) | (0xf << 16) | (0xe << 12) }, + { 1024, 0x00000300 | (0x5) | (0xf << 20) | (0xf << 16) | (0xf << 12) }, + + { 1088, 0x00000300 | (0x6) | (0x8 << 20) | (0x8 << 16) | (0x7 << 12) }, + { 1152, 0x00000300 | (0x6) | (0x8 << 20) | (0x8 << 16) | (0x8 << 12) }, + { 1216, 0x00000300 | (0x6) | (0x9 << 20) | (0x9 << 16) | (0x8 << 12) }, + { 1280, 0x00000300 | (0x6) | (0x9 << 20) | (0x9 << 16) | (0x9 << 12) }, + { 1344, 0x00000300 | (0x6) | (0xa << 20) | (0xa << 16) | (0x9 << 12) }, + { 1408, 0x00000300 | (0x6) | (0xa << 20) | (0xa << 16) | (0xa << 12) }, + { 1472, 0x00000300 | (0x6) | (0xb << 20) | (0xb << 16) | (0xa << 12) }, + { 1536, 0x00000300 | (0x6) | (0xb << 20) | (0xb << 16) | (0xb << 12) }, + { 1600, 0x00000300 | (0x6) | (0xc << 20) | (0xc << 16) | (0xb << 12) }, + { 1664, 0x00000300 | (0x6) | (0xc << 20) | (0xc << 16) | (0xc << 12) }, + { 1728, 0x00000300 | (0x6) | (0xd << 20) | (0xd << 16) | (0xc << 12) }, + { 1792, 0x00000300 | (0x6) | (0xd << 20) | (0xd << 16) | (0xd << 12) }, + { 1856, 0x00000300 | (0x6) | (0xe << 20) | (0xe << 16) | (0xd << 12) }, + { 1920, 0x00000300 | (0x6) | (0xe << 20) | (0xe << 16) | (0xe << 12) }, + { 1984, 0x00000300 | (0x6) | (0xf << 20) | (0xf << 16) | (0xe << 12) }, + { 2048, 0x00000300 | (0x6) | (0xf << 20) | (0xf << 16) | (0xf << 12) }, + + { 2176, 0x00000300 | (0x7) | (0x8 << 20) | (0x8 << 16) | (0x7 << 12) }, + { 2304, 0x00000300 | (0x7) | (0x8 << 20) | (0x8 << 16) | (0x8 << 12) }, + { 2432, 0x00000300 | (0x7) | (0x9 << 20) | (0x9 << 16) | (0x8 << 12) }, + { 2560, 0x00000300 | (0x7) | (0x9 << 20) | (0x9 << 16) | (0x9 << 12) }, + { 2688, 0x00000300 | (0x7) | (0xa << 20) | (0xa << 16) | (0x9 << 12) }, + { 2816, 0x00000300 | (0x7) | (0xa << 20) | (0xa << 16) | (0xa << 12) }, + { 2944, 0x00000300 | (0x7) | (0xb << 20) | (0xb << 16) | (0xa << 12) }, + { 3072, 0x00000300 | (0x7) | (0xb << 20) | (0xb << 16) | (0xb << 12) }, +}; + +enum xfer_mode { + BYTE_MODE = 0, + BUFF_MODE, + DMA_MODE, +}; + +struct ast2600_i2c_bus { + struct i2c_adapter adap; + struct device *dev; + void __iomem *reg_base; + struct regmap *global_reg; + int irq; + /* 0: dma, 1: pool, 2:byte */ + enum xfer_mode mode; + /* 0: old mode, 1: new mode */ + int clk_div_mode; + struct clk *clk; + u32 apb_clk; + u32 bus_frequency; + int slave_operate; + int timeout_enable; + /* smbus alert */ + int alert_enable; + struct i2c_smbus_alert_setup alert_data; + struct i2c_client *ara; + /* Multi-master */ + bool multi_master; + /* master structure */ + int cmd_err; + struct completion cmd_complete; + struct i2c_msg *msgs; /* cur xfer msgs */ + size_t buf_index; /* buffer mode idx */ + /* cur xfer msgs index*/ + int msgs_index; + int msgs_count; /* total msgs */ + u8 *master_safe_buf; + dma_addr_t master_dma_addr; + /*total xfer count */ + int master_xfer_cnt; + /* Buffer mode */ + void __iomem *buf_base; + size_t buf_size; + /* Slave structure */ + int slave_xfer_len; + int slave_xfer_cnt; +#ifdef CONFIG_I2C_SLAVE + unsigned char *slave_dma_buf; + dma_addr_t slave_dma_addr; + struct i2c_client *slave; +#endif +}; + +static u32 ast2600_select_i2c_clock(struct ast2600_i2c_bus *i2c_bus) +{ + unsigned long base_clk1; + unsigned long base_clk2; + unsigned long base_clk3; + unsigned long base_clk4; + int baseclk_idx; + u32 clk_div_reg; + u32 scl_low; + u32 scl_high; + int divisor; + int inc = 0; + u32 data; + int i; + + if (i2c_bus->clk_div_mode) { + regmap_read(i2c_bus->global_reg, AST2600_I2CG_CLK_DIV_CTRL, &clk_div_reg); + base_clk1 = (i2c_bus->apb_clk * 10) / ((((clk_div_reg & 0xff) + 2) * 10) / 2); + base_clk2 = (i2c_bus->apb_clk * 10) / + (((((clk_div_reg >> 8) & 0xff) + 2) * 10) / 2); + base_clk3 = (i2c_bus->apb_clk * 10) / + (((((clk_div_reg >> 16) & 0xff) + 2) * 10) / 2); + base_clk4 = (i2c_bus->apb_clk * 10) / + (((((clk_div_reg >> 24) & 0xff) + 2) * 10) / 2); + + if ((i2c_bus->apb_clk / i2c_bus->bus_frequency) <= 32) { + baseclk_idx = 0; + divisor = DIV_ROUND_UP(i2c_bus->apb_clk, i2c_bus->bus_frequency); + } else if ((base_clk1 / i2c_bus->bus_frequency) <= 32) { + baseclk_idx = 1; + divisor = DIV_ROUND_UP(base_clk1, i2c_bus->bus_frequency); + } else if ((base_clk2 / i2c_bus->bus_frequency) <= 32) { + baseclk_idx = 2; + divisor = DIV_ROUND_UP(base_clk2, i2c_bus->bus_frequency); + } else if ((base_clk3 / i2c_bus->bus_frequency) <= 32) { + baseclk_idx = 3; + divisor = DIV_ROUND_UP(base_clk3, i2c_bus->bus_frequency); + } else { + baseclk_idx = 4; + divisor = DIV_ROUND_UP(base_clk4, i2c_bus->bus_frequency); + inc = 0; + while ((divisor + inc) > 32) { + inc |= divisor & 0x1; + divisor >>= 1; + baseclk_idx++; + } + divisor += inc; + } + divisor = min_t(int, divisor, 32); + baseclk_idx &= 0xf; + scl_low = ((divisor * 9) / 16) - 1; + scl_low = min_t(u32, scl_low, 0xf); + scl_high = (divisor - scl_low - 2) & 0xf; + /* Divisor : Base Clock : tCKHighMin : tCK High : tCK Low */ + data = ((scl_high - 1) << 20) | (scl_high << 16) | (scl_low << 12) | (baseclk_idx); + if (i2c_bus->timeout_enable) { + data |= AST2600_I2CC_TOUTBASECLK(AST_I2C_TIMEOUT_CLK); + data |= AST2600_I2CC_TTIMEOUT(AST_I2C_TIMEOUT_COUNT); + } + } else { + for (i = 0; i < ARRAY_SIZE(i2c_legacy_timing_table); i++) { + if ((i2c_bus->apb_clk / i2c_legacy_timing_table[i].divisor) < + i2c_bus->bus_frequency) { + break; + } + } + data = i2c_legacy_timing_table[i].timing; + } + return data; +} + +static u8 ast2600_i2c_recover_bus(struct ast2600_i2c_bus *i2c_bus) +{ + int ret = 0; + u32 ctrl; + u32 state; + int r; + + dev_dbg(i2c_bus->dev, "%d-bus recovery bus [%x]\n", i2c_bus->adap.nr, + readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF)); + + ctrl = readl(i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + + writel(ctrl & ~(AST2600_I2CC_MASTER_EN | AST2600_I2CC_SLAVE_EN), + i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + + writel(readl(i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL) | AST2600_I2CC_MASTER_EN, + i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + + reinit_completion(&i2c_bus->cmd_complete); + i2c_bus->cmd_err = 0; + + //Check 0x14's SDA and SCL status + state = readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF); + if (!(state & AST2600_I2CC_SDA_LINE_STS) && (state & AST2600_I2CC_SCL_LINE_STS)) { + writel(AST2600_I2CM_RECOVER_CMD_EN, i2c_bus->reg_base + AST2600_I2CM_CMD_STS); + r = wait_for_completion_timeout(&i2c_bus->cmd_complete, i2c_bus->adap.timeout); + if (r == 0) { + dev_dbg(i2c_bus->dev, "recovery timed out\n"); + ret = -ETIMEDOUT; + } else { + if (i2c_bus->cmd_err) { + dev_dbg(i2c_bus->dev, "recovery error\n"); + ret = -EPROTO; + } + } + } + + dev_dbg(i2c_bus->dev, "Recovery done [%x]\n", + readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF)); + if (readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF) & AST2600_I2CC_BUS_BUSY_STS) { + dev_dbg(i2c_bus->dev, "Can't recovery bus [%x]\n", + readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF)); + } + + writel(ctrl, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + return ret; +} + +#ifdef CONFIG_I2C_SLAVE +static void ast2600_i2c_slave_packet_dma_irq(struct ast2600_i2c_bus *i2c_bus, u32 sts) +{ + int slave_rx_len; + u32 cmd = 0; + u8 value; + int i = 0; + + sts &= ~(AST2600_I2CS_SLAVE_PENDING); + /* Handle i2c slave timeout condition */ + if (AST2600_I2CS_INACTIVE_TO & sts) { + cmd = SLAVE_TRIGGER_CMD; + cmd |= AST2600_I2CS_RX_DMA_EN; + writel(AST2600_I2CS_SET_RX_DMA_LEN(I2C_SLAVE_MSG_BUF_SIZE), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + writel(cmd, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + return; + } + + sts &= ~(AST2600_I2CS_PKT_DONE | AST2600_I2CS_PKT_ERROR); + + switch (sts) { + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE | AST2600_I2CS_WAIT_RX_DMA: + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_WAIT_RX_DMA: + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_REQUESTED, &value); + slave_rx_len = AST2600_I2C_GET_RX_DMA_LEN(readl(i2c_bus->reg_base + + AST2600_I2CS_DMA_LEN_STS)); + for (i = 0; i < slave_rx_len; i++) { + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, + &i2c_bus->slave_dma_buf[i]); + } + writel(AST2600_I2CS_SET_RX_DMA_LEN(I2C_SLAVE_MSG_BUF_SIZE), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_RX_DMA_EN; + break; + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_STOP: + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + writel(AST2600_I2CS_SET_RX_DMA_LEN(I2C_SLAVE_MSG_BUF_SIZE), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_RX_DMA_EN; + break; + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE_NAK | + AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_WAIT_RX_DMA | + AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + case AST2600_I2CS_RX_DONE_NAK | AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + case AST2600_I2CS_RX_DONE | AST2600_I2CS_WAIT_RX_DMA | AST2600_I2CS_STOP: + case AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + case AST2600_I2CS_RX_DONE | AST2600_I2CS_WAIT_RX_DMA: + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + if (sts & AST2600_I2CS_SLAVE_MATCH) + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_REQUESTED, &value); + + slave_rx_len = AST2600_I2C_GET_RX_DMA_LEN(readl(i2c_bus->reg_base + + AST2600_I2CS_DMA_LEN_STS)); + for (i = 0; i < slave_rx_len; i++) { + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, + &i2c_bus->slave_dma_buf[i]); + } + writel(AST2600_I2CS_SET_RX_DMA_LEN(I2C_SLAVE_MSG_BUF_SIZE), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + if (sts & AST2600_I2CS_STOP) + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_RX_DMA_EN; + break; + + /* it is Mw data Mr coming -> it need send tx */ + case AST2600_I2CS_RX_DONE | AST2600_I2CS_WAIT_TX_DMA: + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE | AST2600_I2CS_WAIT_TX_DMA: + /* it should be repeat start read */ + if (sts & AST2600_I2CS_SLAVE_MATCH) + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_REQUESTED, &value); + + slave_rx_len = AST2600_I2C_GET_RX_DMA_LEN(readl(i2c_bus->reg_base + + AST2600_I2CS_DMA_LEN_STS)); + for (i = 0; i < slave_rx_len; i++) { + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, + &i2c_bus->slave_dma_buf[i]); + } + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_READ_REQUESTED, + &i2c_bus->slave_dma_buf[0]); + writel(0, i2c_bus->reg_base + AST2600_I2CS_DMA_LEN_STS); + writel(AST2600_I2CS_SET_TX_DMA_LEN(1), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_TX_DMA_EN; + break; + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_WAIT_TX_DMA: + /* First Start read */ + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_READ_REQUESTED, + &i2c_bus->slave_dma_buf[0]); + writel(AST2600_I2CS_SET_TX_DMA_LEN(1), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_TX_DMA_EN; + break; + case AST2600_I2CS_WAIT_TX_DMA: + /* it should be next start read */ + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_READ_PROCESSED, + &i2c_bus->slave_dma_buf[0]); + writel(0, i2c_bus->reg_base + AST2600_I2CS_DMA_LEN_STS); + writel(AST2600_I2CS_SET_TX_DMA_LEN(1), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_TX_DMA_EN; + break; + + case AST2600_I2CS_TX_NAK | AST2600_I2CS_STOP: + /* it just tx complete */ + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + writel(0, i2c_bus->reg_base + AST2600_I2CS_DMA_LEN_STS); + writel(AST2600_I2CS_SET_RX_DMA_LEN(I2C_SLAVE_MSG_BUF_SIZE), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_RX_DMA_EN; + break; + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE: + cmd = 0; + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_REQUESTED, &value); + break; + case AST2600_I2CS_STOP: + cmd = 0; + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + break; + default: + dev_dbg(i2c_bus->dev, "todo slave isr case %x, sts %x\n", sts, + readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF)); + break; + } + + if (cmd) + writel(cmd, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + writel(AST2600_I2CS_PKT_DONE, i2c_bus->reg_base + AST2600_I2CS_ISR); + readl(i2c_bus->reg_base + AST2600_I2CS_ISR); + dev_dbg(i2c_bus->dev, "cmd %x\n", cmd); +} + +static void ast2600_i2c_slave_packet_buff_irq(struct ast2600_i2c_bus *i2c_bus, u32 sts) +{ + int slave_rx_len = 0; + u32 cmd = 0; + u8 value; + int i = 0; + + /* master and slave use common buffer, need force the master stop */ + if (readl(i2c_bus->reg_base + AST2600_I2CM_CMD_STS) & 0xffff) { + writel(0, i2c_bus->reg_base + AST2600_I2CM_CMD_STS); + i2c_bus->cmd_err = -EBUSY; + writel(0, i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + complete(&i2c_bus->cmd_complete); + } + + /* Handle i2c slave timeout condition */ + if (AST2600_I2CS_INACTIVE_TO & sts) { + writel(SLAVE_TRIGGER_CMD, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + i2c_bus->slave_operate = 0; + return; + } + + sts &= ~(AST2600_I2CS_PKT_DONE | AST2600_I2CS_PKT_ERROR); + + if (sts & AST2600_I2CS_SLAVE_MATCH) + i2c_bus->slave_operate = 1; + + switch (sts) { + case AST2600_I2CS_SLAVE_PENDING | AST2600_I2CS_WAIT_RX_DMA | + AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + case AST2600_I2CS_SLAVE_PENDING | + AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + case AST2600_I2CS_SLAVE_PENDING | + AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_STOP: + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + fallthrough; + case AST2600_I2CS_SLAVE_PENDING | + AST2600_I2CS_WAIT_RX_DMA | AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE: + case AST2600_I2CS_WAIT_RX_DMA | AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE: + case AST2600_I2CS_WAIT_RX_DMA | AST2600_I2CS_SLAVE_MATCH: + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_REQUESTED, &value); + cmd = SLAVE_TRIGGER_CMD; + if (sts & AST2600_I2CS_RX_DONE) { + slave_rx_len = AST2600_I2CC_GET_RX_BUF_LEN(readl(i2c_bus->reg_base + + AST2600_I2CC_BUFF_CTRL)); + for (i = 0; i < slave_rx_len; i++) { + value = readb(i2c_bus->buf_base + 0x10 + i); + dev_dbg(i2c_bus->dev, "%02x ", value); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, &value); + } + } + if (readl(i2c_bus->reg_base + AST2600_I2CS_CMD_STS) & AST2600_I2CS_RX_BUFF_EN) + cmd = 0; + else + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_RX_BUFF_EN; + + writel(AST2600_I2CC_SET_RX_BUF_LEN(i2c_bus->buf_size), + i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + break; + case AST2600_I2CS_WAIT_RX_DMA | AST2600_I2CS_RX_DONE: + cmd = SLAVE_TRIGGER_CMD; + slave_rx_len = AST2600_I2CC_GET_RX_BUF_LEN(readl(i2c_bus->reg_base + + AST2600_I2CC_BUFF_CTRL)); + for (i = 0; i < slave_rx_len; i++) { + value = readb(i2c_bus->buf_base + 0x10 + i); + dev_dbg(i2c_bus->dev, "%02x ", value); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, &value); + } + cmd |= AST2600_I2CS_RX_BUFF_EN; + writel(AST2600_I2CC_SET_RX_BUF_LEN(i2c_bus->buf_size), + i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + break; + case AST2600_I2CS_SLAVE_PENDING | AST2600_I2CS_WAIT_RX_DMA | + AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + cmd = SLAVE_TRIGGER_CMD; + slave_rx_len = AST2600_I2CC_GET_RX_BUF_LEN(readl(i2c_bus->reg_base + + AST2600_I2CC_BUFF_CTRL)); + for (i = 0; i < slave_rx_len; i++) { + value = readb(i2c_bus->buf_base + 0x10 + i); + dev_dbg(i2c_bus->dev, "%02x ", value); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, &value); + } + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + cmd |= AST2600_I2CS_RX_BUFF_EN; + writel(AST2600_I2CC_SET_RX_BUF_LEN(i2c_bus->buf_size), + i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + break; + + case AST2600_I2CS_SLAVE_PENDING | AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + cmd = SLAVE_TRIGGER_CMD; + slave_rx_len = AST2600_I2CC_GET_RX_BUF_LEN(readl(i2c_bus->reg_base + + AST2600_I2CC_BUFF_CTRL)); + for (i = 0; i < slave_rx_len; i++) { + value = readb(i2c_bus->buf_base + 0x10 + i); + dev_dbg(i2c_bus->dev, "%02x ", value); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, &value); + } + writel(BIT(0), i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + break; + + case AST2600_I2CS_RX_DONE | AST2600_I2CS_STOP: + cmd = SLAVE_TRIGGER_CMD; + slave_rx_len = AST2600_I2CC_GET_RX_BUF_LEN(readl(i2c_bus->reg_base + + AST2600_I2CC_BUFF_CTRL)); + for (i = 0; i < slave_rx_len; i++) { + value = readb(i2c_bus->buf_base + 0x10 + i); + dev_dbg(i2c_bus->dev, "%02x ", value); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, &value); + } + writel(BIT(0), i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + break; + case AST2600_I2CS_WAIT_TX_DMA | AST2600_I2CS_SLAVE_MATCH: + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_READ_REQUESTED, &value); + dev_dbg(i2c_bus->dev, "tx : %02x ", value); + writeb(value, i2c_bus->buf_base); + writel(AST2600_I2CC_SET_TX_BUF_LEN(1), + i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_TX_BUFF_EN; + break; + case AST2600_I2CS_WAIT_TX_DMA | AST2600_I2CS_RX_DONE: + case AST2600_I2CS_WAIT_TX_DMA: + if (sts & AST2600_I2CS_RX_DONE) { + slave_rx_len = AST2600_I2CC_GET_RX_BUF_LEN(readl(i2c_bus->reg_base + + AST2600_I2CC_BUFF_CTRL)); + for (i = 0; i < slave_rx_len; i++) { + value = readb(i2c_bus->buf_base + 0x10 + i); + dev_dbg(i2c_bus->dev, "%02x ", value); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, &value); + } + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_READ_REQUESTED, &value); + } else { + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_READ_PROCESSED, &value); + } + dev_dbg(i2c_bus->dev, "tx : %02x ", value); + writeb(value, i2c_bus->buf_base); + writel(AST2600_I2CC_SET_TX_BUF_LEN(1), + i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_TX_BUFF_EN; + break; + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE: + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_REQUESTED, &value); + cmd = SLAVE_TRIGGER_CMD | AST2600_I2CS_RX_BUFF_EN; + writel(cmd, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + break; + + case AST2600_I2CS_TX_NAK | AST2600_I2CS_STOP: + case AST2600_I2CS_STOP: + cmd = SLAVE_TRIGGER_CMD; + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + break; + default: + dev_dbg(i2c_bus->dev, "todo slave isr case %x, sts %x\n", sts, + readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF)); + break; + } + + if (cmd) + writel(cmd, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + writel(AST2600_I2CS_PKT_DONE, i2c_bus->reg_base + AST2600_I2CS_ISR); + readl(i2c_bus->reg_base + AST2600_I2CS_ISR); + + if ((sts & AST2600_I2CS_STOP) && !(sts & AST2600_I2CS_SLAVE_PENDING)) + i2c_bus->slave_operate = 0; + + dev_dbg(i2c_bus->dev, "slave_rx_len %d, cmd %x\n", slave_rx_len, cmd); +} + +static void ast2600_i2c_slave_byte_irq(struct ast2600_i2c_bus *i2c_bus, u32 sts) +{ + u32 i2c_buff = readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF); + u32 cmd = AST2600_I2CS_ACTIVE_ALL; + u8 byte_data; + u8 value; + + switch (sts) { + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE | AST2600_I2CS_WAIT_RX_DMA: + dev_dbg(i2c_bus->dev, "S : Sw|D\n"); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_REQUESTED, &value); + /* first address match is address */ + byte_data = AST2600_I2CC_GET_RX_BUFF(i2c_buff); + dev_dbg(i2c_bus->dev, "addr [%x]", byte_data); + break; + case AST2600_I2CS_RX_DONE | AST2600_I2CS_WAIT_RX_DMA: + dev_dbg(i2c_bus->dev, "S : D\n"); + byte_data = AST2600_I2CC_GET_RX_BUFF(i2c_buff); + dev_dbg(i2c_bus->dev, "rx [%x]", byte_data); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_WRITE_RECEIVED, &byte_data); + break; + case AST2600_I2CS_SLAVE_MATCH | AST2600_I2CS_RX_DONE | AST2600_I2CS_WAIT_TX_DMA: + cmd |= AST2600_I2CS_TX_CMD; + dev_dbg(i2c_bus->dev, "S : Sr|D\n"); + byte_data = AST2600_I2CC_GET_RX_BUFF(i2c_buff); + dev_dbg(i2c_bus->dev, "addr : [%02x]", byte_data); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_READ_REQUESTED, &byte_data); + dev_dbg(i2c_bus->dev, "tx: [%02x]\n", byte_data); + writel(byte_data, i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF); + break; + case AST2600_I2CS_TX_ACK | AST2600_I2CS_WAIT_TX_DMA: + cmd |= AST2600_I2CS_TX_CMD; + dev_dbg(i2c_bus->dev, "S : D\n"); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_READ_PROCESSED, &byte_data); + dev_dbg(i2c_bus->dev, "tx: [%02x]\n", byte_data); + writel(byte_data, i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF); + break; + case AST2600_I2CS_STOP: + case AST2600_I2CS_STOP | AST2600_I2CS_TX_NAK: + dev_dbg(i2c_bus->dev, "S : P\n"); + i2c_slave_event(i2c_bus->slave, I2C_SLAVE_STOP, &value); + break; + default: + dev_dbg(i2c_bus->dev, "todo no pkt isr %x\n", sts); + break; + } + writel(cmd, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + writel(sts, i2c_bus->reg_base + AST2600_I2CS_ISR); + readl(i2c_bus->reg_base + AST2600_I2CS_ISR); +} + +static int ast2600_i2c_slave_irq(struct ast2600_i2c_bus *i2c_bus) +{ + u32 ier = readl(i2c_bus->reg_base + AST2600_I2CS_IER); + u32 isr = readl(i2c_bus->reg_base + AST2600_I2CS_ISR); + + if (!(isr & ier)) + return 0; + + /* Slave interrupt coming after Master package done + * So need handle master first. + */ + if (readl(i2c_bus->reg_base + AST2600_I2CM_ISR) & AST2600_I2CM_PKT_DONE) + return 0; + + dev_dbg(i2c_bus->dev, "isr %x\n", isr); + + isr &= ~(AST2600_I2CS_ADDR_INDICATE_MASK); + + if (AST2600_I2CS_ADDR1_NAK & isr) + isr &= ~AST2600_I2CS_ADDR1_NAK; + + if (AST2600_I2CS_ADDR2_NAK & isr) + isr &= ~AST2600_I2CS_ADDR2_NAK; + + if (AST2600_I2CS_ADDR3_NAK & isr) + isr &= ~AST2600_I2CS_ADDR3_NAK; + + if (AST2600_I2CS_ADDR_MASK & isr) + isr &= ~AST2600_I2CS_ADDR_MASK; + + if (AST2600_I2CS_PKT_DONE & isr) { + if (i2c_bus->mode == DMA_MODE) + ast2600_i2c_slave_packet_dma_irq(i2c_bus, isr); + else + ast2600_i2c_slave_packet_buff_irq(i2c_bus, isr); + } else + ast2600_i2c_slave_byte_irq(i2c_bus, isr); + + return 1; +} +#endif + +static int ast2600_i2c_do_start(struct ast2600_i2c_bus *i2c_bus) +{ + struct i2c_msg *msg = &i2c_bus->msgs[i2c_bus->msgs_index]; + int xfer_len = 0; + int i = 0; + u32 cmd; + + cmd = AST2600_I2CM_PKT_EN | AST2600_I2CM_PKT_ADDR(msg->addr) | AST2600_I2CM_START_CMD; + + dev_dbg(i2c_bus->dev, "[%d] %sing %d byte%s %s 0x%02x\n", + i2c_bus->msgs_index, msg->flags & I2C_M_RD ? "read" : "write", + msg->len, msg->len > 1 ? "s" : "", + msg->flags & I2C_M_RD ? "from" : "to", msg->addr); + + i2c_bus->master_xfer_cnt = 0; + i2c_bus->buf_index = 0; + + if (msg->flags & I2C_M_RD) { + cmd |= AST2600_I2CM_RX_CMD; + if (i2c_bus->mode == DMA_MODE) { + cmd |= AST2600_I2CM_RX_DMA_EN; + + if (msg->flags & I2C_M_RECV_LEN) { + dev_dbg(i2c_bus->dev, "smbus read\n"); + xfer_len = 1; + } else { + if (msg->len > AST2600_I2C_DMA_SIZE) { + xfer_len = AST2600_I2C_DMA_SIZE; + } else { + xfer_len = msg->len; + if (i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) { + dev_dbg(i2c_bus->dev, "last stop\n"); + cmd |= MASTER_TRIGGER_LAST_STOP; + } + } + } + writel(AST2600_I2CM_SET_RX_DMA_LEN(xfer_len - 1), + i2c_bus->reg_base + AST2600_I2CM_DMA_LEN); + i2c_bus->master_safe_buf = i2c_get_dma_safe_msg_buf(msg, 1); + if (!i2c_bus->master_safe_buf) + return -ENOMEM; + i2c_bus->master_dma_addr = + dma_map_single(i2c_bus->dev, i2c_bus->master_safe_buf, + msg->len, DMA_FROM_DEVICE); + if (dma_mapping_error(i2c_bus->dev, i2c_bus->master_dma_addr)) { + i2c_put_dma_safe_msg_buf(i2c_bus->master_safe_buf, msg, false); + i2c_bus->master_safe_buf = NULL; + return -ENOMEM; + } + writel(i2c_bus->master_dma_addr, i2c_bus->reg_base + AST2600_I2CM_RX_DMA); + } else if (i2c_bus->mode == BUFF_MODE) { + cmd |= AST2600_I2CM_RX_BUFF_EN; + if (msg->flags & I2C_M_RECV_LEN) { + dev_dbg(i2c_bus->dev, "smbus read\n"); + xfer_len = 1; + } else { + if (msg->len > i2c_bus->buf_size) { + xfer_len = i2c_bus->buf_size; + } else { + xfer_len = msg->len; + if (i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) { + dev_dbg(i2c_bus->dev, "last stop\n"); + cmd |= MASTER_TRIGGER_LAST_STOP; + } + } + } + writel(AST2600_I2CC_SET_RX_BUF_LEN(xfer_len), + i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + } else { + xfer_len = 1; + if (msg->flags & I2C_M_RECV_LEN) { + dev_dbg(i2c_bus->dev, "smbus read\n"); + } else { + if (i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) { + if (msg->len == 1) { + dev_dbg(i2c_bus->dev, "last stop\n"); + cmd |= MASTER_TRIGGER_LAST_STOP; + } + } + } + } + } else { + if (i2c_bus->mode == DMA_MODE) { + if (msg->len > AST2600_I2C_DMA_SIZE) { + xfer_len = AST2600_I2C_DMA_SIZE; + } else { + if (i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) { + dev_dbg(i2c_bus->dev, "with stop\n"); + cmd |= AST2600_I2CM_STOP_CMD; + } + xfer_len = msg->len; + } + + if (xfer_len) { + cmd |= AST2600_I2CM_TX_DMA_EN | AST2600_I2CM_TX_CMD; + writel(AST2600_I2CM_SET_TX_DMA_LEN(xfer_len - 1), + i2c_bus->reg_base + AST2600_I2CM_DMA_LEN); + i2c_bus->master_safe_buf = i2c_get_dma_safe_msg_buf(msg, 1); + if (!i2c_bus->master_safe_buf) + return -ENOMEM; + i2c_bus->master_dma_addr = + dma_map_single(i2c_bus->dev, i2c_bus->master_safe_buf, + msg->len, DMA_TO_DEVICE); + if (dma_mapping_error(i2c_bus->dev, i2c_bus->master_dma_addr)) { + i2c_put_dma_safe_msg_buf(i2c_bus->master_safe_buf, + msg, false); + i2c_bus->master_safe_buf = NULL; + return -ENOMEM; + } + writel(i2c_bus->master_dma_addr, + i2c_bus->reg_base + AST2600_I2CM_TX_DMA); + } + } else if (i2c_bus->mode == BUFF_MODE) { + u8 wbuf[4]; + + if (msg->len > i2c_bus->buf_size) { + xfer_len = i2c_bus->buf_size; + } else { + if (i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) { + dev_dbg(i2c_bus->dev, "with stop\n"); + cmd |= AST2600_I2CM_STOP_CMD; + } + xfer_len = msg->len; + } + if (xfer_len) { + cmd |= AST2600_I2CM_TX_BUFF_EN | AST2600_I2CM_TX_CMD; + if (readl(i2c_bus->reg_base + AST2600_I2CS_ISR)) + return -ENOMEM; + writel(AST2600_I2CC_SET_TX_BUF_LEN(xfer_len), + i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + if (readl(i2c_bus->reg_base + AST2600_I2CS_ISR)) + return -ENOMEM; + for (i = 0; i < xfer_len; i++) { + wbuf[i % 4] = msg->buf[i]; + if (i % 4 == 3) + writel(*(u32 *)wbuf, i2c_bus->buf_base + i - 3); + dev_dbg(i2c_bus->dev, "[%02x]\n", msg->buf[i]); + } + if (--i % 4 != 3) + writel(*(u32 *)wbuf, i2c_bus->buf_base + i - (i % 4)); + } + if (readl(i2c_bus->reg_base + AST2600_I2CS_ISR)) + return -ENOMEM; + } else { + if ((i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) && (msg->len <= 1)) { + dev_dbg(i2c_bus->dev, "with stop\n"); + cmd |= AST2600_I2CM_STOP_CMD; + } + + if (msg->len) { + cmd |= AST2600_I2CM_TX_CMD; + xfer_len = 1; + dev_dbg(i2c_bus->dev, "w [0] : %02x\n", msg->buf[0]); + writel(msg->buf[0], i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF); + } else { + xfer_len = 0; + } + } + } + dev_dbg(i2c_bus->dev, "len %d , cmd %x\n", xfer_len, cmd); + writel(cmd, i2c_bus->reg_base + AST2600_I2CM_CMD_STS); + return 0; +} + +static int ast2600_i2c_is_irq_error(u32 irq_status) +{ + if (irq_status & AST2600_I2CM_ARBIT_LOSS) + return -EAGAIN; + if (irq_status & (AST2600_I2CM_SDA_DL_TO | AST2600_I2CM_SCL_LOW_TO)) + return -EBUSY; + if (irq_status & (AST2600_I2CM_ABNORMAL)) + return -EPROTO; + + return 0; +} + +static void ast2600_i2c_master_package_irq(struct ast2600_i2c_bus *i2c_bus, u32 sts) +{ + struct i2c_msg *msg = &i2c_bus->msgs[i2c_bus->msgs_index]; + u32 cmd = AST2600_I2CM_PKT_EN; + int xfer_len; + int i; + + sts &= ~AST2600_I2CM_PKT_DONE; + writel(AST2600_I2CM_PKT_DONE, i2c_bus->reg_base + AST2600_I2CM_ISR); + switch (sts) { + case AST2600_I2CM_PKT_ERROR: + dev_dbg(i2c_bus->dev, "M : ERROR only\n"); + i2c_bus->cmd_err = -EAGAIN; + complete(&i2c_bus->cmd_complete); + break; + case AST2600_I2CM_PKT_ERROR | AST2600_I2CM_TX_NAK: /* a0 fix for issue */ + fallthrough; + case AST2600_I2CM_PKT_ERROR | AST2600_I2CM_TX_NAK | AST2600_I2CM_NORMAL_STOP: + dev_dbg(i2c_bus->dev, "M : TX NAK | NORMAL STOP\n"); + i2c_bus->cmd_err = -ENXIO; + complete(&i2c_bus->cmd_complete); + break; + case AST2600_I2CM_NORMAL_STOP: + /* write 0 byte only have stop isr */ + dev_dbg(i2c_bus->dev, "M clear isr: AST2600_I2CM_NORMAL_STOP = %x\n", sts); + i2c_bus->msgs_index++; + if (i2c_bus->msgs_index < i2c_bus->msgs_count) { + if (ast2600_i2c_do_start(i2c_bus)) { + i2c_bus->cmd_err = -ENOMEM; + complete(&i2c_bus->cmd_complete); + } + } else { + i2c_bus->cmd_err = i2c_bus->msgs_index; + complete(&i2c_bus->cmd_complete); + } + break; + case AST2600_I2CM_TX_ACK: + case AST2600_I2CM_TX_ACK | AST2600_I2CM_NORMAL_STOP: + if (i2c_bus->mode == DMA_MODE) + xfer_len = AST2600_I2C_GET_TX_DMA_LEN(readl(i2c_bus->reg_base + + AST2600_I2CM_DMA_LEN_STS)); + else if (i2c_bus->mode == BUFF_MODE) + xfer_len = AST2600_I2CC_GET_TX_BUF_LEN(readl(i2c_bus->reg_base + + AST2600_I2CC_BUFF_CTRL)); + else + xfer_len = 1; + + dev_dbg(i2c_bus->dev, + "M : AST2600_I2CM_TX_ACK | AST2600_I2CM_NORMAL_STOP= %x (%d)\n", + sts, xfer_len); + i2c_bus->master_xfer_cnt += xfer_len; + + if (i2c_bus->master_xfer_cnt == msg->len) { + if (i2c_bus->mode == DMA_MODE) { + dma_unmap_single(i2c_bus->dev, i2c_bus->master_dma_addr, msg->len, + DMA_TO_DEVICE); + i2c_put_dma_safe_msg_buf(i2c_bus->master_safe_buf, msg, true); + i2c_bus->master_safe_buf = NULL; + } + i2c_bus->msgs_index++; + if (i2c_bus->msgs_index == i2c_bus->msgs_count) { + i2c_bus->cmd_err = i2c_bus->msgs_index; + complete(&i2c_bus->cmd_complete); + } else { + if (ast2600_i2c_do_start(i2c_bus)) { + i2c_bus->cmd_err = -ENOMEM; + complete(&i2c_bus->cmd_complete); + } + } + } else { + /* do next tx */ + cmd |= AST2600_I2CM_TX_CMD; + if (i2c_bus->mode == DMA_MODE) { + cmd |= AST2600_I2CM_TX_DMA_EN; + xfer_len = msg->len - i2c_bus->master_xfer_cnt; + if (xfer_len > AST2600_I2C_DMA_SIZE) { + xfer_len = AST2600_I2C_DMA_SIZE; + } else { + if (i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) { + dev_dbg(i2c_bus->dev, "M: STOP\n"); + cmd |= AST2600_I2CM_STOP_CMD; + } + } + writel(AST2600_I2CM_SET_TX_DMA_LEN(xfer_len - 1), + i2c_bus->reg_base + AST2600_I2CM_DMA_LEN); + dev_dbg(i2c_bus->dev, "next tx xfer_len: %d, offset %d\n", + xfer_len, i2c_bus->master_xfer_cnt); + writel(i2c_bus->master_dma_addr + i2c_bus->master_xfer_cnt, + i2c_bus->reg_base + AST2600_I2CM_TX_DMA); + } else if (i2c_bus->mode == BUFF_MODE) { + u8 wbuf[4]; + + cmd |= AST2600_I2CM_TX_BUFF_EN; + xfer_len = msg->len - i2c_bus->master_xfer_cnt; + if (xfer_len > i2c_bus->buf_size) { + xfer_len = i2c_bus->buf_size; + } else { + if (i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) { + dev_dbg(i2c_bus->dev, "M: STOP\n"); + cmd |= AST2600_I2CM_STOP_CMD; + } + } + for (i = 0; i < xfer_len; i++) { + wbuf[i % 4] = msg->buf[i2c_bus->master_xfer_cnt + i]; + if (i % 4 == 3) + writel(*(u32 *)wbuf, i2c_bus->buf_base + i - 3); + dev_dbg(i2c_bus->dev, "[%02x]\n", + msg->buf[i2c_bus->master_xfer_cnt + i]); + } + if (--i % 4 != 3) + writel(*(u32 *)wbuf, i2c_bus->buf_base + i - (i % 4)); + writel(AST2600_I2CC_SET_TX_BUF_LEN(xfer_len), + i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + } else { + if ((i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) && + ((i2c_bus->master_xfer_cnt + 1) == msg->len)) { + dev_dbg(i2c_bus->dev, "M: STOP\n"); + cmd |= AST2600_I2CM_STOP_CMD; + } + dev_dbg(i2c_bus->dev, "tx buff[%x]\n", + msg->buf[i2c_bus->master_xfer_cnt]); + writel(msg->buf[i2c_bus->master_xfer_cnt], + i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF); + } + dev_dbg(i2c_bus->dev, "next tx %d cmd: %x\n", xfer_len, cmd); + writel(cmd, i2c_bus->reg_base + AST2600_I2CM_CMD_STS); + } + break; + case AST2600_I2CM_RX_DONE: +#ifdef CONFIG_I2C_SLAVE + /* Workaround for master/slave package mode enable rx done stuck issue + * When master go for first read (RX_DONE), slave mode will also effect + * Then controller will send nack, not operate anymore. + */ + if (readl(i2c_bus->reg_base + AST2600_I2CS_CMD_STS) & AST2600_I2CS_PKT_MODE_EN) { + u32 slave_cmd = readl(i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + + writel(0, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + writel(slave_cmd, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + } + fallthrough; +#endif + case AST2600_I2CM_RX_DONE | AST2600_I2CM_NORMAL_STOP: + if (i2c_bus->mode == DMA_MODE) { + xfer_len = AST2600_I2C_GET_RX_DMA_LEN(readl(i2c_bus->reg_base + + AST2600_I2CM_DMA_LEN_STS)); + } else if (i2c_bus->mode == BUFF_MODE) { + xfer_len = AST2600_I2CC_GET_RX_BUF_LEN( + readl(i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL)); + for (i = 0; i < xfer_len; i++) + msg->buf[i2c_bus->master_xfer_cnt + i] = + readb(i2c_bus->buf_base + 0x10 + i); + } else { + xfer_len = 1; + msg->buf[i2c_bus->master_xfer_cnt] = + AST2600_I2CC_GET_RX_BUFF(readl(i2c_bus->reg_base + + AST2600_I2CC_STS_AND_BUFF)); + } + + dev_dbg(i2c_bus->dev, + "M : AST2600_I2CM_RX_DONE | AST2600_I2CM_NORMAL_STOP = %x (%d)\n", + sts, xfer_len); + + if (msg->flags & I2C_M_RECV_LEN) { + dev_dbg(i2c_bus->dev, "smbus first len = %x\n", msg->buf[0]); + msg->len = msg->buf[0] + ((msg->flags & I2C_CLIENT_PEC) ? 2 : 1); + msg->flags &= ~I2C_M_RECV_LEN; + } + i2c_bus->master_xfer_cnt += xfer_len; + dev_dbg(i2c_bus->dev, "master_xfer_cnt [%d/%d]\n", i2c_bus->master_xfer_cnt, + msg->len); + + if (i2c_bus->master_xfer_cnt == msg->len) { + if (i2c_bus->mode == DMA_MODE) { + dma_unmap_single(i2c_bus->dev, i2c_bus->master_dma_addr, msg->len, + DMA_FROM_DEVICE); + i2c_put_dma_safe_msg_buf(i2c_bus->master_safe_buf, msg, true); + i2c_bus->master_safe_buf = NULL; + } + + for (i = 0; i < msg->len; i++) + dev_dbg(i2c_bus->dev, "M: r %d:[%x]\n", i, msg->buf[i]); + i2c_bus->msgs_index++; + if (i2c_bus->msgs_index == i2c_bus->msgs_count) { + i2c_bus->cmd_err = i2c_bus->msgs_index; + complete(&i2c_bus->cmd_complete); + } else { + if (ast2600_i2c_do_start(i2c_bus)) { + i2c_bus->cmd_err = -ENOMEM; + complete(&i2c_bus->cmd_complete); + } + } + } else { + cmd |= AST2600_I2CM_RX_CMD; + if (i2c_bus->mode == DMA_MODE) { + cmd |= AST2600_I2CM_RX_DMA_EN; + xfer_len = msg->len - i2c_bus->master_xfer_cnt; + if (xfer_len > AST2600_I2C_DMA_SIZE) { + xfer_len = AST2600_I2C_DMA_SIZE; + } else { + if (i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) { + dev_dbg(i2c_bus->dev, "last stop\n"); + cmd |= MASTER_TRIGGER_LAST_STOP; + } + } + dev_dbg(i2c_bus->dev, "M: next rx len [%d/%d] , cmd %x\n", xfer_len, + msg->len, cmd); + writel(AST2600_I2CM_SET_RX_DMA_LEN(xfer_len - 1), + i2c_bus->reg_base + AST2600_I2CM_DMA_LEN); + writel(i2c_bus->master_dma_addr + i2c_bus->master_xfer_cnt, + i2c_bus->reg_base + AST2600_I2CM_RX_DMA); + } else if (i2c_bus->mode == BUFF_MODE) { + cmd |= AST2600_I2CM_RX_BUFF_EN; + xfer_len = msg->len - i2c_bus->master_xfer_cnt; + if (xfer_len > i2c_bus->buf_size) { + xfer_len = i2c_bus->buf_size; + } else { + if (i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) { + dev_dbg(i2c_bus->dev, "last stop\n"); + cmd |= MASTER_TRIGGER_LAST_STOP; + } + } + writel(AST2600_I2CC_SET_RX_BUF_LEN(xfer_len), + i2c_bus->reg_base + AST2600_I2CC_BUFF_CTRL); + } else { + if ((i2c_bus->msgs_index + 1 == i2c_bus->msgs_count) && + ((i2c_bus->master_xfer_cnt + 1) == msg->len)) { + dev_dbg(i2c_bus->dev, "last stop\n"); + cmd |= MASTER_TRIGGER_LAST_STOP; + } + } + dev_dbg(i2c_bus->dev, "M: next rx len %d, cmd %x\n", xfer_len, cmd); + writel(cmd, i2c_bus->reg_base + AST2600_I2CM_CMD_STS); + } + break; + default: + dev_dbg(i2c_bus->dev, "todo care sts %x\n", sts); + break; + } +} + +static int ast2600_i2c_master_irq(struct ast2600_i2c_bus *i2c_bus) +{ + u32 sts = readl(i2c_bus->reg_base + AST2600_I2CM_ISR); + u32 ier = readl(i2c_bus->reg_base + AST2600_I2CM_IER); + u32 ctrl = 0; + + dev_dbg(i2c_bus->dev, "M sts %x\n", sts); + if (!i2c_bus->alert_enable) + sts &= ~AST2600_I2CM_SMBUS_ALT; + + if (AST2600_I2CM_BUS_RECOVER_FAIL & sts) { + dev_dbg(i2c_bus->dev, "M clear isr: AST2600_I2CM_BUS_RECOVER_FAIL= %x\n", sts); + writel(AST2600_I2CM_BUS_RECOVER_FAIL, i2c_bus->reg_base + AST2600_I2CM_ISR); + ctrl = readl(i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + writel(0, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + writel(ctrl, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + i2c_bus->cmd_err = -EPROTO; + complete(&i2c_bus->cmd_complete); + return 1; + } + + if (AST2600_I2CM_BUS_RECOVER & sts) { + dev_dbg(i2c_bus->dev, "M clear isr: AST2600_I2CM_BUS_RECOVER= %x\n", sts); + writel(AST2600_I2CM_BUS_RECOVER, i2c_bus->reg_base + AST2600_I2CM_ISR); + i2c_bus->cmd_err = 0; + complete(&i2c_bus->cmd_complete); + return 1; + } + + if (AST2600_I2CM_SMBUS_ALT & sts) { + if (ier & AST2600_I2CM_SMBUS_ALT) { + dev_dbg(i2c_bus->dev, "M clear isr: AST2600_I2CM_SMBUS_ALT= %x\n", sts); + /* Disable ALT INT */ + writel(ier & ~AST2600_I2CM_SMBUS_ALT, i2c_bus->reg_base + AST2600_I2CM_IER); + i2c_handle_smbus_alert(i2c_bus->ara); + writel(AST2600_I2CM_SMBUS_ALT, i2c_bus->reg_base + AST2600_I2CM_ISR); + dev_err(i2c_bus->dev, + "ast2600_master_alert_recv bus id %d, Disable Alt, Please Imple\n", + i2c_bus->adap.nr); + return 1; + } + } + + i2c_bus->cmd_err = ast2600_i2c_is_irq_error(sts); + if (i2c_bus->cmd_err) { + dev_dbg(i2c_bus->dev, "received error interrupt: 0x%02x\n", sts); + writel(AST2600_I2CM_PKT_DONE, i2c_bus->reg_base + AST2600_I2CM_ISR); + complete(&i2c_bus->cmd_complete); + return 1; + } + + if (AST2600_I2CM_PKT_DONE & sts) { + ast2600_i2c_master_package_irq(i2c_bus, sts); + return 1; + } + + if (readl(i2c_bus->reg_base + AST2600_I2CM_ISR)) { + dev_dbg(i2c_bus->dev, "master TODO care sts %x\n", + readl(i2c_bus->reg_base + AST2600_I2CM_ISR)); + writel(readl(i2c_bus->reg_base + AST2600_I2CM_ISR), + i2c_bus->reg_base + AST2600_I2CM_ISR); + } + + return 0; +} + +static irqreturn_t ast2600_i2c_bus_irq(int irq, void *dev_id) +{ + struct ast2600_i2c_bus *i2c_bus = dev_id; + +#ifdef CONFIG_I2C_SLAVE + if (readl(i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL) & AST2600_I2CC_SLAVE_EN) { + if (ast2600_i2c_slave_irq(i2c_bus)) + return IRQ_HANDLED; + } +#endif + return ast2600_i2c_master_irq(i2c_bus) ? IRQ_HANDLED : IRQ_NONE; +} + +static int ast2600_i2c_master_xfer(struct i2c_adapter *adap, + struct i2c_msg *msgs, int num) +{ + struct ast2600_i2c_bus *i2c_bus = i2c_get_adapdata(adap); + unsigned long timeout; + int ret = 0; + + /* If bus is busy in a single master environment, attempt recovery. */ + if (!i2c_bus->multi_master && + (readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF) & AST2600_I2CC_BUS_BUSY_STS)) { + int ret; + + ret = ast2600_i2c_recover_bus(i2c_bus); + if (ret) + return ret; + } + +#ifdef CONFIG_I2C_SLAVE + if (i2c_bus->mode == BUFF_MODE) { + if (i2c_bus->slave_operate) + return -EBUSY; + writel(0, i2c_bus->reg_base + AST2600_I2CS_IER); + if (readl(i2c_bus->reg_base + AST2600_I2CS_ISR) || (i2c_bus->slave_operate)) { + writel(AST2600_I2CS_PKT_DONE, i2c_bus->reg_base + AST2600_I2CS_IER); + return -EBUSY; + } + } +#endif + + i2c_bus->cmd_err = 0; + i2c_bus->msgs = msgs; + i2c_bus->msgs_index = 0; + i2c_bus->msgs_count = num; + reinit_completion(&i2c_bus->cmd_complete); + ret = ast2600_i2c_do_start(i2c_bus); +#ifdef CONFIG_I2C_SLAVE + if (i2c_bus->mode == BUFF_MODE) + writel(AST2600_I2CS_PKT_DONE, i2c_bus->reg_base + AST2600_I2CS_IER); +#endif + if (ret) + goto master_out; + timeout = wait_for_completion_timeout(&i2c_bus->cmd_complete, i2c_bus->adap.timeout); + if (timeout == 0) { + u32 isr = readl(i2c_bus->reg_base + AST2600_I2CM_ISR); + u32 i2c_status = readl(i2c_bus->reg_base + AST2600_I2CC_STS_AND_BUFF); + + dev_dbg(i2c_bus->dev, "timeout isr[%x], sts[%x]\n", isr, i2c_status); + if (isr || (i2c_status & AST2600_I2CC_TX_DIR_MASK)) { + u32 ctrl = readl(i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + + writel(0, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + writel(ctrl, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); +#ifdef CONFIG_I2C_SLAVE + if (ctrl & AST2600_I2CC_SLAVE_EN) { + u32 cmd = SLAVE_TRIGGER_CMD; + + if (i2c_bus->mode == DMA_MODE) { + cmd |= AST2600_I2CS_RX_DMA_EN; + writel(i2c_bus->slave_dma_addr, + i2c_bus->reg_base + AST2600_I2CS_RX_DMA); + writel(i2c_bus->slave_dma_addr, + i2c_bus->reg_base + AST2600_I2CS_TX_DMA); + writel(AST2600_I2CS_SET_RX_DMA_LEN(I2C_SLAVE_MSG_BUF_SIZE), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + } else if (i2c_bus->mode == BUFF_MODE) { + cmd = SLAVE_TRIGGER_CMD; + } else { + cmd &= ~AST2600_I2CS_PKT_MODE_EN; + } + dev_dbg(i2c_bus->dev, "slave trigger [%x]\n", cmd); + writel(cmd, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + } +#endif + } + ret = -ETIMEDOUT; + } else { + ret = i2c_bus->cmd_err; + } + + dev_dbg(i2c_bus->dev, "bus%d-m: %d end\n", i2c_bus->adap.nr, i2c_bus->cmd_err); + +master_out: + if (i2c_bus->mode == DMA_MODE) { + kfree(i2c_bus->master_safe_buf); + i2c_bus->master_safe_buf = NULL; + } + + return ret; +} + +static void ast2600_i2c_init(struct ast2600_i2c_bus *i2c_bus) +{ + struct platform_device *pdev = to_platform_device(i2c_bus->dev); + u32 fun_ctrl = AST2600_I2CC_BUS_AUTO_RELEASE | AST2600_I2CC_MASTER_EN; + + /* I2C Reset */ + writel(0, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + + if (of_property_read_bool(pdev->dev.of_node, "multi-master")) + i2c_bus->multi_master = true; + else + fun_ctrl |= AST2600_I2CC_MULTI_MASTER_DIS; + + /* Enable Master Mode */ + writel(fun_ctrl, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + /* disable slave address */ + writel(0, i2c_bus->reg_base + AST2600_I2CS_ADDR_CTRL); + + /* Set AC Timing */ + writel(ast2600_select_i2c_clock(i2c_bus), i2c_bus->reg_base + AST2600_I2CC_AC_TIMING); + + /* Clear Interrupt */ + writel(0xfffffff, i2c_bus->reg_base + AST2600_I2CM_ISR); + +#ifdef CONFIG_I2C_SLAVE + /* for memory buffer initial */ + if (i2c_bus->mode == DMA_MODE) { + i2c_bus->slave_dma_buf = dma_alloc_coherent(i2c_bus->dev, I2C_SLAVE_MSG_BUF_SIZE, + &i2c_bus->slave_dma_addr, GFP_KERNEL); + if (!i2c_bus->slave_dma_buf) + return; + } + + writel(0xfffffff, i2c_bus->reg_base + AST2600_I2CS_ISR); + + if (i2c_bus->mode == BYTE_MODE) { + writel(0xffff, i2c_bus->reg_base + AST2600_I2CS_IER); + } else { + /* Set interrupt generation of I2C slave controller */ + writel(AST2600_I2CS_PKT_DONE, i2c_bus->reg_base + AST2600_I2CS_IER); + } +#endif +} + +#ifdef CONFIG_I2C_SLAVE +static int ast2600_i2c_reg_slave(struct i2c_client *client) +{ + struct ast2600_i2c_bus *i2c_bus = i2c_get_adapdata(client->adapter); + u32 cmd = SLAVE_TRIGGER_CMD; + + if (i2c_bus->slave) + return -EINVAL; + + dev_dbg(i2c_bus->dev, "slave addr %x\n", client->addr); + + writel(0, i2c_bus->reg_base + AST2600_I2CS_ADDR_CTRL); + writel(AST2600_I2CC_SLAVE_EN | readl(i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL), + i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + + /* trigger rx buffer */ + if (i2c_bus->mode == DMA_MODE) { + cmd |= AST2600_I2CS_RX_DMA_EN; + writel(i2c_bus->slave_dma_addr, i2c_bus->reg_base + AST2600_I2CS_RX_DMA); + writel(i2c_bus->slave_dma_addr, i2c_bus->reg_base + AST2600_I2CS_TX_DMA); + writel(AST2600_I2CS_SET_RX_DMA_LEN(I2C_SLAVE_MSG_BUF_SIZE), + i2c_bus->reg_base + AST2600_I2CS_DMA_LEN); + } else if (i2c_bus->mode == BUFF_MODE) { + cmd = SLAVE_TRIGGER_CMD; + } else { + cmd &= ~AST2600_I2CS_PKT_MODE_EN; + } + + writel(cmd, i2c_bus->reg_base + AST2600_I2CS_CMD_STS); + i2c_bus->slave = client; + /* Set slave addr. */ + writel(client->addr | AST2600_I2CS_ADDR1_ENABLE, + i2c_bus->reg_base + AST2600_I2CS_ADDR_CTRL); + + return 0; +} + +static int ast2600_i2c_unreg_slave(struct i2c_client *slave) +{ + struct ast2600_i2c_bus *i2c_bus = i2c_get_adapdata(slave->adapter); + + WARN_ON(!i2c_bus->slave); + + /* Turn off slave mode. */ + writel(~AST2600_I2CC_SLAVE_EN & readl(i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL), + i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + writel(readl(i2c_bus->reg_base + AST2600_I2CS_ADDR_CTRL) & ~AST2600_I2CS_ADDR1_MASK, + i2c_bus->reg_base + AST2600_I2CS_ADDR_CTRL); + + i2c_bus->slave = NULL; + + return 0; +} +#endif + +static u32 ast2600_i2c_functionality(struct i2c_adapter *adap) +{ + return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_SMBUS_BLOCK_DATA; +} + +static const struct i2c_algorithm i2c_ast2600_algorithm = { + .master_xfer = ast2600_i2c_master_xfer, +#if IS_ENABLED(CONFIG_I2C_SLAVE) + .reg_slave = ast2600_i2c_reg_slave, + .unreg_slave = ast2600_i2c_unreg_slave, +#endif + .functionality = ast2600_i2c_functionality, +}; + +static const struct of_device_id ast2600_i2c_bus_of_table[] = { + { + .compatible = "aspeed,ast2600-i2c", + }, + {} +}; + +MODULE_DEVICE_TABLE(of, ast2600_i2c_bus_of_table); + +static int ast2600_i2c_probe(struct platform_device *pdev) +{ + struct ast2600_i2c_bus *i2c_bus; + const struct of_device_id *match; + struct resource *res; + u32 global_ctrl; + int ret = 0; + + i2c_bus = devm_kzalloc(&pdev->dev, sizeof(*i2c_bus), GFP_KERNEL); + if (!i2c_bus) + return -ENOMEM; + + i2c_bus->global_reg = syscon_regmap_lookup_by_compatible("aspeed,ast2600-i2c-global"); + if (IS_ERR(i2c_bus->global_reg)) { + dev_err(&pdev->dev, "failed to find ast2600 i2c global regmap\n"); + ret = -ENOMEM; + goto free_mem; + } + + regmap_read(i2c_bus->global_reg, AST2600_I2CG_CTRL, &global_ctrl); + + if (global_ctrl & AST2600_I2CG_CTRL_NEW_CLK_DIV) + i2c_bus->clk_div_mode = 1; + + if (!(global_ctrl & AST2600_I2CG_CTRL_NEW_REG)) { + ret = -ENOENT; + dev_err(&pdev->dev, "Expect I2CG0C[2] = 1 (new reg mode)\n"); + goto free_mem; + } + + i2c_bus->mode = DMA_MODE; + i2c_bus->slave_operate = 0; + + if (of_property_read_bool(pdev->dev.of_node, "byte-mode")) + i2c_bus->mode = BYTE_MODE; + + if (of_property_read_bool(pdev->dev.of_node, "buff-mode")) { + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (res && resource_size(res) >= 2) + i2c_bus->buf_base = devm_ioremap_resource(&pdev->dev, res); + + if (!IS_ERR_OR_NULL(i2c_bus->buf_base)) + i2c_bus->buf_size = resource_size(res) / 2; + + i2c_bus->mode = BUFF_MODE; + } + + if (of_property_read_bool(pdev->dev.of_node, "timeout")) + i2c_bus->timeout_enable = 1; + + i2c_bus->dev = &pdev->dev; + init_completion(&i2c_bus->cmd_complete); + + i2c_bus->reg_base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(i2c_bus->reg_base)) { + ret = PTR_ERR(i2c_bus->reg_base); + goto free_mem; + } + + i2c_bus->irq = irq_of_parse_and_map(pdev->dev.of_node, 0); + if (i2c_bus->irq < 0) { + dev_err(&pdev->dev, "no irq specified\n"); + ret = -i2c_bus->irq; + goto free_irq; + } + + match = of_match_node(ast2600_i2c_bus_of_table, pdev->dev.of_node); + if (!match) { + ret = -ENOENT; + goto free_irq; + } + + platform_set_drvdata(pdev, i2c_bus); + + i2c_bus->clk = devm_clk_get(i2c_bus->dev, NULL); + if (IS_ERR(i2c_bus->clk)) { + dev_err(i2c_bus->dev, "no clock defined\n"); + ret = -ENODEV; + goto free_irq; + } + i2c_bus->apb_clk = clk_get_rate(i2c_bus->clk); + dev_dbg(i2c_bus->dev, "i2c_bus->apb_clk %d\n", i2c_bus->apb_clk); + + ret = of_property_read_u32(pdev->dev.of_node, "bus-frequency", &i2c_bus->bus_frequency); + if (ret < 0) { + dev_err(&pdev->dev, "Could not read bus-frequency property\n"); + i2c_bus->bus_frequency = 100000; + } + + /* Initialize the I2C adapter */ + i2c_bus->adap.owner = THIS_MODULE; + i2c_bus->adap.algo = &i2c_ast2600_algorithm; + i2c_bus->adap.retries = 0; + i2c_bus->adap.dev.parent = i2c_bus->dev; + i2c_bus->adap.dev.of_node = pdev->dev.of_node; + i2c_bus->adap.algo_data = i2c_bus; + strscpy(i2c_bus->adap.name, pdev->name, sizeof(i2c_bus->adap.name)); + i2c_set_adapdata(&i2c_bus->adap, i2c_bus); + + ast2600_i2c_init(i2c_bus); + + ret = devm_request_irq(&pdev->dev, i2c_bus->irq, ast2600_i2c_bus_irq, 0, + dev_name(&pdev->dev), i2c_bus); + if (ret < 0) + goto unmap; + + if (of_property_read_bool(pdev->dev.of_node, "smbus-alert")) { + i2c_bus->alert_enable = 1; + i2c_bus->ara = i2c_new_smbus_alert_device(&i2c_bus->adap, &i2c_bus->alert_data); + if (!i2c_bus->ara) + dev_warn(i2c_bus->dev, "Failed to register ARA client\n"); + + writel(AST2600_I2CM_PKT_DONE | AST2600_I2CM_BUS_RECOVER | AST2600_I2CM_SMBUS_ALT, + i2c_bus->reg_base + AST2600_I2CM_IER); + } else { + i2c_bus->alert_enable = 0; + /* Set interrupt generation of I2C master controller */ + writel(AST2600_I2CM_PKT_DONE | AST2600_I2CM_BUS_RECOVER, + i2c_bus->reg_base + AST2600_I2CM_IER); + } + + ret = i2c_add_adapter(&i2c_bus->adap); + if (ret < 0) + goto unmap; + + dev_info(i2c_bus->dev, "%s [%d]: adapter [%d khz] mode [%d]\n", + pdev->dev.of_node->name, i2c_bus->adap.nr, i2c_bus->bus_frequency / 1000, + i2c_bus->mode); + + return 0; + +unmap: + free_irq(i2c_bus->irq, i2c_bus); +free_irq: + devm_iounmap(&pdev->dev, i2c_bus->reg_base); +free_mem: + kfree(i2c_bus); + return ret; +} + +static int ast2600_i2c_remove(struct platform_device *pdev) +{ + struct ast2600_i2c_bus *i2c_bus = platform_get_drvdata(pdev); + + writel(0, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); + writel(0, i2c_bus->reg_base + AST2600_I2CM_IER); + + free_irq(i2c_bus->irq, i2c_bus); + + platform_set_drvdata(pdev, NULL); + i2c_del_adapter(&i2c_bus->adap); + + kfree(i2c_bus); + + return 0; +} + +static struct platform_driver ast2600_i2c_bus_driver = { + .probe = ast2600_i2c_probe, + .remove = ast2600_i2c_remove, + .driver = { + .name = KBUILD_MODNAME, + .of_match_table = ast2600_i2c_bus_of_table, + }, +}; +module_platform_driver(ast2600_i2c_bus_driver); + +MODULE_AUTHOR("Ryan Chen <ryan_chen@aspeedtech.com>"); +MODULE_DESCRIPTION("ASPEED AST2600 I2C Controller Driver"); +MODULE_LICENSE("GPL"); -- 2.34.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver 2023-02-01 10:33 ` [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver Ryan Chen @ 2023-02-02 6:04 ` Jeremy Kerr 2023-02-02 9:16 ` Ryan Chen 0 siblings, 1 reply; 18+ messages in thread From: Jeremy Kerr @ 2023-02-02 6:04 UTC (permalink / raw) To: Ryan Chen, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hi Ryan, > Add i2c new register mode driver to support AST2600 i2c > new register mode. Nice! A bit of review below - I assume your state machine & event handling is correct, but this is more on the driver API side. > +static int ast2600_i2c_global_probe(struct platform_device *pdev) > +{ > + struct ast2600_i2c_global *i2c_global; > + struct resource *res; > + > + i2c_global = devm_kzalloc(&pdev->dev, sizeof(*i2c_global), GFP_KERNEL); > + if (IS_ERR(i2c_global)) > + return PTR_ERR(i2c_global); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + i2c_global->base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(i2c_global->base)) > + return PTR_ERR(i2c_global->base); > + > + i2c_global->rst = devm_reset_control_get_exclusive(&pdev->dev, NULL); > + if (IS_ERR(i2c_global->rst)) > + return IS_ERR(i2c_global->rst); > + > + reset_control_assert(i2c_global->rst); > + udelay(3); > + reset_control_deassert(i2c_global->rst); > + > + writel(AST2600_GLOBAL_INIT, i2c_global->base + AST2600_I2CG_CTRL); > + writel(I2CCG_DIV_CTRL, i2c_global->base + AST2600_I2CG_CLK_DIV_CTRL); > + > + pr_info("i2c global registered\n"); I'm not the printk police, but I don't think this message is very useful. > + > + return 0; > +} ... so this driver is doing some common reset bits then just the two register writes - is it possible to just use a common syscon/mfd device instead? The core i2c driver could handle the reg writes through the syscon regmap instead. > + > +static struct platform_driver ast2600_i2c_global_driver = { > + .probe = ast2600_i2c_global_probe, > + .driver = { > + .name = KBUILD_MODNAME, > + .of_match_table = ast2600_i2c_global_of_match, > + }, > +}; > + > +static int __init ast2600_i2c_global_init(void) > +{ > + return platform_driver_register(&ast2600_i2c_global_driver); > +} > +device_initcall(ast2600_i2c_global_init); Maybe module_platform_driver() instead? > +enum xfer_mode { > + BYTE_MODE = 0, > + BUFF_MODE, > + DMA_MODE, > +}; > + > +struct ast2600_i2c_bus { > + struct i2c_adapter adap; > + struct device *dev; > + void __iomem *reg_base; > + struct regmap *global_reg; > + int irq; > + /* 0: dma, 1: pool, 2:byte */ > + enum xfer_mode mode; The comment doesn't match the enum. > + /* 0: old mode, 1: new mode */ > + int clk_div_mode; ... and if you're using an enum for xfer_mode, may as well do the same for clk_div_mode, which will make some of the conditionals below more obvious. > +static u32 ast2600_select_i2c_clock(struct ast2600_i2c_bus *i2c_bus) > +{ > + unsigned long base_clk1; > + unsigned long base_clk2; > + unsigned long base_clk3; > + unsigned long base_clk4; > + int baseclk_idx; > + u32 clk_div_reg; > + u32 scl_low; > + u32 scl_high; > + int divisor; > + int inc = 0; > + u32 data; > + int i; > + > + if (i2c_bus->clk_div_mode) { > + regmap_read(i2c_bus->global_reg, AST2600_I2CG_CLK_DIV_CTRL, &clk_div_reg); > + base_clk1 = (i2c_bus->apb_clk * 10) / ((((clk_div_reg & 0xff) + 2) * 10) / 2); > + base_clk2 = (i2c_bus->apb_clk * 10) / > + (((((clk_div_reg >> 8) & 0xff) + 2) * 10) / 2); > + base_clk3 = (i2c_bus->apb_clk * 10) / > + (((((clk_div_reg >> 16) & 0xff) + 2) * 10) / 2); > + base_clk4 = (i2c_bus->apb_clk * 10) / > + (((((clk_div_reg >> 24) & 0xff) + 2) * 10) / 2); > + > + if ((i2c_bus->apb_clk / i2c_bus->bus_frequency) <= 32) { > + baseclk_idx = 0; > + divisor = DIV_ROUND_UP(i2c_bus->apb_clk, i2c_bus->bus_frequency); > + } else if ((base_clk1 / i2c_bus->bus_frequency) <= 32) { > + baseclk_idx = 1; > + divisor = DIV_ROUND_UP(base_clk1, i2c_bus->bus_frequency); > + } else if ((base_clk2 / i2c_bus->bus_frequency) <= 32) { > + baseclk_idx = 2; > + divisor = DIV_ROUND_UP(base_clk2, i2c_bus->bus_frequency); > + } else if ((base_clk3 / i2c_bus->bus_frequency) <= 32) { > + baseclk_idx = 3; > + divisor = DIV_ROUND_UP(base_clk3, i2c_bus->bus_frequency); > + } else { > + baseclk_idx = 4; > + divisor = DIV_ROUND_UP(base_clk4, i2c_bus->bus_frequency); > + inc = 0; > + while ((divisor + inc) > 32) { > + inc |= divisor & 0x1; > + divisor >>= 1; > + baseclk_idx++; > + } > + divisor += inc; > + } > + divisor = min_t(int, divisor, 32); > + baseclk_idx &= 0xf; > + scl_low = ((divisor * 9) / 16) - 1; > + scl_low = min_t(u32, scl_low, 0xf); > + scl_high = (divisor - scl_low - 2) & 0xf; > + /* Divisor : Base Clock : tCKHighMin : tCK High : tCK Low */ > + data = ((scl_high - 1) << 20) | (scl_high << 16) | (scl_low << 12) | (baseclk_idx); > + if (i2c_bus->timeout_enable) { > + data |= AST2600_I2CC_TOUTBASECLK(AST_I2C_TIMEOUT_CLK); > + data |= AST2600_I2CC_TTIMEOUT(AST_I2C_TIMEOUT_COUNT); > + } > + } else { > + for (i = 0; i < ARRAY_SIZE(i2c_legacy_timing_table); i++) { > + if ((i2c_bus->apb_clk / i2c_legacy_timing_table[i].divisor) < > + i2c_bus->bus_frequency) { > + break; > + } > + } > + data = i2c_legacy_timing_table[i].timing; If you don't match a timing, this will overflow i2c_legacy_timing_table. > +static int ast2600_i2c_do_start(struct ast2600_i2c_bus *i2c_bus) > +{ > + struct i2c_msg *msg = &i2c_bus->msgs[i2c_bus->msgs_index]; > + int xfer_len = 0; > + int i = 0; > + u32 cmd; > + > + cmd = AST2600_I2CM_PKT_EN | AST2600_I2CM_PKT_ADDR(msg->addr) | AST2600_I2CM_START_CMD; > + > + dev_dbg(i2c_bus->dev, "[%d] %sing %d byte%s %s 0x%02x\n", > + i2c_bus->msgs_index, msg->flags & I2C_M_RD ? "read" : "write", > + msg->len, msg->len > 1 ? "s" : "", > + msg->flags & I2C_M_RD ? "from" : "to", msg->addr); > + > + i2c_bus->master_xfer_cnt = 0; > + i2c_bus->buf_index = 0; > + > + if (msg->flags & I2C_M_RD) { > + cmd |= AST2600_I2CM_RX_CMD; > + if (i2c_bus->mode == DMA_MODE) { [...] > + } else if (i2c_bus->mode == BUFF_MODE) { [...] > + } else { [...] > + } > + } else { > + if (i2c_bus->mode == DMA_MODE) { [...] > + } else if (i2c_bus->mode == BUFF_MODE) { [...] > + } else { [...] > + } > + } > + dev_dbg(i2c_bus->dev, "len %d , cmd %x\n", xfer_len, cmd); > + writel(cmd, i2c_bus->reg_base + AST2600_I2CM_CMD_STS); > + return 0; > +} The core parts of this function are essentially split into three, depending on the bus mode. Maybe it would be better to refactor those into separate functions for buffer handling? > + > +static int ast2600_i2c_is_irq_error(u32 irq_status) > +{ > + if (irq_status & AST2600_I2CM_ARBIT_LOSS) > + return -EAGAIN; > + if (irq_status & (AST2600_I2CM_SDA_DL_TO | AST2600_I2CM_SCL_LOW_TO)) > + return -EBUSY; > + if (irq_status & (AST2600_I2CM_ABNORMAL)) > + return -EPROTO; > + > + return 0; > +} > + > +static void ast2600_i2c_master_package_irq(struct ast2600_i2c_bus *i2c_bus, u32 sts) What does 'package' refer to here? Same as above with this one - there's a lot of inner conditionals on the bus modes. > +static int ast2600_i2c_master_irq(struct ast2600_i2c_bus *i2c_bus) > +{ > + u32 sts = readl(i2c_bus->reg_base + AST2600_I2CM_ISR); > + u32 ier = readl(i2c_bus->reg_base + AST2600_I2CM_IER); > + u32 ctrl = 0; > + > + dev_dbg(i2c_bus->dev, "M sts %x\n", sts); > + if (!i2c_bus->alert_enable) > + sts &= ~AST2600_I2CM_SMBUS_ALT; > + > + if (AST2600_I2CM_BUS_RECOVER_FAIL & sts) { > + dev_dbg(i2c_bus->dev, "M clear isr: AST2600_I2CM_BUS_RECOVER_FAIL= %x\n", sts); > + writel(AST2600_I2CM_BUS_RECOVER_FAIL, i2c_bus->reg_base + AST2600_I2CM_ISR); > + ctrl = readl(i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); > + writel(0, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); > + writel(ctrl, i2c_bus->reg_base + AST2600_I2CC_FUN_CTRL); > + i2c_bus->cmd_err = -EPROTO; > + complete(&i2c_bus->cmd_complete); > + return 1; > + } > + > + if (AST2600_I2CM_BUS_RECOVER & sts) { > + dev_dbg(i2c_bus->dev, "M clear isr: AST2600_I2CM_BUS_RECOVER= %x\n", sts); > + writel(AST2600_I2CM_BUS_RECOVER, i2c_bus->reg_base + AST2600_I2CM_ISR); > + i2c_bus->cmd_err = 0; > + complete(&i2c_bus->cmd_complete); > + return 1; > + } > + > + if (AST2600_I2CM_SMBUS_ALT & sts) { > + if (ier & AST2600_I2CM_SMBUS_ALT) { > + dev_dbg(i2c_bus->dev, "M clear isr: AST2600_I2CM_SMBUS_ALT= %x\n", sts); > + /* Disable ALT INT */ > + writel(ier & ~AST2600_I2CM_SMBUS_ALT, i2c_bus->reg_base + AST2600_I2CM_IER); > + i2c_handle_smbus_alert(i2c_bus->ara); > + writel(AST2600_I2CM_SMBUS_ALT, i2c_bus->reg_base + AST2600_I2CM_ISR); > + dev_err(i2c_bus->dev, > + "ast2600_master_alert_recv bus id %d, Disable Alt, Please Imple\n", > + i2c_bus->adap.nr); > + return 1; > + } > + } > + > + i2c_bus->cmd_err = ast2600_i2c_is_irq_error(sts); > + if (i2c_bus->cmd_err) { > + dev_dbg(i2c_bus->dev, "received error interrupt: 0x%02x\n", sts); > + writel(AST2600_I2CM_PKT_DONE, i2c_bus->reg_base + AST2600_I2CM_ISR); > + complete(&i2c_bus->cmd_complete); > + return 1; > + } > + > + if (AST2600_I2CM_PKT_DONE & sts) { > + ast2600_i2c_master_package_irq(i2c_bus, sts); > + return 1; > + } > + > + if (readl(i2c_bus->reg_base + AST2600_I2CM_ISR)) { > + dev_dbg(i2c_bus->dev, "master TODO care sts %x\n", > + readl(i2c_bus->reg_base + AST2600_I2CM_ISR)); You're reading the same register twice here, is that intentional? > + writel(readl(i2c_bus->reg_base + AST2600_I2CM_ISR), > + i2c_bus->reg_base + AST2600_I2CM_ISR); > make that three times :) > +static int ast2600_i2c_probe(struct platform_device *pdev) > +{ > + struct ast2600_i2c_bus *i2c_bus; > + const struct of_device_id *match; > + struct resource *res; > + u32 global_ctrl; > + int ret = 0; > + > + i2c_bus = devm_kzalloc(&pdev->dev, sizeof(*i2c_bus), GFP_KERNEL); > + if (!i2c_bus) > + return -ENOMEM; > + > + i2c_bus->global_reg = syscon_regmap_lookup_by_compatible("aspeed,ast2600-i2c-global"); > + if (IS_ERR(i2c_bus->global_reg)) { > + dev_err(&pdev->dev, "failed to find ast2600 i2c global regmap\n"); > + ret = -ENOMEM; > + goto free_mem; > + } > + > + regmap_read(i2c_bus->global_reg, AST2600_I2CG_CTRL, &global_ctrl); > + > + if (global_ctrl & AST2600_I2CG_CTRL_NEW_CLK_DIV) > + i2c_bus->clk_div_mode = 1; > + > + if (!(global_ctrl & AST2600_I2CG_CTRL_NEW_REG)) { > + ret = -ENOENT; > + dev_err(&pdev->dev, "Expect I2CG0C[2] = 1 (new reg mode)\n"); > + goto free_mem; > + } > + > + i2c_bus->mode = DMA_MODE; > + i2c_bus->slave_operate = 0; > + > + if (of_property_read_bool(pdev->dev.of_node, "byte-mode")) > + i2c_bus->mode = BYTE_MODE; > + > + if (of_property_read_bool(pdev->dev.of_node, "buff-mode")) { > + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); > + if (res && resource_size(res) >= 2) > + i2c_bus->buf_base = devm_ioremap_resource(&pdev->dev, res); > + > + if (!IS_ERR_OR_NULL(i2c_bus->buf_base)) > + i2c_bus->buf_size = resource_size(res) / 2; > + > + i2c_bus->mode = BUFF_MODE; > + } The buff-mode and byte-mode properties do not appear in your OF binding document. Using booleans to indicate mutually-exclusive modes seems a bit odd. > + > + if (of_property_read_bool(pdev->dev.of_node, "timeout")) > + i2c_bus->timeout_enable = 1; 'timeout' is also not described in the binding. > + > + i2c_bus->dev = &pdev->dev; > + init_completion(&i2c_bus->cmd_complete); > + > + i2c_bus->reg_base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(i2c_bus->reg_base)) { > + ret = PTR_ERR(i2c_bus->reg_base); > + goto free_mem; > + } > + > + i2c_bus->irq = irq_of_parse_and_map(pdev->dev.of_node, 0); > + if (i2c_bus->irq < 0) { > + dev_err(&pdev->dev, "no irq specified\n"); > + ret = -i2c_bus->irq; > + goto free_irq; > + } > + > + match = of_match_node(ast2600_i2c_bus_of_table, pdev->dev.of_node); > + if (!match) { > + ret = -ENOENT; > + goto free_irq; > + } You don't use 'match' after this. > + > + platform_set_drvdata(pdev, i2c_bus); > + > + i2c_bus->clk = devm_clk_get(i2c_bus->dev, NULL); > + if (IS_ERR(i2c_bus->clk)) { > + dev_err(i2c_bus->dev, "no clock defined\n"); > + ret = -ENODEV; > + goto free_irq; > + } > + i2c_bus->apb_clk = clk_get_rate(i2c_bus->clk); > + dev_dbg(i2c_bus->dev, "i2c_bus->apb_clk %d\n", i2c_bus->apb_clk); > + > + ret = of_property_read_u32(pdev->dev.of_node, "bus-frequency", &i2c_bus->bus_frequency); > + if (ret < 0) { > + dev_err(&pdev->dev, "Could not read bus-frequency property\n"); > + i2c_bus->bus_frequency = 100000; > + } > + > + /* Initialize the I2C adapter */ > + i2c_bus->adap.owner = THIS_MODULE; > + i2c_bus->adap.algo = &i2c_ast2600_algorithm; > + i2c_bus->adap.retries = 0; > + i2c_bus->adap.dev.parent = i2c_bus->dev; > + i2c_bus->adap.dev.of_node = pdev->dev.of_node; > + i2c_bus->adap.algo_data = i2c_bus; > + strscpy(i2c_bus->adap.name, pdev->name, sizeof(i2c_bus->adap.name)); > + i2c_set_adapdata(&i2c_bus->adap, i2c_bus); > + > + ast2600_i2c_init(i2c_bus); > + > + ret = devm_request_irq(&pdev->dev, i2c_bus->irq, ast2600_i2c_bus_irq, 0, > + dev_name(&pdev->dev), i2c_bus); > + if (ret < 0) > + goto unmap; > + > + if (of_property_read_bool(pdev->dev.of_node, "smbus-alert")) { > + i2c_bus->alert_enable = 1; > + i2c_bus->ara = i2c_new_smbus_alert_device(&i2c_bus->adap, &i2c_bus->alert_data); > + if (!i2c_bus->ara) > + dev_warn(i2c_bus->dev, "Failed to register ARA client\n"); > + > + writel(AST2600_I2CM_PKT_DONE | AST2600_I2CM_BUS_RECOVER | AST2600_I2CM_SMBUS_ALT, > + i2c_bus->reg_base + AST2600_I2CM_IER); > + } else { > + i2c_bus->alert_enable = 0; > + /* Set interrupt generation of I2C master controller */ > + writel(AST2600_I2CM_PKT_DONE | AST2600_I2CM_BUS_RECOVER, > + i2c_bus->reg_base + AST2600_I2CM_IER); > + } > + > + ret = i2c_add_adapter(&i2c_bus->adap); > + if (ret < 0) > + goto unmap; > + > + dev_info(i2c_bus->dev, "%s [%d]: adapter [%d khz] mode [%d]\n", > + pdev->dev.of_node->name, i2c_bus->adap.nr, i2c_bus->bus_frequency / 1000, > + i2c_bus->mode); > + > + return 0; > + > +unmap: > + free_irq(i2c_bus->irq, i2c_bus); > +free_irq: > + devm_iounmap(&pdev->dev, i2c_bus->reg_base); Something looks off in these goto labels. > +free_mem: > + kfree(i2c_bus); you devm_kzalloc()ed above, but are kfree()ing here (as well as in the _remove function). Same with devm_request_irq(). You could just drop these? Cheers, Jeremy ^ permalink raw reply [flat|nested] 18+ messages in thread
* RE: [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver 2023-02-02 6:04 ` Jeremy Kerr @ 2023-02-02 9:16 ` Ryan Chen [not found] ` <5239ea2f-284a-dcf5-6dd4-be3b13b319e6@linaro.org> 0 siblings, 1 reply; 18+ messages in thread From: Ryan Chen @ 2023-02-02 9:16 UTC (permalink / raw) To: Jeremy Kerr, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Jeremy > > > Add i2c new register mode driver to support AST2600 i2c new register > > mode. > > Nice! > > A bit of review below - I assume your state machine & event handling is > correct, but this is more on the driver API side. > > > +static int ast2600_i2c_global_probe(struct platform_device *pdev) { > > + struct ast2600_i2c_global *i2c_global; > > + struct resource *res; > > + > > + i2c_global = devm_kzalloc(&pdev->dev, sizeof(*i2c_global), > > +GFP_KERNEL); > > + if (IS_ERR(i2c_global)) > > + return PTR_ERR(i2c_global); > > + > > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + i2c_global->base = devm_ioremap_resource(&pdev->dev, res); > > + if (IS_ERR(i2c_global->base)) > > + return PTR_ERR(i2c_global->base); > > + > > + i2c_global->rst = devm_reset_control_get_exclusive(&pdev->dev, > > +NULL); > > + if (IS_ERR(i2c_global->rst)) > > + return IS_ERR(i2c_global->rst); > > + > > + reset_control_assert(i2c_global->rst); > > + udelay(3); > > + reset_control_deassert(i2c_global->rst); > > + > > + writel(AST2600_GLOBAL_INIT, i2c_global->base + > > +AST2600_I2CG_CTRL); > > + writel(I2CCG_DIV_CTRL, i2c_global->base + > > +AST2600_I2CG_CLK_DIV_CTRL); > > + > > + pr_info("i2c global registered\n"); > > I'm not the printk police, but I don't think this message is very useful. Due to i2c global is top of all i2c bus, should be early than i2c-ast2600.c driver probe. Original though is show to check. I can remove it. > > > + > > + return 0; > > +} > > ... so this driver is doing some common reset bits then just the two register > writes - is it possible to just use a common syscon/mfd device instead? The > core i2c driver could handle the reg writes through the syscon regmap instead. > Sure. I can modify it by syscon/mfd device driver. > > + > > +static struct platform_driver ast2600_i2c_global_driver = { > > + .probe = ast2600_i2c_global_probe, > > + .driver = { > > + .name = KBUILD_MODNAME, > > + .of_match_table = ast2600_i2c_global_of_match, > > + }, > > +}; > > + > > +static int __init ast2600_i2c_global_init(void) { > > + return platform_driver_register(&ast2600_i2c_global_driver); > > +} > > +device_initcall(ast2600_i2c_global_init); > > Maybe module_platform_driver() instead? Due to i2c global is top of all i2c bus like the scu, it make sure the driver is before the i2c bus driver probe. It is needed use device_initcal function. > > > +enum xfer_mode { > > + BYTE_MODE = 0, > > + BUFF_MODE, > > + DMA_MODE, > > +}; > > + > > +struct ast2600_i2c_bus { > > + struct i2c_adapter adap; > > + struct device *dev; > > + void __iomem *reg_base; > > + struct regmap *global_reg; > > + int irq; > > + /* 0: dma, 1: pool, 2:byte */ > > + enum xfer_mode mode; > > The comment doesn't match the enum. Yes, it is typo will remove it. > > > + /* 0: old mode, 1: new mode */ > > > + int clk_div > _mode; > > ... and if you're using an enum for xfer_mode, may as well do the same for > clk_div_mode, which will make some of the conditionals below more obvious. > Yes, will add enum enum div_mode { OLD_DIV = 0, NEW_DIV, }; > > +static u32 ast2600_select_i2c_clock(struct ast2600_i2c_bus *i2c_bus) > > +{ > > + unsigned long base_clk1; > > + unsigned long base_clk2; > > + unsigned long base_clk3; > > + unsigned long base_clk4; > > + int baseclk_idx; > > + u32 clk_div_reg; > > + u32 scl_low; > > + u32 scl_high; > > + int divisor; > > + int inc = 0; > > + u32 data; > > + int i; > > + > > + if (i2c_bus->clk_div_mode) { > > + regmap_read(i2c_bus->global_reg, > > +AST2600_I2CG_CLK_DIV_CTRL, &clk_div_reg); > > + base_clk1 = (i2c_bus->apb_clk * 10) / ((((clk_div_reg > > +& 0xff) + 2) * 10) / 2); > > + base_clk2 = (i2c_bus->apb_clk * 10) / > > + (((((clk_div_reg >> 8) & 0xff) > + 2) * > > +10) / 2); > > + base_clk3 = (i2c_bus->apb_clk * 10) / > > + (((((clk_div_reg >> 16) & > 0xff) + 2) * > > +10) / 2); > > + base_clk4 = (i2c_bus->apb_clk * 10) / > > + (((((clk_div_reg >> 24) & > 0xff) + 2) * > > +10) / 2); > > + > > + if ((i2c_bus->apb_clk / i2c_bus->bus_frequency) <= > 32) > > +{ > > + baseclk_idx = 0; > > + divisor = > DIV_ROUND_UP(i2c_bus->apb_clk, > > +i2c_bus->bus_frequency); > > + } else if ((base_clk1 / i2c_bus->bus_frequency) <= > 32) > > +{ > > + baseclk_idx = 1; > > + divisor = DIV_ROUND_UP(base_clk1, > > +i2c_bus->bus_frequency); > > + } else if ((base_clk2 / i2c_bus->bus_frequency) <= > 32) > > +{ > > + baseclk_idx = 2; > > + divisor = DIV_ROUND_UP(base_clk2, > > +i2c_bus->bus_frequency); > > + } else if ((base_clk3 / i2c_bus->bus_frequency) <= > 32) > > +{ > > + baseclk_idx = 3; > > + divisor = DIV_ROUND_UP(base_clk3, > > +i2c_bus->bus_frequency); > > + } else { > > + baseclk_idx = 4; > > + divisor = DIV_ROUND_UP(base_clk4, > > +i2c_bus->bus_frequency); > > + inc = 0; > > + while ((divisor + inc) > 32) { > > + inc |= divisor & 0x1; > > + divisor >>= 1; > > + baseclk_idx++; > > + } > > + divisor += inc; > > + } > > + divisor = min_t(int, divisor, 32); > > + baseclk_idx &= 0xf; > > + scl_low = ((divisor * 9) / 16) - 1; > > + scl_low = min_t(u32, scl_low, 0xf); > > + scl_high = (divisor - scl_low - 2) & 0xf; > > + /* Divisor : Base Clock : tCKHighMin : tCK High : tCK > > +Low */ > > + data = ((scl_high - 1) << 20) | (scl_high << 16) | > > +(scl_low << 12) | (baseclk_idx); > > + if (i2c_bus->timeout_enable) { > > + data |= > > +AST2600_I2CC_TOUTBASECLK(AST_I2C_TIMEOUT_CLK); > > + data |= > > +AST2600_I2CC_TTIMEOUT(AST_I2C_TIMEOUT_COUNT); > > + } > > + } else { > > + for (i = 0; i < ARRAY_SIZE(i2c_legacy_timing_table); > > +i++) { > > + if ((i2c_bus->apb_clk / > > +i2c_legacy_timing_table[i].divisor) < > > + i2c_bus->bus_frequency) { > > + break; > > + } > > + } > > + data = i2c_legacy_timing_table[i].timing; > > If you don't match a timing, this will overflow i2c_legacy_timing_table. Sorry, I don't have good idea to modify this. If (i = ARRAY_SIZE(i2c_legacy_timing_table)) then i = default to check ?? Or you have any good suggestion? > > > +static int ast2600_i2c_do_start(struct ast2600_i2c_bus *i2c_bus) { > > + struct i2c_msg *msg = &i2c_bus->msgs[i2c_bus->msgs_index]; > > + int xfer_len = 0; > > + int i = 0; > > + u32 cmd; > > + > > + cmd = AST2600_I2CM_PKT_EN | > AST2600_I2CM_PKT_ADDR(msg->addr) | > > +AST2600_I2CM_START_CMD; > > + > > + dev_dbg(i2c_bus->dev, "[%d] %sing %d byte%s %s 0x%02x\n", > > + i2c_bus->msgs_index, msg->flags & I2C_M_RD ? > "read" : > > +"write", > > + msg->len, msg->len > 1 ? "s" : "", > > + msg->flags & I2C_M_RD ? "from" : "to", msg->addr); > > + > > + i2c_bus->master_xfer_cnt = 0; > > + i2c_bus->buf_index = 0; > > + > > + if (msg->flags & I2C_M_RD) { > > + cmd |= AST2600_I2CM_RX_CMD; > > + if (i2c_bus->mode == DMA_MODE) { > [...] > > + } else if (i2c_bus->mode == BUFF_MODE) { > [...] > > + } else { > [...] > > + } > > + } else { > > + if (i2c_bus->mode == DMA_MODE) { > [...] > > + } else if (i2c_bus->mode == BUFF_MODE) { > [...] > > + } else { > [...] > > + } > > + } > > + dev_dbg(i2c_bus->dev, "len %d , cmd %x\n", xfer_len, cmd); > > + writel(cmd, i2c_bus->reg_base + AST2600_I2CM_CMD_STS); > > + return 0; > > +} > > The core parts of this function are essentially split into three, depending on the > bus mode. Maybe it would be better to refactor those into separate functions > for buffer handling? Sorry, I will keep this, due to each condition check will decide what command to trigger. writel(cmd, i2c_bus->reg_base + AST2600_I2CM_CMD_STS); That can keep the driver readable logic. > > > + > > +static int ast2600_i2c_is_irq_error(u32 irq_status) { > > + if (irq_status & AST2600_I2CM_ARBIT_LOSS) > > + return -EAGAIN; > > + if (irq_status & (AST2600_I2CM_SDA_DL_TO | > > +AST2600_I2CM_SCL_LOW_TO)) > > + return -EBUSY; > > + if (irq_status & (AST2600_I2CM_ABNORMAL)) > > + return -EPROTO; > > + > > + return 0; > > +} > > + > > +static void ast2600_i2c_master_package_irq(struct ast2600_i2c_bus > > +*i2c_bus, u32 sts) > > What does 'package' refer to here? > > Same as above with this one - there's a lot of inner conditionals on the bus > modes. It is sync with datasheet mode setting. The default will enable it. So I use the package function naming. > > > +static int ast2600_i2c_master_irq(struct ast2600_i2c_bus *i2c_bus) { > > + u32 sts = readl(i2c_bus->reg_base + AST2600_I2CM_ISR); > > + u32 ier = readl(i2c_bus->reg_base + AST2600_I2CM_IER); > > + u32 ctrl = 0; > > + > > + dev_dbg(i2c_bus->dev, "M sts %x\n", sts); > > + if (!i2c_bus->alert_enable) > > + sts &= ~AST2600_I2CM_SMBUS_ALT; > > + > > + if (AST2600_I2CM_BUS_RECOVER_FAIL & sts) { > > + dev_dbg(i2c_bus->dev, "M clear isr: > > +AST2600_I2CM_BUS_RECOVER_FAIL= %x\n", sts); > > + writel(AST2600_I2CM_BUS_RECOVER_FAIL, > > +i2c_bus->reg_base + AST2600_I2CM_ISR); > > + ctrl = readl(i2c_bus->reg_base + > > +AST2600_I2CC_FUN_CTRL); > > + writel(0, i2c_bus->reg_base + > AST2600_I2CC_FUN_CTRL); > > + writel(ctrl, i2c_bus->reg_base + > > +AST2600_I2CC_FUN_CTRL); > > + i2c_bus->cmd_err = -EPROTO; > > + complete(&i2c_bus->cmd_complete); > > + return 1; > > + } > > + > > + if (AST2600_I2CM_BUS_RECOVER & sts) { > > + dev_dbg(i2c_bus->dev, "M clear isr: > > +AST2600_I2CM_BUS_RECOVER= %x\n", sts); > > + writel(AST2600_I2CM_BUS_RECOVER, > i2c_bus->reg_base + > > +AST2600_I2CM_ISR); > > + i2c_bus->cmd_err = 0; > > + complete(&i2c_bus->cmd_complete); > > + return 1; > > + } > > + > > + if (AST2600_I2CM_SMBUS_ALT & sts) { > > + if (ier & AST2600_I2CM_SMBUS_ALT) { > > + dev_dbg(i2c_bus->dev, "M clear isr: > > +AST2600_I2CM_SMBUS_ALT= %x\n", sts); > > + /* Disable ALT INT */ > > + writel(ier & > ~AST2600_I2CM_SMBUS_ALT, > > +i2c_bus->reg_base + AST2600_I2CM_IER); > > + i2c_handle_smbus_alert(i2c_bus->ara); > > + writel(AST2600_I2CM_SMBUS_ALT, > > +i2c_bus->reg_base + AST2600_I2CM_ISR); > > + dev_err(i2c_bus->dev, > > > + "ast2600_master_alert_recv > bus id %d, > > +Disable Alt, Please Imple\n", > > + i2c_bus->adap.nr); > > + return 1; > > + } > > + } > > + > > + i2c_bus->cmd_err = ast2600_i2c_is_irq_error(sts); > > + if (i2c_bus->cmd_err) { > > + dev_dbg(i2c_bus->dev, "received error interrupt: > > +0x%02x\n", sts); > > + writel(AST2600_I2CM_PKT_DONE, > i2c_bus->reg_base + > > +AST2600_I2CM_ISR); > > + complete(&i2c_bus->cmd_complete); > > + return 1; > > + } > > + > > + if (AST2600_I2CM_PKT_DONE & sts) { > > + ast2600_i2c_master_package_irq(i2c_bus, sts); > > + return 1; > > + } > > + > > + if (readl(i2c_bus->reg_base + AST2600_I2CM_ISR)) { > > + dev_dbg(i2c_bus->dev, "master TODO care sts > %x\n", > > + readl(i2c_bus->reg_base + > AST2600_I2CM_ISR)); > > You're reading the same register twice here, is that intentional? Will modify it to sts. > > > + writel(readl(i2c_bus->reg_base + > AST2600_I2CM_ISR), > > + i2c_bus->reg_base + > AST2600_I2CM_ISR); > > > > make that three times :) > > > +static int ast2600_i2c_probe(struct platform_device *pdev) { > > + struct ast2600_i2c_bus *i2c_bus; > > + const struct of_device_id *match; > > + struct resource *res; > > + u32 global_ctrl; > > + int ret = 0; > > + > > + i2c_bus = devm_kzalloc(&pdev->dev, sizeof(*i2c_bus), > > +GFP_KERNEL); > > + if (!i2c_bus) > > + return -ENOMEM; > > + > > + i2c_bus->global_reg = > > +syscon_regmap_lookup_by_compatible("aspeed,ast2600-i2c-global"); > > + if (IS_ERR(i2c_bus->global_reg)) { > > + dev_err(&pdev->dev, "failed to find ast2600 i2c > global > > +regmap\n"); > > + ret = -ENOMEM; > > + goto free_mem; > > + } > > + > > + regmap_read(i2c_bus->global_reg, AST2600_I2CG_CTRL, > > +&global_ctrl); > > + > > + if (global_ctrl & AST2600_I2CG_CTRL_NEW_CLK_DIV) > > + i2c_bus->clk_div_mode = 1; > > + > > + if (!(global_ctrl & AST2600_I2CG_CTRL_NEW_REG)) { > > + ret = -ENOENT; > > + dev_err(&pdev->dev, "Expect I2CG0C[2] = 1 (new > reg > > +mode)\n"); > > + goto free_mem; > > + } > > + > > + i2c_bus->mode = DMA_MODE; > > + i2c_bus->slave_operate = 0; > > + > > + if (of_property_read_bool(pdev->dev.of_node, "byte-mode")) > > + i2c_bus->mode = BYTE_MODE; > > + > > + if (of_property_read_bool(pdev->dev.of_node, "buff-mode")) { > > + res = platform_get_resource(pdev, > IORESOURCE_MEM, 1); > > + if (res && resource_size(res) >= 2) > > + i2c_bus->buf_base = > > +devm_ioremap_resource(&pdev->dev, res); > > + > > + if (!IS_ERR_OR_NULL(i2c_bus->buf_base)) > > + i2c_bus->buf_size = resource_size(res) / > 2; > > + > > + i2c_bus->mode = BUFF_MODE; > > + } > > The buff-mode and byte-mode properties do not appear in your OF binding > document. Using booleans to indicate mutually-exclusive modes seems a bit > odd. > > > + > > + if (of_property_read_bool(pdev->dev.of_node, "timeout")) > > + i2c_bus->timeout_enable = 1; > > 'timeout' is also not described in the binding. Will add into binding. > > > + > > + i2c_bus->dev = &pdev->dev; > > + init_completion(&i2c_bus->cmd_complete); > > + > > + i2c_bus->reg_base = devm_platform_ioremap_resource(pdev, 0); > > + if (IS_ERR(i2c_bus->reg_base)) { > > + ret = PTR_ERR(i2c_bus->reg_base); > > + goto free_mem; > > + } > > + > > + i2c_bus->irq = irq_of_parse_and_map(pdev->dev.of_node, 0); > > + if (i2c_bus->irq < 0) { > > + dev_err(&pdev->dev, "no irq specified\n"); > > + ret = -i2c_bus->irq; > > + goto free_irq; > > + } > > + > > + match = of_match_node(ast2600_i2c_bus_of_table, > > +pdev->dev.of_node); > > + if (!match) { > > + ret = -ENOENT; > > + goto free_irq; > > + } > > You don't use 'match' after this. Yes, will remove this. > > > + > > + platform_set_drvdata(pdev, i2c_bus); > > + > > + i2c_bus->clk = devm_clk_get(i2c_bus->dev, NULL); > > + if (IS_ERR(i2c_bus->clk)) { > > + dev_err(i2c_bus->dev, "no clock defined\n"); > > + ret = -ENODEV; > > + goto free_irq; > > + } > > + i2c_bus->apb_clk = clk_get_rate(i2c_bus->clk); > > + dev_dbg(i2c_bus->dev, "i2c_bus->apb_clk %d\n", > > +i2c_bus->apb_clk); > > + > > + ret = of_property_read_u32(pdev->dev.of_node, "bus-frequency", > > +&i2c_bus->bus_frequency); > > + if (ret < 0) { > > + dev_err(&pdev->dev, "Could not read bus-frequency > > +property\n"); > > + i2c_bus->bus_frequency = 100000; > > + } > > + > > + /* Initialize the I2C adapter */ > > + i2c_bus->adap.owner = THIS_MODULE; > > + i2c_bus->adap.algo = &i2c_ast2600_algorithm; > > + i2c_bus->adap.retries = 0; > > + i2c_bus->adap.dev.parent = i2c_bus->dev; > > + i2c_bus->adap.dev.of_node = pdev->dev.of_node; > > + i2c_bus->adap.algo_data = i2c_bus; > > + strscpy(i2c_bus->adap.name, pdev->name, > > +sizeof(i2c_bus->adap.name)); > > + i2c_set_adapdata(&i2c_bus->adap, i2c_bus); > > + > > + ast2600_i2c_init(i2c_bus); > > + > > + ret = devm_request_irq(&pdev->dev, i2c_bus->irq, > > +ast2600_i2c_bus_irq, 0, > > + dev_name(&pdev->dev), > i2c_bus); > > + if (ret < 0) > > + goto unmap; > > + > > + if (of_property_read_bool(pdev->dev.of_node, "smbus-alert")) { > > + i2c_bus->alert_enable = 1; > > + i2c_bus->ara = > > +i2c_new_smbus_alert_device(&i2c_bus->adap, &i2c_bus->alert_data); > > + if (!i2c_bus->ara) > > + dev_warn(i2c_bus->dev, "Failed to > register ARA > > +client\n"); > > + > > + writel(AST2600_I2CM_PKT_DONE | > > +AST2600_I2CM_BUS_RECOVER | AST2600_I2CM_SMBUS_ALT, > > + i2c_bus->reg_base + AST2600_I2CM_IER); > > + } else { > > + i2c_bus->alert_enable = 0; > > + /* Set interrupt generation of I2C master controller > > +*/ > > + writel(AST2600_I2CM_PKT_DONE | > > +AST2600_I2CM_BUS_RECOVER, > > + i2c_bus->reg_base + > AST2600_I2CM_IER); > > + } > > + > > + ret = i2c_add_adapter(&i2c_bus->adap); > > + if (ret < 0) > > + goto unmap; > > + > > + dev_info(i2c_bus->dev, "%s [%d]: adapter [%d khz] mode > > +[%d]\n", > > + pdev->dev.of_node->name, i2c_bus->adap.nr, > > +i2c_bus->bus_frequency / 1000, > > + i2c_bus->mode); > > + > > + return 0; > > + > > +unmap: > > + free_irq(i2c_bus->irq, i2c_bus); > > +free_irq: > > + devm_iounmap(&pdev->dev, i2c_bus->reg_base); > > Something looks off in these goto labels. > > > +free_mem: > > + kfree(i2c_bus); > > you devm_kzalloc()ed above, but are kfree()ing here (as well as in the _remove > function). Same with devm_request_irq(). You could just drop these? Yes, will drop this. Thanks your review Ryan ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <5239ea2f-284a-dcf5-6dd4-be3b13b319e6@linaro.org>]
* RE: [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver [not found] ` <5239ea2f-284a-dcf5-6dd4-be3b13b319e6@linaro.org> @ 2023-02-02 10:03 ` Ryan Chen 2023-02-14 6:12 ` Ryan Chen 0 siblings, 1 reply; 18+ messages in thread From: Ryan Chen @ 2023-02-02 10:03 UTC (permalink / raw) To: Krzysztof Kozlowski, Jeremy Kerr, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Krzysztof, > On 02/02/2023 10:16, Ryan Chen wrote: > >>>> +static struct platform_driver ast2600_i2c_global_driver = { > >>> + .probe = ast2600_i2c_global_probe, > >>> + .driver = { > >>> + .name = KBUILD_MODNAME, > >>> + .of_match_table = ast2600_i2c_global_of_match, > >>> + }, > >>> +}; > >>> + > >>> +static int __init ast2600_i2c_global_init(void) { > >>> + return platform_driver_register(&ast2600_i2c_global_driver); > >>> +} > >>> +device_initcall(ast2600_i2c_global_init); > >> > >> Maybe module_platform_driver() instead? > > > > Due to i2c global is top of all i2c bus like the scu, it make sure the driver is > before the i2c bus driver probe. > > It is needed use device_initcal function. > > No, we do not do such ordering. device links and proper resource sharing > handle the order. This must be module_platform_driver() (assuming we do not > drop entire submission). If global driver use module_platform_driver, does i2c driver will latter the global driver probe? If yes, I think it will workable. > > > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 18+ messages in thread
* RE: [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver 2023-02-02 10:03 ` Ryan Chen @ 2023-02-14 6:12 ` Ryan Chen [not found] ` <013cc486-dc70-a8b9-69d2-d0ae991549fd@linaro.org> 0 siblings, 1 reply; 18+ messages in thread From: Ryan Chen @ 2023-02-14 6:12 UTC (permalink / raw) To: Ryan Chen, Krzysztof Kozlowski, Jeremy Kerr, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Krzysztof, > > > On 02/02/2023 10:16, Ryan Chen wrote: > > >>>> +static struct platform_driver ast2600_i2c_global_driver = { > > >>> + .probe = ast2600_i2c_global_probe, > > >>> + .driver = { > > >>> + .name = KBUILD_MODNAME, > > >>> + .of_match_table = > ast2600_i2c_global_of_match, > > >>> + }, > > >>> +}; > > >>> + > > >>> +static int __init ast2600_i2c_global_init(void) { > > >>> + return > > >>> +platform_driver_register(&ast2600_i2c_global_driver); > > >>> +} > > >>> +device_initcall(ast2600_i2c_global_init); > > >> > > >> Maybe module_platform_driver() instead? > > > > > > Due to i2c global is top of all i2c bus like the scu, it make sure > > > the driver is > > before the i2c bus driver probe. > > > It is needed use device_initcal function. > > > > No, we do not do such ordering. device links and proper resource > > sharing handle the order. This must be module_platform_driver() > > (assuming we do not drop entire submission). > > > If global driver use module_platform_driver, does i2c driver will latter the > global driver probe? > If yes, I think it will workable. > > I find a good way instead. subsys_initcall(ast2600_i2c_global_init); is better ? Best regards, Ryan ^ permalink raw reply [flat|nested] 18+ messages in thread
[parent not found: <013cc486-dc70-a8b9-69d2-d0ae991549fd@linaro.org>]
* RE: [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver [not found] ` <013cc486-dc70-a8b9-69d2-d0ae991549fd@linaro.org> @ 2023-02-14 8:57 ` Ryan Chen 0 siblings, 0 replies; 18+ messages in thread From: Ryan Chen @ 2023-02-14 8:57 UTC (permalink / raw) To: Krzysztof Kozlowski, Jeremy Kerr, Rob Herring, Krzysztof Kozlowski, Joel Stanley, Andrew Jeffery, Philipp Zabel, openbmc, linux-arm-kernel, linux-aspeed, linux-kernel Hello Krzysztof, > > On 14/02/2023 07:12, Ryan Chen wrote: > > Hello Krzysztof, > >> > >>> On 02/02/2023 10:16, Ryan Chen wrote: > >>>>>>> +static struct platform_driver ast2600_i2c_global_driver = { > >>>>>> + .probe = ast2600_i2c_global_probe, > >>>>>> + .driver = { > >>>>>> + .name = KBUILD_MODNAME, > >>>>>> + .of_match_table = > >> ast2600_i2c_global_of_match, > >>>>>> + }, > >>>>>> +}; > >>>>>> + > >>>>>> +static int __init ast2600_i2c_global_init(void) { > >>>>>> + return > >>>>>> +platform_driver_register(&ast2600_i2c_global_driver); > >>>>>> +} > >>>>>> +device_initcall(ast2600_i2c_global_init); > >>>>> > >>>>> Maybe module_platform_driver() instead? > >>>> > >>>> Due to i2c global is top of all i2c bus like the scu, it make sure > >>>> the driver is > >>> before the i2c bus driver probe. > >>>> It is needed use device_initcal function. > >>> > >>> No, we do not do such ordering. device links and proper resource > >>> sharing handle the order. This must be module_platform_driver() > >>> (assuming we do not drop entire submission). > >> > >> > >> If global driver use module_platform_driver, does i2c driver will > >> latter the global driver probe? > >> If yes, I think it will workable. > >>> > > I find a good way instead. > > subsys_initcall(ast2600_i2c_global_init); is better ? > > Not really, this is not a subsystem. This is module platform driver so use it. > But, I need i2c-global to be early then i2c-ast2600 driver. The subsys_initcall is needed. I2c-global driver to initial full i2c clock and reset, after this, i2c bus driver(i2c-ast2600.c) can work. So I suggest to use subsys_initcall in i2c global driver. Is it ok? Best regards, ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2023-02-20 9:16 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-01 10:33 [PATCH v4 0/3] Add ASPEED AST2600 I2C new controller driver Ryan Chen
2023-02-01 10:33 ` [PATCH v4 1/3] dt-bindings: i2c-ast2600: Add support for AST2600 I2C global controller Ryan Chen
2023-02-02 4:25 ` Jeremy Kerr
2023-02-02 5:15 ` Ryan Chen
2023-02-01 10:33 ` [PATCH v4 2/3] dt-bindings: i2c-ast2600: Add support for AST2600 i2C driver Ryan Chen
[not found] ` <b0f55494-3a17-4d87-7b8f-5b078503cb53@linaro.org>
2023-02-15 5:43 ` Ryan Chen
2023-02-16 4:17 ` Dhananjay Phadke
2023-02-16 9:17 ` Ryan Chen
[not found] ` <b58fad13-12d5-346b-9452-d345c7bf5327@linaro.org>
2023-02-16 9:20 ` Ryan Chen
[not found] ` <c5aa358d-6fb8-9d4d-eef7-d3a8268229e8@linaro.org>
2023-02-16 9:26 ` Ryan Chen
[not found] ` <bb73393c-d642-0128-9e63-1a751f090a85@linaro.org>
2023-02-18 1:19 ` Ryan Chen
[not found] ` <861da92e-c1a0-f08c-1241-8e833c32674e@linaro.org>
2023-02-20 9:14 ` Ryan Chen
2023-02-01 10:33 ` [PATCH v4 3/3] i2c: aspeed: support ast2600 i2c new register mode driver Ryan Chen
2023-02-02 6:04 ` Jeremy Kerr
2023-02-02 9:16 ` Ryan Chen
[not found] ` <5239ea2f-284a-dcf5-6dd4-be3b13b319e6@linaro.org>
2023-02-02 10:03 ` Ryan Chen
2023-02-14 6:12 ` Ryan Chen
[not found] ` <013cc486-dc70-a8b9-69d2-d0ae991549fd@linaro.org>
2023-02-14 8:57 ` Ryan Chen
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).