Skip to content

Commit

Permalink
kernel: bump to 4.9.194, 4.14.146, 4.17.75
Browse files Browse the repository at this point in the history
  • Loading branch information
coolsnowwolf committed Sep 24, 2019
1 parent 5161e81 commit eb05272
Show file tree
Hide file tree
Showing 1,323 changed files with 68,958 additions and 65,271 deletions.
12 changes: 6 additions & 6 deletions include/kernel-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ ifdef CONFIG_TESTING_KERNEL
KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
endif

LINUX_VERSION-4.9 = .192
LINUX_VERSION-4.14 = .143
LINUX_VERSION-4.19 = .72
LINUX_VERSION-4.9 = .194
LINUX_VERSION-4.14 = .146
LINUX_VERSION-4.19 = .75

LINUX_KERNEL_HASH-4.9.192 = 7a1a300cce70a4fd0d49b7fff7b1673159b61c4040c5a7c08ea333a7cb328d54
LINUX_KERNEL_HASH-4.14.143 = 2534f2f03cb937700a03dd85dcf1cb6e6f46fdd29d489580cc3183d6c0643d93
LINUX_KERNEL_HASH-4.19.72 = f9fcb6b3bd29115ac55fc154e300c3dce2044502732f6842ad6c25e6f9f51f6d
LINUX_KERNEL_HASH-4.9.194 = d5f4bb7584e461f1faa9a3f94c2ad292246fe692b0e992e072dac255f806c2e3
LINUX_KERNEL_HASH-4.14.146 = a3c54b887ea3e679382bd4c0536e6a281b071dab2258bd3ee8af75baef2023f5
LINUX_KERNEL_HASH-4.19.75 = dd5e7147e1e4501560fba5beb86dae6bf6ba843518ab3d4cad283de77b651b78

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
Expand Down
2 changes: 1 addition & 1 deletion package/lean/luci-app-ssr-plus/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=1
PKG_RELEASE:=98
PKG_RELEASE:=99

PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
Expand Down
2 changes: 1 addition & 1 deletion target/linux/ar7/patches-4.9/300-add-ac49x-platform.patch
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@

config ATH25
bool "Atheros AR231x/AR531x SoC support"
@@ -1009,6 +1009,7 @@ config MIPS_PARAVIRT
@@ -1006,6 +1006,7 @@ config MIPS_PARAVIRT
endchoice

source "arch/mips/alchemy/Kconfig"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
From 3fe7841bf5a582dc7fd198e5bf70162ea418a22a Mon Sep 17 00:00:00 2001
From: Koen Vandeputte <[email protected]>
Date: Wed, 11 Sep 2019 11:02:19 +0200
Subject: [PATCH] MIPS: ath79: Fix potentially missed IRQ handling during
dispatch

If both interrupts are set in the current implementation
only the 1st will be handled and the 2nd will be skipped
due to the "if else" condition.

Fix this by using the same approach as done for QCA955x
just below it.

Fixes: fce5cc6e0ddc ("MIPS: ath79: add IRQ handling code for AR934X")
Signed-off-by: Koen Vandeputte <[email protected]>
CC: Felix Fietkau <[email protected]>
CC: Gabor Juhos <[email protected]>
CC: James Hogan <[email protected]>
CC: Paul Burton <[email protected]>
CC: Ralf Baechle <[email protected]>
CC: [email protected] # v3.2+
---
arch/mips/ath79/irq.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

