From f3a221b0cf4cefea48f574a07d2195e414f44c13 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Feb 03 2022 12:00:29 +0000 Subject: Merge branch 'users/trenn/SLE15-SP4/for-next' into SLE15-SP4 Pull removal of disabled patches (no effect on build) from Thomas Renninger. --- diff --git a/patches.suse/acpi_thermal_passive_blacklist.patch b/patches.suse/acpi_thermal_passive_blacklist.patch deleted file mode 100644 index fd1bb96..0000000 --- a/patches.suse/acpi_thermal_passive_blacklist.patch +++ /dev/null @@ -1,126 +0,0 @@ -From: Thomas Renninger -Subject: Avoid critical temp shutdowns on specific ThinkPad T4x(p) and R40 -References: https://bugzilla.novell.com/show_bug.cgi?id=333043 -Patch-mainline: not yet, - ---- - drivers/acpi/thermal.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 94 insertions(+) - ---- a/drivers/acpi/thermal.c -+++ b/drivers/acpi/thermal.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1041,6 +1042,87 @@ static void acpi_thermal_check_fn(struct - mutex_unlock(&tz->thermal_check_lock); - } - -+static struct dmi_system_id thermal_psv_dmi_table[] = { -+ { -+ .ident = "IBM ThinkPad T41", -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T41"), -+ }, -+ }, -+ { -+ .ident = "IBM ThinkPad T42", -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T42"), -+ }, -+ }, -+ { -+ .ident = "IBM ThinkPad T43", -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T43"), -+ }, -+ }, -+ { -+ .ident = "IBM ThinkPad T41p", -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T41p"), -+ }, -+ }, -+ { -+ .ident = "IBM ThinkPad T42p", -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T42p"), -+ }, -+ }, -+ { -+ .ident = "IBM ThinkPad T43p", -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad T43p"), -+ }, -+ }, -+ { -+ .ident = "IBM ThinkPad R40", -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad R40"), -+ }, -+ }, -+ { -+ .ident = "IBM ThinkPad R50p", -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR,"IBM"), -+ DMI_MATCH(DMI_PRODUCT_VERSION,"ThinkPad R50p"), -+ }, -+ }, -+ {}, -+}; -+ -+static int acpi_thermal_set_polling(struct acpi_thermal *tz, int seconds) -+{ -+ if (!tz) -+ return -EINVAL; -+ -+ /* Convert value to deci-seconds */ -+ tz->polling_frequency = seconds * 10; -+ -+ tz->thermal_zone->polling_delay = seconds * 1000; -+ -+ if (tz->thermal_zone->mode == THERMAL_DEVICE_ENABLED) -+ thermal_zone_device_update(tz->thermal_zone, -+ THERMAL_EVENT_UNSPECIFIED); -+ -+ ACPI_DEBUG_PRINT((ACPI_DB_INFO, -+ "Polling frequency set to %lu seconds\n", -+ tz->polling_frequency/10)); -+ -+ return 0; -+} -+ - static int acpi_thermal_add(struct acpi_device *device) - { - int result = 0; -@@ -1070,6 +1152,18 @@ static int acpi_thermal_add(struct acpi_ - if (result) - goto free_memory; - -+ if (dmi_check_system(thermal_psv_dmi_table)) { -+ if (tz->trips.passive.flags.valid && -+ tz->trips.passive.temperature > CELSIUS_TO_DECI_KELVIN(85)) { -+ printk (KERN_INFO "Adjust passive trip point from %lu" -+ " to %lu\n", -+ DECI_KELVIN_TO_CELSIUS(tz->trips.passive.temperature), -+ DECI_KELVIN_TO_CELSIUS(tz->trips.passive.temperature - 150)); -+ tz->trips.passive.temperature -= 150; -+ acpi_thermal_set_polling(tz, 5); -+ } -+ } -+ - refcount_set(&tz->thermal_check_count, 3); - mutex_init(&tz->thermal_check_lock); - INIT_WORK(&tz->thermal_check_work, acpi_thermal_check_fn); diff --git a/patches.suse/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch b/patches.suse/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch deleted file mode 100644 index cff99d1..0000000 --- a/patches.suse/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch +++ /dev/null @@ -1,121 +0,0 @@ -From: Thomas Renninger -Subject: Introduce acpi_root_table=rsdt boot param and dmi list to force rsdt -Patch-mainline: Not yet, -References: http://bugzilla.kernel.org/show_bug.cgi?id=8246 - -This one is part of a patch series: -acpi_thinkpad_introduce_acpi_root_table_boot_param.patch -acpi_thinkpad_introduce_acpica_rsdt_global_variable.patch -acpi_thinkpad_remove_R40e_c-state_blacklist.patch - -Blacklist R40e, R51e and T40, T40p, T41, T41p, T42, T42p, R50 and R50p -ThinkPads to use the RSDT instead of the XSDT. - -Update: Jan 12 2009 jeffm -* 2.6.29-rc1 introduced acpi_rsdt_forced. I've updated the patch to issue - a warning that acpi=rsdt is the prefered method of forcing. -* Moved the dmi table stuff to the main dmi table in x86/kernel/acpi/boot. - -Update: Apr 10 2009 jeffm -* Removed documentation, since it's deprecated. - -Update: Feb 17 2014 jeffm -* Commit fab46105838 upstream renamed the variable - -Signed-off-by: Thomas Renninger -Tested-by: Mark Doughty -CC: Yakui Zhao - ---- - arch/x86/kernel/acpi/boot.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ - drivers/acpi/tables.c | 3 ++ - 2 files changed, 56 insertions(+) - ---- a/arch/x86/kernel/acpi/boot.c -+++ b/arch/x86/kernel/acpi/boot.c -@@ -1350,6 +1350,21 @@ static int __init dmi_ignore_irq0_timer_ - return 0; - } - -+static int __init force_acpi_rsdt(const struct dmi_system_id *d) -+{ -+ if (!acpi_force) { -+ printk(KERN_NOTICE "%s detected: force use of acpi=rsdt\n", -+ d->ident); -+ acpi_gbl_do_not_use_xsdt = TRUE; -+ } else { -+ printk(KERN_NOTICE -+ "Warning: acpi=force overrules DMI blacklist: " -+ "acpi=rsdt\n"); -+ } -+ return 0; -+ -+} -+ - /* - * ACPI offers an alternative platform interface model that removes - * ACPI hardware requirements for platforms that do not implement -@@ -1425,6 +1440,32 @@ static struct dmi_system_id __initdata a - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), - }, - }, -+ -+ /* -+ * Boxes that need RSDT as ACPI root table -+ */ -+ { -+ .callback = force_acpi_rsdt, -+ .ident = "ThinkPad ", /* R40e, broken C-states */ -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "1SET")}, -+ }, -+ { -+ .callback = force_acpi_rsdt, -+ .ident = "ThinkPad ", /* R50e, slow booting */ -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "1WET")}, -+ }, -+ { -+ .callback = force_acpi_rsdt, -+ .ident = "ThinkPad ", /* T40, T40p, T41, T41p, T42, T42p -+ R50, R50p */ -+ .matches = { -+ DMI_MATCH(DMI_BIOS_VENDOR, "IBM"), -+ DMI_MATCH(DMI_BIOS_VERSION, "1RET")}, -+ }, - {} - }; - -@@ -1612,6 +1653,18 @@ static int __init parse_acpi(char *arg) - } - early_param("acpi", parse_acpi); - -+/* Alias for acpi=rsdt for compatibility with openSUSE 11.1 and SLE11 */ -+static int __init parse_acpi_root_table(char *opt) -+{ -+ if (!strcmp(opt, "rsdt")) { -+ acpi_gbl_do_not_use_xsdt = TRUE; -+ printk(KERN_WARNING "acpi_root_table=rsdt is deprecated. " -+ "Please use acpi=rsdt instead.\n"); -+ } -+ return 0; -+} -+early_param("acpi_root_table", parse_acpi_root_table); -+ - /* FIXME: Using pci= for an ACPI parameter is a travesty. */ - static int __init parse_pci(char *arg) - { ---- a/drivers/acpi/tables.c -+++ b/drivers/acpi/tables.c -@@ -339,6 +339,9 @@ int __init acpi_table_init(void) - acpi_gbl_enable_table_validation = FALSE; - } - -+ if (acpi_gbl_do_not_use_xsdt) -+ printk(KERN_INFO "Using RSDT as ACPI root table\n"); -+ - status = acpi_initialize_tables(initial_tables, ACPI_MAX_TABLES, 0); - if (ACPI_FAILURE(status)) - return -EINVAL; diff --git a/series.conf b/series.conf index a77d7d4..466abe7 100644 --- a/series.conf +++ b/series.conf @@ -8512,8 +8512,6 @@ ######################################################## # PM ######################################################## -+trenn +sp4_needs_review patches.suse/acpi_thinkpad_introduce_acpi_root_table_boot_param.patch -+trenn +sp4_needs_review patches.suse/acpi_thermal_passive_blacklist.patch patches.suse/ACPI-acpi_pad-Do-not-launch-acpi_pad-threads-on-idle-cpus.patch patches.suse/thermal-Add-a-sanity-check-for-invalid-state-at-stat.patch