Skip to contentSkip to conversation

mips: octeon: Misc Octeon drivers, DT and Kconfig / defconfig updates

PATCH New Stefan Roese 3 participants 15 messages Jul 30, 2020 – Aug 4, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v2 cover mips: octeon: Misc Octeon drivers, DT and Kconfig / defconfig updates

This patchset includes the following parts:
- Octeon GPIO driver
- Octeon SPI driver
- New simple Octeon clk driver
- DT updates (GPIO, SPI, I2C & CLK nodes)
- Kconfig & defconfig updates

In v2 I've added the SPI driver as well, so combine all the drivers / patches in one patchset, that have been sent to the list before. Also GPIO and SPI have now been tested on ARM Octeon TX2 and have undergone minor changes because of this.

Thanks,
Stefan

Changes in v3:
- Removed 2nd ops struct for Octeon TX2 and removed "const" from the octeon_spi_ops declaration. This makes a more elegant switch to the Octeon TX2 functions possible, as suggested by Daniel
- Remove driver_data struct, as its not needed. The distinction between PCI based on non-PCI based probing can be made via a common Octeon TX & TX2 DT property can be made.

Changes in v2:
- Tested on MIPS Octeon and ARM Octeon TX2
- Removed "struct pci_device_id" definition and U_BOOT_PCI_DEVICE() as its not needed for the PCI based probing on Octeon TX2
- Added "depends on DM_PCI" to Kconfig
- Newly added to this series
- Removed inclusion of "common.h"
- Added "depends on DM_PCI" to Kconfig
- Tested on MIPS Octeon and ARM Octeon TX2
- Fixed issues with Octeon TX2 registration. Now only one driver is registered and the "ops" is overwritten in the Octeon TX2 case.
- Use dev_get_driver_data() to get the driver data struct
- Removed "struct pci_device_id" definition and U_BOOT_PCI_DEVICE() as its not needed for the PCI based probing on Octeon TX2
- Newly added to this series
- Newly added to this series
- Kconfig and defconfig changes separated into 2 patches
- Kconfig and defconfig changes separated into 2 patches

Changes in v1:
- Removed common.h and reduced headers as suggested by Daniel

Stefan Roese (8):
mips: octeon: mrvl,cn73xx.dtsi: Add GPIO DT nodes
mips: octeon: dts: Add I2C DT nodes
clk: clk_octeon: Add simple MIPS Octeon clock driver
mips: octeon: dts: Add Octeon clock driver DT nodes
mips: octeon: mrvl,cn73xx.dtsi: Add SPI DT node
mips: octeon: mrvl,octeon-ebb7304.dts: Add SPI flash DT node
mips: octeon: Update Octeon Kconfig
mips: octeon: Update EBB7304 defconfig

Suneel Garapati (2):
gpio: octeon_gpio: Add GPIO controller driver for Octeon
drivers: spi: Add SPI controller driver for Octeon

 arch/mips/Kconfig                        |   6 +-
 arch/mips/dts/mrvl,cn73xx.dtsi           |  66 +++
 arch/mips/dts/mrvl,octeon-ebb7304.dts    |  21 +-
 configs/octeon_ebb7304_defconfig         |  10 +
 drivers/clk/Kconfig                      |   7 +
 drivers/clk/Makefile                     |   1 +
 drivers/clk/clk_octeon.c                 |  72 +++
 drivers/gpio/Kconfig                     |  10 +
 drivers/gpio/Makefile                    |   1 +
 drivers/gpio/octeon_gpio.c               | 242 +++++++++
 drivers/spi/Kconfig                      |   8 +
 drivers/spi/Makefile                     |   1 +
 drivers/spi/octeon_spi.c                 | 615 +++++++++++++++++++++++
 include/dt-bindings/clock/octeon-clock.h |  12 +
 14 files changed, 1069 insertions(+), 3 deletions(-)
 create mode 100644 drivers/clk/clk_octeon.c
 create mode 100644 drivers/gpio/octeon_gpio.c
 create mode 100644 drivers/spi/octeon_spi.c
 create mode 100644 include/dt-bindings/clock/octeon-clock.h
Signature · 1 line
2.28.0
#1 lore raw

PATCH v2 1/10 gpio: octeon_gpio: Add GPIO controller driver for Octeon

From: Suneel Garapati <[email protected]>

Add support for GPIO controllers found on Octeon II/III and Octeon TX TX2 SoC platforms.

---

(no changes since v2)

Changes in v2:
- Tested on MIPS Octeon and ARM Octeon TX2
- Removed "struct pci_device_id" definition and U_BOOT_PCI_DEVICE() as its not needed for the PCI based probing on Octeon TX2
- Added "depends on DM_PCI" to Kconfig

Changes in v1:
- Removed common.h and reduced headers as suggested by Daniel

 drivers/gpio/Kconfig       |  10 ++
 drivers/gpio/Makefile      |   1 +
 drivers/gpio/octeon_gpio.c | 242 +++++++++++++++++++++++++++++++++++++
 3 files changed, 253 insertions(+)
 create mode 100644 drivers/gpio/octeon_gpio.c
drivers/gpio/Kconfig +10 -0
index ff5cd7efce..11e9a17f97 100644
@@ -346,6 +346,16 @@ config PIC32_GPIO
 	help
 	  Say yes here to support Microchip PIC32 GPIOs.
 
+config OCTEON_GPIO
+	bool "Octeon II/III/TX/TX2 GPIO driver"
+	depends on DM_GPIO && DM_PCI &&	(ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2)
+	default y
+	help
+	  Add support for the Marvell Octeon GPIO driver. This is used with
+	  various Octeon parts such as Octeon II/III and OcteonTX/TX2.
+	  Octeon II/III has 32 GPIOs (count defined via DT) and OcteonTX/TX2
+	  has 64 GPIOs (count defined via internal register).
+
 config STM32_GPIO
 	bool "ST STM32 GPIO driver"
 	depends on DM_GPIO && (ARCH_STM32 || ARCH_STM32MP)
drivers/gpio/Makefile +1 -0
index e769509c69..d3d0d3cacf 100644
@@ -59,6 +59,7 @@ obj-$(CONFIG_HIKEY_GPIO)	+= hi6220_gpio.o
 obj-$(CONFIG_HSDK_CREG_GPIO)	+= hsdk-creg-gpio.o
 obj-$(CONFIG_IMX_RGPIO2P)	+= imx_rgpio2p.o
 obj-$(CONFIG_PIC32_GPIO)	+= pic32_gpio.o
+obj-$(CONFIG_OCTEON_GPIO)	+= octeon_gpio.o
 obj-$(CONFIG_MVEBU_GPIO)	+= mvebu_gpio.o
 obj-$(CONFIG_MSM_GPIO)		+= msm_gpio.o
 obj-$(CONFIG_$(SPL_)PCF8575_GPIO)	+= pcf8575_gpio.o
drivers/gpio/octeon_gpio.c new file +242 -0

242 lines not on this page · raw message

Signature · 1 line
2.28.0
#2 lore raw

PATCH v2 1/10 gpio: octeon_gpio: Add GPIO controller driver for Octeon

Quoted 21 lines

From: Suneel Garapati <[email protected]>

Add support for GPIO controllers found on Octeon II/III and Octeon TX TX2 SoC platforms.

---

(no changes since v2)

Changes in v2:
- Tested on MIPS Octeon and ARM Octeon TX2
- Removed "struct pci_device_id" definition and U_BOOT_PCI_DEVICE() as its not needed for the PCI based probing on Octeon TX2
- Added "depends on DM_PCI" to Kconfig

Quoted 10 lines

Changes in v1:
- Removed common.h and reduced headers as suggested by Daniel

 drivers/gpio/Kconfig       |  10 ++
 drivers/gpio/Makefile      |   1 +
 drivers/gpio/octeon_gpio.c | 242 +++++++++++++++++++++++++++++++++++++
 3 files changed, 253 insertions(+)
 create mode 100644 drivers/gpio/octeon_gpio.c
Signature · 1 line
- Daniel
#3 lore raw

PATCH v2 2/10 mips: octeon: mrvl,cn73xx.dtsi: Add GPIO DT nodes

In reply to Stefan Roese

Add the Octeon GPIO DT node to the dtsi file.

---

(no changes since v1)

 arch/mips/dts/mrvl,cn73xx.dtsi | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
arch/mips/dts/mrvl,cn73xx.dtsi +26 -0
index a7bd55f8ad..8d32a49795 100644
@@ -38,6 +38,32 @@
 			#size-cells = <1>;
 		};
 
