* [PATCH v2 0/3] Add Qualcomm i3c master controller driver support
@ 2025-03-26 14:16 Mukesh Kumar Savaliya
2025-03-26 14:16 ` [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller Mukesh Kumar Savaliya
` (2 more replies)
0 siblings, 3 replies; 28+ messages in thread
From: Mukesh Kumar Savaliya @ 2025-03-26 14:16 UTC (permalink / raw)
To: alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula,
linux-i3c, linux-arm-msm, devicetree, linux-kernel
Cc: andersson, konradybcio, Mukesh Kumar Savaliya
This patchset adds i3c controller support for the qualcomm's QUPV3 based
Serial engine (SE) hardware controller.
The I3C SE(Serial Engine) controller implements I3C master functionality
as defined in the MIPI Specifications for I3C, Version 1.0.
This patchset was tested on Kailua SM8550 MTP device and data transfer
has been tested in I3C SDR mode.
Features tested and supported :
Standard CCC commands.
I3C SDR mode private transfers in PIO mode.
I2C transfers in PIO mode.
Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com>
----
Link to v1: https://lore.kernel.org/lkml/20250205143109.2955321-1-quic_msavaliy@quicinc.com/
Changes in V3:
- Removed bindings word from subject title of dt-bindings patch.
- Use Controller name instead of Master as per MIPI alliance guidance and updated title.
- Added description field for the i3c master into dt-bindings.
- Changed title to "Qualcomm Geni based QUP I3C Controller".
- Changed compatible to "qcom,i3c-master" matching dt-binding file and driver.
- Changed "interrupts-extended" property to "interrupts" as suggested by krzysztof.
- Dropped reg, clock minItems and added maxItems similar to other dt-bindings.
- Removed clock-names property from dt-bindings suggested by Krzysztof, Bjorn.
- Set "se-clock-frequency" set it within drivers as suggested by Rob.
- Removed "dfs-index" property and manage it within driver as suggested by Rob.
- Removed "interrupts" maxItems as we need only 1 interrupt in this change.
- Added comment for mutex lock mentioning purpose in sruct geni_i3c_dev .
- Return with dev_err_probe() instead of error log and then return -ENXIO from probe().
- Removed dev_dbg(&pdev->dev, "Geni I3C probed\n") print log as suggested by krzysztof.
- Removed CONFIG_PM and else part around runtime PM operations following other drivers.
- Removed Module alias MODULE_ALIAS("platform:geni_i3c_master").
- Replaced MASTER with GENI in the Title of MAINTAINER file.
- Removed duplications from the commit log and removed unwanted statement.
- Formatted license and copyright similar to other files.
- Removed SLV_ADDR_MSK and used FIELD_PREP/FIELD_GET instead of local bit shifting operations.
- Used direct bit positions for each internal Error bit of DM_I3C_CB_ERR.
- Removed Unused SLV_ADDR_MSK and added SLAVE_ADDR_MASK as GENMASK(15,9).
- Renamed spinlock as irq_lock.
- Removed dfs_idx from geni_i3c_dev and made it local inside qcom_geni_i3c_conf().
- Use boolean cur_is_write instead of enum i3c_trans_dir/gi3c->cur_rnw.
- Used DECLARE_BITMAP and related set/clear_bit APIs instead of manual operation.
- Inline the error messages from geni_i3c_err_log directly to improve readability
and avoid unnecessary jumps caused by the geni_i3c_err_code enum.
- Converted clk_src_freq of struct geni_i3c_clk_settings to HZ.
- Removed unwanted debug logs from geni_i3c_clk_map_idx().
- clk_od_fld and itr renamed to clk_od_idx and clk_idx respectively to map actual usage.
- Added se-clock-frequency to be read from DTSI, if none, then default to 100MHz source.
- Changed Error log during bus_init() if OD and PP mode frequencies avaiable or not.
- Used FIELD_PREP and standard BIT operations inside qcom_geni_i3c_conf() instead manual shifting.
- Removed unnecessary parentheses from geni_i3c_irq().
- Moved geni_se_abort_m_cmd() implementation to a new helper function geni_i3c_abort_xfer().
- Removed unwanted reinitialization of cur_len, cur_idx, cur_rnw from _i3c_geni_execute_command().
- Removed dev_dbg logs which were meant for developmental debug purpose.
- Removed unnecessary check nxfers <= 0 from geni_i3c_master_priv_xfers().
- Replaced devm_kzalloc() by kzalloc() inside geni_i3c_master_attach_i2c_dev() to use
kfree() from counter function geni_i3c_master_detach_i2c_dev().
- Replaced devm_kzalloc() by kzalloc() inside geni_i3c_master_attach_i3c_dev() to use
kfree() from counter function geni_i3c_master_detach_i3c_dev().
- Removed geni_i3c_master_reattach_i3c_dev() function as default returns 0.
- Removed goto label from geni_i3c_master_bus_init() by reorganizing internal code.
Also used i3c_geni_runtime_get_mutex_lock()/unlock() instead of get_sync() similar to other places.
- Added indent to fallthrough for switch cases inside geni_i3c_master_supports_ccc_cmd().
- Renamed i3c_geni_rsrcs_init() to i3c_geni_resources_init().
- Changed devm_ioremap_resource() to devm_platform_ioremap_resource(), removed platform_get_resource().
- Replaced dev_err() with dev_err_probe() for core clock named se-clk.
- Removed development debug prints for votings from gi3c->se.icc_paths.
- Probe(): Changed all dev_err() to dev_error_probe() with proper log messages.
- Probe(): Moved static resource allocation immediately after gi3c object allocation.
- Probe(): Disabled PM if i3c master registration fails during probe().
- Remove(): Unregister master first and then added Disable of PM as opposite to probe().
- Removed I3C_CCC_ENTHDR support as it's not supported.
---
Mukesh Kumar Savaliya (3):
dt-bindings: i3c: Add Qualcomm I3C master controller
i3c: master: Add Qualcomm I3C controller driver
MAINTAINERS: Add maintainer for Qualcomm's I3C driver
.../bindings/i3c/qcom,i3c-master.yaml | 60 +
MAINTAINERS | 8 +
drivers/i3c/master/Kconfig | 12 +
drivers/i3c/master/Makefile | 1 +
drivers/i3c/master/qcom-i3c-master.c | 1107 +++++++++++++++++
5 files changed, 1188 insertions(+)
create mode 100644 Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml
create mode 100644 drivers/i3c/master/qcom-i3c-master.c
--
2.25.1
^ permalink raw reply [flat|nested] 28+ messages in thread* [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-26 14:16 [PATCH v2 0/3] Add Qualcomm i3c master controller driver support Mukesh Kumar Savaliya @ 2025-03-26 14:16 ` Mukesh Kumar Savaliya 2025-03-26 14:23 ` Krzysztof Kozlowski 2025-03-26 14:16 ` [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver Mukesh Kumar Savaliya 2025-03-26 14:16 ` [PATCH v2 3/3] MAINTAINERS: Add maintainer for Qualcomm's I3C driver Mukesh Kumar Savaliya 2 siblings, 1 reply; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-26 14:16 UTC (permalink / raw) To: alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio, Mukesh Kumar Savaliya Add device tree bindings for the Qualcomm I3C controller. This includes the necessary documentation and properties required to describe the hardware in the device tree. Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> --- .../bindings/i3c/qcom,i3c-master.yaml | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml diff --git a/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml new file mode 100644 index 000000000000..af6b393f2327 --- /dev/null +++ b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/i3c/qcom,i3c-master.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Geni based QUP I3C Controller + +maintainers: + - Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> + +description: + I3C in master mode supports up to 12.5MHz, SDR mode data transfer in mixed + bus mode (I2C and I3C target devices on same i3c bus). It also supports + hotjoin, IBI mechanism. + + I3C Controller nodes must be child of GENI based Qualcomm Universal + Peripharal. Please refer GENI based QUP wrapper controller node bindings + described in Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml. + +allOf: + - $ref: i3c.yaml# + +properties: + compatible: + const: qcom,i3c-master + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + interrupts: + maxItems: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - interrupts + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + #include <dt-bindings/clock/qcom,sm8550-gcc.h> + + i3c@884000 { + compatible = "qcom,i3c-master"; + reg = <0x00884000 0x4000>; + clocks = <&gcc GCC_QUPV3_WRAP2_S1_CLK>; + clock-names = "se-clk"; + interrupts = <&intc GIC_SPI 583 IRQ_TYPE_LEVEL_HIGH>; + #address-cells = <3>; + #size-cells = <0>; + }; +... -- 2.25.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-26 14:16 ` [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller Mukesh Kumar Savaliya @ 2025-03-26 14:23 ` Krzysztof Kozlowski 2025-03-28 14:28 ` Mukesh Kumar Savaliya 0 siblings, 1 reply; 28+ messages in thread From: Krzysztof Kozlowski @ 2025-03-26 14:23 UTC (permalink / raw) To: Mukesh Kumar Savaliya, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio On 26/03/2025 15:16, Mukesh Kumar Savaliya wrote: > Add device tree bindings for the Qualcomm I3C controller. This includes > the necessary documentation and properties required to describe the > hardware in the device tree. > > Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> > --- > .../bindings/i3c/qcom,i3c-master.yaml | 60 +++++++++++++++++++ > 1 file changed, 60 insertions(+) > create mode 100644 Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml > > diff --git a/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml > new file mode 100644 > index 000000000000..af6b393f2327 > --- /dev/null > +++ b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml Naming: nothing improved. > @@ -0,0 +1,60 @@ > +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/i3c/qcom,i3c-master.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm Geni based QUP I3C Controller > + > +maintainers: > + - Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> > + > +description: > + I3C in master mode supports up to 12.5MHz, SDR mode data transfer in mixed > + bus mode (I2C and I3C target devices on same i3c bus). It also supports > + hotjoin, IBI mechanism. > + > + I3C Controller nodes must be child of GENI based Qualcomm Universal > + Peripharal. Please refer GENI based QUP wrapper controller node bindings > + described in Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml. > + > +allOf: > + - $ref: i3c.yaml# > + > +properties: > + compatible: > + const: qcom,i3c-master And this got worse. It makes also no sense either: how can you claim that this covers all possible future I3C masters from Qualcomm? What was the resolution of previous discussion? Best regards, Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-26 14:23 ` Krzysztof Kozlowski @ 2025-03-28 14:28 ` Mukesh Kumar Savaliya 2025-03-28 14:33 ` Krzysztof Kozlowski 0 siblings, 1 reply; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-28 14:28 UTC (permalink / raw) To: Krzysztof Kozlowski, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio Thanks Krzysztof for immediate review ! On 3/26/2025 7:53 PM, Krzysztof Kozlowski wrote: > On 26/03/2025 15:16, Mukesh Kumar Savaliya wrote: >> Add device tree bindings for the Qualcomm I3C controller. This includes >> the necessary documentation and properties required to describe the >> hardware in the device tree. >> >> Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> >> --- >> .../bindings/i3c/qcom,i3c-master.yaml | 60 +++++++++++++++++++ >> 1 file changed, 60 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml >> >> diff --git a/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml >> new file mode 100644 >> index 000000000000..af6b393f2327 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml > > Naming: nothing improved. > Sorry, i didn't get exactly. To your comment "Filename matching compatible." i have Changed the compatible string to "qcom,i3c-master" and now it's matching to file name. shall i make filename as qcom,i3c-master-qcom.yaml ? If this is wrong, please suggest. Removed "bindings" from the subject line too. I have removed "master" from the description, shall i remove from subject also and keep only controller ? I kept master controller thinking it may be good as "master controller" instead "controller". >> @@ -0,0 +1,60 @@ >> +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/i3c/qcom,i3c-master.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Qualcomm Geni based QUP I3C Controller >> + >> +maintainers: >> + - Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> >> + >> +description: >> + I3C in master mode supports up to 12.5MHz, SDR mode data transfer in mixed >> + bus mode (I2C and I3C target devices on same i3c bus). It also supports >> + hotjoin, IBI mechanism. >> + >> + I3C Controller nodes must be child of GENI based Qualcomm Universal >> + Peripharal. Please refer GENI based QUP wrapper controller node bindings >> + described in Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml. >> + >> +allOf: >> + - $ref: i3c.yaml# >> + >> +properties: >> + compatible: >> + const: qcom,i3c-master > > And this got worse. It makes also no sense either: how can you claim > that this covers all possible future I3C masters from Qualcomm? > > What was the resolution of previous discussion? > Below was my understanding and reply. " I think i should remove const. kept it for now as no other compatible to be added as of now. let me remove const. SoC name is not required, as this compatible is generic to all the SOCs. " But i realized i missed to remove const, sorry for that. I have also checked for qcom,spi-geni-qcom.yaml, it has below : properties: compatible: const: qcom,geni-spi Let me know if i can correct for SPI in separate new patch ? > Best regards, > Krzysztof > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-28 14:28 ` Mukesh Kumar Savaliya @ 2025-03-28 14:33 ` Krzysztof Kozlowski 2025-03-29 9:08 ` Mukesh Kumar Savaliya 0 siblings, 1 reply; 28+ messages in thread From: Krzysztof Kozlowski @ 2025-03-28 14:33 UTC (permalink / raw) To: Mukesh Kumar Savaliya, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio On 28/03/2025 15:28, Mukesh Kumar Savaliya wrote: > Thanks Krzysztof for immediate review ! > > On 3/26/2025 7:53 PM, Krzysztof Kozlowski wrote: >> On 26/03/2025 15:16, Mukesh Kumar Savaliya wrote: >>> Add device tree bindings for the Qualcomm I3C controller. This includes >>> the necessary documentation and properties required to describe the >>> hardware in the device tree. >>> >>> Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> >>> --- >>> .../bindings/i3c/qcom,i3c-master.yaml | 60 +++++++++++++++++++ >>> 1 file changed, 60 insertions(+) >>> create mode 100644 Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml >>> >>> diff --git a/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml >>> new file mode 100644 >>> index 000000000000..af6b393f2327 >>> --- /dev/null >>> +++ b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml >> >> Naming: nothing improved. >> > Sorry, i didn't get exactly. To your comment "Filename matching > compatible." i have Changed the compatible string to "qcom,i3c-master" > and now it's matching to file name. > > shall i make filename as qcom,i3c-master-qcom.yaml ? If this is wrong, > please suggest. > > Removed "bindings" from the subject line too. I have removed "master" > from the description, shall i remove from subject also and keep only > controller ? I kept master controller thinking it may be good as "master > controller" instead "controller". I still see the "master" in the compatible and filename. > > >>> @@ -0,0 +1,60 @@ >>> +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause >>> +%YAML 1.2 >>> +--- >>> +$id: http://devicetree.org/schemas/i3c/qcom,i3c-master.yaml# >>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>> + >>> +title: Qualcomm Geni based QUP I3C Controller >>> + >>> +maintainers: >>> + - Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> >>> + >>> +description: >>> + I3C in master mode supports up to 12.5MHz, SDR mode data transfer in mixed >>> + bus mode (I2C and I3C target devices on same i3c bus). It also supports >>> + hotjoin, IBI mechanism. >>> + >>> + I3C Controller nodes must be child of GENI based Qualcomm Universal >>> + Peripharal. Please refer GENI based QUP wrapper controller node bindings >>> + described in Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml. >>> + >>> +allOf: >>> + - $ref: i3c.yaml# >>> + >>> +properties: >>> + compatible: >>> + const: qcom,i3c-master >> >> And this got worse. It makes also no sense either: how can you claim >> that this covers all possible future I3C masters from Qualcomm? >> >> What was the resolution of previous discussion? >> > Below was my understanding and reply. > " > I think i should remove const. kept it for now as no other compatible to > be added as of now. > let me remove const. > SoC name is not required, as this compatible is generic to all the SOCs. I don't see any talks about const, what are you referring to? > " > > But i realized i missed to remove const, sorry for that. > > > I have also checked for qcom,spi-geni-qcom.yaml, it has below : > properties: > compatible: > const: qcom,geni-spi > > Let me know if i can correct for SPI in separate new patch ? I love such arguments - let's find whatever old bindings and whatever antipattern. What was the outcome of the discussion? I think was about geni, no? What did Rob write? So how did it became i3c-master? Best regards, Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-28 14:33 ` Krzysztof Kozlowski @ 2025-03-29 9:08 ` Mukesh Kumar Savaliya 2025-03-29 11:06 ` Krzysztof Kozlowski 0 siblings, 1 reply; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-29 9:08 UTC (permalink / raw) To: Krzysztof Kozlowski, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio On 3/28/2025 8:03 PM, Krzysztof Kozlowski wrote: > On 28/03/2025 15:28, Mukesh Kumar Savaliya wrote: >> Thanks Krzysztof for immediate review ! >> >> On 3/26/2025 7:53 PM, Krzysztof Kozlowski wrote: >>> On 26/03/2025 15:16, Mukesh Kumar Savaliya wrote: >>>> Add device tree bindings for the Qualcomm I3C controller. This includes >>>> the necessary documentation and properties required to describe the >>>> hardware in the device tree. >>>> >>>> Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> >>>> --- >>>> .../bindings/i3c/qcom,i3c-master.yaml | 60 +++++++++++++++++++ >>>> 1 file changed, 60 insertions(+) >>>> create mode 100644 Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml >>>> >>>> diff --git a/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml >>>> new file mode 100644 >>>> index 000000000000..af6b393f2327 >>>> --- /dev/null >>>> +++ b/Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml >>> >>> Naming: nothing improved. >>> >> Sorry, i didn't get exactly. To your comment "Filename matching >> compatible." i have Changed the compatible string to "qcom,i3c-master" >> and now it's matching to file name. >> >> shall i make filename as qcom,i3c-master-qcom.yaml ? If this is wrong, >> please suggest. >> >> Removed "bindings" from the subject line too. I have removed "master" >> from the description, shall i remove from subject also and keep only >> controller ? I kept master controller thinking it may be good as "master >> controller" instead "controller". > > I still see the "master" in the compatible and filename. > File Name : qcom,i3c-geni-qcom.yaml Compatible name : "qcom,i3c-geni" + Remove master from subject too "dt-bindings: i3c: Add Qualcomm I3C controller" will this be fine ? >> >> >>>> @@ -0,0 +1,60 @@ >>>> +# SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause >>>> +%YAML 1.2 >>>> +--- >>>> +$id: http://devicetree.org/schemas/i3c/qcom,i3c-master.yaml# >>>> +$schema: http://devicetree.org/meta-schemas/core.yaml# >>>> + >>>> +title: Qualcomm Geni based QUP I3C Controller >>>> + >>>> +maintainers: >>>> + - Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> >>>> + >>>> +description: >>>> + I3C in master mode supports up to 12.5MHz, SDR mode data transfer in mixed >>>> + bus mode (I2C and I3C target devices on same i3c bus). It also supports >>>> + hotjoin, IBI mechanism. >>>> + >>>> + I3C Controller nodes must be child of GENI based Qualcomm Universal >>>> + Peripharal. Please refer GENI based QUP wrapper controller node bindings >>>> + described in Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml. >>>> + >>>> +allOf: >>>> + - $ref: i3c.yaml# >>>> + >>>> +properties: >>>> + compatible: >>>> + const: qcom,i3c-master >>> >>> And this got worse. It makes also no sense either: how can you claim >>> that this covers all possible future I3C masters from Qualcomm? >>> >>> What was the resolution of previous discussion? >>> >> Below was my understanding and reply. >> " >> I think i should remove const. kept it for now as no other compatible to >> be added as of now. >> let me remove const. >> SoC name is not required, as this compatible is generic to all the SOCs. > > I don't see any talks about const, what are you referring to? > +properties: + compatible: + : qcom,i3c-geni will this be fine ? >> " >> >> But i realized i missed to remove const, sorry for that. >> >> >> I have also checked for qcom,spi-geni-qcom.yaml, it has below : >> properties: >> compatible: >> const: qcom,geni-spi >> >> Let me know if i can correct for SPI in separate new patch ? > > I love such arguments - let's find whatever old bindings and whatever > antipattern. Sure, once i know what should be the ideal pattern which is unique/should be unique, will share you other files. > > What was the outcome of the discussion? I think was about geni, no? What > did Rob write? So how did it became i3c-master? > yes, so "qcom,i3c-geni" is fine ? > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-29 9:08 ` Mukesh Kumar Savaliya @ 2025-03-29 11:06 ` Krzysztof Kozlowski 2025-03-29 14:31 ` Mukesh Kumar Savaliya 0 siblings, 1 reply; 28+ messages in thread From: Krzysztof Kozlowski @ 2025-03-29 11:06 UTC (permalink / raw) To: Mukesh Kumar Savaliya, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio On 29/03/2025 10:08, Mukesh Kumar Savaliya wrote: >>>>> + I3C in master mode supports up to 12.5MHz, SDR mode data transfer in mixed >>>>> + bus mode (I2C and I3C target devices on same i3c bus). It also supports >>>>> + hotjoin, IBI mechanism. >>>>> + >>>>> + I3C Controller nodes must be child of GENI based Qualcomm Universal >>>>> + Peripharal. Please refer GENI based QUP wrapper controller node bindings >>>>> + described in Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml. >>>>> + >>>>> +allOf: >>>>> + - $ref: i3c.yaml# >>>>> + >>>>> +properties: >>>>> + compatible: >>>>> + const: qcom,i3c-master >>>> >>>> And this got worse. It makes also no sense either: how can you claim >>>> that this covers all possible future I3C masters from Qualcomm? >>>> >>>> What was the resolution of previous discussion? >>>> >>> Below was my understanding and reply. >>> " >>> I think i should remove const. kept it for now as no other compatible to >>> be added as of now. >>> let me remove const. >>> SoC name is not required, as this compatible is generic to all the SOCs. >> >> I don't see any talks about const, what are you referring to? >> > +properties: > + compatible: > + : qcom,i3c-geni > will this be fine ? Yes, I think that was also suggested by Rob. Or rather follow existing style so qcom,geni-i3c for the compatible and filename. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-29 11:06 ` Krzysztof Kozlowski @ 2025-03-29 14:31 ` Mukesh Kumar Savaliya 2025-03-30 9:42 ` Krzysztof Kozlowski 0 siblings, 1 reply; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-29 14:31 UTC (permalink / raw) To: Krzysztof Kozlowski, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio On 3/29/2025 4:36 PM, Krzysztof Kozlowski wrote: > On 29/03/2025 10:08, Mukesh Kumar Savaliya wrote: >>>>>> + I3C in master mode supports up to 12.5MHz, SDR mode data transfer in mixed >>>>>> + bus mode (I2C and I3C target devices on same i3c bus). It also supports >>>>>> + hotjoin, IBI mechanism. >>>>>> + >>>>>> + I3C Controller nodes must be child of GENI based Qualcomm Universal >>>>>> + Peripharal. Please refer GENI based QUP wrapper controller node bindings >>>>>> + described in Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.yaml. >>>>>> + >>>>>> +allOf: >>>>>> + - $ref: i3c.yaml# >>>>>> + >>>>>> +properties: >>>>>> + compatible: >>>>>> + const: qcom,i3c-master >>>>> >>>>> And this got worse. It makes also no sense either: how can you claim >>>>> that this covers all possible future I3C masters from Qualcomm? >>>>> >>>>> What was the resolution of previous discussion? >>>>> >>>> Below was my understanding and reply. >>>> " >>>> I think i should remove const. kept it for now as no other compatible to >>>> be added as of now. >>>> let me remove const. >>>> SoC name is not required, as this compatible is generic to all the SOCs. >>> >>> I don't see any talks about const, what are you referring to? >>> >> +properties: >> + compatible: >> + : qcom,i3c-geni >> will this be fine ? > > Yes, I think that was also suggested by Rob. Or rather follow existing > style so qcom,geni-i3c for the compatible and filename. > Sure, makes sense. With below i3c becomes similar in naming conventions to spi, i2c, serial uart. Driver file name : i3c-qcom-geni.c dt-binding file name: qcom,i3c-geni-qcom.yaml compatible = "qcom,geni-i3c"; > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-29 14:31 ` Mukesh Kumar Savaliya @ 2025-03-30 9:42 ` Krzysztof Kozlowski 2025-03-31 6:52 ` Mukesh Kumar Savaliya 0 siblings, 1 reply; 28+ messages in thread From: Krzysztof Kozlowski @ 2025-03-30 9:42 UTC (permalink / raw) To: Mukesh Kumar Savaliya, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio On 29/03/2025 15:31, Mukesh Kumar Savaliya wrote: > dt-binding file name: qcom,i3c-geni-qcom.yaml No. I already asked to use compatible as filename. Don't create your own rules. > compatible = "qcom,geni-i3c"; >> >> Best regards, >> Krzysztof > Best regards, Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-30 9:42 ` Krzysztof Kozlowski @ 2025-03-31 6:52 ` Mukesh Kumar Savaliya 2025-03-31 7:06 ` Mukesh Kumar Savaliya 0 siblings, 1 reply; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-31 6:52 UTC (permalink / raw) To: Krzysztof Kozlowski, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio Thanks Krzysztof ! On 3/30/2025 3:12 PM, Krzysztof Kozlowski wrote: > On 29/03/2025 15:31, Mukesh Kumar Savaliya wrote: >> dt-binding file name: qcom,i3c-geni-qcom.yaml > > No. I already asked to use compatible as filename. Don't create your own > rules. > okay, no problem. I was trying to follow previous i2c,spi, serial uart. Let me make a cleanup patch for them also next as mentioned earlier. For i3c, compatible will be "geni-i3c" as suggested by you , Rob. dt-binding filename "qcom,i3c-geni.yaml" OR "qcom,geni-i3c.yaml" ? >> compatible = "qcom,geni-i3c"; >>> >>> Best regards, >>> Krzysztof >> > > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller 2025-03-31 6:52 ` Mukesh Kumar Savaliya @ 2025-03-31 7:06 ` Mukesh Kumar Savaliya 0 siblings, 0 replies; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-31 7:06 UTC (permalink / raw) To: Krzysztof Kozlowski, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio On 3/31/2025 12:22 PM, Mukesh Kumar Savaliya wrote: > Thanks Krzysztof ! > > On 3/30/2025 3:12 PM, Krzysztof Kozlowski wrote: >> On 29/03/2025 15:31, Mukesh Kumar Savaliya wrote: >>> dt-binding file name: qcom,i3c-geni-qcom.yaml >> >> No. I already asked to use compatible as filename. Don't create your own >> rules. >> > okay, no problem. I was trying to follow previous i2c,spi, serial uart. > Let me make a cleanup patch for them also next as mentioned earlier. > > For i3c, compatible will be "geni-i3c" as suggested by you , Rob. > dt-binding filename "qcom,i3c-geni.yaml" OR "qcom,geni-i3c.yaml" ? >>> compatible = "qcom,geni-i3c"; Please Ignore previous ask. I will go with filename = qcom,geni-i3c.yaml >>>> >>>> Best regards, >>>> Krzysztof >>> >> >> >> Best regards, >> Krzysztof > > ^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-26 14:16 [PATCH v2 0/3] Add Qualcomm i3c master controller driver support Mukesh Kumar Savaliya 2025-03-26 14:16 ` [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller Mukesh Kumar Savaliya @ 2025-03-26 14:16 ` Mukesh Kumar Savaliya 2025-03-26 14:28 ` Krzysztof Kozlowski ` (3 more replies) 2025-03-26 14:16 ` [PATCH v2 3/3] MAINTAINERS: Add maintainer for Qualcomm's I3C driver Mukesh Kumar Savaliya 2 siblings, 4 replies; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-26 14:16 UTC (permalink / raw) To: alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio, Mukesh Kumar Savaliya Add support for the Qualcomm I3C controller driver, which implements I3C master functionality as defined in the MIPI Alliance Specification for I3C, Version 1.0. This driver supports master role in SDR mode. Unlike some other I3C master controllers, this implementation does not support In-Band Interrupts (IBI) and Hot-join requests. Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> --- drivers/i3c/master/Kconfig | 12 + drivers/i3c/master/Makefile | 1 + drivers/i3c/master/qcom-i3c-master.c | 1107 ++++++++++++++++++++++++++ 3 files changed, 1120 insertions(+) create mode 100644 drivers/i3c/master/qcom-i3c-master.c diff --git a/drivers/i3c/master/Kconfig b/drivers/i3c/master/Kconfig index 77da199c7413..5370cadfe236 100644 --- a/drivers/i3c/master/Kconfig +++ b/drivers/i3c/master/Kconfig @@ -44,6 +44,18 @@ config SVC_I3C_MASTER help Support for Silvaco I3C Dual-Role Master Controller. +config QCOM_I3C_MASTER + tristate "Qualcomm Technologies Inc.'s I3C Master controller driver" + depends on I3C + help + This driver supports QUPV3 GENI based I3C controller in master + mode on the Qualcomm Technologies Inc.s SoCs. If you say yes to + this option, support will be included for the built-in I3C interface + on the Qualcomm Technologies Inc.s SoCs. + + This driver can also be built as a module. If so, the module + will be called qcom-i3c-master. + config MIPI_I3C_HCI tristate "MIPI I3C Host Controller Interface driver (EXPERIMENTAL)" depends on I3C diff --git a/drivers/i3c/master/Makefile b/drivers/i3c/master/Makefile index 3e97960160bc..f6670a63b34f 100644 --- a/drivers/i3c/master/Makefile +++ b/drivers/i3c/master/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_DW_I3C_MASTER) += dw-i3c-master.o obj-$(CONFIG_AST2600_I3C_MASTER) += ast2600-i3c-master.o obj-$(CONFIG_SVC_I3C_MASTER) += svc-i3c-master.o obj-$(CONFIG_MIPI_I3C_HCI) += mipi-i3c-hci/ +obj-$(CONFIG_QCOM_I3C_MASTER) += qcom-i3c-master.o diff --git a/drivers/i3c/master/qcom-i3c-master.c b/drivers/i3c/master/qcom-i3c-master.c new file mode 100644 index 000000000000..54778a6baa70 --- /dev/null +++ b/drivers/i3c/master/qcom-i3c-master.c @@ -0,0 +1,1107 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved. + * + * Author: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> + */ + +#include <linux/bits.h> +#include <linux/clk.h> +#include <linux/err.h> +#include <linux/i3c/master.h> +#include <linux/interrupt.h> +#include <linux/io.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/slab.h> +#include <linux/soc/qcom/geni-se.h> + +#define SE_I3C_SCL_HIGH 0x268 +#define SE_I3C_TX_TRANS_LEN 0x26C +#define SE_I3C_RX_TRANS_LEN 0x270 +#define SE_I3C_DELAY_COUNTER 0x274 +#define SE_I2C_SCL_COUNTERS 0x278 +#define SE_I3C_SCL_CYCLE 0x27C +#define SE_GENI_HW_IRQ_EN 0x920 +#define SE_GENI_HW_IRQ_IGNORE_ON_ACTIVE 0x924 +#define SE_GENI_HW_IRQ_CMD_PARAM_0 0x930 + +/* HW I3C IBI interrupt enable */ +#define M_IBI_IRQ_EN BIT(0) + +/* M_IBI_IRQ_IGNORE */ +#define M_IBI_IRQ_IGNORE BIT(0) + +/* SE_GENI_M_CLK_CFG field shifts */ +#define CLK_DIV_VALUE_MASK GENMASK(23, 4) +#define SER_CLK_EN BIT(0) + +/* SE_GENI_HW_IRQ_CMD_PARAM_0 field bits */ +#define M_IBI_IRQ_PARAM_7E BIT(0) +#define M_IBI_IRQ_PARAM_STOP_STALL BIT(1) +/* SE_I2C_SCL_COUNTERS field shifts */ +#define I2C_SCL_HIGH_COUNTER_MASK GENMASK(29, 20) +#define I2C_SCL_LOW_COUNTER_MASK GENMASK(19, 10) +#define I2C_SCL_CYCLE_COUNTER_MASK GENMASK(9, 0) + +#define SE_I3C_ERR (M_CMD_OVERRUN_EN | M_ILLEGAL_CMD_EN | M_CMD_FAILURE_EN |\ + M_CMD_ABORT_EN | M_GP_IRQ_0_EN | M_GP_IRQ_1_EN | M_GP_IRQ_2_EN | \ + M_GP_IRQ_3_EN | M_GP_IRQ_4_EN) + +/* M_CMD OP codes for I2C/I3C */ +#define I3C_READ_IBI_HW 0 +#define I2C_WRITE 1 +#define I2C_READ 2 +#define I2C_WRITE_READ 3 +#define I2C_ADDR_ONLY 4 +#define I3C_INBAND_RESET 5 +#define I2C_BUS_CLEAR 6 +#define I2C_STOP_ON_BUS 7 +#define I3C_HDR_DDR_EXIT 8 +#define I3C_PRIVATE_WRITE 9 +#define I3C_PRIVATE_READ 10 +#define I3C_HDR_DDR_WRITE 11 +#define I3C_HDR_DDR_READ 12 +#define I3C_DIRECT_CCC_ADDR_ONLY 13 +#define I3C_BCAST_CCC_ADDR_ONLY 14 +#define I3C_READ_IBI 15 +#define I3C_BCAST_CCC_WRITE 16 +#define I3C_DIRECT_CCC_WRITE 17 +#define I3C_DIRECT_CCC_READ 18 + +/* M_CMD params for I3C */ +#define PRE_CMD_DELAY BIT(0) +#define TIMESTAMP_BEFORE BIT(1) +#define STOP_STRETCH BIT(2) +#define TIMESTAMP_AFTER BIT(3) +#define POST_COMMAND_DELAY BIT(4) +#define IGNORE_ADD_NACK BIT(6) +#define READ_FINISHED_WITH_ACK BIT(7) +#define CONTINUOUS_MODE_DAA BIT(8) + +#define SLAVE_ADDR_MASK GENMASK(15, 9) +#define SLV_ADDR_SHFT 9 + +#define CCC_HDR_CMD_MSK GENMASK(23, 16) +#define CCC_HDR_CMD_SHFT 16 +#define IBI_NACK_TBL_CTRL BIT(24) +#define USE_7E BIT(25) +#define BYPASS_ADDR_PHASE BIT(26) + +/* GSI callback error fields - DMA_TX_IRQ_STAT */ +#define GP_IRQ0 BIT(5) +#define GP_IRQ1 BIT(6) +#define GP_IRQ2 BIT(7) +#define GP_IRQ3 BIT(8) +#define GP_IRQ4 BIT(9) +#define GP_IRQ5 BIT(10) +#define DM_I3C_CB_ERR GENMASK(10, 5) + +#define I3C_AUTO_SUSPEND_DELAY 250 +#define KHZ(freq) (1000 * (freq)) +#define PACKING_BYTES_PW 4 +#define XFER_TIMEOUT 250 +#define DFS_INDEX_MAX 7 + +#define I3C_ADDR_MASK 0x7f + +enum geni_i3c_err_code { + RD_TERM, + NACK, + CRC_ERR, + BUS_PROTO, + NACK_7E, + NACK_IBI, + GENI_OVERRUN, + GENI_ILLEGAL_CMD, + GENI_ABORT_DONE, + GENI_TIMEOUT, +}; + +enum i3c_bus_phase { + OPEN_DRAIN_MODE = 0, + PUSH_PULL_MODE = 1 +}; + +struct geni_i3c_dev { + struct geni_se se; + unsigned int tx_wm; + int irq; + int err; + struct i3c_master_controller ctrlr; + struct completion done; + /* Protects per device CCC command or transfer from get_mutex_lock()/unlock() wrapper */ + struct mutex lock; + /* Per device protection between process and IRQ context */ + spinlock_t irq_lock; + u32 clk_src_freq; + u8 *cur_buf; + bool cur_is_write; + int cur_len; + int cur_idx; + //unsigned long newaddrslots[(I3C_ADDR_MASK + 1) / BITS_PER_LONG]; + DECLARE_BITMAP(newaddrslots, 64); + + const struct geni_i3c_clk_settings *clk_cfg; + const struct geni_i3c_clk_settings *clk_od_cfg; +}; + +struct geni_i3c_i2c_dev_data { + u32 ibi_keeping; /* Plan to save IBI information, keep as dummy for now */ +}; + +struct geni_i3c_xfer_params { + enum geni_se_xfer_mode mode; + u32 m_cmd; + u32 m_param; +}; + +static inline struct geni_i3c_dev *to_geni_i3c_master(struct i3c_master_controller + *master) +{ + return container_of(master, struct geni_i3c_dev, ctrlr); +} + +struct geni_i3c_clk_settings { + u32 clk_freq_out; + u32 clk_src_freq; + u8 clk_div; + u8 i2c_t_high_cnt; + u8 i2c_t_low_cnt; + u8 i3c_t_high_cnt; + u8 i3c_t_cycle_cnt; + u8 i2c_t_cycle_cnt; +}; + +/* + * Hardware uses the underlying formula to calculate time periods of + * SCL clock cycle. Firmware uses some additional cycles excluded from the + * below formula and it is confirmed that the time periods are within + * specification limits. + * + * time of high period of I2C SCL: + * i2c_t_high = (i2c_t_high_cnt * clk_div) / source_clock + * time of low period of I2C SCL: + * i2c_t_low = (i2c_t_low_cnt * clk_div) / source_clock + * time of full period of I2C SCL: + * i2c_t_cycle = (i2c_t_cycle_cnt * clk_div) / source_clock + * time of high period of I3C SCL: + * i3c_t_high = (i3c_t_high_cnt * clk_div) / source_clock + * time of full period of I3C SCL: + * i3c_t_cycle = (i3c_t_cycle_cnt * clk_div) / source_clock + * clk_freq_out = t / t_cycle + */ +static const struct geni_i3c_clk_settings geni_i3c_clk_map[] = { +/* op-freq, src-freq, div, i2c_high, i2c_low, i3c_high, i3c_cyc i2c_cyc */ + { KHZ(100), KHZ(19200), 1, 76, 90, 7, 8, 192}, + { KHZ(400), KHZ(19200), 1, 12, 24, 7, 8, 48}, + { KHZ(1000), KHZ(19200), 1, 4, 9, 7, 0, 19}, + { KHZ(12500), KHZ(100000), 1, 45, 63, 6, 7, 110}, +}; + +static int geni_i3c_clk_map_idx(struct geni_i3c_dev *gi3c) +{ + const struct geni_i3c_clk_settings *clk_idx = geni_i3c_clk_map; + struct i3c_master_controller *m = &gi3c->ctrlr; + struct i3c_bus *bus = i3c_master_get_bus(m); + int i; + + for (i = 0; i < ARRAY_SIZE(geni_i3c_clk_map); i++, clk_idx++) { + if ((!bus || clk_idx->clk_freq_out == bus->scl_rate.i3c) && + clk_idx->clk_src_freq == gi3c->clk_src_freq) { + gi3c->clk_cfg = clk_idx; + } + + if (clk_idx->clk_freq_out == bus->scl_rate.i2c) + gi3c->clk_od_cfg = clk_idx; + } + + if (!gi3c->clk_cfg || !gi3c->clk_od_cfg) + return -EINVAL; + + return 0; +} + +static void set_new_addr_slot(unsigned long *addrslot, u8 addr) +{ + if (addr > I3C_ADDR_MASK) + return; + + set_bit(addr, addrslot); +} + +static void clear_new_addr_slot(unsigned long *addrslot, u8 addr) +{ + if (addr > I3C_ADDR_MASK) + return; + + clear_bit(addr, addrslot); +} + +static bool is_new_addr_slot_set(unsigned long *addrslot, u8 addr) +{ + if (addr > I3C_ADDR_MASK) + return false; + + return test_bit(addr, addrslot); +} + +static void qcom_geni_i3c_conf(struct geni_i3c_dev *gi3c, enum i3c_bus_phase bus_phase) +{ + const struct geni_i3c_clk_settings *clk_idx = gi3c->clk_cfg; + unsigned long freq; + u32 val, dfs_idx; + int ret; + + if (bus_phase == OPEN_DRAIN_MODE) + clk_idx = gi3c->clk_od_cfg; + + ret = geni_se_clk_freq_match(&gi3c->se, clk_idx->clk_src_freq, + &dfs_idx, &freq, false); + if (ret) + dfs_idx = 0; + + writel_relaxed(dfs_idx, gi3c->se.base + SE_GENI_CLK_SEL); + + val = FIELD_PREP(CLK_DIV_VALUE_MASK, clk_idx->clk_div); + val |= SER_CLK_EN; + writel_relaxed(val, gi3c->se.base + GENI_SER_M_CLK_CFG); + + val = FIELD_PREP(I2C_SCL_HIGH_COUNTER_MASK, clk_idx->i2c_t_high_cnt); + val |= FIELD_PREP(I2C_SCL_LOW_COUNTER_MASK, clk_idx->i2c_t_low_cnt); + val |= FIELD_PREP(I2C_SCL_CYCLE_COUNTER_MASK, clk_idx->i2c_t_cycle_cnt); + writel_relaxed(val, gi3c->se.base + SE_I2C_SCL_COUNTERS); + + writel_relaxed(clk_idx->i3c_t_cycle_cnt, gi3c->se.base + SE_I3C_SCL_CYCLE); + writel_relaxed(clk_idx->i3c_t_high_cnt, gi3c->se.base + SE_I3C_SCL_HIGH); + + writel_relaxed(M_IBI_IRQ_IGNORE, gi3c->se.base + SE_GENI_HW_IRQ_IGNORE_ON_ACTIVE); + + val = M_IBI_IRQ_PARAM_STOP_STALL | M_IBI_IRQ_PARAM_7E; + writel_relaxed(val, gi3c->se.base + SE_GENI_HW_IRQ_CMD_PARAM_0); + + writel_relaxed(M_IBI_IRQ_EN, gi3c->se.base + SE_GENI_HW_IRQ_EN); +} + +static void geni_i3c_handle_err(struct geni_i3c_dev *gi3c, u32 status) +{ + dev_dbg(gi3c->se.dev, "len:%d, %s\n", + gi3c->cur_len, gi3c->cur_is_write ? "write" : "read"); + + if (status & M_GP_IRQ_0_EN) { + gi3c->err = -EINVAL; + dev_dbg(gi3c->se.dev, "%s\n", "I3C slave early read termination"); + } + if (status & M_GP_IRQ_1_EN) { + gi3c->err = -ENOTCONN; + dev_dbg(gi3c->se.dev, "%s\n", "NACK: slave unresponsive, check power/reset"); + } + if (status & M_GP_IRQ_2_EN) { + gi3c->err = -EINVAL; + dev_dbg(gi3c->se.dev, "%s\n", "CRC or parity error"); + } + if (status & M_GP_IRQ_3_EN) { + gi3c->err = -EPROTO; + dev_dbg(gi3c->se.dev, "%s\n", "Bus proto Error, noisy/unexpected start/stop"); + } + if (status & M_GP_IRQ_4_EN) { + gi3c->err = -EBUSY; + dev_dbg(gi3c->se.dev, "%s\n", "NACK on 7E, unexpected protocol error"); + } + if (status & M_GP_IRQ_5_EN) { + gi3c->err = -EINVAL; + dev_dbg(gi3c->se.dev, "%s\n", "NACK on IBI"); + } + if (status & M_CMD_OVERRUN_EN) { + gi3c->err = -EIO; + dev_dbg(gi3c->se.dev, "%s\n", "Cmd overrun, check GENI cmd-state machine"); + } + if (status & M_ILLEGAL_CMD_EN) { + gi3c->err = -EILSEQ; + dev_dbg(gi3c->se.dev, "%s\n", "Illegal cmd, check GENI cmd-state machine"); + } + if (status & M_CMD_ABORT_EN) { + gi3c->err = -ETIMEDOUT; + dev_dbg(gi3c->se.dev, "%s\n", "Abort after timeout successful"); + } + if (status & GENI_TIMEOUT) { + gi3c->err = -ETIMEDOUT; + dev_dbg(gi3c->se.dev, "%s\n", "I3C transaction timed out"); + } +} + +static irqreturn_t geni_i3c_irq(int irq, void *dev) +{ + u32 m_stat_mask, dm_tx_st, dm_rx_st, m_stat, rx_st, dma; + struct geni_i3c_dev *gi3c = dev; + unsigned long flags; + int j; + + m_stat = readl_relaxed(gi3c->se.base + SE_GENI_M_IRQ_STATUS); + m_stat_mask = readl_relaxed(gi3c->se.base + SE_GENI_M_IRQ_EN); + rx_st = readl_relaxed(gi3c->se.base + SE_GENI_RX_FIFO_STATUS); + dm_tx_st = readl_relaxed(gi3c->se.base + SE_DMA_TX_IRQ_STAT); + dm_rx_st = readl_relaxed(gi3c->se.base + SE_DMA_RX_IRQ_STAT); + dma = readl_relaxed(gi3c->se.base + SE_GENI_DMA_MODE_EN); + + spin_lock_irqsave(&gi3c->irq_lock, flags); + + if (m_stat & SE_I3C_ERR || dm_rx_st & DM_I3C_CB_ERR) { + geni_i3c_handle_err(gi3c, m_stat); + /* Disable the TX Watermark interrupt to stop TX */ + if (!dma) + writel_relaxed(0, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); + goto irqret; + } + + if (dma) { + dev_dbg(gi3c->se.dev, "i3c dma tx:0x%x, dma rx:0x%x\n", dm_tx_st, dm_rx_st); + goto irqret; + } + + if ((m_stat & + (M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN)) && + !gi3c->cur_is_write && gi3c->cur_buf) { + u32 rxcnt = rx_st & RX_FIFO_WC_MSK; + + for (j = 0; j < rxcnt; j++) { + u32 val; + int p = 0; + + val = readl_relaxed(gi3c->se.base + SE_GENI_RX_FIFOn); + while (gi3c->cur_idx < gi3c->cur_len && p < sizeof(val)) { + gi3c->cur_buf[gi3c->cur_idx++] = val & 0xff; + val >>= 8; + p++; + } + if (gi3c->cur_idx == gi3c->cur_len) + break; + } + } else if (m_stat & M_TX_FIFO_WATERMARK_EN && + gi3c->cur_is_write && gi3c->cur_buf) { + for (j = 0; j < gi3c->tx_wm; j++) { + u32 temp; + u32 val = 0; + int p = 0; + + while (gi3c->cur_idx < gi3c->cur_len && p < sizeof(val)) { + temp = gi3c->cur_buf[gi3c->cur_idx++]; + val |= temp << (p * 8); + p++; + } + + writel_relaxed(val, gi3c->se.base + SE_GENI_TX_FIFOn); + if (gi3c->cur_idx == gi3c->cur_len) { + writel_relaxed(0, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); + break; + } + } + } + +irqret: + if (m_stat) + writel_relaxed(m_stat, gi3c->se.base + SE_GENI_M_IRQ_CLEAR); + + if (dma) { + if (dm_tx_st) + writel_relaxed(dm_tx_st, gi3c->se.base + SE_DMA_TX_IRQ_CLR); + if (dm_rx_st) + writel_relaxed(dm_rx_st, gi3c->se.base + SE_DMA_RX_IRQ_CLR); + } + + /* if this is err with done-bit not set, handle that through timeout. */ + if (m_stat & M_CMD_DONE_EN || m_stat & M_CMD_ABORT_EN) { + writel_relaxed(0, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); + complete(&gi3c->done); + } else if (dm_tx_st & TX_DMA_DONE || dm_rx_st & RX_DMA_DONE || + dm_rx_st & RX_RESET_DONE) { + complete(&gi3c->done); + } + + spin_unlock_irqrestore(&gi3c->irq_lock, flags); + return IRQ_HANDLED; +} + +static int i3c_geni_runtime_get_mutex_lock(struct geni_i3c_dev *gi3c) +{ + int ret; + + mutex_lock(&gi3c->lock); + reinit_completion(&gi3c->done); + ret = pm_runtime_get_sync(gi3c->se.dev); + if (ret < 0) { + dev_err(gi3c->se.dev, "error turning on SE resources:%d\n", ret); + pm_runtime_put_noidle(gi3c->se.dev); + /* Set device in suspended since resume failed */ + pm_runtime_set_suspended(gi3c->se.dev); + mutex_unlock(&gi3c->lock); + return ret; + } + + return 0; +} + +static void i3c_geni_runtime_put_mutex_unlock(struct geni_i3c_dev *gi3c) +{ + pm_runtime_mark_last_busy(gi3c->se.dev); + pm_runtime_put_autosuspend(gi3c->se.dev); + mutex_unlock(&gi3c->lock); +} + +static void geni_i3c_abort_xfer(struct geni_i3c_dev *gi3c) +{ + unsigned long time_remaining; + unsigned long flags; + + reinit_completion(&gi3c->done); + spin_lock_irqsave(&gi3c->irq_lock, flags); + geni_i3c_handle_err(gi3c, GENI_TIMEOUT); + geni_se_abort_m_cmd(&gi3c->se); + spin_unlock_irqrestore(&gi3c->irq_lock, flags); + time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT); + if (!time_remaining) + dev_err(gi3c->se.dev, "Timeout abort_m_cmd\n"); +} + +static int _i3c_geni_execute_command(struct geni_i3c_dev *gi3c, struct geni_i3c_xfer_params *xfer) +{ + bool is_write = gi3c->cur_is_write; + dma_addr_t tx_dma = 0, rx_dma = 0; + unsigned long time_remaining; + u32 len = gi3c->cur_len; + int ret; + + geni_se_select_mode(&gi3c->se, xfer->mode); + + gi3c->err = 0; + gi3c->cur_idx = 0; + + if (!is_write) { + dev_dbg(gi3c->se.dev, "I3C cmd:0x%x param:0x%x READ len:%d\n", + xfer->m_cmd, xfer->m_param, len); + writel_relaxed(len, gi3c->se.base + SE_I3C_RX_TRANS_LEN); + geni_se_setup_m_cmd(&gi3c->se, xfer->m_cmd, xfer->m_param); + if (xfer->mode == GENI_SE_DMA) { + ret = geni_se_rx_dma_prep(&gi3c->se, gi3c->cur_buf, len, &rx_dma); + if (ret) { + xfer->mode = GENI_SE_FIFO; + geni_se_select_mode(&gi3c->se, xfer->mode); + } + } + } else { + dev_dbg(gi3c->se.dev, "I3C cmd:0x%x param:0x%x WRITE len:%d\n", + xfer->m_cmd, xfer->m_param, len); + + writel_relaxed(len, gi3c->se.base + SE_I3C_TX_TRANS_LEN); + geni_se_setup_m_cmd(&gi3c->se, xfer->m_cmd, xfer->m_param); + + if (xfer->mode == GENI_SE_DMA) { + ret = geni_se_tx_dma_prep(&gi3c->se, gi3c->cur_buf, len, &tx_dma); + if (ret) { + xfer->mode = GENI_SE_FIFO; + geni_se_select_mode(&gi3c->se, xfer->mode); + } + } + + if (xfer->mode == GENI_SE_FIFO && len > 0) /* Get FIFO IRQ */ + writel_relaxed(1, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); + } + + time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT); + if (!time_remaining) { + unsigned long flags; + + dev_dbg(gi3c->se.dev, "Timeout completing FIFO transfer\n"); + spin_lock_irqsave(&gi3c->irq_lock, flags); + geni_i3c_handle_err(gi3c, GENI_TIMEOUT); + gi3c->cur_buf = NULL; + spin_unlock_irqrestore(&gi3c->irq_lock, flags); + geni_i3c_abort_xfer(gi3c); + } + + if (xfer->mode == GENI_SE_DMA) { + if (gi3c->err) { + if (is_write) + writel_relaxed(1, gi3c->se.base + SE_DMA_TX_FSM_RST); + else + writel_relaxed(1, gi3c->se.base + SE_DMA_RX_FSM_RST); + + time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT); + dev_dbg(gi3c->se.dev, "Timeout completing DMA transfer\n"); + } + geni_se_rx_dma_unprep(&gi3c->se, rx_dma, len); + geni_se_tx_dma_unprep(&gi3c->se, tx_dma, len); + } + + ret = gi3c->err; + if (gi3c->err) + dev_err(gi3c->se.dev, "I3C transaction error :%d\n", gi3c->err); + + gi3c->cur_buf = NULL; + gi3c->err = 0; + + return ret; +} + +static int i3c_geni_execute_read_command(struct geni_i3c_dev *gi3c, + struct geni_i3c_xfer_params *xfer, u8 *buf, u32 len) +{ + gi3c->cur_is_write = false; + gi3c->cur_buf = buf; + gi3c->cur_len = len; + return _i3c_geni_execute_command(gi3c, xfer); + //return geni_i3c_fifo_dma_xfer(gi3c, xfer); +} + +static int i3c_geni_execute_write_command(struct geni_i3c_dev *gi3c, + struct geni_i3c_xfer_params *xfer, u8 *buf, u32 len) +{ + gi3c->cur_is_write = true; + gi3c->cur_buf = buf; + gi3c->cur_len = len; + return _i3c_geni_execute_command(gi3c, xfer); + //return geni_i3c_fifo_dma_xfer(gi3c, xfer); +} + +static void geni_i3c_perform_daa(struct geni_i3c_dev *gi3c) +{ + u8 last_dyn_addr = 0; + int ret; + + while (1) { + u8 rx_buf[8], tx_buf[8]; + struct geni_i3c_xfer_params xfer = { GENI_SE_FIFO }; + struct i3c_device_info info = { 0 }; + struct i3c_dev_desc *i3cdev; + bool new_device = true; + u64 pid; + u8 bcr, dcr, addr; + + xfer.m_cmd = I2C_READ; + xfer.m_param = STOP_STRETCH | CONTINUOUS_MODE_DAA | USE_7E; + ret = i3c_geni_execute_read_command(gi3c, &xfer, rx_buf, 8); + if (ret) + break; + + dcr = rx_buf[7]; + bcr = rx_buf[6]; + pid = ((u64)rx_buf[0] << 40) | + ((u64)rx_buf[1] << 32) | + ((u64)rx_buf[2] << 24) | + ((u64)rx_buf[3] << 16) | + ((u64)rx_buf[4] << 8) | + ((u64)rx_buf[5]); + + i3c_bus_for_each_i3cdev(&gi3c->ctrlr.bus, i3cdev) { + i3c_device_get_info(i3cdev->dev, &info); + if (pid == info.pid && dcr == info.dcr && bcr == info.bcr) { + new_device = false; + addr = (info.dyn_addr) ? info.dyn_addr : + info.static_addr; + break; + } + } + + if (new_device) { + ret = i3c_master_get_free_addr(&gi3c->ctrlr, last_dyn_addr + 1); + if (ret < 0) + break; + addr = (u8)ret; + last_dyn_addr = (u8)ret; + set_new_addr_slot(gi3c->newaddrslots, addr); + } + + tx_buf[0] = (addr & I3C_ADDR_MASK) << 1; + tx_buf[0] |= ~(hweight8(addr & I3C_ADDR_MASK) & 1); + + xfer.m_cmd = I2C_WRITE; + xfer.m_param = STOP_STRETCH | BYPASS_ADDR_PHASE | USE_7E; + + ret = i3c_geni_execute_write_command(gi3c, &xfer, tx_buf, 1); + if (ret) + break; + } +} + +static int geni_i3c_master_send_ccc_cmd(struct i3c_master_controller *m, + struct i3c_ccc_cmd *cmd) +{ + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); + int i, ret; + + if (!(cmd->id & I3C_CCC_DIRECT) && cmd->ndests != 1) + return -EINVAL; + + ret = i3c_geni_runtime_get_mutex_lock(gi3c); + if (ret) + return ret; + + qcom_geni_i3c_conf(gi3c, OPEN_DRAIN_MODE); + for (i = 0; i < cmd->ndests; i++) { + int stall = (i < (cmd->ndests - 1)) || + (cmd->id == I3C_CCC_ENTDAA); + struct geni_i3c_xfer_params xfer = { GENI_SE_FIFO }; + + xfer.m_param = (stall ? STOP_STRETCH : 0); + xfer.m_param |= (cmd->id << CCC_HDR_CMD_SHFT); + xfer.m_param |= IBI_NACK_TBL_CTRL; + if (cmd->id & I3C_CCC_DIRECT) { + xfer.m_param |= FIELD_PREP(SLAVE_ADDR_MASK, cmd->dests[i].addr); + if (cmd->rnw) { + if (i == 0) + xfer.m_cmd = I3C_DIRECT_CCC_READ; + else + xfer.m_cmd = I3C_PRIVATE_READ; + } else { + if (i == 0) + xfer.m_cmd = + (cmd->dests[i].payload.len > 0) ? + I3C_DIRECT_CCC_WRITE : + I3C_DIRECT_CCC_ADDR_ONLY; + else + xfer.m_cmd = I3C_PRIVATE_WRITE; + } + } else { + if (cmd->dests[i].payload.len > 0) + xfer.m_cmd = I3C_BCAST_CCC_WRITE; + else + xfer.m_cmd = I3C_BCAST_CCC_ADDR_ONLY; + } + + if (i == 0) + xfer.m_param |= USE_7E; + + if (cmd->rnw) + ret = i3c_geni_execute_read_command(gi3c, &xfer, + cmd->dests[i].payload.data, + cmd->dests[i].payload.len); + else + ret = i3c_geni_execute_write_command(gi3c, &xfer, + cmd->dests[i].payload.data, + cmd->dests[i].payload.len); + if (ret) + break; + + if (cmd->id == I3C_CCC_ENTDAA) + geni_i3c_perform_daa(gi3c); + } + + i3c_geni_runtime_put_mutex_unlock(gi3c); + return ret; +} + +static int geni_i3c_master_priv_xfers(struct i3c_dev_desc *dev, struct i3c_priv_xfer *xfers, + int nxfers) +{ + struct i3c_master_controller *m = i3c_dev_get_master(dev); + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); + bool use_7e = false; + int i, ret; + + ret = i3c_geni_runtime_get_mutex_lock(gi3c); + if (ret) + return ret; + + qcom_geni_i3c_conf(gi3c, PUSH_PULL_MODE); + + for (i = 0; i < nxfers; i++) { + bool stall = (i < (nxfers - 1)); + struct geni_i3c_xfer_params xfer = { GENI_SE_FIFO }; + + xfer.m_param = (stall ? STOP_STRETCH : 0); + xfer.m_param |= FIELD_PREP(SLAVE_ADDR_MASK, dev->info.dyn_addr); + xfer.m_param |= (use_7e) ? USE_7E : 0; + + /* use_7e = true only for last transfer */ + use_7e = (i == nxfers - 1); + + if (xfers[i].rnw) { + xfer.m_cmd = I3C_PRIVATE_READ; + ret = i3c_geni_execute_read_command(gi3c, &xfer, (u8 *)xfers[i].data.in, + xfers[i].len); + } else { + xfer.m_cmd = I3C_PRIVATE_WRITE; + ret = i3c_geni_execute_write_command(gi3c, &xfer, (u8 *)xfers[i].data.out, + xfers[i].len); + } + + if (ret) + break; + } + + dev_dbg(gi3c->se.dev, "i3c priv: txn ret:%d\n", ret); + i3c_geni_runtime_put_mutex_unlock(gi3c); + return ret; +} + +static int geni_i3c_master_i2c_xfers(struct i2c_dev_desc *dev, const struct i2c_msg *msgs, int num) +{ + struct i3c_master_controller *m = i2c_dev_get_master(dev); + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); + int i, ret; + + ret = i3c_geni_runtime_get_mutex_lock(gi3c); + if (ret) + return ret; + + qcom_geni_i3c_conf(gi3c, PUSH_PULL_MODE); + + for (i = 0; i < num; i++) { + struct geni_i3c_xfer_params xfer; + + xfer.m_cmd = (msgs[i].flags & I2C_M_RD) ? I2C_READ : I2C_WRITE; + xfer.m_param = (i < (num - 1)) ? STOP_STRETCH : 0; + xfer.m_param |= FIELD_PREP(SLAVE_ADDR_MASK, msgs[i].addr); + xfer.mode = msgs[i].len > 32 ? GENI_SE_DMA : GENI_SE_FIFO; + if (msgs[i].flags & I2C_M_RD) + ret = i3c_geni_execute_read_command(gi3c, &xfer, msgs[i].buf, msgs[i].len); + else + ret = i3c_geni_execute_write_command(gi3c, &xfer, msgs[i].buf, msgs[i].len); + if (ret) + break; + } + + dev_dbg(gi3c->se.dev, "i2c: txn ret:%d\n", ret); + i3c_geni_runtime_put_mutex_unlock(gi3c); + return ret; +} + +static int geni_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev) +{ + struct geni_i3c_i2c_dev_data *data; + + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + i2c_dev_set_master_data(dev, data); + return 0; +} + +static void geni_i3c_master_detach_i2c_dev(struct i2c_dev_desc *dev) +{ + struct geni_i3c_i2c_dev_data *data = i2c_dev_get_master_data(dev); + + i2c_dev_set_master_data(dev, NULL); + kfree(data); +} + +static int geni_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev) +{ + struct geni_i3c_i2c_dev_data *data; + + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + i3c_dev_set_master_data(dev, data); + return 0; +} + +static void geni_i3c_master_detach_i3c_dev(struct i3c_dev_desc *dev) +{ + struct geni_i3c_i2c_dev_data *data = i3c_dev_get_master_data(dev); + + i3c_dev_set_master_data(dev, NULL); + kfree(data); +} + +static int geni_i3c_master_do_daa(struct i3c_master_controller *m) +{ + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); + u8 addr; + int ret; + + ret = i3c_master_entdaa_locked(m); + if (ret && ret != I3C_ERROR_M2) + return ret; + + for (addr = 0; addr <= I3C_ADDR_MASK; addr++) { + if (is_new_addr_slot_set(gi3c->newaddrslots, addr)) { + clear_new_addr_slot(gi3c->newaddrslots, addr); + i3c_master_add_i3c_dev_locked(m, addr); + } + } + + return 0; +} + +static int geni_i3c_master_bus_init(struct i3c_master_controller *m) +{ + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); + struct i3c_bus *bus = i3c_master_get_bus(m); + struct i3c_device_info info = { }; + int ret; + + /* Get an address for the master. */ + ret = i3c_master_get_free_addr(m, 0); + if (ret < 0) + dev_err(gi3c->se.dev, "%s: error No free addr:%d\n", __func__, ret); + + info.dyn_addr = ret; + info.dcr = I3C_DCR_GENERIC_DEVICE; + info.bcr = I3C_BCR_I3C_MASTER | I3C_BCR_HDR_CAP; + info.pid = 0; + + ret = geni_i3c_clk_map_idx(gi3c); + if (ret) + dev_err(gi3c->se.dev, + "Invalid clk frequency %d Hz src for %ld Hz bus: %d\n", + gi3c->clk_src_freq, bus->scl_rate.i3c, ret); + + ret = i3c_geni_runtime_get_mutex_lock(gi3c); + if (ret) + return ret; + + qcom_geni_i3c_conf(gi3c, OPEN_DRAIN_MODE); + + ret = i3c_master_set_info(&gi3c->ctrlr, &info); + i3c_geni_runtime_put_mutex_unlock(gi3c); + return ret; +} + +static bool geni_i3c_master_supports_ccc_cmd(struct i3c_master_controller *m, + const struct i3c_ccc_cmd *cmd) +{ + switch (cmd->id) { + case I3C_CCC_ENEC(true): + fallthrough; + case I3C_CCC_ENEC(false): + fallthrough; + case I3C_CCC_DISEC(true): + fallthrough; + case I3C_CCC_DISEC(false): + fallthrough; + case I3C_CCC_ENTAS(0, true): + fallthrough; + case I3C_CCC_ENTAS(0, false): + fallthrough; + case I3C_CCC_RSTDAA(true): + fallthrough; + case I3C_CCC_RSTDAA(false): + fallthrough; + case I3C_CCC_ENTDAA: + fallthrough; + case I3C_CCC_SETMWL(true): + fallthrough; + case I3C_CCC_SETMWL(false): + fallthrough; + case I3C_CCC_SETMRL(true): + fallthrough; + case I3C_CCC_SETMRL(false): + fallthrough; + case I3C_CCC_DEFSLVS: + fallthrough; + case I3C_CCC_SETDASA: + fallthrough; + case I3C_CCC_SETNEWDA: + fallthrough; + case I3C_CCC_GETMWL: + fallthrough; + case I3C_CCC_GETMRL: + fallthrough; + case I3C_CCC_GETPID: + fallthrough; + case I3C_CCC_GETBCR: + fallthrough; + case I3C_CCC_GETDCR: + fallthrough; + case I3C_CCC_GETSTATUS: + fallthrough; + case I3C_CCC_GETACCMST: + fallthrough; + case I3C_CCC_GETMXDS: + fallthrough; + case I3C_CCC_GETHDRCAP: + return true; + + default: + return false; + } +} + +static const struct i3c_master_controller_ops geni_i3c_master_ops = { + .bus_init = geni_i3c_master_bus_init, + .bus_cleanup = NULL, + .do_daa = geni_i3c_master_do_daa, + .attach_i3c_dev = geni_i3c_master_attach_i3c_dev, + .reattach_i3c_dev = NULL, + .detach_i3c_dev = geni_i3c_master_detach_i3c_dev, + .attach_i2c_dev = geni_i3c_master_attach_i2c_dev, + .detach_i2c_dev = geni_i3c_master_detach_i2c_dev, + .supports_ccc_cmd = geni_i3c_master_supports_ccc_cmd, + .send_ccc_cmd = geni_i3c_master_send_ccc_cmd, + .priv_xfers = geni_i3c_master_priv_xfers, + .i2c_xfers = geni_i3c_master_i2c_xfers, + .enable_ibi = NULL, + .disable_ibi = NULL, + .request_ibi = NULL, + .free_ibi = NULL, + .recycle_ibi_slot = NULL, +}; + +static int i3c_geni_resources_init(struct geni_i3c_dev *gi3c, struct platform_device *pdev) +{ + int ret; + + gi3c->se.base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(gi3c->se.base)) + return PTR_ERR(gi3c->se.base); + + gi3c->se.clk = devm_clk_get(&pdev->dev, "se-clk"); + if (IS_ERR(gi3c->se.clk)) + return dev_err_probe(&pdev->dev, PTR_ERR(gi3c->se.clk), + "Unable to get serial engine core clock: %pe\n", + gi3c->se.clk); + + ret = device_property_read_u32(&pdev->dev, "se-clock-frequency", &gi3c->clk_src_freq); + if (ret) { + dev_info(&pdev->dev, "SE clk freq not specified, default to 100 MHz.\n"); + /* Default source clock freq is 100Mhz */ + gi3c->clk_src_freq = KHZ(100000); + } + + ret = geni_icc_get(&gi3c->se, NULL); + if (ret) + return ret; + + /* Set the bus quota to a reasonable value for register access */ + gi3c->se.icc_paths[GENI_TO_CORE].avg_bw = GENI_DEFAULT_BW; + gi3c->se.icc_paths[CPU_TO_GENI].avg_bw = GENI_DEFAULT_BW; + ret = geni_icc_set_bw(&gi3c->se); + if (ret) + return ret; + + return 0; +} + +static int geni_i3c_probe(struct platform_device *pdev) +{ + u32 proto, tx_depth, fifo_disable; + struct geni_i3c_dev *gi3c; + int ret; + + gi3c = devm_kzalloc(&pdev->dev, sizeof(*gi3c), GFP_KERNEL); + if (!gi3c) + return -ENOMEM; + + gi3c->se.dev = &pdev->dev; + gi3c->se.wrapper = dev_get_drvdata(pdev->dev.parent); + + init_completion(&gi3c->done); + mutex_init(&gi3c->lock); + spin_lock_init(&gi3c->irq_lock); + platform_set_drvdata(pdev, gi3c); + + ret = i3c_geni_resources_init(gi3c, pdev); + if (ret) + return dev_err_probe(&pdev->dev, ret, "Error Initializing GENI Resources\n"); + + gi3c->irq = platform_get_irq(pdev, 0); + if (gi3c->irq < 0) + return dev_err_probe(&pdev->dev, gi3c->irq, "Error getting IRQ number for I3C\n"); + + ret = devm_request_irq(&pdev->dev, gi3c->irq, geni_i3c_irq, + IRQF_NO_AUTOEN, dev_name(&pdev->dev), gi3c); + if (ret) + return dev_err_probe(&pdev->dev, ret, "Error registering core IRQ\n"); + + ret = geni_se_resources_on(&gi3c->se); + if (ret) + return dev_err_probe(&pdev->dev, ret, "Error turning resources ON\n"); + + proto = geni_se_read_proto(&gi3c->se); + if (proto != GENI_SE_I3C) { + geni_se_resources_off(&gi3c->se); + return dev_err_probe(&pdev->dev, -ENXIO, "Invalid proto %d\n", proto); + } + + fifo_disable = readl_relaxed(gi3c->se.base + GENI_IF_DISABLE_RO); + if (fifo_disable) { + geni_se_resources_off(&gi3c->se); + return dev_err_probe(&pdev->dev, -ENXIO, "GPI DMA mode not supported\n"); + } + + tx_depth = geni_se_get_tx_fifo_depth(&gi3c->se); + gi3c->tx_wm = tx_depth - 1; + geni_se_init(&gi3c->se, gi3c->tx_wm, tx_depth); + geni_se_config_packing(&gi3c->se, BITS_PER_BYTE, PACKING_BYTES_PW, true, true, true); + geni_se_resources_off(&gi3c->se); + dev_dbg(&pdev->dev, "i3c fifo/se-dma mode. fifo depth:%d\n", tx_depth); + + pm_runtime_set_autosuspend_delay(gi3c->se.dev, I3C_AUTO_SUSPEND_DELAY); + pm_runtime_use_autosuspend(gi3c->se.dev); + pm_runtime_set_active(gi3c->se.dev); + pm_runtime_enable(gi3c->se.dev); + + ret = i3c_master_register(&gi3c->ctrlr, &pdev->dev, &geni_i3c_master_ops, false); + if (ret) { + pm_runtime_disable(gi3c->se.dev); + pm_runtime_set_suspended(gi3c->se.dev); + pm_runtime_dont_use_autosuspend(gi3c->se.dev); + return ret; + } + + return ret; +} + +static void geni_i3c_remove(struct platform_device *pdev) +{ + struct geni_i3c_dev *gi3c = platform_get_drvdata(pdev); + + i3c_master_unregister(&gi3c->ctrlr); + pm_runtime_disable(gi3c->se.dev); + pm_runtime_set_suspended(gi3c->se.dev); + pm_runtime_dont_use_autosuspend(gi3c->se.dev); +} + +static int geni_i3c_runtime_suspend(struct device *dev) +{ + struct geni_i3c_dev *gi3c = dev_get_drvdata(dev); + + disable_irq(gi3c->irq); + geni_se_resources_off(&gi3c->se); + return 0; +} + +static int geni_i3c_runtime_resume(struct device *dev) +{ + int ret; + struct geni_i3c_dev *gi3c = dev_get_drvdata(dev); + + ret = geni_se_resources_on(&gi3c->se); + if (ret) + return ret; + enable_irq(gi3c->irq); + return 0; +} + +static const struct dev_pm_ops geni_i3c_pm_ops = { + SET_RUNTIME_PM_OPS(geni_i3c_runtime_suspend, geni_i3c_runtime_resume, NULL) +}; + +static const struct of_device_id geni_i3c_dt_match[] = { + { .compatible = "qcom,i3c-master" }, + { } +}; +MODULE_DEVICE_TABLE(of, geni_i3c_dt_match); + +static struct platform_driver geni_i3c_master = { + .probe = geni_i3c_probe, + .remove = geni_i3c_remove, + .driver = { + .name = "geni_i3c_master", + .pm = &geni_i3c_pm_ops, + .of_match_table = geni_i3c_dt_match, + }, +}; + +module_platform_driver(geni_i3c_master); + +MODULE_AUTHOR("Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com>"); +MODULE_DESCRIPTION("Qualcomm I3C Controller Driver for GENI based QUP cores"); +MODULE_LICENSE("GPL"); -- 2.25.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
* Re: [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-26 14:16 ` [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver Mukesh Kumar Savaliya @ 2025-03-26 14:28 ` Krzysztof Kozlowski 2025-03-28 14:28 ` Mukesh Kumar Savaliya 2025-03-26 20:03 ` Frank Li ` (2 subsequent siblings) 3 siblings, 1 reply; 28+ messages in thread From: Krzysztof Kozlowski @ 2025-03-26 14:28 UTC (permalink / raw) To: Mukesh Kumar Savaliya, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel, Trilok Soni Cc: andersson, konradybcio On 26/03/2025 15:16, Mukesh Kumar Savaliya wrote: > + > +static int i3c_geni_resources_init(struct geni_i3c_dev *gi3c, struct platform_device *pdev) > +{ > + int ret; > + > + gi3c->se.base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(gi3c->se.base)) > + return PTR_ERR(gi3c->se.base); > + > + gi3c->se.clk = devm_clk_get(&pdev->dev, "se-clk"); Never tested. > + if (IS_ERR(gi3c->se.clk)) > + return dev_err_probe(&pdev->dev, PTR_ERR(gi3c->se.clk), > + "Unable to get serial engine core clock: %pe\n", > + gi3c->se.clk); > + > + ret = device_property_read_u32(&pdev->dev, "se-clock-frequency", &gi3c->clk_src_freq); I don't see previous comments implemented. Comment was: "Drop". You did not test the DTS - again - even though I asked for that. You claim you did internal review, but I have doubts because internal review would tell you how to test it (there is comprehensive internal guide - see go/upstream). Then the testing would point out this issue. Such trivial things should not be in v1 even. But they happened so you got the review. Now you sent v2 ignoring that public review. Sorry guys, please improve internal processes instead of wasting reviewers time. NAK. Best regards, Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-26 14:28 ` Krzysztof Kozlowski @ 2025-03-28 14:28 ` Mukesh Kumar Savaliya 2025-03-28 14:35 ` Krzysztof Kozlowski 0 siblings, 1 reply; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-28 14:28 UTC (permalink / raw) To: Krzysztof Kozlowski, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel, Trilok Soni Cc: andersson, konradybcio Thanks Krzysztof for correcting ! On 3/26/2025 7:58 PM, Krzysztof Kozlowski wrote: > On 26/03/2025 15:16, Mukesh Kumar Savaliya wrote: >> + >> +static int i3c_geni_resources_init(struct geni_i3c_dev *gi3c, struct platform_device *pdev) >> +{ >> + int ret; >> + >> + gi3c->se.base = devm_platform_ioremap_resource(pdev, 0); >> + if (IS_ERR(gi3c->se.base)) >> + return PTR_ERR(gi3c->se.base); >> + >> + gi3c->se.clk = devm_clk_get(&pdev->dev, "se-clk"); > > Never tested. > sorry, i ran and i got below error now: i3c@884000: Unevaluated properties are not allowed ('clock-names', 'interrupts' were unexpected). so i have made below change and ran dt_binding_check + dtbs_check, i could fix the issue. Let me have this review internally specific to dt-binding and will post next patch after internal review. So i can avoid such misses. yaml : + clock-names: + const: se + - - interrupts-extended + - interrupts example: clock-names = "se"; >> + if (IS_ERR(gi3c->se.clk)) >> + return dev_err_probe(&pdev->dev, PTR_ERR(gi3c->se.clk), >> + "Unable to get serial engine core clock: %pe\n", >> + gi3c->se.clk); >> + >> + ret = device_property_read_u32(&pdev->dev, "se-clock-frequency", &gi3c->clk_src_freq); > > I don't see previous comments implemented. Comment was: "Drop". > > You did not test the DTS - again - even though I asked for that. > Sorry for miss. I did test for this but what happened is while i worked for multiple other changes, i did miss merging of removal of se-clock-frequency from the driver code. I had hard-coded it instead of removing because we don't give this frequency selection to user right now. > You claim you did internal review, but I have doubts because internal > review would tell you how to test it (there is comprehensive internal > guide - see go/upstream). Then the testing would point out this issue. > > Such trivial things should not be in v1 even. But they happened so you > got the review. Now you sent v2 ignoring that public review. > > Sorry guys, please improve internal processes instead of wasting > reviewers time. > Sure, i agree there are misses. will have internal review with dt-bindings and related changes in driver, then will post V3. > NAK. > > Best regards, > Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-28 14:28 ` Mukesh Kumar Savaliya @ 2025-03-28 14:35 ` Krzysztof Kozlowski 0 siblings, 0 replies; 28+ messages in thread From: Krzysztof Kozlowski @ 2025-03-28 14:35 UTC (permalink / raw) To: Mukesh Kumar Savaliya, alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel, Trilok Soni Cc: andersson, konradybcio On 28/03/2025 15:28, Mukesh Kumar Savaliya wrote: > Thanks Krzysztof for correcting ! > > On 3/26/2025 7:58 PM, Krzysztof Kozlowski wrote: >> On 26/03/2025 15:16, Mukesh Kumar Savaliya wrote: >>> + >>> +static int i3c_geni_resources_init(struct geni_i3c_dev *gi3c, struct platform_device *pdev) >>> +{ >>> + int ret; >>> + >>> + gi3c->se.base = devm_platform_ioremap_resource(pdev, 0); >>> + if (IS_ERR(gi3c->se.base)) >>> + return PTR_ERR(gi3c->se.base); >>> + >>> + gi3c->se.clk = devm_clk_get(&pdev->dev, "se-clk"); >> >> Never tested. >> > sorry, i ran and i got below error now: Please do the tests *before* you post changes You do not need community reviewer to tell you to do static/compile time checks on your code. > i3c@884000: Unevaluated properties are not allowed ('clock-names', > 'interrupts' were unexpected). > > so i have made below change and ran dt_binding_check + dtbs_check, i > could fix the issue. Let me have this review internally specific to > dt-binding and will post next patch after internal review. So i can > avoid such misses. > > yaml : > + clock-names: > + const: se > + > - - interrupts-extended > + - interrupts > > example: > clock-names = "se"; No, drop clock names entirely, not really useful for one entry using block's name. Just get the first clock, like most of the drivers. > Best regards, Krzysztof ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-26 14:16 ` [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver Mukesh Kumar Savaliya 2025-03-26 14:28 ` Krzysztof Kozlowski @ 2025-03-26 20:03 ` Frank Li 2025-03-29 9:09 ` Mukesh Kumar Savaliya 2025-03-28 13:19 ` Markus Elfring 2025-03-28 13:28 ` [PATCH v2 " Markus Elfring 3 siblings, 1 reply; 28+ messages in thread From: Frank Li @ 2025-03-26 20:03 UTC (permalink / raw) To: Mukesh Kumar Savaliya Cc: alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel, andersson, konradybcio On Wed, Mar 26, 2025 at 07:46:40PM +0530, Mukesh Kumar Savaliya wrote: > Add support for the Qualcomm I3C controller driver, which implements > I3C master functionality as defined in the MIPI Alliance Specification > for I3C, Version 1.0. > > This driver supports master role in SDR mode. > > Unlike some other I3C master controllers, this implementation > does not support In-Band Interrupts (IBI) and Hot-join requests. > > Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> > --- > drivers/i3c/master/Kconfig | 12 + > drivers/i3c/master/Makefile | 1 + > drivers/i3c/master/qcom-i3c-master.c | 1107 ++++++++++++++++++++++++++ > 3 files changed, 1120 insertions(+) > create mode 100644 drivers/i3c/master/qcom-i3c-master.c > > diff --git a/drivers/i3c/master/Kconfig b/drivers/i3c/master/Kconfig > index 77da199c7413..5370cadfe236 100644 > --- a/drivers/i3c/master/Kconfig > +++ b/drivers/i3c/master/Kconfig > @@ -44,6 +44,18 @@ config SVC_I3C_MASTER > help > Support for Silvaco I3C Dual-Role Master Controller. > > +config QCOM_I3C_MASTER > + tristate "Qualcomm Technologies Inc.'s I3C Master controller driver" > + depends on I3C > + help > + This driver supports QUPV3 GENI based I3C controller in master It should have extrn 2 space help This driver .... > + mode on the Qualcomm Technologies Inc.s SoCs. If you say yes to > + this option, support will be included for the built-in I3C interface > + on the Qualcomm Technologies Inc.s SoCs. > + > + This driver can also be built as a module. If so, the module > + will be called qcom-i3c-master. > + > config MIPI_I3C_HCI > tristate "MIPI I3C Host Controller Interface driver (EXPERIMENTAL)" > depends on I3C > diff --git a/drivers/i3c/master/Makefile b/drivers/i3c/master/Makefile > index 3e97960160bc..f6670a63b34f 100644 > --- a/drivers/i3c/master/Makefile > +++ b/drivers/i3c/master/Makefile > @@ -4,3 +4,4 @@ obj-$(CONFIG_DW_I3C_MASTER) += dw-i3c-master.o > obj-$(CONFIG_AST2600_I3C_MASTER) += ast2600-i3c-master.o > obj-$(CONFIG_SVC_I3C_MASTER) += svc-i3c-master.o > obj-$(CONFIG_MIPI_I3C_HCI) += mipi-i3c-hci/ > +obj-$(CONFIG_QCOM_I3C_MASTER) += qcom-i3c-master.o > diff --git a/drivers/i3c/master/qcom-i3c-master.c b/drivers/i3c/master/qcom-i3c-master.c > new file mode 100644 > index 000000000000..54778a6baa70 > --- /dev/null > +++ b/drivers/i3c/master/qcom-i3c-master.c > @@ -0,0 +1,1107 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved. > + * > + * Author: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> > + */ > + > +#include <linux/bits.h> > +#include <linux/clk.h> > +#include <linux/err.h> > +#include <linux/i3c/master.h> > +#include <linux/interrupt.h> > +#include <linux/io.h> > +#include <linux/kernel.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > +#include <linux/platform_device.h> > +#include <linux/pm_runtime.h> > +#include <linux/slab.h> > +#include <linux/soc/qcom/geni-se.h> > + > +#define SE_I3C_SCL_HIGH 0x268 > +#define SE_I3C_TX_TRANS_LEN 0x26C > +#define SE_I3C_RX_TRANS_LEN 0x270 > +#define SE_I3C_DELAY_COUNTER 0x274 > +#define SE_I2C_SCL_COUNTERS 0x278 > +#define SE_I3C_SCL_CYCLE 0x27C please use low case hex value > +#define SE_GENI_HW_IRQ_EN 0x920 > +#define SE_GENI_HW_IRQ_IGNORE_ON_ACTIVE 0x924 > +#define SE_GENI_HW_IRQ_CMD_PARAM_0 0x930 > + > +/* HW I3C IBI interrupt enable */ > +#define M_IBI_IRQ_EN BIT(0) > + > +/* M_IBI_IRQ_IGNORE */ > +#define M_IBI_IRQ_IGNORE BIT(0) > + > +/* SE_GENI_M_CLK_CFG field shifts */ > +#define CLK_DIV_VALUE_MASK GENMASK(23, 4) > +#define SER_CLK_EN BIT(0) > + > +/* SE_GENI_HW_IRQ_CMD_PARAM_0 field bits */ > +#define M_IBI_IRQ_PARAM_7E BIT(0) > +#define M_IBI_IRQ_PARAM_STOP_STALL BIT(1) > +/* SE_I2C_SCL_COUNTERS field shifts */ > +#define I2C_SCL_HIGH_COUNTER_MASK GENMASK(29, 20) > +#define I2C_SCL_LOW_COUNTER_MASK GENMASK(19, 10) > +#define I2C_SCL_CYCLE_COUNTER_MASK GENMASK(9, 0) > + > +#define SE_I3C_ERR (M_CMD_OVERRUN_EN | M_ILLEGAL_CMD_EN | M_CMD_FAILURE_EN |\ > + M_CMD_ABORT_EN | M_GP_IRQ_0_EN | M_GP_IRQ_1_EN | M_GP_IRQ_2_EN | \ > + M_GP_IRQ_3_EN | M_GP_IRQ_4_EN) > + > +/* M_CMD OP codes for I2C/I3C */ > +#define I3C_READ_IBI_HW 0 > +#define I2C_WRITE 1 > +#define I2C_READ 2 > +#define I2C_WRITE_READ 3 > +#define I2C_ADDR_ONLY 4 > +#define I3C_INBAND_RESET 5 > +#define I2C_BUS_CLEAR 6 > +#define I2C_STOP_ON_BUS 7 > +#define I3C_HDR_DDR_EXIT 8 > +#define I3C_PRIVATE_WRITE 9 > +#define I3C_PRIVATE_READ 10 > +#define I3C_HDR_DDR_WRITE 11 > +#define I3C_HDR_DDR_READ 12 > +#define I3C_DIRECT_CCC_ADDR_ONLY 13 > +#define I3C_BCAST_CCC_ADDR_ONLY 14 > +#define I3C_READ_IBI 15 > +#define I3C_BCAST_CCC_WRITE 16 > +#define I3C_DIRECT_CCC_WRITE 17 > +#define I3C_DIRECT_CCC_READ 18 > + > +/* M_CMD params for I3C */ > +#define PRE_CMD_DELAY BIT(0) > +#define TIMESTAMP_BEFORE BIT(1) > +#define STOP_STRETCH BIT(2) > +#define TIMESTAMP_AFTER BIT(3) > +#define POST_COMMAND_DELAY BIT(4) > +#define IGNORE_ADD_NACK BIT(6) > +#define READ_FINISHED_WITH_ACK BIT(7) > +#define CONTINUOUS_MODE_DAA BIT(8) > + > +#define SLAVE_ADDR_MASK GENMASK(15, 9) > +#define SLV_ADDR_SHFT 9 > + > +#define CCC_HDR_CMD_MSK GENMASK(23, 16) > +#define CCC_HDR_CMD_SHFT 16 > +#define IBI_NACK_TBL_CTRL BIT(24) > +#define USE_7E BIT(25) > +#define BYPASS_ADDR_PHASE BIT(26) > + > +/* GSI callback error fields - DMA_TX_IRQ_STAT */ > +#define GP_IRQ0 BIT(5) > +#define GP_IRQ1 BIT(6) > +#define GP_IRQ2 BIT(7) > +#define GP_IRQ3 BIT(8) > +#define GP_IRQ4 BIT(9) > +#define GP_IRQ5 BIT(10) > +#define DM_I3C_CB_ERR GENMASK(10, 5) > + > +#define I3C_AUTO_SUSPEND_DELAY 250 > +#define KHZ(freq) (1000 * (freq)) > +#define PACKING_BYTES_PW 4 > +#define XFER_TIMEOUT 250 > +#define DFS_INDEX_MAX 7 > + > +#define I3C_ADDR_MASK 0x7f > + > +enum geni_i3c_err_code { > + RD_TERM, > + NACK, > + CRC_ERR, > + BUS_PROTO, > + NACK_7E, > + NACK_IBI, > + GENI_OVERRUN, > + GENI_ILLEGAL_CMD, > + GENI_ABORT_DONE, > + GENI_TIMEOUT, > +}; > + > +enum i3c_bus_phase { > + OPEN_DRAIN_MODE = 0, > + PUSH_PULL_MODE = 1 > +}; > + > +struct geni_i3c_dev { > + struct geni_se se; > + unsigned int tx_wm; > + int irq; > + int err; > + struct i3c_master_controller ctrlr; > + struct completion done; > + /* Protects per device CCC command or transfer from get_mutex_lock()/unlock() wrapper */ > + struct mutex lock; > + /* Per device protection between process and IRQ context */ > + spinlock_t irq_lock; > + u32 clk_src_freq; > + u8 *cur_buf; > + bool cur_is_write; > + int cur_len; > + int cur_idx; > + //unsigned long newaddrslots[(I3C_ADDR_MASK + 1) / BITS_PER_LONG]; > + DECLARE_BITMAP(newaddrslots, 64); > + > + const struct geni_i3c_clk_settings *clk_cfg; > + const struct geni_i3c_clk_settings *clk_od_cfg; > +}; > + > +struct geni_i3c_i2c_dev_data { > + u32 ibi_keeping; /* Plan to save IBI information, keep as dummy for now */ Remove it, add it only when use it. > +}; > + > +struct geni_i3c_xfer_params { > + enum geni_se_xfer_mode mode; > + u32 m_cmd; > + u32 m_param; > +}; > + > +static inline struct geni_i3c_dev *to_geni_i3c_master(struct i3c_master_controller > + *master) > +{ > + return container_of(master, struct geni_i3c_dev, ctrlr); > +} > + > +struct geni_i3c_clk_settings { > + u32 clk_freq_out; > + u32 clk_src_freq; > + u8 clk_div; > + u8 i2c_t_high_cnt; > + u8 i2c_t_low_cnt; > + u8 i3c_t_high_cnt; > + u8 i3c_t_cycle_cnt; > + u8 i2c_t_cycle_cnt; > +}; > + > +/* > + * Hardware uses the underlying formula to calculate time periods of > + * SCL clock cycle. Firmware uses some additional cycles excluded from the > + * below formula and it is confirmed that the time periods are within > + * specification limits. > + * > + * time of high period of I2C SCL: > + * i2c_t_high = (i2c_t_high_cnt * clk_div) / source_clock > + * time of low period of I2C SCL: > + * i2c_t_low = (i2c_t_low_cnt * clk_div) / source_clock > + * time of full period of I2C SCL: > + * i2c_t_cycle = (i2c_t_cycle_cnt * clk_div) / source_clock > + * time of high period of I3C SCL: > + * i3c_t_high = (i3c_t_high_cnt * clk_div) / source_clock > + * time of full period of I3C SCL: > + * i3c_t_cycle = (i3c_t_cycle_cnt * clk_div) / source_clock > + * clk_freq_out = t / t_cycle > + */ > +static const struct geni_i3c_clk_settings geni_i3c_clk_map[] = { > +/* op-freq, src-freq, div, i2c_high, i2c_low, i3c_high, i3c_cyc i2c_cyc */ > + { KHZ(100), KHZ(19200), 1, 76, 90, 7, 8, 192}, > + { KHZ(400), KHZ(19200), 1, 12, 24, 7, 8, 48}, > + { KHZ(1000), KHZ(19200), 1, 4, 9, 7, 0, 19}, > + { KHZ(12500), KHZ(100000), 1, 45, 63, 6, 7, 110}, > +}; > + > +static int geni_i3c_clk_map_idx(struct geni_i3c_dev *gi3c) > +{ > + const struct geni_i3c_clk_settings *clk_idx = geni_i3c_clk_map; > + struct i3c_master_controller *m = &gi3c->ctrlr; > + struct i3c_bus *bus = i3c_master_get_bus(m); > + int i; > + > + for (i = 0; i < ARRAY_SIZE(geni_i3c_clk_map); i++, clk_idx++) { > + if ((!bus || clk_idx->clk_freq_out == bus->scl_rate.i3c) && > + clk_idx->clk_src_freq == gi3c->clk_src_freq) { > + gi3c->clk_cfg = clk_idx; > + } > + > + if (clk_idx->clk_freq_out == bus->scl_rate.i2c) > + gi3c->clk_od_cfg = clk_idx; > + } > + > + if (!gi3c->clk_cfg || !gi3c->clk_od_cfg) > + return -EINVAL; > + > + return 0; > +} > + > +static void set_new_addr_slot(unsigned long *addrslot, u8 addr) > +{ > + if (addr > I3C_ADDR_MASK) > + return; > + > + set_bit(addr, addrslot); > +} > + > +static void clear_new_addr_slot(unsigned long *addrslot, u8 addr) > +{ > + if (addr > I3C_ADDR_MASK) > + return; > + > + clear_bit(addr, addrslot); > +} > + > +static bool is_new_addr_slot_set(unsigned long *addrslot, u8 addr) > +{ > + if (addr > I3C_ADDR_MASK) > + return false; > + > + return test_bit(addr, addrslot); > +} > + > +static void qcom_geni_i3c_conf(struct geni_i3c_dev *gi3c, enum i3c_bus_phase bus_phase) > +{ > + const struct geni_i3c_clk_settings *clk_idx = gi3c->clk_cfg; > + unsigned long freq; > + u32 val, dfs_idx; > + int ret; > + > + if (bus_phase == OPEN_DRAIN_MODE) > + clk_idx = gi3c->clk_od_cfg; > + > + ret = geni_se_clk_freq_match(&gi3c->se, clk_idx->clk_src_freq, > + &dfs_idx, &freq, false); > + if (ret) > + dfs_idx = 0; > + > + writel_relaxed(dfs_idx, gi3c->se.base + SE_GENI_CLK_SEL); > + > + val = FIELD_PREP(CLK_DIV_VALUE_MASK, clk_idx->clk_div); > + val |= SER_CLK_EN; > + writel_relaxed(val, gi3c->se.base + GENI_SER_M_CLK_CFG); > + > + val = FIELD_PREP(I2C_SCL_HIGH_COUNTER_MASK, clk_idx->i2c_t_high_cnt); > + val |= FIELD_PREP(I2C_SCL_LOW_COUNTER_MASK, clk_idx->i2c_t_low_cnt); > + val |= FIELD_PREP(I2C_SCL_CYCLE_COUNTER_MASK, clk_idx->i2c_t_cycle_cnt); > + writel_relaxed(val, gi3c->se.base + SE_I2C_SCL_COUNTERS); > + > + writel_relaxed(clk_idx->i3c_t_cycle_cnt, gi3c->se.base + SE_I3C_SCL_CYCLE); > + writel_relaxed(clk_idx->i3c_t_high_cnt, gi3c->se.base + SE_I3C_SCL_HIGH); > + > + writel_relaxed(M_IBI_IRQ_IGNORE, gi3c->se.base + SE_GENI_HW_IRQ_IGNORE_ON_ACTIVE); > + > + val = M_IBI_IRQ_PARAM_STOP_STALL | M_IBI_IRQ_PARAM_7E; > + writel_relaxed(val, gi3c->se.base + SE_GENI_HW_IRQ_CMD_PARAM_0); > + > + writel_relaxed(M_IBI_IRQ_EN, gi3c->se.base + SE_GENI_HW_IRQ_EN); > +} > + > +static void geni_i3c_handle_err(struct geni_i3c_dev *gi3c, u32 status) > +{ > + dev_dbg(gi3c->se.dev, "len:%d, %s\n", > + gi3c->cur_len, gi3c->cur_is_write ? "write" : "read"); > + > + if (status & M_GP_IRQ_0_EN) { > + gi3c->err = -EINVAL; > + dev_dbg(gi3c->se.dev, "%s\n", "I3C slave early read termination"); > + } > + if (status & M_GP_IRQ_1_EN) { > + gi3c->err = -ENOTCONN; > + dev_dbg(gi3c->se.dev, "%s\n", "NACK: slave unresponsive, check power/reset"); > + } > + if (status & M_GP_IRQ_2_EN) { > + gi3c->err = -EINVAL; > + dev_dbg(gi3c->se.dev, "%s\n", "CRC or parity error"); > + } > + if (status & M_GP_IRQ_3_EN) { > + gi3c->err = -EPROTO; > + dev_dbg(gi3c->se.dev, "%s\n", "Bus proto Error, noisy/unexpected start/stop"); > + } > + if (status & M_GP_IRQ_4_EN) { > + gi3c->err = -EBUSY; > + dev_dbg(gi3c->se.dev, "%s\n", "NACK on 7E, unexpected protocol error"); > + } > + if (status & M_GP_IRQ_5_EN) { > + gi3c->err = -EINVAL; > + dev_dbg(gi3c->se.dev, "%s\n", "NACK on IBI"); > + } > + if (status & M_CMD_OVERRUN_EN) { > + gi3c->err = -EIO; > + dev_dbg(gi3c->se.dev, "%s\n", "Cmd overrun, check GENI cmd-state machine"); > + } > + if (status & M_ILLEGAL_CMD_EN) { > + gi3c->err = -EILSEQ; > + dev_dbg(gi3c->se.dev, "%s\n", "Illegal cmd, check GENI cmd-state machine"); > + } > + if (status & M_CMD_ABORT_EN) { > + gi3c->err = -ETIMEDOUT; > + dev_dbg(gi3c->se.dev, "%s\n", "Abort after timeout successful"); > + } > + if (status & GENI_TIMEOUT) { > + gi3c->err = -ETIMEDOUT; > + dev_dbg(gi3c->se.dev, "%s\n", "I3C transaction timed out"); > + } > +} > + > +static irqreturn_t geni_i3c_irq(int irq, void *dev) > +{ > + u32 m_stat_mask, dm_tx_st, dm_rx_st, m_stat, rx_st, dma; > + struct geni_i3c_dev *gi3c = dev; > + unsigned long flags; > + int j; > + > + m_stat = readl_relaxed(gi3c->se.base + SE_GENI_M_IRQ_STATUS); > + m_stat_mask = readl_relaxed(gi3c->se.base + SE_GENI_M_IRQ_EN); > + rx_st = readl_relaxed(gi3c->se.base + SE_GENI_RX_FIFO_STATUS); > + dm_tx_st = readl_relaxed(gi3c->se.base + SE_DMA_TX_IRQ_STAT); > + dm_rx_st = readl_relaxed(gi3c->se.base + SE_DMA_RX_IRQ_STAT); > + dma = readl_relaxed(gi3c->se.base + SE_GENI_DMA_MODE_EN); > + > + spin_lock_irqsave(&gi3c->irq_lock, flags); > + > + if (m_stat & SE_I3C_ERR || dm_rx_st & DM_I3C_CB_ERR) { > + geni_i3c_handle_err(gi3c, m_stat); > + /* Disable the TX Watermark interrupt to stop TX */ > + if (!dma) > + writel_relaxed(0, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); > + goto irqret; > + } > + > + if (dma) { > + dev_dbg(gi3c->se.dev, "i3c dma tx:0x%x, dma rx:0x%x\n", dm_tx_st, dm_rx_st); > + goto irqret; > + } > + > + if ((m_stat & > + (M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN)) && > + !gi3c->cur_is_write && gi3c->cur_buf) { > + u32 rxcnt = rx_st & RX_FIFO_WC_MSK; > + > + for (j = 0; j < rxcnt; j++) { > + u32 val; > + int p = 0; > + > + val = readl_relaxed(gi3c->se.base + SE_GENI_RX_FIFOn); > + while (gi3c->cur_idx < gi3c->cur_len && p < sizeof(val)) { > + gi3c->cur_buf[gi3c->cur_idx++] = val & 0xff; > + val >>= 8; > + p++; > + } > + if (gi3c->cur_idx == gi3c->cur_len) > + break; > + } > + } else if (m_stat & M_TX_FIFO_WATERMARK_EN && > + gi3c->cur_is_write && gi3c->cur_buf) { > + for (j = 0; j < gi3c->tx_wm; j++) { > + u32 temp; > + u32 val = 0; > + int p = 0; > + > + while (gi3c->cur_idx < gi3c->cur_len && p < sizeof(val)) { > + temp = gi3c->cur_buf[gi3c->cur_idx++]; > + val |= temp << (p * 8); > + p++; > + } > + > + writel_relaxed(val, gi3c->se.base + SE_GENI_TX_FIFOn); > + if (gi3c->cur_idx == gi3c->cur_len) { > + writel_relaxed(0, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); > + break; > + } > + } > + } > + > +irqret: > + if (m_stat) > + writel_relaxed(m_stat, gi3c->se.base + SE_GENI_M_IRQ_CLEAR); > + > + if (dma) { > + if (dm_tx_st) > + writel_relaxed(dm_tx_st, gi3c->se.base + SE_DMA_TX_IRQ_CLR); > + if (dm_rx_st) > + writel_relaxed(dm_rx_st, gi3c->se.base + SE_DMA_RX_IRQ_CLR); > + } > + > + /* if this is err with done-bit not set, handle that through timeout. */ > + if (m_stat & M_CMD_DONE_EN || m_stat & M_CMD_ABORT_EN) { > + writel_relaxed(0, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); > + complete(&gi3c->done); > + } else if (dm_tx_st & TX_DMA_DONE || dm_rx_st & RX_DMA_DONE || > + dm_rx_st & RX_RESET_DONE) { > + complete(&gi3c->done); > + } > + > + spin_unlock_irqrestore(&gi3c->irq_lock, flags); > + return IRQ_HANDLED; > +} > + > +static int i3c_geni_runtime_get_mutex_lock(struct geni_i3c_dev *gi3c) > +{ > + int ret; > + > + mutex_lock(&gi3c->lock); > + reinit_completion(&gi3c->done); > + ret = pm_runtime_get_sync(gi3c->se.dev); > + if (ret < 0) { > + dev_err(gi3c->se.dev, "error turning on SE resources:%d\n", ret); > + pm_runtime_put_noidle(gi3c->se.dev); > + /* Set device in suspended since resume failed */ > + pm_runtime_set_suspended(gi3c->se.dev); > + mutex_unlock(&gi3c->lock); > + return ret; > + } > + > + return 0; > +} > + > +static void i3c_geni_runtime_put_mutex_unlock(struct geni_i3c_dev *gi3c) > +{ > + pm_runtime_mark_last_busy(gi3c->se.dev); > + pm_runtime_put_autosuspend(gi3c->se.dev); > + mutex_unlock(&gi3c->lock); > +} > + > +static void geni_i3c_abort_xfer(struct geni_i3c_dev *gi3c) > +{ > + unsigned long time_remaining; > + unsigned long flags; > + > + reinit_completion(&gi3c->done); > + spin_lock_irqsave(&gi3c->irq_lock, flags); > + geni_i3c_handle_err(gi3c, GENI_TIMEOUT); > + geni_se_abort_m_cmd(&gi3c->se); > + spin_unlock_irqrestore(&gi3c->irq_lock, flags); > + time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT); > + if (!time_remaining) > + dev_err(gi3c->se.dev, "Timeout abort_m_cmd\n"); > +} > + > +static int _i3c_geni_execute_command(struct geni_i3c_dev *gi3c, struct geni_i3c_xfer_params *xfer) > +{ > + bool is_write = gi3c->cur_is_write; > + dma_addr_t tx_dma = 0, rx_dma = 0; > + unsigned long time_remaining; > + u32 len = gi3c->cur_len; > + int ret; > + > + geni_se_select_mode(&gi3c->se, xfer->mode); > + > + gi3c->err = 0; > + gi3c->cur_idx = 0; > + > + if (!is_write) { > + dev_dbg(gi3c->se.dev, "I3C cmd:0x%x param:0x%x READ len:%d\n", > + xfer->m_cmd, xfer->m_param, len); > + writel_relaxed(len, gi3c->se.base + SE_I3C_RX_TRANS_LEN); > + geni_se_setup_m_cmd(&gi3c->se, xfer->m_cmd, xfer->m_param); > + if (xfer->mode == GENI_SE_DMA) { > + ret = geni_se_rx_dma_prep(&gi3c->se, gi3c->cur_buf, len, &rx_dma); > + if (ret) { > + xfer->mode = GENI_SE_FIFO; > + geni_se_select_mode(&gi3c->se, xfer->mode); > + } > + } > + } else { > + dev_dbg(gi3c->se.dev, "I3C cmd:0x%x param:0x%x WRITE len:%d\n", > + xfer->m_cmd, xfer->m_param, len); > + > + writel_relaxed(len, gi3c->se.base + SE_I3C_TX_TRANS_LEN); > + geni_se_setup_m_cmd(&gi3c->se, xfer->m_cmd, xfer->m_param); > + > + if (xfer->mode == GENI_SE_DMA) { > + ret = geni_se_tx_dma_prep(&gi3c->se, gi3c->cur_buf, len, &tx_dma); > + if (ret) { > + xfer->mode = GENI_SE_FIFO; > + geni_se_select_mode(&gi3c->se, xfer->mode); > + } > + } > + > + if (xfer->mode == GENI_SE_FIFO && len > 0) /* Get FIFO IRQ */ > + writel_relaxed(1, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); > + } > + > + time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT); > + if (!time_remaining) { > + unsigned long flags; > + > + dev_dbg(gi3c->se.dev, "Timeout completing FIFO transfer\n"); > + spin_lock_irqsave(&gi3c->irq_lock, flags); > + geni_i3c_handle_err(gi3c, GENI_TIMEOUT); > + gi3c->cur_buf = NULL; > + spin_unlock_irqrestore(&gi3c->irq_lock, flags); > + geni_i3c_abort_xfer(gi3c); > + } > + > + if (xfer->mode == GENI_SE_DMA) { > + if (gi3c->err) { > + if (is_write) > + writel_relaxed(1, gi3c->se.base + SE_DMA_TX_FSM_RST); > + else > + writel_relaxed(1, gi3c->se.base + SE_DMA_RX_FSM_RST); > + > + time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT); > + dev_dbg(gi3c->se.dev, "Timeout completing DMA transfer\n"); > + } > + geni_se_rx_dma_unprep(&gi3c->se, rx_dma, len); > + geni_se_tx_dma_unprep(&gi3c->se, tx_dma, len); > + } > + > + ret = gi3c->err; > + if (gi3c->err) > + dev_err(gi3c->se.dev, "I3C transaction error :%d\n", gi3c->err); > + > + gi3c->cur_buf = NULL; > + gi3c->err = 0; > + > + return ret; > +} > + > +static int i3c_geni_execute_read_command(struct geni_i3c_dev *gi3c, > + struct geni_i3c_xfer_params *xfer, u8 *buf, u32 len) > +{ > + gi3c->cur_is_write = false; > + gi3c->cur_buf = buf; > + gi3c->cur_len = len; > + return _i3c_geni_execute_command(gi3c, xfer); > + //return geni_i3c_fifo_dma_xfer(gi3c, xfer); remove these commented code. > +} > + > +static int i3c_geni_execute_write_command(struct geni_i3c_dev *gi3c, > + struct geni_i3c_xfer_params *xfer, u8 *buf, u32 len) > +{ > + gi3c->cur_is_write = true; > + gi3c->cur_buf = buf; > + gi3c->cur_len = len; > + return _i3c_geni_execute_command(gi3c, xfer); > + //return geni_i3c_fifo_dma_xfer(gi3c, xfer); > +} > + > +static void geni_i3c_perform_daa(struct geni_i3c_dev *gi3c) > +{ > + u8 last_dyn_addr = 0; > + int ret; > + > + while (1) { > + u8 rx_buf[8], tx_buf[8]; > + struct geni_i3c_xfer_params xfer = { GENI_SE_FIFO }; > + struct i3c_device_info info = { 0 }; > + struct i3c_dev_desc *i3cdev; > + bool new_device = true; > + u64 pid; > + u8 bcr, dcr, addr; > + > + xfer.m_cmd = I2C_READ; > + xfer.m_param = STOP_STRETCH | CONTINUOUS_MODE_DAA | USE_7E; > + ret = i3c_geni_execute_read_command(gi3c, &xfer, rx_buf, 8); > + if (ret) > + break; > + > + dcr = rx_buf[7]; > + bcr = rx_buf[6]; > + pid = ((u64)rx_buf[0] << 40) | > + ((u64)rx_buf[1] << 32) | > + ((u64)rx_buf[2] << 24) | > + ((u64)rx_buf[3] << 16) | > + ((u64)rx_buf[4] << 8) | > + ((u64)rx_buf[5]); > + > + i3c_bus_for_each_i3cdev(&gi3c->ctrlr.bus, i3cdev) { > + i3c_device_get_info(i3cdev->dev, &info); > + if (pid == info.pid && dcr == info.dcr && bcr == info.bcr) { > + new_device = false; > + addr = (info.dyn_addr) ? info.dyn_addr : > + info.static_addr; > + break; > + } > + } > + > + if (new_device) { > + ret = i3c_master_get_free_addr(&gi3c->ctrlr, last_dyn_addr + 1); > + if (ret < 0) > + break; > + addr = (u8)ret; > + last_dyn_addr = (u8)ret; > + set_new_addr_slot(gi3c->newaddrslots, addr); > + } > + > + tx_buf[0] = (addr & I3C_ADDR_MASK) << 1; > + tx_buf[0] |= ~(hweight8(addr & I3C_ADDR_MASK) & 1); > + > + xfer.m_cmd = I2C_WRITE; > + xfer.m_param = STOP_STRETCH | BYPASS_ADDR_PHASE | USE_7E; > + > + ret = i3c_geni_execute_write_command(gi3c, &xfer, tx_buf, 1); > + if (ret) > + break; > + } > +} > + > +static int geni_i3c_master_send_ccc_cmd(struct i3c_master_controller *m, > + struct i3c_ccc_cmd *cmd) > +{ > + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); > + int i, ret; > + > + if (!(cmd->id & I3C_CCC_DIRECT) && cmd->ndests != 1) > + return -EINVAL; > + > + ret = i3c_geni_runtime_get_mutex_lock(gi3c); > + if (ret) > + return ret; > + > + qcom_geni_i3c_conf(gi3c, OPEN_DRAIN_MODE); > + for (i = 0; i < cmd->ndests; i++) { > + int stall = (i < (cmd->ndests - 1)) || > + (cmd->id == I3C_CCC_ENTDAA); > + struct geni_i3c_xfer_params xfer = { GENI_SE_FIFO }; > + > + xfer.m_param = (stall ? STOP_STRETCH : 0); > + xfer.m_param |= (cmd->id << CCC_HDR_CMD_SHFT); > + xfer.m_param |= IBI_NACK_TBL_CTRL; > + if (cmd->id & I3C_CCC_DIRECT) { > + xfer.m_param |= FIELD_PREP(SLAVE_ADDR_MASK, cmd->dests[i].addr); > + if (cmd->rnw) { > + if (i == 0) > + xfer.m_cmd = I3C_DIRECT_CCC_READ; > + else > + xfer.m_cmd = I3C_PRIVATE_READ; > + } else { > + if (i == 0) > + xfer.m_cmd = > + (cmd->dests[i].payload.len > 0) ? > + I3C_DIRECT_CCC_WRITE : > + I3C_DIRECT_CCC_ADDR_ONLY; > + else > + xfer.m_cmd = I3C_PRIVATE_WRITE; > + } > + } else { > + if (cmd->dests[i].payload.len > 0) > + xfer.m_cmd = I3C_BCAST_CCC_WRITE; > + else > + xfer.m_cmd = I3C_BCAST_CCC_ADDR_ONLY; > + } > + > + if (i == 0) > + xfer.m_param |= USE_7E; > + > + if (cmd->rnw) > + ret = i3c_geni_execute_read_command(gi3c, &xfer, > + cmd->dests[i].payload.data, > + cmd->dests[i].payload.len); > + else > + ret = i3c_geni_execute_write_command(gi3c, &xfer, > + cmd->dests[i].payload.data, > + cmd->dests[i].payload.len); > + if (ret) > + break; > + > + if (cmd->id == I3C_CCC_ENTDAA) > + geni_i3c_perform_daa(gi3c); > + } > + > + i3c_geni_runtime_put_mutex_unlock(gi3c); > + return ret; > +} > + > +static int geni_i3c_master_priv_xfers(struct i3c_dev_desc *dev, struct i3c_priv_xfer *xfers, > + int nxfers) > +{ > + struct i3c_master_controller *m = i3c_dev_get_master(dev); > + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); > + bool use_7e = false; > + int i, ret; > + > + ret = i3c_geni_runtime_get_mutex_lock(gi3c); > + if (ret) > + return ret; > + > + qcom_geni_i3c_conf(gi3c, PUSH_PULL_MODE); > + > + for (i = 0; i < nxfers; i++) { > + bool stall = (i < (nxfers - 1)); > + struct geni_i3c_xfer_params xfer = { GENI_SE_FIFO }; > + > + xfer.m_param = (stall ? STOP_STRETCH : 0); > + xfer.m_param |= FIELD_PREP(SLAVE_ADDR_MASK, dev->info.dyn_addr); > + xfer.m_param |= (use_7e) ? USE_7E : 0; > + > + /* use_7e = true only for last transfer */ > + use_7e = (i == nxfers - 1); > + > + if (xfers[i].rnw) { > + xfer.m_cmd = I3C_PRIVATE_READ; > + ret = i3c_geni_execute_read_command(gi3c, &xfer, (u8 *)xfers[i].data.in, > + xfers[i].len); > + } else { > + xfer.m_cmd = I3C_PRIVATE_WRITE; > + ret = i3c_geni_execute_write_command(gi3c, &xfer, (u8 *)xfers[i].data.out, > + xfers[i].len); > + } > + > + if (ret) > + break; > + } > + > + dev_dbg(gi3c->se.dev, "i3c priv: txn ret:%d\n", ret); > + i3c_geni_runtime_put_mutex_unlock(gi3c); > + return ret; > +} > + > +static int geni_i3c_master_i2c_xfers(struct i2c_dev_desc *dev, const struct i2c_msg *msgs, int num) > +{ > + struct i3c_master_controller *m = i2c_dev_get_master(dev); > + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); > + int i, ret; > + > + ret = i3c_geni_runtime_get_mutex_lock(gi3c); > + if (ret) > + return ret; > + > + qcom_geni_i3c_conf(gi3c, PUSH_PULL_MODE); > + > + for (i = 0; i < num; i++) { > + struct geni_i3c_xfer_params xfer; > + > + xfer.m_cmd = (msgs[i].flags & I2C_M_RD) ? I2C_READ : I2C_WRITE; > + xfer.m_param = (i < (num - 1)) ? STOP_STRETCH : 0; > + xfer.m_param |= FIELD_PREP(SLAVE_ADDR_MASK, msgs[i].addr); > + xfer.mode = msgs[i].len > 32 ? GENI_SE_DMA : GENI_SE_FIFO; > + if (msgs[i].flags & I2C_M_RD) > + ret = i3c_geni_execute_read_command(gi3c, &xfer, msgs[i].buf, msgs[i].len); > + else > + ret = i3c_geni_execute_write_command(gi3c, &xfer, msgs[i].buf, msgs[i].len); > + if (ret) > + break; > + } > + > + dev_dbg(gi3c->se.dev, "i2c: txn ret:%d\n", ret); > + i3c_geni_runtime_put_mutex_unlock(gi3c); > + return ret; > +} > + > +static int geni_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev) > +{ > + struct geni_i3c_i2c_dev_data *data; > + > + data = kzalloc(sizeof(*data), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + > + i2c_dev_set_master_data(dev, data); > + return 0; > +} > + > +static void geni_i3c_master_detach_i2c_dev(struct i2c_dev_desc *dev) > +{ > + struct geni_i3c_i2c_dev_data *data = i2c_dev_get_master_data(dev); > + > + i2c_dev_set_master_data(dev, NULL); > + kfree(data); > +} > + > +static int geni_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev) > +{ > + struct geni_i3c_i2c_dev_data *data; > + > + data = kzalloc(sizeof(*data), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + > + i3c_dev_set_master_data(dev, data); > + return 0; > +} > + > +static void geni_i3c_master_detach_i3c_dev(struct i3c_dev_desc *dev) > +{ > + struct geni_i3c_i2c_dev_data *data = i3c_dev_get_master_data(dev); > + > + i3c_dev_set_master_data(dev, NULL); > + kfree(data); > +} > + > +static int geni_i3c_master_do_daa(struct i3c_master_controller *m) > +{ > + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); > + u8 addr; > + int ret; > + > + ret = i3c_master_entdaa_locked(m); > + if (ret && ret != I3C_ERROR_M2) > + return ret; > + > + for (addr = 0; addr <= I3C_ADDR_MASK; addr++) { > + if (is_new_addr_slot_set(gi3c->newaddrslots, addr)) { > + clear_new_addr_slot(gi3c->newaddrslots, addr); > + i3c_master_add_i3c_dev_locked(m, addr); > + } > + } > + > + return 0; > +} > + > +static int geni_i3c_master_bus_init(struct i3c_master_controller *m) > +{ > + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); > + struct i3c_bus *bus = i3c_master_get_bus(m); > + struct i3c_device_info info = { }; > + int ret; > + > + /* Get an address for the master. */ > + ret = i3c_master_get_free_addr(m, 0); > + if (ret < 0) > + dev_err(gi3c->se.dev, "%s: error No free addr:%d\n", __func__, ret); > + > + info.dyn_addr = ret; > + info.dcr = I3C_DCR_GENERIC_DEVICE; > + info.bcr = I3C_BCR_I3C_MASTER | I3C_BCR_HDR_CAP; > + info.pid = 0; > + > + ret = geni_i3c_clk_map_idx(gi3c); > + if (ret) > + dev_err(gi3c->se.dev, > + "Invalid clk frequency %d Hz src for %ld Hz bus: %d\n", > + gi3c->clk_src_freq, bus->scl_rate.i3c, ret); > + > + ret = i3c_geni_runtime_get_mutex_lock(gi3c); > + if (ret) > + return ret; > + > + qcom_geni_i3c_conf(gi3c, OPEN_DRAIN_MODE); > + > + ret = i3c_master_set_info(&gi3c->ctrlr, &info); > + i3c_geni_runtime_put_mutex_unlock(gi3c); > + return ret; > +} > + > +static bool geni_i3c_master_supports_ccc_cmd(struct i3c_master_controller *m, > + const struct i3c_ccc_cmd *cmd) > +{ > + switch (cmd->id) { > + case I3C_CCC_ENEC(true): > + fallthrough; > + case I3C_CCC_ENEC(false): > + fallthrough; > + case I3C_CCC_DISEC(true): > + fallthrough; > + case I3C_CCC_DISEC(false): > + fallthrough; > + case I3C_CCC_ENTAS(0, true): > + fallthrough; > + case I3C_CCC_ENTAS(0, false): > + fallthrough; > + case I3C_CCC_RSTDAA(true): > + fallthrough; > + case I3C_CCC_RSTDAA(false): > + fallthrough; > + case I3C_CCC_ENTDAA: > + fallthrough; > + case I3C_CCC_SETMWL(true): > + fallthrough; > + case I3C_CCC_SETMWL(false): > + fallthrough; > + case I3C_CCC_SETMRL(true): > + fallthrough; > + case I3C_CCC_SETMRL(false): > + fallthrough; > + case I3C_CCC_DEFSLVS: > + fallthrough; > + case I3C_CCC_SETDASA: > + fallthrough; > + case I3C_CCC_SETNEWDA: > + fallthrough; > + case I3C_CCC_GETMWL: > + fallthrough; > + case I3C_CCC_GETMRL: > + fallthrough; > + case I3C_CCC_GETPID: > + fallthrough; > + case I3C_CCC_GETBCR: > + fallthrough; > + case I3C_CCC_GETDCR: > + fallthrough; > + case I3C_CCC_GETSTATUS: > + fallthrough; > + case I3C_CCC_GETACCMST: > + fallthrough; > + case I3C_CCC_GETMXDS: > + fallthrough; > + case I3C_CCC_GETHDRCAP: > + return true; > + > + default: > + return false; > + } > +} > + > +static const struct i3c_master_controller_ops geni_i3c_master_ops = { > + .bus_init = geni_i3c_master_bus_init, > + .bus_cleanup = NULL, > + .do_daa = geni_i3c_master_do_daa, > + .attach_i3c_dev = geni_i3c_master_attach_i3c_dev, > + .reattach_i3c_dev = NULL, > + .detach_i3c_dev = geni_i3c_master_detach_i3c_dev, > + .attach_i2c_dev = geni_i3c_master_attach_i2c_dev, > + .detach_i2c_dev = geni_i3c_master_detach_i2c_dev, > + .supports_ccc_cmd = geni_i3c_master_supports_ccc_cmd, > + .send_ccc_cmd = geni_i3c_master_send_ccc_cmd, > + .priv_xfers = geni_i3c_master_priv_xfers, > + .i2c_xfers = geni_i3c_master_i2c_xfers, > + .enable_ibi = NULL, > + .disable_ibi = NULL, > + .request_ibi = NULL, > + .free_ibi = NULL, > + .recycle_ibi_slot = NULL, > +}; > + > +static int i3c_geni_resources_init(struct geni_i3c_dev *gi3c, struct platform_device *pdev) > +{ > + int ret; > + > + gi3c->se.base = devm_platform_ioremap_resource(pdev, 0); > + if (IS_ERR(gi3c->se.base)) > + return PTR_ERR(gi3c->se.base); > + > + gi3c->se.clk = devm_clk_get(&pdev->dev, "se-clk"); > + if (IS_ERR(gi3c->se.clk)) > + return dev_err_probe(&pdev->dev, PTR_ERR(gi3c->se.clk), > + "Unable to get serial engine core clock: %pe\n", > + gi3c->se.clk); > + > + ret = device_property_read_u32(&pdev->dev, "se-clock-frequency", &gi3c->clk_src_freq); > + if (ret) { > + dev_info(&pdev->dev, "SE clk freq not specified, default to 100 MHz.\n"); > + /* Default source clock freq is 100Mhz */ > + gi3c->clk_src_freq = KHZ(100000); > + } > + > + ret = geni_icc_get(&gi3c->se, NULL); > + if (ret) > + return ret; > + > + /* Set the bus quota to a reasonable value for register access */ > + gi3c->se.icc_paths[GENI_TO_CORE].avg_bw = GENI_DEFAULT_BW; > + gi3c->se.icc_paths[CPU_TO_GENI].avg_bw = GENI_DEFAULT_BW; > + ret = geni_icc_set_bw(&gi3c->se); > + if (ret) > + return ret; > + > + return 0; > +} > + > +static int geni_i3c_probe(struct platform_device *pdev) > +{ > + u32 proto, tx_depth, fifo_disable; > + struct geni_i3c_dev *gi3c; > + int ret; > + > + gi3c = devm_kzalloc(&pdev->dev, sizeof(*gi3c), GFP_KERNEL); > + if (!gi3c) > + return -ENOMEM; > + > + gi3c->se.dev = &pdev->dev; > + gi3c->se.wrapper = dev_get_drvdata(pdev->dev.parent); > + > + init_completion(&gi3c->done); > + mutex_init(&gi3c->lock); > + spin_lock_init(&gi3c->irq_lock); > + platform_set_drvdata(pdev, gi3c); > + > + ret = i3c_geni_resources_init(gi3c, pdev); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, "Error Initializing GENI Resources\n"); > + > + gi3c->irq = platform_get_irq(pdev, 0); > + if (gi3c->irq < 0) > + return dev_err_probe(&pdev->dev, gi3c->irq, "Error getting IRQ number for I3C\n"); > + > + ret = devm_request_irq(&pdev->dev, gi3c->irq, geni_i3c_irq, > + IRQF_NO_AUTOEN, dev_name(&pdev->dev), gi3c); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, "Error registering core IRQ\n"); > + > + ret = geni_se_resources_on(&gi3c->se); > + if (ret) > + return dev_err_probe(&pdev->dev, ret, "Error turning resources ON\n"); > + > + proto = geni_se_read_proto(&gi3c->se); > + if (proto != GENI_SE_I3C) { > + geni_se_resources_off(&gi3c->se); > + return dev_err_probe(&pdev->dev, -ENXIO, "Invalid proto %d\n", proto); > + } > + > + fifo_disable = readl_relaxed(gi3c->se.base + GENI_IF_DISABLE_RO); > + if (fifo_disable) { > + geni_se_resources_off(&gi3c->se); > + return dev_err_probe(&pdev->dev, -ENXIO, "GPI DMA mode not supported\n"); > + } > + > + tx_depth = geni_se_get_tx_fifo_depth(&gi3c->se); > + gi3c->tx_wm = tx_depth - 1; > + geni_se_init(&gi3c->se, gi3c->tx_wm, tx_depth); > + geni_se_config_packing(&gi3c->se, BITS_PER_BYTE, PACKING_BYTES_PW, true, true, true); > + geni_se_resources_off(&gi3c->se); > + dev_dbg(&pdev->dev, "i3c fifo/se-dma mode. fifo depth:%d\n", tx_depth); > + > + pm_runtime_set_autosuspend_delay(gi3c->se.dev, I3C_AUTO_SUSPEND_DELAY); > + pm_runtime_use_autosuspend(gi3c->se.dev); > + pm_runtime_set_active(gi3c->se.dev); > + pm_runtime_enable(gi3c->se.dev); > + > + ret = i3c_master_register(&gi3c->ctrlr, &pdev->dev, &geni_i3c_master_ops, false); > + if (ret) { > + pm_runtime_disable(gi3c->se.dev); > + pm_runtime_set_suspended(gi3c->se.dev); > + pm_runtime_dont_use_autosuspend(gi3c->se.dev); > + return ret; > + } > + > + return ret; > +} > + > +static void geni_i3c_remove(struct platform_device *pdev) > +{ > + struct geni_i3c_dev *gi3c = platform_get_drvdata(pdev); > + > + i3c_master_unregister(&gi3c->ctrlr); > + pm_runtime_disable(gi3c->se.dev); > + pm_runtime_set_suspended(gi3c->se.dev); > + pm_runtime_dont_use_autosuspend(gi3c->se.dev); > +} > + > +static int geni_i3c_runtime_suspend(struct device *dev) > +{ > + struct geni_i3c_dev *gi3c = dev_get_drvdata(dev); > + > + disable_irq(gi3c->irq); why need disable irq here? > + geni_se_resources_off(&gi3c->se); > + return 0; > +} > + > +static int geni_i3c_runtime_resume(struct device *dev) > +{ > + int ret; > + struct geni_i3c_dev *gi3c = dev_get_drvdata(dev); > + > + ret = geni_se_resources_on(&gi3c->se); > + if (ret) > + return ret; > + enable_irq(gi3c->irq); > + return 0; > +} > + > +static const struct dev_pm_ops geni_i3c_pm_ops = { > + SET_RUNTIME_PM_OPS(geni_i3c_runtime_suspend, geni_i3c_runtime_resume, NULL) > +}; > + > +static const struct of_device_id geni_i3c_dt_match[] = { > + { .compatible = "qcom,i3c-master" }, > + { } > +}; > +MODULE_DEVICE_TABLE(of, geni_i3c_dt_match); > + > +static struct platform_driver geni_i3c_master = { > + .probe = geni_i3c_probe, > + .remove = geni_i3c_remove, > + .driver = { > + .name = "geni_i3c_master", > + .pm = &geni_i3c_pm_ops, > + .of_match_table = geni_i3c_dt_match, > + }, > +}; > + > +module_platform_driver(geni_i3c_master); > + > +MODULE_AUTHOR("Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com>"); > +MODULE_DESCRIPTION("Qualcomm I3C Controller Driver for GENI based QUP cores"); > +MODULE_LICENSE("GPL"); > -- > 2.25.1 > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-26 20:03 ` Frank Li @ 2025-03-29 9:09 ` Mukesh Kumar Savaliya 0 siblings, 0 replies; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-29 9:09 UTC (permalink / raw) To: Frank Li Cc: alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel, andersson, konradybcio Thanks Frank ! On 3/27/2025 1:33 AM, Frank Li wrote: > On Wed, Mar 26, 2025 at 07:46:40PM +0530, Mukesh Kumar Savaliya wrote: >> Add support for the Qualcomm I3C controller driver, which implements >> I3C master functionality as defined in the MIPI Alliance Specification >> for I3C, Version 1.0. >> >> This driver supports master role in SDR mode. >> >> Unlike some other I3C master controllers, this implementation >> does not support In-Band Interrupts (IBI) and Hot-join requests. >> >> Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> >> --- >> drivers/i3c/master/Kconfig | 12 + >> drivers/i3c/master/Makefile | 1 + >> drivers/i3c/master/qcom-i3c-master.c | 1107 ++++++++++++++++++++++++++ >> 3 files changed, 1120 insertions(+) >> create mode 100644 drivers/i3c/master/qcom-i3c-master.c >> >> diff --git a/drivers/i3c/master/Kconfig b/drivers/i3c/master/Kconfig >> index 77da199c7413..5370cadfe236 100644 >> --- a/drivers/i3c/master/Kconfig >> +++ b/drivers/i3c/master/Kconfig >> @@ -44,6 +44,18 @@ config SVC_I3C_MASTER >> help >> Support for Silvaco I3C Dual-Role Master Controller. >> >> +config QCOM_I3C_MASTER >> + tristate "Qualcomm Technologies Inc.'s I3C Master controller driver" >> + depends on I3C >> + help >> + This driver supports QUPV3 GENI based I3C controller in master > > It should have extrn 2 space > > help > This driver .... > Understood, will add this change in v3. >> + mode on the Qualcomm Technologies Inc.s SoCs. If you say yes to >> + this option, support will be included for the built-in I3C interface >> + on the Qualcomm Technologies Inc.s SoCs. >> + >> + This driver can also be built as a module. If so, the module >> + will be called qcom-i3c-master. >> + >> config MIPI_I3C_HCI >> tristate "MIPI I3C Host Controller Interface driver (EXPERIMENTAL)" >> depends on I3C >> diff --git a/drivers/i3c/master/Makefile b/drivers/i3c/master/Makefile >> index 3e97960160bc..f6670a63b34f 100644 >> --- a/drivers/i3c/master/Makefile >> +++ b/drivers/i3c/master/Makefile >> @@ -4,3 +4,4 @@ obj-$(CONFIG_DW_I3C_MASTER) += dw-i3c-master.o >> obj-$(CONFIG_AST2600_I3C_MASTER) += ast2600-i3c-master.o >> obj-$(CONFIG_SVC_I3C_MASTER) += svc-i3c-master.o >> obj-$(CONFIG_MIPI_I3C_HCI) += mipi-i3c-hci/ >> +obj-$(CONFIG_QCOM_I3C_MASTER) += qcom-i3c-master.o >> diff --git a/drivers/i3c/master/qcom-i3c-master.c b/drivers/i3c/master/qcom-i3c-master.c >> new file mode 100644 >> index 000000000000..54778a6baa70 >> --- /dev/null >> +++ b/drivers/i3c/master/qcom-i3c-master.c >> @@ -0,0 +1,1107 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> +/* >> + * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved. >> + * >> + * Author: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> >> + */ >> + >> +#include <linux/bits.h> >> +#include <linux/clk.h> >> +#include <linux/err.h> >> +#include <linux/i3c/master.h> >> +#include <linux/interrupt.h> >> +#include <linux/io.h> >> +#include <linux/kernel.h> >> +#include <linux/module.h> >> +#include <linux/of.h> >> +#include <linux/of_platform.h> >> +#include <linux/platform_device.h> >> +#include <linux/pm_runtime.h> >> +#include <linux/slab.h> >> +#include <linux/soc/qcom/geni-se.h> >> + >> +#define SE_I3C_SCL_HIGH 0x268 >> +#define SE_I3C_TX_TRANS_LEN 0x26C >> +#define SE_I3C_RX_TRANS_LEN 0x270 >> +#define SE_I3C_DELAY_COUNTER 0x274 >> +#define SE_I2C_SCL_COUNTERS 0x278 >> +#define SE_I3C_SCL_CYCLE 0x27C > > please use low case hex value > >> +#define SE_GENI_HW_IRQ_EN 0x920 >> +#define SE_GENI_HW_IRQ_IGNORE_ON_ACTIVE 0x924 >> +#define SE_GENI_HW_IRQ_CMD_PARAM_0 0x930 >> + >> +/* HW I3C IBI interrupt enable */ >> +#define M_IBI_IRQ_EN BIT(0) >> + >> +/* M_IBI_IRQ_IGNORE */ >> +#define M_IBI_IRQ_IGNORE BIT(0) >> + >> +/* SE_GENI_M_CLK_CFG field shifts */ >> +#define CLK_DIV_VALUE_MASK GENMASK(23, 4) >> +#define SER_CLK_EN BIT(0) >> + >> +/* SE_GENI_HW_IRQ_CMD_PARAM_0 field bits */ >> +#define M_IBI_IRQ_PARAM_7E BIT(0) >> +#define M_IBI_IRQ_PARAM_STOP_STALL BIT(1) >> +/* SE_I2C_SCL_COUNTERS field shifts */ >> +#define I2C_SCL_HIGH_COUNTER_MASK GENMASK(29, 20) >> +#define I2C_SCL_LOW_COUNTER_MASK GENMASK(19, 10) >> +#define I2C_SCL_CYCLE_COUNTER_MASK GENMASK(9, 0) >> + >> +#define SE_I3C_ERR (M_CMD_OVERRUN_EN | M_ILLEGAL_CMD_EN | M_CMD_FAILURE_EN |\ >> + M_CMD_ABORT_EN | M_GP_IRQ_0_EN | M_GP_IRQ_1_EN | M_GP_IRQ_2_EN | \ >> + M_GP_IRQ_3_EN | M_GP_IRQ_4_EN) >> + >> +/* M_CMD OP codes for I2C/I3C */ >> +#define I3C_READ_IBI_HW 0 >> +#define I2C_WRITE 1 >> +#define I2C_READ 2 >> +#define I2C_WRITE_READ 3 >> +#define I2C_ADDR_ONLY 4 >> +#define I3C_INBAND_RESET 5 >> +#define I2C_BUS_CLEAR 6 >> +#define I2C_STOP_ON_BUS 7 >> +#define I3C_HDR_DDR_EXIT 8 >> +#define I3C_PRIVATE_WRITE 9 >> +#define I3C_PRIVATE_READ 10 >> +#define I3C_HDR_DDR_WRITE 11 >> +#define I3C_HDR_DDR_READ 12 >> +#define I3C_DIRECT_CCC_ADDR_ONLY 13 >> +#define I3C_BCAST_CCC_ADDR_ONLY 14 >> +#define I3C_READ_IBI 15 >> +#define I3C_BCAST_CCC_WRITE 16 >> +#define I3C_DIRECT_CCC_WRITE 17 >> +#define I3C_DIRECT_CCC_READ 18 >> + >> +/* M_CMD params for I3C */ >> +#define PRE_CMD_DELAY BIT(0) >> +#define TIMESTAMP_BEFORE BIT(1) >> +#define STOP_STRETCH BIT(2) >> +#define TIMESTAMP_AFTER BIT(3) >> +#define POST_COMMAND_DELAY BIT(4) >> +#define IGNORE_ADD_NACK BIT(6) >> +#define READ_FINISHED_WITH_ACK BIT(7) >> +#define CONTINUOUS_MODE_DAA BIT(8) >> + >> +#define SLAVE_ADDR_MASK GENMASK(15, 9) >> +#define SLV_ADDR_SHFT 9 >> + >> +#define CCC_HDR_CMD_MSK GENMASK(23, 16) >> +#define CCC_HDR_CMD_SHFT 16 >> +#define IBI_NACK_TBL_CTRL BIT(24) >> +#define USE_7E BIT(25) >> +#define BYPASS_ADDR_PHASE BIT(26) >> + >> +/* GSI callback error fields - DMA_TX_IRQ_STAT */ >> +#define GP_IRQ0 BIT(5) >> +#define GP_IRQ1 BIT(6) >> +#define GP_IRQ2 BIT(7) >> +#define GP_IRQ3 BIT(8) >> +#define GP_IRQ4 BIT(9) >> +#define GP_IRQ5 BIT(10) >> +#define DM_I3C_CB_ERR GENMASK(10, 5) >> + >> +#define I3C_AUTO_SUSPEND_DELAY 250 >> +#define KHZ(freq) (1000 * (freq)) >> +#define PACKING_BYTES_PW 4 >> +#define XFER_TIMEOUT 250 >> +#define DFS_INDEX_MAX 7 >> + >> +#define I3C_ADDR_MASK 0x7f >> + >> +enum geni_i3c_err_code { >> + RD_TERM, >> + NACK, >> + CRC_ERR, >> + BUS_PROTO, >> + NACK_7E, >> + NACK_IBI, >> + GENI_OVERRUN, >> + GENI_ILLEGAL_CMD, >> + GENI_ABORT_DONE, >> + GENI_TIMEOUT, >> +}; >> + >> +enum i3c_bus_phase { >> + OPEN_DRAIN_MODE = 0, >> + PUSH_PULL_MODE = 1 >> +}; >> + >> +struct geni_i3c_dev { >> + struct geni_se se; >> + unsigned int tx_wm; >> + int irq; >> + int err; >> + struct i3c_master_controller ctrlr; >> + struct completion done; >> + /* Protects per device CCC command or transfer from get_mutex_lock()/unlock() wrapper */ >> + struct mutex lock; >> + /* Per device protection between process and IRQ context */ >> + spinlock_t irq_lock; >> + u32 clk_src_freq; >> + u8 *cur_buf; >> + bool cur_is_write; >> + int cur_len; >> + int cur_idx; >> + //unsigned long newaddrslots[(I3C_ADDR_MASK + 1) / BITS_PER_LONG]; >> + DECLARE_BITMAP(newaddrslots, 64); >> + >> + const struct geni_i3c_clk_settings *clk_cfg; >> + const struct geni_i3c_clk_settings *clk_od_cfg; >> +}; >> + >> +struct geni_i3c_i2c_dev_data { >> + u32 ibi_keeping; /* Plan to save IBI information, keep as dummy for now */ > > Remove it, add it only when use it. > >> +}; >> + >> +struct geni_i3c_xfer_params { >> + enum geni_se_xfer_mode mode; >> + u32 m_cmd; >> + u32 m_param; >> +}; >> + >> +static inline struct geni_i3c_dev *to_geni_i3c_master(struct i3c_master_controller >> + *master) >> +{ >> + return container_of(master, struct geni_i3c_dev, ctrlr); >> +} >> + >> +struct geni_i3c_clk_settings { >> + u32 clk_freq_out; >> + u32 clk_src_freq; >> + u8 clk_div; >> + u8 i2c_t_high_cnt; >> + u8 i2c_t_low_cnt; >> + u8 i3c_t_high_cnt; >> + u8 i3c_t_cycle_cnt; >> + u8 i2c_t_cycle_cnt; >> +}; >> + >> +/* >> + * Hardware uses the underlying formula to calculate time periods of >> + * SCL clock cycle. Firmware uses some additional cycles excluded from the >> + * below formula and it is confirmed that the time periods are within >> + * specification limits. >> + * >> + * time of high period of I2C SCL: >> + * i2c_t_high = (i2c_t_high_cnt * clk_div) / source_clock >> + * time of low period of I2C SCL: >> + * i2c_t_low = (i2c_t_low_cnt * clk_div) / source_clock >> + * time of full period of I2C SCL: >> + * i2c_t_cycle = (i2c_t_cycle_cnt * clk_div) / source_clock >> + * time of high period of I3C SCL: >> + * i3c_t_high = (i3c_t_high_cnt * clk_div) / source_clock >> + * time of full period of I3C SCL: >> + * i3c_t_cycle = (i3c_t_cycle_cnt * clk_div) / source_clock >> + * clk_freq_out = t / t_cycle >> + */ >> +static const struct geni_i3c_clk_settings geni_i3c_clk_map[] = { >> +/* op-freq, src-freq, div, i2c_high, i2c_low, i3c_high, i3c_cyc i2c_cyc */ >> + { KHZ(100), KHZ(19200), 1, 76, 90, 7, 8, 192}, >> + { KHZ(400), KHZ(19200), 1, 12, 24, 7, 8, 48}, >> + { KHZ(1000), KHZ(19200), 1, 4, 9, 7, 0, 19}, >> + { KHZ(12500), KHZ(100000), 1, 45, 63, 6, 7, 110}, >> +}; >> + >> +static int geni_i3c_clk_map_idx(struct geni_i3c_dev *gi3c) >> +{ >> + const struct geni_i3c_clk_settings *clk_idx = geni_i3c_clk_map; >> + struct i3c_master_controller *m = &gi3c->ctrlr; >> + struct i3c_bus *bus = i3c_master_get_bus(m); >> + int i; >> + >> + for (i = 0; i < ARRAY_SIZE(geni_i3c_clk_map); i++, clk_idx++) { >> + if ((!bus || clk_idx->clk_freq_out == bus->scl_rate.i3c) && >> + clk_idx->clk_src_freq == gi3c->clk_src_freq) { >> + gi3c->clk_cfg = clk_idx; >> + } >> + >> + if (clk_idx->clk_freq_out == bus->scl_rate.i2c) >> + gi3c->clk_od_cfg = clk_idx; >> + } >> + >> + if (!gi3c->clk_cfg || !gi3c->clk_od_cfg) >> + return -EINVAL; >> + >> + return 0; >> +} >> + >> +static void set_new_addr_slot(unsigned long *addrslot, u8 addr) >> +{ >> + if (addr > I3C_ADDR_MASK) >> + return; >> + >> + set_bit(addr, addrslot); >> +} >> + >> +static void clear_new_addr_slot(unsigned long *addrslot, u8 addr) >> +{ >> + if (addr > I3C_ADDR_MASK) >> + return; >> + >> + clear_bit(addr, addrslot); >> +} >> + >> +static bool is_new_addr_slot_set(unsigned long *addrslot, u8 addr) >> +{ >> + if (addr > I3C_ADDR_MASK) >> + return false; >> + >> + return test_bit(addr, addrslot); >> +} >> + >> +static void qcom_geni_i3c_conf(struct geni_i3c_dev *gi3c, enum i3c_bus_phase bus_phase) >> +{ >> + const struct geni_i3c_clk_settings *clk_idx = gi3c->clk_cfg; >> + unsigned long freq; >> + u32 val, dfs_idx; >> + int ret; >> + >> + if (bus_phase == OPEN_DRAIN_MODE) >> + clk_idx = gi3c->clk_od_cfg; >> + >> + ret = geni_se_clk_freq_match(&gi3c->se, clk_idx->clk_src_freq, >> + &dfs_idx, &freq, false); >> + if (ret) >> + dfs_idx = 0; >> + >> + writel_relaxed(dfs_idx, gi3c->se.base + SE_GENI_CLK_SEL); >> + >> + val = FIELD_PREP(CLK_DIV_VALUE_MASK, clk_idx->clk_div); >> + val |= SER_CLK_EN; >> + writel_relaxed(val, gi3c->se.base + GENI_SER_M_CLK_CFG); >> + >> + val = FIELD_PREP(I2C_SCL_HIGH_COUNTER_MASK, clk_idx->i2c_t_high_cnt); >> + val |= FIELD_PREP(I2C_SCL_LOW_COUNTER_MASK, clk_idx->i2c_t_low_cnt); >> + val |= FIELD_PREP(I2C_SCL_CYCLE_COUNTER_MASK, clk_idx->i2c_t_cycle_cnt); >> + writel_relaxed(val, gi3c->se.base + SE_I2C_SCL_COUNTERS); >> + >> + writel_relaxed(clk_idx->i3c_t_cycle_cnt, gi3c->se.base + SE_I3C_SCL_CYCLE); >> + writel_relaxed(clk_idx->i3c_t_high_cnt, gi3c->se.base + SE_I3C_SCL_HIGH); >> + >> + writel_relaxed(M_IBI_IRQ_IGNORE, gi3c->se.base + SE_GENI_HW_IRQ_IGNORE_ON_ACTIVE); >> + >> + val = M_IBI_IRQ_PARAM_STOP_STALL | M_IBI_IRQ_PARAM_7E; >> + writel_relaxed(val, gi3c->se.base + SE_GENI_HW_IRQ_CMD_PARAM_0); >> + >> + writel_relaxed(M_IBI_IRQ_EN, gi3c->se.base + SE_GENI_HW_IRQ_EN); >> +} >> + >> +static void geni_i3c_handle_err(struct geni_i3c_dev *gi3c, u32 status) >> +{ >> + dev_dbg(gi3c->se.dev, "len:%d, %s\n", >> + gi3c->cur_len, gi3c->cur_is_write ? "write" : "read"); >> + >> + if (status & M_GP_IRQ_0_EN) { >> + gi3c->err = -EINVAL; >> + dev_dbg(gi3c->se.dev, "%s\n", "I3C slave early read termination"); >> + } >> + if (status & M_GP_IRQ_1_EN) { >> + gi3c->err = -ENOTCONN; >> + dev_dbg(gi3c->se.dev, "%s\n", "NACK: slave unresponsive, check power/reset"); >> + } >> + if (status & M_GP_IRQ_2_EN) { >> + gi3c->err = -EINVAL; >> + dev_dbg(gi3c->se.dev, "%s\n", "CRC or parity error"); >> + } >> + if (status & M_GP_IRQ_3_EN) { >> + gi3c->err = -EPROTO; >> + dev_dbg(gi3c->se.dev, "%s\n", "Bus proto Error, noisy/unexpected start/stop"); >> + } >> + if (status & M_GP_IRQ_4_EN) { >> + gi3c->err = -EBUSY; >> + dev_dbg(gi3c->se.dev, "%s\n", "NACK on 7E, unexpected protocol error"); >> + } >> + if (status & M_GP_IRQ_5_EN) { >> + gi3c->err = -EINVAL; >> + dev_dbg(gi3c->se.dev, "%s\n", "NACK on IBI"); >> + } >> + if (status & M_CMD_OVERRUN_EN) { >> + gi3c->err = -EIO; >> + dev_dbg(gi3c->se.dev, "%s\n", "Cmd overrun, check GENI cmd-state machine"); >> + } >> + if (status & M_ILLEGAL_CMD_EN) { >> + gi3c->err = -EILSEQ; >> + dev_dbg(gi3c->se.dev, "%s\n", "Illegal cmd, check GENI cmd-state machine"); >> + } >> + if (status & M_CMD_ABORT_EN) { >> + gi3c->err = -ETIMEDOUT; >> + dev_dbg(gi3c->se.dev, "%s\n", "Abort after timeout successful"); >> + } >> + if (status & GENI_TIMEOUT) { >> + gi3c->err = -ETIMEDOUT; >> + dev_dbg(gi3c->se.dev, "%s\n", "I3C transaction timed out"); >> + } >> +} >> + >> +static irqreturn_t geni_i3c_irq(int irq, void *dev) >> +{ >> + u32 m_stat_mask, dm_tx_st, dm_rx_st, m_stat, rx_st, dma; >> + struct geni_i3c_dev *gi3c = dev; >> + unsigned long flags; >> + int j; >> + >> + m_stat = readl_relaxed(gi3c->se.base + SE_GENI_M_IRQ_STATUS); >> + m_stat_mask = readl_relaxed(gi3c->se.base + SE_GENI_M_IRQ_EN); >> + rx_st = readl_relaxed(gi3c->se.base + SE_GENI_RX_FIFO_STATUS); >> + dm_tx_st = readl_relaxed(gi3c->se.base + SE_DMA_TX_IRQ_STAT); >> + dm_rx_st = readl_relaxed(gi3c->se.base + SE_DMA_RX_IRQ_STAT); >> + dma = readl_relaxed(gi3c->se.base + SE_GENI_DMA_MODE_EN); >> + >> + spin_lock_irqsave(&gi3c->irq_lock, flags); >> + >> + if (m_stat & SE_I3C_ERR || dm_rx_st & DM_I3C_CB_ERR) { >> + geni_i3c_handle_err(gi3c, m_stat); >> + /* Disable the TX Watermark interrupt to stop TX */ >> + if (!dma) >> + writel_relaxed(0, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); >> + goto irqret; >> + } >> + >> + if (dma) { >> + dev_dbg(gi3c->se.dev, "i3c dma tx:0x%x, dma rx:0x%x\n", dm_tx_st, dm_rx_st); >> + goto irqret; >> + } >> + >> + if ((m_stat & >> + (M_RX_FIFO_WATERMARK_EN | M_RX_FIFO_LAST_EN)) && >> + !gi3c->cur_is_write && gi3c->cur_buf) { >> + u32 rxcnt = rx_st & RX_FIFO_WC_MSK; >> + >> + for (j = 0; j < rxcnt; j++) { >> + u32 val; >> + int p = 0; >> + >> + val = readl_relaxed(gi3c->se.base + SE_GENI_RX_FIFOn); >> + while (gi3c->cur_idx < gi3c->cur_len && p < sizeof(val)) { >> + gi3c->cur_buf[gi3c->cur_idx++] = val & 0xff; >> + val >>= 8; >> + p++; >> + } >> + if (gi3c->cur_idx == gi3c->cur_len) >> + break; >> + } >> + } else if (m_stat & M_TX_FIFO_WATERMARK_EN && >> + gi3c->cur_is_write && gi3c->cur_buf) { >> + for (j = 0; j < gi3c->tx_wm; j++) { >> + u32 temp; >> + u32 val = 0; >> + int p = 0; >> + >> + while (gi3c->cur_idx < gi3c->cur_len && p < sizeof(val)) { >> + temp = gi3c->cur_buf[gi3c->cur_idx++]; >> + val |= temp << (p * 8); >> + p++; >> + } >> + >> + writel_relaxed(val, gi3c->se.base + SE_GENI_TX_FIFOn); >> + if (gi3c->cur_idx == gi3c->cur_len) { >> + writel_relaxed(0, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); >> + break; >> + } >> + } >> + } >> + >> +irqret: >> + if (m_stat) >> + writel_relaxed(m_stat, gi3c->se.base + SE_GENI_M_IRQ_CLEAR); >> + >> + if (dma) { >> + if (dm_tx_st) >> + writel_relaxed(dm_tx_st, gi3c->se.base + SE_DMA_TX_IRQ_CLR); >> + if (dm_rx_st) >> + writel_relaxed(dm_rx_st, gi3c->se.base + SE_DMA_RX_IRQ_CLR); >> + } >> + >> + /* if this is err with done-bit not set, handle that through timeout. */ >> + if (m_stat & M_CMD_DONE_EN || m_stat & M_CMD_ABORT_EN) { >> + writel_relaxed(0, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); >> + complete(&gi3c->done); >> + } else if (dm_tx_st & TX_DMA_DONE || dm_rx_st & RX_DMA_DONE || >> + dm_rx_st & RX_RESET_DONE) { >> + complete(&gi3c->done); >> + } >> + >> + spin_unlock_irqrestore(&gi3c->irq_lock, flags); >> + return IRQ_HANDLED; >> +} >> + >> +static int i3c_geni_runtime_get_mutex_lock(struct geni_i3c_dev *gi3c) >> +{ >> + int ret; >> + >> + mutex_lock(&gi3c->lock); >> + reinit_completion(&gi3c->done); >> + ret = pm_runtime_get_sync(gi3c->se.dev); >> + if (ret < 0) { >> + dev_err(gi3c->se.dev, "error turning on SE resources:%d\n", ret); >> + pm_runtime_put_noidle(gi3c->se.dev); >> + /* Set device in suspended since resume failed */ >> + pm_runtime_set_suspended(gi3c->se.dev); >> + mutex_unlock(&gi3c->lock); >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static void i3c_geni_runtime_put_mutex_unlock(struct geni_i3c_dev *gi3c) >> +{ >> + pm_runtime_mark_last_busy(gi3c->se.dev); >> + pm_runtime_put_autosuspend(gi3c->se.dev); >> + mutex_unlock(&gi3c->lock); >> +} >> + >> +static void geni_i3c_abort_xfer(struct geni_i3c_dev *gi3c) >> +{ >> + unsigned long time_remaining; >> + unsigned long flags; >> + >> + reinit_completion(&gi3c->done); >> + spin_lock_irqsave(&gi3c->irq_lock, flags); >> + geni_i3c_handle_err(gi3c, GENI_TIMEOUT); >> + geni_se_abort_m_cmd(&gi3c->se); >> + spin_unlock_irqrestore(&gi3c->irq_lock, flags); >> + time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT); >> + if (!time_remaining) >> + dev_err(gi3c->se.dev, "Timeout abort_m_cmd\n"); >> +} >> + >> +static int _i3c_geni_execute_command(struct geni_i3c_dev *gi3c, struct geni_i3c_xfer_params *xfer) >> +{ >> + bool is_write = gi3c->cur_is_write; >> + dma_addr_t tx_dma = 0, rx_dma = 0; >> + unsigned long time_remaining; >> + u32 len = gi3c->cur_len; >> + int ret; >> + >> + geni_se_select_mode(&gi3c->se, xfer->mode); >> + >> + gi3c->err = 0; >> + gi3c->cur_idx = 0; >> + >> + if (!is_write) { >> + dev_dbg(gi3c->se.dev, "I3C cmd:0x%x param:0x%x READ len:%d\n", >> + xfer->m_cmd, xfer->m_param, len); >> + writel_relaxed(len, gi3c->se.base + SE_I3C_RX_TRANS_LEN); >> + geni_se_setup_m_cmd(&gi3c->se, xfer->m_cmd, xfer->m_param); >> + if (xfer->mode == GENI_SE_DMA) { >> + ret = geni_se_rx_dma_prep(&gi3c->se, gi3c->cur_buf, len, &rx_dma); >> + if (ret) { >> + xfer->mode = GENI_SE_FIFO; >> + geni_se_select_mode(&gi3c->se, xfer->mode); >> + } >> + } >> + } else { >> + dev_dbg(gi3c->se.dev, "I3C cmd:0x%x param:0x%x WRITE len:%d\n", >> + xfer->m_cmd, xfer->m_param, len); >> + >> + writel_relaxed(len, gi3c->se.base + SE_I3C_TX_TRANS_LEN); >> + geni_se_setup_m_cmd(&gi3c->se, xfer->m_cmd, xfer->m_param); >> + >> + if (xfer->mode == GENI_SE_DMA) { >> + ret = geni_se_tx_dma_prep(&gi3c->se, gi3c->cur_buf, len, &tx_dma); >> + if (ret) { >> + xfer->mode = GENI_SE_FIFO; >> + geni_se_select_mode(&gi3c->se, xfer->mode); >> + } >> + } >> + >> + if (xfer->mode == GENI_SE_FIFO && len > 0) /* Get FIFO IRQ */ >> + writel_relaxed(1, gi3c->se.base + SE_GENI_TX_WATERMARK_REG); >> + } >> + >> + time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT); >> + if (!time_remaining) { >> + unsigned long flags; >> + >> + dev_dbg(gi3c->se.dev, "Timeout completing FIFO transfer\n"); >> + spin_lock_irqsave(&gi3c->irq_lock, flags); >> + geni_i3c_handle_err(gi3c, GENI_TIMEOUT); >> + gi3c->cur_buf = NULL; >> + spin_unlock_irqrestore(&gi3c->irq_lock, flags); >> + geni_i3c_abort_xfer(gi3c); >> + } >> + >> + if (xfer->mode == GENI_SE_DMA) { >> + if (gi3c->err) { >> + if (is_write) >> + writel_relaxed(1, gi3c->se.base + SE_DMA_TX_FSM_RST); >> + else >> + writel_relaxed(1, gi3c->se.base + SE_DMA_RX_FSM_RST); >> + >> + time_remaining = wait_for_completion_timeout(&gi3c->done, XFER_TIMEOUT); >> + dev_dbg(gi3c->se.dev, "Timeout completing DMA transfer\n"); >> + } >> + geni_se_rx_dma_unprep(&gi3c->se, rx_dma, len); >> + geni_se_tx_dma_unprep(&gi3c->se, tx_dma, len); >> + } >> + >> + ret = gi3c->err; >> + if (gi3c->err) >> + dev_err(gi3c->se.dev, "I3C transaction error :%d\n", gi3c->err); >> + >> + gi3c->cur_buf = NULL; >> + gi3c->err = 0; >> + >> + return ret; >> +} >> + >> +static int i3c_geni_execute_read_command(struct geni_i3c_dev *gi3c, >> + struct geni_i3c_xfer_params *xfer, u8 *buf, u32 len) >> +{ >> + gi3c->cur_is_write = false; >> + gi3c->cur_buf = buf; >> + gi3c->cur_len = len; >> + return _i3c_geni_execute_command(gi3c, xfer); >> + //return geni_i3c_fifo_dma_xfer(gi3c, xfer); > > remove these commented code. > >> +} >> + >> +static int i3c_geni_execute_write_command(struct geni_i3c_dev *gi3c, >> + struct geni_i3c_xfer_params *xfer, u8 *buf, u32 len) >> +{ >> + gi3c->cur_is_write = true; >> + gi3c->cur_buf = buf; >> + gi3c->cur_len = len; >> + return _i3c_geni_execute_command(gi3c, xfer); >> + //return geni_i3c_fifo_dma_xfer(gi3c, xfer); >> +} >> + >> +static void geni_i3c_perform_daa(struct geni_i3c_dev *gi3c) >> +{ >> + u8 last_dyn_addr = 0; >> + int ret; >> + >> + while (1) { >> + u8 rx_buf[8], tx_buf[8]; >> + struct geni_i3c_xfer_params xfer = { GENI_SE_FIFO }; >> + struct i3c_device_info info = { 0 }; >> + struct i3c_dev_desc *i3cdev; >> + bool new_device = true; >> + u64 pid; >> + u8 bcr, dcr, addr; >> + >> + xfer.m_cmd = I2C_READ; >> + xfer.m_param = STOP_STRETCH | CONTINUOUS_MODE_DAA | USE_7E; >> + ret = i3c_geni_execute_read_command(gi3c, &xfer, rx_buf, 8); >> + if (ret) >> + break; >> + >> + dcr = rx_buf[7]; >> + bcr = rx_buf[6]; >> + pid = ((u64)rx_buf[0] << 40) | >> + ((u64)rx_buf[1] << 32) | >> + ((u64)rx_buf[2] << 24) | >> + ((u64)rx_buf[3] << 16) | >> + ((u64)rx_buf[4] << 8) | >> + ((u64)rx_buf[5]); >> + >> + i3c_bus_for_each_i3cdev(&gi3c->ctrlr.bus, i3cdev) { >> + i3c_device_get_info(i3cdev->dev, &info); >> + if (pid == info.pid && dcr == info.dcr && bcr == info.bcr) { >> + new_device = false; >> + addr = (info.dyn_addr) ? info.dyn_addr : >> + info.static_addr; >> + break; >> + } >> + } >> + >> + if (new_device) { >> + ret = i3c_master_get_free_addr(&gi3c->ctrlr, last_dyn_addr + 1); >> + if (ret < 0) >> + break; >> + addr = (u8)ret; >> + last_dyn_addr = (u8)ret; >> + set_new_addr_slot(gi3c->newaddrslots, addr); >> + } >> + >> + tx_buf[0] = (addr & I3C_ADDR_MASK) << 1; >> + tx_buf[0] |= ~(hweight8(addr & I3C_ADDR_MASK) & 1); >> + >> + xfer.m_cmd = I2C_WRITE; >> + xfer.m_param = STOP_STRETCH | BYPASS_ADDR_PHASE | USE_7E; >> + >> + ret = i3c_geni_execute_write_command(gi3c, &xfer, tx_buf, 1); >> + if (ret) >> + break; >> + } >> +} >> + >> +static int geni_i3c_master_send_ccc_cmd(struct i3c_master_controller *m, >> + struct i3c_ccc_cmd *cmd) >> +{ >> + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); >> + int i, ret; >> + >> + if (!(cmd->id & I3C_CCC_DIRECT) && cmd->ndests != 1) >> + return -EINVAL; >> + >> + ret = i3c_geni_runtime_get_mutex_lock(gi3c); >> + if (ret) >> + return ret; >> + >> + qcom_geni_i3c_conf(gi3c, OPEN_DRAIN_MODE); >> + for (i = 0; i < cmd->ndests; i++) { >> + int stall = (i < (cmd->ndests - 1)) || >> + (cmd->id == I3C_CCC_ENTDAA); >> + struct geni_i3c_xfer_params xfer = { GENI_SE_FIFO }; >> + >> + xfer.m_param = (stall ? STOP_STRETCH : 0); >> + xfer.m_param |= (cmd->id << CCC_HDR_CMD_SHFT); >> + xfer.m_param |= IBI_NACK_TBL_CTRL; >> + if (cmd->id & I3C_CCC_DIRECT) { >> + xfer.m_param |= FIELD_PREP(SLAVE_ADDR_MASK, cmd->dests[i].addr); >> + if (cmd->rnw) { >> + if (i == 0) >> + xfer.m_cmd = I3C_DIRECT_CCC_READ; >> + else >> + xfer.m_cmd = I3C_PRIVATE_READ; >> + } else { >> + if (i == 0) >> + xfer.m_cmd = >> + (cmd->dests[i].payload.len > 0) ? >> + I3C_DIRECT_CCC_WRITE : >> + I3C_DIRECT_CCC_ADDR_ONLY; >> + else >> + xfer.m_cmd = I3C_PRIVATE_WRITE; >> + } >> + } else { >> + if (cmd->dests[i].payload.len > 0) >> + xfer.m_cmd = I3C_BCAST_CCC_WRITE; >> + else >> + xfer.m_cmd = I3C_BCAST_CCC_ADDR_ONLY; >> + } >> + >> + if (i == 0) >> + xfer.m_param |= USE_7E; >> + >> + if (cmd->rnw) >> + ret = i3c_geni_execute_read_command(gi3c, &xfer, >> + cmd->dests[i].payload.data, >> + cmd->dests[i].payload.len); >> + else >> + ret = i3c_geni_execute_write_command(gi3c, &xfer, >> + cmd->dests[i].payload.data, >> + cmd->dests[i].payload.len); >> + if (ret) >> + break; >> + >> + if (cmd->id == I3C_CCC_ENTDAA) >> + geni_i3c_perform_daa(gi3c); >> + } >> + >> + i3c_geni_runtime_put_mutex_unlock(gi3c); >> + return ret; >> +} >> + >> +static int geni_i3c_master_priv_xfers(struct i3c_dev_desc *dev, struct i3c_priv_xfer *xfers, >> + int nxfers) >> +{ >> + struct i3c_master_controller *m = i3c_dev_get_master(dev); >> + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); >> + bool use_7e = false; >> + int i, ret; >> + >> + ret = i3c_geni_runtime_get_mutex_lock(gi3c); >> + if (ret) >> + return ret; >> + >> + qcom_geni_i3c_conf(gi3c, PUSH_PULL_MODE); >> + >> + for (i = 0; i < nxfers; i++) { >> + bool stall = (i < (nxfers - 1)); >> + struct geni_i3c_xfer_params xfer = { GENI_SE_FIFO }; >> + >> + xfer.m_param = (stall ? STOP_STRETCH : 0); >> + xfer.m_param |= FIELD_PREP(SLAVE_ADDR_MASK, dev->info.dyn_addr); >> + xfer.m_param |= (use_7e) ? USE_7E : 0; >> + >> + /* use_7e = true only for last transfer */ >> + use_7e = (i == nxfers - 1); >> + >> + if (xfers[i].rnw) { >> + xfer.m_cmd = I3C_PRIVATE_READ; >> + ret = i3c_geni_execute_read_command(gi3c, &xfer, (u8 *)xfers[i].data.in, >> + xfers[i].len); >> + } else { >> + xfer.m_cmd = I3C_PRIVATE_WRITE; >> + ret = i3c_geni_execute_write_command(gi3c, &xfer, (u8 *)xfers[i].data.out, >> + xfers[i].len); >> + } >> + >> + if (ret) >> + break; >> + } >> + >> + dev_dbg(gi3c->se.dev, "i3c priv: txn ret:%d\n", ret); >> + i3c_geni_runtime_put_mutex_unlock(gi3c); >> + return ret; >> +} >> + >> +static int geni_i3c_master_i2c_xfers(struct i2c_dev_desc *dev, const struct i2c_msg *msgs, int num) >> +{ >> + struct i3c_master_controller *m = i2c_dev_get_master(dev); >> + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); >> + int i, ret; >> + >> + ret = i3c_geni_runtime_get_mutex_lock(gi3c); >> + if (ret) >> + return ret; >> + >> + qcom_geni_i3c_conf(gi3c, PUSH_PULL_MODE); >> + >> + for (i = 0; i < num; i++) { >> + struct geni_i3c_xfer_params xfer; >> + >> + xfer.m_cmd = (msgs[i].flags & I2C_M_RD) ? I2C_READ : I2C_WRITE; >> + xfer.m_param = (i < (num - 1)) ? STOP_STRETCH : 0; >> + xfer.m_param |= FIELD_PREP(SLAVE_ADDR_MASK, msgs[i].addr); >> + xfer.mode = msgs[i].len > 32 ? GENI_SE_DMA : GENI_SE_FIFO; >> + if (msgs[i].flags & I2C_M_RD) >> + ret = i3c_geni_execute_read_command(gi3c, &xfer, msgs[i].buf, msgs[i].len); >> + else >> + ret = i3c_geni_execute_write_command(gi3c, &xfer, msgs[i].buf, msgs[i].len); >> + if (ret) >> + break; >> + } >> + >> + dev_dbg(gi3c->se.dev, "i2c: txn ret:%d\n", ret); >> + i3c_geni_runtime_put_mutex_unlock(gi3c); >> + return ret; >> +} >> + >> +static int geni_i3c_master_attach_i2c_dev(struct i2c_dev_desc *dev) >> +{ >> + struct geni_i3c_i2c_dev_data *data; >> + >> + data = kzalloc(sizeof(*data), GFP_KERNEL); >> + if (!data) >> + return -ENOMEM; >> + >> + i2c_dev_set_master_data(dev, data); >> + return 0; >> +} >> + >> +static void geni_i3c_master_detach_i2c_dev(struct i2c_dev_desc *dev) >> +{ >> + struct geni_i3c_i2c_dev_data *data = i2c_dev_get_master_data(dev); >> + >> + i2c_dev_set_master_data(dev, NULL); >> + kfree(data); >> +} >> + >> +static int geni_i3c_master_attach_i3c_dev(struct i3c_dev_desc *dev) >> +{ >> + struct geni_i3c_i2c_dev_data *data; >> + >> + data = kzalloc(sizeof(*data), GFP_KERNEL); >> + if (!data) >> + return -ENOMEM; >> + >> + i3c_dev_set_master_data(dev, data); >> + return 0; >> +} >> + >> +static void geni_i3c_master_detach_i3c_dev(struct i3c_dev_desc *dev) >> +{ >> + struct geni_i3c_i2c_dev_data *data = i3c_dev_get_master_data(dev); >> + >> + i3c_dev_set_master_data(dev, NULL); >> + kfree(data); >> +} >> + >> +static int geni_i3c_master_do_daa(struct i3c_master_controller *m) >> +{ >> + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); >> + u8 addr; >> + int ret; >> + >> + ret = i3c_master_entdaa_locked(m); >> + if (ret && ret != I3C_ERROR_M2) >> + return ret; >> + >> + for (addr = 0; addr <= I3C_ADDR_MASK; addr++) { >> + if (is_new_addr_slot_set(gi3c->newaddrslots, addr)) { >> + clear_new_addr_slot(gi3c->newaddrslots, addr); >> + i3c_master_add_i3c_dev_locked(m, addr); >> + } >> + } >> + >> + return 0; >> +} >> + >> +static int geni_i3c_master_bus_init(struct i3c_master_controller *m) >> +{ >> + struct geni_i3c_dev *gi3c = to_geni_i3c_master(m); >> + struct i3c_bus *bus = i3c_master_get_bus(m); >> + struct i3c_device_info info = { }; >> + int ret; >> + >> + /* Get an address for the master. */ >> + ret = i3c_master_get_free_addr(m, 0); >> + if (ret < 0) >> + dev_err(gi3c->se.dev, "%s: error No free addr:%d\n", __func__, ret); >> + >> + info.dyn_addr = ret; >> + info.dcr = I3C_DCR_GENERIC_DEVICE; >> + info.bcr = I3C_BCR_I3C_MASTER | I3C_BCR_HDR_CAP; >> + info.pid = 0; >> + >> + ret = geni_i3c_clk_map_idx(gi3c); >> + if (ret) >> + dev_err(gi3c->se.dev, >> + "Invalid clk frequency %d Hz src for %ld Hz bus: %d\n", >> + gi3c->clk_src_freq, bus->scl_rate.i3c, ret); >> + >> + ret = i3c_geni_runtime_get_mutex_lock(gi3c); >> + if (ret) >> + return ret; >> + >> + qcom_geni_i3c_conf(gi3c, OPEN_DRAIN_MODE); >> + >> + ret = i3c_master_set_info(&gi3c->ctrlr, &info); >> + i3c_geni_runtime_put_mutex_unlock(gi3c); >> + return ret; >> +} >> + >> +static bool geni_i3c_master_supports_ccc_cmd(struct i3c_master_controller *m, >> + const struct i3c_ccc_cmd *cmd) >> +{ >> + switch (cmd->id) { >> + case I3C_CCC_ENEC(true): >> + fallthrough; >> + case I3C_CCC_ENEC(false): >> + fallthrough; >> + case I3C_CCC_DISEC(true): >> + fallthrough; >> + case I3C_CCC_DISEC(false): >> + fallthrough; >> + case I3C_CCC_ENTAS(0, true): >> + fallthrough; >> + case I3C_CCC_ENTAS(0, false): >> + fallthrough; >> + case I3C_CCC_RSTDAA(true): >> + fallthrough; >> + case I3C_CCC_RSTDAA(false): >> + fallthrough; >> + case I3C_CCC_ENTDAA: >> + fallthrough; >> + case I3C_CCC_SETMWL(true): >> + fallthrough; >> + case I3C_CCC_SETMWL(false): >> + fallthrough; >> + case I3C_CCC_SETMRL(true): >> + fallthrough; >> + case I3C_CCC_SETMRL(false): >> + fallthrough; >> + case I3C_CCC_DEFSLVS: >> + fallthrough; >> + case I3C_CCC_SETDASA: >> + fallthrough; >> + case I3C_CCC_SETNEWDA: >> + fallthrough; >> + case I3C_CCC_GETMWL: >> + fallthrough; >> + case I3C_CCC_GETMRL: >> + fallthrough; >> + case I3C_CCC_GETPID: >> + fallthrough; >> + case I3C_CCC_GETBCR: >> + fallthrough; >> + case I3C_CCC_GETDCR: >> + fallthrough; >> + case I3C_CCC_GETSTATUS: >> + fallthrough; >> + case I3C_CCC_GETACCMST: >> + fallthrough; >> + case I3C_CCC_GETMXDS: >> + fallthrough; >> + case I3C_CCC_GETHDRCAP: >> + return true; >> + >> + default: >> + return false; >> + } >> +} >> + >> +static const struct i3c_master_controller_ops geni_i3c_master_ops = { >> + .bus_init = geni_i3c_master_bus_init, >> + .bus_cleanup = NULL, >> + .do_daa = geni_i3c_master_do_daa, >> + .attach_i3c_dev = geni_i3c_master_attach_i3c_dev, >> + .reattach_i3c_dev = NULL, >> + .detach_i3c_dev = geni_i3c_master_detach_i3c_dev, >> + .attach_i2c_dev = geni_i3c_master_attach_i2c_dev, >> + .detach_i2c_dev = geni_i3c_master_detach_i2c_dev, >> + .supports_ccc_cmd = geni_i3c_master_supports_ccc_cmd, >> + .send_ccc_cmd = geni_i3c_master_send_ccc_cmd, >> + .priv_xfers = geni_i3c_master_priv_xfers, >> + .i2c_xfers = geni_i3c_master_i2c_xfers, >> + .enable_ibi = NULL, >> + .disable_ibi = NULL, >> + .request_ibi = NULL, >> + .free_ibi = NULL, >> + .recycle_ibi_slot = NULL, >> +}; >> + >> +static int i3c_geni_resources_init(struct geni_i3c_dev *gi3c, struct platform_device *pdev) >> +{ >> + int ret; >> + >> + gi3c->se.base = devm_platform_ioremap_resource(pdev, 0); >> + if (IS_ERR(gi3c->se.base)) >> + return PTR_ERR(gi3c->se.base); >> + >> + gi3c->se.clk = devm_clk_get(&pdev->dev, "se-clk"); >> + if (IS_ERR(gi3c->se.clk)) >> + return dev_err_probe(&pdev->dev, PTR_ERR(gi3c->se.clk), >> + "Unable to get serial engine core clock: %pe\n", >> + gi3c->se.clk); >> + >> + ret = device_property_read_u32(&pdev->dev, "se-clock-frequency", &gi3c->clk_src_freq); >> + if (ret) { >> + dev_info(&pdev->dev, "SE clk freq not specified, default to 100 MHz.\n"); >> + /* Default source clock freq is 100Mhz */ >> + gi3c->clk_src_freq = KHZ(100000); >> + } >> + >> + ret = geni_icc_get(&gi3c->se, NULL); >> + if (ret) >> + return ret; >> + >> + /* Set the bus quota to a reasonable value for register access */ >> + gi3c->se.icc_paths[GENI_TO_CORE].avg_bw = GENI_DEFAULT_BW; >> + gi3c->se.icc_paths[CPU_TO_GENI].avg_bw = GENI_DEFAULT_BW; >> + ret = geni_icc_set_bw(&gi3c->se); >> + if (ret) >> + return ret; >> + >> + return 0; >> +} >> + >> +static int geni_i3c_probe(struct platform_device *pdev) >> +{ >> + u32 proto, tx_depth, fifo_disable; >> + struct geni_i3c_dev *gi3c; >> + int ret; >> + >> + gi3c = devm_kzalloc(&pdev->dev, sizeof(*gi3c), GFP_KERNEL); >> + if (!gi3c) >> + return -ENOMEM; >> + >> + gi3c->se.dev = &pdev->dev; >> + gi3c->se.wrapper = dev_get_drvdata(pdev->dev.parent); >> + >> + init_completion(&gi3c->done); >> + mutex_init(&gi3c->lock); >> + spin_lock_init(&gi3c->irq_lock); >> + platform_set_drvdata(pdev, gi3c); >> + >> + ret = i3c_geni_resources_init(gi3c, pdev); >> + if (ret) >> + return dev_err_probe(&pdev->dev, ret, "Error Initializing GENI Resources\n"); >> + >> + gi3c->irq = platform_get_irq(pdev, 0); >> + if (gi3c->irq < 0) >> + return dev_err_probe(&pdev->dev, gi3c->irq, "Error getting IRQ number for I3C\n"); >> + >> + ret = devm_request_irq(&pdev->dev, gi3c->irq, geni_i3c_irq, >> + IRQF_NO_AUTOEN, dev_name(&pdev->dev), gi3c); >> + if (ret) >> + return dev_err_probe(&pdev->dev, ret, "Error registering core IRQ\n"); >> + >> + ret = geni_se_resources_on(&gi3c->se); >> + if (ret) >> + return dev_err_probe(&pdev->dev, ret, "Error turning resources ON\n"); >> + >> + proto = geni_se_read_proto(&gi3c->se); >> + if (proto != GENI_SE_I3C) { >> + geni_se_resources_off(&gi3c->se); >> + return dev_err_probe(&pdev->dev, -ENXIO, "Invalid proto %d\n", proto); >> + } >> + >> + fifo_disable = readl_relaxed(gi3c->se.base + GENI_IF_DISABLE_RO); >> + if (fifo_disable) { >> + geni_se_resources_off(&gi3c->se); >> + return dev_err_probe(&pdev->dev, -ENXIO, "GPI DMA mode not supported\n"); >> + } >> + >> + tx_depth = geni_se_get_tx_fifo_depth(&gi3c->se); >> + gi3c->tx_wm = tx_depth - 1; >> + geni_se_init(&gi3c->se, gi3c->tx_wm, tx_depth); >> + geni_se_config_packing(&gi3c->se, BITS_PER_BYTE, PACKING_BYTES_PW, true, true, true); >> + geni_se_resources_off(&gi3c->se); >> + dev_dbg(&pdev->dev, "i3c fifo/se-dma mode. fifo depth:%d\n", tx_depth); >> + >> + pm_runtime_set_autosuspend_delay(gi3c->se.dev, I3C_AUTO_SUSPEND_DELAY); >> + pm_runtime_use_autosuspend(gi3c->se.dev); >> + pm_runtime_set_active(gi3c->se.dev); >> + pm_runtime_enable(gi3c->se.dev); >> + >> + ret = i3c_master_register(&gi3c->ctrlr, &pdev->dev, &geni_i3c_master_ops, false); >> + if (ret) { >> + pm_runtime_disable(gi3c->se.dev); >> + pm_runtime_set_suspended(gi3c->se.dev); >> + pm_runtime_dont_use_autosuspend(gi3c->se.dev); >> + return ret; >> + } >> + >> + return ret; >> +} >> + >> +static void geni_i3c_remove(struct platform_device *pdev) >> +{ >> + struct geni_i3c_dev *gi3c = platform_get_drvdata(pdev); >> + >> + i3c_master_unregister(&gi3c->ctrlr); >> + pm_runtime_disable(gi3c->se.dev); >> + pm_runtime_set_suspended(gi3c->se.dev); >> + pm_runtime_dont_use_autosuspend(gi3c->se.dev); >> +} >> + >> +static int geni_i3c_runtime_suspend(struct device *dev) >> +{ >> + struct geni_i3c_dev *gi3c = dev_get_drvdata(dev); >> + >> + disable_irq(gi3c->irq); > > why need disable irq here? > >> + geni_se_resources_off(&gi3c->se); >> + return 0; >> +} >> + >> +static int geni_i3c_runtime_resume(struct device *dev) >> +{ >> + int ret; >> + struct geni_i3c_dev *gi3c = dev_get_drvdata(dev); >> + >> + ret = geni_se_resources_on(&gi3c->se); >> + if (ret) >> + return ret; >> + enable_irq(gi3c->irq); >> + return 0; >> +} >> + >> +static const struct dev_pm_ops geni_i3c_pm_ops = { >> + SET_RUNTIME_PM_OPS(geni_i3c_runtime_suspend, geni_i3c_runtime_resume, NULL) >> +}; >> + >> +static const struct of_device_id geni_i3c_dt_match[] = { >> + { .compatible = "qcom,i3c-master" }, >> + { } >> +}; >> +MODULE_DEVICE_TABLE(of, geni_i3c_dt_match); >> + >> +static struct platform_driver geni_i3c_master = { >> + .probe = geni_i3c_probe, >> + .remove = geni_i3c_remove, >> + .driver = { >> + .name = "geni_i3c_master", >> + .pm = &geni_i3c_pm_ops, >> + .of_match_table = geni_i3c_dt_match, >> + }, >> +}; >> + >> +module_platform_driver(geni_i3c_master); >> + >> +MODULE_AUTHOR("Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com>"); >> +MODULE_DESCRIPTION("Qualcomm I3C Controller Driver for GENI based QUP cores"); >> +MODULE_LICENSE("GPL"); >> -- >> 2.25.1 >> ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-26 14:16 ` [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver Mukesh Kumar Savaliya 2025-03-26 14:28 ` Krzysztof Kozlowski 2025-03-26 20:03 ` Frank Li @ 2025-03-28 13:19 ` Markus Elfring 2025-03-28 14:29 ` Mukesh Kumar Savaliya 2025-03-28 13:28 ` [PATCH v2 " Markus Elfring 3 siblings, 1 reply; 28+ messages in thread From: Markus Elfring @ 2025-03-28 13:19 UTC (permalink / raw) To: Mukesh Kumar Savaliya, linux-i3c, devicetree, linux-arm-msm Cc: LKML, Alexandre Belloni, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring … > +++ b/drivers/i3c/master/qcom-i3c-master.c > @@ -0,0 +1,1107 @@ … > +static void geni_i3c_abort_xfer(struct geni_i3c_dev *gi3c) > +{ … > + spin_lock_irqsave(&gi3c->irq_lock, flags); > + geni_i3c_handle_err(gi3c, GENI_TIMEOUT); > + geni_se_abort_m_cmd(&gi3c->se); > + spin_unlock_irqrestore(&gi3c->irq_lock, flags); … Under which circumstances would you become interested to apply a statement like “guard(spinlock_irqsave)(&gi3c->irq_lock);”? https://elixir.bootlin.com/linux/v6.14-rc6/source/include/linux/spinlock.h#L572 Regards, Markus ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-28 13:19 ` Markus Elfring @ 2025-03-28 14:29 ` Mukesh Kumar Savaliya 2025-03-28 19:04 ` [v2 " Markus Elfring 0 siblings, 1 reply; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-28 14:29 UTC (permalink / raw) To: Markus Elfring, linux-i3c, devicetree, linux-arm-msm Cc: LKML, Alexandre Belloni, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring Thanks Markus for review and suggestion ! On 3/28/2025 6:49 PM, Markus Elfring wrote: > … >> +++ b/drivers/i3c/master/qcom-i3c-master.c >> @@ -0,0 +1,1107 @@ > … >> +static void geni_i3c_abort_xfer(struct geni_i3c_dev *gi3c) >> +{ > … >> + spin_lock_irqsave(&gi3c->irq_lock, flags); >> + geni_i3c_handle_err(gi3c, GENI_TIMEOUT); >> + geni_se_abort_m_cmd(&gi3c->se); >> + spin_unlock_irqrestore(&gi3c->irq_lock, flags); > … > > Under which circumstances would you become interested to apply a statement > like “guard(spinlock_irqsave)(&gi3c->irq_lock);”? Didn't get, hence a question. Do you suggest to use DEFINE_LOCK_GUARD_1 instead of existing method ? > https://elixir.bootlin.com/linux/v6.14-rc6/source/include/linux/spinlock.h#L572 > > Regards, > Markus > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-28 14:29 ` Mukesh Kumar Savaliya @ 2025-03-28 19:04 ` Markus Elfring 2025-03-29 9:08 ` Mukesh Kumar Savaliya 0 siblings, 1 reply; 28+ messages in thread From: Markus Elfring @ 2025-03-28 19:04 UTC (permalink / raw) To: Mukesh Kumar Savaliya, linux-i3c, devicetree, linux-arm-msm Cc: LKML, Alexandre Belloni, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring >> Under which circumstances would you become interested to apply a statement >> like “guard(spinlock_irqsave)(&gi3c->irq_lock);”? > Didn't get, hence a question. Do you suggest to use DEFINE_LOCK_GUARD_1 instead of existing method ? I propose to pick further opportunities up for benefits from scope-based resource management. Regards, Markus ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-28 19:04 ` [v2 " Markus Elfring @ 2025-03-29 9:08 ` Mukesh Kumar Savaliya 2025-03-29 9:43 ` Markus Elfring 2025-03-29 10:48 ` Alexandre Belloni 0 siblings, 2 replies; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-29 9:08 UTC (permalink / raw) To: Markus Elfring, linux-i3c, devicetree, linux-arm-msm Cc: LKML, Alexandre Belloni, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring Hi Markus, On 3/29/2025 12:34 AM, Markus Elfring wrote: >>> Under which circumstances would you become interested to apply a statement >>> like “guard(spinlock_irqsave)(&gi3c->irq_lock);”? >> Didn't get, hence a question. Do you suggest to use DEFINE_LOCK_GUARD_1 instead of existing method ? > I propose to pick further opportunities up for benefits from scope-based resource management. > Sorry, still not clear to me what should i add/change ? please share me some example. > Regards, > Markus ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-29 9:08 ` Mukesh Kumar Savaliya @ 2025-03-29 9:43 ` Markus Elfring 2025-03-29 10:48 ` Alexandre Belloni 1 sibling, 0 replies; 28+ messages in thread From: Markus Elfring @ 2025-03-29 9:43 UTC (permalink / raw) To: Mukesh Kumar Savaliya, linux-i3c, devicetree, linux-arm-msm Cc: LKML, Alexandre Belloni, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring >>>> Under which circumstances would you become interested to apply a statement >>>> like “guard(spinlock_irqsave)(&gi3c->irq_lock);”? >>> Didn't get, hence a question. Do you suggest to use DEFINE_LOCK_GUARD_1 instead of existing method ? >> I propose to pick further opportunities up for benefits from scope-based resource management. >> > Sorry, still not clear to me what should i add/change ? please share me some example. I pointed desirable statements out several times already. See also related information sources once more: * https://elixir.bootlin.com/linux/v6.14-rc6/A/ident/guard * https://lore.kernel.org/linux-kernel/?q=spinlock_irqsave Regards, Markus ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-29 9:08 ` Mukesh Kumar Savaliya 2025-03-29 9:43 ` Markus Elfring @ 2025-03-29 10:48 ` Alexandre Belloni 2025-03-29 13:16 ` Markus Elfring 2025-03-29 14:27 ` Mukesh Kumar Savaliya 1 sibling, 2 replies; 28+ messages in thread From: Alexandre Belloni @ 2025-03-29 10:48 UTC (permalink / raw) To: Mukesh Kumar Savaliya Cc: Markus Elfring, linux-i3c, devicetree, linux-arm-msm, LKML, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring On 29/03/2025 14:38:14+0530, Mukesh Kumar Savaliya wrote: > Hi Markus, > > On 3/29/2025 12:34 AM, Markus Elfring wrote: > > > > Under which circumstances would you become interested to apply a statement > > > > like “guard(spinlock_irqsave)(&gi3c->irq_lock);”? > > > Didn't get, hence a question. Do you suggest to use DEFINE_LOCK_GUARD_1 instead of existing method ? > > I propose to pick further opportunities up for benefits from scope-based resource management. > > > Sorry, still not clear to me what should i add/change ? please share me some > example. Don't change anything, Markus is wasting your time. -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-29 10:48 ` Alexandre Belloni @ 2025-03-29 13:16 ` Markus Elfring 2025-03-29 14:27 ` Mukesh Kumar Savaliya 1 sibling, 0 replies; 28+ messages in thread From: Markus Elfring @ 2025-03-29 13:16 UTC (permalink / raw) To: Alexandre Belloni, Mukesh Kumar Savaliya, linux-i3c, devicetree, linux-arm-msm Cc: LKML, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring > Don't change anything, Markus is wasting your time. Can clarifications become more constructive also for the usage of scope-based resource management? Regards, Markus ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-29 10:48 ` Alexandre Belloni 2025-03-29 13:16 ` Markus Elfring @ 2025-03-29 14:27 ` Mukesh Kumar Savaliya 1 sibling, 0 replies; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-29 14:27 UTC (permalink / raw) To: Alexandre Belloni Cc: Markus Elfring, linux-i3c, devicetree, linux-arm-msm, LKML, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring On 3/29/2025 4:18 PM, Alexandre Belloni wrote: > On 29/03/2025 14:38:14+0530, Mukesh Kumar Savaliya wrote: >> Hi Markus, >> >> On 3/29/2025 12:34 AM, Markus Elfring wrote: >>>>> Under which circumstances would you become interested to apply a statement >>>>> like “guard(spinlock_irqsave)(&gi3c->irq_lock);”? >>>> Didn't get, hence a question. Do you suggest to use DEFINE_LOCK_GUARD_1 instead of existing method ? >>> I propose to pick further opportunities up for benefits from scope-based resource management. >>> >> Sorry, still not clear to me what should i add/change ? please share me some >> example. > > Don't change anything, Markus is wasting your time. Clear to me. Thanks a lot ! > ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-26 14:16 ` [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver Mukesh Kumar Savaliya ` (2 preceding siblings ...) 2025-03-28 13:19 ` Markus Elfring @ 2025-03-28 13:28 ` Markus Elfring 2025-03-28 14:29 ` Mukesh Kumar Savaliya 3 siblings, 1 reply; 28+ messages in thread From: Markus Elfring @ 2025-03-28 13:28 UTC (permalink / raw) To: Mukesh Kumar Savaliya, linux-i3c, devicetree, linux-arm-msm Cc: LKML, Alexandre Belloni, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring … > +++ b/drivers/i3c/master/qcom-i3c-master.c > @@ -0,0 +1,1107 @@ … > +/* M_CMD OP codes for I2C/I3C */ > +#define I3C_READ_IBI_HW 0 > +#define I2C_WRITE 1 > +#define I2C_READ 2 … Can an enumeration become helpful here? Regards, Markus ^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver 2025-03-28 13:28 ` [PATCH v2 " Markus Elfring @ 2025-03-28 14:29 ` Mukesh Kumar Savaliya 0 siblings, 0 replies; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-28 14:29 UTC (permalink / raw) To: Markus Elfring, linux-i3c, devicetree, linux-arm-msm Cc: LKML, Alexandre Belloni, Bjorn Andersson, Conor Dooley, Jarkko Nikula, Konrad Dybcio, Krzysztof Kozlowski, Rob Herring Hi Markus, Thanks for review ! On 3/28/2025 6:58 PM, Markus Elfring wrote: > … >> +++ b/drivers/i3c/master/qcom-i3c-master.c >> @@ -0,0 +1,1107 @@ > … >> +/* M_CMD OP codes for I2C/I3C */ >> +#define I3C_READ_IBI_HW 0 >> +#define I2C_WRITE 1 >> +#define I2C_READ 2 > … > > Can an enumeration become helpful here? > No, these are hardware program defined op-codes not created for any software purpose. so Macro define looks fine to me. > Regards, > Markus ^ permalink raw reply [flat|nested] 28+ messages in thread
* [PATCH v2 3/3] MAINTAINERS: Add maintainer for Qualcomm's I3C driver 2025-03-26 14:16 [PATCH v2 0/3] Add Qualcomm i3c master controller driver support Mukesh Kumar Savaliya 2025-03-26 14:16 ` [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller Mukesh Kumar Savaliya 2025-03-26 14:16 ` [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver Mukesh Kumar Savaliya @ 2025-03-26 14:16 ` Mukesh Kumar Savaliya 2 siblings, 0 replies; 28+ messages in thread From: Mukesh Kumar Savaliya @ 2025-03-26 14:16 UTC (permalink / raw) To: alexandre.belloni, robh, krzk+dt, conor+dt, jarkko.nikula, linux-i3c, linux-arm-msm, devicetree, linux-kernel Cc: andersson, konradybcio, Mukesh Kumar Savaliya Add a new entry for the I3C QCOM GENI driver to the MAINTAINERS file. This entry includes the maintainer's name and contact information, ensuring proper maintainership and communication for the new driver. Signed-off-by: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> --- MAINTAINERS | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 3520ce6f9859..047d804122ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11016,6 +11016,14 @@ S: Orphan F: Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.yaml F: drivers/i3c/master/dw* +I3C DRIVER FOR QUALCOMM GENI CONTROLLER IP +M: Mukesh Kumar Savaliya <quic_msavaliy@quicinc.com> +L: linux-i3c@lists.infradead.org (moderated for non-subscribers) +L: linux-arm-msm@vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/i3c/qcom,i3c-master.yaml +F: drivers/i3c/master/qcom-i3c-master.c + I3C SUBSYSTEM M: Alexandre Belloni <alexandre.belloni@bootlin.com> L: linux-i3c@lists.infradead.org (moderated for non-subscribers) -- 2.25.1 ^ permalink raw reply related [flat|nested] 28+ messages in thread
end of thread, other threads:[~2025-03-31 7:07 UTC | newest] Thread overview: 28+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-03-26 14:16 [PATCH v2 0/3] Add Qualcomm i3c master controller driver support Mukesh Kumar Savaliya 2025-03-26 14:16 ` [PATCH v2 1/3] dt-bindings: i3c: Add Qualcomm I3C master controller Mukesh Kumar Savaliya 2025-03-26 14:23 ` Krzysztof Kozlowski 2025-03-28 14:28 ` Mukesh Kumar Savaliya 2025-03-28 14:33 ` Krzysztof Kozlowski 2025-03-29 9:08 ` Mukesh Kumar Savaliya 2025-03-29 11:06 ` Krzysztof Kozlowski 2025-03-29 14:31 ` Mukesh Kumar Savaliya 2025-03-30 9:42 ` Krzysztof Kozlowski 2025-03-31 6:52 ` Mukesh Kumar Savaliya 2025-03-31 7:06 ` Mukesh Kumar Savaliya 2025-03-26 14:16 ` [PATCH v2 2/3] i3c: master: Add Qualcomm I3C controller driver Mukesh Kumar Savaliya 2025-03-26 14:28 ` Krzysztof Kozlowski 2025-03-28 14:28 ` Mukesh Kumar Savaliya 2025-03-28 14:35 ` Krzysztof Kozlowski 2025-03-26 20:03 ` Frank Li 2025-03-29 9:09 ` Mukesh Kumar Savaliya 2025-03-28 13:19 ` Markus Elfring 2025-03-28 14:29 ` Mukesh Kumar Savaliya 2025-03-28 19:04 ` [v2 " Markus Elfring 2025-03-29 9:08 ` Mukesh Kumar Savaliya 2025-03-29 9:43 ` Markus Elfring 2025-03-29 10:48 ` Alexandre Belloni 2025-03-29 13:16 ` Markus Elfring 2025-03-29 14:27 ` Mukesh Kumar Savaliya 2025-03-28 13:28 ` [PATCH v2 " Markus Elfring 2025-03-28 14:29 ` Mukesh Kumar Savaliya 2025-03-26 14:16 ` [PATCH v2 3/3] MAINTAINERS: Add maintainer for Qualcomm's I3C driver Mukesh Kumar Savaliya
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox