From 463f5bafed293176165365a46e67a467ed2cb8f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Thu, 15 Aug 2019 10:24:05 +0200
Subject: [PATCH] patches/openwrt: refresh Mox support kernel patch
---
.../wip/0004-mvebu-Basic-MoX-support.patch | 74 ++++++-------------
1 file changed, 21 insertions(+), 53 deletions(-)
diff --git a/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch b/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
index 203e3563a..d41f731c4 100644
--- a/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
+++ b/patches/openwrt/wip/0004-mvebu-Basic-MoX-support.patch
@@ -1,4 +1,4 @@
-From f04b73c7cbb0032d5be5e90f40cf5c51be234ce4 Mon Sep 17 00:00:00 2001
+From 8e259b72b3fd9b71d8226dda25b43726a53df08b 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
@@ -53,8 +53,8 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
...e-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch} | 18 +-
...a-add-module-EEPROM-reading-support.patch} | 13 +-
...d-phy-remove-fixed_phy_update_state.patch} | 17 +-
- ...eprom-ethtool-access-into-netdev-co.patch} | 38 +-
- ...p-use-netdev-sfp_bus-for-start-stop.patch} | 9 +-
+ ...eprom-ethtool-access-into-netdev-co.patch} | 34 +-
+ ...p-use-netdev-sfp_bus-for-start-stop.patch} | 3 +
...-marvell-10G-phy-support-to-use-SFP.patch} | 11 +-
...tch => 90047-sfp-add-sfp-compatible.patch} | 7 +-
...armada-37xx-periph-cosmetic-changes.patch} | 21 +-
@@ -136,8 +136,7 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
...-marvell-Add-DTS-file-for-Turris-Mox.patch | 931 ++++++++++++++++++
...64-restart-Armada-3700-restart-code.patch} | 6 +-
...-cpufreq-armada-37xx-Fix-clock-leak.patch} | 0
-<<<<<<< HEAD
- 130 files changed, 14299 insertions(+), 307 deletions(-)
+ 129 files changed, 14258 insertions(+), 302 deletions(-)
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
create mode 100644 target/linux/mvebu/patches-4.14/90002-crypto-inside-secure-do-not-use-areq-result-for-part.patch
@@ -182,8 +181,8 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
rename target/linux/mvebu/patches-4.14/{405-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch => 90041-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch} (72%)
rename target/linux/mvebu/patches-4.14/{406-net-mvneta-add-module-EEPROM-reading-support.patch => 90042-net-mvneta-add-module-EEPROM-reading-support.patch} (74%)
rename target/linux/mvebu/patches-4.14/{407-phy-fixed-phy-remove-fixed_phy_update_state.patch => 90043-phy-fixed-phy-remove-fixed_phy_update_state.patch} (78%)
- rename target/linux/mvebu/patches-4.14/{408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch => 90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch} (78%)
- rename target/linux/mvebu/patches-4.14/{409-sfp-use-netdev-sfp_bus-for-start-stop.patch => 90045-sfp-use-netdev-sfp_bus-for-start-stop.patch} (79%)
+ rename target/linux/mvebu/patches-4.14/{408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch => 90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch} (81%)
+ rename target/linux/mvebu/patches-4.14/{409-sfp-use-netdev-sfp_bus-for-start-stop.patch => 90045-sfp-use-netdev-sfp_bus-for-start-stop.patch} (98%)
rename target/linux/mvebu/patches-4.14/{410-sfp-hack-allow-marvell-10G-phy-support-to-use-SFP.patch => 90046-sfp-hack-allow-marvell-10G-phy-support-to-use-SFP.patch} (93%)
rename target/linux/mvebu/patches-4.14/{411-sfp-add-sfp-compatible.patch => 90047-sfp-add-sfp-compatible.patch} (84%)
rename target/linux/mvebu/patches-4.14/{500-clk-mvebu-armada-37xx-periph-cosmetic-changes.patch => 90048-clk-mvebu-armada-37xx-periph-cosmetic-changes.patch} (73%)
@@ -4163,7 +4162,7 @@ diff --git a/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-informat
similarity index 99%
rename from target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch
rename to target/linux/mvebu/patches-4.14/90037-sfp-display-SFP-module-information.patch
-index ccc9896..ead2977 100644
+index c531c37..9b6e7ab 100644
--- a/target/linux/mvebu/patches-4.14/402-sfp-display-SFP-module-information.patch
+++ b/target/linux/mvebu/patches-4.14/90037-sfp-display-SFP-module-information.patch
@@ -288,3 +288,6 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
@@ -5016,10 +5015,10 @@ index 71c2f45..c45f34d 100644
+2.21.0
+
diff --git a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch b/target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
-similarity index 78%
+similarity index 81%
rename from target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
rename to target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
-index 3fd07d2..d6f3f75 100644
+index a5efa25..1c0b97c 100644
--- a/target/linux/mvebu/patches-4.14/408-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
+++ b/target/linux/mvebu/patches-4.14/90044-sfp-move-module-eeprom-ethtool-access-into-netdev-co.patch
@@ -1,21 +1,24 @@
@@ -5061,20 +5060,7 @@ index 3fd07d2..d6f3f75 100644
.set_link_ksettings = mvneta_ethtool_set_link_ksettings,
.get_wol = mvneta_ethtool_get_wol,
.set_wol = mvneta_ethtool_set_wol,
-@@ -47,9 +50,11 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
- .get_eee = mvneta_ethtool_get_eee,
- .set_eee = mvneta_ethtool_set_eee,
- };
-+diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
-+index 5bfc961e53c9..fd0944c209c2 100644
- --- a/drivers/net/phy/phylink.c
- +++ b/drivers/net/phy/phylink.c
--@@ -1058,34 +1058,6 @@ int phylink_ethtool_set_pauseparam(struc
-+@@ -1058,34 +1058,6 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl,
- }
- EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam);
-
-@@ -84,9 +89,11 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+@@ -84,9 +87,11 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
int phylink_init_eee(struct phylink *pl, bool clk_stop_enable)
{
int ret = -EPROTONOSUPPORT;
@@ -5087,7 +5073,7 @@ index 3fd07d2..d6f3f75 100644
bus->socket_ops->attach(bus->sfp);
if (bus->started)
bus->socket_ops->start(bus->sfp);
-@@ -94,7 +101,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+@@ -94,7 +99,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
bus->registered = true;
return 0;
}
@@ -5096,7 +5082,7 @@ index 3fd07d2..d6f3f75 100644
if (bus->phydev && ops && ops->disconnect_phy)
ops->disconnect_phy(bus->upstream);
}
-@@ -119,6 +126,8 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+@@ -119,6 +124,8 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
return bus->socket_ops->module_eeprom(bus->sfp, ee, data);
}
EXPORT_SYMBOL_GPL(sfp_get_module_eeprom);
@@ -5105,7 +5091,7 @@ index 3fd07d2..d6f3f75 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -57,6 +57,7 @@ struct device;
-@@ -129,7 +138,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+@@ -129,7 +136,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
/* 802.11 specific */
struct wireless_dev;
/* 802.15.4 specific */
@@ -5114,7 +5100,7 @@ index 3fd07d2..d6f3f75 100644
struct netprio_map __rcu *priomap;
#endif
struct phy_device *phydev;
-@@ -137,9 +146,11 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+@@ -137,9 +144,11 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
struct lock_class_key *qdisc_tx_busylock;
struct lock_class_key *qdisc_running_key;
bool proto_down;
@@ -5127,7 +5113,7 @@ index 3fd07d2..d6f3f75 100644
struct ethtool_pauseparam *);
int phylink_ethtool_set_pauseparam(struct phylink *,
struct ethtool_pauseparam *);
-@@ -149,6 +160,8 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+@@ -149,6 +158,8 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
int phylink_init_eee(struct phylink *, bool);
int phylink_get_eee_err(struct phylink *);
int phylink_ethtool_get_eee(struct phylink *, struct ethtool_eee *);
@@ -5136,7 +5122,7 @@ index 3fd07d2..d6f3f75 100644
--- a/net/core/ethtool.c
+++ b/net/core/ethtool.c
@@ -22,6 +22,7 @@
-@@ -179,3 +192,6 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+@@ -179,3 +190,6 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
if (phydev && phydev->drv && phydev->drv->module_eeprom)
return phydev->drv->module_eeprom(phydev, ee, data);
@@ -5144,31 +5130,13 @@ index 3fd07d2..d6f3f75 100644
+2.21.0
+
diff --git a/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch b/target/linux/mvebu/patches-4.14/90045-sfp-use-netdev-sfp_bus-for-start-stop.patch
-similarity index 79%
+similarity index 98%
rename from target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch
rename to target/linux/mvebu/patches-4.14/90045-sfp-use-netdev-sfp_bus-for-start-stop.patch
-index 4db3867..4a058f0 100644
+index 10bd2d0..46a63ba 100644
--- a/target/linux/mvebu/patches-4.14/409-sfp-use-netdev-sfp_bus-for-start-stop.patch
+++ b/target/linux/mvebu/patches-4.14/90045-sfp-use-netdev-sfp_bus-for-start-stop.patch
-@@ -1,13 +1,15 @@
--From 883dc66755313e133a787eba4dfde313fe33525b Mon Sep 17 00:00:00 2001
-+From c0f7b78aa709443779170e4ebbe873e49e99578f Mon Sep 17 00:00:00 2001
- From: Russell King <rmk+kernel@armlinux.org.uk>
- Date: Fri, 14 Apr 2017 16:41:55 +0100
--Subject: sfp: use netdev sfp_bus for start/stop
-+Subject: [PATCH 045/127] sfp: use netdev sfp_bus for start/stop
-
- Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
- ---
- drivers/net/phy/phylink.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-+diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
-+index fd0944c209c2..eb9d9ee24e40 100644
- --- a/drivers/net/phy/phylink.c
- +++ b/drivers/net/phy/phylink.c
- @@ -775,8 +775,8 @@ void phylink_start(struct phylink *pl)
-@@ -32,3 +34,6 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
+@@ -32,3 +32,6 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
phylink_run_resolve_and_disable(pl, PHYLINK_DISABLE_STOPPED);
}
@@ -5216,7 +5184,7 @@ diff --git a/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch b/
similarity index 84%
rename from target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch
rename to target/linux/mvebu/patches-4.14/90047-sfp-add-sfp-compatible.patch
-index d2e7d22..0d6a467 100644
+index 9174765..99f1652 100644
--- a/target/linux/mvebu/patches-4.14/411-sfp-add-sfp-compatible.patch
+++ b/target/linux/mvebu/patches-4.14/90047-sfp-add-sfp-compatible.patch
@@ -1,7 +1,7 @@
@@ -16613,5 +16581,5 @@ similarity index 100%
rename from target/linux/mvebu/patches-4.14/508-cpufreq-armada-37xx-Fix-clock-leak.patch
rename to target/linux/mvebu/patches-4.14/9508-cpufreq-armada-37xx-Fix-clock-leak.patch
--
-2.22.0
+2.22.1
--
GitLab