From 9a16bcfd790e93b9b5f1e6388e9c24620f33723f Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Thu, 16 May 2019 12:32:14 +0200 Subject: [PATCH 1/7] firmware: intel-microcode: bump to 20190514 * New Microcodes: sig 0x00030678, pf_mask 0x02, 2019-04-22, rev 0x0838, size 52224 sig 0x00030678, pf_mask 0x0c, 2019-04-22, rev 0x0838, size 52224 sig 0x00030679, pf_mask 0x0f, 2019-04-23, rev 0x090c, size 52224 sig 0x000406c3, pf_mask 0x01, 2019-04-23, rev 0x0368, size 69632 sig 0x000406c4, pf_mask 0x01, 2019-04-23, rev 0x0411, size 68608 sig 0x00050657, pf_mask 0xbf, 2019-02-27, rev 0x5000021, size 47104 sig 0x000806e9, pf_mask 0x10, 2018-10-18, rev 0x009e, size 98304 sig 0x000806eb, pf_mask 0xd0, 2018-10-25, rev 0x00a4, size 99328 sig 0x000806ec, pf_mask 0x94, 2019-02-12, rev 0x00b2, size 98304 sig 0x000906ec, pf_mask 0x22, 2018-09-29, rev 0x00a2, size 98304 sig 0x000906ed, pf_mask 0x22, 2019-02-04, rev 0x00b0, size 97280 * Updated Microcodes: sig 0x000206a7, pf_mask 0x12, 2019-02-17, rev 0x002f, size 12288 sig 0x000306a9, pf_mask 0x12, 2019-02-13, rev 0x0021, size 14336 sig 0x000306c3, pf_mask 0x32, 2019-02-26, rev 0x0027, size 23552 sig 0x000306d4, pf_mask 0xc0, 2019-03-07, rev 0x002d, size 19456 sig 0x000306e4, pf_mask 0xed, 2019-03-14, rev 0x042e, size 16384 sig 0x000306e7, pf_mask 0xed, 2019-03-14, rev 0x0715, size 17408 sig 0x000306f2, pf_mask 0x6f, 2019-03-01, rev 0x0043, size 34816 sig 0x000306f4, pf_mask 0x80, 2019-03-01, rev 0x0014, size 18432 sig 0x00040651, pf_mask 0x72, 2019-02-26, rev 0x0025, size 21504 sig 0x00040661, pf_mask 0x32, 2019-02-26, rev 0x001b, size 25600 sig 0x00040671, pf_mask 0x22, 2019-03-07, rev 0x0020, size 14336 sig 0x000406e3, pf_mask 0xc0, 2019-04-01, rev 0x00cc, size 100352 sig 0x000406f1, pf_mask 0xef, 2019-03-02, rev 0xb000036, size 30720 sig 0x00050654, pf_mask 0xb7, 2019-04-02, rev 0x200005e, size 32768 sig 0x00050662, pf_mask 0x10, 2019-03-23, rev 0x001a, size 32768 sig 0x00050663, pf_mask 0x10, 2019-03-23, rev 0x7000017, size 24576 sig 0x00050664, pf_mask 0x10, 2019-03-23, rev 0xf000015, size 23552 sig 0x00050665, pf_mask 0x10, 2019-03-23, rev 0xe00000d, size 19456 sig 0x000506c9, pf_mask 0x03, 2019-01-15, rev 0x0038, size 17408 sig 0x000506ca, pf_mask 0x03, 2019-03-01, rev 0x0016, size 15360 sig 0x000506e3, pf_mask 0x36, 2019-04-01, rev 0x00cc, size 100352 sig 0x000506f1, pf_mask 0x01, 2019-03-21, rev 0x002e, size 11264 sig 0x000706a1, pf_mask 0x01, 2019-01-02, rev 0x002e, size 73728 sig 0x000806e9, pf_mask 0x10, 2019-04-01, rev 0x00b4, size 98304 sig 0x000806e9, pf_mask 0xc0, 2019-04-01, rev 0x00b4, size 99328 sig 0x000806ea, pf_mask 0xc0, 2019-04-01, rev 0x00b4, size 99328 sig 0x000806eb, pf_mask 0xd0, 2019-03-30, rev 0x00b8, size 98304 sig 0x000806ec, pf_mask 0x94, 2019-03-30, rev 0x00b8, size 97280 sig 0x000906e9, pf_mask 0x2a, 2019-04-01, rev 0x00b4, size 99328 sig 0x000906ea, pf_mask 0x22, 2019-04-01, rev 0x00b4, size 98304 sig 0x000906eb, pf_mask 0x02, 2019-04-01, rev 0x00b4, size 99328 sig 0x000906ec, pf_mask 0x22, 2019-02-14, rev 0x00ae, size 98304 sig 0x000906ed, pf_mask 0x22, 2019-03-17, rev 0x00b8, size 97280 * Implements MDS mitigation (RIDL, Fallout, Zombieload), INTEL-SA-00223 CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091 Signed-off-by: Zoltan HERPAI --- package/firmware/intel-microcode/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile index 07db9b1f96..2036d378d8 100644 --- a/package/firmware/intel-microcode/Makefile +++ b/package/firmware/intel-microcode/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=intel-microcode -PKG_VERSION:=20180807a +PKG_VERSION:=20190514 PKG_RELEASE:=1 PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).$(PKG_RELEASE).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/i/intel-microcode/ -PKG_HASH:=1a7cb96d5c6a4abac2936236223d9bea79d7442dc1cfe9b712ff8e35374f0f9f +PKG_HASH:=3bead7f29ce9619553e62db7d44438d9143c596cf68ad30ebdc1631af782e377 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-3.$(PKG_VERSION).$(PKG_RELEASE) PKG_BUILD_DEPENDS:=iucode-tool/host From db0933584855446c57278e8f303f9338c5d59961 Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Sun, 25 Aug 2019 22:34:13 +0200 Subject: [PATCH 2/7] firmware: intel-microcode: bump to 20190618 * Implements MDS mitigation (RIDL, Fallout, Zombieload), INTEL-SA-00223 CVE-2018-12126, CVE-2018-12127, CVE-2018-12130, CVE-2019-11091 * Updated Microcodes: sig 0x000206d6, pf_mask 0x6d, 2019-05-21, rev 0x061f, size 18432 sig 0x000206d7, pf_mask 0x6d, 2019-05-21, rev 0x0718, size 19456 Signed-off-by: Zoltan HERPAI --- package/firmware/intel-microcode/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile index 2036d378d8..8c6dbb4451 100644 --- a/package/firmware/intel-microcode/Makefile +++ b/package/firmware/intel-microcode/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=intel-microcode -PKG_VERSION:=20190514 +PKG_VERSION:=20190618 PKG_RELEASE:=1 PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).$(PKG_RELEASE).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/i/intel-microcode/ -PKG_HASH:=3bead7f29ce9619553e62db7d44438d9143c596cf68ad30ebdc1631af782e377 +PKG_HASH:=0026ade98745205841fbab5d298c5efe6c571438f55619aeb1f2686f95a0f4b8 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-3.$(PKG_VERSION).$(PKG_RELEASE) PKG_BUILD_DEPENDS:=iucode-tool/host From b16d76bf40727672e49b2050c11a36947f87a614 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sun, 10 Nov 2019 20:54:38 +0100 Subject: [PATCH 3/7] ramips: correct Netgear WNDR3700v5 button flag This adjusts the GPIO state flag to ACTIVE_LOW as FCC pictures indicate the base board is identical to the one of the R6220. Fixes commit 3459013257e0 ("ramips: correct R6220 button flag") Signed-off-by: David Bauer --- target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts b/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts index a8e4b5c632..5cf09ac7c4 100644 --- a/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts +++ b/target/linux/ramips/dts/mt7621_netgear_wndr3700-v5.dts @@ -12,19 +12,19 @@ wps { label = "wps"; - gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; linux,code = ; }; wifi { label = "wifi"; - gpios = <&gpio0 8 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; linux,code = ; }; reset { label = "reset"; - gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>; + gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; linux,code = ; }; }; From aa89bdcd04676b21cbe3e8a7b8df3545a86d947a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 10 Nov 2019 21:33:47 +0100 Subject: [PATCH 4/7] rpcd: update to latest Git HEAD 77ad0de plugin: avoid truncating numeric values Signed-off-by: Jo-Philipp Wich --- package/system/rpcd/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 6f23bbe96e..b0cf7fa24b 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -12,10 +12,10 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/rpcd.git -PKG_SOURCE_DATE:=2019-10-29 -PKG_SOURCE_VERSION:=d442d62dea8d7c5f9bb58f1be257230a469f343f +PKG_SOURCE_DATE:=2019-11-10 +PKG_SOURCE_VERSION:=77ad0de09247b9bdce50f4cecf3e5beb5636f57f PKG_MAINTAINER:=Jo-Philipp Wich -PKG_MIRROR_HASH:=1e06289ec1a639dddf7dcddd6936e20808f41ec7f1b5afc0cc6fda32a8207824 +PKG_MIRROR_HASH:=d36caff85bebbf7fb1b512359243bdbb7d9b16140e0d631afae9de2c3b8e4dff PKG_LICENSE:=ISC PKG_LICENSE_FILES:= From 32287b39137eaa0d469a1e3716c74669cf29dff4 Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Sat, 9 Nov 2019 13:01:50 +0100 Subject: [PATCH 5/7] firmware: intel-microcode: bump to 20190918 * New upstream microcode datafile 20190918 *Might* contain mitigations for INTEL-SA-00247 (RAMBleed), given the set of processors being updated. * Updated Microcodes: sig 0x000306d4, pf_mask 0xc0, 2019-06-13, rev 0x002e, size 19456 sig 0x000306f4, pf_mask 0x80, 2019-06-17, rev 0x0016, size 18432 sig 0x00040671, pf_mask 0x22, 2019-06-13, rev 0x0021, size 14336 sig 0x000406f1, pf_mask 0xef, 2019-06-18, rev 0xb000038, size 30720 sig 0x00050654, pf_mask 0xb7, 2019-07-31, rev 0x2000064, size 33792 sig 0x00050657, pf_mask 0xbf, 2019-08-12, rev 0x500002b, size 51200 sig 0x00050662, pf_mask 0x10, 2019-06-17, rev 0x001c, size 32768 sig 0x00050663, pf_mask 0x10, 2019-06-17, rev 0x7000019, size 24576 sig 0x00050664, pf_mask 0x10, 2019-06-17, rev 0xf000017, size 24576 sig 0x00050665, pf_mask 0x10, 2019-06-17, rev 0xe00000f, size 19456 Signed-off-by: Zoltan HERPAI --- package/firmware/intel-microcode/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/intel-microcode/Makefile b/package/firmware/intel-microcode/Makefile index 8c6dbb4451..de501622de 100644 --- a/package/firmware/intel-microcode/Makefile +++ b/package/firmware/intel-microcode/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=intel-microcode -PKG_VERSION:=20190618 +PKG_VERSION:=20190918 PKG_RELEASE:=1 PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).$(PKG_RELEASE).tar.xz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/i/intel-microcode/ -PKG_HASH:=0026ade98745205841fbab5d298c5efe6c571438f55619aeb1f2686f95a0f4b8 +PKG_HASH:=b7ecb5dd30d71e9b3c2ab184693a876171392e0d80d138c3560c662e5f2a2247 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-3.$(PKG_VERSION).$(PKG_RELEASE) PKG_BUILD_DEPENDS:=iucode-tool/host From 5dc535419fe5f59839686570545fc4180e14d545 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 Nov 2019 00:15:36 +0100 Subject: [PATCH 6/7] ath79: fix identifier for Nanostation M in ath9k caldata extraction When Nanostation M was renamed from ubnt,nano-m to ubnt,nanostation-m in commit f1396ac753cc ("ath79: align naming of Ubiquiti Nanostation M"), the caldata extraction in 10-ath9k-eeprom was overlooked. Signed-off-by: Adrian Schmutzler --- .../generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 6a6484879a..f04fb64fc9 100644 --- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -83,7 +83,7 @@ case "$FIRMWARE" in tplink,tl-wr842n-v1|\ ubnt,airrouter|\ ubnt,bullet-m|\ - ubnt,nano-m|\ + ubnt,nanostation-m|\ ubnt,rocket-m) caldata_extract "art" 0x1000 0x1000 ;; From 1c321237c29202e0ed5c168c625cc89fcabb609c Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 Nov 2019 14:48:17 +0100 Subject: [PATCH 7/7] ramips: split further base-files across subtargets As started in 19724e28c81e ("ramips: split base-files into subtargets"), this moves some smaller left-over files to the appropriate base-files folder of their subtarget: - /etc/init.d/bootcount - /etc/uci-defaults/04_led_migration Signed-off-by: Adrian Schmutzler --- .../etc/uci-defaults/04_led_migration | 18 --------------- .../mt7621/base-files/etc/init.d/bootcount | 11 ++++++++++ .../etc/uci-defaults/04_led_migration | 16 ++++++++++++++ .../base-files/etc/init.d/bootcount | 3 --- .../etc/uci-defaults/04_led_migration | 22 +++++++++++++++++++ .../etc/uci-defaults/04_led_migration | 19 ++++++++++++++++ 6 files changed, 68 insertions(+), 21 deletions(-) rename target/linux/ramips/{ => mt7620}/base-files/etc/uci-defaults/04_led_migration (69%) create mode 100755 target/linux/ramips/mt7621/base-files/etc/init.d/bootcount create mode 100644 target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration rename target/linux/ramips/{ => mt76x8}/base-files/etc/init.d/bootcount (72%) create mode 100644 target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration create mode 100644 target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration diff --git a/target/linux/ramips/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt7620/base-files/etc/uci-defaults/04_led_migration similarity index 69% rename from target/linux/ramips/base-files/etc/uci-defaults/04_led_migration rename to target/linux/ramips/mt7620/base-files/etc/uci-defaults/04_led_migration index e84d02331b..ba1a0df7e6 100644 --- a/target/linux/ramips/base-files/etc/uci-defaults/04_led_migration +++ b/target/linux/ramips/mt7620/base-files/etc/uci-defaults/04_led_migration @@ -6,12 +6,6 @@ board=$(board_name) case "$board" in -fon,fonera-20n) - migrate_leds "^fonera20n:=fonera-20n:" - ;; -intenso,memory2move) - migrate_leds "^m2m:=memory2move:" - ;; lenovo,newifi-y1) migrate_leds "^y1:=newifi-y1:" ;; @@ -21,30 +15,18 @@ lenovo,newifi-y1s) netgear,wn3000rp-v3) migrate_leds "^wn3000rpv3:=wn3000rp-v3:" ;; -netgear,wndr3700-v5) - migrate_leds "^wndr3700v5:=wndr3700-v5:" - ;; tplink,archer-c2-v1) migrate_leds "^c2-v1:=archer-c2-v1:" ;; tplink,archer-c20-v1) migrate_leds "^c20-v1:=archer-c20-v1:" ;; -tplink,archer-c20-v4) - migrate_leds "^c20-v4:=archer-c20-v4:" - ;; tplink,archer-c20i) migrate_leds "^c20i:=archer-c20i:" ;; tplink,archer-c50-v1) migrate_leds "^c50:=archer-c50-v1:" ;; -tplink,archer-c50-v3) - migrate_leds "^c50-v3:=archer-c50-v3:" - ;; -tplink,archer-c50-v4) - migrate_leds "^c50-v4:=archer-c50-v4:" - ;; tplink,archer-mr200) migrate_leds "^mr200:=archer-mr200:" ;; diff --git a/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount b/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount new file mode 100755 index 0000000000..807801a34f --- /dev/null +++ b/target/linux/ramips/mt7621/base-files/etc/init.d/bootcount @@ -0,0 +1,11 @@ +#!/bin/sh /etc/rc.common + +START=99 + +boot() { + case $(board_name) in + samknows,whitebox-v8) + fw_setenv bootcount 0 + ;; + esac +} diff --git a/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration new file mode 100644 index 0000000000..e745c2c5d4 --- /dev/null +++ b/target/linux/ramips/mt7621/base-files/etc/uci-defaults/04_led_migration @@ -0,0 +1,16 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/functions/migrations.sh + +board=$(board_name) + +case "$board" in +netgear,wndr3700-v5) + migrate_leds "^wndr3700v5:=wndr3700-v5:" + ;; +esac + +migrations_apply system + +exit 0 diff --git a/target/linux/ramips/base-files/etc/init.d/bootcount b/target/linux/ramips/mt76x8/base-files/etc/init.d/bootcount similarity index 72% rename from target/linux/ramips/base-files/etc/init.d/bootcount rename to target/linux/ramips/mt76x8/base-files/etc/init.d/bootcount index ad3dd97402..0d64deb9e0 100755 --- a/target/linux/ramips/base-files/etc/init.d/bootcount +++ b/target/linux/ramips/mt76x8/base-files/etc/init.d/bootcount @@ -4,9 +4,6 @@ START=99 boot() { case $(board_name) in - samknows,whitebox-v8) - fw_setenv bootcount 0 - ;; xiaomi,miwifi-nano) fw_setenv flag_boot_success 1 ;; diff --git a/target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration new file mode 100644 index 0000000000..3f9f615c10 --- /dev/null +++ b/target/linux/ramips/mt76x8/base-files/etc/uci-defaults/04_led_migration @@ -0,0 +1,22 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/functions/migrations.sh + +board=$(board_name) + +case "$board" in +tplink,archer-c20-v4) + migrate_leds "^c20-v4:=archer-c20-v4:" + ;; +tplink,archer-c50-v3) + migrate_leds "^c50-v3:=archer-c50-v3:" + ;; +tplink,archer-c50-v4) + migrate_leds "^c50-v4:=archer-c50-v4:" + ;; +esac + +migrations_apply system + +exit 0 diff --git a/target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration b/target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration new file mode 100644 index 0000000000..b1a94bf81b --- /dev/null +++ b/target/linux/ramips/rt305x/base-files/etc/uci-defaults/04_led_migration @@ -0,0 +1,19 @@ +#!/bin/sh + +. /lib/functions.sh +. /lib/functions/migrations.sh + +board=$(board_name) + +case "$board" in +fon,fonera-20n) + migrate_leds "^fonera20n:=fonera-20n:" + ;; +intenso,memory2move) + migrate_leds "^m2m:=memory2move:" + ;; +esac + +migrations_apply system + +exit 0