+		gpio: gpio-controller at 1070000000800 {
+			#gpio-cells = <2>;
+			compatible = "cavium,octeon-7890-gpio";
+			reg = <0x10700 0x00000800 0x0 0x100>;
+			gpio-controller;
+			nr-gpios = <32>;
+			/* Interrupts are specified by two parts:
+			 * 1) GPIO pin number (0..15)
+			 * 2) Triggering (1 - edge rising
+			 *		  2 - edge falling
+			 *		  4 - level active high
+			 *		  8 - level active low)
+			 */
+			interrupt-controller;
+			#interrupt-cells = <2>;
+			/* The GPIO pins connect to 16 consecutive CUI bits */
+			interrupts = <0x03000 4>, <0x03001 4>,
+				     <0x03002 4>, <0x03003 4>,
+				     <0x03004 4>, <0x03005 4>,
+				     <0x03006 4>, <0x03007 4>,
+				     <0x03008 4>, <0x03009 4>,
+				     <0x0300a 4>, <0x0300b 4>,
+				     <0x0300c 4>, <0x0300d 4>,
+				     <0x0300e 4>, <0x0300f 4>;
+		};
+
 		reset: reset at 1180006001600 {
 			compatible = "mrvl,cn7xxx-rst";
 			reg = <0x11800 0x06001600 0x0 0x200>;
Signature · 1 line
2.28.0
#4 lore raw

PATCH v2 3/10 mips: octeon: dts: Add I2C DT nodes

In reply to Stefan Roese

Add I2C DT nodes to the Octeon dts / dtsi files.

---

(no changes since v1)

 arch/mips/dts/mrvl,cn73xx.dtsi        | 20 ++++++++++++++++++++
 arch/mips/dts/mrvl,octeon-ebb7304.dts | 10 ++++++++++
 2 files changed, 30 insertions(+)
arch/mips/dts/mrvl,cn73xx.dtsi +20 -0
index 8d32a49795..4c7b6e4160 100644
@@ -86,5 +86,25 @@
 			reg-shift = <3>;
 			interrupts = <0x08040 4>;
 		};
+
+		i2c0: i2c at 1180000001000 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "cavium,octeon-7890-twsi";
+			reg = <0x11800 0x00001000 0x0 0x200>;
+			/* INT_ST, INT_TS, INT_CORE */
+			interrupts = <0x0b000 1>, <0x0b001 1>, <0x0b002 1>;
+			clock-frequency = <100000>;
+		};
+
+		i2c1: i2c at 1180000001200 {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "cavium,octeon-7890-twsi";
+			reg = <0x11800 0x00001200 0x0 0x200>;
+			/* INT_ST, INT_TS, INT_CORE */
+			interrupts = <0x0b100 1>, <0x0b101 1>, <0x0b102 1>;
+			clock-frequency = <100000>;
+		};
 	};
 };
arch/mips/dts/mrvl,octeon-ebb7304.dts +10 -0
index 4e9c2de7d4..096e5c8f66 100644
@@ -94,3 +94,13 @@
 &uart0 {
 	clock-frequency = <1200000000>;
 };
+
+&i2c0 {
+	u-boot,dm-pre-reloc;	/* Needed early for DDR SPD EEPROM */
+	clock-frequency = <100000>;
+};
+
+&i2c1 {
+	u-boot,dm-pre-reloc;	/* Needed early for DDR SPD EEPROM */
+	clock-frequency = <100000>;
+};
Signature · 1 line
2.28.0
#5 lore raw

PATCH v2 4/10 clk: clk_octeon: Add simple MIPS Octeon clock driver

In reply to Stefan Roese

This patch adds a simple clock driver for the Marvell Octeon MIPS SoC family. Its for IO clock rate passing via DT in some of the Octeon driver, like I2C. So that we don't need to use the non-mainline API octeon_get_io_clock().

Cc Lukasz Majewski <[email protected]>

---

(no changes since v1)

 drivers/clk/Kconfig                      |  7 +++
 drivers/clk/Makefile                     |  1 +
 drivers/clk/clk_octeon.c                 | 72 ++++++++++++++++++++++++
 include/dt-bindings/clock/octeon-clock.h | 12 ++++
 4 files changed, 92 insertions(+)
 create mode 100644 drivers/clk/clk_octeon.c
 create mode 100644 include/dt-bindings/clock/octeon-clock.h
drivers/clk/Kconfig +7 -0
index 82cb1874e1..6003e140b5 100644
@@ -83,6 +83,13 @@ config CLK_INTEL
 	  set up by U-Boot itself but only statically. Thus the driver does not
 	  support changing clock rates, only querying them.
 
+config CLK_OCTEON
+	bool "Clock controller driver for Marvell MIPS Octeon"
+	depends on CLK && ARCH_OCTEON
+	default y
+	help
+	  Enable this to support the clocks on Octeon MIPS platforms.
+
 config CLK_STM32F
 	bool "Enable clock driver support for STM32F family"
 	depends on CLK && (STM32F7 || STM32F4)
drivers/clk/Makefile +1 -0
index d911954581..cda4b4b605 100644
@@ -29,6 +29,7 @@ obj-$(CONFIG_$(SPL_TPL_)CLK_INTEL) += intel/
 obj-$(CONFIG_CLK_HSDK) += clk-hsdk-cgu.o
 obj-$(CONFIG_CLK_K210) += kendryte/
 obj-$(CONFIG_CLK_MPC83XX) += mpc83xx_clk.o
+obj-$(CONFIG_CLK_OCTEON) += clk_octeon.o
 obj-$(CONFIG_CLK_OWL) += owl/
 obj-$(CONFIG_CLK_RENESAS) += renesas/
 obj-$(CONFIG_CLK_SIFIVE) += sifive/
drivers/clk/clk_octeon.c new file +72 -0

72 lines not on this page · raw message

include/dt-bindings/clock/octeon-clock.h new file +12 -0
new file mode 100644
index 0000000000..34e6a3bf41
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright (C) 2020 Stefan Roese <[email protected]>
+ */
+
+#ifndef __DT_BINDINGS_CLOCK_OCTEON_CLOCK_H
+#define __DT_BINDINGS_CLOCK_OCTEON_CLOCK_H
+
+#define OCTEON_CLK_CORE		0
+#define OCTEON_CLK_IO		1
+
+#endif /* __DT_BINDINGS_CLOCK_OCTEON_CLOCK_H */
Signature · 1 line
2.28.0
#6 lore raw

PATCH v2 5/10 mips: octeon: dts: Add Octeon clock driver DT nodes

In reply to Stefan Roese

This patch adds the DT nodes for the Octeon clock support via the common clk_ API.

---

(no changes since v1)

 arch/mips/dts/mrvl,cn73xx.dtsi        | 10 ++++++++++
 arch/mips/dts/mrvl,octeon-ebb7304.dts |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)
arch/mips/dts/mrvl,cn73xx.dtsi +10 -0
index 4c7b6e4160..7c0a8d73f0 100644
@@ -5,6 +5,8 @@
 
 /dts-v1/;
 
+#include <dt-bindings/clock/octeon-clock.h>
+
 / {
 	#address-cells = <2>;
 	#size-cells = <2>;
@@ -38,6 +40,12 @@
 			#size-cells = <1>;
 		};
 
+		clk: clock {
+			compatible = "mrvl,octeon-clk";
+			#clock-cells = <1>;
+			u-boot,dm-pre-reloc;
+		};
+
 		gpio: gpio-controller at 1070000000800 {
 			#gpio-cells = <2>;
 			compatible = "cavium,octeon-7890-gpio";
@@ -95,6 +103,7 @@
 			/* INT_ST, INT_TS, INT_CORE */
 			interrupts = <0x0b000 1>, <0x0b001 1>, <0x0b002 1>;
 			clock-frequency = <100000>;
+			clocks = <&clk OCTEON_CLK_IO>;
 		};
 
 		i2c1: i2c at 1180000001200 {
@@ -105,6 +114,7 @@
 			/* INT_ST, INT_TS, INT_CORE */
 			interrupts = <0x0b100 1>, <0x0b101 1>, <0x0b102 1>;
 			clock-frequency = <100000>;
+			clocks = <&clk OCTEON_CLK_IO>;
 		};
 	};
 };
arch/mips/dts/mrvl,octeon-ebb7304.dts +1 -1
index 096e5c8f66..c229aa5fc0 100644
@@ -5,7 +5,7 @@
 
 /dts-v1/;
 
