diff --git a/config/sources/families/bcm2711.conf b/config/sources/families/bcm2711.conf index 86e9da1835..84ee9b4a2e 100644 --- a/config/sources/families/bcm2711.conf +++ b/config/sources/families/bcm2711.conf @@ -23,22 +23,22 @@ declare -g LINUXCONFIG="linux-${LINUXFAMILY}-${BRANCH}" case "${BRANCH}" in legacy) - declare -g KERNELSOURCE='https://github.com/raspberrypi/linux' - declare -g KERNEL_MAJOR_MINOR="6.6" # Major and minor versions of this kernel. For mainline caching. - declare -g KERNELBRANCH="branch:rpi-6.6.y" - ;; - - current) declare -g KERNELSOURCE='https://github.com/raspberrypi/linux' declare -g KERNEL_MAJOR_MINOR="6.12" # Major and minor versions of this kernel. For mainline caching. declare -g KERNELBRANCH="branch:rpi-6.12.y" ;; - edge) + current) declare -g KERNELSOURCE='https://github.com/raspberrypi/linux' declare -g KERNEL_MAJOR_MINOR="6.18" # Major and minor versions of this kernel. For mainline caching. declare -g KERNELBRANCH="branch:rpi-6.18.y" ;; + + edge) + declare -g KERNELSOURCE='https://github.com/raspberrypi/linux' + declare -g KERNEL_MAJOR_MINOR="6.19" # Major and minor versions of this kernel. For mainline caching. + declare -g KERNELBRANCH="branch:rpi-6.19.y" + ;; esac function post_family_config__mark_bsp_as_firmware_containing() { diff --git a/patch/kernel/archive/bcm2711-6.1/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch b/patch/kernel/archive/bcm2711-6.1/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch deleted file mode 100644 index 366418642f..0000000000 --- a/patch/kernel/archive/bcm2711-6.1/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: graysky -Date: Mon, 7 Dec 2020 13:03:40 -0500 -Subject: Make /proc/cpuinfo consistent on arm64 and arm - -Signed-off-by: graysky ---- - arch/arm64/kernel/cpuinfo.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 111111111111..222222222222 100644 ---- a/arch/arm64/kernel/cpuinfo.c -+++ b/arch/arm64/kernel/cpuinfo.c -@@ -175,9 +175,8 @@ static int c_show(struct seq_file *m, void *v) - * "processor". Give glibc what it expects. - */ - seq_printf(m, "processor\t: %d\n", i); -- if (compat) -- seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n", -- MIDR_REVISION(midr), COMPAT_ELF_PLATFORM); -+ seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n", -+ MIDR_REVISION(midr), COMPAT_ELF_PLATFORM); - - seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", - loops_per_jiffy / (500000UL/HZ), --- -Armbian - diff --git a/patch/kernel/archive/bcm2711-6.1/001-force-platform-selection-brcm-soc-support.patch.disabled b/patch/kernel/archive/bcm2711-6.1/001-force-platform-selection-brcm-soc-support.patch.disabled deleted file mode 100644 index 507c24c406..0000000000 --- a/patch/kernel/archive/bcm2711-6.1/001-force-platform-selection-brcm-soc-support.patch.disabled +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur a/arch/arm/Kconfig b/arch/arm/Kconfig ---- a/arch/arm/Kconfig 2022-12-11 17:15:18.000000000 -0500 -+++ b/arch/arm/Kconfig 2022-12-13 10:24:24.085749880 -0500 -@@ -2,6 +2,7 @@ - config ARM - bool - default y -+ select ARCH_BCM - select ARCH_32BIT_OFF_T - select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND - select ARCH_HAS_BINFMT_FLAT -diff -Naur a/arch/arm64/Kconfig b/arch/arm64/Kconfig ---- a/arch/arm64/Kconfig 2022-12-11 17:15:18.000000000 -0500 -+++ b/arch/arm64/Kconfig 2022-12-13 10:28:40.045233987 -0500 -@@ -1,6 +1,7 @@ - # SPDX-License-Identifier: GPL-2.0-only - config ARM64 - def_bool y -+ select ARCH_BCM - select ACPI_CCA_REQUIRED if ACPI - select ACPI_GENERIC_GSI if ACPI - select ACPI_GTDT if ACPI diff --git a/patch/kernel/archive/bcm2711-6.1/1003-remote-wakeup.patch b/patch/kernel/archive/bcm2711-6.1/1003-remote-wakeup.patch deleted file mode 100644 index 07c7b523f7..0000000000 --- a/patch/kernel/archive/bcm2711-6.1/1003-remote-wakeup.patch +++ /dev/null @@ -1,198 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Igor Pecovnik -Date: Mon, 29 Aug 2022 08:43:24 +0200 -Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) - -> X-Git-Archeology: > recovered message: > * Add patches needed for Pi-KVM on Rpi4 -> X-Git-Archeology: > recovered message: > * Remove patch that does not belong here -> X-Git-Archeology: > recovered message: > * Update config -> X-Git-Archeology: > recovered message: > * Update edge config -> X-Git-Archeology: - Revision 2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25: https://github.com/armbian/build/commit/2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25 -> X-Git-Archeology: Date: Mon, 29 Aug 2022 08:43:24 +0200 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Add patches needed for Pi-KVM on Rpi4 (#4127) -> X-Git-Archeology: -> X-Git-Archeology: - Revision acf5810cbe38c7578907ecd06e61abb0a446df1e: https://github.com/armbian/build/commit/acf5810cbe38c7578907ecd06e61abb0a446df1e -> X-Git-Archeology: Date: Sat, 11 Mar 2023 19:19:13 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Move Rpi kernels to 6.2, move current to legacy (#4898) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 8caf51243e9769c48289be534f1ecc6aa4b53a15: https://github.com/armbian/build/commit/8caf51243e9769c48289be534f1ecc6aa4b53a15 -> X-Git-Archeology: Date: Sun, 19 Nov 2023 22:34:54 +0100 -> X-Git-Archeology: From: Igor -> X-Git-Archeology: Subject: Bump rpi and ebin edge kernels to 6.6.y (#5925) -> X-Git-Archeology: -> X-Git-Archeology: - Revision f852beca0aeaec9ef5c062f089c3493e3b12fc48: https://github.com/armbian/build/commit/f852beca0aeaec9ef5c062f089c3493e3b12fc48 -> X-Git-Archeology: Date: Sun, 07 Jan 2024 18:58:36 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Switch meson64, bcm2711, sunxi, imx6, mvebu current to 6.6, edge to 6.7 and leave 6.1 for legecy -> X-Git-Archeology: ---- - drivers/usb/dwc2/gadget.c | 73 ++++++++++ - drivers/usb/gadget/function/f_hid.c | 14 ++ - drivers/usb/gadget/function/u_hid.h | 1 + - 3 files changed, 88 insertions(+) - -diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c -index 111111111111..222222222222 100644 ---- a/drivers/usb/dwc2/gadget.c -+++ b/drivers/usb/dwc2/gadget.c -@@ -4773,6 +4773,78 @@ static void dwc2_gadget_set_speed(struct usb_gadget *g, enum usb_device_speed sp - spin_unlock_irqrestore(&hsotg->lock, flags); - } - -+/** -+ * dwc2_hsotg_wakeup - send wakeup signal to the host -+ * @gadget: The usb gadget state -+ * -+ * If the gadget is in device mode and in the L1 or L2 state, -+ * it sends a wakeup signal to the host. -+ */ -+static int dwc2_hsotg_wakeup(struct usb_gadget *gadget) -+{ -+ struct dwc2_hsotg *hsotg = to_hsotg(gadget); -+ int ret = -1; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&hsotg->lock, flags); -+ -+ if (!hsotg->remote_wakeup_allowed) { -+ dev_dbg(hsotg->dev, -+ "wakeup: signalling skipped: is not allowed by host\n"); -+ goto skip; -+ } -+ if (hsotg->lx_state != DWC2_L1 && hsotg->lx_state != DWC2_L2) { -+ dev_dbg(hsotg->dev, -+ "wakeup: signalling skipped: gadget not in L1/L2 state: %d\n", hsotg->lx_state); -+ goto skip; -+ } -+ if (!dwc2_is_device_mode(hsotg)) { -+ dev_dbg(hsotg->dev, -+ "wakeup: signalling skipped: gadget not in device mode\n"); -+ goto skip; -+ } -+ -+ /*if (hsotg->in_ppd) { -+ if (dwc2_exit_partial_power_down(hsotg, 1, true)) -+ dev_err(hsotg->dev, "wakeup: exit partial_power_down failed\n"); -+ call_gadget(hsotg, resume); -+ }*/ -+ if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended) { -+ u32 pcgctl; -+ -+ dev_dbg(hsotg->dev, "wakeup: exiting device clock gating\n"); -+ -+ /* Clear the Gate hclk. */ -+ pcgctl = dwc2_readl(hsotg, PCGCTL); -+ pcgctl &= ~PCGCTL_GATEHCLK; -+ dwc2_writel(hsotg, pcgctl, PCGCTL); -+ udelay(5); -+ -+ /* Phy Clock bit. */ -+ pcgctl = dwc2_readl(hsotg, PCGCTL); -+ pcgctl &= ~PCGCTL_STOPPCLK; -+ dwc2_writel(hsotg, pcgctl, PCGCTL); -+ udelay(5); -+ -+ hsotg->bus_suspended = false; -+ } -+ -+ dev_dbg(hsotg->dev, "wakeup: sending signal to the host"); -+ -+ dwc2_set_bit(hsotg, DCTL, DCTL_RMTWKUPSIG); -+ mdelay(10); -+ dwc2_clear_bit(hsotg, DCTL, DCTL_RMTWKUPSIG); -+ -+ /* After the signalling, the USB core wakes up to L0 */ -+ call_gadget(hsotg, resume); -+ hsotg->lx_state = DWC2_L0; -+ -+ ret = 0; -+skip: -+ spin_unlock_irqrestore(&hsotg->lock, flags); -+ return ret; -+} -+ - static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { - .get_frame = dwc2_hsotg_gadget_getframe, - .set_selfpowered = dwc2_hsotg_set_selfpowered, -@@ -4782,6 +4854,7 @@ static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { - .udc_set_speed = dwc2_gadget_set_speed, - .vbus_session = dwc2_hsotg_vbus_session, - .vbus_draw = dwc2_hsotg_vbus_draw, -+ .wakeup = dwc2_hsotg_wakeup, - }; - - /** -diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c -index 111111111111..222222222222 100644 ---- a/drivers/usb/gadget/function/f_hid.c -+++ b/drivers/usb/gadget/function/f_hid.c -@@ -54,6 +54,8 @@ struct f_hidg { - * will be used to receive reports. - */ - bool use_out_ep; -+ /* attempt to wake up the host before write */ -+ bool wakeup_on_write; - - /* recv report */ - spinlock_t read_spinlock; -@@ -431,10 +433,19 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, - size_t count, loff_t *offp) - { - struct f_hidg *hidg = file->private_data; -+ struct usb_composite_dev *cdev = hidg->func.config->cdev; - struct usb_request *req; - unsigned long flags; - ssize_t status = -ENOMEM; - -+ /* -+ * remote wakeup is allowed only when the corresponding bit -+ * in config descriptor is set and wakeup_on_write is enabled. -+ * FIXME: cdev->config can be NULLed on disconnect. -+ */ -+ if (hidg->wakeup_on_write /*&& cdev->config->bmAttributes & 0x20*/) -+ usb_gadget_wakeup(cdev->gadget); -+ - spin_lock_irqsave(&hidg->write_spinlock, flags); - - if (!hidg->req) { -@@ -1098,6 +1109,7 @@ CONFIGFS_ATTR(f_hid_opts_, name) - F_HID_OPT(subclass, 8, 255); - F_HID_OPT(protocol, 8, 255); - F_HID_OPT(no_out_endpoint, 8, 1); -+F_HID_OPT(wakeup_on_write, 8, 1); - F_HID_OPT(report_length, 16, 65535); - - static ssize_t f_hid_opts_report_desc_show(struct config_item *item, char *page) -@@ -1158,6 +1170,7 @@ static struct configfs_attribute *hid_attrs[] = { - &f_hid_opts_attr_subclass, - &f_hid_opts_attr_protocol, - &f_hid_opts_attr_no_out_endpoint, -+ &f_hid_opts_attr_wakeup_on_write, - &f_hid_opts_attr_report_length, - &f_hid_opts_attr_report_desc, - &f_hid_opts_attr_dev, -@@ -1299,6 +1312,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) - } - } - hidg->use_out_ep = !opts->no_out_endpoint; -+ hidg->wakeup_on_write = opts->wakeup_on_write; - - mutex_unlock(&opts->lock); - -diff --git a/drivers/usb/gadget/function/u_hid.h b/drivers/usb/gadget/function/u_hid.h -index 111111111111..222222222222 100644 ---- a/drivers/usb/gadget/function/u_hid.h -+++ b/drivers/usb/gadget/function/u_hid.h -@@ -21,6 +21,7 @@ struct f_hid_opts { - unsigned char subclass; - unsigned char protocol; - unsigned char no_out_endpoint; -+ unsigned char wakeup_on_write; - unsigned short report_length; - unsigned short report_desc_length; - unsigned char *report_desc; --- -Armbian - diff --git a/patch/kernel/archive/bcm2711-6.1/2001-rename-msd.patch b/patch/kernel/archive/bcm2711-6.1/2001-rename-msd.patch deleted file mode 100644 index 1cd3eaa0de..0000000000 --- a/patch/kernel/archive/bcm2711-6.1/2001-rename-msd.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Igor Pecovnik -Date: Mon, 29 Aug 2022 08:43:24 +0200 -Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) - -> X-Git-Archeology: > recovered message: > * Add patches needed for Pi-KVM on Rpi4 -> X-Git-Archeology: > recovered message: > * Remove patch that does not belong here -> X-Git-Archeology: > recovered message: > * Update config -> X-Git-Archeology: > recovered message: > * Update edge config -> X-Git-Archeology: - Revision 2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25: https://github.com/armbian/build/commit/2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25 -> X-Git-Archeology: Date: Mon, 29 Aug 2022 08:43:24 +0200 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Add patches needed for Pi-KVM on Rpi4 (#4127) -> X-Git-Archeology: -> X-Git-Archeology: - Revision acf5810cbe38c7578907ecd06e61abb0a446df1e: https://github.com/armbian/build/commit/acf5810cbe38c7578907ecd06e61abb0a446df1e -> X-Git-Archeology: Date: Sat, 11 Mar 2023 19:19:13 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Move Rpi kernels to 6.2, move current to legacy (#4898) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 8caf51243e9769c48289be534f1ecc6aa4b53a15: https://github.com/armbian/build/commit/8caf51243e9769c48289be534f1ecc6aa4b53a15 -> X-Git-Archeology: Date: Sun, 19 Nov 2023 22:34:54 +0100 -> X-Git-Archeology: From: Igor -> X-Git-Archeology: Subject: Bump rpi and ebin edge kernels to 6.6.y (#5925) -> X-Git-Archeology: -> X-Git-Archeology: - Revision f852beca0aeaec9ef5c062f089c3493e3b12fc48: https://github.com/armbian/build/commit/f852beca0aeaec9ef5c062f089c3493e3b12fc48 -> X-Git-Archeology: Date: Sun, 07 Jan 2024 18:58:36 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Switch meson64, bcm2711, sunxi, imx6, mvebu current to 6.6, edge to 6.7 and leave 6.1 for legecy -> X-Git-Archeology: ---- - drivers/usb/gadget/function/f_mass_storage.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -index 111111111111..222222222222 100644 ---- a/drivers/usb/gadget/function/f_mass_storage.c -+++ b/drivers/usb/gadget/function/f_mass_storage.c -@@ -2986,11 +2986,11 @@ void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn, - /* Prepare inquiryString */ - i = get_default_bcdDevice(); - snprintf(common->inquiry_string, sizeof(common->inquiry_string), -- "%-8s%-16s%04x", vn ?: "Linux", -+ "%-8s%-16s%04x", vn ?: "PiKVM", - /* Assume product name dependent on the first LUN */ - pn ?: ((*common->luns)->cdrom -- ? "File-CD Gadget" -- : "File-Stor Gadget"), -+ ? "CD-ROM Drive" -+ : "Flash Drive"), - i); - } - EXPORT_SYMBOL_GPL(fsg_common_set_inquiry_string); --- -Armbian - diff --git a/patch/kernel/archive/bcm2711-6.10/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch b/patch/kernel/archive/bcm2711-6.10/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch deleted file mode 100644 index b9be9cff19..0000000000 --- a/patch/kernel/archive/bcm2711-6.10/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: graysky -Date: Mon, 7 Dec 2020 13:03:40 -0500 -Subject: Make /proc/cpuinfo consistent on arm64 and arm - -Signed-off-by: graysky ---- - arch/arm64/kernel/cpuinfo.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 111111111111..222222222222 100644 ---- a/arch/arm64/kernel/cpuinfo.c -+++ b/arch/arm64/kernel/cpuinfo.c -@@ -211,9 +211,8 @@ static int c_show(struct seq_file *m, void *v) - * "processor". Give glibc what it expects. - */ - seq_printf(m, "processor\t: %d\n", i); -- if (compat) -- seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n", -- MIDR_REVISION(midr), COMPAT_ELF_PLATFORM); -+ seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n", -+ MIDR_REVISION(midr), COMPAT_ELF_PLATFORM); - - seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", - loops_per_jiffy / (500000UL/HZ), --- -Armbian - diff --git a/patch/kernel/archive/bcm2711-6.10/001-force-platform-selection-brcm-soc-support.disabled b/patch/kernel/archive/bcm2711-6.10/001-force-platform-selection-brcm-soc-support.disabled deleted file mode 100644 index 01ef6aecd3..0000000000 --- a/patch/kernel/archive/bcm2711-6.10/001-force-platform-selection-brcm-soc-support.disabled +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur a/arch/arm/Kconfig b/arch/arm/Kconfig ---- a/arch/arm/Kconfig 2022-12-11 17:15:18.000000000 -0500 -+++ b/arch/arm/Kconfig 2022-12-13 10:24:24.085749880 -0500 -@@ -2,6 +2,7 @@ - config ARM - bool - default y -+ select ARCH_BCM - select ARCH_32BIT_OFF_T - select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND - select ARCH_HAS_BINFMT_FLAT -diff -Naur a/arch/arm64/Kconfig b/arch/arm64/Kconfig ---- a/arch/arm64/Kconfig 2022-12-11 17:15:18.000000000 -0500 -+++ b/arch/arm64/Kconfig 2022-12-13 10:28:40.045233987 -0500 -@@ -1,6 +1,7 @@ - # SPDX-License-Identifier: GPL-2.0-only - config ARM64 - def_bool y -+ select ARCH_BCM - select ACPI_APMT if ACPI - select ACPI_CCA_REQUIRED if ACPI - select ACPI_GENERIC_GSI if ACPI diff --git a/patch/kernel/archive/bcm2711-6.10/1003-remote-wakeup.patch b/patch/kernel/archive/bcm2711-6.10/1003-remote-wakeup.patch deleted file mode 100644 index 63228388d9..0000000000 --- a/patch/kernel/archive/bcm2711-6.10/1003-remote-wakeup.patch +++ /dev/null @@ -1,193 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Igor Pecovnik -Date: Mon, 29 Aug 2022 08:43:24 +0200 -Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) - -> X-Git-Archeology: > recovered message: > * Add patches needed for Pi-KVM on Rpi4 -> X-Git-Archeology: > recovered message: > * Remove patch that does not belong here -> X-Git-Archeology: > recovered message: > * Update config -> X-Git-Archeology: > recovered message: > * Update edge config -> X-Git-Archeology: - Revision 2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25: https://github.com/armbian/build/commit/2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25 -> X-Git-Archeology: Date: Mon, 29 Aug 2022 08:43:24 +0200 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Add patches needed for Pi-KVM on Rpi4 (#4127) -> X-Git-Archeology: -> X-Git-Archeology: - Revision acf5810cbe38c7578907ecd06e61abb0a446df1e: https://github.com/armbian/build/commit/acf5810cbe38c7578907ecd06e61abb0a446df1e -> X-Git-Archeology: Date: Sat, 11 Mar 2023 19:19:13 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Move Rpi kernels to 6.2, move current to legacy (#4898) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 5f2a1af2193187f0b994d6f163b94f370a01134f: https://github.com/armbian/build/commit/5f2a1af2193187f0b994d6f163b94f370a01134f -> X-Git-Archeology: Date: Fri, 28 Apr 2023 21:32:52 +0200 -> X-Git-Archeology: From: Ricardo Pardini -> X-Git-Archeology: Subject: `bcm2711`/`edge`: bump to `6.3` (`rpi4b`, RPi Foundation Kernel) -> X-Git-Archeology: ---- - drivers/usb/dwc2/gadget.c | 73 ++++++++++ - drivers/usb/gadget/function/f_hid.c | 14 ++ - drivers/usb/gadget/function/u_hid.h | 1 + - 3 files changed, 88 insertions(+) - -diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c -index 111111111111..222222222222 100644 ---- a/drivers/usb/dwc2/gadget.c -+++ b/drivers/usb/dwc2/gadget.c -@@ -4775,6 +4775,78 @@ static void dwc2_gadget_set_speed(struct usb_gadget *g, enum usb_device_speed sp - spin_unlock_irqrestore(&hsotg->lock, flags); - } - -+/** -+ * dwc2_hsotg_wakeup - send wakeup signal to the host -+ * @gadget: The usb gadget state -+ * -+ * If the gadget is in device mode and in the L1 or L2 state, -+ * it sends a wakeup signal to the host. -+ */ -+static int dwc2_hsotg_wakeup(struct usb_gadget *gadget) -+{ -+ struct dwc2_hsotg *hsotg = to_hsotg(gadget); -+ int ret = -1; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&hsotg->lock, flags); -+ -+ if (!hsotg->remote_wakeup_allowed) { -+ dev_dbg(hsotg->dev, -+ "wakeup: signalling skipped: is not allowed by host\n"); -+ goto skip; -+ } -+ if (hsotg->lx_state != DWC2_L1 && hsotg->lx_state != DWC2_L2) { -+ dev_dbg(hsotg->dev, -+ "wakeup: signalling skipped: gadget not in L1/L2 state: %d\n", hsotg->lx_state); -+ goto skip; -+ } -+ if (!dwc2_is_device_mode(hsotg)) { -+ dev_dbg(hsotg->dev, -+ "wakeup: signalling skipped: gadget not in device mode\n"); -+ goto skip; -+ } -+ -+ /*if (hsotg->in_ppd) { -+ if (dwc2_exit_partial_power_down(hsotg, 1, true)) -+ dev_err(hsotg->dev, "wakeup: exit partial_power_down failed\n"); -+ call_gadget(hsotg, resume); -+ }*/ -+ if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended) { -+ u32 pcgctl; -+ -+ dev_dbg(hsotg->dev, "wakeup: exiting device clock gating\n"); -+ -+ /* Clear the Gate hclk. */ -+ pcgctl = dwc2_readl(hsotg, PCGCTL); -+ pcgctl &= ~PCGCTL_GATEHCLK; -+ dwc2_writel(hsotg, pcgctl, PCGCTL); -+ udelay(5); -+ -+ /* Phy Clock bit. */ -+ pcgctl = dwc2_readl(hsotg, PCGCTL); -+ pcgctl &= ~PCGCTL_STOPPCLK; -+ dwc2_writel(hsotg, pcgctl, PCGCTL); -+ udelay(5); -+ -+ hsotg->bus_suspended = false; -+ } -+ -+ dev_dbg(hsotg->dev, "wakeup: sending signal to the host"); -+ -+ dwc2_set_bit(hsotg, DCTL, DCTL_RMTWKUPSIG); -+ mdelay(10); -+ dwc2_clear_bit(hsotg, DCTL, DCTL_RMTWKUPSIG); -+ -+ /* After the signalling, the USB core wakes up to L0 */ -+ call_gadget(hsotg, resume); -+ hsotg->lx_state = DWC2_L0; -+ -+ ret = 0; -+skip: -+ spin_unlock_irqrestore(&hsotg->lock, flags); -+ return ret; -+} -+ - static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { - .get_frame = dwc2_hsotg_gadget_getframe, - .set_selfpowered = dwc2_hsotg_set_selfpowered, -@@ -4784,6 +4856,7 @@ static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { - .udc_set_speed = dwc2_gadget_set_speed, - .vbus_session = dwc2_hsotg_vbus_session, - .vbus_draw = dwc2_hsotg_vbus_draw, -+ .wakeup = dwc2_hsotg_wakeup, - }; - - /** -diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c -index 111111111111..222222222222 100644 ---- a/drivers/usb/gadget/function/f_hid.c -+++ b/drivers/usb/gadget/function/f_hid.c -@@ -58,6 +58,8 @@ struct f_hidg { - * will be used to receive reports. - */ - bool use_out_ep; -+ /* attempt to wake up the host before write */ -+ bool wakeup_on_write; - - /* recv report */ - spinlock_t read_spinlock; -@@ -435,10 +437,19 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, - size_t count, loff_t *offp) - { - struct f_hidg *hidg = file->private_data; -+ struct usb_composite_dev *cdev = hidg->func.config->cdev; - struct usb_request *req; - unsigned long flags; - ssize_t status = -ENOMEM; - -+ /* -+ * remote wakeup is allowed only when the corresponding bit -+ * in config descriptor is set and wakeup_on_write is enabled. -+ * FIXME: cdev->config can be NULLed on disconnect. -+ */ -+ if (hidg->wakeup_on_write /*&& cdev->config->bmAttributes & 0x20*/) -+ usb_gadget_wakeup(cdev->gadget); -+ - spin_lock_irqsave(&hidg->write_spinlock, flags); - - if (!hidg->req) { -@@ -1102,6 +1113,7 @@ CONFIGFS_ATTR(f_hid_opts_, name) - F_HID_OPT(subclass, 8, 255); - F_HID_OPT(protocol, 8, 255); - F_HID_OPT(no_out_endpoint, 8, 1); -+F_HID_OPT(wakeup_on_write, 8, 1); - F_HID_OPT(report_length, 16, 65535); - - static ssize_t f_hid_opts_report_desc_show(struct config_item *item, char *page) -@@ -1162,6 +1174,7 @@ static struct configfs_attribute *hid_attrs[] = { - &f_hid_opts_attr_subclass, - &f_hid_opts_attr_protocol, - &f_hid_opts_attr_no_out_endpoint, -+ &f_hid_opts_attr_wakeup_on_write, - &f_hid_opts_attr_report_length, - &f_hid_opts_attr_report_desc, - &f_hid_opts_attr_dev, -@@ -1297,6 +1310,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) - } - } - hidg->use_out_ep = !opts->no_out_endpoint; -+ hidg->wakeup_on_write = opts->wakeup_on_write; - - ++opts->refcnt; - mutex_unlock(&opts->lock); -diff --git a/drivers/usb/gadget/function/u_hid.h b/drivers/usb/gadget/function/u_hid.h -index 111111111111..222222222222 100644 ---- a/drivers/usb/gadget/function/u_hid.h -+++ b/drivers/usb/gadget/function/u_hid.h -@@ -21,6 +21,7 @@ struct f_hid_opts { - unsigned char subclass; - unsigned char protocol; - unsigned char no_out_endpoint; -+ unsigned char wakeup_on_write; - unsigned short report_length; - unsigned short report_desc_length; - unsigned char *report_desc; --- -Armbian - diff --git a/patch/kernel/archive/bcm2711-6.10/2001-rename-msd.patch b/patch/kernel/archive/bcm2711-6.10/2001-rename-msd.patch deleted file mode 100644 index 277f494b2d..0000000000 --- a/patch/kernel/archive/bcm2711-6.10/2001-rename-msd.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Igor Pecovnik -Date: Mon, 29 Aug 2022 08:43:24 +0200 -Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) - -> X-Git-Archeology: > recovered message: > * Add patches needed for Pi-KVM on Rpi4 -> X-Git-Archeology: > recovered message: > * Remove patch that does not belong here -> X-Git-Archeology: > recovered message: > * Update config -> X-Git-Archeology: > recovered message: > * Update edge config -> X-Git-Archeology: - Revision 2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25: https://github.com/armbian/build/commit/2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25 -> X-Git-Archeology: Date: Mon, 29 Aug 2022 08:43:24 +0200 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Add patches needed for Pi-KVM on Rpi4 (#4127) -> X-Git-Archeology: -> X-Git-Archeology: - Revision acf5810cbe38c7578907ecd06e61abb0a446df1e: https://github.com/armbian/build/commit/acf5810cbe38c7578907ecd06e61abb0a446df1e -> X-Git-Archeology: Date: Sat, 11 Mar 2023 19:19:13 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Move Rpi kernels to 6.2, move current to legacy (#4898) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 5f2a1af2193187f0b994d6f163b94f370a01134f: https://github.com/armbian/build/commit/5f2a1af2193187f0b994d6f163b94f370a01134f -> X-Git-Archeology: Date: Fri, 28 Apr 2023 21:32:52 +0200 -> X-Git-Archeology: From: Ricardo Pardini -> X-Git-Archeology: Subject: `bcm2711`/`edge`: bump to `6.3` (`rpi4b`, RPi Foundation Kernel) -> X-Git-Archeology: ---- - drivers/usb/gadget/function/f_mass_storage.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -index 111111111111..222222222222 100644 ---- a/drivers/usb/gadget/function/f_mass_storage.c -+++ b/drivers/usb/gadget/function/f_mass_storage.c -@@ -2983,11 +2983,11 @@ void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn, - /* Prepare inquiryString */ - i = get_default_bcdDevice(); - snprintf(common->inquiry_string, sizeof(common->inquiry_string), -- "%-8s%-16s%04x", vn ?: "Linux", -+ "%-8s%-16s%04x", vn ?: "PiKVM", - /* Assume product name dependent on the first LUN */ - pn ?: ((*common->luns)->cdrom -- ? "File-CD Gadget" -- : "File-Stor Gadget"), -+ ? "CD-ROM Drive" -+ : "Flash Drive"), - i); - } - EXPORT_SYMBOL_GPL(fsg_common_set_inquiry_string); --- -Armbian - diff --git a/patch/kernel/archive/bcm2711-6.6/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch b/patch/kernel/archive/bcm2711-6.6/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch deleted file mode 100644 index 7d27f375f1..0000000000 --- a/patch/kernel/archive/bcm2711-6.6/0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: graysky -Date: Mon, 7 Dec 2020 13:03:40 -0500 -Subject: Make /proc/cpuinfo consistent on arm64 and arm - -Signed-off-by: graysky ---- - arch/arm64/kernel/cpuinfo.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 111111111111..222222222222 100644 ---- a/arch/arm64/kernel/cpuinfo.c -+++ b/arch/arm64/kernel/cpuinfo.c -@@ -194,9 +194,8 @@ static int c_show(struct seq_file *m, void *v) - * "processor". Give glibc what it expects. - */ - seq_printf(m, "processor\t: %d\n", i); -- if (compat) -- seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n", -- MIDR_REVISION(midr), COMPAT_ELF_PLATFORM); -+ seq_printf(m, "model name\t: ARMv8 Processor rev %d (%s)\n", -+ MIDR_REVISION(midr), COMPAT_ELF_PLATFORM); - - seq_printf(m, "BogoMIPS\t: %lu.%02lu\n", - loops_per_jiffy / (500000UL/HZ), --- -Armbian - diff --git a/patch/kernel/archive/bcm2711-6.6/001-force-platform-selection-brcm-soc-support.patch.disabled b/patch/kernel/archive/bcm2711-6.6/001-force-platform-selection-brcm-soc-support.patch.disabled deleted file mode 100644 index 507c24c406..0000000000 --- a/patch/kernel/archive/bcm2711-6.6/001-force-platform-selection-brcm-soc-support.patch.disabled +++ /dev/null @@ -1,22 +0,0 @@ -diff -Naur a/arch/arm/Kconfig b/arch/arm/Kconfig ---- a/arch/arm/Kconfig 2022-12-11 17:15:18.000000000 -0500 -+++ b/arch/arm/Kconfig 2022-12-13 10:24:24.085749880 -0500 -@@ -2,6 +2,7 @@ - config ARM - bool - default y -+ select ARCH_BCM - select ARCH_32BIT_OFF_T - select ARCH_CORRECT_STACKTRACE_ON_KRETPROBE if HAVE_KRETPROBES && FRAME_POINTER && !ARM_UNWIND - select ARCH_HAS_BINFMT_FLAT -diff -Naur a/arch/arm64/Kconfig b/arch/arm64/Kconfig ---- a/arch/arm64/Kconfig 2022-12-11 17:15:18.000000000 -0500 -+++ b/arch/arm64/Kconfig 2022-12-13 10:28:40.045233987 -0500 -@@ -1,6 +1,7 @@ - # SPDX-License-Identifier: GPL-2.0-only - config ARM64 - def_bool y -+ select ARCH_BCM - select ACPI_CCA_REQUIRED if ACPI - select ACPI_GENERIC_GSI if ACPI - select ACPI_GTDT if ACPI diff --git a/patch/kernel/archive/bcm2711-6.6/1003-remote-wakeup.patch b/patch/kernel/archive/bcm2711-6.6/1003-remote-wakeup.patch deleted file mode 100644 index 8f5a9449ea..0000000000 --- a/patch/kernel/archive/bcm2711-6.6/1003-remote-wakeup.patch +++ /dev/null @@ -1,198 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Igor Pecovnik -Date: Mon, 29 Aug 2022 08:43:24 +0200 -Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) - -> X-Git-Archeology: > recovered message: > * Add patches needed for Pi-KVM on Rpi4 -> X-Git-Archeology: > recovered message: > * Remove patch that does not belong here -> X-Git-Archeology: > recovered message: > * Update config -> X-Git-Archeology: > recovered message: > * Update edge config -> X-Git-Archeology: - Revision 2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25: https://github.com/armbian/build/commit/2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25 -> X-Git-Archeology: Date: Mon, 29 Aug 2022 08:43:24 +0200 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Add patches needed for Pi-KVM on Rpi4 (#4127) -> X-Git-Archeology: -> X-Git-Archeology: - Revision acf5810cbe38c7578907ecd06e61abb0a446df1e: https://github.com/armbian/build/commit/acf5810cbe38c7578907ecd06e61abb0a446df1e -> X-Git-Archeology: Date: Sat, 11 Mar 2023 19:19:13 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Move Rpi kernels to 6.2, move current to legacy (#4898) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 8caf51243e9769c48289be534f1ecc6aa4b53a15: https://github.com/armbian/build/commit/8caf51243e9769c48289be534f1ecc6aa4b53a15 -> X-Git-Archeology: Date: Sun, 19 Nov 2023 22:34:54 +0100 -> X-Git-Archeology: From: Igor -> X-Git-Archeology: Subject: Bump rpi and ebin edge kernels to 6.6.y (#5925) -> X-Git-Archeology: -> X-Git-Archeology: - Revision f852beca0aeaec9ef5c062f089c3493e3b12fc48: https://github.com/armbian/build/commit/f852beca0aeaec9ef5c062f089c3493e3b12fc48 -> X-Git-Archeology: Date: Sun, 07 Jan 2024 18:58:36 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Switch meson64, bcm2711, sunxi, imx6, mvebu current to 6.6, edge to 6.7 and leave 6.1 for legecy -> X-Git-Archeology: ---- - drivers/usb/dwc2/gadget.c | 73 ++++++++++ - drivers/usb/gadget/function/f_hid.c | 14 ++ - drivers/usb/gadget/function/u_hid.h | 1 + - 3 files changed, 88 insertions(+) - -diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c -index 111111111111..222222222222 100644 ---- a/drivers/usb/dwc2/gadget.c -+++ b/drivers/usb/dwc2/gadget.c -@@ -4772,6 +4772,78 @@ static void dwc2_gadget_set_speed(struct usb_gadget *g, enum usb_device_speed sp - spin_unlock_irqrestore(&hsotg->lock, flags); - } - -+/** -+ * dwc2_hsotg_wakeup - send wakeup signal to the host -+ * @gadget: The usb gadget state -+ * -+ * If the gadget is in device mode and in the L1 or L2 state, -+ * it sends a wakeup signal to the host. -+ */ -+static int dwc2_hsotg_wakeup(struct usb_gadget *gadget) -+{ -+ struct dwc2_hsotg *hsotg = to_hsotg(gadget); -+ int ret = -1; -+ unsigned long flags; -+ -+ spin_lock_irqsave(&hsotg->lock, flags); -+ -+ if (!hsotg->remote_wakeup_allowed) { -+ dev_dbg(hsotg->dev, -+ "wakeup: signalling skipped: is not allowed by host\n"); -+ goto skip; -+ } -+ if (hsotg->lx_state != DWC2_L1 && hsotg->lx_state != DWC2_L2) { -+ dev_dbg(hsotg->dev, -+ "wakeup: signalling skipped: gadget not in L1/L2 state: %d\n", hsotg->lx_state); -+ goto skip; -+ } -+ if (!dwc2_is_device_mode(hsotg)) { -+ dev_dbg(hsotg->dev, -+ "wakeup: signalling skipped: gadget not in device mode\n"); -+ goto skip; -+ } -+ -+ /*if (hsotg->in_ppd) { -+ if (dwc2_exit_partial_power_down(hsotg, 1, true)) -+ dev_err(hsotg->dev, "wakeup: exit partial_power_down failed\n"); -+ call_gadget(hsotg, resume); -+ }*/ -+ if (hsotg->params.power_down == DWC2_POWER_DOWN_PARAM_NONE && hsotg->bus_suspended) { -+ u32 pcgctl; -+ -+ dev_dbg(hsotg->dev, "wakeup: exiting device clock gating\n"); -+ -+ /* Clear the Gate hclk. */ -+ pcgctl = dwc2_readl(hsotg, PCGCTL); -+ pcgctl &= ~PCGCTL_GATEHCLK; -+ dwc2_writel(hsotg, pcgctl, PCGCTL); -+ udelay(5); -+ -+ /* Phy Clock bit. */ -+ pcgctl = dwc2_readl(hsotg, PCGCTL); -+ pcgctl &= ~PCGCTL_STOPPCLK; -+ dwc2_writel(hsotg, pcgctl, PCGCTL); -+ udelay(5); -+ -+ hsotg->bus_suspended = false; -+ } -+ -+ dev_dbg(hsotg->dev, "wakeup: sending signal to the host"); -+ -+ dwc2_set_bit(hsotg, DCTL, DCTL_RMTWKUPSIG); -+ mdelay(10); -+ dwc2_clear_bit(hsotg, DCTL, DCTL_RMTWKUPSIG); -+ -+ /* After the signalling, the USB core wakes up to L0 */ -+ call_gadget(hsotg, resume); -+ hsotg->lx_state = DWC2_L0; -+ -+ ret = 0; -+skip: -+ spin_unlock_irqrestore(&hsotg->lock, flags); -+ return ret; -+} -+ - static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { - .get_frame = dwc2_hsotg_gadget_getframe, - .set_selfpowered = dwc2_hsotg_set_selfpowered, -@@ -4781,6 +4853,7 @@ static const struct usb_gadget_ops dwc2_hsotg_gadget_ops = { - .udc_set_speed = dwc2_gadget_set_speed, - .vbus_session = dwc2_hsotg_vbus_session, - .vbus_draw = dwc2_hsotg_vbus_draw, -+ .wakeup = dwc2_hsotg_wakeup, - }; - - /** -diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c -index 111111111111..222222222222 100644 ---- a/drivers/usb/gadget/function/f_hid.c -+++ b/drivers/usb/gadget/function/f_hid.c -@@ -58,6 +58,8 @@ struct f_hidg { - * will be used to receive reports. - */ - bool use_out_ep; -+ /* attempt to wake up the host before write */ -+ bool wakeup_on_write; - - /* recv report */ - spinlock_t read_spinlock; -@@ -435,10 +437,19 @@ static ssize_t f_hidg_write(struct file *file, const char __user *buffer, - size_t count, loff_t *offp) - { - struct f_hidg *hidg = file->private_data; -+ struct usb_composite_dev *cdev = hidg->func.config->cdev; - struct usb_request *req; - unsigned long flags; - ssize_t status = -ENOMEM; - -+ /* -+ * remote wakeup is allowed only when the corresponding bit -+ * in config descriptor is set and wakeup_on_write is enabled. -+ * FIXME: cdev->config can be NULLed on disconnect. -+ */ -+ if (hidg->wakeup_on_write /*&& cdev->config->bmAttributes & 0x20*/) -+ usb_gadget_wakeup(cdev->gadget); -+ - spin_lock_irqsave(&hidg->write_spinlock, flags); - - if (!hidg->req) { -@@ -1102,6 +1113,7 @@ CONFIGFS_ATTR(f_hid_opts_, name) - F_HID_OPT(subclass, 8, 255); - F_HID_OPT(protocol, 8, 255); - F_HID_OPT(no_out_endpoint, 8, 1); -+F_HID_OPT(wakeup_on_write, 8, 1); - F_HID_OPT(report_length, 16, 65535); - - static ssize_t f_hid_opts_report_desc_show(struct config_item *item, char *page) -@@ -1162,6 +1174,7 @@ static struct configfs_attribute *hid_attrs[] = { - &f_hid_opts_attr_subclass, - &f_hid_opts_attr_protocol, - &f_hid_opts_attr_no_out_endpoint, -+ &f_hid_opts_attr_wakeup_on_write, - &f_hid_opts_attr_report_length, - &f_hid_opts_attr_report_desc, - &f_hid_opts_attr_dev, -@@ -1297,6 +1310,7 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) - } - } - hidg->use_out_ep = !opts->no_out_endpoint; -+ hidg->wakeup_on_write = opts->wakeup_on_write; - - ++opts->refcnt; - mutex_unlock(&opts->lock); -diff --git a/drivers/usb/gadget/function/u_hid.h b/drivers/usb/gadget/function/u_hid.h -index 111111111111..222222222222 100644 ---- a/drivers/usb/gadget/function/u_hid.h -+++ b/drivers/usb/gadget/function/u_hid.h -@@ -21,6 +21,7 @@ struct f_hid_opts { - unsigned char subclass; - unsigned char protocol; - unsigned char no_out_endpoint; -+ unsigned char wakeup_on_write; - unsigned short report_length; - unsigned short report_desc_length; - unsigned char *report_desc; --- -Armbian - diff --git a/patch/kernel/archive/bcm2711-6.6/2001-rename-msd.patch b/patch/kernel/archive/bcm2711-6.6/2001-rename-msd.patch deleted file mode 100644 index 22add2c8b0..0000000000 --- a/patch/kernel/archive/bcm2711-6.6/2001-rename-msd.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Igor Pecovnik -Date: Mon, 29 Aug 2022 08:43:24 +0200 -Subject: [ARCHEOLOGY] Add patches needed for Pi-KVM on Rpi4 (#4127) - -> X-Git-Archeology: > recovered message: > * Add patches needed for Pi-KVM on Rpi4 -> X-Git-Archeology: > recovered message: > * Remove patch that does not belong here -> X-Git-Archeology: > recovered message: > * Update config -> X-Git-Archeology: > recovered message: > * Update edge config -> X-Git-Archeology: - Revision 2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25: https://github.com/armbian/build/commit/2fb3aaaf86a7463ef1d26f4d623e1d3289ea4f25 -> X-Git-Archeology: Date: Mon, 29 Aug 2022 08:43:24 +0200 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Add patches needed for Pi-KVM on Rpi4 (#4127) -> X-Git-Archeology: -> X-Git-Archeology: - Revision acf5810cbe38c7578907ecd06e61abb0a446df1e: https://github.com/armbian/build/commit/acf5810cbe38c7578907ecd06e61abb0a446df1e -> X-Git-Archeology: Date: Sat, 11 Mar 2023 19:19:13 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Move Rpi kernels to 6.2, move current to legacy (#4898) -> X-Git-Archeology: -> X-Git-Archeology: - Revision 8caf51243e9769c48289be534f1ecc6aa4b53a15: https://github.com/armbian/build/commit/8caf51243e9769c48289be534f1ecc6aa4b53a15 -> X-Git-Archeology: Date: Sun, 19 Nov 2023 22:34:54 +0100 -> X-Git-Archeology: From: Igor -> X-Git-Archeology: Subject: Bump rpi and ebin edge kernels to 6.6.y (#5925) -> X-Git-Archeology: -> X-Git-Archeology: - Revision f852beca0aeaec9ef5c062f089c3493e3b12fc48: https://github.com/armbian/build/commit/f852beca0aeaec9ef5c062f089c3493e3b12fc48 -> X-Git-Archeology: Date: Sun, 07 Jan 2024 18:58:36 +0100 -> X-Git-Archeology: From: Igor Pecovnik -> X-Git-Archeology: Subject: Switch meson64, bcm2711, sunxi, imx6, mvebu current to 6.6, edge to 6.7 and leave 6.1 for legecy -> X-Git-Archeology: ---- - drivers/usb/gadget/function/f_mass_storage.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/usb/gadget/function/f_mass_storage.c b/drivers/usb/gadget/function/f_mass_storage.c -index 111111111111..222222222222 100644 ---- a/drivers/usb/gadget/function/f_mass_storage.c -+++ b/drivers/usb/gadget/function/f_mass_storage.c -@@ -2983,11 +2983,11 @@ void fsg_common_set_inquiry_string(struct fsg_common *common, const char *vn, - /* Prepare inquiryString */ - i = get_default_bcdDevice(); - snprintf(common->inquiry_string, sizeof(common->inquiry_string), -- "%-8s%-16s%04x", vn ?: "Linux", -+ "%-8s%-16s%04x", vn ?: "PiKVM", - /* Assume product name dependent on the first LUN */ - pn ?: ((*common->luns)->cdrom -- ? "File-CD Gadget" -- : "File-Stor Gadget"), -+ ? "CD-ROM Drive" -+ : "Flash Drive"), - i); - } - EXPORT_SYMBOL_GPL(fsg_common_set_inquiry_string); --- -Armbian -