diff --git a/README.md b/README.md index d2d35ddb..28aa92a6 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The default git branch builds images with the following: * includes history from AREDN nightly build 176 * olsrd upgrade from 0.6.7 to 0.9.6.2 -* fixed to OpenWrt v18.06.0 +* fixed to OpenWrt v18.06.1 * added Mikrotik basebox 2 and 5 * added tp-link cp210 v2.0, v3.0, and cpe510 v2.0 * both 64Mb and 32Mb devices are stable diff --git a/openwrt.mk b/openwrt.mk index 90dca2b8..f7e34154 100644 --- a/openwrt.mk +++ b/openwrt.mk @@ -2,5 +2,5 @@ OPENWRT_SRC=https://github.com/openwrt/openwrt.git # what branch, tag or commit in this repo? -OPENWRT_COMMIT=v18.06.0 +OPENWRT_COMMIT=v18.06.1 diff --git a/patches/003-re-add-patch-for-AT8032-Ethernet-PHY.patch b/patches/003-re-add-patch-for-AT8032-Ethernet-PHY.patch deleted file mode 100644 index 8c52f2a1..00000000 --- a/patches/003-re-add-patch-for-AT8032-Ethernet-PHY.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 20c64dabb67b210c1148820e626fbe0b1dc994f6 Mon Sep 17 00:00:00 2001 -From: Daniel Golle -Date: Tue, 31 Jul 2018 04:50:38 +0200 -Subject: [PATCH] kernel: re-add patch for AT8032 Ethernet PHY - -The patch was wrongly removed by a kernel version bump to 4.9.106 in -the believe that it was merged upstream thow it wasn't. This lead to -unrecoverable link losses on devices which use those PHYs such as -many ubnt single-port CPEs. - -Fixes: 6f8eb1b50f ("kernel: bump 4.9 to 4.9.106 for 18.06") -Signed-off-by: Daniel Golle -(cherry picked from commit a497e47762) ---- - .../902-at803x-add-reset-gpio-pdata.patch | 8 +-- - ...et-phy-at803x-add-support-for-AT8032.patch | 70 +++++++++++++++++++ - ...-at803x-allow-to-configure-via-pdata.patch | 12 ++-- - ...net-phy-at803x-fix-at8033-sgmii-mode.patch | 2 +- - 4 files changed, 81 insertions(+), 11 deletions(-) - create mode 100644 target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch - -Index: openwrt/target/linux/ar71xx/patches-4.9/902-at803x-add-reset-gpio-pdata.patch -=================================================================== ---- openwrt.orig/target/linux/ar71xx/patches-4.9/902-at803x-add-reset-gpio-pdata.patch -+++ openwrt/target/linux/ar71xx/patches-4.9/902-at803x-add-reset-gpio-pdata.patch -@@ -16,7 +16,7 @@ Signed-off-by: Felix Fietkau mdio.dev; - struct at803x_priv *priv; - struct gpio_desc *gpiod_reset; --@@ -274,6 +275,12 @@ static int at803x_probe(struct phy_devic -- if (phydev->drv->phy_id != ATH8030_PHY_ID) -+@@ -276,6 +277,12 @@ static int at803x_probe(struct phy_devic -+ phydev->drv->phy_id != ATH8032_PHY_ID) - goto does_not_require_reset_workaround; - - + pdata = dev_get_platdata(dev); -@@ -37,7 +37,7 @@ Signed-off-by: Felix Fietkau state == PHY_NOLINK) { -Index: openwrt/target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch -=================================================================== ---- /dev/null -+++ openwrt/target/linux/generic/pending-4.9/180-net-phy-at803x-add-support-for-AT8032.patch -@@ -0,0 +1,70 @@ -+From: Felix Fietkau -+Subject: net: phy: at803x: add support for AT8032 -+ -+Like AT8030, this PHY needs the GPIO reset workaround -+ -+Signed-off-by: Felix Fietkau -+--- -+ -+--- a/drivers/net/phy/at803x.c -++++ b/drivers/net/phy/at803x.c -+@@ -62,6 +62,7 @@ -+ -+ #define ATH8030_PHY_ID 0x004dd076 -+ #define ATH8031_PHY_ID 0x004dd074 -++#define ATH8032_PHY_ID 0x004dd023 -+ #define ATH8035_PHY_ID 0x004dd072 -+ -+ MODULE_DESCRIPTION("Atheros 803x PHY driver"); -+@@ -259,7 +260,8 @@ static int at803x_probe(struct phy_devic -+ if (!priv) -+ return -ENOMEM; -+ -+- if (phydev->drv->phy_id != ATH8030_PHY_ID) -++ if (phydev->drv->phy_id != ATH8030_PHY_ID && -++ phydev->drv->phy_id != ATH8032_PHY_ID) -+ goto does_not_require_reset_workaround; -+ -+ gpiod_reset = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW); -+@@ -335,7 +337,7 @@ static void at803x_link_change_notify(st -+ struct at803x_priv *priv = phydev->priv; -+ -+ /* -+- * Conduct a hardware reset for AT8030 every time a link loss is -++ * Conduct a hardware reset for AT8030/2 every time a link loss is -+ * signalled. This is necessary to circumvent a hardware bug that -+ * occurs when the cable is unplugged while TX packets are pending -+ * in the FIFO. In such cases, the FIFO enters an error mode it -+@@ -447,6 +449,24 @@ static struct phy_driver at803x_driver[] -+ .aneg_done = at803x_aneg_done, -+ .ack_interrupt = &at803x_ack_interrupt, -+ .config_intr = &at803x_config_intr, -++}, { -++ /* ATHEROS 8032 */ -++ .phy_id = ATH8032_PHY_ID, -++ .name = "Atheros 8032 ethernet", -++ .phy_id_mask = 0xffffffef, -++ .probe = at803x_probe, -++ .config_init = at803x_config_init, -++ .link_change_notify = at803x_link_change_notify, -++ .set_wol = at803x_set_wol, -++ .get_wol = at803x_get_wol, -++ .suspend = at803x_suspend, -++ .resume = at803x_resume, -++ .features = PHY_BASIC_FEATURES, -++ .flags = PHY_HAS_INTERRUPT, -++ .config_aneg = genphy_config_aneg, -++ .read_status = genphy_read_status, -++ .ack_interrupt = at803x_ack_interrupt, -++ .config_intr = at803x_config_intr, -+ } }; -+ -+ module_phy_driver(at803x_driver); -+@@ -454,6 +474,7 @@ module_phy_driver(at803x_driver); -+ static struct mdio_device_id __maybe_unused atheros_tbl[] = { -+ { ATH8030_PHY_ID, 0xffffffef }, -+ { ATH8031_PHY_ID, 0xffffffef }, -++ { ATH8032_PHY_ID, 0xffffffef }, -+ { ATH8035_PHY_ID, 0xffffffef }, -+ { } -+ }; -Index: openwrt/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch -=================================================================== ---- openwrt.orig/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch -+++ openwrt/target/linux/generic/pending-4.9/734-net-phy-at803x-allow-to-configure-via-pdata.patch -@@ -40,7 +40,7 @@ Signed-off-by: Gabor Juhos priv; -@@ -100,8 +100,8 @@ Signed-off-by: Gabor Juhos mdio.dev); - - /* -- * Conduct a hardware reset for AT8030 every time a link loss is --@@ -361,6 +399,24 @@ static void at803x_link_change_notify(st -+ * Conduct a hardware reset for AT8030/2 every time a link loss is -+@@ -363,6 +401,24 @@ static void at803x_link_change_notify(st - } else { - priv->phy_reset = false; - } -Index: openwrt/target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch -=================================================================== ---- openwrt.orig/target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch -+++ openwrt/target/linux/generic/pending-4.9/735-net-phy-at803x-fix-at8033-sgmii-mode.patch -@@ -24,7 +24,7 @@ Signed-off-by: Roman Yeryomin -Date: Mon, 30 Jul 2018 15:06:14 +0530 -Subject: [PATCH] fix compilation failure when luasrcdiet is being copied to - non existing directory - -Signed-off-by: Jaymin Patel -Index: openwrt/feeds/luci/modules/luci-base/Makefile -=================================================================== ---- openwrt.orig/feeds/luci/modules/luci-base/Makefile -+++ openwrt/feeds/luci/modules/luci-base/Makefile -@@ -41,6 +41,7 @@ endef - - define Host/Install - $(INSTALL_DIR) $(1)/bin -+ $(INSTALL_DIR) $(1)/lib/lua/5.1 - $(INSTALL_BIN) src/po2lmo $(1)/bin/po2lmo - $(INSTALL_BIN) $(HOST_BUILD_DIR)/bin/luasrcdiet $(1)/bin/luasrcdiet - $(CP) $(HOST_BUILD_DIR)/luasrcdiet $(1)/lib/lua/5.1/ diff --git a/patches/series b/patches/series index da6ab0e5..59627314 100644 --- a/patches/series +++ b/patches/series @@ -1,8 +1,6 @@ 001-add_support_for_TP-Link_CPE510_v2.patch 001-add_support_for_TP-Link_CPE210_v3.patch 002-firmware-check-fix.patch -003-re-add-patch-for-AT8032-Ethernet-PHY.patch -200-luasrcdiet-luci-build.patch 700-cpe210.patch 701-extended-spectrum.patch 702-enable-country-hx.patch