-/include/ "mrvl,cn73xx.dtsi"
+#include "mrvl,cn73xx.dtsi"
 
 / {
 	model = "cavium,ebb7304";
Signature · 1 line
2.28.0
#7 lore raw

PATCH v2 6/10 drivers: spi: Add SPI controller driver for Octeon

In reply to Stefan Roese

From: Suneel Garapati <[email protected]>

Adds support for SPI controllers found on Octeon II/III and Octeon TX TX2 SoC platforms.

Cc Daniel Schwierzeck <[email protected]>
Cc Aaron Williams <[email protected]>
Cc Chandrakala Chavva <[email protected]>
Cc Jagan Teki <[email protected]>

---

Changes in v3:
- Removed 2nd ops struct for Octeon TX2 and removed "const" from the octeon_spi_ops declaration. This makes a more elegant switch to the Octeon TX2 functions possible, as suggested by Daniel
- Remove driver_data struct, as its not needed. The distinction between PCI based on non-PCI based probing can be made via a common Octeon TX & TX2 DT property can be made.

Changes in v2:
- Newly added to this series
- Removed inclusion of "common.h"
- Added "depends on DM_PCI" to Kconfig
- Tested on MIPS Octeon and ARM Octeon TX2
- Fixed issues with Octeon TX2 registration. Now only one driver is registered and the "ops" is overwritten in the Octeon TX2 case.
- Use dev_get_driver_data() to get the driver data struct
- Removed "struct pci_device_id" definition and U_BOOT_PCI_DEVICE() as its not needed for the PCI based probing on Octeon TX2

 drivers/spi/Kconfig      |   8 +
 drivers/spi/Makefile     |   1 +
 drivers/spi/octeon_spi.c | 615 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 624 insertions(+)
 create mode 100644 drivers/spi/octeon_spi.c
drivers/spi/Kconfig +8 -0
index 30d808d7bb..3fc2d0674a 100644
@@ -240,6 +240,14 @@ config NXP_FSPI
 	  Enable the NXP FlexSPI (FSPI) driver. This driver can be used to
 	  access the SPI NOR flash on platforms embedding this NXP IP core.
 
+config OCTEON_SPI
+	bool "Octeon SPI driver"
+	depends on DM_PCI && (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2)
+	help
+	  Enable the Octeon SPI driver. This driver can be used to
+	  access the SPI NOR flash on Octeon II/III and OcteonTX/TX2
+	  SoC platforms.
+
 config OMAP3_SPI
 	bool "McSPI driver for OMAP"
 	help
drivers/spi/Makefile +1 -0
index 4e7461771f..b5c9ff1af8 100644
@@ -43,6 +43,7 @@ obj-$(CONFIG_MXC_SPI) += mxc_spi.o
 obj-$(CONFIG_MXS_SPI) += mxs_spi.o
 obj-$(CONFIG_NXP_FSPI) += nxp_fspi.o
 obj-$(CONFIG_ATCSPI200_SPI) += atcspi200_spi.o
+obj-$(CONFIG_OCTEON_SPI) += octeon_spi.o
 obj-$(CONFIG_OMAP3_SPI) += omap3_spi.o
 obj-$(CONFIG_PIC32_SPI) += pic32_spi.o
 obj-$(CONFIG_PL022_SPI) += pl022_spi.o
drivers/spi/octeon_spi.c new file +615 -0

615 lines not on this page · raw message

Signature · 1 line
2.28.0
#8 lore raw

PATCH v2 6/10 drivers: spi: Add SPI controller driver for Octeon

Am Donnerstag, den 30.07.2020, 13:56 +0200 schrieb Stefan Roese:

Quoted 34 lines

From: Suneel Garapati <[email protected]>

Adds support for SPI controllers found on Octeon II/III and Octeon TX TX2 SoC platforms.

Cc Daniel Schwierzeck <[email protected]>
Cc Aaron Williams <[email protected]>
Cc Chandrakala Chavva <[email protected]>
Cc Jagan Teki <[email protected]>

---

Changes in v3:
- Removed 2nd ops struct for Octeon TX2 and removed "const" from the octeon_spi_ops declaration. This makes a more elegant switch to the Octeon TX2 functions possible, as suggested by Daniel
- Remove driver_data struct, as its not needed. The distinction between PCI based on non-PCI based probing can be made via a common Octeon TX & TX2 DT property can be made.

Changes in v2:
- Newly added to this series
- Removed inclusion of "common.h"
- Added "depends on DM_PCI" to Kconfig
- Tested on MIPS Octeon and ARM Octeon TX2
- Fixed issues with Octeon TX2 registration. Now only one driver is registered and the "ops" is overwritten in the Octeon TX2 case.
- Use dev_get_driver_data() to get the driver data struct
- Removed "struct pci_device_id" definition and U_BOOT_PCI_DEVICE() as its not needed for the PCI based probing on Octeon TX2

Quoted 7 lines
 drivers/spi/Kconfig      |   8 +
 drivers/spi/Makefile     |   1 +
 drivers/spi/octeon_spi.c | 615 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 624 insertions(+)
 create mode 100644 drivers/spi/octeon_spi.c
Signature · 1 line
- Daniel
#9 lore raw

PATCH v2 6/10 drivers: spi: Add SPI controller driver for Octeon

In reply to Stefan Roese

Hi Stefan,

Quoted 383 lines · Stefan Roese

From: Suneel Garapati <[email protected]>

Adds support for SPI controllers found on Octeon II/III and Octeon TX TX2 SoC platforms.

Cc Daniel Schwierzeck <[email protected]>
Cc Aaron Williams <[email protected]>
Cc Chandrakala Chavva <[email protected]>
Cc Jagan Teki <[email protected]>

---

Changes in v3:
- Removed 2nd ops struct for Octeon TX2 and removed "const" from the octeon_spi_ops declaration. This makes a more elegant switch to the Octeon TX2 functions possible, as suggested by Daniel
- Remove driver_data struct, as its not needed. The distinction between PCI based on non-PCI based probing can be made via a common Octeon TX & TX2 DT property can be made.

Changes in v2:
- Newly added to this series
- Removed inclusion of "common.h"
- Added "depends on DM_PCI" to Kconfig
- Tested on MIPS Octeon and ARM Octeon TX2
- Fixed issues with Octeon TX2 registration. Now only one driver is registered and the "ops" is overwritten in the Octeon TX2 case.
- Use dev_get_driver_data() to get the driver data struct
- Removed "struct pci_device_id" definition and U_BOOT_PCI_DEVICE() as its not needed for the PCI based probing on Octeon TX2

 drivers/spi/Kconfig      |   8 +
 drivers/spi/Makefile     |   1 +
 drivers/spi/octeon_spi.c | 615 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 624 insertions(+)
 create mode 100644 drivers/spi/octeon_spi.c
drivers/spi/Kconfig +8 -0
index 30d808d7bb..3fc2d0674a 100644
@@ -240,6 +240,14 @@ config NXP_FSPI
          Enable the NXP FlexSPI (FSPI) driver. This driver can be used to
          access the SPI NOR flash on platforms embedding this NXP IP core.
 
+config OCTEON_SPI
+       bool "Octeon SPI driver"
+       depends on DM_PCI && (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2)
+       help
+         Enable the Octeon SPI driver. This driver can be used to
+         access the SPI NOR flash on Octeon II/III and OcteonTX/TX2
+         SoC platforms.
+
 config OMAP3_SPI
        bool "McSPI driver for OMAP"
        help
drivers/spi/Makefile +1 -0
index 4e7461771f..b5c9ff1af8 100644
@@ -43,6 +43,7 @@ obj-$(CONFIG_MXC_SPI) += mxc_spi.o
 obj-$(CONFIG_MXS_SPI) += mxs_spi.o
 obj-$(CONFIG_NXP_FSPI) += nxp_fspi.o
 obj-$(CONFIG_ATCSPI200_SPI) += atcspi200_spi.o
+obj-$(CONFIG_OCTEON_SPI) += octeon_spi.o
 obj-$(CONFIG_OMAP3_SPI) += omap3_spi.o
 obj-$(CONFIG_PIC32_SPI) += pic32_spi.o
 obj-$(CONFIG_PL022_SPI) += pl022_spi.o
drivers/spi/octeon_spi.c new file +305 -0
new file mode 100644
index 0000000000..868eb1bef5
@@ -0,0 +1,615 @@
+// SPDX-License-Identifier:    GPL-2.0
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ *
+ * https://spdx.org/licenses
+ */
+
+#include <clk.h>
+#include <dm.h>
+#include <malloc.h>
+#include <spi.h>
+#include <spi-mem.h>
+#include <watchdog.h>
+#include <asm/io.h>
+#include <asm/unaligned.h>
+#include <linux/bitfield.h>
+#include <linux/compat.h>
+#include <linux/delay.h>
+
+#define OCTEON_SPI_MAX_BYTES   9
+#define OCTEON_SPI_MAX_CLOCK_HZ        50000000
+
+#define OCTEON_SPI_NUM_CS      4
+
+#define OCTEON_SPI_CS_VALID(cs)        ((cs) < OCTEON_SPI_NUM_CS)
+
+#define MPI_CFG                        0x0000
+#define MPI_STS                        0x0008
+#define MPI_TX                 0x0010
+#define MPI_XMIT               0x0018
+#define MPI_WIDE_DAT           0x0040
+#define MPI_IO_CTL             0x0048
+#define MPI_DAT(X)             (0x0080 + ((X) << 3))
+#define MPI_WIDE_BUF(X)                (0x0800 + ((X) << 3))
+#define MPI_CYA_CFG            0x1000
+#define MPI_CLKEN              0x1080
+
+#define MPI_CFG_ENABLE         BIT_ULL(0)
+#define MPI_CFG_IDLELO         BIT_ULL(1)
+#define MPI_CFG_CLK_CONT       BIT_ULL(2)
+#define MPI_CFG_WIREOR         BIT_ULL(3)
+#define MPI_CFG_LSBFIRST       BIT_ULL(4)
+#define MPI_CFG_CS_STICKY      BIT_ULL(5)
+#define MPI_CFG_CSHI           BIT_ULL(7)
+#define MPI_CFG_IDLECLKS       GENMASK_ULL(9, 8)
+#define MPI_CFG_TRITX          BIT_ULL(10)
+#define MPI_CFG_CSLATE         BIT_ULL(11)
+#define MPI_CFG_CSENA0         BIT_ULL(12)
+#define MPI_CFG_CSENA1         BIT_ULL(13)
+#define MPI_CFG_CSENA2         BIT_ULL(14)
+#define MPI_CFG_CSENA3         BIT_ULL(15)
+#define MPI_CFG_CLKDIV         GENMASK_ULL(28, 16)
+#define MPI_CFG_LEGACY_DIS     BIT_ULL(31)
+#define MPI_CFG_IOMODE         GENMASK_ULL(35, 34)
+#define MPI_CFG_TB100_EN       BIT_ULL(49)
+
+#define MPI_DAT_DATA           GENMASK_ULL(7, 0)
+
+#define MPI_STS_BUSY           BIT_ULL(0)
+#define MPI_STS_MPI_INTR       BIT_ULL(1)
+#define MPI_STS_RXNUM          GENMASK_ULL(12, 8)
+
+#define MPI_TX_TOTNUM          GENMASK_ULL(4, 0)
+#define MPI_TX_TXNUM           GENMASK_ULL(12, 8)
+#define MPI_TX_LEAVECS         BIT_ULL(16)
+#define MPI_TX_CSID            GENMASK_ULL(21, 20)
+
+#define MPI_XMIT_TOTNUM                GENMASK_ULL(10, 0)
+#define MPI_XMIT_TXNUM         GENMASK_ULL(30, 20)
+#define MPI_XMIT_BUF_SEL       BIT_ULL(59)
+#define MPI_XMIT_LEAVECS       BIT_ULL(60)
+#define MPI_XMIT_CSID          GENMASK_ULL(62, 61)
+
+/* Used on Octeon TX2 */
+void board_acquire_flash_arb(bool acquire);
+
+/* Local driver data structure */
+struct octeon_spi {
+       void __iomem *base;     /* Register base address */
+       struct clk clk;
+       u32 clkdiv;             /* Clock divisor for device speed */
+};
+
+static u64 octeon_spi_set_mpicfg(struct udevice *dev)
+{
+       struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev);
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       u64 mpi_cfg;
+       uint max_speed = slave->max_hz;
+       bool cpha, cpol;
+
+       if (!max_speed)
+               max_speed = 12500000;
+       if (max_speed > OCTEON_SPI_MAX_CLOCK_HZ)
+               max_speed = OCTEON_SPI_MAX_CLOCK_HZ;
+
+       debug("\n slave params %d %d %d\n", slave->cs,
+             slave->max_hz, slave->mode);
+       cpha = !!(slave->mode & SPI_CPHA);
+       cpol = !!(slave->mode & SPI_CPOL);
+
+       mpi_cfg = FIELD_PREP(MPI_CFG_CLKDIV, priv->clkdiv & 0x1fff) |
+               FIELD_PREP(MPI_CFG_CSHI, !!(slave->mode & SPI_CS_HIGH)) |
+               FIELD_PREP(MPI_CFG_LSBFIRST, !!(slave->mode & SPI_LSB_FIRST)) |
+               FIELD_PREP(MPI_CFG_WIREOR, !!(slave->mode & SPI_3WIRE)) |
+               FIELD_PREP(MPI_CFG_IDLELO, cpha != cpol) |
+               FIELD_PREP(MPI_CFG_CSLATE, cpha) |
+               MPI_CFG_CSENA0 | MPI_CFG_CSENA1 |
+               MPI_CFG_CSENA2 | MPI_CFG_CSENA1 |
+               MPI_CFG_ENABLE;
+
+       debug("\n mpi_cfg %llx\n", mpi_cfg);
+       return mpi_cfg;
+}
+
+/**
+ * Wait until the SPI bus is ready
+ *
+ * @param      dev     SPI device to wait for
+ */
+static void octeon_spi_wait_ready(struct udevice *dev)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_sts;
+
+       do {
+               mpi_sts = readq(base + MPI_STS);
+               WATCHDOG_RESET();
+       } while (mpi_sts & MPI_STS_BUSY);
+
+       debug("%s(%s)\n", __func__, dev->name);
+}
+
+/**
+ * Claim the bus for a slave device
+ *
+ * @param      dev     SPI bus
+ *
+ * @return     0 for success, -EINVAL if chip select is invalid
+ */
+static int octeon_spi_claim_bus(struct udevice *dev)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_cfg;
+
+       debug("\n\n%s(%s)\n", __func__, dev->name);
+       if (!OCTEON_SPI_CS_VALID(spi_chip_select(dev)))
+               return -EINVAL;
+
+       if (IS_ENABLED(CONFIG_ARCH_OCTEONTX2))
+               board_acquire_flash_arb(true);
+
+       mpi_cfg = readq(base + MPI_CFG);
+       mpi_cfg &= ~MPI_CFG_TRITX;
+       mpi_cfg |= MPI_CFG_ENABLE;
+       writeq(mpi_cfg, base + MPI_CFG);
+       mpi_cfg = readq(base + MPI_CFG);
+       udelay(5);      /** Wait for bus to settle */
+
+       return 0;
+}
+
+/**
+ * Release the bus to a slave device
+ *
+ * @param      dev     SPI bus
+ *
+ * @return     0 for success, -EINVAL if chip select is invalid
+ */
+static int octeon_spi_release_bus(struct udevice *dev)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_cfg;
+
+       debug("%s(%s)\n\n", __func__, dev->name);
+       if (!OCTEON_SPI_CS_VALID(spi_chip_select(dev)))
+               return -EINVAL;
+
+       if (IS_ENABLED(CONFIG_ARCH_OCTEONTX2))
+               board_acquire_flash_arb(false);
+
+       mpi_cfg = readq(base + MPI_CFG);
+       mpi_cfg &= ~MPI_CFG_ENABLE;
+       writeq(mpi_cfg, base + MPI_CFG);
+       mpi_cfg = readq(base + MPI_CFG);
+       udelay(1);
+
+       return 0;
+}
+
+static int octeon_spi_xfer(struct udevice *dev, unsigned int bitlen,
+                          const void *dout, void *din, unsigned long flags)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_tx;
+       u64 mpi_cfg;
+       u64 wide_dat = 0;
+       int len = bitlen / 8;
+       int i;
+       const u8 *tx_data = dout;
+       u8 *rx_data = din;
+       int cs = spi_chip_select(dev);
+
+       if (!OCTEON_SPI_CS_VALID(cs))
+               return -EINVAL;
+
+       debug("\n %s(%s, %u, %p, %p, 0x%lx), cs: %d\n",
+             __func__, dev->name, bitlen, dout, din, flags, cs);
+
+       mpi_cfg = octeon_spi_set_mpicfg(dev);
+       if (mpi_cfg != readq(base + MPI_CFG)) {
+               writeq(mpi_cfg, base + MPI_CFG);
+               mpi_cfg = readq(base + MPI_CFG);
+               udelay(10);
+       }
+
+       debug("\n mpi_cfg upd %llx\n", mpi_cfg);
+
+       /*
+        * Start by writing and reading 8 bytes at a time. While we can support
+        * up to 10, it's easier to just use 8 with the MPI_WIDE_DAT register.
+        */
+       while (len > 8) {
+               if (tx_data) {
+                       wide_dat = get_unaligned((u64 *)tx_data);
+                       debug("  tx: %016llx \t", (unsigned long long)wide_dat);
+                       tx_data += 8;
+                       writeq(wide_dat, base + MPI_WIDE_DAT);
+               }
+
+               mpi_tx = FIELD_PREP(MPI_TX_CSID, cs) |
+                       FIELD_PREP(MPI_TX_LEAVECS, 1) |
+                       FIELD_PREP(MPI_TX_TXNUM, tx_data ? 8 : 0) |
+                       FIELD_PREP(MPI_TX_TOTNUM, 8);
+               writeq(mpi_tx, base + MPI_TX);
+
+               octeon_spi_wait_ready(dev);
+
+               debug("\n ");
+
+               if (rx_data) {
+                       wide_dat = readq(base + MPI_WIDE_DAT);
+                       debug("  rx: %016llx\t", (unsigned long long)wide_dat);
+                       *(u64 *)rx_data = wide_dat;
+                       rx_data += 8;
+               }
+               len -= 8;
+       }
+
+       debug("\n ");
+
+       /* Write and read the rest of the data */
+       if (tx_data) {
+               for (i = 0; i < len; i++) {
+                       debug("  tx: %02x\n", *tx_data);
+                       writeq(*tx_data++, base + MPI_DAT(i));
+               }
+       }
+
+       mpi_tx = FIELD_PREP(MPI_TX_CSID, cs) |
+               FIELD_PREP(MPI_TX_LEAVECS, !(flags & SPI_XFER_END)) |
+               FIELD_PREP(MPI_TX_TXNUM, tx_data ? len : 0) |
+               FIELD_PREP(MPI_TX_TOTNUM, len);
+       writeq(mpi_tx, base + MPI_TX);
+
+       octeon_spi_wait_ready(dev);
+
+       debug("\n ");
+
+       if (rx_data) {
+               for (i = 0; i < len; i++) {
+                       *rx_data = readq(base + MPI_DAT(i)) & 0xff;
+                       debug("  rx: %02x\n", *rx_data);
+                       rx_data++;
+               }
+       }
+
+       return 0;
+}
+
+static int octeontx2_spi_xfer(struct udevice *dev, unsigned int bitlen,
+                             const void *dout, void *din, unsigned long flags)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_xmit;
+       u64 mpi_cfg;
+       u64 wide_dat = 0;
+       int len = bitlen / 8;
+       int rem;
+       int i;
+       const u8 *tx_data = dout;
+       u8 *rx_data = din;
+       int cs = spi_chip_select(dev);
+

drivers/spi/octeon_spi.c line 315

Quoted 10 lines
drivers/spi/octeon_spi.c new file +10 -0
+       if (!OCTEON_SPI_CS_VALID(cs))
+               return -EINVAL;
+
+       debug("\n %s(%s, %u, %p, %p, 0x%lx), cs: %d\n",
+             __func__, dev->name, bitlen, dout, din, flags, cs);
+
+       mpi_cfg = octeon_spi_set_mpicfg(dev);
+
+       mpi_cfg |= MPI_CFG_TRITX | MPI_CFG_LEGACY_DIS | MPI_CFG_CS_STICKY |
+               MPI_CFG_TB100_EN;

For OcteonTX2, TB100_EN is set so a fixed 100MHz clock should be used in spi_set_speed.

Regards,
Suneel

Quoted 303 lines
drivers/spi/octeon_spi.c new file +300 -1
+
+       mpi_cfg &= ~MPI_CFG_IOMODE;
+       if (flags & (SPI_TX_DUAL | SPI_RX_DUAL))
+               mpi_cfg |= FIELD_PREP(MPI_CFG_IOMODE, 2);
+       if (flags & (SPI_TX_QUAD | SPI_RX_QUAD))
+               mpi_cfg |= FIELD_PREP(MPI_CFG_IOMODE, 3);
+
+       if (mpi_cfg != readq(base + MPI_CFG)) {
+               writeq(mpi_cfg, base + MPI_CFG);
+               mpi_cfg = readq(base + MPI_CFG);
+               udelay(10);
+       }
+
+       debug("\n mpi_cfg upd %llx\n\n", mpi_cfg);
+
+       /* Start by writing or reading 1024 bytes at a time. */
+       while (len > 1024) {
+               if (tx_data) {
+                       /* 8 bytes per iteration */
+                       for (i = 0; i < 128; i++) {
+                               wide_dat = get_unaligned((u64 *)tx_data);
+                               debug("  tx: %016llx \t",
+                                     (unsigned long long)wide_dat);
+                               if ((i % 4) == 3)
+                                       debug("\n");
+                               tx_data += 8;
+                               writeq(wide_dat, base + MPI_WIDE_BUF(i));
+                       }
+               }
+
+               mpi_xmit = FIELD_PREP(MPI_XMIT_CSID, cs) | MPI_XMIT_LEAVECS |
+                       FIELD_PREP(MPI_XMIT_TXNUM, tx_data ? 1024 : 0) |
+                       FIELD_PREP(MPI_XMIT_TOTNUM, 1024);
+               writeq(mpi_xmit, base + MPI_XMIT);
+
+               octeon_spi_wait_ready(dev);
+
+               debug("\n ");
+
+               if (rx_data) {
+                       /* 8 bytes per iteration */
+                       for (i = 0; i < 128; i++) {
+                               wide_dat = readq(base + MPI_WIDE_BUF(i));
+                               debug("  rx: %016llx\t",
+                                     (unsigned long long)wide_dat);
+                               if ((i % 4) == 3)
+                                       debug("\n");
+                               *(u64 *)rx_data = wide_dat;
+                               rx_data += 8;
+                       }
+               }
+               len -= 1024;
+       }
+
+       if (tx_data) {
+               rem = len % 8;
+               /* 8 bytes per iteration */
+               for (i = 0; i < len / 8; i++) {
+                       wide_dat = get_unaligned((u64 *)tx_data);
+                       debug("  tx: %016llx \t",
+                             (unsigned long long)wide_dat);
+                       if ((i % 4) == 3)
+                               debug("\n");
+                       tx_data += 8;
+                       writeq(wide_dat, base + MPI_WIDE_BUF(i));
+               }
+               if (rem) {
+                       memcpy(&wide_dat, tx_data, rem);
+                       debug("  rtx: %016llx\t", wide_dat);
+                       writeq(wide_dat, base + MPI_WIDE_BUF(i));
+               }
+       }
+
+       mpi_xmit = FIELD_PREP(MPI_XMIT_CSID, cs) |
+               FIELD_PREP(MPI_XMIT_LEAVECS, !(flags & SPI_XFER_END)) |
+               FIELD_PREP(MPI_XMIT_TXNUM, tx_data ? len : 0) |
+               FIELD_PREP(MPI_XMIT_TOTNUM, len);
+       writeq(mpi_xmit, base + MPI_XMIT);
+
+       octeon_spi_wait_ready(dev);
+
+       debug("\n ");
+
+       if (rx_data) {
+               rem = len % 8;
+               /* 8 bytes per iteration */
+               for (i = 0; i < len / 8; i++) {
+                       wide_dat = readq(base + MPI_WIDE_BUF(i));
+                       debug("  rx: %016llx\t",
+                             (unsigned long long)wide_dat);
+                       if ((i % 4) == 3)
+                               debug("\n");
+                       *(u64 *)rx_data = wide_dat;
+                       rx_data += 8;
+               }
+               if (rem) {
+                       wide_dat = readq(base + MPI_WIDE_BUF(i));
+                       debug("  rrx: %016llx\t",
+                             (unsigned long long)wide_dat);
+                       memcpy(rx_data, &wide_dat, rem);
+                       rx_data += rem;
+               }
+       }
+
+       return 0;
+}
+
+static bool octeon_spi_supports_op(struct spi_slave *slave,
+                                  const struct spi_mem_op *op)
+{
+       /* For now, support only below combinations
+        * 1-1-1
+        * 1-1-2 1-2-2
+        * 1-1-4 1-4-4
+        */
+       if (op->cmd.buswidth != 1)
+               return false;
+       return true;
+}
+
+static int octeon_spi_exec_op(struct spi_slave *slave,
+                             const struct spi_mem_op *op)
+{
+       unsigned long flags = SPI_XFER_BEGIN;
+       const void *tx;
+       void *rx;
+       u8 opcode, *buf;
+       u8 *addr;
+       int i, temp, ret;
+
+       if (op->cmd.buswidth != 1)
+               return -ENOTSUPP;
+
+       /* Send CMD */
+       i = 0;
+       opcode = op->cmd.opcode;
+
+       if (!op->data.nbytes && !op->addr.nbytes && !op->dummy.nbytes)
+               flags |= SPI_XFER_END;
+
+       ret = octeontx2_spi_xfer(slave->dev, 8, (void *)&opcode, NULL, flags);
+       if (ret < 0)
+               return ret;
+
+       /* Send Address and dummy */
+       if (op->addr.nbytes) {
+               /* Alloc buffer for address+dummy */
+               buf = (u8 *)calloc(1, op->addr.nbytes + op->dummy.nbytes);
+               if (!buf) {
+                       printf("%s Out of memory\n", __func__);
+                       return -ENOMEM;
+               }
+               addr = (u8 *)&op->addr.val;
+               for (temp = 0; temp < op->addr.nbytes; temp++)
+                       buf[i++] = *(u8 *)(addr + op->addr.nbytes - 1 - temp);
+               for (temp = 0; temp < op->dummy.nbytes; temp++)
+                       buf[i++] = 0xff;
+               if (op->addr.buswidth == 2)
+                       flags |= SPI_RX_DUAL;
+               if (op->addr.buswidth == 4)
+                       flags |= SPI_RX_QUAD;
+
+               if (!op->data.nbytes)
+                       flags |= SPI_XFER_END;
+               ret = octeontx2_spi_xfer(slave->dev, i * 8, (void *)buf, NULL,
+                                        flags);
+               free(buf);
+               if (ret < 0)
+                       return ret;
+       }
+       if (!op->data.nbytes)
+               return 0;
+
+       /* Send/Receive Data */
+       flags |= SPI_XFER_END;
+       if (op->data.buswidth == 2)
+               flags |= SPI_RX_DUAL;
+       if (op->data.buswidth == 4)
+               flags |= SPI_RX_QUAD;
+
+       rx = (op->data.dir == SPI_MEM_DATA_IN) ? op->data.buf.in : NULL;
+       tx = (op->data.dir == SPI_MEM_DATA_OUT) ? op->data.buf.out : NULL;
+
+       ret = octeontx2_spi_xfer(slave->dev, (op->data.nbytes * 8), tx, rx,
+                                flags);
+       return ret;
+}
+
+static const struct spi_controller_mem_ops octeontx2_spi_mem_ops = {
+       .supports_op = octeon_spi_supports_op,
+       .exec_op = octeon_spi_exec_op,
+};
+
+/**
+ * Set the speed of the SPI bus
+ *
+ * @param      bus     bus to set
+ * @param      max_hz  maximum speed supported
+ */
+static int octeon_spi_set_speed(struct udevice *bus, uint max_hz)
+{
+       struct octeon_spi *priv = dev_get_priv(bus);
+       ulong clk_rate;
+       u32 calc_hz;
+
+       if (max_hz > OCTEON_SPI_MAX_CLOCK_HZ)
+               max_hz = OCTEON_SPI_MAX_CLOCK_HZ;
+
+       clk_rate = clk_get_rate(&priv->clk);
+       if (IS_ERR_VALUE(clk_rate))
+               return -EINVAL;
+
+       debug("%s(%s, %u, %lu)\n", __func__, bus->name, max_hz, clk_rate);
+
+       priv->clkdiv = clk_rate / (2 * max_hz);
+       while (1) {
+               calc_hz = clk_rate / (2 * priv->clkdiv);
+               if (calc_hz <= max_hz)
+                       break;
+               priv->clkdiv += 1;
+       }
+
+       if (priv->clkdiv > 8191)
+               return -EINVAL;
+
+       debug("%s: clkdiv=%d\n", __func__, priv->clkdiv);
+
+       return 0;
+}
+
+static int octeon_spi_set_mode(struct udevice *bus, uint mode)
+{
+       /* We don't set it here */
+       return 0;
+}
+
+static struct dm_spi_ops octeon_spi_ops = {
+       .claim_bus      = octeon_spi_claim_bus,
+       .release_bus    = octeon_spi_release_bus,
+       .set_speed      = octeon_spi_set_speed,
+       .set_mode       = octeon_spi_set_mode,
+       .xfer           = octeon_spi_xfer,
+};
+
+static int octeon_spi_probe(struct udevice *dev)
+{
+       struct octeon_spi *priv = dev_get_priv(dev);
+       int ret;
+
+       /* Octeon TX & TX2 use PCI based probing */
+       if (device_is_compatible(dev, "cavium,thunder-8190-spi")) {
+               pci_dev_t bdf = dm_pci_get_bdf(dev);
+
+               debug("SPI PCI device: %x\n", bdf);
+               priv->base = dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0,
+                                           PCI_REGION_MEM);
+               /* Add base offset */
+               priv->base += 0x1000;
+
+               /*
+                * Octeon TX2 needs a different xfer function and supports
+                * mem_ops
+                */
+               if (device_is_compatible(dev, "cavium,thunderx-spi")) {
+                       octeon_spi_ops.xfer = octeontx2_spi_xfer;
+                       octeon_spi_ops.mem_ops = &octeontx2_spi_mem_ops;
+               }
+       } else {
+               priv->base = dev_remap_addr(dev);
+       }
+
+       ret = clk_get_by_index(dev, 0, &priv->clk);
+       if (ret < 0)
+               return ret;
+
+       ret = clk_enable(&priv->clk);
+       if (ret)
+               return ret;
+
+       debug("SPI bus %s %d at %p\n", dev->name, dev->seq, priv->base);
+
+       return 0;
+}
+
+static const struct udevice_id octeon_spi_ids[] = {
+       /* MIPS Octeon */
+       { .compatible = "cavium,octeon-3010-spi" },
+       /* ARM Octeon TX / TX2 */
+       { .compatible = "cavium,thunder-8190-spi" },
+       { }
+};
+
+U_BOOT_DRIVER(octeon_spi) = {
+       .name                   = "spi_octeon",
+       .id                     = UCLASS_SPI,
+       .of_match               = octeon_spi_ids,
+       .probe                  = octeon_spi_probe,
+       .priv_auto_alloc_size   = sizeof(struct octeon_spi),
+       .ops                    = &octeon_spi_ops,
+};
--

