* [PATCH 3/4] add code to enable XOR and CRYPTO engines on mv78xx0
2023-03-17 15:43 [PATCH 1/4] adjust init logic for ts-wxl to reflect single core dev Jeremy J. Peper
2023-03-17 15:43 ` [PATCH 2/4] set the correct driver for the i2c RTC Jeremy J. Peper
@ 2023-03-17 15:43 ` Jeremy J. Peper
2023-03-17 15:43 ` [PATCH 4/4] fix entries for gpios, buttons and usb ports Jeremy J. Peper
2023-03-17 15:52 ` [PATCH 1/4] adjust init logic for ts-wxl to reflect single core dev Arnd Bergmann
3 siblings, 0 replies; 5+ messages in thread
From: Jeremy J. Peper @ 2023-03-17 15:43 UTC (permalink / raw)
To: linux-kernel, arnd
Cc: Jeremy J . Peper, Andrew Lunn, Sebastian Hesselbarth,
Gregory Clement, Russell King, linux-arm-kernel
Adding missing code/values required to enable the XOR and CESA engines for this SoC
Signed-off-by: Jeremy J. Peper <jeremy@jeremypeper.com>
---
arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 2 ++
arch/arm/mach-mv78xx0/common.c | 23 +++++++++++++++++++++++
arch/arm/mach-mv78xx0/common.h | 2 ++
arch/arm/mach-mv78xx0/mv78xx0.h | 10 ++++++++++
4 files changed, 37 insertions(+)
diff --git a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
index c3f6dc351..31359f586 100644
--- a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
+++ b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
@@ -119,6 +119,8 @@ static void __init wxl_init(void)
mv78xx0_uart1_init();
mv78xx0_uart2_init();
mv78xx0_uart3_init();
+ mv78xx0_xor_init();
+ mv78xx0_crypto_init();
mv78xx0_i2c_init();
i2c_register_board_info(0, &db78x00_i2c_rtc, 1);
}
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 461a68945..679753fcc 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -342,6 +342,29 @@ void __ref mv78xx0_timer_init(void)
IRQ_MV78XX0_TIMER_1, get_tclk());
}
+/****************************************************************************
+* XOR engine
+****************************************************************************/
+void __init mv78xx0_xor_init(void)
+{
+ orion_xor0_init(XOR_PHYS_BASE,
+ XOR_PHYS_BASE + 0x200,
+ IRQ_MV78XX0_XOR_0, IRQ_MV78XX0_XOR_1);
+}
+
+/****************************************************************************
+ * Cryptographic Engines and Security Accelerator (CESA)
+****************************************************************************/
+void __init mv78xx0_crypto_init(void)
+{
+ mvebu_mbus_add_window_by_id(MV78XX0_MBUS_SRAM_TARGET,
+ MV78XX0_MBUS_SRAM_ATTR,
+ MV78XX0_SRAM_PHYS_BASE,
+ MV78XX0_SRAM_SIZE);
+ orion_crypto_init(CRYPTO_PHYS_BASE, MV78XX0_SRAM_PHYS_BASE,
+ SZ_8K, IRQ_MV78XX0_CRYPTO);
+}
+
/*****************************************************************************
* General
diff --git a/arch/arm/mach-mv78xx0/common.h b/arch/arm/mach-mv78xx0/common.h
index d8c6c2400..9f1dfd595 100644
--- a/arch/arm/mach-mv78xx0/common.h
+++ b/arch/arm/mach-mv78xx0/common.h
@@ -43,6 +43,8 @@ void mv78xx0_uart0_init(void);
void mv78xx0_uart1_init(void);
void mv78xx0_uart2_init(void);
void mv78xx0_uart3_init(void);
+void mv78xx0_xor_init(void);
+void mv78xx0_crypto_init(void);
void mv78xx0_i2c_init(void);
void mv78xx0_restart(enum reboot_mode, const char *);
diff --git a/arch/arm/mach-mv78xx0/mv78xx0.h b/arch/arm/mach-mv78xx0/mv78xx0.h
index 3f19bef7d..88efb1e44 100644
--- a/arch/arm/mach-mv78xx0/mv78xx0.h
+++ b/arch/arm/mach-mv78xx0/mv78xx0.h
@@ -49,9 +49,15 @@
#define MV78XX0_REGS_VIRT_BASE IOMEM(0xfec00000)
#define MV78XX0_REGS_SIZE SZ_1M
+#define MV78XX0_SRAM_PHYS_BASE (0xf2200000)
+#define MV78XX0_SRAM_SIZE SZ_8K
+
#define MV78XX0_PCIE_MEM_PHYS_BASE 0xc0000000
#define MV78XX0_PCIE_MEM_SIZE 0x30000000
+#define MV78XX0_MBUS_SRAM_TARGET 0x09
+#define MV78XX0_MBUS_SRAM_ATTR 0x00
+
/*
* Core-specific peripheral registers.
*/
@@ -98,6 +104,8 @@
#define USB1_PHYS_BASE (MV78XX0_REGS_PHYS_BASE + 0x51000)
#define USB2_PHYS_BASE (MV78XX0_REGS_PHYS_BASE + 0x52000)
+#define XOR_PHYS_BASE (MV78XX0_REGS_PHYS_BASE + 0x60900)
+
#define GE00_PHYS_BASE (MV78XX0_REGS_PHYS_BASE + 0x70000)
#define GE01_PHYS_BASE (MV78XX0_REGS_PHYS_BASE + 0x74000)
@@ -106,6 +114,8 @@
#define PCIE12_VIRT_BASE (MV78XX0_REGS_VIRT_BASE + 0x88000)
#define PCIE13_VIRT_BASE (MV78XX0_REGS_VIRT_BASE + 0x8c000)
+#define CRYPTO_PHYS_BASE (MV78XX0_REGS_PHYS_BASE + 0x90000)
+
#define SATA_PHYS_BASE (MV78XX0_REGS_PHYS_BASE + 0xa0000)
/*
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 4/4] fix entries for gpios, buttons and usb ports
2023-03-17 15:43 [PATCH 1/4] adjust init logic for ts-wxl to reflect single core dev Jeremy J. Peper
2023-03-17 15:43 ` [PATCH 2/4] set the correct driver for the i2c RTC Jeremy J. Peper
2023-03-17 15:43 ` [PATCH 3/4] add code to enable XOR and CRYPTO engines on mv78xx0 Jeremy J. Peper
@ 2023-03-17 15:43 ` Jeremy J. Peper
2023-03-17 15:52 ` [PATCH 1/4] adjust init logic for ts-wxl to reflect single core dev Arnd Bergmann
3 siblings, 0 replies; 5+ messages in thread
From: Jeremy J. Peper @ 2023-03-17 15:43 UTC (permalink / raw)
To: linux-kernel, arnd
Cc: Jeremy J . Peper, Andrew Lunn, Sebastian Hesselbarth,
Gregory Clement, Russell King, linux-arm-kernel
Original code was largely copy-pasted from the reference board code, correct values to reflect the hardware actually present in the TS-WXL.
Signed-off-by: Jeremy J. Peper <jeremy@jeremypeper.com>
---
arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 66 +++++++++++++++++------
1 file changed, 51 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
index 31359f586..62e982f74 100644
--- a/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
+++ b/arch/arm/mach-mv78xx0/buffalo-wxl-setup.c
@@ -14,6 +14,9 @@
#include <linux/mv643xx_eth.h>
#include <linux/ethtool.h>
#include <linux/i2c.h>
+#include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include "mv78xx0.h"
@@ -21,6 +24,11 @@
#include "mpp.h"
+#define TSWXL_AUTO_SWITCH 15
+#define TSWXL_USB_POWER1 30
+#define TSWXL_USB_POWER2 31
+
+
/* This arch has 2 Giga Ethernet */
static struct mv643xx_eth_platform_data db78x00_ge00_data = {
@@ -57,9 +65,9 @@ static unsigned int wxl_mpp_config[] __initdata = {
MPP10_GE1_RXD2,
MPP11_GE1_RXD3,
MPP12_GPIO,
- MPP13_SYSRST_OUTn,
- MPP14_SATA1_ACTn,
- MPP15_SATA0_ACTn,
+ MPP13_GPIO,
+ MPP14_GPIO,
+ MPP15_GPIO,
MPP16_GPIO,
MPP17_GPIO,
MPP18_GPIO,
@@ -73,7 +81,7 @@ static unsigned int wxl_mpp_config[] __initdata = {
MPP26_UA2_CTSn,
MPP27_UA2_RTSn,
MPP28_GPIO,
- MPP29_SYSRST_OUTn,
+ MPP29_GPIO,
MPP30_GPIO,
MPP31_GPIO,
MPP32_GPIO,
@@ -84,19 +92,41 @@ static unsigned int wxl_mpp_config[] __initdata = {
MPP37_GPIO,
MPP38_GPIO,
MPP39_GPIO,
- MPP40_UNUSED,
- MPP41_UNUSED,
- MPP42_UNUSED,
- MPP43_UNUSED,
- MPP44_UNUSED,
- MPP45_UNUSED,
- MPP46_UNUSED,
- MPP47_UNUSED,
- MPP48_SATA1_ACTn,
- MPP49_SATA0_ACTn,
+ MPP40_GPIO,
+ MPP41_GPIO,
+ MPP42_GPIO,
+ MPP43_GPIO,
+ MPP44_GPIO,
+ MPP45_GPIO,
+ MPP46_GPIO,
+ MPP47_GPIO,
+ MPP48_GPIO,
+ MPP49_GPIO,
0
};
+static struct gpio_keys_button tswxl_buttons[] = {
+ {
+ .code = KEY_OPTION,
+ .gpio = TSWXL_AUTO_SWITCH,
+ .desc = "Power-auto Switch",
+ .active_low = 1,
+ }
+};
+
+static struct gpio_keys_platform_data tswxl_button_data = {
+ .buttons = tswxl_buttons,
+ .nbuttons = ARRAY_SIZE(tswxl_buttons),
+};
+
+static struct platform_device tswxl_button_device = {
+ .name = "gpio-keys",
+ .id = -1,
+ .num_resources = 0,
+ .dev = {
+ .platform_data = &tswxl_button_data,
+ },
+};
static void __init wxl_init(void)
{
@@ -111,7 +141,6 @@ static void __init wxl_init(void)
*/
mv78xx0_ehci0_init();
mv78xx0_ehci1_init();
- mv78xx0_ehci2_init();
mv78xx0_ge00_init(&db78x00_ge00_data);
mv78xx0_ge01_init(&db78x00_ge01_data);
mv78xx0_sata_init(&db78x00_sata_data);
@@ -123,6 +152,13 @@ static void __init wxl_init(void)
mv78xx0_crypto_init();
mv78xx0_i2c_init();
i2c_register_board_info(0, &db78x00_i2c_rtc, 1);
+
+ //enable both usb ports
+ gpio_direction_output(TSWXL_USB_POWER1, 1);
+ gpio_direction_output(TSWXL_USB_POWER2, 1);
+
+ //enable rear switch
+ platform_device_register(&tswxl_button_device);
}
static int __init wxl_pci_init(void)
--
2.30.2
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/4] adjust init logic for ts-wxl to reflect single core dev
2023-03-17 15:43 [PATCH 1/4] adjust init logic for ts-wxl to reflect single core dev Jeremy J. Peper
` (2 preceding siblings ...)
2023-03-17 15:43 ` [PATCH 4/4] fix entries for gpios, buttons and usb ports Jeremy J. Peper
@ 2023-03-17 15:52 ` Arnd Bergmann
3 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2023-03-17 15:52 UTC (permalink / raw)
To: Jeremy J. Peper, linux-kernel
Cc: Andrew Lunn, Sebastian Hesselbarth, Gregory Clement,
Russell King, linux-arm-kernel
On Fri, Mar 17, 2023, at 16:43, Jeremy J. Peper wrote:
> Original code was largely copy-pasted from the reference board code,
> adjust pcie initialiazation to reflect the TS-WXL using the single-core
> variant of this SoC.
> Correct pcie_port_size to be a power of 2 as required.
>
> Signed-off-by: Jeremy J. Peper <jeremy@jeremypeper.com>
All four patches look good to me in this version,
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Andrew/Sebastian/Gregory, please let me know if you have any comments
on this, and if you want to pick it up in the mvebu tree or I should
just apply them directly in the soc tree to save you the work.
If I apply them directly, I'd probably take patches 1, 2 and 4 as
bugfixes for 6.3, but leave patch 3 for the 6.4 merge window, unless
you have a different preference.
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread