mirror of
https://codeberg.org/libreboot/lbmk.git
synced 2026-07-22 14:36:31 +02:00
Leah Rowe
81dc1a7f89
NOTE: gfxterm_menu module removed, because of this change by upstream: commit ca2a91f43bf6e1df23a07c295534f871ddf2d401 Author: Glenn Washburn <development@efficientek.com> Date: Mon May 5 16:11:36 2025 -0500 tests: Disable gfxterm_menu and cmdline_cat tests This brings in the following changes from upstream: * a68a7dece loader/i386/pc/linux: Fix resource leak * de80acf36 loader/efi/linux: Unload previous Linux kernel/initrd before updating kernel size * 249db11d8 loader/efi/linux: Correctly terminate load_options member * f3b339af1 loader/efi/linux: Use sizeof() instead of constant * c2b2e0dcf loader/efi/linux: Use proper type for len variable * de4e8e2aa loader/efi/linux: Do not pass excessive size for source string * 8c8f96664 loader/efi/linux: Remove useless assignment * 8ebf155af include/grub/charset.h: Update documentation * 2f2ed28d5 Revert "lzma: Make sure we don't dereference past array" * 2539ede82 tests/util/grub-shell: Correct netboot and file_filter test failure * 8c2d4e64f normal/charset: Fix underflow and overflow in loop init * ba8eadde6 dl: Provide a fake grub_dl_set_persistent() and grub_dl_is_persistent() for the emu target * 409e72ced util/grub-protect: Correct uninit "err" variable * 5eca564b1 gnulib: Bring back the fix for resolving unused variable issue * ac1512b87 gnulib: Add patch to allow GRUB w/GCC-15 compile * db506b3b8 gnulib/regexec: Fix resource leak * bba7dd736 gnulib/regcomp: Fix resource leak * 91cb7ff6b tests/tpm2_key_protector_test: Add tests for SHA-384 PCR bank * 451e227e5 tpm2_key_protector: Dump the PCR bank for key unsealing * 11caacdb2 util/grub-protect: Fix the hash algorithm of PCR digest * ce23919ca build: Add new header files to dist to allow building from tar * e3b15bafd build: Remove extra_deps.lst from EXTRA_DIST * 40e261b89 lib/LzmaEnc: Validate "len" before subtracting * 86e8f2c4b osdep/unix/hostdisk: Fix signed integer overflow * 438f05581 disk/luks2: Add attempting to decrypt message to align with luks and geli modules * 20e6d0c4a osdep/linux/getroot: Detect DDF container similar to IMSM * b71bc0f8b fs/fshelp: Avoid possible NULL pointer deference * 272ff81cb fs/ntfs: Correct possible infinite loops/hangs * 8c95307a0 fs/ntfs: Correct possible access violations * 06914b614 fs/ntfs: Correct attribute vs attribute list validation * 0e1762c8a fs/ntfs: Correct regression with run list calculation * be303f8c1 lib/envblk: Ignore empty new lines while parsing env files * 34bd00ee2 fs/zfs: Fix another memory leak in ZFS code * ca2a91f43 tests: Disable gfxterm_menu and cmdline_cat tests Signed-off-by: Leah Rowe <leah@libreboot.org>
78 lines
2.7 KiB
Diff
78 lines
2.7 KiB
Diff
From 7db1cdd1cdbb79a8da04648dcbf7318d200f72a4 Mon Sep 17 00:00:00 2001
|
|
From: Patrick Rudolph <patrick.rudolph@9elements.com>
|
|
Date: Mon, 7 Dec 2020 08:41:25 +0100
|
|
Subject: [PATCH 18/26] grub-core/bus/usb/usbhub: Add new private fields for
|
|
xHCI controller
|
|
|
|
Store the root port number, the route, consisting out of the port ID
|
|
in each nibble, and a pointer to driver private data.
|
|
|
|
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
|
|
---
|
|
grub-core/bus/usb/usbhub.c | 11 ++++++++---
|
|
include/grub/usb.h | 5 +++++
|
|
2 files changed, 13 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
|
|
index 8e963e84b..b4b3a1a61 100644
|
|
--- a/grub-core/bus/usb/usbhub.c
|
|
+++ b/grub-core/bus/usb/usbhub.c
|
|
@@ -49,7 +49,9 @@ static grub_usb_controller_dev_t grub_usb_list;
|
|
static grub_usb_device_t
|
|
grub_usb_hub_add_dev (grub_usb_controller_t controller,
|
|
grub_usb_speed_t speed,
|
|
- int split_hubport, int split_hubaddr)
|
|
+ int split_hubport, int split_hubaddr,
|
|
+ int root_portno,
|
|
+ grub_uint32_t route)
|
|
{
|
|
grub_usb_device_t dev;
|
|
int i;
|
|
@@ -65,6 +67,8 @@ grub_usb_hub_add_dev (grub_usb_controller_t controller,
|
|
dev->speed = speed;
|
|
dev->split_hubport = split_hubport;
|
|
dev->split_hubaddr = split_hubaddr;
|
|
+ dev->root_port = root_portno;
|
|
+ dev->route = route;
|
|
|
|
if (controller->dev->attach_dev) {
|
|
err = controller->dev->attach_dev (controller, dev);
|
|
@@ -245,7 +249,7 @@ attach_root_port (struct grub_usb_hub *hub, int portno,
|
|
and full/low speed device connected to OHCI/UHCI needs not
|
|
transaction translation - e.g. hubport and hubaddr should be
|
|
always none (zero) for any device connected to any root hub. */
|
|
- dev = grub_usb_hub_add_dev (hub->controller, speed, 0, 0);
|
|
+ dev = grub_usb_hub_add_dev (hub->controller, speed, 0, 0, portno, 0);
|
|
hub->controller->dev->pending_reset = 0;
|
|
npending--;
|
|
if (! dev)
|
|
@@ -676,7 +680,8 @@ poll_nonroot_hub (grub_usb_device_t dev)
|
|
|
|
/* Add the device and assign a device address to it. */
|
|
next_dev = grub_usb_hub_add_dev (&dev->controller, speed,
|
|
- split_hubport, split_hubaddr);
|
|
+ split_hubport, split_hubaddr, dev->root_port,
|
|
+ dev->route << 4 | (i & 0xf));
|
|
if (dev->controller.dev->pending_reset)
|
|
{
|
|
dev->controller.dev->pending_reset = 0;
|
|
diff --git a/include/grub/usb.h b/include/grub/usb.h
|
|
index 4dd179db2..609faf7d0 100644
|
|
--- a/include/grub/usb.h
|
|
+++ b/include/grub/usb.h
|
|
@@ -237,6 +237,11 @@ struct grub_usb_device
|
|
int split_hubport;
|
|
|
|
int split_hubaddr;
|
|
+
|
|
+ /* xHCI specific information */
|
|
+ int root_port;
|
|
+ grub_uint32_t route;
|
|
+ void *xhci_priv;
|
|
};
|
|
|
|
|
|
--
|
|
2.39.5
|
|
|