2.28.0

#10 lore raw

PATCH v2 6/10 drivers: spi: Add SPI controller driver for Octeon

Hi Suneel,

Quoted 391 lines · Suneel Garapati

Hi Stefan,

Quoted 387 lines · Stefan Roese

From: Suneel Garapati <[email protected]>

Adds support for SPI controllers found on Octeon II/III and Octeon TX TX2 SoC platforms.

Cc Daniel Schwierzeck <[email protected]>
Cc Aaron Williams <[email protected]>
Cc Chandrakala Chavva <[email protected]>
Cc Jagan Teki <[email protected]>

---

Changes in v3:
- Removed 2nd ops struct for Octeon TX2 and removed "const" from the octeon_spi_ops declaration. This makes a more elegant switch to the Octeon TX2 functions possible, as suggested by Daniel
- Remove driver_data struct, as its not needed. The distinction between PCI based on non-PCI based probing can be made via a common Octeon TX & TX2 DT property can be made.

Changes in v2:
- Newly added to this series
- Removed inclusion of "common.h"
- Added "depends on DM_PCI" to Kconfig
- Tested on MIPS Octeon and ARM Octeon TX2
- Fixed issues with Octeon TX2 registration. Now only one driver is registered and the "ops" is overwritten in the Octeon TX2 case.
- Use dev_get_driver_data() to get the driver data struct
- Removed "struct pci_device_id" definition and U_BOOT_PCI_DEVICE() as its not needed for the PCI based probing on Octeon TX2

  drivers/spi/Kconfig      |   8 +
  drivers/spi/Makefile     |   1 +
  drivers/spi/octeon_spi.c | 615 +++++++++++++++++++++++++++++++++++++++
  3 files changed, 624 insertions(+)

create mode 100644 drivers/spi/octeon_spi.c

drivers/spi/Kconfig +8 -0
index 30d808d7bb..3fc2d0674a 100644
@@ -240,6 +240,14 @@ config NXP_FSPI
           Enable the NXP FlexSPI (FSPI) driver. This driver can be used to
           access the SPI NOR flash on platforms embedding this NXP IP core.
 
+config OCTEON_SPI
+       bool "Octeon SPI driver"
+       depends on DM_PCI && (ARCH_OCTEON || ARCH_OCTEONTX || ARCH_OCTEONTX2)
+       help
+         Enable the Octeon SPI driver. This driver can be used to
+         access the SPI NOR flash on Octeon II/III and OcteonTX/TX2
+         SoC platforms.
+
  config OMAP3_SPI
         bool "McSPI driver for OMAP"
         help
drivers/spi/Makefile +1 -0
index 4e7461771f..b5c9ff1af8 100644
@@ -43,6 +43,7 @@ obj-$(CONFIG_MXC_SPI) += mxc_spi.o
  obj-$(CONFIG_MXS_SPI) += mxs_spi.o
  obj-$(CONFIG_NXP_FSPI) += nxp_fspi.o
  obj-$(CONFIG_ATCSPI200_SPI) += atcspi200_spi.o
+obj-$(CONFIG_OCTEON_SPI) += octeon_spi.o
  obj-$(CONFIG_OMAP3_SPI) += omap3_spi.o
  obj-$(CONFIG_PIC32_SPI) += pic32_spi.o
  obj-$(CONFIG_PL022_SPI) += pl022_spi.o