--- a/arch/mips/ath79/irq.c
+++ b/arch/mips/ath79/irq.c
@@ -32,15 +32,21 @@ static void ar934x_ip2_irq_dispatch(stru
u32 status;

status = ath79_reset_rr(AR934X_RESET_REG_PCIE_WMAC_INT_STATUS);
+ status &= AR934X_PCIE_WMAC_INT_PCIE_ALL | AR934X_PCIE_WMAC_INT_WMAC_ALL;
+
+ if (status == 0) {
+ spurious_interrupt();
+ return;
+ }

if (status & AR934X_PCIE_WMAC_INT_PCIE_ALL) {
ath79_ddr_wb_flush(3);
generic_handle_irq(ATH79_IP2_IRQ(0));
- } else if (status & AR934X_PCIE_WMAC_INT_WMAC_ALL) {
+ }
+
+ if (status & AR934X_PCIE_WMAC_INT_WMAC_ALL) {
ath79_ddr_wb_flush(4);
generic_handle_irq(ATH79_IP2_IRQ(1));
- } else {
- spurious_interrupt();
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1155,6 +1155,9 @@ config MIPS_MSC
@@ -1152,6 +1152,9 @@ config MIPS_MSC
config MIPS_NILE4
bool

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed.
return;
--- a/arch/mips/ath79/irq.c
+++ b/arch/mips/ath79/irq.c
@@ -56,6 +56,34 @@ static void ar934x_ip2_irq_init(void)
@@ -62,6 +62,34 @@ static void ar934x_ip2_irq_init(void)
irq_set_chained_handler(ATH79_CPU_IRQ(2), ar934x_ip2_irq_dispatch);
}

Expand Down Expand Up @@ -342,7 +342,7 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed.
static void qca955x_ip2_irq_dispatch(struct irq_desc *desc)
{
u32 status;
@@ -143,7 +171,7 @@ void __init arch_init_irq(void)
@@ -149,7 +177,7 @@ void __init arch_init_irq(void)
soc_is_ar913x() || soc_is_ar933x()) {
irq_wb_chan2 = 3;
irq_wb_chan3 = 2;
Expand All @@ -351,15 +351,15 @@ meaning of the bits CPUCLK_FROM_CPUPLL and DDRCLK_FROM_DDRPLL is reversed.
irq_wb_chan3 = 2;
}

@@ -154,6 +182,7 @@ void __init arch_init_irq(void)
@@ -160,6 +188,7 @@ void __init arch_init_irq(void)
else if (soc_is_ar724x() ||
soc_is_ar933x() ||
soc_is_ar934x() ||
+ soc_is_qca953x() ||
soc_is_qca955x())
misc_is_ar71xx = false;
else
@@ -164,6 +193,8 @@ void __init arch_init_irq(void)
@@ -170,6 +199,8 @@ void __init arch_init_irq(void)

if (soc_is_ar934x())
ar934x_ip2_irq_init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
return;
--- a/arch/mips/ath79/irq.c
+++ b/arch/mips/ath79/irq.c
@@ -156,6 +156,87 @@ static void qca955x_irq_init(void)
@@ -162,6 +162,87 @@ static void qca955x_irq_init(void)
irq_set_chained_handler(ATH79_CPU_IRQ(3), qca955x_ip3_irq_dispatch);
}

Expand Down Expand Up @@ -379,7 +379,7 @@
void __init arch_init_irq(void)
{
unsigned irq_wb_chan2 = -1;
@@ -183,7 +264,9 @@ void __init arch_init_irq(void)
@@ -189,7 +270,9 @@ void __init arch_init_irq(void)
soc_is_ar933x() ||
soc_is_ar934x() ||
soc_is_qca953x() ||
Expand All @@ -390,7 +390,7 @@
misc_is_ar71xx = false;
else
BUG();
@@ -197,4 +280,6 @@ void __init arch_init_irq(void)
@@ -203,4 +286,6 @@ void __init arch_init_irq(void)
qca953x_irq_init();
else if (soc_is_qca955x())
qca955x_irq_init();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
static void ar934x_ip2_irq_dispatch(struct irq_desc *desc)
{
u32 status;
@@ -50,8 +53,7 @@ static void ar934x_ip2_irq_init(void)
@@ -56,8 +59,7 @@ static void ar934x_ip2_irq_init(void)

for (i = ATH79_IP2_IRQ_BASE;
i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
Expand All @@ -20,7 +20,7 @@

irq_set_chained_handler(ATH79_CPU_IRQ(2), ar934x_ip2_irq_dispatch);
}
@@ -79,7 +81,7 @@ static void qca953x_irq_init(void)
@@ -85,7 +87,7 @@ static void qca953x_irq_init(void)

for (i = ATH79_IP2_IRQ_BASE;
i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
Expand All @@ -29,7 +29,7 @@

irq_set_chained_handler(ATH79_CPU_IRQ(2), qca953x_ip2_irq_dispatch);
}
@@ -143,15 +145,13 @@ static void qca955x_irq_init(void)
@@ -149,15 +151,13 @@ static void qca955x_irq_init(void)

for (i = ATH79_IP2_IRQ_BASE;
i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
Expand All @@ -47,7 +47,7 @@

irq_set_chained_handler(ATH79_CPU_IRQ(3), qca955x_ip3_irq_dispatch);
}
@@ -222,13 +222,13 @@ static void qca956x_irq_init(void)
@@ -228,13 +228,13 @@ static void qca956x_irq_init(void)

for (i = ATH79_IP2_IRQ_BASE;
i < ATH79_IP2_IRQ_BASE + ATH79_IP2_IRQ_COUNT; i++)
Expand All @@ -63,7 +63,7 @@

irq_set_chained_handler(ATH79_CPU_IRQ(3), qca956x_ip3_irq_dispatch);

@@ -237,12 +237,40 @@ static void qca956x_irq_init(void)
@@ -243,12 +243,40 @@ static void qca956x_irq_init(void)
late_time_init = &qca956x_enable_timer_cb;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--- a/arch/mips/ath79/common.c
+++ b/arch/mips/ath79/common.c
@@ -49,6 +49,8 @@ void ath79_ddr_ctrl_init(void)
if (soc_is_ar913x() || soc_is_ar724x() || soc_is_ar933x()) {
ath79_ddr_wb_flush_base = ath79_ddr_base + 0x7c;
ath79_ddr_pci_win_base = 0;
+ } else if (soc_is_qca953x() || soc_is_qca955x()) {
+ ath79_ddr_wb_flush_base = ath79_ddr_base + 0x9c;
} else {
ath79_ddr_wb_flush_base = ath79_ddr_base + 0x9c;
ath79_ddr_pci_win_base = ath79_ddr_base + 0x7c;
--- a/arch/mips/ath79/irq.c
+++ b/arch/mips/ath79/irq.c
@@ -105,12 +105,12 @@ static void qca955x_ip2_irq_dispatch(str
}

if (status & QCA955X_EXT_INT_PCIE_RC1_ALL) {
- /* TODO: flush DDR? */
+ ath79_ddr_wb_flush(3);
generic_handle_irq(ATH79_IP2_IRQ(0));
}

if (status & QCA955X_EXT_INT_WMAC_ALL) {
- /* TODO: flush DDR? */
+ ath79_ddr_wb_flush(4);
generic_handle_irq(ATH79_IP2_IRQ(1));
}
}
@@ -130,17 +130,17 @@ static void qca955x_ip3_irq_dispatch(str
}

if (status & QCA955X_EXT_INT_USB1) {
- /* TODO: flush DDR? */
+ ath79_ddr_wb_flush(2);
generic_handle_irq(ATH79_IP3_IRQ(0));
}

if (status & QCA955X_EXT_INT_USB2) {
- /* TODO: flush DDR? */
+ ath79_ddr_wb_flush(2);
generic_handle_irq(ATH79_IP3_IRQ(1));
}

if (status & QCA955X_EXT_INT_PCIE_RC2_ALL) {
- /* TODO: flush DDR? */
+ ath79_ddr_wb_flush(3);
generic_handle_irq(ATH79_IP3_IRQ(2));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
*/
--- a/net/ipv6/datagram.c
+++ b/net/ipv6/datagram.c
@@ -478,7 +478,7 @@ int ipv6_recv_error(struct sock *sk, str
@@ -480,7 +480,7 @@ int ipv6_recv_error(struct sock *sk, str
ipv6_iface_scope_id(&sin->sin6_addr,
IP6CB(skb)->iif);
} else {
Expand All @@ -250,7 +250,7 @@
&sin->sin6_addr);
sin->sin6_scope_id = 0;
}
@@ -828,12 +828,12 @@ int ip6_datagram_send_ctl(struct net *ne
@@ -830,12 +830,12 @@ int ip6_datagram_send_ctl(struct net *ne
}

if (fl6->flowlabel&IPV6_FLOWINFO_MASK) {
Expand Down
1 change: 1 addition & 0 deletions target/linux/brcm2708/base-files/etc/board.d/02_network
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ raspberrypi,model-b |\
raspberrypi,model-b-plus |\
raspberrypi,model-b-rev2 |\
raspberrypi,2-model-b |\
raspberrypi,2-model-b-rev2 |\
raspberrypi,3-model-b |\
raspberrypi,3-model-b-plus |\
raspberrypi,4-model-b)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set_preinit_iface() {

case "$(board_name)" in
raspberrypi,2-model-b |\
raspberrypi,2-model-b-rev2 |\
raspberrypi,3-model-b |\
raspberrypi,3-model-b-plus |\
raspberrypi,4-model-b |\
Expand Down
4 changes: 3 additions & 1 deletion target/linux/brcm2708/base-files/lib/preinit/79_move_config
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#!/bin/sh
# Copyright (C) 2015 OpenWrt.org

. /lib/upgrade/common.sh

BOOTPART=/dev/mmcblk0p1

move_config() {
Expand All @@ -11,7 +13,7 @@ move_config() {
insmod vfat
mkdir -p /boot
mount -t vfat -o rw,noatime $BOOTPART /boot
[ -f /boot/sysupgrade.tgz ] && mv -f /boot/sysupgrade.tgz /
[ -f "/boot/$BACKUP_FILE" ] && mv -f "/boot/$BACKUP_FILE" /
fi
}

Expand Down
4 changes: 2 additions & 2 deletions target/linux/brcm2708/base-files/lib/upgrade/platform.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ platform_copy_config() {
if export_partdevice partdev 1; then
mkdir -p /boot
[ -f /boot/kernel.img ] || mount -t vfat -o rw,noatime "/dev/$partdev" /boot
cp -af "$CONF_TAR" /boot/
tar -C / -zxvf "$CONF_TAR" boot/config.txt
cp -af "$UPGRADE_BACKUP" "/boot/$BACKUP_FILE"
tar -C / -zxvf "$UPGRADE_BACKUP" boot/config.txt
sync
unmount /boot
fi
Expand Down
26 changes: 18 additions & 8 deletions target/linux/brcm2708/image/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ define Build/boot-common
mcopy -i $@.boot $(KDIR)/COPYING.linux ::
mcopy -i $@.boot $(KDIR)/LICENCE.broadcom ::
mcopy -i $@.boot cmdline.txt ::
mcopy -i $@.boot $(BOOT_CONFIG) ::config.txt
mcopy -i $@.boot config.txt ::
mcopy -i $@.boot distroconfig.txt ::
mcopy -i $@.boot $(IMAGE_KERNEL) ::$(KERNEL_IMG)
$(foreach dts,$(shell echo $(DEVICE_DTS)),mcopy -i $@.boot $(DTS_DIR)/$(dts).dtb ::;)
mmd -i $@.boot ::/overlays
Expand Down Expand Up @@ -67,12 +68,14 @@ define Device/Default
IMAGES := factory.img.gz sysupgrade.img.gz
IMAGE/sysupgrade.img.gz := boot-common | boot-2708 | sdcard-img | gzip | append-metadata
IMAGE/factory.img.gz := boot-common | boot-2708 | sdcard-img | gzip
BOOT_CONFIG := config.txt
endef

define Device/rpi
DEVICE_MODEL := B/B+/CM/Zero/ZeroW
DEVICE_DTS := bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm bcm2708-rpi-zero bcm2708-rpi-zero-w
DEVICE_DTS := \
bcm2708-rpi-b bcm2708-rpi-b-plus \
bcm2708-rpi-cm \
bcm2708-rpi-zero bcm2708-rpi-zero-w
SUPPORTED_DEVICES := \
rpi-b rpi-b-plus rpi-cm rpi-zero rpi-zero-w \
raspberrypi,model-b raspberrypi,model-b-plus raspberrypi,model-b-rev2 \
Expand All @@ -89,10 +92,14 @@ endif

define Device/rpi-2
DEVICE_MODEL := 2B/3B/3B+/3CM/4B
DEVICE_DTS := bcm2709-rpi-2-b bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2711-rpi-4-b bcm2710-rpi-cm3
DEVICE_DTS := \
bcm2709-rpi-2-b bcm2710-rpi-2-b \
bcm2710-rpi-3-b bcm2710-rpi-3-b-plus \
bcm2711-rpi-4-b \
bcm2710-rpi-cm3
SUPPORTED_DEVICES := \
rpi-2-b rpi-3-b rpi-3-b-plus rpi-cm \
raspberrypi,2-model-b \
raspberrypi,2-model-b raspberrypi,2-model-b-rev2 \
raspberrypi,3-model-b raspberrypi,3-model-b-plus \
raspberrypi,3-compute-module raspberrypi,compute-module-3 \
raspberrypi,4-model-b
Expand All @@ -110,11 +117,15 @@ ifeq ($(SUBTARGET),bcm2709)
endif

define Device/rpi-3
DEVICE_MODEL := 3B/3B+/3CM
DEVICE_MODEL := 2B-1.2/3B/3B+/3CM
KERNEL_IMG := kernel8.img
DEVICE_DTS := broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus broadcom/bcm2710-rpi-cm3
DEVICE_DTS := \
broadcom/bcm2710-rpi-2-b \
broadcom/bcm2710-rpi-3-b broadcom/bcm2710-rpi-3-b-plus \
broadcom/bcm2710-rpi-cm3
SUPPORTED_DEVICES := \
rpi-3-b rpi-3-b-plus \
raspberrypi,2-model-b-rev2 \
raspberrypi,3-model-b raspberrypi,3-model-b-plus \
raspberrypi,3-compute-module raspberrypi,compute-module-3
DEVICE_PACKAGES := \
Expand All @@ -140,7 +151,6 @@ define Device/rpi-4
kmod-brcmfmac wpad-basic
IMAGE/sysupgrade.img.gz := boot-common | boot-2711 | sdcard-img | gzip | append-metadata
IMAGE/factory.img.gz := boot-common | boot-2711 | sdcard-img | gzip
BOOT_CONFIG := config-bcm2711-arm64.txt
endef
ifeq ($(SUBTARGET),bcm2711)
TARGET_DEVICES += rpi-4
Expand Down
Loading

0 comments on commit eb05272

Please sign in to comment.