| Message ID | 20230312004445.15913-1-blarson@amd.com |
|---|---|
| Headers | show |
| Series | Support AMD Pensando Elba SoC | expand |
On 12/03/2023 01:44, Brad Larson wrote: > Document the cadence qspi controller compatible for AMD Pensando > Elba SoC boards. The Elba qspi fifo size is 1024. > > Signed-off-by: Brad Larson <blarson@amd.com> > --- > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On 12/03/2023 01:44, Brad Larson wrote: > Support the AMD Pensando Elba 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. > > Signed-off-by: Brad Larson <blarson@amd.com> > --- > > v11 changes: > - Fixed the compatible which should have stayed as 'amd,pensando-elba-ctrl', > the commit message, and the filename > - Reference spi-peripheral-props > - Delete spi-max-frequency > - Remove num-cs from example Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
On Sat, Mar 11, 2023 at 04:44:40PM -0800, Brad Larson wrote: > 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. > > Signed-off-by: Brad Larson <blarson@amd.com> > --- > > v11 changes: > - Simplify dw_spi_elb_init by using syscon_regmap_lookup_by_phandle() > > 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 | 57 +++++++++++++++++++++++++++++++++++++++ > 1 file changed, 57 insertions(+) > > diff --git a/drivers/spi/spi-dw-mmio.c b/drivers/spi/spi-dw-mmio.c > index 26c40ea6dd12..5851ecc6e1e9 100644 > --- a/drivers/spi/spi-dw-mmio.c > +++ b/drivers/spi/spi-dw-mmio.c > @@ -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,48 @@ 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) > +{ > + struct regmap *syscon; > + > + syscon = syscon_regmap_lookup_by_phandle(dev_of_node(&pdev->dev), > + "amd,pensando-elba-syscon"); > + 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; | +-------------------------------------+ | Newline here + would be nice. Other than that looks good. Reviewed-by: Serge Semin <fancer.lancer@gmail.com> -Serge(y) > + > + return 0; > +} > + > static int dw_spi_mmio_probe(struct platform_device *pdev) > { > int (*init_func)(struct platform_device *pdev, > @@ -352,6 +408,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); > -- > 2.17.1 >
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 == V11 changes == v11-0002-dt-bindings-mmc-cdns-Add-AMD-Pensando-Elba-SoC - Remove resets description and reset-names - Add descriptions for amd,pensando-elba-sd4hc reg items v11-0003-dt-bindings-spi-cdns-Add-compatible-for-AMD-Pens - Removed redundant if/then for amd,pensando-elba-qspi v11-0005-dt-bindings-soc-amd-amd-pensando-elba-ctrl-Add-P - Fixed the compatible which should have stayed as 'amd,pensando-elba-ctrl', the commit message, and the filename. - Reference spi-peripheral-props - Delete spi-max-frequency - Remove num-cs from example v11-0008-arm64-dts-Add-AMD-Pensando-Elba-SoC-support - Delete reset-names - Fix spi0 compatible to be specific 'amd,pensando-elba-ctrl' v11-0010-spi-dw-Add-support-for-AMD-Pensando-Elba-SoC - Simplify dw_spi_elb_init by using syscon_regmap_lookup_by_phandle() v11-0013-mmc-sdhci-cadence-Add-AMD-Pensando-Elba-SoC-supp - Remove elba-drv_init() call to platform_get_resource() since that check is done inside devm_platform_ioremap_resource() - Move spin_lock_init() before error check - Remove extra parentheses v11-0015-soc-amd-Add-support-for-AMD-Pensando-SoC-Control - Fix the compatible to be specific 'amd,pensando-elba-ctrl' - Cast arguments flagged with a gcc-12.1.0 warning: Reported-by: kernel test robot <lkp@intel.com> Link: https://lore.kernel.org/oe-kbuild-all/202303061526.I8VPcR1M-lkp@intel.com/ == 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-elba-ctrl: Add Pensando SoC 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 | 28 +- .../soc/amd/amd,pensando-elba-ctrl.yaml | 58 +++ .../bindings/spi/cdns,qspi-nor.yaml | 19 +- .../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 | 80 ++++ 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 | 173 +++++++- drivers/soc/Kconfig | 1 + drivers/soc/Makefile | 1 + drivers/soc/amd/Kconfig | 16 + drivers/soc/amd/Makefile | 2 + drivers/soc/amd/pensando-ctrl.c | 378 ++++++++++++++++++ drivers/spi/spi-cadence-quadspi.c | 19 + drivers/spi/spi-dw-mmio.c | 57 +++ include/uapi/linux/amd-pensando-ctrl.h | 30 ++ 23 files changed, 1425 insertions(+), 20 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/amd,pensando.yaml create mode 100644 Documentation/devicetree/bindings/soc/amd/amd,pensando-elba-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/pensando-ctrl.c create mode 100644 include/uapi/linux/amd-pensando-ctrl.h base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6