Skip to content
Snippets Groups Projects
Verified Commit dcaf2861 authored by Michal Hrusecky's avatar Michal Hrusecky :mouse:
Browse files

mox: Update kernel

parent 065681be
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
patches/openwrt/wip/0001-mvebu-Basic-MoX-support.patch
+ 65
− 35
View file @ dcaf2861
From 534426512d3f7ba0720e48628701f9082edbe9b2 Mon Sep 17 00:00:00 2001
From a7d27b8f9b956a8552d913a28d58f7cefe3d7bc0 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
......@@ -93,14 +93,14 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
...net-phy-phylink-Remove-error-message.patch | 35 +
...0082-net-dsa-Plug-in-PHYLINK-support.patch | 577 +++++++++++
...lper-for-configuring-2500BaseX-modes.patch | 74 ++
...et-dsa-mv88e6xxx-add-PHYLINK-support.patch | 213 +++++
...et-dsa-mv88e6xxx-add-PHYLINK-support.patch | 213 ++++
...8e6xxx-Add-support-to-enabling-pause.patch | 171 ++++
...et-dsa-mv88e6xxx-add-phylink-support.patch | 705 ++++++++++++++
...-mv88e6xxx-Refactor-SERDES-lane-code.patch | 284 ++++++
...88e6xxx-6390-vs-6390X-SERDES-support.patch | 126 +++
...v88e6xxx-88E6141-6341-SERDES-support.patch | 87 ++
...xxx-Rename-sgmii-10g-power-functions.patch | 65 ++
...x-Add-serdes-register-read-write-hel.patch | 107 +++
...x-Add-serdes-register-read-write-hel.patch | 107 ++
...x-2500Base-X-uses-the-1000Base-X-SER.patch | 34 +
...t-dsa-mv88e6xxx-Cache-the-port-cmode.patch | 439 +++++++++
...x-Power-on-off-SERDES-on-cmode-chang.patch | 53 +
......@@ -120,7 +120,7 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
...x-fix-races-between-lock-and-irq-fre.patch | 102 ++
...-dsa-mv88e6xxx-Share-main-switch-IRQ.patch | 29 +
...x-Fix-88E6141-6341-2500mbps-SERDES-s.patch | 103 ++
...eta-Fix-napi-structure-mixup-on-arma.patch | 107 +++
...eta-Fix-napi-structure-mixup-on-arma.patch | 107 ++
...fix-mvneta_config_rss-on-armada-3700.patch | 77 ++
...-armada-37xx-Correct-mpp-definitions.patch | 108 +++
...l-armada-37xx-mark-the-gpio-controll.patch | 56 ++
......@@ -130,10 +130,10 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
...hdog-Document-armada-37xx-wdt-bindin.patch | 52 +
...tchdog-add-documentation-for-armada-.patch | 37 +
...l-armada-37xx-add-nodes-to-support-w.patch | 44 +
...drvark-warm-reset-the-cores-and-card.patch | 90 ++
...-marvell-Add-DTS-file-for-Turris-Mox.patch | 905 ++++++++++++++++++
...drvark-warm-reset-the-cores-and-card.patch | 115 +++
...-marvell-Add-DTS-file-for-Turris-Mox.patch | 910 ++++++++++++++++++
...-cpufreq-armada-37xx-Fix-clock-leak.patch} | 0
126 files changed, 13436 insertions(+), 372 deletions(-)
126 files changed, 13466 insertions(+), 372 deletions(-)
delete mode 100644 target/linux/mvebu/patches-4.14/450-reprobe_sfp_phy.patch
create mode 100644 target/linux/mvebu/patches-4.14/90001-crypto-inside-secure-remove-null-check-before-kfree.patch
create mode 100644 target/linux/mvebu/patches-4.14/90002-crypto-inside-secure-do-not-use-areq-result-for-part.patch
......@@ -14937,11 +14937,11 @@ index 0000000..acbba76
+
diff --git a/target/linux/mvebu/patches-4.14/90121-PCI-aadrvark-warm-reset-the-cores-and-card.patch b/target/linux/mvebu/patches-4.14/90121-PCI-aadrvark-warm-reset-the-cores-and-card.patch
new file mode 100644
index 0000000..09391ea
index 0000000..13128e6
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/90121-PCI-aadrvark-warm-reset-the-cores-and-card.patch
@@ -0,0 +1,90 @@
+From 4039bc6263e4306bc8ceac6e2a381ec41d9f2221 Mon Sep 17 00:00:00 2001
@@ -0,0 +1,115 @@
+From 2bb282b437d76b4375988ed754b1be30f0f6cb43 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
+Date: Wed, 24 Oct 2018 16:55:11 +0200
+Subject: [PATCH 121/122] PCI: aadrvark: warm reset the cores and card
......@@ -14957,10 +14957,10 @@ index 0000000..09391ea
+ drivers/pci/host/pci-aardvark.c | 46 +++++++++++++++++++++++++++++++--
+ 1 file changed, 44 insertions(+), 2 deletions(-)
+
+Index: linux-4.14.78/drivers/pci/host/pci-aardvark.c
+===================================================================
+--- linux-4.14.78.orig/drivers/pci/host/pci-aardvark.c
++++ linux-4.14.78/drivers/pci/host/pci-aardvark.c
+diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
+index 50e8addc22f9..5610fcb3f426 100644
+--- a/drivers/pci/host/pci-aardvark.c
++++ b/drivers/pci/host/pci-aardvark.c
+@@ -21,6 +21,7 @@
+ #include <linux/platform_device.h>
+ #include <linux/of_address.h>
......@@ -14979,29 +14979,51 @@ index 0000000..09391ea
+
+ /* PCIe Central Interrupts Registers */
+ #define CENTRAL_INT_BASE_ADDR 0x1b000
+@@ -270,6 +274,21 @@ static void advk_pcie_set_ob_win(struct
+@@ -270,8 +274,25 @@ static void advk_pcie_set_ob_win(struct advk_pcie *pcie,
+ advk_writel(pcie, match_ls | BIT(0), OB_WIN_MATCH_LS(win_num));
+ }
+
++static void advk_pcie_warm_reset(struct advk_pcie *pcie)
++{
++ u32 reg;
++ u32 reg;
++
++ reg = advk_readl(pcie, CTRL_WARM_RESET_REG);
++ reg |= CTRL_PCIE_CORE_WARM_RESET | CTRL_PHY_CORE_WARM_RESET;
++ advk_writel(pcie, reg, CTRL_WARM_RESET_REG);
++ reg = advk_readl(pcie, CTRL_WARM_RESET_REG);
++ reg |= CTRL_PCIE_CORE_WARM_RESET | CTRL_PHY_CORE_WARM_RESET;
++ advk_writel(pcie, reg, CTRL_WARM_RESET_REG);
++
++ mdelay(100);
++ mdelay(100);
++
++ reg = advk_readl(pcie, CTRL_WARM_RESET_REG);
++ reg &= ~(CTRL_PCIE_CORE_WARM_RESET | CTRL_PHY_CORE_WARM_RESET);
++ advk_writel(pcie, reg, CTRL_WARM_RESET_REG);
++ reg = advk_readl(pcie, CTRL_WARM_RESET_REG);
++ reg &= ~(CTRL_PCIE_CORE_WARM_RESET | CTRL_PHY_CORE_WARM_RESET);
++ advk_writel(pcie, reg, CTRL_WARM_RESET_REG);
++}
++
+ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
+ {
+ struct device *dev = &pcie->pdev->dev;
+@@ -955,6 +974,8 @@ static int advk_pcie_probe(struct platfo
++ struct device *dev = &pcie->pdev->dev;
++ struct device_node *node = dev->of_node;
+ u32 reg;
+ int i;
+
+@@ -311,10 +332,15 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie)
+ PCIE_CORE_CTRL2_TD_ENABLE;
+ advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
+
+- /* Set GEN2 */
++ /* Set GEN */
+ reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
+ reg &= ~PCIE_GEN_SEL_MSK;
+- reg |= SPEED_GEN_2;
++ if (of_pci_get_max_link_speed(node) == 1)
++ reg |= SPEED_GEN_1;
++ if (of_pci_get_max_link_speed(node) == 3)
++ reg |= SPEED_GEN_3;
++ else
++ reg |= SPEED_GEN_2;
+ advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+
+ /* Set lane X1 */
+@@ -948,6 +974,8 @@ static int advk_pcie_probe(struct platform_device *pdev)
+ struct pci_bus *bus, *child;
+ struct pci_host_bridge *bridge;
+ int ret, irq;
......@@ -15010,7 +15032,7 @@ index 0000000..09391ea
+
+ bridge = devm_pci_alloc_host_bridge(dev, sizeof(struct advk_pcie));
+ if (!bridge)
+@@ -977,6 +998,20 @@ static int advk_pcie_probe(struct platfo
+@@ -970,6 +998,20 @@ static int advk_pcie_probe(struct platform_device *pdev)
+ return ret;
+ }
+
......@@ -15031,13 +15053,16 @@ index 0000000..09391ea
+ ret = advk_pcie_parse_request_of_pci_ranges(pcie);
+ if (ret) {
+ dev_err(dev, "Failed to parse resources\n");
+--
+2.19.1
+
diff --git a/target/linux/mvebu/patches-4.14/90122-ARM64-dts-marvell-Add-DTS-file-for-Turris-Mox.patch b/target/linux/mvebu/patches-4.14/90122-ARM64-dts-marvell-Add-DTS-file-for-Turris-Mox.patch
new file mode 100644
index 0000000..d4b7df0
index 0000000..eb36c1e
--- /dev/null
+++ b/target/linux/mvebu/patches-4.14/90122-ARM64-dts-marvell-Add-DTS-file-for-Turris-Mox.patch
@@ -0,0 +1,905 @@
+From 122a85d5ba5996c18e0b6536249bc2bfec8b0193 Mon Sep 17 00:00:00 2001
@@ -0,0 +1,910 @@
+From 642cfb91ff8b2160851539ae014b5cfca23b2d05 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
+Date: Wed, 24 Oct 2018 17:01:12 +0200
+Subject: [PATCH 122/122] ARM64: dts: marvell: Add DTS file for Turris Mox
......@@ -15102,10 +15127,10 @@ index 0000000..d4b7df0
+ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb
+diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+new file mode 100644
+index 000000000000..3ba9196de562
+index 000000000000..5668415ad5ba
+--- /dev/null
++++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+@@ -0,0 +1,833 @@
+@@ -0,0 +1,837 @@
++// SPDX-License-Identifier: GPL-2.0+ or X11
++/*
++ * Device Tree file for CZ.NIC Turris Mox Board
......@@ -15889,12 +15914,12 @@ index 0000000..d4b7df0
++
++ partition@0 {
++ label = "secure-firmware";
++ reg = <0x0 0x15000>;
++ reg = <0x0 0x20000>;
++ };
++
++ partition@15000 {
++ partition@20000 {
++ label = "u-boot";
++ reg = <0x15000 0x16b000>;
++ reg = <0x20000 0x160000>;
++ };
++
++ partition@180000 {
......@@ -15904,9 +15929,14 @@ index 0000000..d4b7df0
++
++ partition@190000 {
++ label = "Rescue system";
++ reg = <0x190000 0x670000>;
++ reg = <0x190000 0x660000>;
++ };
++ partition@7f0000 {
++ label = "DTB";
++ reg = <0x7f0000 0x10000>;
++ };
++ };
++ };
++
++ moxtet@1 {
++ #address-cells = <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