# Pastebin qYmx2wMa commit b88cfe6514c416fadd64879ce152bd7a5e8c4013 Author: Arnd Bergmann Date: Wed Jan 12 14:53:50 2022 +0100 arm64: octeon: rename CONFIG_ARCH_THUNDER to CONFIG_ARCH_OCTEON There are three different SoC families from Marvell that use overlapping marketing names, which frequently leads to confusion. It appears that the only family that has a future is the OCTEON DPU series, originally from Cavium, and currently controlled by the CONFIG_ARCH_THUNDER symbol that originally referred to the long-discontinued ThunderX line of server processors. As there are only a few references to CONFIG_ARCH_THUNDER, it is easy to rename that now to something that is closer to the currently used product names, and different from the discontinued ThunderX/ThunderX2 names. An earlier commit to the crypto drivers added an incorrect dependency to the OcteonTX2 driver, which is in the Octeon family rather than the unrelated ThunderX2 family. Fixes: 42e6f351dcb0 ("crypto: marvell - CRYPTO_DEV_OCTEONTX2_CPT should depend on ARCH_THUNDER2") Signed-off-by: Arnd Bergmann diff --git a/MAINTAINERS b/MAINTAINERS index 4d5ab928dfdd..f3f89192573d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1821,7 +1821,7 @@ M: Krzysztof Halasa S: Maintained F: arch/arm/mach-cns3xxx/ -ARM/CAVIUM THUNDER NETWORK DRIVER +ARM/CAVIUM OCTEON/THUNDERX NETWORK DRIVER M: Sunil Goutham L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Supported @@ -6783,7 +6783,7 @@ L: linux-mips@vger.kernel.org S: Supported F: drivers/edac/octeon_edac* -EDAC-CAVIUM THUNDERX +EDAC-CAVIUM OCTEON/THUNDERX M: Robert Richter L: linux-edac@vger.kernel.org S: Odd Fixes @@ -14799,7 +14799,7 @@ S: Maintained F: Documentation/devicetree/bindings/pci/axis,artpec* F: drivers/pci/controller/dwc/*artpec* -PCIE DRIVER FOR CAVIUM THUNDERX +PCIE DRIVER FOR CAVIUM OCTEON/THUNDERX M: Robert Richter L: linux-pci@vger.kernel.org L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@ -18953,7 +18953,7 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/thunderbolt.c -THUNDERX GPIO DRIVER +OCTEON/THUNDERX GPIO DRIVER M: Robert Richter S: Odd Fixes F: drivers/gpio/gpio-thunderx.c diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 54e3910e8b9b..5449b7b63c95 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -187,6 +187,7 @@ config ARCH_MVEBU - Armada 3700 SoC Family - Armada 7K SoC Family - Armada 8K SoC Family + - Octeon TX2 CN91xx Family config ARCH_MXC bool "ARMv8 based NXP i.MX SoC family" @@ -272,17 +273,27 @@ config ARCH_SPRD help Support for Spreadtrum ARM based SoCs -config ARCH_THUNDER - bool "Cavium Inc. Thunder SoC Family" +config ARCH_OCTEON + bool "Marvell OCTEON and ThunderX data processing units" help - This enables support for Cavium's Thunder Family of SoCs. + This enables support for Marvell (formerly Cavium) OCTEON + Family of DPUs and SoCs, including OCTEON 10, Octeon TX2 + CN92xx/CN96xx/CN98xx, OcteonTX CN8xxx, ThunderX CN88xx, and + Octeon Fusion products. + + Note: these are unrelated to the similarly named ThunderX2 + CN99xx server processors, the Octeon TX2 91xx SoCs and the + Armada processors. config ARCH_THUNDER2 - bool "Cavium ThunderX2 Server Processors" + bool "Marvell/Cavium ThunderX2 Server Processors" select GPIOLIB help - This enables support for Cavium's ThunderX2 CN99XX family of - server processors. + This enables support for Marvell's discontinued ThunderX2 + CN99XX family of server processors, originally sold by Cavium. + + Note: these do not include the unrelated ThunderX CN88xx or + OCTEON TX2 processors, despite the similarities in naming. config ARCH_UNIPHIER bool "Socionext UniPhier SoC Family" diff --git a/arch/arm64/boot/dts/cavium/Makefile b/arch/arm64/boot/dts/cavium/Makefile index c178f7e06e18..a87fa34149f7 100644 --- a/arch/arm64/boot/dts/cavium/Makefile +++ b/arch/arm64/boot/dts/cavium/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_THUNDER) += thunder-88xx.dtb +dtb-$(CONFIG_ARCH_OCTEON) += thunder-88xx.dtb dtb-$(CONFIG_ARCH_THUNDER2) += thunder2-99xx.dtb diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index f2e2b9bdd702..1ac65df229a2 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -55,7 +55,7 @@ CONFIG_ARCH_INTEL_SOCFPGA=y CONFIG_ARCH_SYNQUACER=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_SPRD=y -CONFIG_ARCH_THUNDER=y +CONFIG_ARCH_CAVIUM=y CONFIG_ARCH_THUNDER2=y CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_VEXPRESS=y diff --git a/drivers/crypto/cavium/cpt/Kconfig b/drivers/crypto/cavium/cpt/Kconfig index b9874058d4fa..5e919d2d3c13 100644 --- a/drivers/crypto/cavium/cpt/Kconfig +++ b/drivers/crypto/cavium/cpt/Kconfig @@ -8,7 +8,7 @@ config CRYPTO_DEV_CPT config CAVIUM_CPT tristate "Cavium Cryptographic Accelerator driver" - depends on ARCH_THUNDER || COMPILE_TEST + depends on ARCH_OCTEON || COMPILE_TEST depends on PCI_MSI && 64BIT select CRYPTO_DEV_CPT help diff --git a/drivers/crypto/marvell/Kconfig b/drivers/crypto/marvell/Kconfig index 9125199f1702..a34bf1f64afe 100644 --- a/drivers/crypto/marvell/Kconfig +++ b/drivers/crypto/marvell/Kconfig @@ -22,7 +22,7 @@ config CRYPTO_DEV_MARVELL_CESA config CRYPTO_DEV_OCTEONTX_CPT tristate "Support for Marvell OcteonTX CPT driver" - depends on ARCH_THUNDER || COMPILE_TEST + depends on ARCH_OCTEON || COMPILE_TEST depends on PCI_MSI && 64BIT depends on CRYPTO_LIB_AES select CRYPTO_SKCIPHER @@ -30,15 +30,16 @@ config CRYPTO_DEV_OCTEONTX_CPT select CRYPTO_AEAD select CRYPTO_DEV_MARVELL help - This driver allows you to utilize the Marvell Cryptographic - Accelerator Unit(CPT) found in OcteonTX series of processors. + This driver allows you to utilize the Marvell Cryptographic + Accelerator Unit(CPT) found in OcteonTX series of processors + before the Octeon TX2. - To compile this driver as module, choose M here: - the modules will be called octeontx-cpt and octeontx-cptvf + To compile this driver as module, choose M here: + the modules will be called octeontx-cpt and octeontx-cptvf config CRYPTO_DEV_OCTEONTX2_CPT - tristate "Marvell OcteonTX2 CPT driver" - depends on ARCH_THUNDER2 || COMPILE_TEST + tristate "Marvell Octeon CPT driver" + depends on ARCH_OCTEON || COMPILE_TEST depends on PCI_MSI && 64BIT depends on CRYPTO_LIB_AES depends on NET_VENDOR_MARVELL @@ -48,5 +49,6 @@ config CRYPTO_DEV_OCTEONTX2_CPT select CRYPTO_HASH select CRYPTO_AEAD help - This driver allows you to utilize the Marvell Cryptographic - Accelerator Unit(CPT) found in OcteonTX2 series of processors. + This driver allows you to utilize the Marvell Cryptographic + Accelerator Unit(CPT) found in Octeon TX2 CN91xx/CN96xx/CN98xx, + OCTEON 10 and later series of processors. diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index ceb7e9291daf..9fc4a2acd0c8 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -648,7 +648,7 @@ config GPIO_TS4800 config GPIO_THUNDERX tristate "Cavium ThunderX/OCTEON-TX GPIO" - depends on ARCH_THUNDER || (64BIT && COMPILE_TEST) + depends on ARCH_OCTEON || (64BIT && COMPILE_TEST) depends on PCI_MSI select GPIOLIB_IRQCHIP select IRQ_DOMAIN_HIERARCHY