Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 795233bf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI and power management fixes from Rafael Wysocki:
 "These include two fixes for recent regressions related to ACPI, a
  cpufreq fix for breakage overlooked by a previous fix commit, two
  intel_pstate fixes for stuff added during the 3.13 cycle that need to
  go into -stable, three fixes for older bugs that also are -stable
  candidates, ACPI video blacklist changes related to BIOSes that behave
  in a special way on Windows 8, several build fixes for CONFIG_PM_SLEEP
  unset in ACPI drivers and an ACPI driver cleanup.

  Specifics:

   - Fix for a recent probing regression in the nouveau driver
     introduced by an ACPI change related to the handling of _DSM from
     Jiang Liu.

   - Fix for a dock station sysfs attribute that stopped working
     correctly after recent changes in the ACPI core.

   - cpufreq fix taking care of broken code related to CPU removal and
     overlooked by a previous recent fix in that area.  From Viresh
     Kumar.

   - Two intel_pstate fixes related to Baytrail support added during the
     3.13 cycle (candidates for -stable) from Dirk Brandewie.

   - ACPI video fix removing duplicate brightness values from the _BCL
     table which makes its user space interface behave sanely.  From
     Hans de Goede.

   - Fix for the powernow-k8 cpufreq driver making it initialize its
     per-CPU data structures correctly from Srivatsa S Bhat.

   - Fix for an obscure memory leak in the ACPI PCI interrupt allocation
     code (related to ISA) from Tomasz Nowicki.

   - ACPI video blacklist changes moving several systems that should use
     the native backlight interface instead of the ACPI one from the
     general ACPI _OSI blacklist the the ACPI video driver's blacklist
     where they belong.  This consists of an ACPI video driver update
     from Aaron Lu and a revert of a previous commit adding systems to
     the ACPI _OSI blacklist requested by Takashi Iwai.

   - Several fixes for build issues in ACPI drivers occuring when
     CONFIG_PM_SLEEP is unset from Shuah Khan.

   - Fix for an sscanf() format string in the ACPI Smart Battery
     Subsystem (SBS) driver from Luis G.F"

* tag 'pm+acpi-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  intel_pstate: Add support for Baytrail turbo P states
  intel_pstate: Use LFM bus ratio as min ratio/P state
  ACPI / nouveau: fix probing regression related to _DSM
  Revert "ACPI: Blacklist Win8 OSI for some HP laptop 2013 models"
  ACPI / video: Add systems that should favour native backlight interface
  ACPI / video: Filter the _BCL table for duplicate brightness values
  cpufreq: powernow-k8: Initialize per-cpu data-structures properly
  cpufreq: remove sysfs link when a cpu != policy->cpu, is removed
  ACPI / PCI: Fix memory leak in acpi_pci_irq_enable()
  ACPI / dock: Make 'docked' sysfs attribute work as documented
  ACPI / SBS: Fix incorrect sscanf() string
  ACPI / thermal: fix thermal driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / SBS: fix SBS driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / fan: fix fan driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / button: fix button driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / battery: fix battery driver compile error when CONFIG_PM_SLEEP is undefined
  ACPI / AC: fix AC driver compile error when CONFIG_PM_SLEEP is undefined
parents 7777d934 fee5ae96

drivers/acpi/ac.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -243,6 +243,8 @@ static int acpi_ac_resume(struct device *dev) 
		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

		kobject_uevent(&ac->charger.dev->kobj, KOBJ_CHANGE);

	return 0;

	return 0;

}

}

#else

#define acpi_ac_resume NULL

#endif

#endif

static SIMPLE_DEV_PM_OPS(acpi_ac_pm_ops, NULL, acpi_ac_resume);

static SIMPLE_DEV_PM_OPS(acpi_ac_pm_ops, NULL, acpi_ac_resume);

drivers/acpi/battery.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -841,6 +841,8 @@ static int acpi_battery_resume(struct device *dev) 
	acpi_battery_update(battery);

	acpi_battery_update(battery);

	return 0;

	return 0;

}

}

#else

#define acpi_battery_resume NULL

#endif

#endif





static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);

static SIMPLE_DEV_PM_OPS(acpi_battery_pm, NULL, acpi_battery_resume);

drivers/acpi/blacklist.c

+0 −58
Original line number Original line Diff line number Diff line
@@ -260,14 +260,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { 
	},

	},

	{

	{

	.callback = dmi_disable_osi_win8,

	.callback = dmi_disable_osi_win8,

	.ident = "Dell Inspiron 15R SE",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),

		     DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 7520"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "ThinkPad Edge E530",

	.ident = "ThinkPad Edge E530",

	.matches = {

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		     DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
@@ -322,56 +314,6 @@ static struct dmi_system_id acpi_osi_dmi_table[] __initdata = { 
		     DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"),

		     DMI_MATCH(DMI_PRODUCT_VERSION, "2349D15"),

		},

		},

	},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP ProBook 2013 models",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP ProBook "),

		     DMI_MATCH(DMI_PRODUCT_NAME, " G1"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP EliteBook 2013 models",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook "),

		     DMI_MATCH(DMI_PRODUCT_NAME, " G1"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP ZBook 14",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP ZBook 14"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP ZBook 15",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP ZBook 15"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP ZBook 17",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP ZBook 17"),

		},

	},

	{

	.callback = dmi_disable_osi_win8,

	.ident = "HP EliteBook 8780w",

	.matches = {

		     DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		     DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8780w"),

		},

	},





	/*

	/*

	 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.

	 * BIOS invocation of _OSI(Linux) is almost always a BIOS bug.

drivers/acpi/button.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -80,6 +80,8 @@ static void acpi_button_notify(struct acpi_device *device, u32 event); 




#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP

static int acpi_button_resume(struct device *dev);

static int acpi_button_resume(struct device *dev);

#else

#define acpi_button_resume NULL

#endif

#endif

static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);

static SIMPLE_DEV_PM_OPS(acpi_button_pm, NULL, acpi_button_resume);

drivers/acpi/dock.c

+3 −5
Original line number Original line Diff line number Diff line
@@ -713,13 +713,11 @@ static acpi_status __init find_dock_devices(acpi_handle handle, u32 lvl, 
static ssize_t show_docked(struct device *dev,

static ssize_t show_docked(struct device *dev,

			   struct device_attribute *attr, char *buf)

			   struct device_attribute *attr, char *buf)

{

{

	struct acpi_device *tmp;



	struct dock_station *dock_station = dev->platform_data;

	struct dock_station *dock_station = dev->platform_data;

	struct acpi_device *adev = NULL;





	if (!acpi_bus_get_device(dock_station->handle, &tmp))

	acpi_bus_get_device(dock_station->handle, &adev);

		return snprintf(buf, PAGE_SIZE, "1\n");

	return snprintf(buf, PAGE_SIZE, "%u\n", acpi_device_enumerated(adev));

	return snprintf(buf, PAGE_SIZE, "0\n");

}

}

static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);

static DEVICE_ATTR(docked, S_IRUGO, show_docked, NULL);