From 8f47b87b0cc8178f73d280c98e571fe9f0ddfee8 Mon Sep 17 00:00:00 2001 From: Sander Vanheule Date: Wed, 25 Jan 2023 22:18:42 +0100 Subject: [PATCH 01/11] realtek: rtl931x: drop LINKER_LOAD_ADDRESS bypass RTL931x kernel builds were patched to bypass the LINKER_LOAD_ADDRESS parameter, and hardcode it to 0x80220000. This doesn't make much sense, since value of LINKER_LOAD_ADDRESS, load-ld, only appears to be a copy of load-y, adjusted to the linker's taste. Dropping the hacks for bypassing LINKER_LOAD_ADDRESS results in a kernel that actually starts booting on an RTL9313 (Netgear MS510TXM), but currently still hangs when the kernel switches timers. Signed-off-by: Sander Vanheule --- .../patches-5.10/312-rt9313-support.patch | 59 ------------------- .../patches-5.15/312-rt9313-support.patch | 59 ------------------- 2 files changed, 118 deletions(-) delete mode 100644 target/linux/realtek/patches-5.10/312-rt9313-support.patch delete mode 100644 target/linux/realtek/patches-5.15/312-rt9313-support.patch diff --git a/target/linux/realtek/patches-5.10/312-rt9313-support.patch b/target/linux/realtek/patches-5.10/312-rt9313-support.patch deleted file mode 100644 index 7626cc9c25..0000000000 --- a/target/linux/realtek/patches-5.10/312-rt9313-support.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0b8dfe085180b58b81d2657c76b080168e3bc8df Mon Sep 17 00:00:00 2001 -From: Birger Koblitz -Date: Wed, 19 Jan 2022 18:14:02 +0100 -Subject: [PATCH] realtek: Add RTL931X sub-target - -We add the RTL931X sub-target with kernel configuration for -a dual core MIPS InterAptive CPU. - -Submitted-by: Sebastian Gottschall -Submitted-by: Birger Koblitz ---- - arch/mips/Makefile | 10 +++++++++++++-- - arch/mips/kernel/head.S | 4 ++++ - aarch/mips/kernel/vmlinux.lds.S | 4 ++++ - 3 files changed, 18 insertions(+), 2 deletions(-) - ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -307,14 +307,24 @@ endif - - KBUILD_AFLAGS += $(cflags-y) - KBUILD_CFLAGS += $(cflags-y) -+ifdef CONFIG_931X -+KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) -+bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ -+ VMLINUX_ENTRY_ADDRESS=$(entry-y) \ -+ PLATFORM="$(platform-y)" \ -+ ITS_INPUTS="$(its-y)" -+else - KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) -DLINKER_LOAD_ADDRESS=$(load-ld) --KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) -- - bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ - LINKER_LOAD_ADDRESS=$(load-ld) \ - VMLINUX_ENTRY_ADDRESS=$(entry-y) \ - PLATFORM="$(platform-y)" \ - ITS_INPUTS="$(its-y)" -+endif -+KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) -+ -+ -+ - ifdef CONFIG_32BIT - bootvars-y += ADDR_BITS=32 - endif ---- a/arch/mips/kernel/vmlinux.lds.S -+++ b/arch/mips/kernel/vmlinux.lds.S -@@ -55,7 +55,11 @@ SECTIONS - /* . = 0xa800000000300000; */ - . = 0xffffffff80300000; - #endif -+#ifdef CONFIG_RTL931X -+ . = 0x80220000; -+#else - . = LINKER_LOAD_ADDRESS; -+#endif - /* read-only */ - _text = .; /* Text and read-only data */ - .text : { diff --git a/target/linux/realtek/patches-5.15/312-rt9313-support.patch b/target/linux/realtek/patches-5.15/312-rt9313-support.patch deleted file mode 100644 index e8edc996f3..0000000000 --- a/target/linux/realtek/patches-5.15/312-rt9313-support.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 0b8dfe085180b58b81d2657c76b080168e3bc8df Mon Sep 17 00:00:00 2001 -From: Birger Koblitz -Date: Wed, 19 Jan 2022 18:14:02 +0100 -Subject: [PATCH] realtek: Add RTL931X sub-target - -We add the RTL931X sub-target with kernel configuration for -a dual core MIPS InterAptive CPU. - -Submitted-by: Sebastian Gottschall -Submitted-by: Birger Koblitz ---- - arch/mips/Makefile | 10 +++++++++++++-- - arch/mips/kernel/head.S | 4 ++++ - aarch/mips/kernel/vmlinux.lds.S | 4 ++++ - 3 files changed, 18 insertions(+), 2 deletions(-) - ---- a/arch/mips/Makefile -+++ b/arch/mips/Makefile -@@ -310,14 +310,24 @@ endif - - KBUILD_AFLAGS += $(cflags-y) - KBUILD_CFLAGS += $(cflags-y) -+ifdef CONFIG_931X -+KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) -+bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ -+ VMLINUX_ENTRY_ADDRESS=$(entry-y) \ -+ PLATFORM="$(platform-y)" \ -+ ITS_INPUTS="$(its-y)" -+else - KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y) -DLINKER_LOAD_ADDRESS=$(load-ld) --KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) -- - bootvars-y = VMLINUX_LOAD_ADDRESS=$(load-y) \ - LINKER_LOAD_ADDRESS=$(load-ld) \ - VMLINUX_ENTRY_ADDRESS=$(entry-y) \ - PLATFORM="$(platform-y)" \ - ITS_INPUTS="$(its-y)" -+endif -+KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0) -+ -+ -+ - ifdef CONFIG_32BIT - bootvars-y += ADDR_BITS=32 - endif ---- a/arch/mips/kernel/vmlinux.lds.S -+++ b/arch/mips/kernel/vmlinux.lds.S -@@ -55,7 +55,11 @@ SECTIONS - /* . = 0xa800000000300000; */ - . = 0xffffffff80300000; - #endif -+#ifdef CONFIG_RTL931X -+ . = 0x80220000; -+#else - . = LINKER_LOAD_ADDRESS; -+#endif - /* read-only */ - _text = .; /* Text and read-only data */ - .text : { From 4e9365a654fe33c1c140253de752bdea67d83d03 Mon Sep 17 00:00:00 2001 From: John Audia Date: Tue, 24 Jan 2023 07:43:03 -0500 Subject: [PATCH 02/11] kernel: bump 5.15 to 5.15.90 All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia --- include/kernel-5.15 | 4 ++-- .../patches-5.15/950-0064-Add-dwc_otg-driver.patch | 2 +- ...-plumbing-for-updating-interrupt-endpoint-int.patch | 2 +- ...plement-xhci_fixup_endpoint-for-interval-adju.patch | 2 +- ...0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch | 4 ++-- ...factor-out-TRBS_PER_SEGMENT-define-in-runtime.patch | 4 ++-- ...950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch | 4 ++-- ...i-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch | 10 +++++----- ...sb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch | 6 +++--- ...xhci-add-support-for-performing-fake-doorbell.patch | 2 +- .../hack-5.15/780-usb-net-MeigLink_modem_support.patch | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/include/kernel-5.15 b/include/kernel-5.15 index 82d1c5a7bc..ab1500f4b2 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .89 -LINUX_KERNEL_HASH-5.15.89 = e7311b874e014bb6d37c051319bd6a4a4e3d05a1c32546522deabbfd2d752fe8 +LINUX_VERSION-5.15 = .90 +LINUX_KERNEL_HASH-5.15.90 = e6fd430022686753af7516fe7544f96aab379509dc5b7829017bdcd92b393b42 diff --git a/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch b/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch index e3ac41496b..33ff798471 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0064-Add-dwc_otg-driver.patch @@ -1123,7 +1123,7 @@ Signed-off-by: Jonathan Bell } --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5582,7 +5582,7 @@ static void port_event(struct usb_hub *h +@@ -5585,7 +5585,7 @@ static void port_event(struct usb_hub *h port_dev->over_current_count++; port_over_current_notify(port_dev); diff --git a/target/linux/bcm27xx/patches-5.15/950-0151-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch b/target/linux/bcm27xx/patches-5.15/950-0151-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch index 12ddf91426..857221d8b5 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0151-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0151-usb-add-plumbing-for-updating-interrupt-endpoint-int.patch @@ -70,7 +70,7 @@ Signed-off-by: Jonathan Bell * @dev: the device whose endpoint is being disabled --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -1842,6 +1842,8 @@ extern int usb_clear_halt(struct usb_dev +@@ -1845,6 +1845,8 @@ extern int usb_clear_halt(struct usb_dev extern int usb_reset_configuration(struct usb_device *dev); extern int usb_set_interface(struct usb_device *dev, int ifnum, int alternate); extern void usb_reset_endpoint(struct usb_device *dev, unsigned int epaddr); diff --git a/target/linux/bcm27xx/patches-5.15/950-0152-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch b/target/linux/bcm27xx/patches-5.15/950-0152-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch index aa12dae1fc..bedeb04227 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0152-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0152-xhci-implement-xhci_fixup_endpoint-for-interval-adju.patch @@ -125,7 +125,7 @@ Signed-off-by: Jonathan Bell * non-error returns are a promise to giveback() the urb later * we drop ownership so next owner (or urb unlink) can get it */ -@@ -5443,6 +5546,7 @@ static const struct hc_driver xhci_hc_dr +@@ -5457,6 +5560,7 @@ static const struct hc_driver xhci_hc_dr .endpoint_reset = xhci_endpoint_reset, .check_bandwidth = xhci_check_bandwidth, .reset_bandwidth = xhci_reset_bandwidth, diff --git a/target/linux/bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch b/target/linux/bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch index 10820c6708..3ef184fd78 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -293,6 +293,7 @@ static void xhci_pci_quirks(struct devic +@@ -296,6 +296,7 @@ static void xhci_pci_quirks(struct devic if (pdev->vendor == PCI_VENDOR_ID_VIA && pdev->device == 0x3483) { xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; @@ -50,7 +50,7 @@ Signed-off-by: Jonathan Bell addr = xhci_trb_virt_to_dma(new_seg, new_deq); --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1905,6 +1905,7 @@ struct xhci_hcd { +@@ -1906,6 +1906,7 @@ struct xhci_hcd { #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42) #define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43) #define XHCI_RESET_TO_DEFAULT BIT_ULL(44) diff --git a/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch b/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch index 40632ecf13..7c1c96fa92 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0605-xhci-refactor-out-TRBS_PER_SEGMENT-define-in-runtime.patch @@ -205,7 +205,7 @@ Signed-off-by: Jonathan Bell xhci_err(xhci, "Tried to move enqueue past ring segment\n"); return; } -@@ -3159,7 +3162,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd +@@ -3162,7 +3165,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd * that clears the EHB. */ while (xhci_handle_event(xhci) > 0) { @@ -214,7 +214,7 @@ Signed-off-by: Jonathan Bell continue; xhci_update_erst_dequeue(xhci, event_ring_deq); event_ring_deq = xhci->event_ring->dequeue; -@@ -3301,7 +3304,8 @@ static int prepare_ring(struct xhci_hcd +@@ -3304,7 +3307,8 @@ static int prepare_ring(struct xhci_hcd } } diff --git a/target/linux/bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch b/target/linux/bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch index f3bb6384c6..b27f505e32 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch @@ -53,7 +53,7 @@ Signed-off-by: Jonathan Bell cycle_state, type, max_packet, flags); --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -294,6 +294,7 @@ static void xhci_pci_quirks(struct devic +@@ -297,6 +297,7 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_LPM_SUPPORT; xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; @@ -63,7 +63,7 @@ Signed-off-by: Jonathan Bell if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1907,6 +1907,7 @@ struct xhci_hcd { +@@ -1908,6 +1908,7 @@ struct xhci_hcd { #define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43) #define XHCI_RESET_TO_DEFAULT BIT_ULL(44) #define XHCI_AVOID_DQ_ON_LINK BIT_ULL(45) diff --git a/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch b/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch index aa54439b32..ef95a78b3e 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch @@ -26,7 +26,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c -@@ -295,6 +295,7 @@ static void xhci_pci_quirks(struct devic +@@ -298,6 +298,7 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_EP_CTX_BROKEN_DCS; xhci->quirks |= XHCI_AVOID_DQ_ON_LINK; xhci->quirks |= XHCI_VLI_TRB_CACHE_BUG; @@ -36,7 +36,7 @@ Signed-off-by: Jonathan Bell if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -3614,14 +3614,15 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3617,14 +3617,15 @@ int xhci_queue_bulk_tx(struct xhci_hcd * unsigned int num_trbs; unsigned int start_cycle, num_sgs = 0; unsigned int enqd_len, block_len, trb_buff_len, full_len; @@ -54,7 +54,7 @@ Signed-off-by: Jonathan Bell full_len = urb->transfer_buffer_length; /* If we have scatter/gather list, we use it. */ if (urb->num_sgs && !(urb->transfer_flags & URB_DMA_MAP_SINGLE)) { -@@ -3658,6 +3659,17 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3661,6 +3662,17 @@ int xhci_queue_bulk_tx(struct xhci_hcd * start_cycle = ring->cycle_state; send_addr = addr; @@ -72,7 +72,7 @@ Signed-off-by: Jonathan Bell /* Queue the TRBs, even if they are zero-length */ for (enqd_len = 0; first_trb || enqd_len < full_len; enqd_len += trb_buff_len) { -@@ -3670,6 +3682,11 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3673,6 +3685,11 @@ int xhci_queue_bulk_tx(struct xhci_hcd * if (enqd_len + trb_buff_len > full_len) trb_buff_len = full_len - enqd_len; @@ -86,7 +86,7 @@ Signed-off-by: Jonathan Bell first_trb = false; --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1908,6 +1908,7 @@ struct xhci_hcd { +@@ -1909,6 +1909,7 @@ struct xhci_hcd { #define XHCI_RESET_TO_DEFAULT BIT_ULL(44) #define XHCI_AVOID_DQ_ON_LINK BIT_ULL(45) #define XHCI_VLI_TRB_CACHE_BUG BIT_ULL(46) diff --git a/target/linux/bcm27xx/patches-5.15/950-0747-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch b/target/linux/bcm27xx/patches-5.15/950-0747-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch index 313a664f59..49638b3a05 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0747-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0747-usb-xhci-rework-XHCI_VLI_SS_BULK_OUT_BUG-quirk.patch @@ -13,7 +13,7 @@ Signed-off-by: Jonathan Bell --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c -@@ -3614,7 +3614,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3617,7 +3617,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * unsigned int num_trbs; unsigned int start_cycle, num_sgs = 0; unsigned int enqd_len, block_len, trb_buff_len, full_len; @@ -22,7 +22,7 @@ Signed-off-by: Jonathan Bell u32 field, length_field, remainder, maxpacket; u64 addr, send_addr; -@@ -3660,14 +3660,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3663,14 +3663,9 @@ int xhci_queue_bulk_tx(struct xhci_hcd * send_addr = addr; if (xhci->quirks & XHCI_VLI_SS_BULK_OUT_BUG && @@ -40,7 +40,7 @@ Signed-off-by: Jonathan Bell } /* Queue the TRBs, even if they are zero-length */ -@@ -3682,7 +3677,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * +@@ -3685,7 +3680,7 @@ int xhci_queue_bulk_tx(struct xhci_hcd * if (enqd_len + trb_buff_len > full_len) trb_buff_len = full_len - enqd_len; diff --git a/target/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch b/target/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch index 69d70aefaf..81a9f0c0cb 100644 --- a/target/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch +++ b/target/linux/bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch @@ -127,7 +127,7 @@ it on BCM4708 family. /* --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1905,6 +1905,7 @@ struct xhci_hcd { +@@ -1906,6 +1906,7 @@ struct xhci_hcd { #define XHCI_EP_CTX_BROKEN_DCS BIT_ULL(42) #define XHCI_SUSPEND_RESUME_CLKS BIT_ULL(43) #define XHCI_RESET_TO_DEFAULT BIT_ULL(44) diff --git a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch index 60c5f6b762..e901deb8ab 100644 --- a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch @@ -29,7 +29,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1156,6 +1158,11 @@ static const struct usb_device_id option +@@ -1162,6 +1164,11 @@ static const struct usb_device_id option .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, From d68a73a025648cebbf68862090471d865b2a6605 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 25 Jan 2023 00:22:01 +0100 Subject: [PATCH 03/11] tcpdump: update to 4.99.3 Changes: https://git.tcpdump.org/tcpdump/blob/032e4923e5202ea4d5a6d1cead83ed1927135874:/CHANGES Signed-off-by: Nick Hainke --- package/network/utils/tcpdump/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/tcpdump/Makefile b/package/network/utils/tcpdump/Makefile index 5019e0b3b6..827a66e860 100644 --- a/package/network/utils/tcpdump/Makefile +++ b/package/network/utils/tcpdump/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tcpdump -PKG_VERSION:=4.99.2 +PKG_VERSION:=4.99.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.tcpdump.org/release/ -PKG_HASH:=f4304357d34b79d46f4e17e654f1f91f9ce4e3d5608a1badbd53295a26fb44d5 +PKG_HASH:=ad75a6ed3dc0d9732945b2e5483cb41dc8b4b528a169315e499c6861952e73b3 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-3-Clause From 340d3d84dc545429b028d3250ddd084b3d084367 Mon Sep 17 00:00:00 2001 From: Linhui Liu Date: Mon, 23 Jan 2023 20:15:36 +0800 Subject: [PATCH 04/11] firmware: intel-microcode: update to 20221108 Changelog: * New Microcodes: sig 0x000606c1, pf_mask 0x10, 2022-08-07, rev 0x1000201, size 286720 sig 0x000b0671, pf_mask 0x32, 2022-09-07, rev 0x010e, size 204800 * Updated Microcodes: sig 0x000706e5, pf_mask 0x80, 2022-08-02, rev 0x00b6, size 113664 sig 0x000806c1, pf_mask 0x80, 2022-06-28, rev 0x00a6, size 110592 sig 0x000806d1, pf_mask 0xc2, 2022-06-28, rev 0x0042, size 102400 sig 0x000806ec, pf_mask 0x94, 2022-07-31, rev 0x00f4, size 105472 sig 0x00090661, pf_mask 0x01, 2022-07-15, rev 0x0017, size 20480 sig 0x00090672, pf_mask 0x07, 2022-09-19, rev 0x0026, size 218112 sig 0x00090675, pf_mask 0x07, 2022-09-19, rev 0x0026 sig 0x000b06f2, pf_mask 0x07, 2022-09-19, rev 0x0026 sig 0x000b06f5, pf_mask 0x07, 2022-09-19, rev 0x0026 sig 0x000906a3, pf_mask 0x80, 2022-09-19, rev 0x0424, size 217088 sig 0x000906a4, pf_mask 0x80, 2022-09-19, rev 0x0424 sig 0x000906ed, pf_mask 0x22, 2022-07-31, rev 0x00f4, size 104448 sig 0x000a0652, pf_mask 0x20, 2022-07-31, rev 0x00f4, size 96256 sig 0x000a0653, pf_mask 0x22, 2022-07-31, rev 0x00f4, size 97280 sig 0x000a0655, pf_mask 0x22, 2022-07-31, rev 0x00f4, size 96256 sig 0x000a0660, pf_mask 0x80, 2022-07-31, rev 0x00f4, size 97280 sig 0x000a0661, pf_mask 0x80, 2022-07-31, rev 0x00f4, size 96256 sig 0x000a0671, pf_mask 0x02, 2022-08-02, rev 0x0056, size 103424 We need to update to this version because https://ftp.debian.org/debian/pool/non-free/i/intel-microcode/intel-microcode_3.20220809.1.tar.xz has been removed. Signed-off-by: Linhui Liu --- 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 b0379f363d..58ae7ee74b 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:=20220809 +PKG_VERSION:=20221108 PKG_RELEASE:=1 PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).1.tar.xz PKG_SOURCE_URL:=@DEBIAN/pool/non-free/i/intel-microcode/ -PKG_HASH:=4cf6c3638bb52d9d45c1916af866fd0929628a6f459daac3edfd369149e9c665 +PKG_HASH:=9c40fc5cbb386a4e1154f8f316422b28fccc9eaabdea707a80643f9bed3f9064 PKG_BUILD_DIR:=$(BUILD_DIR)/intel-microcode-3.$(PKG_VERSION).1 PKG_BUILD_DEPENDS:=iucode-tool/host From cfb296b79a9568386267828374eb5f2dd3ba0d37 Mon Sep 17 00:00:00 2001 From: Shiji Yang Date: Thu, 19 Jan 2023 14:20:59 +0000 Subject: [PATCH 05/11] ath79: add support for D-Link DIR-629 A1 Specifications: SOC: QCA9588 CPU 720 MHz AHB 200 MHz Switch: AR8236 RAM: 64 MiB DDR2-600 Flash: 8 MiB WLAN: Wi-Fi4 2.4 GHz 3*3 LAN: LAN ports *4 WAN: WAN port *1 Buttons: reset *1 + wps *1 LEDs: ethernet *5, power, wlan, wps MAC Address: use address source label 70:62:b8:xx:xx:96 lan && wlan lan 70:62:b8:xx:xx:96 mfcdata@0x35 wan 70:62:b8:xx:xx:97 mfcdata@0x6a wlan 70:62:b8:xx:xx:96 mfcdata@0x51 Install via Web UI: Apply factory image in the stock firmware's Web UI. Install via Emergency Room Mode: DIR-629 A1 will enter recovery mode when the system fails to boot or press reset button for about 10 seconds. First, set IP address to 192.168.0.1 and server IP to 192.168.0.10. Then we can open http://192.168.0.1 in the web browser to upload OpenWrt factory image or stock firmware. Some modern browsers may need to turn on compatibility mode. Signed-off-by: Shiji Yang --- .../ath79/dts/qca9558_dlink_dir-629-a1.dts | 170 ++++++++++++++++++ .../generic/base-files/etc/board.d/02_network | 4 + .../etc/uci-defaults/09_fix-checksum | 1 + target/linux/ath79/image/generic.mk | 13 ++ 4 files changed, 188 insertions(+) create mode 100644 target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts diff --git a/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts new file mode 100644 index 0000000000..41b0039e93 --- /dev/null +++ b/target/linux/ath79/dts/qca9558_dlink_dir-629-a1.dts @@ -0,0 +1,170 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include "qca955x.dtsi" + +#include +#include +#include + +/ { + compatible = "dlink,dir-629-a1", "qca,qca9558"; + model = "D-Link DIR-629 A1"; + + aliases { + label-mac-device = ð0; + led-boot = &led_power; + led-failsafe = &led_power; + led-running = &led_power; + led-upgrade = &led_power; + serial0 = &uart; + }; + + keys { + compatible = "gpio-keys"; + + reset { + label = "reset"; + linux,code = ; + gpios = <&gpio 17 GPIO_ACTIVE_LOW>; + }; + + wps { + label = "wps"; + linux,code = ; + gpios = <&gpio 11 GPIO_ACTIVE_LOW>; + }; + }; + + leds { + compatible = "gpio-leds"; + + led-0 { + color = ; + function = LED_FUNCTION_WLAN; + gpios = <&gpio 13 GPIO_ACTIVE_LOW>; + linux,default-trigger = "phy0tpt"; + }; + + led_power: led-1 { + label = "green:power"; + color = ; + function = LED_FUNCTION_POWER; + gpios = <&gpio 21 GPIO_ACTIVE_LOW>; + }; + + led-2 { + color = ; + function = LED_FUNCTION_WPS; + gpios = <&gpio 23 GPIO_ACTIVE_LOW>; + }; + }; +}; + +ð0 { + status = "okay"; + + phy-mode = "mii"; + + nvmem-cells = <&macaddr_mfcdata_35>; + nvmem-cell-names = "mac-address-ascii"; + + fixed-link { + speed = <100>; + full-duplex; + }; +}; + +&mdio0 { + status = "okay"; + + switch0@1f { + compatible = "qca,ar8236"; + reg = <0x1f>; + }; +}; + +&spi { + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <30000000>; + m25p,fast-read; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "u-boot"; + reg = <0x000000 0x040000>; + read-only; + }; + + partition@40000 { + label = "u-boot-env"; + reg = <0x040000 0x008000>; + read-only; + }; + + partition@48000 { + label = "mfcdata"; + reg = <0x048000 0x008000>; + read-only; + + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + macaddr_mfcdata_35: macaddr@35 { + reg = <0x35 0x11>; + }; + + macaddr_mfcdata_51: macaddr@51 { + reg = <0x51 0x11>; + }; + }; + + partition@50000 { + label = "devconf"; + reg = <0x050000 0x010000>; + read-only; + }; + + partition@60000 { + label = "langpack"; + reg = <0x060000 0x020000>; + read-only; + }; + + partition@80000 { + label = "art"; + reg = <0x080000 0x010000>; + read-only; + + compatible = "nvmem-cells"; + #address-cells = <1>; + #size-cells = <1>; + + cal_art_1000: calibration@1000 { + reg = <0x1000 0x440>; + }; + }; + + partition@90000 { + compatible = "seama"; + label = "firmware"; + reg = <0x090000 0x770000>; + }; + }; + }; +}; + +&wmac { + status = "okay"; + + nvmem-cells = <&cal_art_1000>, <&macaddr_mfcdata_51>; + nvmem-cell-names = "calibration", "mac-address-ascii"; +}; diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network index 20352095a4..610e70e500 100644 --- a/target/linux/ath79/generic/base-files/etc/board.d/02_network +++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network @@ -278,6 +278,7 @@ ath79_setup_interfaces() ucidef_add_switch "switch0" \ "0@eth0" "1:lan:2" "2:lan:1" ;; + dlink,dir-629-a1|\ dlink,dir-825-c1|\ dlink,dir-835-a1|\ dlink,dir-842-c1|\ @@ -623,6 +624,9 @@ ath79_setup_macs() dlink,dap-3662-a1) label_mac=$(mtd_get_mac_ascii bdcfg "wlanmac") ;; + dlink,dir-629-a1) + wan_mac=$(mtd_get_mac_text "mfcdata" 0x6a) + ;; dlink,dir-825-b1|\ trendnet,tew-673gru) lan_mac=$(mtd_get_mac_text "caldata" 0xffa0) diff --git a/target/linux/ath79/generic/base-files/etc/uci-defaults/09_fix-checksum b/target/linux/ath79/generic/base-files/etc/uci-defaults/09_fix-checksum index 92048fd810..4d961f26d2 100644 --- a/target/linux/ath79/generic/base-files/etc/uci-defaults/09_fix-checksum +++ b/target/linux/ath79/generic/base-files/etc/uci-defaults/09_fix-checksum @@ -21,6 +21,7 @@ dlink,dap-3320-a1|\ dlink,dap-3662-a1) fixwrgg ;; +dlink,dir-629-a1|\ qihoo,c301) fix_seama_header ;; diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index 7712247d39..3e32a08295 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -1010,6 +1010,19 @@ define Device/dlink_dir-505 endef TARGET_DEVICES += dlink_dir-505 +define Device/dlink_dir-629-a1 + $(Device/seama) + SOC := qca9558 + IMAGE_SIZE := 7616k + DEVICE_VENDOR := D-Link + DEVICE_MODEL := DIR-629 + DEVICE_VARIANT := A1 + DEVICE_PACKAGES := -uboot-envtools + SEAMA_MTDBLOCK := 6 + SEAMA_SIGNATURE := wrgn83_dlob.hans_dir629 +endef +TARGET_DEVICES += dlink_dir-629-a1 + define Device/dlink_dir-825-b1 SOC := ar7161 DEVICE_VENDOR := D-Link From 1a47f19080e0c8edbf4a463020118bb9ccaa3ff0 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 25 Jan 2023 21:29:13 +0100 Subject: [PATCH 06/11] linux-firmware: update to 20230117 Changes: 32d3199 linux-firmware: Update firmware file for Intel Bluetooth AX201 2da8a7a linux-firmware: Update firmware file for Intel Bluetooth AX201 8b5ddf4 linux-firmware: Update firmware file for Intel Bluetooth AX211 4219dac linux-firmware: Update firmware file for Intel Bluetooth AX211 fb34135 linux-firmware: Update firmware file for Intel Bluetooth AX210 becd3fc linux-firmware: Update firmware file for Intel Bluetooth AX200 7101c57 linux-firmware: Update firmware file for Intel Bluetooth AX201 49e87fa linux-firmware: Update firmware file for Intel Bluetooth 9560 86b73ce linux-firmware: Update firmware file for Intel Bluetooth 9260 3723b48 brcm: add configuration files for CyberTan WC121 7f626ef qcom: add firmware files for Adreno A200 fc5a25f rtw89: 8852c: update fw to v0.27.56.10 2ba1bea QCA: Add Bluetooth firmware for QCA2066 a1ad1d5 amdgpu: add VCN4.0.4 firmware from amd-5.4 9e01e17 amdgpu: add SMU13.0.7 firmware from amd-5.4 3a50eb8 amdgpu: add SDMA6.0.2 firmware from amd-5.4 19995fb amdgpu: add PSP13.0.7 firmware from amd-5.4 32e7c93 amdgpu: add GC11.0.2 firmware from amd-5.4 20c8060 amdgpu: add DCN3.2.1 firmware from amd-5.4 5c8e895 amdgpu: update VCN4.0.0 firmware from amd-5.4 66b3435 amdgpu: update SMU13.0.0 firmware from amd-5.4 604df78 amdgpu: update SDMA6.0.0 firmware from amd-5.4 3e9169a amdgpu: update PSP13.0.0 firmware from amd-5.4 bd1b7f7 amdgpu: update GC11.0.0 firmware from amd-5.4 c8ff1f4 iwlwifi: add new FWs from core76-35 release 5630963 iwlwifi: update cc/Qu/QuZ firmwares for core76-35 release 8bbec22 iwlwifi: add new FWs from core75-47 release e20a687 iwlwifi: update 9000-family firmwares to core75-47 504b691 amdgpu: update renoir DMCUB firmware 1ed02d5 amdgpu: Update renoir PSP firmware d0598c3 amdgpu: update copyright date for LICENSE.amdgpu cee86df linux-firmware: update firmware for MT7921 WiFi device e2d1174 linux-firmware: update firmware for MT7922 WiFi device ce7cc73 linux-firmware: update firmware for mediatek bluetooth chip (MT7921) 91f4c6b linux-firmware: update firmware for mediatek bluetooth chip (MT7922) 52e62d6 cxgb4: Update firmware to revision 1.27.1.0 4704e25 qca: Update firmware files for BT chip WCN6750 c9c1958 rtw89: 8852c: update fw to v0.27.56.9 9e91f0c rtw89: 8852c: update fw to v0.27.56.8 Signed-off-by: Nick Hainke --- package/firmware/linux-firmware/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile index 7ffd8baf88..684f39f664 100644 --- a/package/firmware/linux-firmware/Makefile +++ b/package/firmware/linux-firmware/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=linux-firmware -PKG_VERSION:=20221214 -PKG_RELEASE:=3 +PKG_VERSION:=20230117 +PKG_RELEASE:=1 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_HASH:=e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331 +PKG_HASH:=df11e25ba2fb4d5343473757e17a3b4cef599250a26b1f7e0f038850f0cb3d64 PKG_MAINTAINER:=Felix Fietkau From ba3aa6233d2c269c29d5191450cdc4ad2892358f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Wed, 11 Jan 2023 10:26:16 +0100 Subject: [PATCH 07/11] ci: allow custom kernel and target jobs based on labels MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Current job triggers based on matching of changed paths is quite limited, so lets make it possible to additionally trigger manual CI jobs by adding CI specific pull request build labels: * `ci:target:x86:64` label is going to trigger CI target check jobs for x86/64 (sub)target. * `ci:kernel:x86:64` label is going to trigger CI kernel check jobs for x86/64 (sub)target. Signed-off-by: Petr Štetiar --- .github/workflows/label-kernel.yml | 45 ++++++++++++++++++++++++++++++ .github/workflows/label-target.yml | 37 ++++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 .github/workflows/label-kernel.yml create mode 100644 .github/workflows/label-target.yml diff --git a/.github/workflows/label-kernel.yml b/.github/workflows/label-kernel.yml new file mode 100644 index 0000000000..1156e0ad98 --- /dev/null +++ b/.github/workflows/label-kernel.yml @@ -0,0 +1,45 @@ +# ci:kernel:x86:64 is going to trigger CI kernel check jobs for x86/64 target + +name: Build kernel and check patches for target specified in labels +on: + pull_request: + types: + - labeled + +jobs: + set_target: + if: startsWith(github.event.label.name, 'ci:kernel:') + name: Set target + runs-on: ubuntu-latest + outputs: + target: ${{ steps.set_target.outputs.target }} + + steps: + - name: Set target + id: set_target + env: + CI_EVENT_LABEL_NAME: ${{ github.event.label.name }} + run: | + echo "$CI_EVENT_LABEL_NAME" | sed -n 's/.*:\(.*\):\(.*\)$/target="\1\/\2"/p' | tee --append $GITHUB_OUTPUT + + build_kernel: + name: Build Kernel with external toolchain + needs: set_target + permissions: + contents: read + packages: read + uses: ./.github/workflows/build.yml + with: + target: ${{ needs.set_target.outputs.target }} + build_kernel: true + build_all_kmods: true + + check-kernel-patches: + name: Check Kernel patches + needs: set_target + permissions: + contents: read + packages: read + uses: ./.github/workflows/check-kernel-patches.yml + with: + target: ${{ needs.set_target.outputs.target }} diff --git a/.github/workflows/label-target.yml b/.github/workflows/label-target.yml new file mode 100644 index 0000000000..e189024076 --- /dev/null +++ b/.github/workflows/label-target.yml @@ -0,0 +1,37 @@ +# ci:target:x86:64 is going to trigger CI target check jobs for x86/64 target + +name: Build check target specified in labels +on: + pull_request: + types: + - labeled + +jobs: + set_target: + if: startsWith(github.event.label.name, 'ci:target:') + name: Set target + runs-on: ubuntu-latest + outputs: + target: ${{ steps.set_target.outputs.target }} + + steps: + - name: Set target + id: set_target + env: + CI_EVENT_LABEL_NAME: ${{ github.event.label.name }} + run: | + echo "$CI_EVENT_LABEL_NAME" | sed -n 's/.*:\(.*\):\(.*\)$/target="\1\/\2"/p' | tee --append $GITHUB_OUTPUT + + build_target: + name: Build target + needs: set_target + permissions: + contents: read + packages: read + uses: ./.github/workflows/build.yml + with: + target: ${{ needs.set_target.outputs.target }} + build_full: true + build_all_kmods: true + build_all_boards: true + build_all_modules: true From 36076b5a409236b44d56179071cc53fdd1c6fc78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Thu, 26 Jan 2023 10:34:31 +0100 Subject: [PATCH 08/11] ubus: update to version 2022-06-15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update which contains just a following fix: * ubusd: add lookup command queuing support Defers and continues a client's lookup command to avoid unnecessary buffering under load. Signed-off-by: Petr Štetiar --- package/system/ubus/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index c70defcafa..8762324e7c 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubus.git -PKG_SOURCE_DATE:=2022-06-01 -PKG_SOURCE_VERSION:=2bebf93cd3343fe49f22a05ef935e460d2d44f67 -PKG_MIRROR_HASH:=4efd873928089c086bbac02f3ca5bae55904500b6e6f1c4c377181a00b67147f +PKG_SOURCE_DATE:=2022-06-15 +PKG_SOURCE_VERSION:=9913aa61de739e3efe067a2d186021c20bcd65e2 +PKG_MIRROR_HASH:=2a9fd9e895835b15948ab211963b7489f8437cd1b2bf43e0e321bc960e105774 PKG_ABI_VERSION:=$(call abi_version_str,$(PKG_SOURCE_DATE)) CMAKE_INSTALL:=1 From 7f5edeb8bd819d6e418ca0023b4ec97c60e5ca47 Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Tue, 24 Jan 2023 13:48:53 +0100 Subject: [PATCH 09/11] realtek: eth: Fix missing end of comment marker Because this comment is followed by another comment, nothing luckily breaks, so only a cosmetic change. Signed-off-by: Olliver Schinagl --- .../linux/realtek/files-5.15/drivers/net/ethernet/rtl838x_eth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/realtek/files-5.15/drivers/net/ethernet/rtl838x_eth.c b/target/linux/realtek/files-5.15/drivers/net/ethernet/rtl838x_eth.c index 857d389f12..1b35fae09b 100644 --- a/target/linux/realtek/files-5.15/drivers/net/ethernet/rtl838x_eth.c +++ b/target/linux/realtek/files-5.15/drivers/net/ethernet/rtl838x_eth.c @@ -862,7 +862,7 @@ static void rtl839x_setup_notify_ring_buffer(struct rtl838x_eth_priv *priv) /* Setup notification events */ sw_w32_mask(0, 1 << 14, RTL839X_L2_CTRL_0); /* RTL8390_L2_CTRL_0_FLUSH_NOTIFY_EN */ - sw_w32_mask(0, 1 << 12, RTL839X_L2_NOTIFICATION_CTRL); /* SUSPEND_NOTIFICATION_EN + sw_w32_mask(0, 1 << 12, RTL839X_L2_NOTIFICATION_CTRL); /* SUSPEND_NOTIFICATION_EN */ /* Enable Notification */ sw_w32_mask(0, 1 << 0, RTL839X_L2_NOTIFICATION_CTRL); From 6e428a84904daa07190f924530f975102e8e7668 Mon Sep 17 00:00:00 2001 From: Zoltan HERPAI Date: Tue, 24 Jan 2023 19:34:22 +0100 Subject: [PATCH 10/11] mxs: fix SD-card image generation for OLinuXino boards Fixes: mxs: add generic subtarget (64ef920) Adding the generic target caused the TARGET_BOOTFS_PARTSIZE to stay hidden for these boards, crashing the FAT filesystem creation. Signed-off-by: Zoltan HERPAI --- target/linux/mxs/image/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/mxs/image/Config.in b/target/linux/mxs/image/Config.in index 250553e356..a04700a440 100644 --- a/target/linux/mxs/image/Config.in +++ b/target/linux/mxs/image/Config.in @@ -1,6 +1,6 @@ config TARGET_BOOTFS_PARTSIZE int "Boot (SD Card) filesystem partition size (in MB)" - depends on TARGET_mxs_olinuxino-maxi || TARGET_mxs_olinuxino-micro + depends on TARGET_mxs_generic_olinuxino-maxi || TARGET_mxs_generic_olinuxino-micro default 8 help On the Olimex OLinuXino boards, mainline U-Boot loads the From a63430eac33ceb1dbf96d3667e2a0f2e04ba391f Mon Sep 17 00:00:00 2001 From: David Bauer Date: Sat, 28 Jan 2023 13:50:17 +0100 Subject: [PATCH 11/11] mac80211: use 802.11ax iw modes This adds missing HE modes to mac80211_prepare_ht_modes. Previously mesh without wpa_supplicant would be initialized with 802.11g /NO-HT only, as this method did not parse channel bandwidth for HE operation. Signed-off-by: David Bauer --- .../kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 0a7f787cff..5aaba9af26 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -901,8 +901,8 @@ mac80211_setup_supplicant_noctl() { mac80211_prepare_iw_htmode() { case "$htmode" in - VHT20|HT20) iw_htmode=HT20;; - HT40*|VHT40|VHT160) + VHT20|HT20|HE20) iw_htmode=HT20;; + HT40*|VHT40|VHT160|HE40) case "$band" in 2g) case "$htmode" in @@ -926,7 +926,7 @@ mac80211_prepare_iw_htmode() { esac [ "$auto_channel" -gt 0 ] && iw_htmode="HT40+" ;; - VHT80) + VHT80|HE80) iw_htmode="80MHZ" ;; NONE|NOHT)