drivers/spi/octeon_spi.c new file +309 -0
new file mode 100644
index 0000000000..868eb1bef5
@@ -0,0 +1,615 @@
+// SPDX-License-Identifier:    GPL-2.0
+/*
+ * Copyright (C) 2018 Marvell International Ltd.
+ *
+ * https://spdx.org/licenses
+ */
+
+#include <clk.h>
+#include <dm.h>
+#include <malloc.h>
+#include <spi.h>
+#include <spi-mem.h>
+#include <watchdog.h>
+#include <asm/io.h>
+#include <asm/unaligned.h>
+#include <linux/bitfield.h>
+#include <linux/compat.h>
+#include <linux/delay.h>
+
+#define OCTEON_SPI_MAX_BYTES   9
+#define OCTEON_SPI_MAX_CLOCK_HZ        50000000
+
+#define OCTEON_SPI_NUM_CS      4
+
+#define OCTEON_SPI_CS_VALID(cs)        ((cs) < OCTEON_SPI_NUM_CS)
+
+#define MPI_CFG                        0x0000
+#define MPI_STS                        0x0008
+#define MPI_TX                 0x0010
+#define MPI_XMIT               0x0018
+#define MPI_WIDE_DAT           0x0040
+#define MPI_IO_CTL             0x0048
+#define MPI_DAT(X)             (0x0080 + ((X) << 3))
+#define MPI_WIDE_BUF(X)                (0x0800 + ((X) << 3))
+#define MPI_CYA_CFG            0x1000
+#define MPI_CLKEN              0x1080
+
+#define MPI_CFG_ENABLE         BIT_ULL(0)
+#define MPI_CFG_IDLELO         BIT_ULL(1)
+#define MPI_CFG_CLK_CONT       BIT_ULL(2)
+#define MPI_CFG_WIREOR         BIT_ULL(3)
+#define MPI_CFG_LSBFIRST       BIT_ULL(4)
+#define MPI_CFG_CS_STICKY      BIT_ULL(5)
+#define MPI_CFG_CSHI           BIT_ULL(7)
+#define MPI_CFG_IDLECLKS       GENMASK_ULL(9, 8)
+#define MPI_CFG_TRITX          BIT_ULL(10)
+#define MPI_CFG_CSLATE         BIT_ULL(11)
+#define MPI_CFG_CSENA0         BIT_ULL(12)
+#define MPI_CFG_CSENA1         BIT_ULL(13)
+#define MPI_CFG_CSENA2         BIT_ULL(14)
+#define MPI_CFG_CSENA3         BIT_ULL(15)
+#define MPI_CFG_CLKDIV         GENMASK_ULL(28, 16)
+#define MPI_CFG_LEGACY_DIS     BIT_ULL(31)
+#define MPI_CFG_IOMODE         GENMASK_ULL(35, 34)
+#define MPI_CFG_TB100_EN       BIT_ULL(49)
+
+#define MPI_DAT_DATA           GENMASK_ULL(7, 0)
+
+#define MPI_STS_BUSY           BIT_ULL(0)
+#define MPI_STS_MPI_INTR       BIT_ULL(1)
+#define MPI_STS_RXNUM          GENMASK_ULL(12, 8)
+
+#define MPI_TX_TOTNUM          GENMASK_ULL(4, 0)
+#define MPI_TX_TXNUM           GENMASK_ULL(12, 8)
+#define MPI_TX_LEAVECS         BIT_ULL(16)
+#define MPI_TX_CSID            GENMASK_ULL(21, 20)
+
+#define MPI_XMIT_TOTNUM                GENMASK_ULL(10, 0)
+#define MPI_XMIT_TXNUM         GENMASK_ULL(30, 20)
+#define MPI_XMIT_BUF_SEL       BIT_ULL(59)
+#define MPI_XMIT_LEAVECS       BIT_ULL(60)
+#define MPI_XMIT_CSID          GENMASK_ULL(62, 61)
+
+/* Used on Octeon TX2 */
+void board_acquire_flash_arb(bool acquire);
+
+/* Local driver data structure */
+struct octeon_spi {
+       void __iomem *base;     /* Register base address */
+       struct clk clk;
+       u32 clkdiv;             /* Clock divisor for device speed */
+};
+
+static u64 octeon_spi_set_mpicfg(struct udevice *dev)
+{
+       struct dm_spi_slave_platdata *slave = dev_get_parent_platdata(dev);
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       u64 mpi_cfg;
+       uint max_speed = slave->max_hz;
+       bool cpha, cpol;
+
+       if (!max_speed)
+               max_speed = 12500000;
+       if (max_speed > OCTEON_SPI_MAX_CLOCK_HZ)
+               max_speed = OCTEON_SPI_MAX_CLOCK_HZ;
+
+       debug("\n slave params %d %d %d\n", slave->cs,
+             slave->max_hz, slave->mode);
+       cpha = !!(slave->mode & SPI_CPHA);
+       cpol = !!(slave->mode & SPI_CPOL);
+
+       mpi_cfg = FIELD_PREP(MPI_CFG_CLKDIV, priv->clkdiv & 0x1fff) |
+               FIELD_PREP(MPI_CFG_CSHI, !!(slave->mode & SPI_CS_HIGH)) |
+               FIELD_PREP(MPI_CFG_LSBFIRST, !!(slave->mode & SPI_LSB_FIRST)) |
+               FIELD_PREP(MPI_CFG_WIREOR, !!(slave->mode & SPI_3WIRE)) |
+               FIELD_PREP(MPI_CFG_IDLELO, cpha != cpol) |
+               FIELD_PREP(MPI_CFG_CSLATE, cpha) |
+               MPI_CFG_CSENA0 | MPI_CFG_CSENA1 |
+               MPI_CFG_CSENA2 | MPI_CFG_CSENA1 |
+               MPI_CFG_ENABLE;
+
+       debug("\n mpi_cfg %llx\n", mpi_cfg);
+       return mpi_cfg;
+}
+
+/**
+ * Wait until the SPI bus is ready
+ *
+ * @param      dev     SPI device to wait for
+ */
+static void octeon_spi_wait_ready(struct udevice *dev)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_sts;
+
+       do {
+               mpi_sts = readq(base + MPI_STS);
+               WATCHDOG_RESET();
+       } while (mpi_sts & MPI_STS_BUSY);
+
+       debug("%s(%s)\n", __func__, dev->name);
+}
+
+/**
+ * Claim the bus for a slave device
+ *
+ * @param      dev     SPI bus
+ *
+ * @return     0 for success, -EINVAL if chip select is invalid
+ */
+static int octeon_spi_claim_bus(struct udevice *dev)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_cfg;
+
+       debug("\n\n%s(%s)\n", __func__, dev->name);
+       if (!OCTEON_SPI_CS_VALID(spi_chip_select(dev)))
+               return -EINVAL;
+
+       if (IS_ENABLED(CONFIG_ARCH_OCTEONTX2))
+               board_acquire_flash_arb(true);
+
+       mpi_cfg = readq(base + MPI_CFG);
+       mpi_cfg &= ~MPI_CFG_TRITX;
+       mpi_cfg |= MPI_CFG_ENABLE;
+       writeq(mpi_cfg, base + MPI_CFG);
+       mpi_cfg = readq(base + MPI_CFG);
+       udelay(5);      /** Wait for bus to settle */
+
+       return 0;
+}
+
+/**
+ * Release the bus to a slave device
+ *
+ * @param      dev     SPI bus
+ *
+ * @return     0 for success, -EINVAL if chip select is invalid
+ */
+static int octeon_spi_release_bus(struct udevice *dev)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_cfg;
+
+       debug("%s(%s)\n\n", __func__, dev->name);
+       if (!OCTEON_SPI_CS_VALID(spi_chip_select(dev)))
+               return -EINVAL;
+
+       if (IS_ENABLED(CONFIG_ARCH_OCTEONTX2))
+               board_acquire_flash_arb(false);
+
+       mpi_cfg = readq(base + MPI_CFG);
+       mpi_cfg &= ~MPI_CFG_ENABLE;
+       writeq(mpi_cfg, base + MPI_CFG);
+       mpi_cfg = readq(base + MPI_CFG);
+       udelay(1);
+
+       return 0;
+}
+
+static int octeon_spi_xfer(struct udevice *dev, unsigned int bitlen,
+                          const void *dout, void *din, unsigned long flags)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_tx;
+       u64 mpi_cfg;
+       u64 wide_dat = 0;
+       int len = bitlen / 8;
+       int i;
+       const u8 *tx_data = dout;
+       u8 *rx_data = din;
+       int cs = spi_chip_select(dev);
+
+       if (!OCTEON_SPI_CS_VALID(cs))
+               return -EINVAL;
+
+       debug("\n %s(%s, %u, %p, %p, 0x%lx), cs: %d\n",
+             __func__, dev->name, bitlen, dout, din, flags, cs);
+
+       mpi_cfg = octeon_spi_set_mpicfg(dev);
+       if (mpi_cfg != readq(base + MPI_CFG)) {
+               writeq(mpi_cfg, base + MPI_CFG);
+               mpi_cfg = readq(base + MPI_CFG);
+               udelay(10);
+       }
+
+       debug("\n mpi_cfg upd %llx\n", mpi_cfg);
+
+       /*
+        * Start by writing and reading 8 bytes at a time. While we can support
+        * up to 10, it's easier to just use 8 with the MPI_WIDE_DAT register.
+        */
+       while (len > 8) {
+               if (tx_data) {
+                       wide_dat = get_unaligned((u64 *)tx_data);
+                       debug("  tx: %016llx \t", (unsigned long long)wide_dat);
+                       tx_data += 8;
+                       writeq(wide_dat, base + MPI_WIDE_DAT);
+               }
+
+               mpi_tx = FIELD_PREP(MPI_TX_CSID, cs) |
+                       FIELD_PREP(MPI_TX_LEAVECS, 1) |
+                       FIELD_PREP(MPI_TX_TXNUM, tx_data ? 8 : 0) |
+                       FIELD_PREP(MPI_TX_TOTNUM, 8);
+               writeq(mpi_tx, base + MPI_TX);
+
+               octeon_spi_wait_ready(dev);
+
+               debug("\n ");
+
+               if (rx_data) {
+                       wide_dat = readq(base + MPI_WIDE_DAT);
+                       debug("  rx: %016llx\t", (unsigned long long)wide_dat);
+                       *(u64 *)rx_data = wide_dat;
+                       rx_data += 8;
+               }
+               len -= 8;
+       }
+
+       debug("\n ");
+
+       /* Write and read the rest of the data */
+       if (tx_data) {
+               for (i = 0; i < len; i++) {
+                       debug("  tx: %02x\n", *tx_data);
+                       writeq(*tx_data++, base + MPI_DAT(i));
+               }
+       }
+
+       mpi_tx = FIELD_PREP(MPI_TX_CSID, cs) |
+               FIELD_PREP(MPI_TX_LEAVECS, !(flags & SPI_XFER_END)) |
+               FIELD_PREP(MPI_TX_TXNUM, tx_data ? len : 0) |
+               FIELD_PREP(MPI_TX_TOTNUM, len);
+       writeq(mpi_tx, base + MPI_TX);
+
+       octeon_spi_wait_ready(dev);
+
+       debug("\n ");
+
+       if (rx_data) {
+               for (i = 0; i < len; i++) {
+                       *rx_data = readq(base + MPI_DAT(i)) & 0xff;
+                       debug("  rx: %02x\n", *rx_data);
+                       rx_data++;
+               }
+       }
+
+       return 0;
+}
+
+static int octeontx2_spi_xfer(struct udevice *dev, unsigned int bitlen,
+                             const void *dout, void *din, unsigned long flags)
+{
+       struct udevice *bus = dev_get_parent(dev);
+       struct octeon_spi *priv = dev_get_priv(bus);
+       void *base = priv->base;
+       u64 mpi_xmit;
+       u64 mpi_cfg;
+       u64 wide_dat = 0;
+       int len = bitlen / 8;
+       int rem;
+       int i;
+       const u8 *tx_data = dout;
+       u8 *rx_data = din;
+       int cs = spi_chip_select(dev);
+
+       if (!OCTEON_SPI_CS_VALID(cs))
+               return -EINVAL;
+
+       debug("\n %s(%s, %u, %p, %p, 0x%lx), cs: %d\n",
Quoted 8 lines

drivers/spi/octeon_spi.c line 315

Quoted 6 lines
drivers/spi/octeon_spi.c new file +6 -0
+             __func__, dev->name, bitlen, dout, din, flags, cs);
+
+       mpi_cfg = octeon_spi_set_mpicfg(dev);
+
+       mpi_cfg |= MPI_CFG_TRITX | MPI_CFG_LEGACY_DIS | MPI_CFG_CS_STICKY |
+               MPI_CFG_TB100_EN;

For OcteonTX2, TB100_EN is set so a fixed 100MHz clock should be used in spi_set_speed.

Thanks for the feedback. I'll send a fix, once this driver has reached mainline - which should be shortly.

Thanks,
Stefan

#11 lore raw

PATCH v2 7/10 mips: octeon: mrvl,cn73xx.dtsi: Add SPI DT node

In reply to Stefan Roese

Add the Octeon SPI DT node to the dtsi file.

---

(no changes since v2)

Changes in v2:
- Newly added to this series

 arch/mips/dts/mrvl,cn73xx.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/mips/dts/mrvl,cn73xx.dtsi +10 -0
index 7c0a8d73f0..f5ad4a6213 100644
@@ -116,5 +116,15 @@
 			clock-frequency = <100000>;
 			clocks = <&clk OCTEON_CLK_IO>;
 		};
