Hello Karthikeyan Ramasubramanian,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/34291
to review the following change.
Change subject: mb/google/octopus: Disable unused USB devices ......................................................................
mb/google/octopus: Disable unused USB devices
Disable unused USB devices in the device tree so that the concerned ACPI objects do not get exported to the OS.
BUG=b:133513961 BRANCH=octopus TEST=Boot to ChromeOS. Ensure that the USB devices are disabled based on port status and the concerned ACPI objects are not exported.
Change-Id: I0faccdfb8a9df9ec52130437433b15973e3d6f1a Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com --- M src/mainboard/google/octopus/mainboard.c M src/mainboard/google/octopus/variants/casta/Makefile.inc A src/mainboard/google/octopus/variants/casta/variant.c 3 files changed, 40 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/34291/1
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c index 91cf1e4..c902007 100644 --- a/src/mainboard/google/octopus/mainboard.c +++ b/src/mainboard/google/octopus/mainboard.c @@ -16,12 +16,14 @@ #include <arch/acpi.h> #include <baseboard/variants.h> #include <boardid.h> +#include <bootstate.h> #include <console/console.h> #include <device/device.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <ec/google/chromeec/ec.h> #include <ec/ec.h> +#include <intelblocks/xhci.h> #include <nhlt.h> #include <smbios.h> #include <soc/cpu.h> @@ -199,3 +201,10 @@
return manuf; } + +static void disable_unused_devices(void *unused) +{ + usb_xhci_internal_device_disable(); +} + +BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_EXIT, disable_unused_devices, NULL); diff --git a/src/mainboard/google/octopus/variants/casta/Makefile.inc b/src/mainboard/google/octopus/variants/casta/Makefile.inc index 9fb63f5..ba865e9 100644 --- a/src/mainboard/google/octopus/variants/casta/Makefile.inc +++ b/src/mainboard/google/octopus/variants/casta/Makefile.inc @@ -1,3 +1,4 @@ bootblock-y += gpio.c
ramstage-y += gpio.c +ramstage-y += variant.c diff --git a/src/mainboard/google/octopus/variants/casta/variant.c b/src/mainboard/google/octopus/variants/casta/variant.c new file mode 100644 index 0000000..c7353c1 --- /dev/null +++ b/src/mainboard/google/octopus/variants/casta/variant.c @@ -0,0 +1,30 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2019 Google LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <baseboard/variants.h> +#include <bootstate.h> +#include <intelblocks/xhci.h> + +#define RIGHT_USB_C_PORT_ID 4 + +static void disable_unused_devices(void *unused) +{ + uint32_t sku_id = get_board_sku(); + + if (sku_id == 2) + usb_xhci_external_device_disable(RIGHT_USB_C_PORT_ID); +} + +BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_EXIT, disable_unused_devices, NULL);
Hello Karthikeyan Ramasubramanian, Justin TerAvest, build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/34291
to look at the new patch set (#2).
Change subject: mb/google/octopus: Disable unused USB devices ......................................................................
mb/google/octopus: Disable unused USB devices
Disable unused USB devices in the device tree so that the concerned ACPI objects do not get exported to the OS.
BUG=b:133513961 BRANCH=octopus TEST=Boot to ChromeOS. Ensure that the USB devices are disabled based on port status and the concerned ACPI objects are not exported.
Change-Id: I0faccdfb8a9df9ec52130437433b15973e3d6f1a Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com --- M src/mainboard/google/octopus/mainboard.c M src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/octopus/variants/casta/variant.c 3 files changed, 37 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/91/34291/2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/34291 )
Change subject: mb/google/octopus: Disable unused USB devices ......................................................................
Patch Set 2: Code-Review+2
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34291 )
Change subject: mb/google/octopus: Disable unused USB devices ......................................................................
mb/google/octopus: Disable unused USB devices
Disable unused USB devices in the device tree so that the concerned ACPI objects do not get exported to the OS.
BUG=b:133513961 BRANCH=octopus TEST=Boot to ChromeOS. Ensure that the USB devices are disabled based on port status and the concerned ACPI objects are not exported.
Change-Id: I0faccdfb8a9df9ec52130437433b15973e3d6f1a Signed-off-by: Karthikeyan Ramasubramanian kramasub@google.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/34291 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Furquan Shaikh furquan@google.com --- M src/mainboard/google/octopus/mainboard.c M src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h M src/mainboard/google/octopus/variants/casta/variant.c 3 files changed, 37 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Furquan Shaikh: Looks good to me, approved
diff --git a/src/mainboard/google/octopus/mainboard.c b/src/mainboard/google/octopus/mainboard.c index 91cf1e4..3312d4d 100644 --- a/src/mainboard/google/octopus/mainboard.c +++ b/src/mainboard/google/octopus/mainboard.c @@ -16,12 +16,14 @@ #include <arch/acpi.h> #include <baseboard/variants.h> #include <boardid.h> +#include <bootstate.h> #include <console/console.h> #include <device/device.h> #include <device/pci_def.h> #include <device/pci_ops.h> #include <ec/google/chromeec/ec.h> #include <ec/ec.h> +#include <intelblocks/xhci.h> #include <nhlt.h> #include <smbios.h> #include <soc/cpu.h> @@ -199,3 +201,16 @@
return manuf; } + +bool __weak variant_ext_usb_status(unsigned int port_type, unsigned int port_id) +{ + /* All externally visible USB ports are present */ + return true; +} + +static void disable_unused_devices(void *unused) +{ + usb_xhci_disable_unused(variant_ext_usb_status); +} + +BOOT_STATE_INIT_ENTRY(BS_DEV_INIT, BS_ON_EXIT, disable_unused_devices, NULL); diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h index 140beb4..2132db5 100644 --- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/variants.h @@ -47,6 +47,17 @@ /* Modify devictree settings during ramstage. */ struct device; void variant_update_devtree(struct device *dev); +/** + * variant_ext_usb_status() - Get status of externally visible USB ports + * @port_type: Type of USB port i.e. USB2/USB3 + * @port_id: USB Port ID + * + * This function is supplied by the mainboard/variant to SoC's XHCI driver to + * identify the status of externally visible USB ports. + * + * Return: true if the port is present, false if the port is absent. + */ +bool variant_ext_usb_status(unsigned int port_type, unsigned int port_id);
/* Get no touchscreen SKU ID. */ bool no_touchscreen_sku(uint32_t sku_id); diff --git a/src/mainboard/google/octopus/variants/casta/variant.c b/src/mainboard/google/octopus/variants/casta/variant.c index 89b1033..12c8dd7 100644 --- a/src/mainboard/google/octopus/variants/casta/variant.c +++ b/src/mainboard/google/octopus/variants/casta/variant.c @@ -16,6 +16,8 @@ #include <baseboard/variants.h> #include <sar.h>
+#define RIGHT_USB_C_PORT_ID 4 + const char *get_wifi_sar_cbfs_filename(void) { const char *filename = NULL; @@ -26,3 +28,12 @@
return filename; } + +bool variant_ext_usb_status(unsigned int port_type, unsigned int port_id) +{ + uint32_t sku_id = get_board_sku(); + + if (sku_id == 2 && port_id == RIGHT_USB_C_PORT_ID) + return false; + return true; +}
-
Furquan Shaikh (Code Review) -
Karthik Ramasubramanian (Code Review)
-
Patrick Georgi (Code Review)