Skip to contentSkip to conversation

Support AMD Pensando Elba SoC

PATCH Superseded Brad Larson 6 participants 38 messages Mar 6, 2023 – Mar 11, 2023

Subsystems (8)

v10 of 16 Superseded Latest is v16 →

lore
Share & tools
lore

Brad Larson

author maintainer
#0 lore raw

v10 cover Support AMD Pensando Elba SoC

This series enables support for AMD Pensando Elba SoC based platforms.

The Elba SoC has the following features:
- Sixteen ARM64 A72 cores
- Dual DDR 4/5 memory controllers
- 32 lanes of PCIe Gen3/4 to the Host
- Network interfaces: Dual 200GE, Quad 100GE, 50GE, 25GE, 10GE and also a single 1GE management port.
- Storage/crypto offloads and 144 programmable P4 cores.
- QSPI and EMMC for SoC storage
- Two SPI interfaces for peripheral management
- I2C bus for platform management

== V10 changes ==
Binding property amd,pensando-elba-syscon was merged in 6.2

v10-0002-dt-bindings-mmc-cdns-Add-AMD-Pensando-Elba-SoC
- Move reset-names property definition next to existing resets prop
- Move allOf to the bottom and set resets/reset-names required only for pensando
- Fix reg maxItems for existing, must be 1

v10-0003-dt-bindings-spi-cdns-Add-compatible-for-AMD-Pens
- Fix cdns,fifo-depth, only amd,pensando-elba-qspi is 1024 bytes

v10-0004-dt-bindings-spi-dw-Add-AMD-Pensando-Elba-SoC-SPI
- Move definition of amd,pensando-elba-syscon into properties with a better description
- Add amd,pensando-elba-syscon: false for non elba designs

v10-0005-dt-bindings-soc-amd-amd-pensando-elbasr-Add-AMD-
- Property renamed to amd,pensando-ctrl
- Driver is renamed and moved to soc/drivers/amd affecting binding
- Delete cs property, driver handles device node creation from parent num-cs fixing schema reg error in a different way

v10-0010-spi-dw-Add-support-for-AMD-Pensando-Elba-SoC
- Delete struct dw_spi_elba, use regmap directly in priv

v10-0011-mmc-sdhci-cadence-Enable-device-specific-overrid
- The 1st patch adding private writel() is unchanged. The 2nd patch is split into two patches to provide for device specific init in one patch with no effect on existing designs. Then add the pensando support into the next patch. Then the 4th patch is mmc hardware reset support which is unchanged.

v10-0012-mmc-sdhci-cadence-Support-device-specific-init-i
- New patch to provide for platform specific init() with no change to existing designs.

v10-0013-mmc-sdhci-cadence-Add-AMD-Pensando-Elba-SoC-supp
- Add Elba specific support into this 3rd patch. This builds on the private writel() enabled in patch 1 followed by platform specific init() in patch 2.
- Specify when first used the reason for the spinlock use to order byte-enable prior to write data.

v10-0015-soc-amd-Add-support-for-AMD-Pensando-SoC-Control
- Different driver implementation specific to this Pensando controller device.
- Moved to soc/amd directory under new name based on guidance. This driver is of no use to any design other than all Pensando SoC based cards.
- Removed use of builtin_driver, can be built as a module.

== V9 changes == v9-0002-dt-bindings-mmc-cdns-Add-AMD-Pensando-Elba-SoC
- Add reset-names and resets properties
- Add if/then on property amd,pensando-elba-sd4hc to set reg property values for minItems and maxItems

v9-0003-dt-bindings-spi-cdns-Add-compatible-for-AMD-Pensa
- Add 1024 to cdns,fifo-depth property to resolve dtbs_check error

v9-0004-dt-bindings-spi-dw-Add-AMD-Pensando-Elba-SoC-SPI-
- Define property amd,pensando-elba-syscon
- Move compatible amd,pensando-elba-spi ahead of baikal,bt1-ssi

v9-0006-dt-bindings-mfd-amd-pensando-elbasr-Add-AMD-Pensa
- Instead of four nodes, one per chip-select, a single node is used with reset-cells in the parent.
- No MFD API is used anymore in the driver so it made sense to move this to drivers/spi.
- This driver is common for all Pensando SoC based designs so changed the name to pensando-sr.c to not make it Elba SoC specific.
- Added property cs for the chip-select number which is used by the driver to create /dev/pensr0.<cs>

v9-0009-arm64-dts-Add-AMD-Pensando-Elba-SoC-support
- Single node for spi0 system-controller and squash the reset-controller child into parent

v9-0010-spi-cadence-quadspi-Add-compatible-for-AMD-Pensan
- Rebase to linux-next 6.2.0-rc1

v9-0011-spi-dw-Add-support-for-AMD-Pensando-Elba-SoC
- Add use of macros GENMASK() and BIT()
- Change ELBA_SPICS_SHIFT() to ELBA_SPICS_OFFSET()

v9-0012-mmc-sdhci-cadence-Enable-device-specific-override
- No change to this patch but as some patches are deleted and this is a respin the three successive patches to sdhci-cadence.c are patches 12, 13, and 14 which do the following:
1. Add ability for Cadence specific design to have priv writel().
2. Add Elba SoC support that requires its own priv writel() for byte-lane control .
3. Add support for mmc hardware reset.

v9-0014-mmc-sdhci-cadence-Support-mmc-hardware-reset
- Previously patch 17/17
- Changed delay after reset_control_assert() from 9 to 3 usec
- Renamed sdhci_mmc_hw_reset() to sdhci_cdns_mmc_hw_reset()

v9-0015-spi-pensando-sr-Add-AMD-Pensando-SoC-System-Resou
- Previously patch 14/17
- After the change to the device tree node and squashing reset-cells into the parent simplified this to not use any MFD API and move it to drivers/spi/pensando-sr.c.
- Change the naming to remove elba since this driver is common for all Pensando SoC designs .
- Default yes SPI_PENSANDO_SR for ARCH_PENSANDO

== V6 changes ==
- Updated copyright and SPDX

v6-0001-dt-bindings-arm-add-AMD-Pensando-boards
- Delete 'Device Tree Bindings' in title

v6-0002-dt-bindings-mmc-cdns-Add-AMD-Pensando-Elba-SoC
- Change if/then for Elba which has a second reg for byte-lane control

v6-0003-dt-bindings-spi-cdns-Add-compatible-for-AMD-Pensa
- no change

v6-0004-dt-bindings-spi-dw-Add-AMD-Pensando-Elba-SoC-SPI-
- Add amd,pensando-elba-syscon

v6-0005-dt-bindings-mfd-syscon-Add-amd-pensando-elba-sysc
- no change

v6-0006-dt-bindings-mfd-amd-pensando-elbasr-Add-AMD-Pensa
- Expand description, rename nodes and change compatible usage

v6-0007-dt-bindings-reset-amd-pensando-elbasr-reset-Add-A
- Delete nodename pattern and changed spi0 to spi
- File amd,pensando-elba-reset.h is deleted as there is only one reset used.
- Update example

v6-0008-MAINTAINERS-Add-entry-for-AMD-PENSANDO
- no change

v6-0009-arm64-Add-config-for-AMD-Pensando-SoC-platforms
- no change

v6-0010-arm64-dts-Add-AMD-Pensando-Elba-SoC-support
- Update node names and add amd,pensando-elba-syscon
- Delete use of amd,pensando-elba-reset.h which had a single definition

v6-0011-spi-cadence-quadspi-Add-compatible-for-AMD-Pensan
- Remove (void) cast

v6-0012-spi-dw-Add-support-for-AMD-Pensando-Elba-SoC
- Update use of amd,pensando-elba-syscon

v6-0013-mmc-sdhci-cadence-Enable-device-specific-override
- Change this patch to add a priv_writel() callback where all existing designs use writel(). This separates the Elba support into three patches. The second patch is added to the end of the sequence for Elba support. The third patch enables mmc hardware reset.

v6-0014-mfd-pensando-elbasr-Add-AMD-Pensando-Elba-System-
- Updates from review comments
- Use spi_message_init_with_transfers instead of init/add_tail API

v6-0015-reset-elbasr-Add-AMD-Pensando-Elba-SR-Reset-Contr
- Remove use of amd,pensando-elba-reset.h and use BIT()

v6-0016-mmc-sdhci-cadence-Add-AMD-Pensando-Elba-SoC-suppo
- Elba sdhci-cadence.c support added in this patch to build on 0013 which just adds a callback to override priv_writel()

v6-0017-mmc-sdhci-cadence-Support-mmc-hardware-reset
- New patch where Elba has a reset-controller for mmc hardware reset. The reset is implemented by a register in the cpld.

== V5 changes ==
- Change to AMD Pensando instead of Pensando.
- No reference to spidev in the device tree. Add multi-function driver pensando-elbasr and sub-device reset-elbasr which provides mfd and /dev interface to the cpld.
- Rebase to linux-next tag next-20220609 5.19.0-rc1
- Redo the email list after rebase and using scripts/get_maintainer.pl

== V4 changes ==
The version of dtschema used is 2022.3.2.

v4-0001-dt-bindings-arm-add-Pensando-boards.patch
- Add description and board compatible

v4-0003-dt-bindings-mmc-Add-Pensando-Elba-SoC-binding.patch
- Change from elba-emmc to elba-sd4hc to match file convention
- Use minItems: 1 and maxItems: 2 to pass schema check

v4-0005-dt-bindings-spi-dw-Add-Pensando-Elba-SoC-SPI-Control.patch
- Add required property pensando,syscon-spics to go with pensando,elba-spi

v4-0006-MAINTAINERS-Add-entry-for-PENSANDO.patch
- Change Maintained to Supported

v4-0007-arm64-Add-config-for-Pensando-SoC-platforms.patch
- Fix a typo on interface max speed

v4-0008-spi-cadence-quadspi-Add-compatible-for-Pensando-Elba.patch
- Update due to spi-cadence-quadspi.c changes

v4-0009-mmc-sdhci-cadence-Add-Pensando-Elba-SoC-support.patch
- Change from elba-emmc to elba-sd4hc to match file convention

v4-0010-spi-dw-Add-support-for-Pensando-Elba-SoC.patch
- Use more descriptive dt property pensando,syscon-spics
- Minor changes from review input

v4-0011-arm64-dts-Add-Pensando-Elba-SoC-support.patch
- Changed to dual copyright (GPL-2.0+ OR MIT)
- Minor changes from review input

== V3 changes == v3-0001-gpio-Add-Elba-SoC-gpio-driver-for-spi-cs-control.patch
- This patch is deleted. Elba SOC specific gpio spics control is integrated into spi-dw-mmio.c.

v3-0002-spi-cadence-quadspi-Add-QSPI-support-for-Pensando-El.patch
- Changed compatible to "pensando,elba-qspi" to be more descriptive in spi-cadence-quadspi.c.

- Arnd wondered if moving to DT properties for quirks may be the way to go. Feedback I've received on other patches was don't mix two efforts in one patch so I'm currently just adding the Elba support to the current design.

v3-0003-spi-dw-Add-support-for-Pensando-Elba-SoC-SPI.patch
- Changed the implementation to use existing dw_spi_set_cs() and integrated Elba specific CS control into spi-dw-mmio.c. The native designware support is for two chip-selects while Elba provides 4 chip-selects. Instead of adding a new file for this support in gpio-elba-spics.c the support is in one file (spi-dw-mmio.c).

v3-0004-spidev-Add-Pensando-CPLD-compatible.patch
- This patch is deleted. The addition of compatible "pensando,cpld" to spidev.c is not added and an existing compatible is used in the device tree to enable.

v3-0005-mmc-sdhci-cadence-Add-Pensando-Elba-SoC-support.patch
- Ulf and Yamada-san agreed the amount of code for this support is not enough to need a new file. The support is added into sdhci-cadence.c and new files sdhci-cadence-elba.c and sdhci-cadence.h are deleted.
- Redundant defines are removed (e.g. use SDHCI_CDNS_HRS04 and remove SDIO_REG_HRS4).
- Removed phy init function sd4_set_dlyvr() and used existing sdhci_cdns_phy_init(). Init values are from DT properties.
- Replace devm_ioremap_resource(&pdev->dev, iomem) with devm_platform_ioremap_resource(pdev, 1)
- Refactored the elba priv_writ_l() and elba_write_l() to remove a little redundant code.
- The config option CONFIG_MMC_SDHCI_CADENCE_ELBA goes away.
- Only C syntax and Elba functions are prefixed with elba_

v3-0006-arm64-Add-config-for-Pensando-SoC-platforms.patch
- Added a little more info to the platform help text to assist users to decide on including platform support or not.

v3-0007-arm64-dts-Add-Pensando-Elba-SoC-support.patch
- Node names changed to DT generic names
- Changed from using 'spi@' which is reserved
- The elba-flash-parts.dtsi is kept separate as it is included in multiple dts files.
- SPDX license tags at the top of each file
- The compatible = "pensando,elba" and 'model' are now together in the board file.
- UIO nodes removed
- Ordered nodes by increasing unit address
- Removed an unreferenced container node.
- Dropped deprecated 'device_type' for uart0 node.

v3-0010-dt-bindings-spi-cadence-qspi-Add-support-for-Pensand.patch
- Updated since the latest documentation has been converted to yaml

v3-0011-dt-bindings-gpio-Add-Pensando-Elba-SoC-support.patch
- This patch is deleted since the Elba gpio spics is added to the spi dw driver and documented there.

Because of the deletion of patches and merging of code the new patchset is not similar. A changelog is added into the patches for merged code to be helpful on the history.

== V2 changes ==
- 01 Fix typo, return code value and log message.
- 03 Remove else clause, intrinsic DW chip-select is never used.
- 08-11 Split out dts and bindings to sub-patches
- 10 Converted existing cadence-quadspi.txt to YAML schema
- 13 New driver should use <linux/gpio/driver.h>

Brad Larson (15):
dt-bindings: arm: add AMD Pensando boards
dt-bindings: mmc: cdns: Add AMD Pensando Elba SoC
dt-bindings: spi: cdns: Add compatible for AMD Pensando Elba SoC
dt-bindings: spi: dw: Add AMD Pensando Elba SoC SPI Controller
dt-bindings: soc: amd: amd,pensando-elbasr: Add AMD Pensando SoC
System Controller
MAINTAINERS: Add entry for AMD PENSANDO
arm64: Add config for AMD Pensando SoC platforms
arm64: dts: Add AMD Pensando Elba SoC support
spi: cadence-quadspi: Add compatible for AMD Pensando Elba SoC
spi: dw: Add support for AMD Pensando Elba SoC
mmc: sdhci-cadence: Enable device specific override of writel()
mmc: sdhci-cadence: Support device specific init during probe
mmc: sdhci-cadence: Add AMD Pensando Elba SoC support
mmc: sdhci-cadence: Support mmc hardware reset
soc: amd: Add support for AMD Pensando SoC Controller

 .../devicetree/bindings/arm/amd,pensando.yaml |  26 ++
 .../devicetree/bindings/mmc/cdns,sdhci.yaml   |  33 +-
 .../bindings/soc/amd/amd,pensando-ctrl.yaml   |  60 +++
 .../bindings/spi/cdns,qspi-nor.yaml           |  30 +-
 .../bindings/spi/snps,dw-apb-ssi.yaml         |  19 +
 MAINTAINERS                                   |   9 +
 arch/arm64/Kconfig.platforms                  |  12 +
 arch/arm64/boot/dts/amd/Makefile              |   1 +
 arch/arm64/boot/dts/amd/elba-16core.dtsi      | 189 +++++++++
 arch/arm64/boot/dts/amd/elba-asic-common.dtsi |  81 ++++
 arch/arm64/boot/dts/amd/elba-asic.dts         |  28 ++
 arch/arm64/boot/dts/amd/elba-flash-parts.dtsi | 106 +++++
 arch/arm64/boot/dts/amd/elba.dtsi             | 192 +++++++++
 drivers/mmc/host/Kconfig                      |   1 +
 drivers/mmc/host/sdhci-cadence.c              | 178 ++++++++-
 drivers/soc/Kconfig                           |   1 +
 drivers/soc/Makefile                          |   1 +
 drivers/soc/amd/Kconfig                       |  16 +
 drivers/soc/amd/Makefile                      |   2 +
 drivers/soc/amd/amd-pensando-ctrl.c           | 378 ++++++++++++++++++
 drivers/spi/spi-cadence-quadspi.c             |  19 +
 drivers/spi/spi-dw-mmio.c                     |  65 +++
 include/uapi/linux/amd-pensando-ctrl.h        |  30 ++
 23 files changed, 1457 insertions(+), 20 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/amd,pensando.yaml
 create mode 100644 Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml
 create mode 100644 arch/arm64/boot/dts/amd/elba-16core.dtsi
 create mode 100644 arch/arm64/boot/dts/amd/elba-asic-common.dtsi
 create mode 100644 arch/arm64/boot/dts/amd/elba-asic.dts
 create mode 100644 arch/arm64/boot/dts/amd/elba-flash-parts.dtsi
 create mode 100644 arch/arm64/boot/dts/amd/elba.dtsi
 create mode 100644 drivers/soc/amd/Kconfig
 create mode 100644 drivers/soc/amd/Makefile
 create mode 100644 drivers/soc/amd/amd-pensando-ctrl.c
 create mode 100644 include/uapi/linux/amd-pensando-ctrl.h

base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6

Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH v10 1/15 dt-bindings: arm: add AMD Pensando boards

Document the compatible for AMD Pensando Elba SoC boards.

---
 .../devicetree/bindings/arm/amd,pensando.yaml | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/amd,pensando.yaml
Documentation/devicetree/bindings/arm/amd,pensando.yaml new file +26 -0
new file mode 100644
index 000000000000..e5c2591834a8
@@ -0,0 +1,26 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/amd,pensando.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: AMD Pensando SoC Platforms
+
+maintainers:
+  - Brad Larson <[email protected]>
+
+properties:
+  $nodename:
+    const: "/"
+  compatible:
+    oneOf:
+
+      - description: Boards with Pensando Elba SoC
+        items:
+          - enum:
+              - amd,pensando-elba-ortano
+          - const: amd,pensando-elba
+
+additionalProperties: true
+
+...
Signature · 1 line
2.17.1
author maintainer
#2 lore raw

PATCH v10 2/15 dt-bindings: mmc: cdns: Add AMD Pensando Elba SoC

In reply to Brad Larson

AMD Pensando Elba ARM 64-bit SoC is integrated with this IP and explicitly controls byte-lane enables.

---

v10 changes:
- Move reset-names property definition next to existing resets prop
- Move allOf to the bottom and set resets/reset-names required only for pensando
- Fix reg maxItems for existing, must be 1

v9 changes:
- Add reset-names and resets properties
- Add if/then on property amd,pensando-elba-sd4hc to set reg property values for minItems and maxItems

---
 .../devicetree/bindings/mmc/cdns,sdhci.yaml   | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +29 -4
index adacd0535c14..0c4d6d4b2b58 100644
@@ -9,19 +9,18 @@ title: Cadence SD/SDIO/eMMC Host Controller (SD4HC)
 maintainers:
   - Masahiro Yamada <[email protected]>
 
-allOf:
-  - $ref: mmc-controller.yaml
-
 properties:
   compatible:
     items:
       - enum:
+          - amd,pensando-elba-sd4hc
           - microchip,mpfs-sd4hc
           - socionext,uniphier-sd4hc
       - const: cdns,sd4hc
 
   reg:
-    maxItems: 1
+    minItems: 1
+    maxItems: 2
 
   interrupts:
     maxItems: 1
@@ -30,8 +29,13 @@ properties:
     maxItems: 1
 
   resets:
+    description: physical line number to hardware reset the mmc
     maxItems: 1
 
+  reset-names:
+    items:
+      - const: hw
+
   # PHY DLL input delays:
   # They are used to delay the data valid window, and align the window to
   # sampling clock. The delay starts from 5ns (for delay parameter equal to 0)
@@ -120,6 +124,27 @@ required:
   - interrupts
   - clocks
 
+allOf:
+  - $ref: mmc-controller.yaml
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amd,pensando-elba-sd4hc
+    then:
+      properties:
+        reg:
+          minItems: 2
+      required:
+        - reset-names
+        - resets
+    else:
+      properties:
+        reset-names: false
+        resets: false
+        reg:
+          maxItems: 1
+
 unevaluatedProperties: false
 
 examples:
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH v10 02/15] dt-bindings: mmc: cdns: Add AMD Pensando Elba SoC

Quoted 48 lines · Brad Larson

AMD Pensando Elba ARM 64-bit SoC is integrated with this IP and explicitly controls byte-lane enables.

---

v10 changes:
- Move reset-names property definition next to existing resets prop
- Move allOf to the bottom and set resets/reset-names required only for pensando
- Fix reg maxItems for existing, must be 1

v9 changes:
- Add reset-names and resets properties
- Add if/then on property amd,pensando-elba-sd4hc to set reg property values for minItems and maxItems

---
 .../devicetree/bindings/mmc/cdns,sdhci.yaml   | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +3 -4
index adacd0535c14..0c4d6d4b2b58 100644
@@ -9,19 +9,18 @@ title: Cadence SD/SDIO/eMMC Host Controller (SD4HC)
 maintainers:
   - Masahiro Yamada <[email protected]>
 
-allOf:
-  - $ref: mmc-controller.yaml
-
 properties:
   compatible:
     items:
       - enum:
+          - amd,pensando-elba-sd4hc
           - microchip,mpfs-sd4hc
           - socionext,uniphier-sd4hc
       - const: cdns,sd4hc
 
   reg:
-    maxItems: 1
+    minItems: 1
+    maxItems: 2
 
   interrupts:
     maxItems: 1

Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml properties: · line 32

Quoted 4 lines
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +1 -0
@@ -30,8 +29,13 @@ properties:
     maxItems: 1
 
   resets:
+    description: physical line number to hardware reset the mmc

This part seems to be not needed anymore. Resets field was already added.

Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml properties: · line 37

Quoted 5 lines
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +3 -0
     maxItems: 1
 
+  reset-names:
+    items:
+      - const: hw

Why did you add reset-names for one item? There is no v8 of this patch, so I cannot find previous discussion about it.

Quoted 8 lines
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +1 -0
   # PHY DLL input delays:
   # They are used to delay the data valid window, and align the window to
   # sampling clock. The delay starts from 5ns (for delay parameter equal to 0)
@@ -120,6 +124,27 @@ required:
   - interrupts
   - clocks
 
+allOf:

Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml required: · line 137

Quoted 10 lines
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +10 -0
+  - $ref: mmc-controller.yaml
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amd,pensando-elba-sd4hc
+    then:
+      properties:
+        reg:
+          minItems: 2

Hm, we missed to mention it before, but what is the second reg for? It's not obvious from the binding so probably you need to describe it instead minItems:
items:
- description: foo
- description: bar

Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml required: · line 150

Quoted 13 lines
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +10 -0
+      required:
+        - reset-names
+        - resets
+    else:
+      properties:
+        reset-names: false
+        resets: false
+        reg:
+          maxItems: 1
+
 unevaluatedProperties: false
 
 examples:

Best regards,
Krzysztof

author maintainer
#4 lore raw

Re: [PATCH v10 02/15] dt-bindings: mmc: cdns: Add AMD Pensando Elba SoC

Quoted 51 lines · Krzysztof Kozlowski
Quoted 50 lines · Brad Larson

AMD Pensando Elba ARM 64-bit SoC is integrated with this IP and explicitly controls byte-lane enables.

---

v10 changes:
- Move reset-names property definition next to existing resets prop
- Move allOf to the bottom and set resets/reset-names required only for pensando
- Fix reg maxItems for existing, must be 1

v9 changes:
- Add reset-names and resets properties
- Add if/then on property amd,pensando-elba-sd4hc to set reg property values for minItems and maxItems

---
 .../devicetree/bindings/mmc/cdns,sdhci.yaml   | 33 ++++++++++++++++---
 1 file changed, 29 insertions(+), 4 deletions(-)
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +3 -4
index adacd0535c14..0c4d6d4b2b58 100644
@@ -9,19 +9,18 @@ title: Cadence SD/SDIO/eMMC Host Controller (SD4HC)
 maintainers:
   - Masahiro Yamada <[email protected]>
 
-allOf:
-  - $ref: mmc-controller.yaml
-
 properties:
   compatible:
     items:
       - enum:
+          - amd,pensando-elba-sd4hc
           - microchip,mpfs-sd4hc
           - socionext,uniphier-sd4hc
       - const: cdns,sd4hc
 
   reg:
-    maxItems: 1
+    minItems: 1
+    maxItems: 2
 
   interrupts:
     maxItems: 1
@@ -30,8 +29,13 @@ properties:
     maxItems: 1
 
Quoted 4 lines

Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml properties: · line 32

Quoted 2 lines
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +1 -0
   resets:
+    description: physical line number to hardware reset the mmc

This part seems to be not needed anymore. Resets field was already added.

Yes, see below.

Quoted 9 lines

Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml properties: · line 37

Quoted 6 lines
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +3 -0
     maxItems: 1
 
+  reset-names:
+    items:
+      - const: hw

Why did you add reset-names for one item? There is no v8 of this patch, so I cannot find previous discussion about it.

I found resets property was added recently when I rebased.

cb7f090171393 (Kunihiko Hayashi    2023-02-13 13:52:33 +0900  32)   resets:
cb7f090171393 (Kunihiko Hayashi    2023-02-13 13:52:33 +0900  33)     maxItems: 1

I've deleted reset-names and dropped description for resets.

Quoted 18 lines
Quoted 18 lines
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +10 -0
   # PHY DLL input delays:
   # They are used to delay the data valid window, and align the window to
   # sampling clock. The delay starts from 5ns (for delay parameter equal to 0)
@@ -120,6 +124,27 @@ required:
   - interrupts
   - clocks
 
+allOf:
+  - $ref: mmc-controller.yaml
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amd,pensando-elba-sd4hc
+    then:
+      properties:
+        reg:
Quoted 9 lines

Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml required: · line 137

Quoted 1 line
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +1 -0
+          minItems: 2

Hm, we missed to mention it before, but what is the second reg for? It's not obvious from the binding so probably you need to describe it instead minItems:
items:
- description: foo
- description: bar

The second reg is byte lane enable for writes. The following passed dtbs_check after getting: hint: "minItems" is only needed if less than the "items" list length

then:
properties:
reg:
items:
- description: Host controller registers
- description: Elba byte-lane enable register for writes
required:
- resets
else:
properties:
resets: false
reg:
maxItems: 1

Quoted 11 lines

Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml required: · line 148

Quoted 11 lines
Documentation/devicetree/bindings/mmc/cdns,sdhci.yaml +10 -0
+      required:
+        - reset-names
+        - resets
+    else:
+      properties:
+        reset-names: false
+        resets: false
+        reg:
+          maxItems: 1
+
 unevaluatedProperties: false

Regards,
Brad

author maintainer
#5 lore raw

PATCH v10 3/15 dt-bindings: spi: cdns: Add compatible for AMD Pensando Elba SoC

In reply to Brad Larson

Document the cadence qspi controller compatible for AMD Pensando Elba SoC boards. The Elba qspi fifo size is 1024.

---

v10 changes:
- Fix cdns,fifo-depth, only amd,pensando-elba-qspi is 1024 bytes

v9 changes:
- Add 1024 to cdns,fifo-depth property to resolve dtbs_check error

---
 .../bindings/spi/cdns,qspi-nor.yaml           | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml +28 -2
index 5c01db128be0..18e4bc04f091 100644
@@ -20,11 +20,39 @@ allOf:
       required:
         - power-domains
 
+  - if:
+      properties:
+        compatible:
+          enum:
+            - amd,pensando-elba-qspi
+    then:
+      properties:
+        cdns,fifo-depth:
+          enum: [ 128, 256, 1024 ]
+          default: 1024
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amd,pensando-elba-qspi
+    then:
+      properties:
+        cdns,fifo-depth:
+          enum: [ 128, 256, 1024 ]
+          default: 1024
+    else:
+      properties:
+        cdns,fifo-depth:
+          enum: [ 128, 256 ]
+          default: 128
+
 properties:
   compatible:
     oneOf:
       - items:
           - enum:
+              - amd,pensando-elba-qspi
               - ti,k2g-qspi
               - ti,am654-ospi
               - intel,lgm-qspi
@@ -48,8 +76,6 @@ properties:
     description:
       Size of the data FIFO in words.
     $ref: /schemas/types.yaml#/definitions/uint32
-    enum: [ 128, 256 ]
-    default: 128
 
   cdns,fifo-width:
     $ref: /schemas/types.yaml#/definitions/uint32
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#6 lore raw

Re: [PATCH v10 03/15] dt-bindings: spi: cdns: Add compatible for AMD Pensando Elba SoC

Quoted 30 lines · Brad Larson

Document the cadence qspi controller compatible for AMD Pensando Elba SoC boards. The Elba qspi fifo size is 1024.

---

v10 changes:
- Fix cdns,fifo-depth, only amd,pensando-elba-qspi is 1024 bytes

v9 changes:
- Add 1024 to cdns,fifo-depth property to resolve dtbs_check error

---
 .../bindings/spi/cdns,qspi-nor.yaml           | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml +6 -0
index 5c01db128be0..18e4bc04f091 100644
@@ -20,11 +20,39 @@ allOf:
       required:
         - power-domains
 
+  - if:
+      properties:
+        compatible:
+          enum:
+            - amd,pensando-elba-qspi
+    then:

Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml allOf: · line 38

Quoted 10 lines
Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml +10 -0
+      properties:
+        cdns,fifo-depth:
+          enum: [ 128, 256, 1024 ]
+          default: 1024
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amd,pensando-elba-qspi

This does not make any sense. You have two ifs for the same.

Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml allOf: · line 49

Quoted 11 lines
Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml +11 -0
+    then:
+      properties:
+        cdns,fifo-depth:
+          enum: [ 128, 256, 1024 ]
+          default: 1024
+    else:
+      properties:
+        cdns,fifo-depth:
+          enum: [ 128, 256 ]
+          default: 128
+

Best regards,
Krzysztof

author maintainer
#7 lore raw

Re: [PATCH v10 03/15] dt-bindings: spi: cdns: Add compatible for AMD Pensando Elba SoC

Quoted 35 lines · Krzysztof Kozlowski
Quoted 34 lines · Brad Larson

Document the cadence qspi controller compatible for AMD Pensando Elba SoC boards. The Elba qspi fifo size is 1024.

---

v10 changes:
- Fix cdns,fifo-depth, only amd,pensando-elba-qspi is 1024 bytes

v9 changes:
- Add 1024 to cdns,fifo-depth property to resolve dtbs_check error

---
 .../bindings/spi/cdns,qspi-nor.yaml           | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml +10 -0
index 5c01db128be0..18e4bc04f091 100644
@@ -20,11 +20,39 @@ allOf:
       required:
         - power-domains
 
+  - if:
+      properties:
+        compatible:
+          enum:
+            - amd,pensando-elba-qspi
+    then:
+      properties:
+        cdns,fifo-depth:
+          enum: [ 128, 256, 1024 ]
+          default: 1024
Quoted 8 lines

Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml allOf: · line 38

Quoted 6 lines
Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml +6 -0
+
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amd,pensando-elba-qspi

This does not make any sense. You have two ifs for the same.

That's an oops, only this is needed

+ - if:
+ properties:
+ compatible:
+ contains:
+ const: amd,pensando-elba-qspi
+ then:
+ properties:
+ cdns,fifo-depth:
+ enum: [ 128, 256, 1024 ]
+ default: 1024
+ else:
+ properties:
+ cdns,fifo-depth:
+ enum: [ 128, 256 ]
+ default: 128

Regards,
Brad

author maintainer
#8 lore raw

PATCH v10 4/15 dt-bindings: spi: dw: Add AMD Pensando Elba SoC SPI Controller