+
+		spi: spi at 1070000001000 {
+			compatible = "cavium,octeon-3010-spi";
+			reg = <0x10700 0x00001000 0x0 0x100>;
+			interrupts = <0x05001 1>;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			spi-max-frequency = <25000000>;
+			clocks = <&clk OCTEON_CLK_IO>;
+		};
 	};
 };
Signature · 1 line
2.28.0
#12 lore raw

PATCH v2 8/10 mips: octeon: mrvl, octeon-ebb7304.dts: Add SPI flash DT node

In reply to Stefan Roese

Add the SPI flash DT node for the EBB7304.

---

(no changes since v2)

Changes in v2:
- Newly added to this series

 arch/mips/dts/mrvl,octeon-ebb7304.dts | 9 +++++++++
 1 file changed, 9 insertions(+)
arch/mips/dts/mrvl,octeon-ebb7304.dts +9 -0
index c229aa5fc0..6b2e5e84bc 100644
@@ -13,6 +13,7 @@
 
 	aliases {
 		serial0 = &uart0;
+		spi0 = &spi;
 	};
 
 	chosen {
@@ -104,3 +105,11 @@
 	u-boot,dm-pre-reloc;	/* Needed early for DDR SPD EEPROM */
 	clock-frequency = <100000>;
 };
+
+&spi {
+	flash at 0 {
+		compatible = "micron,n25q128a11", "jedec,spi-nor";
+		spi-max-frequency = <2000000>;
+		reg = <0>;
+	};
+};
Signature · 1 line
2.28.0
#13 lore raw

PATCH v2 9/10 mips: octeon: Update Octeon Kconfig

In reply to Stefan Roese

This patch selects DM_SPI & DM_I2C for MIPS Octeon. DM_GPIO, DM_SERIAL and DM_ETH are already selected.

Additionally the selections are now alphabetically sorted.

---

(no changes since v2)

Changes in v2:
- Kconfig and defconfig changes separated into 2 patches

 arch/mips/Kconfig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
arch/mips/Kconfig +4 -2
index 997e145450..e0f6b6c4b3 100644
@@ -112,9 +112,11 @@ config ARCH_OCTEON
 	select DISPLAY_CPUINFO
 	select DMA_ADDR_T_64BIT
 	select DM
-	select DM_SERIAL
-	select DM_GPIO
 	select DM_ETH
+	select DM_GPIO
+	select DM_I2C
+	select DM_SERIAL
+	select DM_SPI
 	select MIPS_L2_CACHE
 	select MIPS_MACH_EARLY_INIT
 	select MIPS_TUNE_OCTEON3
Signature · 1 line
2.28.0
#14 lore raw

PATCH v2 10/10 mips: octeon: Update EBB7304 defconfig

In reply to Stefan Roese

This patch enables the following options for the Octeon EBB7304 EVB:

- PCI & DM_PCI
- DM_SPI_FLASH & SPI flash device support
- SPI & Octeon SPI driver
- GPIO cmd support
- I2C cmd support

---

(no changes since v2)

Changes in v2:
- Kconfig and defconfig changes separated into 2 patches

 configs/octeon_ebb7304_defconfig | 10 ++++++++++
 1 file changed, 10 insertions(+)
configs/octeon_ebb7304_defconfig +10 -0
index d810b1e45f..17fdc68c03 100644
@@ -12,6 +12,8 @@ CONFIG_ARCH_OCTEON=y
 CONFIG_DEBUG_UART=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_HUSH_PARSER=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
 CONFIG_CMD_MTD=y
 CONFIG_CMD_PCI=y
 CONFIG_CMD_DHCP=y
@@ -29,10 +31,18 @@ CONFIG_CFI_FLASH=y
 CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
 CONFIG_FLASH_CFI_MTD=y
 CONFIG_SYS_FLASH_CFI=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_SPANSION=y
+CONFIG_SPI_FLASH_STMICRO=y
 # CONFIG_NETDEVICES is not set
+CONFIG_PCI=y
+CONFIG_DM_PCI=y
 CONFIG_DEBUG_UART_SHIFT=3
 CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_SYS_NS16550=y
+CONFIG_SPI=y
+CONFIG_OCTEON_SPI=y
 CONFIG_SYSRESET=y
 CONFIG_SYSRESET_OCTEON=y
 CONFIG_HEXDUMP=y
Signature · 1 line
2.28.0