Commit fc723957 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-pci', 'acpi-misc' and 'acpi-tools' 

* acpi-pci:
  ACPI,PCI,IRQ: remove SCI penalize function
  ACPI,PCI,IRQ: remove redundant code in acpi_irq_penalty_init()
  ACPI,PCI,IRQ: reduce static IRQ array size to 16
  ACPI,PCI,IRQ: reduce resource requirements

* acpi-misc:
  ACPI / sysfs: fix error code in get_status()
  ACPI / device_sysfs: Clean up checkpatch errors
  ACPI / device_sysfs: Change _SUN and _STA show functions error return to EIO
  ACPI / device_sysfs: Add sysfs support for _HRV hardware revision
  arm64: defconfig: Enable ACPI
  ACPI / ARM64: Remove EXPERT dependency for ACPI on ARM64
  ACPI / ARM64: Don't enable ACPI by default on ARM64
  acer-wmi: Use acpi_dev_found()
  eeepc-wmi: Use acpi_dev_found()
  ACPI / utils: Rename acpi_dev_present()

* acpi-tools:
  tools/power/acpi: close file only if it is open
parents efc499f9 9e5ed6d1 f18ebc21 60438d9a

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ CONFIG_PHY_RCAR_GEN3_USB2=y 
CONFIG_PHY_HI6220_USB=y

CONFIG_PHY_XGENE=y

CONFIG_ARM_SCPI_PROTOCOL=y

CONFIG_ACPI=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_FANOTIFY=y

arch/x86/kernel/acpi/boot.c

+0 −1
Original line number Diff line number Diff line
@@ -445,7 +445,6 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger, 
		polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK;



	mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);

	acpi_penalize_sci_irq(bus_irq, trigger, polarity);



	/*

	 * stash over-ride to indicate we've been here

arch/x86/pci/acpi.c

+0 −1
Original line number Diff line number Diff line
@@ -396,7 +396,6 @@ int __init pci_acpi_init(void) 
		return -ENODEV;



	printk(KERN_INFO "PCI: Using ACPI for IRQ routing\n");

	acpi_irq_penalty_init();

	pcibios_enable_irq = acpi_pci_irq_enable;

	pcibios_disable_irq = acpi_pci_irq_disable;

	x86_init.pci.init_irq = x86_init_noop;

drivers/acpi/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ 
menuconfig ACPI

	bool "ACPI (Advanced Configuration and Power Interface) Support"

	depends on !IA64_HP_SIM

	depends on IA64 || X86 || (ARM64 && EXPERT)

	depends on IA64 || X86 || ARM64

	depends on PCI

	select PNP

	default y

	default y if (IA64 || X86)

	help

	  Advanced Configuration and Power Interface (ACPI) support for 

	  Linux requires an ACPI-compliant platform (hardware/firmware),

drivers/acpi/device_sysfs.c

+35 −9
Original line number Diff line number Diff line
@@ -333,7 +333,8 @@ int acpi_device_modalias(struct device *dev, char *buf, int size) 
EXPORT_SYMBOL_GPL(acpi_device_modalias);



static ssize_t

acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, char *buf) {

acpi_device_modalias_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	return __acpi_device_modalias(to_acpi_device(dev), buf, 1024);

}

static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
@@ -397,7 +398,8 @@ acpi_eject_store(struct device *d, struct device_attribute *attr, 
static DEVICE_ATTR(eject, 0200, NULL, acpi_eject_store);



static ssize_t

acpi_device_hid_show(struct device *dev, struct device_attribute *attr, char *buf) {

acpi_device_hid_show(struct device *dev, struct device_attribute *attr, char *buf)

{

	struct acpi_device *acpi_dev = to_acpi_device(dev);



	return sprintf(buf, "%s\n", acpi_device_hid(acpi_dev));
@@ -467,12 +469,27 @@ acpi_device_sun_show(struct device *dev, struct device_attribute *attr, 


	status = acpi_evaluate_integer(acpi_dev->handle, "_SUN", NULL, &sun);

	if (ACPI_FAILURE(status))

		return -ENODEV;

		return -EIO;



	return sprintf(buf, "%llu\n", sun);

}

static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL);



static ssize_t

acpi_device_hrv_show(struct device *dev, struct device_attribute *attr,

		     char *buf) {

	struct acpi_device *acpi_dev = to_acpi_device(dev);

	acpi_status status;

	unsigned long long hrv;



	status = acpi_evaluate_integer(acpi_dev->handle, "_HRV", NULL, &hrv);

	if (ACPI_FAILURE(status))

		return -EIO;



	return sprintf(buf, "%llu\n", hrv);

}

static DEVICE_ATTR(hrv, 0444, acpi_device_hrv_show, NULL);



static ssize_t status_show(struct device *dev, struct device_attribute *attr,

				char *buf) {

	struct acpi_device *acpi_dev = to_acpi_device(dev);
@@ -481,7 +498,7 @@ static ssize_t status_show(struct device *dev, struct device_attribute *attr, 


	status = acpi_evaluate_integer(acpi_dev->handle, "_STA", NULL, &sta);

	if (ACPI_FAILURE(status))

		return -ENODEV;

		return -EIO;



	return sprintf(buf, "%llu\n", sta);

}
@@ -541,6 +558,12 @@ int acpi_device_setup_files(struct acpi_device *dev) 
			goto end;

	}



	if (acpi_has_method(dev->handle, "_HRV")) {

		result = device_create_file(&dev->dev, &dev_attr_hrv);

		if (result)

			goto end;

	}



	if (acpi_has_method(dev->handle, "_STA")) {

		result = device_create_file(&dev->dev, &dev_attr_status);

		if (result)
@@ -604,6 +627,9 @@ void acpi_device_remove_files(struct acpi_device *dev) 
	if (acpi_has_method(dev->handle, "_SUN"))

		device_remove_file(&dev->dev, &dev_attr_sun);



	if (acpi_has_method(dev->handle, "_HRV"))

		device_remove_file(&dev->dev, &dev_attr_hrv);



	if (dev->pnp.unique_id)

		device_remove_file(&dev->dev, &dev_attr_uid);

	if (dev->pnp.type.bus_address)

CRA Git | Maintained and supported by SUSTech CRA and CCSE