In reply to Brad Larson

The AMD Pensando Elba SoC has integrated the DW APB SPI Controller

---

v10 changes:
- Move definition of amd,pensando-elba-syscon into properties with a better description
- Add amd,pensando-elba-syscon: false for non elba designs

v9 changes:
- Define property amd,pensando-elba-syscon
- Move compatible amd,pensando-elba-spi ahead of baikal,bt1-ssi

---
 .../bindings/spi/snps,dw-apb-ssi.yaml         | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml +19 -0
index a132b5fc56e0..2383d6497b1e 100644
@@ -37,6 +37,17 @@ allOf:
     else:
       required:
         - interrupts
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amd,pensando-elba-spi
+    then:
+      required:
+        - amd,pensando-elba-syscon
+    else:
+      properties:
+        amd,pensando-elba-syscon: false
 
 properties:
   compatible:
@@ -63,6 +74,8 @@ properties:
         const: intel,keembay-ssi
       - description: Intel Thunder Bay SPI Controller
         const: intel,thunderbay-ssi
+      - description: AMD Pensando Elba SoC SPI Controller
+        const: amd,pensando-elba-spi
       - description: Baikal-T1 SPI Controller
         const: baikal,bt1-ssi
       - description: Baikal-T1 System Boot SPI Controller
@@ -136,6 +149,12 @@ properties:
       of the designware controller, and the upper limit is also subject to
       controller configuration.
 
+  amd,pensando-elba-syscon:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
+    description: |
+      Block address to control SPI chip-selects.  The Elba SoC
+      does not use ssi.
+
 patternProperties:
   "^.*@[0-9a-f]+$":
     type: object
Signature · 7 lines
2.17.1


_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Reviewed-by on v10 4/15
#10 lore raw

Re: [PATCH v10 04/15] dt-bindings: spi: dw: Add AMD Pensando Elba SoC SPI Controller

In reply to Brad Larson
Quoted 3 lines · Brad Larson

The AMD Pensando Elba SoC has integrated the DW APB SPI Controller

Looks good. Thanks!

-Serge(y)

Quoted 62 lines

---

v10 changes:
- Move definition of amd,pensando-elba-syscon into properties with a better description
- Add amd,pensando-elba-syscon: false for non elba designs

v9 changes:
- Define property amd,pensando-elba-syscon
- Move compatible amd,pensando-elba-spi ahead of baikal,bt1-ssi

---
 .../bindings/spi/snps,dw-apb-ssi.yaml         | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml +19 -0
index a132b5fc56e0..2383d6497b1e 100644
@@ -37,6 +37,17 @@ allOf:
     else:
       required:
         - interrupts
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: amd,pensando-elba-spi
+    then:
+      required:
+        - amd,pensando-elba-syscon
+    else:
+      properties:
+        amd,pensando-elba-syscon: false
 
 properties:
   compatible:
@@ -63,6 +74,8 @@ properties:
         const: intel,keembay-ssi
       - description: Intel Thunder Bay SPI Controller
         const: intel,thunderbay-ssi
+      - description: AMD Pensando Elba SoC SPI Controller
+        const: amd,pensando-elba-spi
       - description: Baikal-T1 SPI Controller
         const: baikal,bt1-ssi
       - description: Baikal-T1 System Boot SPI Controller
@@ -136,6 +149,12 @@ properties:
       of the designware controller, and the upper limit is also subject to
       controller configuration.
 
+  amd,pensando-elba-syscon:
+    $ref: /schemas/types.yaml#/definitions/phandle-array
+    description: |
+      Block address to control SPI chip-selects.  The Elba SoC
+      does not use ssi.
+
 patternProperties:
   "^.*@[0-9a-f]+$":
     type: object
Signature · 1 line
2.17.1

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

author maintainer
#11 lore raw

PATCH v10 5/15 dt-bindings: soc: amd: amd,pensando-elbasr: Add AMD Pensando SoC System Controller

In reply to Brad Larson

Support the AMD Pensando SoC Controller which is a SPI connected device providing a miscellaneous set of essential board control/status registers. This device is present in all Pensando SoC based designs.

---

v10 changes:
- Property renamed to amd,pensando-ctrl
- Driver is renamed and moved to soc/drivers/amd affecting binding
- Delete cs property, driver handles device node creation from parent num-cs fixing schema reg error in a different way

v9 changes:
- Instead of four nodes, one per chip-select, a single node is used with reset-cells in the parent.
- No MFD API is used anymore in the driver so it made sense to move this to drivers/spi.
- This driver is common for all Pensando SoC based designs so changed the name to pensando-sr.c to not make it Elba SoC specific.
- Added property cs for the chip-select number which is used by the driver to create /dev/pensr0.<cs>

---
 .../bindings/soc/amd/amd,pensando-ctrl.yaml   | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +60 -0
new file mode 100644
index 000000000000..36694077b2e6
@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/soc/amd/amd,pensando-ctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: AMD Pensando SoC Controller
+
+description: |
+  The AMD Pensando SoC Controller is a SPI connected device with essential
+  control/status registers accessed on chip select 0.  This device is present
+  in all Pensando SoC based designs.
+
+maintainers:
+  - Brad Larson <[email protected]>
+
+properties:
+  compatible:
+    contains:
+      enum:
+        - amd,pensando-ctrl
+
+  reg:
+    minItems: 1
+
+  '#reset-cells':
+    const: 1
+
+  interrupts:
+    maxItems: 1
+
+  spi-max-frequency: true
+
+required:
+  - compatible
+  - spi-max-frequency
+  - '#reset-cells'
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    spi {
+        #address-cells = <1>;
+        #size-cells = <0>;
+        num-cs = <4>;
+
+        system-controller@0 {
+            compatible = "amd,pensando-ctrl";
+            reg = <0>;
+            spi-max-frequency = <12000000>;
+            interrupt-parent = <&porta>;
+            interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+            #reset-cells = <1>;
+        };
+    };
+
+...
Signature · 1 line
2.17.1
#12 lore raw

Re: [PATCH v10 05/15] dt-bindings: soc: amd: amd,pensando-elbasr: Add AMD Pensando SoC System Controller

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml

Quoted 34 lines · Brad Larson

Support the AMD Pensando SoC Controller which is a SPI connected device providing a miscellaneous set of essential board control/status registers. This device is present in all Pensando SoC based designs.

---

v10 changes:
- Property renamed to amd,pensando-ctrl
- Driver is renamed and moved to soc/drivers/amd affecting binding
- Delete cs property, driver handles device node creation from parent num-cs fixing schema reg error in a different way

v9 changes:
- Instead of four nodes, one per chip-select, a single node is used with reset-cells in the parent.
- No MFD API is used anymore in the driver so it made sense to move this to drivers/spi.
- This driver is common for all Pensando SoC based designs so changed the name to pensando-sr.c to not make it Elba SoC specific.
- Added property cs for the chip-select number which is used by the driver to create /dev/pensr0.<cs>

---
 .../bindings/soc/amd/amd,pensando-ctrl.yaml   | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +0 -0
new file mode 100644
index 000000000000..36694077b2e6

Your subject suggests this is pensando-elbasr but you write everywhere pensando-ctrl. Confusing. Pick one.

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 9

Quoted 10 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +9 -0
@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/soc/amd/amd,pensando-ctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: AMD Pensando SoC Controller
+
+description: |

No need for |

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 19

Quoted 10 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +10 -0
+  The AMD Pensando SoC Controller is a SPI connected device with essential
+  control/status registers accessed on chip select 0.  This device is present
+  in all Pensando SoC based designs.
+
+maintainers:
+  - Brad Larson <[email protected]>
+
+properties:
+  compatible:
+    contains:

Drop 'contains'. That's not a correct syntax here.

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 24

Quoted 5 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +5 -0
+      enum:
+        - amd,pensando-ctrl
+
+  reg:
+    minItems: 1

maxItems instead

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 32

Quoted 8 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +8 -0
+
+  '#reset-cells':
+    const: 1
+
+  interrupts:
+    maxItems: 1
+
+  spi-max-frequency: true

Drop, not needed.

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 37

Quoted 5 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +5 -0
+
+required:
+  - compatible
+  - spi-max-frequency
+  - '#reset-cells'

allOf with ref to spi-peripheral-props.yaml

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 39

Quoted 2 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +2 -0
+
+unevaluatedProperties: false

This is not correct without allOf (should be additionalProperties if you are not using allOf), which leads you to the missing allOf.

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 48

Quoted 9 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +9 -0
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    spi {
+        #address-cells = <1>;
+        #size-cells = <0>;
+        num-cs = <4>;

Drop num-cs, not important in this context.

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 60

Quoted 12 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +12 -0
+
+        system-controller@0 {
+            compatible = "amd,pensando-ctrl";
+            reg = <0>;
+            spi-max-frequency = <12000000>;
+            interrupt-parent = <&porta>;
+            interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+            #reset-cells = <1>;
+        };
+    };
+
+...

Best regards,
Krzysztof

#13 lore raw

Re: [PATCH v10 05/15] dt-bindings: soc: amd: amd,pensando-elbasr: Add AMD Pensando SoC System Controller

Quoted 30 lines · Krzysztof Kozlowski
Quoted 29 lines · Brad Larson

Support the AMD Pensando SoC Controller which is a SPI connected device providing a miscellaneous set of essential board control/status registers. This device is present in all Pensando SoC based designs.

---

v10 changes:
- Property renamed to amd,pensando-ctrl
- Driver is renamed and moved to soc/drivers/amd affecting binding
- Delete cs property, driver handles device node creation from parent num-cs fixing schema reg error in a different way

v9 changes:
- Instead of four nodes, one per chip-select, a single node is used with reset-cells in the parent.
- No MFD API is used anymore in the driver so it made sense to move this to drivers/spi.
- This driver is common for all Pensando SoC based designs so changed the name to pensando-sr.c to not make it Elba SoC specific.
- Added property cs for the chip-select number which is used by the driver to create /dev/pensr0.<cs>

---
 .../bindings/soc/amd/amd,pensando-ctrl.yaml   | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml
Quoted 8 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml

Quoted 5 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +0 -0
new file mode 100644
index 000000000000..36694077b2e6

Your subject suggests this is pensando-elbasr but you write everywhere pensando-ctrl. Confusing. Pick one.

Actually pensando-ctrl is for sure not correct, because it misses the name of the SoC (you call it everywhere "elba").

Best regards,
Krzysztof

author maintainer
#14 lore raw

Re: [PATCH v10 05/15] dt-bindings: soc: amd: amd,pensando-elbasr: Add AMD Pensando SoC System Controller

Quoted 39 lines · Krzysztof Kozlowski
Quoted 30 lines · Brad Larson
Quoted 29 lines

Support the AMD Pensando SoC Controller which is a SPI connected device providing a miscellaneous set of essential board control/status registers. This device is present in all Pensando SoC based designs.

---

v10 changes:
- Property renamed to amd,pensando-ctrl
- Driver is renamed and moved to soc/drivers/amd affecting binding
- Delete cs property, driver handles device node creation from parent num-cs fixing schema reg error in a different way

v9 changes:
- Instead of four nodes, one per chip-select, a single node is used with reset-cells in the parent.
- No MFD API is used anymore in the driver so it made sense to move this to drivers/spi.
- This driver is common for all Pensando SoC based designs so changed the name to pensando-sr.c to not make it Elba SoC specific.
- Added property cs for the chip-select number which is used by the driver to create /dev/pensr0.<cs>

---
 .../bindings/soc/amd/amd,pensando-ctrl.yaml   | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml
Quoted 8 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml

Quoted 5 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +0 -0
new file mode 100644
index 000000000000..36694077b2e6

Your subject suggests this is pensando-elbasr but you write everywhere pensando-ctrl. Confusing. Pick one.

Quoted 2 lines

Actually pensando-ctrl is for sure not correct, because it misses the name of the SoC (you call it everywhere "elba").

The reason I dropped elba as part of the name is this driver and its associated SPI attached device (cpld or fpga depending on the board design) will be used across a series of SoCs starting with Elba. Implying its Elba specific is misleading.

Regards,
Brad

#15 lore raw

Re: [PATCH v10 05/15] dt-bindings: soc: amd: amd,pensando-elbasr: Add AMD Pensando SoC System Controller

Quoted 40 lines · Brad Larson
Quoted 39 lines · Krzysztof Kozlowski
Quoted 38 lines · Brad Larson

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml

Quoted 34 lines

Support the AMD Pensando SoC Controller which is a SPI connected device providing a miscellaneous set of essential board control/status registers. This device is present in all Pensando SoC based designs.

---

v10 changes:
- Property renamed to amd,pensando-ctrl
- Driver is renamed and moved to soc/drivers/amd affecting binding
- Delete cs property, driver handles device node creation from parent num-cs fixing schema reg error in a different way

v9 changes:
- Instead of four nodes, one per chip-select, a single node is used with reset-cells in the parent.
- No MFD API is used anymore in the driver so it made sense to move this to drivers/spi.
- This driver is common for all Pensando SoC based designs so changed the name to pensando-sr.c to not make it Elba SoC specific.
- Added property cs for the chip-select number which is used by the driver to create /dev/pensr0.<cs>

---
 .../bindings/soc/amd/amd,pensando-ctrl.yaml   | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +0 -0
new file mode 100644
index 000000000000..36694077b2e6

Your subject suggests this is pensando-elbasr but you write everywhere pensando-ctrl. Confusing. Pick one.

Quoted 6 lines
Quoted 2 lines

Actually pensando-ctrl is for sure not correct, because it misses the name of the SoC (you call it everywhere "elba").

The reason I dropped elba as part of the name is this driver and its associated SPI attached device (cpld or fpga depending on the board design) will be used across a series of SoCs starting with Elba. Implying its Elba specific is misleading.

Compatibles must be specific.
https://elixir.bootlin.com/linux/v6.1-rc1/source/Documentation/devicetree/bindings/writing-bindings.rst#L42
If this is SoC part it must match SoC. What is misleading in this? Why Pensando is different than all other SoCs (I am really getting tired everytime asking why people think their solution is special)?

If this is not part of the SoC, then your commit msg is misleading. Maybe bindings as well, so rework it.

Best regards,
Krzysztof

author maintainer
#16 lore raw

Re: [PATCH v10 05/15] dt-bindings: soc: amd: amd,pensando-elbasr: Add AMD Pensando SoC System Controller

Quoted 7 lines · Krzysztof Kozlowski
Quoted 6 lines · Brad Larson
Quoted 5 lines · Krzysztof Kozlowski
Quoted 5 lines · Brad Larson
Quoted 4 lines

Support the AMD Pensando SoC Controller which is a SPI connected device providing a miscellaneous set of essential board control/status registers. This device is present in all Pensando SoC based designs.

...

Quoted 20 lines
Quoted 13 lines
Quoted 13 lines
Quoted 12 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml

Quoted 9 lines
 .../bindings/soc/amd/amd,pensando-ctrl.yaml   | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +0 -0
new file mode 100644
index 000000000000..36694077b2e6

Your subject suggests this is pensando-elbasr but you write everywhere pensando-ctrl. Confusing. Pick one.

Quoted 6 lines
Quoted 2 lines

Actually pensando-ctrl is for sure not correct, because it misses the name of the SoC (you call it everywhere "elba").

The reason I dropped elba as part of the name is this driver and its associated SPI attached device (cpld or fpga depending on the board design) will be used across a series of SoCs starting with Elba. Implying its Elba specific is misleading.

Quoted 8 lines

Compatibles must be specific.
https://elixir.bootlin.com/linux/v6.1-rc1/source/Documentation/devicetree/bindings/writing-bindings.rst#L42
If this is SoC part it must match SoC. What is misleading in this? Why Pensando is different than all other SoCs (I am really getting tired everytime asking why people think their solution is special)?

If this is not part of the SoC, then your commit msg is misleading. Maybe bindings as well, so rework it.

Yes, changed it back to 'amd,pensando-elba-ctrl' and fixed the dts, driver and commit message.

