On Fri, Oct 11, 2024 at 03:17:29PM +0300, Jani Nikula wrote:
> This reverts commit 8d16a118950c ("ICL HACK: usb/icl: Work around ACPI
> boottime crash").
>
> There shouldn't be any ICL RVP's in CI anymore.
>
> Cc: Imre Deak <imre.deak@xxxxxxxxx>
> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Acked-by: Imre Deak <imre.deak@xxxxxxxxx>
> ---
> drivers/usb/core/usb-acpi.c | 25 -------------------------
> 1 file changed, 25 deletions(-)
>
> diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c
> index 4c7e862cdf2d..21585ed89ef8 100644
> --- a/drivers/usb/core/usb-acpi.c
> +++ b/drivers/usb/core/usb-acpi.c
> @@ -12,7 +12,6 @@
> #include <linux/acpi.h>
> #include <linux/pci.h>
> #include <linux/usb/hcd.h>
> -#include <linux/dmi.h>
>
> #include "hub.h"
>
> @@ -190,19 +189,6 @@ static int usb_acpi_add_usb4_devlink(struct usb_device *udev)
> return 0;
> }
>
> -static const struct dmi_system_id intel_icl_broken_acpi[] = {
> - {
> - .ident = "ICL RVP",
> - .matches = {
> - DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"),
> - DMI_MATCH(DMI_PRODUCT_NAME, "Ice Lake Client Platform"),
> - },
> - },
> -
> - { }
> -};
> -static bool acpi_connection_type_broken;
> -
> /*
> * Private to usb-acpi, all the core needs to know is that
> * port_dev->location is non-zero when it has been set by the firmware.
> @@ -218,12 +204,6 @@ usb_acpi_get_connect_type(struct usb_port *port_dev, acpi_handle *handle)
> struct acpi_pld_info *pld = NULL;
> acpi_status status;
>
> - /* Work around unknown ACPI instruction error on ICL RVP BIOSes. */
> - if (acpi_connection_type_broken) {
> - port_dev->connect_type = USB_PORT_CONNECT_TYPE_UNKNOWN;
> - return;
> - }
> -
> /*
> * According to 9.14 in ACPI Spec 6.2. _PLD indicates whether usb port
> * is user visible and _UPC indicates whether it is connectable. If
> @@ -394,11 +374,6 @@ static struct acpi_bus_type usb_acpi_bus = {
>
> int usb_acpi_register(void)
> {
> - if (dmi_check_system(intel_icl_broken_acpi)) {
> - pr_info("USB ACPI connection type broken.\n");
> - acpi_connection_type_broken = true;
> - }
> -
> return register_acpi_bus_type(&usb_acpi_bus);
> }
>
> --
> 2.39.5
>
