diff --git a/patches/openwrt/to-upstream/0024-kernel-bump-4.19-to-4.19.44.patch b/patches/openwrt/to-upstream/0024-kernel-bump-4.19-to-4.19.44.patch deleted file mode 100644 index 2b54bdb256302051fe9f80fa60da502dc302009c..0000000000000000000000000000000000000000 --- a/patches/openwrt/to-upstream/0024-kernel-bump-4.19-to-4.19.44.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 8153aa192b3a2f84e3b5f11b54b575cee01ed595 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz> -Date: Sun, 19 May 2019 16:49:25 +0200 -Subject: [PATCH] kernel: bump 4.19 to 4.19.44 - ---- - include/kernel-version.mk | 4 +- - ...f-ath79-Fix-perfcount-IRQ-assignment.patch | 110 ------------------ - 2 files changed, 2 insertions(+), 112 deletions(-) - delete mode 100644 target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch - -diff --git a/include/kernel-version.mk b/include/kernel-version.mk -index 98a7bf07f3..036f4d42a1 100644 ---- a/include/kernel-version.mk -+++ b/include/kernel-version.mk -@@ -8,11 +8,11 @@ endif - - LINUX_VERSION-4.9 = .176 - LINUX_VERSION-4.14 = .119 --LINUX_VERSION-4.19 = .43 -+LINUX_VERSION-4.19 = .44 - - LINUX_KERNEL_HASH-4.9.176 = 2a94d008c0737f01d4b78f669a3c40e334cacebe4d62eb25252171cee205b178 - LINUX_KERNEL_HASH-4.14.119 = 5615b713389d74044eaa57032dab674228116b63ed358086c33bd929d7ad3b7c --LINUX_KERNEL_HASH-4.19.43 = 111619a1fab2368bf4da05c079e44bf25ee00ee250694c1b8e536f2ed5d2df57 -+LINUX_KERNEL_HASH-4.19.44 = 707642e993775618a5afa039b1058fa49f1c0faada46e8cdcb976241bca6b288 - - remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) - sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) -diff --git a/target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch b/target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch -deleted file mode 100644 -index 6b74c7da1d..0000000000 ---- a/target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch -+++ /dev/null -@@ -1,110 +0,0 @@ --From 852a88f35f4b7e5ebb717fed3c3a3330d5ad4336 Mon Sep 17 00:00:00 2001 --From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz> --Date: Wed, 10 Apr 2019 16:43:27 +0200 --Subject: [PATCH v2] MIPS: perf: ath79: Fix perfcount IRQ assignment --MIME-Version: 1.0 --Content-Type: text/plain; charset=UTF-8 --Content-Transfer-Encoding: 8bit -- --Currently it's not possible to use perf on ath79 due to genirq flags --mismatch happening on static virtual IRQ 13 which is used for --performance counters hardware IRQ 5. -- --On TP-Link Archer C7v5: -- -- CPU0 -- 2: 0 MIPS 2 ath9k -- 4: 318 MIPS 4 19000000.eth -- 7: 55034 MIPS 7 timer -- 8: 1236 MISC 3 ttyS0 -- 12: 0 INTC 1 ehci_hcd:usb1 -- 13: 0 gpio-ath79 2 keys -- 14: 0 gpio-ath79 5 keys -- 15: 31 AR724X PCI 1 ath10k_pci -- -- $ perf top -- genirq: Flags mismatch irq 13. 00014c83 (mips_perf_pmu) vs. 00002003 (keys) -- --On TP-Link Archer C7v4: -- -- CPU0 -- 4: 0 MIPS 4 19000000.eth -- 5: 7135 MIPS 5 1a000000.eth -- 7: 98379 MIPS 7 timer -- 8: 30 MISC 3 ttyS0 -- 12: 90028 INTC 0 ath9k -- 13: 5520 INTC 1 ehci_hcd:usb1 -- 14: 4623 INTC 2 ehci_hcd:usb2 -- 15: 32844 AR724X PCI 1 ath10k_pci -- 16: 0 gpio-ath79 16 keys -- 23: 0 gpio-ath79 23 keys -- -- $ perf top -- genirq: Flags mismatch irq 13. 00014c80 (mips_perf_pmu) vs. 00000080 (ehci_hcd:usb1) -- --This problem is happening, because currently statically assigned virtual --IRQ 13 for performance counters is not claimed during the initialization --of MIPS PMU during the bootup, so the IRQ subsystem doesn't know, that --this interrupt isn't available for further use. -- --So this patch fixes the issue by simply booking hardware IRQ 5 for MIPS PMU. -- --Tested-by: Kevin 'ldir' Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> --Signed-off-by: Petr ΔΉ tetiar <ynezz@true.cz> ----- -- --Changes since v1: -- -- I've incorporated two comments which I've received on IRC from blogic and -- I've also reworded the commit message to match the changes in v2 of this -- patch. -- -- * use actual hardware perfcount IRQ 5 instead of the virtual IRQ 13 -- * dropped the CONFIG_PERF_EVENTS ifdef around irq_create_mapping -- -- arch/mips/ath79/setup.c | 6 ------ -- drivers/irqchip/irq-ath79-misc.c | 11 +++++++++++ -- 2 files changed, 11 insertions(+), 6 deletions(-) -- ----- a/arch/mips/ath79/setup.c --+++ b/arch/mips/ath79/setup.c --@@ -211,12 +211,6 @@ const char *get_system_type(void) -- return ath79_sys_type; -- } -- ---int get_c0_perfcount_int(void) ---{ --- return ATH79_MISC_IRQ(5); ---} ---EXPORT_SYMBOL_GPL(get_c0_perfcount_int); --- -- unsigned int get_c0_compare_int(void) -- { -- return CP0_LEGACY_COMPARE_IRQ; ----- a/drivers/irqchip/irq-ath79-misc.c --+++ b/drivers/irqchip/irq-ath79-misc.c --@@ -22,6 +22,15 @@ -- #define AR71XX_RESET_REG_MISC_INT_ENABLE 4 -- -- #define ATH79_MISC_IRQ_COUNT 32 --+#define ATH79_MISC_PERF_IRQ 5 --+ --+static int ath79_perfcount_irq; --+ --+int get_c0_perfcount_int(void) --+{ --+ return ath79_perfcount_irq; --+} --+EXPORT_SYMBOL_GPL(get_c0_perfcount_int); -- -- static void ath79_misc_irq_handler(struct irq_desc *desc) -- { --@@ -113,6 +122,8 @@ static void __init ath79_misc_intc_domai -- { -- void __iomem *base = domain->host_data; -- --+ ath79_perfcount_irq = irq_create_mapping(domain, ATH79_MISC_PERF_IRQ); --+ -- /* Disable and clear all interrupts */ -- __raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_ENABLE); -- __raw_writel(0, base + AR71XX_RESET_REG_MISC_INT_STATUS); --- -2.21.0 -