Regards,
Brad

author maintainer
#17 lore raw

Re: [PATCH v10 05/15] dt-bindings: soc: amd: amd,pensando-elbasr: Add AMD Pensando SoC System Controller

In reply to Krzysztof Kozlowski
Quoted 30 lines · Krzysztof Kozlowski
Quoted 29 lines · Brad Larson

Support the AMD Pensando SoC Controller which is a SPI connected device providing a miscellaneous set of essential board control/status registers. This device is present in all Pensando SoC based designs.

---

v10 changes:
- Property renamed to amd,pensando-ctrl
- Driver is renamed and moved to soc/drivers/amd affecting binding
- Delete cs property, driver handles device node creation from parent num-cs fixing schema reg error in a different way

v9 changes:
- Instead of four nodes, one per chip-select, a single node is used with reset-cells in the parent.
- No MFD API is used anymore in the driver so it made sense to move this to drivers/spi.
- This driver is common for all Pensando SoC based designs so changed the name to pensando-sr.c to not make it Elba SoC specific.
- Added property cs for the chip-select number which is used by the driver to create /dev/pensr0.<cs>

---
 .../bindings/soc/amd/amd,pensando-ctrl.yaml   | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml
Quoted 8 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml

Quoted 5 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +0 -0
new file mode 100644
index 000000000000..36694077b2e6

Your subject suggests this is pensando-elbasr but you write everywhere pensando-ctrl. Confusing. Pick one.

I'll fix the commit message. This driver is common across multiple Pensando SoCs and embedding elba in the name is misleading which is why I changed it to pensando controller (pensando-ctrl). Sorry for the churn.

Quoted 4 lines
Quoted 4 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +3 -0
@@ -0,0 +1,60 @@
+# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
+%YAML 1.2
+---
Quoted 8 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 9

Quoted 6 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +6 -0
+$id: http://devicetree.org/schemas/soc/amd/amd,pensando-ctrl.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: AMD Pensando SoC Controller
+
+description: |

No need for |

Removed |

Quoted 4 lines
Quoted 4 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +4 -0
+  The AMD Pensando SoC Controller is a SPI connected device with essential
+  control/status registers accessed on chip select 0.  This device is present
+  in all Pensando SoC based designs.
+
Quoted 9 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 19

Quoted 6 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +6 -0
+maintainers:
+  - Brad Larson <[email protected]>
+
+properties:
+  compatible:
+    contains:

Drop 'contains'. That's not a correct syntax here.

Removed contains and looks like this now:

properties:
compatible:
enum:
- amd,pensando-ctrl

Quoted 7 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 24

Quoted 5 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +5 -0
+      enum:
+        - amd,pensando-ctrl
+
+  reg:
+    minItems: 1

maxItems instead

Changed to maxItems: 1

Quoted 11 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 32

Quoted 8 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +8 -0
+
+  '#reset-cells':
+    const: 1
+
+  interrupts:
+    maxItems: 1
+
+  spi-max-frequency: true

Drop, not needed.

Removed spi-max-frequency and included alOff w/spi-peripheral-props.yaml

Quoted 8 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 37

Quoted 5 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +5 -0
+
+required:
+  - compatible
+  - spi-max-frequency
+  - '#reset-cells'

allOf with ref to spi-peripheral-props.yaml

Quoted 5 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 39

Quoted 2 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +2 -0
+
+unevaluatedProperties: false

This is not correct without allOf (should be additionalProperties if you are not using allOf), which leads you to the missing allOf.

Thanks for pointing out use of spi-peripheral-props.yaml, looks like this now

+required:

+  - compatible
+  - reg
+  - '#reset-cells'

+
+allOf:
+ - $ref: /schemas/spi/spi-peripheral-props.yaml# +
+unevaluatedProperties: false

Quoted 11 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 48

Quoted 9 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +9 -0
+
+examples:
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+
+    spi {
+        #address-cells = <1>;
+        #size-cells = <0>;
+        num-cs = <4>;

Drop num-cs, not important in this context.

Removed num-cs

Quoted 4 lines
Quoted 4 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +4 -0
+
+        system-controller@0 {
+            compatible = "amd,pensando-ctrl";
+            reg = <0>;
Quoted 8 lines

Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml line 60

Quoted 8 lines
Documentation/devicetree/bindings/soc/amd/amd,pensando-ctrl.yaml new file +8 -0
+            spi-max-frequency = <12000000>;
+            interrupt-parent = <&porta>;
+            interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+            #reset-cells = <1>;
+        };
+    };
+
+...

Regards,
Brad

author maintainer
#18 lore raw

PATCH v10 6/15 MAINTAINERS: Add entry for AMD PENSANDO

In reply to Brad Larson

Add entry for AMD PENSANDO maintainer and files

---
 MAINTAINERS | 9 +++++++++
 1 file changed, 9 insertions(+)
MAINTAINERS +9 -0
index 8d5bc223f305..5e39def215c9 100644
@@ -1875,6 +1875,15 @@ N:	allwinner
 N:	sun[x456789]i
 N:	sun[25]0i
 
