Skip to content
Snippets Groups Projects
Unverified Commit 4a2419ba authored by Michal Hrusecky's avatar Michal Hrusecky :mouse:
Browse files

MOX: Include latest patches

parent 1fa36077
1 merge request!123Turris OS 5.0 (HBK)
Hide whitespace changes
Inline Side-by-side
patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
+ 65
− 12
View file @ 4a2419ba
From 35d374048519163bc8a8df2bf201c5a6f1200680 Mon Sep 17 00:00:00 2001
From c1beadb3617ad518545aed415dfa659b9cb57906 Mon Sep 17 00:00:00 2001
From: Michal Hrusecky <Michal@Hrusecky.net>
Date: Wed, 7 Mar 2018 17:10:32 +0100
Subject: [PATCH] mvebu: Basic MoX support
......@@ -134,13 +134,14 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
...drvark-warm-reset-the-cores-and-card.patch | 121 +++
...support-for-Armada-37xx-rWTM-mailbox.patch | 328 ++++++
...ell-armada37xx-add-rWTM-mailbox-node.patch | 38 +
...-Add-Turris-Mox-rWTM-firmware-driver.patch | 423 ++++++++
...-Add-Turris-Mox-rWTM-firmware-driver.patch | 454 +++++++++
...-marvell-Add-DTS-file-for-Turris-Mox.patch | 931 ++++++++++++++++++
...-cpufreq-armada-37xx-Fix-clock-leak.patch} | 0
...37xx-periph-Fix-switching-CPU-rate-.patch} | 0
...37xx-periph-Fix-wrong-return-value-.patch} | 0
...37xx-periph-Remove-unused-var-num_p.patch} | 0
133 files changed, 14282 insertions(+), 415 deletions(-)
...m64-restart-Armada-3700-restart-code.patch | 6 +-
134 files changed, 14316 insertions(+), 418 deletions(-)
delete mode 100644 target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
delete mode 100644 target/linux/mvebu/patches-4.14/527-PCI-aardvark-allow-to-specify-link-capability.patch
create mode 100644 target/linux/mvebu/patches-4.14/90001-crypto-inside-secure-remove-null-check-before-kfree.patch
......@@ -15505,14 +15506,14 @@ index 0000000000..50cd639322
+
diff --git a/target/linux/mvebu/patches-4.14/90124-crypto-Add-Turris-Mox-rWTM-firmware-driver.patch b/target/linux/mvebu/patches-4.14/90124-crypto-Add-Turris-Mox-rWTM-firmware-driver.patch
new file mode 100644
index 0000000000..f3db234259
index 0000000000..d280a8adf4
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/90124-crypto-Add-Turris-Mox-rWTM-firmware-driver.patch
@@ -0,0 +1,423 @@
+From c2bb9b2bd14c7f702088d6168f984c40e135cb8d Mon Sep 17 00:00:00 2001
@@ -0,0 +1,454 @@
+From d32e378c944b63f21d72206bcfd1e634a317099e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
+Date: Mon, 26 Nov 2018 12:23:05 +0100
+Subject: [PATCH 124/125] crypto: Add Turris Mox rWTM firmware driver
+Subject: [PATCH 124/126] crypto: Add Turris Mox rWTM firmware driver
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
......@@ -15530,8 +15531,8 @@ index 0000000000..f3db234259
+---
+ drivers/crypto/Kconfig | 15 ++
+ drivers/crypto/Makefile | 1 +
+ drivers/crypto/turris-mox-rwtm.c | 351 +++++++++++++++++++++++++++++++
+ 3 files changed, 367 insertions(+)
+ drivers/crypto/turris-mox-rwtm.c | 382 +++++++++++++++++++++++++++++++
+ 3 files changed, 398 insertions(+)
+ create mode 100644 drivers/crypto/turris-mox-rwtm.c
+
+diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
......@@ -15574,10 +15575,10 @@ index 0000000000..f3db234259
+ obj-$(CONFIG_CRYPTO_DEV_VMX) += vmx/
+diff --git a/drivers/crypto/turris-mox-rwtm.c b/drivers/crypto/turris-mox-rwtm.c
+new file mode 100644
+index 000000000000..cb896d610329
+index 000000000000..212337293b38
+--- /dev/null
++++ b/drivers/crypto/turris-mox-rwtm.c
+@@ -0,0 +1,351 @@
+@@ -0,0 +1,382 @@
++// SPDX-License-Identifier: GPL-2.0+
++/*
++ * Turris Mox rWTM firmware driver
......@@ -15630,6 +15631,7 @@ index 0000000000..f3db234259
++ /* board information */
++ u64 serial_number;
++ int board_version, ram_size;
++ u8 mac_address1[6], mac_address2[6];
++ u8 pubkey[135];
++ u8 last_sig[136];
++ int last_sig_done;
......@@ -15648,6 +15650,8 @@ index 0000000000..f3db234259
++MOX_ATTR(serial_number, "%016llX\n");
++MOX_ATTR(board_version, "%i\n");
++MOX_ATTR(ram_size, "%i\n");
++MOX_ATTR(mac_address1, "%pM\n");
++MOX_ATTR(mac_address2, "%pM\n");
++MOX_ATTR(pubkey, "%s\n");
++
++static ssize_t
......@@ -15663,6 +15667,18 @@ index 0000000000..f3db234259
++ return 136;
++}
++
++static void be32_to_cpu_array(u32 *buf, int n)
++{
++ for (; n > 0; --n, ++buf)
++ *buf = be32_to_cpu(*buf);
++}
++
++static void cpu_to_be32_array(u32 *buf, int n)
++{
++ for (; n > 0; --n, ++buf)
++ *buf = cpu_to_be32(*buf);
++}
++
++static ssize_t
++mox_do_sign_store(struct device *dev, struct device_attribute *a,
++ const char *buf, size_t count)
......@@ -15683,6 +15699,7 @@ index 0000000000..f3db234259
++
++ memset(rwtm->buf, 0, 4);
++ memcpy(rwtm->buf + 4, buf, 64);
++ be32_to_cpu_array(rwtm->buf, 17);
++
++ msg.command = MBOX_CMD_SIGN;
++ msg.args[0] = 1;
......@@ -15702,6 +15719,7 @@ index 0000000000..f3db234259
++ goto unlock_mutex;
++
++ memcpy(rwtm->last_sig, rwtm->buf + 68, 136);
++ cpu_to_be32_array((u32 *) rwtm->last_sig, 34);
++ rwtm->last_sig_done = 1;
++
++ mutex_unlock(&rwtm->busy);
......@@ -15717,6 +15735,8 @@ index 0000000000..f3db234259
++ &dev_attr_mox_serial_number.attr,
++ &dev_attr_mox_board_version.attr,
++ &dev_attr_mox_ram_size.attr,
++ &dev_attr_mox_mac_address1.attr,
++ &dev_attr_mox_mac_address2.attr,
++ &dev_attr_mox_pubkey.attr,
++ &dev_attr_mox_do_sign.attr,
++ NULL
......@@ -15743,6 +15763,16 @@ index 0000000000..f3db234259
++ return MBOX_STS_VALUE(retval);
++}
++
++static void reply_to_mac(u8 *mac, u32 t1, u32 t2)
++{
++ mac[0] = t1 >> 8;
++ mac[1] = t1;
++ mac[2] = t2 >> 24;
++ mac[3] = t2 >> 16;
++ mac[4] = t2 >> 8;
++ mac[5] = t2;
++}
++
++static int mox_board_info(struct mox_rwtm *rwtm)
++{
++ struct armada_37xx_rwtm_tx_msg msg;
......@@ -15767,6 +15797,8 @@ index 0000000000..f3db234259
++ rwtm->serial_number |= reply->status[0];
++ rwtm->board_version = reply->status[2];
++ rwtm->ram_size = reply->status[3];
++ reply_to_mac(rwtm->mac_address1, reply->status[4], reply->status[5]);
++ reply_to_mac(rwtm->mac_address2, reply->status[6], reply->status[7]);
++
++ pr_info("Turris Mox serial number %016llX\n", rwtm->serial_number);
++ pr_info(" board version %i\n", rwtm->board_version);
......@@ -15930,7 +15962,7 @@ index 0000000000..f3db234259
++MODULE_DESCRIPTION("Turris Mox rWTM firmware driver");
++MODULE_AUTHOR("Marek Behun <marek.behun@nic.cz>");
+--
+2.19.2
+2.20.1
+
diff --git a/target/linux/mvebu/patches-4.14/90125-ARM64-dts-marvell-Add-DTS-file-for-Turris-Mox.patch b/target/linux/mvebu/patches-4.14/90125-ARM64-dts-marvell-Add-DTS-file-for-Turris-Mox.patch
new file mode 100644
......@@ -16885,6 +16917,27 @@ diff --git a/target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Re
similarity index 100%
rename from target/linux/mvebu/patches-4.14/512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch
rename to target/linux/mvebu/patches-4.14/99512-clk-mvebu-armada-37xx-periph-Remove-unused-var-num_p.patch
diff --git a/target/linux/mvebu/patches-4.14/9999-arm64-restart-Armada-3700-restart-code.patch b/target/linux/mvebu/patches-4.14/9999-arm64-restart-Armada-3700-restart-code.patch
index b442f71bee..e063bbaca9 100644
--- a/target/linux/mvebu/patches-4.14/9999-arm64-restart-Armada-3700-restart-code.patch
+++ b/target/linux/mvebu/patches-4.14/9999-arm64-restart-Armada-3700-restart-code.patch
@@ -1,7 +1,7 @@
-From d419edef1a2429acfa35341eb6fbfaea3b6c87c4 Mon Sep 17 00:00:00 2001
+From 69abf3c124adfb41f5dec58cac50457cff6b4557 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
Date: Mon, 14 Jan 2019 17:00:04 +0100
-Subject: [PATCH] arm64: restart: Armada 3700 restart code
+Subject: [PATCH 126/126] arm64: restart: Armada 3700 restart code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -40,5 +40,5 @@ index 9e773732520c..2ae392c218fc 100644
/*
* Whoops - the architecture was unable to reboot.
--
-2.19.2
+2.20.1
--
2.20.1
 
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment