| Message ID | 20241023211834.3370346-1-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [topic/core-for-CI,1/2] Revert "HAX suspend: Disable S3/S4 for fi-bdw-samus" | expand |
On Wed, 23 Oct 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote: > This reverts commit efeb42fe3b7c58abbe674515252cfdb71c09eba5. > > That machine is not in CI anymore, let's drop the hack. > > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Acked-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/acpi/sleep.c | 20 -------------------- > 1 file changed, 20 deletions(-) > > diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c > index 4272cbc71ae89..c8ee8e42b0f64 100644 > --- a/drivers/acpi/sleep.c > +++ b/drivers/acpi/sleep.c > @@ -84,16 +84,11 @@ static int acpi_sleep_prepare(u32 acpi_state) > return 0; > } > > -static u8 max_sleep_state = -1; > - > bool acpi_sleep_state_supported(u8 sleep_state) > { > acpi_status status; > u8 type_a, type_b; > > - if (sleep_state > max_sleep_state) > - return false; > - > status = acpi_get_sleep_type_data(sleep_state, &type_a, &type_b); > return ACPI_SUCCESS(status) && (!acpi_gbl_reduced_hardware > || (acpi_gbl_FADT.sleep_control.address > @@ -170,13 +165,6 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d) > return 0; > } > > -static int __init init_nosleep(const struct dmi_system_id *d) > -{ > - pr_info("Disabling ACPI suspend\n"); > - max_sleep_state = 0; > - return 0; > -} > - > bool acpi_sleep_default_s3; > > static int __init init_default_s3(const struct dmi_system_id *d) > @@ -411,14 +399,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { > DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"), > }, > }, > - { > - .callback = init_nosleep, > - .ident = "samus", > - .matches = { > - DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), > - DMI_MATCH(DMI_PRODUCT_NAME, "Samus"), > - }, > - }, > {}, > };
On Wed, Oct 23, 2024 at 02:18:33PM -0700, Lucas De Marchi wrote: >This reverts commit efeb42fe3b7c58abbe674515252cfdb71c09eba5. > >That machine is not in CI anymore, let's drop the hack. > >Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Failures unrelated to these hacks being removed. Thanks Jani for the ack. Patches removed from topic/core-for-CI. Lucas De Marchi
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 4272cbc71ae89..c8ee8e42b0f64 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -84,16 +84,11 @@ static int acpi_sleep_prepare(u32 acpi_state) return 0; } -static u8 max_sleep_state = -1; - bool acpi_sleep_state_supported(u8 sleep_state) { acpi_status status; u8 type_a, type_b; - if (sleep_state > max_sleep_state) - return false; - status = acpi_get_sleep_type_data(sleep_state, &type_a, &type_b); return ACPI_SUCCESS(status) && (!acpi_gbl_reduced_hardware || (acpi_gbl_FADT.sleep_control.address @@ -170,13 +165,6 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d) return 0; } -static int __init init_nosleep(const struct dmi_system_id *d) -{ - pr_info("Disabling ACPI suspend\n"); - max_sleep_state = 0; - return 0; -} - bool acpi_sleep_default_s3; static int __init init_default_s3(const struct dmi_system_id *d) @@ -411,14 +399,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"), }, }, - { - .callback = init_nosleep, - .ident = "samus", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "GOOGLE"), - DMI_MATCH(DMI_PRODUCT_NAME, "Samus"), - }, - }, {}, };
This reverts commit efeb42fe3b7c58abbe674515252cfdb71c09eba5. That machine is not in CI anymore, let's drop the hack. Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/acpi/sleep.c | 20 -------------------- 1 file changed, 20 deletions(-)