+ARM/AMD PENSANDO ARM64 ARCHITECTURE
+M:	Brad Larson <[email protected]>
+L:	[email protected] (moderated for non-subscribers)
+S:	Supported
+F:	Documentation/devicetree/bindings/*/amd,pensando*
+F:	Documentation/devicetree/bindings/soc/amd/amd,pensando*
+F:	arch/arm64/boot/dts/amd/elba*
+F:	drivers/soc/amd/
+
 ARM/Amlogic Meson SoC CLOCK FRAMEWORK
 M:	Neil Armstrong <[email protected]>
 M:	Jerome Brunet <[email protected]>
Signature · 1 line
2.17.1
author maintainer
#19 lore raw

PATCH v10 7/15 arm64: Add config for AMD Pensando SoC platforms

In reply to Brad Larson

Add ARCH_PENSANDO configuration option for AMD Pensando SoC based platforms.

---
 arch/arm64/Kconfig.platforms | 12 ++++++++++++
 1 file changed, 12 insertions(+)
arch/arm64/Kconfig.platforms +12 -0
index 89a0b13b058d..3510daaabe27 100644
@@ -236,6 +236,18 @@ config ARCH_NPCM
 	  General support for NPCM8xx BMC (Arbel).
 	  Nuvoton NPCM8xx BMC based on the Cortex A35.
 
+config ARCH_PENSANDO
+	bool "AMD Pensando Platforms"
+	help
+	  This enables support for the ARMv8 based AMD Pensando SoC
+	  family to include the Elba SoC.
+
+	  AMD Pensando SoCs support a range of Distributed Services
+	  Cards in PCIe format installed into servers.  The Elba
+	  SoC includes 16 A-72 CPU cores, 144 programmable P4
+	  cores for a minimal latency/jitter datapath, and network
+	  interfaces up to 200 Gb/s.
+
 config ARCH_QCOM
 	bool "Qualcomm Platforms"
 	select GPIOLIB
Signature · 1 line
2.17.1
author maintainer
#20 lore raw

PATCH v10 8/15 arm64: dts: Add AMD Pensando Elba SoC support

In reply to Brad Larson

Add AMD Pensando common and Elba SoC specific device nodes

---

v9 changes:
- Single node for spi0 system-controller and squash the reset-controller child into parent

---
 arch/arm64/boot/dts/amd/Makefile              |   1 +
 arch/arm64/boot/dts/amd/elba-16core.dtsi      | 189 +++++++++++++++++
 arch/arm64/boot/dts/amd/elba-asic-common.dtsi |  81 ++++++++
 arch/arm64/boot/dts/amd/elba-asic.dts         |  28 +++
 arch/arm64/boot/dts/amd/elba-flash-parts.dtsi | 106 ++++++++++
 arch/arm64/boot/dts/amd/elba.dtsi             | 192 ++++++++++++++++++
 6 files changed, 597 insertions(+)
 create mode 100644 arch/arm64/boot/dts/amd/elba-16core.dtsi
 create mode 100644 arch/arm64/boot/dts/amd/elba-asic-common.dtsi
 create mode 100644 arch/arm64/boot/dts/amd/elba-asic.dts
 create mode 100644 arch/arm64/boot/dts/amd/elba-flash-parts.dtsi
 create mode 100644 arch/arm64/boot/dts/amd/elba.dtsi
arch/arm64/boot/dts/amd/Makefile +1 -0
index 68103a8b0ef5..8502cc2afbc5 100644
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
+dtb-$(CONFIG_ARCH_PENSANDO) += elba-asic.dtb
 dtb-$(CONFIG_ARCH_SEATTLE) += amd-overdrive-rev-b0.dtb amd-overdrive-rev-b1.dtb
arch/arm64/boot/dts/amd/elba-16core.dtsi new file +189 -0

189 lines not on this page · raw message

arch/arm64/boot/dts/amd/elba-asic-common.dtsi new file +81 -0

81 lines not on this page · raw message

arch/arm64/boot/dts/amd/elba-asic.dts new file +28 -0
new file mode 100644
index 000000000000..c3f4da2f7449
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
+/*
+ * Device Tree file for AMD Pensando Elba Board.
+ *
+ * Copyright 2020-2022 Advanced Micro Devices, Inc.
+ */
+
+/dts-v1/;
+
+#include "elba.dtsi"
+#include "elba-16core.dtsi"
+#include "elba-asic-common.dtsi"
+#include "elba-flash-parts.dtsi"
+
+/ {
+	model = "AMD Pensando Elba Board";
+	compatible = "amd,pensando-elba-ortano", "amd,pensando-elba";
+
+	aliases {
+		serial0 = &uart0;
+		spi0 = &spi0;
+		spi1 = &qspi;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+};
arch/arm64/boot/dts/amd/elba-flash-parts.dtsi new file +106 -0

106 lines not on this page · raw message

arch/arm64/boot/dts/amd/elba.dtsi new file +192 -0

192 lines not on this page · raw message

Signature · 1 line
2.17.1
author maintainer
#21 lore raw

PATCH v10 9/15 spi: cadence-quadspi: Add compatible for AMD Pensando Elba SoC

In reply to Brad Larson

The AMD Pensando Elba SoC has the Cadence QSPI controller integrated.

The quirk CQSPI_NEEDS_APB_AHB_HAZARD_WAR is added and if enabled a dummy readback from the controller is performed to ensure synchronization.

---

v9 changes:
- Rebase to linux-next 6.2.0-rc1

---
 drivers/spi/spi-cadence-quadspi.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
drivers/spi/spi-cadence-quadspi.c +19 -0
index 64b6a460d739..ad82d2ab3442 100644
@@ -40,6 +40,7 @@
 #define CQSPI_SUPPORT_EXTERNAL_DMA	BIT(2)
 #define CQSPI_NO_SUPPORT_WR_COMPLETION	BIT(3)
 #define CQSPI_SLOW_SRAM		BIT(4)
+#define CQSPI_NEEDS_APB_AHB_HAZARD_WAR	BIT(5)
 
 /* Capabilities */
 #define CQSPI_SUPPORTS_OCTAL		BIT(0)
@@ -90,6 +91,7 @@ struct cqspi_st {
 	u32			pd_dev_id;
 	bool			wr_completion;
 	bool			slow_sram;
+	bool			apb_ahb_hazard;
 };
 
 struct cqspi_driver_platdata {
@@ -1004,6 +1006,13 @@ static int cqspi_indirect_write_execute(struct cqspi_flash_pdata *f_pdata,
 	if (cqspi->wr_delay)
 		ndelay(cqspi->wr_delay);
 
+	/*
+	 * If a hazard exists between the APB and AHB interfaces, perform a
+	 * dummy readback from the controller to ensure synchronization.
+	 */
+	if (cqspi->apb_ahb_hazard)
+		readl(reg_base + CQSPI_REG_INDIRECTWR);
+
 	while (remaining > 0) {
 		size_t write_words, mod_bytes;
 
@@ -1734,6 +1743,8 @@ static int cqspi_probe(struct platform_device *pdev)
 			cqspi->wr_completion = false;
 		if (ddata->quirks & CQSPI_SLOW_SRAM)
 			cqspi->slow_sram = true;
+		if (ddata->quirks & CQSPI_NEEDS_APB_AHB_HAZARD_WAR)
+			cqspi->apb_ahb_hazard = true;
 
 		if (of_device_is_compatible(pdev->dev.of_node,
 					    "xlnx,versal-ospi-1.0"))
@@ -1859,6 +1870,10 @@ static const struct cqspi_driver_platdata versal_ospi = {
 	.get_dma_status = cqspi_get_versal_dma_status,
 };
 
+static const struct cqspi_driver_platdata pensando_cdns_qspi = {
+	.quirks = CQSPI_NEEDS_APB_AHB_HAZARD_WAR | CQSPI_DISABLE_DAC_MODE,
+};
+
 static const struct of_device_id cqspi_dt_ids[] = {
 	{
 		.compatible = "cdns,qspi-nor",
@@ -1884,6 +1899,10 @@ static const struct of_device_id cqspi_dt_ids[] = {
 		.compatible = "intel,socfpga-qspi",
 		.data = &socfpga_qspi,
 	},
+	{
+		.compatible = "amd,pensando-elba-qspi",
+		.data = &pensando_cdns_qspi,
+	},
 	{ /* end of table */ }
 };
 
Signature · 1 line
2.17.1
author maintainer
#22 lore raw

PATCH v10 10/15 spi: dw: Add support for AMD Pensando Elba SoC

In reply to Brad Larson

The AMD Pensando Elba SoC includes a DW apb_ssi v4 controller with device specific chip-select control. The Elba SoC provides four chip-selects where the native DW IP supports two chip-selects. The Elba DW_SPI instance has two native CS signals that are always overridden.

---

v10 changes:
- Delete struct dw_spi_elba, use regmap directly in priv

v9 changes:
- Add use of macros GENMASK() and BIT()
- Change ELBA_SPICS_SHIFT() to ELBA_SPICS_OFFSET()

---
 drivers/spi/spi-dw-mmio.c | 65 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
drivers/spi/spi-dw-mmio.c +65 -0
index 26c40ea6dd12..2076cb83a11b 100644
@@ -53,6 +53,20 @@ struct dw_spi_mscc {
 	void __iomem        *spi_mst; /* Not sparx5 */
 };
 
+/*
+ * Elba SoC does not use ssi, pin override is used for cs 0,1 and
+ * gpios for cs 2,3 as defined in the device tree.
+ *
+ * cs:  |       1               0
+ * bit: |---3-------2-------1-------0
+ *      |  cs1   cs1_ovr   cs0   cs0_ovr
+ */
+#define ELBA_SPICS_REG			0x2468
+#define ELBA_SPICS_OFFSET(cs)		((cs) << 1)
+#define ELBA_SPICS_MASK(cs)		(GENMASK(1, 0) << ELBA_SPICS_OFFSET(cs))
+#define ELBA_SPICS_SET(cs, val)		\
+		((((val) << 1) | BIT(0)) << ELBA_SPICS_OFFSET(cs))
+
 /*
  * The Designware SPI controller (referred to as master in the documentation)
  * automatically deasserts chip select when the tx fifo is empty. The chip
@@ -237,6 +251,56 @@ static int dw_spi_canaan_k210_init(struct platform_device *pdev,
 	return 0;
 }
 
+static void dw_spi_elba_override_cs(struct regmap *syscon, int cs, int enable)
+{
+	regmap_update_bits(syscon, ELBA_SPICS_REG, ELBA_SPICS_MASK(cs),
+			   ELBA_SPICS_SET(cs, enable));
+}
+
+static void dw_spi_elba_set_cs(struct spi_device *spi, bool enable)
+{
+	struct dw_spi *dws = spi_master_get_devdata(spi->master);
+	struct dw_spi_mmio *dwsmmio = container_of(dws, struct dw_spi_mmio, dws);
+	struct regmap *syscon = dwsmmio->priv;
+	u8 cs;
+
+	cs = spi->chip_select;
+	if (cs < 2)
+		dw_spi_elba_override_cs(syscon, spi->chip_select, enable);
+
+	/*
+	 * The DW SPI controller needs a native CS bit selected to start
+	 * the serial engine.
+	 */
+	spi->chip_select = 0;
+	dw_spi_set_cs(spi, enable);
+	spi->chip_select = cs;
+}
+
+static int dw_spi_elba_init(struct platform_device *pdev,
+			    struct dw_spi_mmio *dwsmmio)
+{
+	const char *syscon_name = "amd,pensando-elba-syscon";
+	struct device_node *np = pdev->dev.of_node;
+	struct device_node *node;
+	struct regmap *syscon;
+
+	node = of_parse_phandle(np, syscon_name, 0);
+	if (!node)
+		return dev_err_probe(&pdev->dev, -ENODEV, "failed to find %s\n",
+				     syscon_name);
+
+	syscon = syscon_node_to_regmap(node);
+	if (IS_ERR(syscon))
+		return dev_err_probe(&pdev->dev, PTR_ERR(syscon),
+				     "syscon regmap lookup failed\n");
+
+	dwsmmio->priv = syscon;
+	dwsmmio->dws.set_cs = dw_spi_elba_set_cs;
+
+	return 0;
+}
+
 static int dw_spi_mmio_probe(struct platform_device *pdev)
 {
 	int (*init_func)(struct platform_device *pdev,
@@ -352,6 +416,7 @@ static const struct of_device_id dw_spi_mmio_of_match[] = {
 	{ .compatible = "intel,thunderbay-ssi", .data = dw_spi_intel_init},
 	{ .compatible = "microchip,sparx5-spi", dw_spi_mscc_sparx5_init},
 	{ .compatible = "canaan,k210-spi", dw_spi_canaan_k210_init},
+	{ .compatible = "amd,pensando-elba-spi", .data = dw_spi_elba_init},
 	{ /* end of table */}
 };
 MODULE_DEVICE_TABLE(of, dw_spi_mmio_of_match);
Signature · 1 line
2.17.1
#23 lore raw

Re: [PATCH v10 10/15] spi: dw: Add support for AMD Pensando Elba SoC

Quoted 71 lines · Brad Larson

The AMD Pensando Elba SoC includes a DW apb_ssi v4 controller with device specific chip-select control. The Elba SoC provides four chip-selects where the native DW IP supports two chip-selects. The Elba DW_SPI instance has two native CS signals that are always overridden.

---

v10 changes:
- Delete struct dw_spi_elba, use regmap directly in priv

v9 changes:
- Add use of macros GENMASK() and BIT()
- Change ELBA_SPICS_SHIFT() to ELBA_SPICS_OFFSET()

---
 drivers/spi/spi-dw-mmio.c | 65 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
drivers/spi/spi-dw-mmio.c +36 -0
index 26c40ea6dd12..2076cb83a11b 100644
@@ -53,6 +53,20 @@ struct dw_spi_mscc {
 	void __iomem        *spi_mst; /* Not sparx5 */
 };
 
+/*
+ * Elba SoC does not use ssi, pin override is used for cs 0,1 and
+ * gpios for cs 2,3 as defined in the device tree.
+ *
+ * cs:  |       1               0
+ * bit: |---3-------2-------1-------0
+ *      |  cs1   cs1_ovr   cs0   cs0_ovr
+ */
+#define ELBA_SPICS_REG			0x2468
+#define ELBA_SPICS_OFFSET(cs)		((cs) << 1)
+#define ELBA_SPICS_MASK(cs)		(GENMASK(1, 0) << ELBA_SPICS_OFFSET(cs))
+#define ELBA_SPICS_SET(cs, val)		\
+		((((val) << 1) | BIT(0)) << ELBA_SPICS_OFFSET(cs))
+
 /*
  * The Designware SPI controller (referred to as master in the documentation)
  * automatically deasserts chip select when the tx fifo is empty. The chip
@@ -237,6 +251,56 @@ static int dw_spi_canaan_k210_init(struct platform_device *pdev,
 	return 0;
 }
 
+static void dw_spi_elba_override_cs(struct regmap *syscon, int cs, int enable)
+{
+	regmap_update_bits(syscon, ELBA_SPICS_REG, ELBA_SPICS_MASK(cs),
+			   ELBA_SPICS_SET(cs, enable));
+}
+
+static void dw_spi_elba_set_cs(struct spi_device *spi, bool enable)
+{
+	struct dw_spi *dws = spi_master_get_devdata(spi->master);
+	struct dw_spi_mmio *dwsmmio = container_of(dws, struct dw_spi_mmio, dws);
+	struct regmap *syscon = dwsmmio->priv;
+	u8 cs;
+
+	cs = spi->chip_select;
+	if (cs < 2)
+		dw_spi_elba_override_cs(syscon, spi->chip_select, enable);
+
+	/*
+	 * The DW SPI controller needs a native CS bit selected to start
+	 * the serial engine.
+	 */
+	spi->chip_select = 0;

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 285

Quoted 10 lines
drivers/spi/spi-dw-mmio.c +9 -0
+	dw_spi_set_cs(spi, enable);
+	spi->chip_select = cs;
+}
+
+static int dw_spi_elba_init(struct platform_device *pdev,
+			    struct dw_spi_mmio *dwsmmio)
+{
+	const char *syscon_name = "amd,pensando-elba-syscon";
 
+	struct device_node *np = pdev->dev.of_node;

Drop this since it's used only once below.

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev,

Quoted 4 lines
drivers/spi/spi-dw-mmio.c +3 -1
+	struct device_node *node;                                         
+	struct regmap *syscon;                                            
+                                                                       
-	node = of_parse_phandle(np, syscon_name, 0);                      
	node = of_parse_phandle(dev_of_node(pdev->dev), syscon_name, 0);

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 291

Quoted 4 lines
drivers/spi/spi-dw-mmio.c +3 -0
+	if (!node)
 
+		return dev_err_probe(&pdev->dev, -ENODEV, "failed to find %s\n",
+				     syscon_name);

Hm, using dev_err_probe() with known error value seems overkill.

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 296

Quoted 6 lines
drivers/spi/spi-dw-mmio.c +5 -0
+
 
+	syscon = syscon_node_to_regmap(node);
+	if (IS_ERR(syscon))
+		return dev_err_probe(&pdev->dev, PTR_ERR(syscon),
+				     "syscon regmap lookup failed\n");

of_node_put() is missing in the error and success paths.

-Serge(y)

Quoted 21 lines
drivers/spi/spi-dw-mmio.c +8 -0
+
+	dwsmmio->priv = syscon;
+	dwsmmio->dws.set_cs = dw_spi_elba_set_cs;
+
+	return 0;
+}
+
 static int dw_spi_mmio_probe(struct platform_device *pdev)
 {
 	int (*init_func)(struct platform_device *pdev,
@@ -352,6 +416,7 @@ static const struct of_device_id dw_spi_mmio_of_match[] = {
 	{ .compatible = "intel,thunderbay-ssi", .data = dw_spi_intel_init},
 	{ .compatible = "microchip,sparx5-spi", dw_spi_mscc_sparx5_init},
 	{ .compatible = "canaan,k210-spi", dw_spi_canaan_k210_init},
+	{ .compatible = "amd,pensando-elba-spi", .data = dw_spi_elba_init},
 	{ /* end of table */}
 };
 MODULE_DEVICE_TABLE(of, dw_spi_mmio_of_match);
Signature · 1 line
2.17.1
#24 lore raw

Re: [PATCH v10 10/15] spi: dw: Add support for AMD Pensando Elba SoC

Quoted 1 line · Serge Semin

On Sun, Mar 05, 2023 at 08:07:34PM -0800, Brad Larson wrote:

...

Quoted 3 lines
Quoted 1 line

- node = of_parse_phandle(np, syscon_name, 0);

        node = of_parse_phandle(dev_of_node(pdev->dev), syscon_name, 0);

Side note: I would rather see syscon_fwnode_to_regmap() instead of this. And IIRC syscon already has an API to find by name.

Quoted 6 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 291

Quoted 4 lines
drivers/spi/spi-dw-mmio.c +3 -0
+     if (!node)
 
+             return dev_err_probe(&pdev->dev, -ENODEV, "failed to find %s\n",
+                                  syscon_name);

Hm, using dev_err_probe() with known error value seems overkill.

It's allowed use and it helps to drop a few unnecessary lines of code.

Quoted 4 lines
Quoted 4 lines
drivers/spi/spi-dw-mmio.c +4 -0
+     syscon = syscon_node_to_regmap(node);
+     if (IS_ERR(syscon))
+             return dev_err_probe(&pdev->dev, PTR_ERR(syscon),
+                                  "syscon regmap lookup failed\n");
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#25 lore raw

Re: [PATCH v10 10/15] spi: dw: Add support for AMD Pensando Elba SoC

Quoted 5 lines · Andy Shevchenko
Quoted 1 line · Serge Semin

On Sun, Mar 05, 2023 at 08:07:34PM -0800, Brad Larson wrote:

...

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

- node = of_parse_phandle(np, syscon_name, 0);

        node = of_parse_phandle(dev_of_node(pdev->dev), syscon_name, 0);

Side note: I would rather see syscon_fwnode_to_regmap() instead of this. And IIRC syscon already has an API to find by name.

Ah, right. Though it's called syscon_regmap_lookup_by_phandle() and it can be used to replace the entire pattern: "Parse property; Find node by phandle; Get regmap by node". Basically the of_parse_phandle() and syscon_node_to_regmap() methods invocation can be replaced with just a single function call. Thus there won't be need to worry about decrementing the found DT-node ref-counter.

Quoted 10 lines
Quoted 7 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 291

Quoted 5 lines
drivers/spi/spi-dw-mmio.c +3 -0
+     if (!node)
 
+             return dev_err_probe(&pdev->dev, -ENODEV, "failed to find %s\n",
+                                  syscon_name);

Hm, using dev_err_probe() with known error value seems overkill.

It's allowed use and it helps to drop a few unnecessary lines of code.

Ok, seeing there is no alternative to that method which would return the passed error but wouldn't have a name implying the silent deferred-probe error semantics.

-Serge(y)

Quoted 9 lines
Quoted 5 lines
Quoted 5 lines
drivers/spi/spi-dw-mmio.c +4 -0
+     syscon = syscon_node_to_regmap(node);
+     if (IS_ERR(syscon))
+             return dev_err_probe(&pdev->dev, PTR_ERR(syscon),
+                                  "syscon regmap lookup failed\n");
Signature · 2 lines
With Best Regards,
Andy Shevchenko
author maintainer
#26 lore raw

Re: [PATCH v10 10/15] spi: dw: Add support for AMD Pensando Elba SoC

In reply to Serge Semin
Quoted 81 lines · Serge Semin
Quoted 79 lines · Brad Larson

The AMD Pensando Elba SoC includes a DW apb_ssi v4 controller with device specific chip-select control. The Elba SoC provides four chip-selects where the native DW IP supports two chip-selects. The Elba DW_SPI instance has two native CS signals that are always overridden.

---

v10 changes:
- Delete struct dw_spi_elba, use regmap directly in priv

v9 changes:
- Add use of macros GENMASK() and BIT()
- Change ELBA_SPICS_SHIFT() to ELBA_SPICS_OFFSET()

---
 drivers/spi/spi-dw-mmio.c | 65 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
drivers/spi/spi-dw-mmio.c +44 -0
index 26c40ea6dd12..2076cb83a11b 100644
@@ -53,6 +53,20 @@ struct dw_spi_mscc {
 	void __iomem        *spi_mst; /* Not sparx5 */
 };
 
+/*
+ * Elba SoC does not use ssi, pin override is used for cs 0,1 and
+ * gpios for cs 2,3 as defined in the device tree.
+ *
+ * cs:  |       1               0
+ * bit: |---3-------2-------1-------0
+ *      |  cs1   cs1_ovr   cs0   cs0_ovr
+ */
+#define ELBA_SPICS_REG			0x2468
+#define ELBA_SPICS_OFFSET(cs)		((cs) << 1)
+#define ELBA_SPICS_MASK(cs)		(GENMASK(1, 0) << ELBA_SPICS_OFFSET(cs))
+#define ELBA_SPICS_SET(cs, val)		\
+		((((val) << 1) | BIT(0)) << ELBA_SPICS_OFFSET(cs))
+
 /*
  * The Designware SPI controller (referred to as master in the documentation)
  * automatically deasserts chip select when the tx fifo is empty. The chip
@@ -237,6 +251,56 @@ static int dw_spi_canaan_k210_init(struct platform_device *pdev,
 	return 0;
 }
 
+static void dw_spi_elba_override_cs(struct regmap *syscon, int cs, int enable)
+{
+	regmap_update_bits(syscon, ELBA_SPICS_REG, ELBA_SPICS_MASK(cs),
+			   ELBA_SPICS_SET(cs, enable));
+}
+
+static void dw_spi_elba_set_cs(struct spi_device *spi, bool enable)
+{
+	struct dw_spi *dws = spi_master_get_devdata(spi->master);
+	struct dw_spi_mmio *dwsmmio = container_of(dws, struct dw_spi_mmio, dws);
+	struct regmap *syscon = dwsmmio->priv;
+	u8 cs;
+
+	cs = spi->chip_select;
+	if (cs < 2)
+		dw_spi_elba_override_cs(syscon, spi->chip_select, enable);
+
+	/*
+	 * The DW SPI controller needs a native CS bit selected to start
+	 * the serial engine.
+	 */
+	spi->chip_select = 0;
+	dw_spi_set_cs(spi, enable);
+	spi->chip_select = cs;
+}
+
+static int dw_spi_elba_init(struct platform_device *pdev,
+			    struct dw_spi_mmio *dwsmmio)
+{
+	const char *syscon_name = "amd,pensando-elba-syscon";
Quoted 4 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 284

Quoted 1 line
drivers/spi/spi-dw-mmio.c +1 -0
+	struct device_node *np = pdev->dev.of_node;

Drop this since it's used only once below.

Removed

Quoted 1 line

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 285

Quoted 1 line
drivers/spi/spi-dw-mmio.c +1 -0
+	struct device_node *node;                                         

Renamed *node to *np

Quoted 8 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev,

Quoted 3 lines
drivers/spi/spi-dw-mmio.c +2 -1
+	struct regmap *syscon;                                            
+                                                                       
-	node = of_parse_phandle(np, syscon_name, 0);                      
	node = of_parse_phandle(dev_of_node(pdev->dev), syscon_name, 0);
drivers/spi/spi-dw-mmio.c +1 -0
+	if (!node)
Quoted 4 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 291

Quoted 2 lines
drivers/spi/spi-dw-mmio.c +2 -0
+		return dev_err_probe(&pdev->dev, -ENODEV, "failed to find %s\n",
+				     syscon_name);

Hm, using dev_err_probe() with known error value seems overkill.

Changed to: return -ENODEV

Quoted 8 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 296

Quoted 6 lines
drivers/spi/spi-dw-mmio.c +5 -0
+
 
+	syscon = syscon_node_to_regmap(node);
+	if (IS_ERR(syscon))
+		return dev_err_probe(&pdev->dev, PTR_ERR(syscon),
+				     "syscon regmap lookup failed\n");

of_node_put() is missing in the error and success paths.

Result of the above changes are:

+       const char *syscon_name = "amd,pensando-elba-syscon";
+       struct device_node *np;
+       struct regmap *syscon;

+
+ np = of_parse_phandle(pdev->dev.of_node, syscon_name, 0);
+ if (!np)
+ return -ENODEV;
+

+       syscon = syscon_node_to_regmap(np);
+       of_node_put(np);
+       if (IS_ERR(syscon))

+ return dev_err_probe(&pdev->dev, PTR_ERR(syscon),
+ "syscon regmap lookup failed\n");

Regards,
Brad

#27 lore raw

Re: [PATCH v10 10/15] spi: dw: Add support for AMD Pensando Elba SoC

Quoted 123 lines · Brad Larson
Quoted 81 lines · Serge Semin
Quoted 79 lines · Brad Larson

The AMD Pensando Elba SoC includes a DW apb_ssi v4 controller with device specific chip-select control. The Elba SoC provides four chip-selects where the native DW IP supports two chip-selects. The Elba DW_SPI instance has two native CS signals that are always overridden.

---

v10 changes:
- Delete struct dw_spi_elba, use regmap directly in priv

v9 changes:
- Add use of macros GENMASK() and BIT()
- Change ELBA_SPICS_SHIFT() to ELBA_SPICS_OFFSET()

---
 drivers/spi/spi-dw-mmio.c | 65 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
drivers/spi/spi-dw-mmio.c +44 -0
index 26c40ea6dd12..2076cb83a11b 100644
@@ -53,6 +53,20 @@ struct dw_spi_mscc {
 	void __iomem        *spi_mst; /* Not sparx5 */
 };
 
+/*
+ * Elba SoC does not use ssi, pin override is used for cs 0,1 and
+ * gpios for cs 2,3 as defined in the device tree.
+ *
+ * cs:  |       1               0
+ * bit: |---3-------2-------1-------0
+ *      |  cs1   cs1_ovr   cs0   cs0_ovr
+ */
+#define ELBA_SPICS_REG			0x2468
+#define ELBA_SPICS_OFFSET(cs)		((cs) << 1)
+#define ELBA_SPICS_MASK(cs)		(GENMASK(1, 0) << ELBA_SPICS_OFFSET(cs))
+#define ELBA_SPICS_SET(cs, val)		\
+		((((val) << 1) | BIT(0)) << ELBA_SPICS_OFFSET(cs))
+
 /*
  * The Designware SPI controller (referred to as master in the documentation)
  * automatically deasserts chip select when the tx fifo is empty. The chip
@@ -237,6 +251,56 @@ static int dw_spi_canaan_k210_init(struct platform_device *pdev,
 	return 0;
 }
 
+static void dw_spi_elba_override_cs(struct regmap *syscon, int cs, int enable)
+{
+	regmap_update_bits(syscon, ELBA_SPICS_REG, ELBA_SPICS_MASK(cs),
+			   ELBA_SPICS_SET(cs, enable));
+}
+
+static void dw_spi_elba_set_cs(struct spi_device *spi, bool enable)
+{
+	struct dw_spi *dws = spi_master_get_devdata(spi->master);
+	struct dw_spi_mmio *dwsmmio = container_of(dws, struct dw_spi_mmio, dws);
+	struct regmap *syscon = dwsmmio->priv;
+	u8 cs;
+
+	cs = spi->chip_select;
+	if (cs < 2)
+		dw_spi_elba_override_cs(syscon, spi->chip_select, enable);
+
+	/*
+	 * The DW SPI controller needs a native CS bit selected to start
+	 * the serial engine.
+	 */
+	spi->chip_select = 0;
+	dw_spi_set_cs(spi, enable);
+	spi->chip_select = cs;
+}
+
+static int dw_spi_elba_init(struct platform_device *pdev,
+			    struct dw_spi_mmio *dwsmmio)
+{
+	const char *syscon_name = "amd,pensando-elba-syscon";
Quoted 4 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 284

Quoted 1 line
drivers/spi/spi-dw-mmio.c +1 -0
+	struct device_node *np = pdev->dev.of_node;

Drop this since it's used only once below.

Removed

Quoted 1 line

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 285

Quoted 1 line
drivers/spi/spi-dw-mmio.c +1 -0
+	struct device_node *node;                                         

Renamed *node to *np

Quoted 8 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev,

Quoted 3 lines
drivers/spi/spi-dw-mmio.c +2 -1
+	struct regmap *syscon;                                            
+                                                                       
-	node = of_parse_phandle(np, syscon_name, 0);                      
	node = of_parse_phandle(dev_of_node(pdev->dev), syscon_name, 0);
drivers/spi/spi-dw-mmio.c +1 -0
+	if (!node)
Quoted 4 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 291

Quoted 2 lines
drivers/spi/spi-dw-mmio.c +2 -0
+		return dev_err_probe(&pdev->dev, -ENODEV, "failed to find %s\n",
+				     syscon_name);

Hm, using dev_err_probe() with known error value seems overkill.

Changed to: return -ENODEV

Quoted 8 lines

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 296

Quoted 6 lines
drivers/spi/spi-dw-mmio.c +5 -0
+
 
+	syscon = syscon_node_to_regmap(node);
+	if (IS_ERR(syscon))
+		return dev_err_probe(&pdev->dev, PTR_ERR(syscon),
+				     "syscon regmap lookup failed\n");

of_node_put() is missing in the error and success paths.

Result of the above changes are:

drivers/spi/spi-dw-mmio.c +4 -0
+       const char *syscon_name = "amd,pensando-elba-syscon";
+       struct device_node *np;
+       struct regmap *syscon;
+

drivers/spi/spi-dw-mmio.c static int dw_spi_canaan_k210_init(struct platform_device *pdev, · line 296

Quoted 10 lines
drivers/spi/spi-dw-mmio.c +9 -0
 
+       np = of_parse_phandle(pdev->dev.of_node, syscon_name, 0);
+       if (!np)
+               return -ENODEV;
+
+       syscon = syscon_node_to_regmap(np);
+       of_node_put(np);
+       if (IS_ERR(syscon))
+               return dev_err_probe(&pdev->dev, PTR_ERR(syscon),
+                                    "syscon regmap lookup failed\n");

As Andy correctly noted this can be fully converted to just a single call:
syscon_regmap_lookup_by_phandle().

and replace pdev->dev.of_node with dev_of_node(pdev->dev).

-Serge(y)

Quoted 3 lines

Regards,
Brad

author maintainer
#28 lore raw

PATCH v10 11/15 mmc: sdhci-cadence: Enable device specific override of writel()

In reply to Brad Larson

SoCs with device specific Cadence implementation, such as setting byte-enables before the write, need to override writel(). Add a callback where the default is writel() for all existing chips.

---

v10 changes:
- The 1st patch adding private writel() is unchanged. The 2nd patch is split into two patches to provide for device specific init in one patch with no effect on existing designs. Then add the pensando support into the next patch. Then the 4th patch is mmc hardware reset support which is unchanged.

v9 changes:
- No change to this patch but as some patches are deleted and this is a respin the three successive patches to sdhci-cadence.c are patches 12, 13, and 14 which do the following:

1. Add ability for Cadence specific design to have priv writel().
2. Add Elba SoC support that requires its own priv writel() for byte-lane control .
3. Add support for mmc hardware reset.

---
 drivers/mmc/host/sdhci-cadence.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/mmc/host/sdhci-cadence.c +13 -5
index 6f2de54a5987..708d4297f241 100644
@@ -67,6 +67,7 @@ struct sdhci_cdns_phy_param {
 struct sdhci_cdns_priv {
 	void __iomem *hrs_addr;
 	bool enhanced_strobe;
+	void (*priv_writel)(struct sdhci_cdns_priv *priv, u32 val, void __iomem *reg);
 	unsigned int nr_phy_params;
 	struct sdhci_cdns_phy_param phy_params[];
 };
@@ -90,6 +91,12 @@ static const struct sdhci_cdns_phy_cfg sdhci_cdns_phy_cfgs[] = {
 	{ "cdns,phy-dll-delay-strobe", SDHCI_CDNS_PHY_DLY_STROBE, },
 };
 
+static inline void cdns_writel(struct sdhci_cdns_priv *priv, u32 val,
+			       void __iomem *reg)
+{
+	writel(val, reg);
+}
+
 static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv,
 				    u8 addr, u8 data)
 {
@@ -104,17 +111,17 @@ static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv,
 
 	tmp = FIELD_PREP(SDHCI_CDNS_HRS04_WDATA, data) |
 	      FIELD_PREP(SDHCI_CDNS_HRS04_ADDR, addr);
-	writel(tmp, reg);
+	priv->priv_writel(priv, tmp, reg);
 
 	tmp |= SDHCI_CDNS_HRS04_WR;
-	writel(tmp, reg);
+	priv->priv_writel(priv, tmp, reg);
 
 	ret = readl_poll_timeout(reg, tmp, tmp & SDHCI_CDNS_HRS04_ACK, 0, 10);
 	if (ret)
 		return ret;
 
 	tmp &= ~SDHCI_CDNS_HRS04_WR;
-	writel(tmp, reg);
+	priv->priv_writel(priv, tmp, reg);
 
 	ret = readl_poll_timeout(reg, tmp, !(tmp & SDHCI_CDNS_HRS04_ACK),
 				 0, 10);
@@ -191,7 +198,7 @@ static void sdhci_cdns_set_emmc_mode(struct sdhci_cdns_priv *priv, u32 mode)
 	tmp = readl(priv->hrs_addr + SDHCI_CDNS_HRS06);
 	tmp &= ~SDHCI_CDNS_HRS06_MODE;
 	tmp |= FIELD_PREP(SDHCI_CDNS_HRS06_MODE, mode);
-	writel(tmp, priv->hrs_addr + SDHCI_CDNS_HRS06);
+	priv->priv_writel(priv, tmp, priv->hrs_addr + SDHCI_CDNS_HRS06);
 }
 
 static u32 sdhci_cdns_get_emmc_mode(struct sdhci_cdns_priv *priv)
@@ -223,7 +230,7 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val)
 	 */
 	for (i = 0; i < 2; i++) {
 		tmp |= SDHCI_CDNS_HRS06_TUNE_UP;
-		writel(tmp, reg);
+		priv->priv_writel(priv, tmp, reg);
 
 		ret = readl_poll_timeout(reg, tmp,
 					 !(tmp & SDHCI_CDNS_HRS06_TUNE_UP),
@@ -386,6 +393,7 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
 	priv->nr_phy_params = nr_phy_params;
 	priv->hrs_addr = host->ioaddr;
 	priv->enhanced_strobe = false;
+	priv->priv_writel = cdns_writel;
 	host->ioaddr += SDHCI_CDNS_SRS_BASE;
 	host->mmc_host_ops.hs400_enhanced_strobe =
 				sdhci_cdns_hs400_enhanced_strobe;
Signature · 1 line
2.17.1
maintainer Acked-by on v10 11/15
#29 lore raw

Re: [PATCH v10 11/15] mmc: sdhci-cadence: Enable device specific override of writel()

Quoted 5 lines · Brad Larson

SoCs with device specific Cadence implementation, such as setting byte-enables before the write, need to override writel(). Add a callback where the default is writel() for all existing chips.

Quoted 94 lines

---

v10 changes:
- The 1st patch adding private writel() is unchanged. The 2nd patch is split into two patches to provide for device specific init in one patch with no effect on existing designs. Then add the pensando support into the next patch. Then the 4th patch is mmc hardware reset support which is unchanged.

v9 changes:
- No change to this patch but as some patches are deleted and this is a respin the three successive patches to sdhci-cadence.c are patches 12, 13, and 14 which do the following:

1. Add ability for Cadence specific design to have priv writel().
2. Add Elba SoC support that requires its own priv writel() for byte-lane control .
3. Add support for mmc hardware reset.

---
 drivers/mmc/host/sdhci-cadence.c | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)
drivers/mmc/host/sdhci-cadence.c +13 -5
index 6f2de54a5987..708d4297f241 100644
@@ -67,6 +67,7 @@ struct sdhci_cdns_phy_param {
 struct sdhci_cdns_priv {
 	void __iomem *hrs_addr;
 	bool enhanced_strobe;
+	void (*priv_writel)(struct sdhci_cdns_priv *priv, u32 val, void __iomem *reg);
 	unsigned int nr_phy_params;
 	struct sdhci_cdns_phy_param phy_params[];
 };
@@ -90,6 +91,12 @@ static const struct sdhci_cdns_phy_cfg sdhci_cdns_phy_cfgs[] = {
 	{ "cdns,phy-dll-delay-strobe", SDHCI_CDNS_PHY_DLY_STROBE, },
 };
 
+static inline void cdns_writel(struct sdhci_cdns_priv *priv, u32 val,
+			       void __iomem *reg)
+{
+	writel(val, reg);
+}
+
 static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv,
 				    u8 addr, u8 data)
 {
@@ -104,17 +111,17 @@ static int sdhci_cdns_write_phy_reg(struct sdhci_cdns_priv *priv,
 
 	tmp = FIELD_PREP(SDHCI_CDNS_HRS04_WDATA, data) |
 	      FIELD_PREP(SDHCI_CDNS_HRS04_ADDR, addr);
-	writel(tmp, reg);
+	priv->priv_writel(priv, tmp, reg);
 
 	tmp |= SDHCI_CDNS_HRS04_WR;
-	writel(tmp, reg);
+	priv->priv_writel(priv, tmp, reg);
 
 	ret = readl_poll_timeout(reg, tmp, tmp & SDHCI_CDNS_HRS04_ACK, 0, 10);
 	if (ret)
 		return ret;
 
 	tmp &= ~SDHCI_CDNS_HRS04_WR;
-	writel(tmp, reg);
+	priv->priv_writel(priv, tmp, reg);
 
 	ret = readl_poll_timeout(reg, tmp, !(tmp & SDHCI_CDNS_HRS04_ACK),
 				 0, 10);
@@ -191,7 +198,7 @@ static void sdhci_cdns_set_emmc_mode(struct sdhci_cdns_priv *priv, u32 mode)
 	tmp = readl(priv->hrs_addr + SDHCI_CDNS_HRS06);
 	tmp &= ~SDHCI_CDNS_HRS06_MODE;
 	tmp |= FIELD_PREP(SDHCI_CDNS_HRS06_MODE, mode);
-	writel(tmp, priv->hrs_addr + SDHCI_CDNS_HRS06);
+	priv->priv_writel(priv, tmp, priv->hrs_addr + SDHCI_CDNS_HRS06);
 }
 
 static u32 sdhci_cdns_get_emmc_mode(struct sdhci_cdns_priv *priv)
@@ -223,7 +230,7 @@ static int sdhci_cdns_set_tune_val(struct sdhci_host *host, unsigned int val)
 	 */
 	for (i = 0; i < 2; i++) {
 		tmp |= SDHCI_CDNS_HRS06_TUNE_UP;
-		writel(tmp, reg);
+		priv->priv_writel(priv, tmp, reg);
 
 		ret = readl_poll_timeout(reg, tmp,
 					 !(tmp & SDHCI_CDNS_HRS06_TUNE_UP),
@@ -386,6 +393,7 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
 	priv->nr_phy_params = nr_phy_params;
 	priv->hrs_addr = host->ioaddr;
 	priv->enhanced_strobe = false;
+	priv->priv_writel = cdns_writel;
 	host->ioaddr += SDHCI_CDNS_SRS_BASE;
 	host->mmc_host_ops.hs400_enhanced_strobe =
 				sdhci_cdns_hs400_enhanced_strobe;
author maintainer
#30 lore raw

PATCH v10 12/15 mmc: sdhci-cadence: Support device specific init during probe

In reply to Brad Larson

Move struct sdhci_pltfm_data under new struct sdhci_cdns_drv_data. Add an init() into sdhci_cdns_drv_data for platform specific device initialization in the device probe which is not used for existing devices.

---

v10 changes:
- New patch to provide for platform specific init() with no change to existing designs.

---
 drivers/mmc/host/sdhci-cadence.c | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)
drivers/mmc/host/sdhci-cadence.c +23 -9
index 708d4297f241..c528a25f48b8 100644
@@ -77,6 +77,11 @@ struct sdhci_cdns_phy_cfg {
 	u8 addr;
 };
 
+struct sdhci_cdns_drv_data {
+	int (*init)(struct platform_device *pdev);
+	const struct sdhci_pltfm_data pltfm_data;
+};
+
 static const struct sdhci_cdns_phy_cfg sdhci_cdns_phy_cfgs[] = {
 	{ "cdns,phy-input-delay-sd-highspeed", SDHCI_CDNS_PHY_DLY_SD_HS, },
 	{ "cdns,phy-input-delay-legacy", SDHCI_CDNS_PHY_DLY_SD_DEFAULT, },
@@ -325,13 +330,17 @@ static const struct sdhci_ops sdhci_cdns_ops = {
 	.set_uhs_signaling = sdhci_cdns_set_uhs_signaling,
 };
 
-static const struct sdhci_pltfm_data sdhci_cdns_uniphier_pltfm_data = {
-	.ops = &sdhci_cdns_ops,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+static const struct sdhci_cdns_drv_data sdhci_cdns_uniphier_drv_data = {
+	.pltfm_data = {
+		.ops = &sdhci_cdns_ops,
+		.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	},
 };
 
-static const struct sdhci_pltfm_data sdhci_cdns_pltfm_data = {
-	.ops = &sdhci_cdns_ops,
+static const struct sdhci_cdns_drv_data sdhci_cdns_drv_data = {
+	.pltfm_data = {
+		.ops = &sdhci_cdns_ops,
+	},
 };
 
 static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc,
@@ -357,7 +366,7 @@ static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc,
 static int sdhci_cdns_probe(struct platform_device *pdev)
 {
 	struct sdhci_host *host;
-	const struct sdhci_pltfm_data *data;
+	const struct sdhci_cdns_drv_data *data;
 	struct sdhci_pltfm_host *pltfm_host;
 	struct sdhci_cdns_priv *priv;
 	struct clk *clk;
@@ -376,10 +385,10 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
 
 	data = of_device_get_match_data(dev);
 	if (!data)
-		data = &sdhci_cdns_pltfm_data;
+		data = &sdhci_cdns_drv_data;
 
 	nr_phy_params = sdhci_cdns_phy_param_count(dev->of_node);
-	host = sdhci_pltfm_init(pdev, data,
+	host = sdhci_pltfm_init(pdev, &data->pltfm_data,
 				struct_size(priv, phy_params, nr_phy_params));
 	if (IS_ERR(host)) {
 		ret = PTR_ERR(host);
@@ -397,6 +406,11 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
 	host->ioaddr += SDHCI_CDNS_SRS_BASE;
 	host->mmc_host_ops.hs400_enhanced_strobe =
 				sdhci_cdns_hs400_enhanced_strobe;
+	if (data->init) {
+		ret = data->init(pdev);
+		if (ret)
+			goto free;
+	}
 	sdhci_enable_v4_mode(host);
 	__sdhci_read_caps(host, &version, NULL, NULL);
 
@@ -461,7 +475,7 @@ static const struct dev_pm_ops sdhci_cdns_pm_ops = {
 static const struct of_device_id sdhci_cdns_match[] = {
 	{
 		.compatible = "socionext,uniphier-sd4hc",
-		.data = &sdhci_cdns_uniphier_pltfm_data,
+		.data = &sdhci_cdns_uniphier_drv_data,
 	},
 	{ .compatible = "cdns,sd4hc" },
 	{ /* sentinel */ }
Signature · 1 line
2.17.1
maintainer Acked-by on v10 12/15
#31 lore raw

Re: [PATCH v10 12/15] mmc: sdhci-cadence: Support device specific init during probe

Quoted 5 lines · Brad Larson

Move struct sdhci_pltfm_data under new struct sdhci_cdns_drv_data. Add an init() into sdhci_cdns_drv_data for platform specific device initialization in the device probe which is not used for existing devices.

Quoted 92 lines

---

v10 changes:
- New patch to provide for platform specific init() with no change to existing designs.

---
 drivers/mmc/host/sdhci-cadence.c | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)
drivers/mmc/host/sdhci-cadence.c +23 -9
index 708d4297f241..c528a25f48b8 100644
@@ -77,6 +77,11 @@ struct sdhci_cdns_phy_cfg {
 	u8 addr;
 };
 
+struct sdhci_cdns_drv_data {
+	int (*init)(struct platform_device *pdev);
+	const struct sdhci_pltfm_data pltfm_data;
+};
+
 static const struct sdhci_cdns_phy_cfg sdhci_cdns_phy_cfgs[] = {
 	{ "cdns,phy-input-delay-sd-highspeed", SDHCI_CDNS_PHY_DLY_SD_HS, },
 	{ "cdns,phy-input-delay-legacy", SDHCI_CDNS_PHY_DLY_SD_DEFAULT, },
@@ -325,13 +330,17 @@ static const struct sdhci_ops sdhci_cdns_ops = {
 	.set_uhs_signaling = sdhci_cdns_set_uhs_signaling,
 };
 
-static const struct sdhci_pltfm_data sdhci_cdns_uniphier_pltfm_data = {
-	.ops = &sdhci_cdns_ops,
-	.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+static const struct sdhci_cdns_drv_data sdhci_cdns_uniphier_drv_data = {
+	.pltfm_data = {
+		.ops = &sdhci_cdns_ops,
+		.quirks2 = SDHCI_QUIRK2_PRESET_VALUE_BROKEN,
+	},
 };
 
-static const struct sdhci_pltfm_data sdhci_cdns_pltfm_data = {
-	.ops = &sdhci_cdns_ops,
+static const struct sdhci_cdns_drv_data sdhci_cdns_drv_data = {
+	.pltfm_data = {
+		.ops = &sdhci_cdns_ops,
+	},
 };
 
 static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc,
@@ -357,7 +366,7 @@ static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc,
 static int sdhci_cdns_probe(struct platform_device *pdev)
 {
 	struct sdhci_host *host;
-	const struct sdhci_pltfm_data *data;
+	const struct sdhci_cdns_drv_data *data;
 	struct sdhci_pltfm_host *pltfm_host;
 	struct sdhci_cdns_priv *priv;
 	struct clk *clk;
@@ -376,10 +385,10 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
 
 	data = of_device_get_match_data(dev);
 	if (!data)
-		data = &sdhci_cdns_pltfm_data;
+		data = &sdhci_cdns_drv_data;
 
 	nr_phy_params = sdhci_cdns_phy_param_count(dev->of_node);
-	host = sdhci_pltfm_init(pdev, data,
+	host = sdhci_pltfm_init(pdev, &data->pltfm_data,
 				struct_size(priv, phy_params, nr_phy_params));
 	if (IS_ERR(host)) {
 		ret = PTR_ERR(host);
@@ -397,6 +406,11 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
 	host->ioaddr += SDHCI_CDNS_SRS_BASE;
 	host->mmc_host_ops.hs400_enhanced_strobe =
 				sdhci_cdns_hs400_enhanced_strobe;
+	if (data->init) {
+		ret = data->init(pdev);
+		if (ret)
+			goto free;
+	}
 	sdhci_enable_v4_mode(host);
 	__sdhci_read_caps(host, &version, NULL, NULL);
 
@@ -461,7 +475,7 @@ static const struct dev_pm_ops sdhci_cdns_pm_ops = {
 static const struct of_device_id sdhci_cdns_match[] = {
 	{
 		.compatible = "socionext,uniphier-sd4hc",
-		.data = &sdhci_cdns_uniphier_pltfm_data,
+		.data = &sdhci_cdns_uniphier_drv_data,
 	},
 	{ .compatible = "cdns,sd4hc" },
 	{ /* sentinel */ }
author maintainer
#32 lore raw

PATCH v10 13/15 mmc: sdhci-cadence: Add AMD Pensando Elba SoC support

In reply to Brad Larson

Add support for AMD Pensando Elba SoC which explicitly controls byte-lane enables on writes.

Select MMC_SDHCI_IO_ACCESSORS for MMC_SDHCI_CADENCE which allows Elba SoC sdhci_elba_ops to overwrite the SDHCI IO memory accessors.

---

v10 changes:
- Add Elba specific support into this 3rd patch. This builds on the private writel() enabled in patch 1 followed by platform specific init() in patch 2.
- Specify when first used the reason for the spinlock use to order byte-enable prior to write data.

---
 drivers/mmc/host/Kconfig         |   1 +
 drivers/mmc/host/sdhci-cadence.c | 101 +++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)
drivers/mmc/host/Kconfig +1 -0
index 4745fe217ade..9f793892123c 100644
@@ -255,6 +255,7 @@ config MMC_SDHCI_CADENCE
 	tristate "SDHCI support for the Cadence SD/SDIO/eMMC controller"
 	depends on MMC_SDHCI_PLTFM
 	depends on OF
+	select MMC_SDHCI_IO_ACCESSORS
 	help
 	  This selects the Cadence SD/SDIO/eMMC driver.
 
drivers/mmc/host/sdhci-cadence.c +101 -0

125 lines not on this page · raw message

Signature · 1 line
2.17.1
maintainer Acked-by on v10 13/15
#33 lore raw

Re: [PATCH v10 13/15] mmc: sdhci-cadence: Add AMD Pensando Elba SoC support

Quoted 8 lines · Brad Larson

Add support for AMD Pensando Elba SoC which explicitly controls byte-lane enables on writes.

Select MMC_SDHCI_IO_ACCESSORS for MMC_SDHCI_CADENCE which allows Elba SoC sdhci_elba_ops to overwrite the SDHCI IO memory accessors.

Minor comments below. Fix those and you can add:

Quoted 102 lines

---

v10 changes:
- Add Elba specific support into this 3rd patch. This builds on the private writel() enabled in patch 1 followed by platform specific init() in patch 2.
- Specify when first used the reason for the spinlock use to order byte-enable prior to write data.

---
 drivers/mmc/host/Kconfig         |   1 +
 drivers/mmc/host/sdhci-cadence.c | 101 +++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+)
drivers/mmc/host/Kconfig +1 -0
index 4745fe217ade..9f793892123c 100644
@@ -255,6 +255,7 @@ config MMC_SDHCI_CADENCE
 	tristate "SDHCI support for the Cadence SD/SDIO/eMMC controller"
 	depends on MMC_SDHCI_PLTFM
 	depends on OF
+	select MMC_SDHCI_IO_ACCESSORS
 	help
 	  This selects the Cadence SD/SDIO/eMMC driver.
 
drivers/mmc/host/sdhci-cadence.c +62 -0
index c528a25f48b8..31c77d32aa7d 100644
@@ -66,6 +66,8 @@ struct sdhci_cdns_phy_param {
 
 struct sdhci_cdns_priv {
 	void __iomem *hrs_addr;
+	void __iomem *ctl_addr;	/* write control */
+	spinlock_t wrlock;	/* write lock */
 	bool enhanced_strobe;
 	void (*priv_writel)(struct sdhci_cdns_priv *priv, u32 val, void __iomem *reg);
 	unsigned int nr_phy_params;
@@ -321,6 +323,94 @@ static void sdhci_cdns_set_uhs_signaling(struct sdhci_host *host,
 		sdhci_set_uhs_signaling(host, timing);
 }
 
+/* Elba control register bits [6:3] are byte-lane enables */
+#define ELBA_BYTE_ENABLE_MASK(x)	((x) << 3)
+
+/*
+ * The Pensando Elba SoC explicitly controls byte-lane enabling on writes
+ * which includes writes to the HRS registers.  The write lock (wrlock)
+ * is used to ensure byte-lane enable, using write control (ctl_addr),
+ * occurs before the data write.
+ */
+static void elba_priv_writel(struct sdhci_cdns_priv *priv, u32 val,
+			     void __iomem *reg)
+{
+	unsigned long flags;
+
+	spin_lock_irqsave(&priv->wrlock, flags);
+	writel(ELBA_BYTE_ENABLE_MASK(0xf), priv->ctl_addr);
+	writel(val, reg);
+	spin_unlock_irqrestore(&priv->wrlock, flags);
+}
+
+static void elba_write_l(struct sdhci_host *host, u32 val, int reg)
+{
+	elba_priv_writel(sdhci_cdns_priv(host), val, host->ioaddr + reg);
+}
+
+static void elba_write_w(struct sdhci_host *host, u16 val, int reg)
+{
+	struct sdhci_cdns_priv *priv = sdhci_cdns_priv(host);
+	u32 byte_enables;
+	unsigned long flags;
+
+	byte_enables = GENMASK(1, 0) << (reg & 0x3);
+	spin_lock_irqsave(&priv->wrlock, flags);
+	writel(ELBA_BYTE_ENABLE_MASK(byte_enables), priv->ctl_addr);
+	writew(val, host->ioaddr + reg);
+	spin_unlock_irqrestore(&priv->wrlock, flags);
+}
+
+static void elba_write_b(struct sdhci_host *host, u8 val, int reg)
+{
+	struct sdhci_cdns_priv *priv = sdhci_cdns_priv(host);
+	u32 byte_enables;
+	unsigned long flags;
+
+	byte_enables = BIT(0) << (reg & 0x3);
+	spin_lock_irqsave(&priv->wrlock, flags);
+	writel(ELBA_BYTE_ENABLE_MASK(byte_enables), priv->ctl_addr);
+	writeb(val, host->ioaddr + reg);
+	spin_unlock_irqrestore(&priv->wrlock, flags);
+}
+
+static const struct sdhci_ops sdhci_elba_ops = {
+	.write_l = elba_write_l,
+	.write_w = elba_write_w,
+	.write_b = elba_write_b,
+	.set_clock = sdhci_set_clock,
+	.get_timeout_clock = sdhci_cdns_get_timeout_clock,
+	.set_bus_width = sdhci_set_bus_width,
+	.reset = sdhci_reset,
+	.set_uhs_signaling = sdhci_cdns_set_uhs_signaling,

drivers/mmc/host/sdhci-cadence.c static void sdhci_cdns_set_uhs_signaling(struct sdhci_host *host, · line 395

Quoted 10 lines
drivers/mmc/host/sdhci-cadence.c +10 -0
+};
+
+static int elba_drv_init(struct platform_device *pdev)
+{
+	struct sdhci_host *host = platform_get_drvdata(pdev);
+	struct sdhci_cdns_priv *priv = sdhci_cdns_priv(host);
+	struct resource *iomem;
+	void __iomem *ioaddr;
+
+	host->mmc->caps |= (MMC_CAP_1_8V_DDR | MMC_CAP_8_BIT_DATA);

Unnecessary parentheses

drivers/mmc/host/sdhci-cadence.c static void sdhci_cdns_set_uhs_signaling(struct sdhci_host *host, · line 397

Quoted 2 lines
drivers/mmc/host/sdhci-cadence.c +2 -0
+
+	iomem = platform_get_resource(pdev, IORESOURCE_MEM, 1);

Looks like devm_platform_ioremap_resource() does that also and will return an error if need be, so platform_get_resource() is not needed here.

drivers/mmc/host/sdhci-cadence.c static void sdhci_cdns_set_uhs_signaling(struct sdhci_host *host, · line 408

Quoted 11 lines
drivers/mmc/host/sdhci-cadence.c +11 -0
+	if (!iomem)
+		return -ENOMEM;
+
+	/* Byte-lane control register */
+	ioaddr = devm_platform_ioremap_resource(pdev, 1);
+	if (IS_ERR(ioaddr))
+		return PTR_ERR(ioaddr);
+
+	priv->ctl_addr = ioaddr;
+	priv->priv_writel = elba_priv_writel;
+	spin_lock_init(&priv->wrlock);

Please move the spin_lock_init() so it happens always.

Quoted 33 lines
drivers/mmc/host/sdhci-cadence.c +16 -0
+	writel(ELBA_BYTE_ENABLE_MASK(0xf), priv->ctl_addr);
+
+	return 0;
+}
+
 static const struct sdhci_ops sdhci_cdns_ops = {
 	.set_clock = sdhci_set_clock,
 	.get_timeout_clock = sdhci_cdns_get_timeout_clock,
@@ -337,6 +427,13 @@ static const struct sdhci_cdns_drv_data sdhci_cdns_uniphier_drv_data = {
 	},
 };
 
+static const struct sdhci_cdns_drv_data sdhci_elba_drv_data = {
+	.init = elba_drv_init,
+	.pltfm_data = {
+		.ops = &sdhci_elba_ops,
+	},
+};
+
 static const struct sdhci_cdns_drv_data sdhci_cdns_drv_data = {
 	.pltfm_data = {
 		.ops = &sdhci_cdns_ops,
@@ -477,6 +574,10 @@ static const struct of_device_id sdhci_cdns_match[] = {
 		.compatible = "socionext,uniphier-sd4hc",
 		.data = &sdhci_cdns_uniphier_drv_data,
 	},
+	{
+		.compatible = "amd,pensando-elba-sd4hc",
+		.data = &sdhci_elba_drv_data,
+	},
 	{ .compatible = "cdns,sd4hc" },
 	{ /* sentinel */ }
 };
author maintainer
#34 lore raw

PATCH v10 14/15 mmc: sdhci-cadence: Support mmc hardware reset

In reply to Brad Larson

Add support for mmc hardware reset using a reset-controller that would need to be enabled in the device tree with a supporting driver. The default is disabled for all existing designs.

---

v9 changes:
- Previously patch 17/17
- Changed delay after reset_control_assert() from 9 to 3 usec
- Renamed sdhci_mmc_hw_reset() to sdhci_cdns_mmc_hw_reset()

---
 drivers/mmc/host/sdhci-cadence.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
drivers/mmc/host/sdhci-cadence.c +27 -0
index 31c77d32aa7d..d13081da5e30 100644
@@ -12,6 +12,7 @@
 #include <linux/mmc/mmc.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/reset.h>
 
 #include "sdhci-pltfm.h"
 
@@ -70,6 +71,7 @@ struct sdhci_cdns_priv {
 	spinlock_t wrlock;	/* write lock */
 	bool enhanced_strobe;
 	void (*priv_writel)(struct sdhci_cdns_priv *priv, u32 val, void __iomem *reg);
+	struct reset_control *rst_hw;
 	unsigned int nr_phy_params;
 	struct sdhci_cdns_phy_param phy_params[];
 };
@@ -460,6 +462,22 @@ static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc,
 					 SDHCI_CDNS_HRS06_MODE_MMC_HS400);
 }
 
+static void sdhci_cdns_mmc_hw_reset(struct mmc_host *mmc)
+{
+	struct sdhci_host *host = mmc_priv(mmc);
+	struct sdhci_cdns_priv *priv = sdhci_cdns_priv(host);
+
+	dev_dbg(mmc_dev(host->mmc), "emmc hardware reset\n");
+
+	reset_control_assert(priv->rst_hw);
+	/* For eMMC, minimum is 1us but give it 3us for good measure */
+	udelay(3);
+
+	reset_control_deassert(priv->rst_hw);
+	/* For eMMC, minimum is 200us but give it 300us for good measure */
+	usleep_range(300, 1000);
+}
+
 static int sdhci_cdns_probe(struct platform_device *pdev)
 {
 	struct sdhci_host *host;
@@ -523,6 +541,15 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
 	if (ret)
 		goto free;
 
+	if (host->mmc->caps & MMC_CAP_HW_RESET) {
+		priv->rst_hw = devm_reset_control_get_optional_exclusive(dev, "hw");
+		if (IS_ERR(priv->rst_hw))
+			return dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
+					     "reset controller error\n");
+		if (priv->rst_hw)
+			host->mmc_host_ops.card_hw_reset = sdhci_cdns_mmc_hw_reset;
+	}
+
 	ret = sdhci_add_host(host);
 	if (ret)
 		goto free;
Signature · 1 line
2.17.1
maintainer Acked-by on v10 14/15
#35 lore raw

Re: [PATCH v10 14/15] mmc: sdhci-cadence: Support mmc hardware reset

Quoted 6 lines · Brad Larson

Add support for mmc hardware reset using a reset-controller that would need to be enabled in the device tree with a supporting driver. The default is disabled for all existing designs.

Quoted 70 lines

---

v9 changes:
- Previously patch 17/17
- Changed delay after reset_control_assert() from 9 to 3 usec
- Renamed sdhci_mmc_hw_reset() to sdhci_cdns_mmc_hw_reset()

---
 drivers/mmc/host/sdhci-cadence.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
drivers/mmc/host/sdhci-cadence.c +27 -0
index 31c77d32aa7d..d13081da5e30 100644
@@ -12,6 +12,7 @@
 #include <linux/mmc/mmc.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
+#include <linux/reset.h>
 
 #include "sdhci-pltfm.h"
 
@@ -70,6 +71,7 @@ struct sdhci_cdns_priv {
 	spinlock_t wrlock;	/* write lock */
 	bool enhanced_strobe;
 	void (*priv_writel)(struct sdhci_cdns_priv *priv, u32 val, void __iomem *reg);
+	struct reset_control *rst_hw;
 	unsigned int nr_phy_params;
 	struct sdhci_cdns_phy_param phy_params[];
 };
@@ -460,6 +462,22 @@ static void sdhci_cdns_hs400_enhanced_strobe(struct mmc_host *mmc,
 					 SDHCI_CDNS_HRS06_MODE_MMC_HS400);
 }
 
+static void sdhci_cdns_mmc_hw_reset(struct mmc_host *mmc)
+{
+	struct sdhci_host *host = mmc_priv(mmc);
+	struct sdhci_cdns_priv *priv = sdhci_cdns_priv(host);
+
+	dev_dbg(mmc_dev(host->mmc), "emmc hardware reset\n");
+
+	reset_control_assert(priv->rst_hw);
+	/* For eMMC, minimum is 1us but give it 3us for good measure */
+	udelay(3);
+
+	reset_control_deassert(priv->rst_hw);
+	/* For eMMC, minimum is 200us but give it 300us for good measure */
+	usleep_range(300, 1000);
+}
+
 static int sdhci_cdns_probe(struct platform_device *pdev)
 {
 	struct sdhci_host *host;
@@ -523,6 +541,15 @@ static int sdhci_cdns_probe(struct platform_device *pdev)
 	if (ret)
 		goto free;
 
+	if (host->mmc->caps & MMC_CAP_HW_RESET) {
+		priv->rst_hw = devm_reset_control_get_optional_exclusive(dev, "hw");
+		if (IS_ERR(priv->rst_hw))
+			return dev_err_probe(mmc_dev(host->mmc), PTR_ERR(priv->rst_hw),
+					     "reset controller error\n");
+		if (priv->rst_hw)
+			host->mmc_host_ops.card_hw_reset = sdhci_cdns_mmc_hw_reset;
+	}
+
 	ret = sdhci_add_host(host);
 	if (ret)
 		goto free;
author maintainer
#36 lore raw

PATCH v10 15/15 soc: amd: Add support for AMD Pensando SoC Controller

In reply to Brad Larson

The Pensando SoC controller is a SPI connected companion device that is present in all Pensando SoC board designs. The essential board management registers are accessed on chip select 0 with board mgmt IO support accessed using additional chip selects.

---

v10 changes:
- Different driver implementation specific to this Pensando controller device.
- Moved to soc/amd directory under new name based on guidance. This driver is of no use to any design other than all Pensando SoC based cards.
- Removed use of builtin_driver, can be built as a module.

v9 changes:
- Previously patch 14/17
- After the change to the device tree node and squashing reset-cells into the parent simplified this to not use any MFD API and move it to drivers/spi/pensando-sr.c.
- Change the naming to remove elba since this driver is common for all Pensando SoC designs .
- Default yes SPI_PENSANDO_SR for ARCH_PENSANDO

---
 drivers/soc/Kconfig                    |   1 +
 drivers/soc/Makefile                   |   1 +
 drivers/soc/amd/Kconfig                |  16 ++
 drivers/soc/amd/Makefile               |   2 +
 drivers/soc/amd/amd-pensando-ctrl.c    | 378 +++++++++++++++++++++++++
 include/uapi/linux/amd-pensando-ctrl.h |  30 ++
 6 files changed, 428 insertions(+)
 create mode 100644 drivers/soc/amd/Kconfig
 create mode 100644 drivers/soc/amd/Makefile
 create mode 100644 drivers/soc/amd/amd-pensando-ctrl.c
 create mode 100644 include/uapi/linux/amd-pensando-ctrl.h
drivers/soc/Kconfig +1 -0
index 4e176280113a..9e023f74e47c 100644
@@ -2,6 +2,7 @@
 menu "SOC (System On Chip) specific Drivers"
 
 source "drivers/soc/actions/Kconfig"
+source "drivers/soc/amd/Kconfig"
 source "drivers/soc/amlogic/Kconfig"
 source "drivers/soc/apple/Kconfig"
 source "drivers/soc/aspeed/Kconfig"
drivers/soc/Makefile +1 -0
index 3b0f9fb3b5c8..8914530f2721 100644
@@ -4,6 +4,7 @@
 #
 
 obj-$(CONFIG_ARCH_ACTIONS)	+= actions/
+obj-y				+= amd/
 obj-y				+= apple/
 obj-y				+= aspeed/
 obj-$(CONFIG_ARCH_AT91)		+= atmel/
drivers/soc/amd/Kconfig new file +16 -0
new file mode 100644
index 000000000000..9fc03de49f11
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+menu "AMD Pensando SoC drivers"
+
+config AMD_PENSANDO_CTRL
+	tristate "AMD Pensando SoC Controller"
+	depends on SPI_MASTER=y
+	depends on (ARCH_PENSANDO && OF) || COMPILE_TEST
+	default y if ARCH_PENSANDO
+	select REGMAP_SPI
+	select MFD_SYSCON
+	help
+	  Enables AMD Pensando SoC controller device support.  This is a SPI
+	  attached companion device in all Pensando SoC board designs which
+	  provides essential board control/status registers and management IO
+	  support.
+endmenu
drivers/soc/amd/Makefile new file +2 -0
new file mode 100644
index 000000000000..6505bfe71baf
@@ -0,0 +1,2 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_AMD_PENSANDO_CTRL)	+= amd-pensando-ctrl.o
drivers/soc/amd/amd-pensando-ctrl.c new file +378 -0

378 lines not on this page · raw message

include/uapi/linux/amd-pensando-ctrl.h new file +30 -0
new file mode 100644
index 000000000000..0a6caf3b764c
@@ -0,0 +1,30 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * Userspace interface for /dev/penctrl
+ *
+ * This file can be used by applications that need to communicate
+ * with the AMD Pensando SoC controller device via the ioctl interface.
+ */
+#ifndef _UAPI_LINUX_AMD_PENSANDO_CTRL_H
+#define _UAPI_LINUX_AMD_PENSANDO_CTRL_H
+
+#include <linux/types.h>
+#include <linux/ioctl.h>
+
+#define PENCTRL_SPI_CMD_REGRD	0x0b
+#define PENCTRL_SPI_CMD_REGWR	0x02
+#define PENCTRL_IOC_MAGIC	'k'
+#define PENCTRL_IOC_MAXNR	0
+#define PENCTRL_MAX_MSG_LEN	16
+#define PENCTRL_MAX_REG		0xff
+#define PENCTRL_REG_CTRL0	0x10
+
+struct penctrl_spi_xfer {
+	__u64 tx_buf;
+	__u64 rx_buf;
+	__u32 len;
+	__u32 speed_hz;
+	__u64 compat;
+};
+
+#endif /* _UAPI_LINUX_AMD_PENSANDO_CTRL_H */
Signature · 1 line
2.17.1
#37 lore raw

Re: [PATCH v10 15/15] soc: amd: Add support for AMD Pensando SoC Controller

I love your patch! Perhaps something to improve:

Hi Brad,

I love your patch! Perhaps something to improve:

[auto build test WARNING on fe15c26ee26efa11741a7b632e9f23b01aca4cc6]

url:    https://github.com/intel-lab-lkp/linux/commits/Brad-Larson/dt-bindings-arm-add-AMD-Pensando-boards/20230306-121545
base:   fe15c26ee26efa11741a7b632e9f23b01aca4cc6
patch link:    https://lore.kernel.org/r/20230306040739.51488-16-blarson%40amd.com
patch subject: [PATCH v10 15/15] soc: amd: Add support for AMD Pensando SoC Controller
config: m68k-allmodconfig (https://download.01.org/0day-ci/archive/20230306/[email protected]/config)
compiler: m68k-linux-gcc (GCC) 12.1.0

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/b4bbd78c769f6618e07ec1607fdd3d964dd13083
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Brad-Larson/dt-bindings-arm-add-AMD-Pensando-boards/20230306-121545 git checkout b4bbd78c769f6618e07ec1607fdd3d964dd13083
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=m68k SHELL=/bin/bash drivers/soc/amd/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All warnings (new ones prefixed by >>):

drivers/soc/amd/amd-pensando-ctrl.c: In function 'penctrl_ioctl':

>> drivers/soc/amd/amd-pensando-ctrl.c:97:36: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
      97 |         if (copy_from_user(tx_buf, (void __user *)msg->tx_buf, msg->len)) {
         |                                    ^
   drivers/soc/amd/amd-pensando-ctrl.c:120:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
     120 |         if (copy_to_user((void __user *)msg->rx_buf, rx_buf, msg->len))
         |                          ^

vim +97 drivers/soc/amd/amd-pensando-ctrl.c

    35	
    36	static long
    37	penctrl_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
    38	{
    39		struct spi_transfer t[2] = { 0 };
    40		struct penctrl_device *penctrl;
    41		struct penctrl_spi_xfer *msg;
    42		struct spi_device *spi_dev;
    43		unsigned int num_msgs;
    44		struct spi_message m;
    45		u8 tx_buf[PENCTRL_MAX_MSG_LEN];
    46		u8 rx_buf[PENCTRL_MAX_MSG_LEN];
    47		u32 size;
    48		int ret;
    49	
    50		/* Check for a valid command */
    51		if (_IOC_TYPE(cmd) != PENCTRL_IOC_MAGIC)
    52			return -ENOTTY;
    53	
    54		if (_IOC_NR(cmd) > PENCTRL_IOC_MAXNR)
    55			return -ENOTTY;
    56	
    57		if (_IOC_DIR(cmd) & _IOC_READ)
    58			ret = !access_ok((void __user *)arg, _IOC_SIZE(cmd));
    59		else if (_IOC_DIR(cmd) & _IOC_WRITE)
    60			ret = !access_ok((void __user *)arg, _IOC_SIZE(cmd));
    61	
    62		if (ret)
    63			return -EFAULT;
    64	
    65		/* Get a reference to the SPI device */
    66		penctrl = filp->private_data;
    67		if (!penctrl)
    68			return -ESHUTDOWN;
    69	
    70		spi_dev = spi_dev_get(penctrl->spi_dev);
    71		if (!spi_dev)
    72			return -ESHUTDOWN;
    73	
    74		/* Verify and prepare spi message */
    75		size = _IOC_SIZE(cmd);
    76		if ((size % sizeof(struct penctrl_spi_xfer)) != 0) {
    77			ret = -EINVAL;
    78			goto done;
    79		}
    80		num_msgs = size / sizeof(struct penctrl_spi_xfer);
    81		if (num_msgs == 0) {
    82			ret = -EINVAL;
    83			goto done;
    84		}
    85		msg = memdup_user((struct penctrl_spi_xfer __user *)arg, size);
    86		if (!msg) {
    87			ret = PTR_ERR(msg);
    88			goto done;
    89		}
    90		if (msg->len > PENCTRL_MAX_MSG_LEN) {
    91			ret = -EINVAL;
    92			goto done;
    93		}
    94	
    95		t[0].tx_buf = tx_buf;
    96		t[0].len = msg->len;
  > 97		if (copy_from_user(tx_buf, (void __user *)msg->tx_buf, msg->len)) {
    98			ret = -EFAULT;
    99			goto done;

100 }
101 if (num_msgs > 1) {
102 msg++;
103 if (msg->len > PENCTRL_MAX_MSG_LEN) {
104 ret = -EINVAL;
105 goto done;
106 }
107 t[1].rx_buf = rx_buf;
108 t[1].len = msg->len;
109 }
110 spi_message_init_with_transfers(&m, t, num_msgs);
111
112 /* Perform the transfer */
113 mutex_lock(&spi_lock);
114 ret = spi_sync(spi_dev, &m);
115 mutex_unlock(&spi_lock);
116
117 if (ret || (num_msgs == 1))
118 goto done;
119
120 if (copy_to_user((void __user *)msg->rx_buf, rx_buf, msg->len))
121 ret = -EFAULT;
122
123 done:
124 spi_dev_put(spi_dev);
125 return ret;
126 }
127

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests