Commit 5e692824 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI updates from Rafael Wysocki:
 "These update the ACPICA code in the kernel to the 20210604 upstream
  revision, add preliminary support for the Platform Runtime Mechanism
  (PRM), address issues related to the handling of device dependencies
  in the ACPI device eunmeration code, improve the tracking of ACPI
  power resource states, improve the ACPI support for suspend-to-idle on
  AMD systems, continue the unification of message printing in the ACPI
  code, address assorted issues and clean up the code in a number of
  places.

  Specifics:

   - Update ACPICA code in the kernel to upstrea revision 20210604
     including the following changes:

      - Add defines for the CXL Host Bridge Structureand and add the
        CFMWS structure definition to CEDT (Alison Schofield).
      - iASL: Finish support for the IVRS ACPI table (Bob Moore).
      - iASL: Add support for the SVKL table (Bob Moore).
      - iASL: Add full support for RGRT ACPI table (Bob Moore).
      - iASL: Add support for the BDAT ACPI table (Bob Moore).
      - iASL: add disassembler support for PRMT (Erik Kaneda).
      - Fix memory leak caused by _CID repair function (Erik Kaneda).
      - Add support for PlatformRtMechanism OpRegion (Erik Kaneda).
      - Add PRMT module header to facilitate parsing (Erik Kaneda).
      - Add _PLD panel positions (Fabian Wüthrich).
      - MADT: add Multiprocessor Wakeup Mailbox Structure and the SVKL
        table headers (Kuppuswamy Sathyanarayanan).
      - Use ACPI_FALLTHROUGH (Wei Ming Chen).

   - Add preliminary support for the Platform Runtime Mechanism (PRM) to
     allow the AML interpreter to call PRM functions (Erik Kaneda).

   - Address some issues related to the handling of device dependencies
     reported by _DEP in the ACPI device enumeration code and clean up
     some related pieces of it (Rafael Wysocki).

   - Improve the tracking of states of ACPI power resources (Rafael
     Wysocki).

   - Improve ACPI support for suspend-to-idle on AMD systems (Alex
     Deucher, Mario Limonciello, Pratik Vishwakarma).

   - Continue the unification and cleanup of message printing in the
     ACPI code (Hanjun Guo, Heiner Kallweit).

   - Fix possible buffer overrun issue with the description_show() sysfs
     attribute method (Krzysztof Wilczyński).

   - Improve the acpi_mask_gpe kernel command line parameter handling
     and clean up the core ACPI code related to sysfs (Andy Shevchenko,
     Baokun Li, Clayton Casciato).

   - Postpone bringing devices in the general ACPI PM domain to D0
     during resume from system-wide suspend until they are really needed
     (Dmitry Torokhov).

   - Make the ACPI processor driver fix up C-state latency if not
     ordered (Mario Limonciello).

   - Add support for identifying devices depening on the given one that
     are not its direct descendants with the help of _DEP (Daniel
     Scally).

   - Extend the checks related to ACPI IRQ overrides on x86 in order to
     avoid false-positives (Hui Wang).

   - Add battery DPTF participant for Intel SoCs (Sumeet Pawnikar).

   - Rearrange the ACPI fan driver and device power management code to
     use a common list of device IDs (Rafael Wysocki).

   - Fix clang CFI violation in the ACPI BGRT table parsing code and
     clean it up (Nathan Chancellor).

   - Add GPE-related quirks for some laptops to the EC driver (Chris
     Chiu, Zhang Rui).

   - Make the ACPI PPTT table parsing code populate the cache-id value
     if present in the firmware (James Morse).

   - Remove redundant clearing of context->ret.pointer from
     acpi_run_osc() (Hans de Goede).

   - Add missing acpi_put_table() in acpi_init_fpdt() (Jing Xiangfeng).

   - Make ACPI APEI handle ARM Processor Error CPER records like Memory
     Error ones to avoid user space task lockups (Xiaofei Tan).

   - Stop warning about disabled ACPI in APEI (Jon Hunter).

   - Fix fall-through warning for Clang in the SBSHC driver (Gustavo A.
     R. Silva).

   - Add custom DSDT file as Makefile prerequisite (Richard Fitzgerald).

   - Initialize local variable to avoid garbage being returned (Colin
     Ian King).

   - Simplify assorted pieces of code, address assorted coding style and
     documentation issues and comment typos (Baokun Li, Christophe
     JAILLET, Clayton Casciato, Liu Shixin, Shaokun Zhang, Wei Yongjun,
     Yang Li, Zhen Lei)"

* tag 'acpi-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (97 commits)
  ACPI: PM: postpone bringing devices to D0 unless we need them
  ACPI: tables: Add custom DSDT file as makefile prerequisite
  ACPI: bgrt: Use sysfs_emit
  ACPI: bgrt: Fix CFI violation
  ACPI: EC: trust DSDT GPE for certain HP laptop
  ACPI: scan: Simplify acpi_table_events_fn()
  ACPI: PM: Adjust behavior for field problems on AMD systems
  ACPI: PM: s2idle: Add support for new Microsoft UUID
  ACPI: PM: s2idle: Add support for multiple func mask
  ACPI: PM: s2idle: Refactor common code
  ACPI: PM: s2idle: Use correct revision id
  ACPI: sysfs: Remove tailing return statement in void function
  ACPI: sysfs: Use __ATTR_RO() and __ATTR_RW() macros
  ACPI: sysfs: Sort headers alphabetically
  ACPI: sysfs: Refactor param_get_trace_state() to drop dead code
  ACPI: sysfs: Unify pattern of memory allocations
  ACPI: sysfs: Allow bitmap list to be supplied to acpi_mask_gpe
  ACPI: sysfs: Make sparse happy about address space in use
  ACPI: scan: Fix race related to dropping dependencies
  ACPI: scan: Reorganize acpi_device_add()
  ...
parents 3563f55c 64f9111d

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
			the GPE dispatcher.

			This facility can be used to prevent such uncontrolled

			GPE floodings.

			Format: <byte>

			Format: <byte> or <bitmap-list>



	acpi_no_auto_serialize	[HW,ACPI]

			Disable auto-serialization of AML methods

arch/x86/kernel/acpi/boot.c

+47 −71
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
 *  Copyright (C) 2001, 2002 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>

 *  Copyright (C) 2001 Jun Nakajima <jun.nakajima@intel.com>

 */

#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/init.h>

#include <linux/acpi.h>
@@ -42,8 +43,6 @@ EXPORT_SYMBOL(acpi_disabled); 
# include <asm/proto.h>

#endif				/* X86 */



#define PREFIX			"ACPI: "



int acpi_noirq;				/* skip ACPI IRQ initialization */

static int acpi_nobgrt;			/* skip ACPI BGRT */

int acpi_pci_disabled;		/* skip ACPI PCI scan and IRQ initialization */
@@ -130,15 +129,14 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) 


	madt = (struct acpi_table_madt *)table;

	if (!madt) {

		printk(KERN_WARNING PREFIX "Unable to map MADT\n");

		pr_warn("Unable to map MADT\n");

		return -ENODEV;

	}



	if (madt->address) {

		acpi_lapic_addr = (u64) madt->address;



		printk(KERN_DEBUG PREFIX "Local APIC address 0x%08x\n",

		       madt->address);

		pr_debug("Local APIC address 0x%08x\n", madt->address);

	}



	default_acpi_madt_oem_check(madt->header.oem_id,
@@ -161,7 +159,7 @@ static int acpi_register_lapic(int id, u32 acpiid, u8 enabled) 
	int cpu;



	if (id >= MAX_LOCAL_APIC) {

		printk(KERN_INFO PREFIX "skipped apicid that is too big\n");

		pr_info("skipped apicid that is too big\n");

		return -EINVAL;

	}
@@ -213,13 +211,13 @@ acpi_parse_x2apic(union acpi_subtable_headers *header, const unsigned long end) 
	 */

	if (!apic->apic_id_valid(apic_id)) {

		if (enabled)

			pr_warn(PREFIX "x2apic entry ignored\n");

			pr_warn("x2apic entry ignored\n");

		return 0;

	}



	acpi_register_lapic(apic_id, processor->uid, enabled);

#else

	printk(KERN_WARNING PREFIX "x2apic entry ignored\n");

	pr_warn("x2apic entry ignored\n");

#endif



	return 0;
@@ -306,7 +304,7 @@ acpi_parse_x2apic_nmi(union acpi_subtable_headers *header, 
	acpi_table_print_madt_entry(&header->common);



	if (x2apic_nmi->lint != 1)

		printk(KERN_WARNING PREFIX "NMI not connected to LINT 1!\n");

		pr_warn("NMI not connected to LINT 1!\n");



	return 0;

}
@@ -324,7 +322,7 @@ acpi_parse_lapic_nmi(union acpi_subtable_headers * header, const unsigned long e 
	acpi_table_print_madt_entry(&header->common);



	if (lapic_nmi->lint != 1)

		printk(KERN_WARNING PREFIX "NMI not connected to LINT 1!\n");

		pr_warn("NMI not connected to LINT 1!\n");



	return 0;

}
@@ -514,14 +512,14 @@ acpi_parse_int_src_ovr(union acpi_subtable_headers * header, 


	if (intsrc->source_irq == 0) {

		if (acpi_skip_timer_override) {

			printk(PREFIX "BIOS IRQ0 override ignored.\n");

			pr_warn("BIOS IRQ0 override ignored.\n");

			return 0;

		}



		if ((intsrc->global_irq == 2) && acpi_fix_pin2_polarity

			&& (intsrc->inti_flags & ACPI_MADT_POLARITY_MASK)) {

			intsrc->inti_flags &= ~ACPI_MADT_POLARITY_MASK;

			printk(PREFIX "BIOS IRQ0 pin2 override: forcing polarity to high active.\n");

			pr_warn("BIOS IRQ0 pin2 override: forcing polarity to high active.\n");

		}

	}
@@ -597,7 +595,7 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger) 
	if (old == new)

		return;



	printk(PREFIX "setting ELCR to %04x (from %04x)\n", new, old);

	pr_warn("setting ELCR to %04x (from %04x)\n", new, old);

	outb(new, 0x4d0);

	outb(new >> 8, 0x4d1);

}
@@ -754,7 +752,7 @@ int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id, 


	cpu = acpi_register_lapic(physid, acpi_id, ACPI_MADT_ENABLED);

	if (cpu < 0) {

		pr_info(PREFIX "Unable to map lapic to logical cpu number\n");

		pr_info("Unable to map lapic to logical cpu number\n");

		return cpu;

	}
@@ -870,8 +868,7 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) 
	struct acpi_table_hpet *hpet_tbl = (struct acpi_table_hpet *)table;



	if (hpet_tbl->address.space_id != ACPI_SPACE_MEM) {

		printk(KERN_WARNING PREFIX "HPET timers must be located in "

		       "memory.\n");

		pr_warn("HPET timers must be located in memory.\n");

		return -1;

	}
@@ -883,9 +880,7 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) 
	 * want to allocate a resource there.

	 */

	if (!hpet_address) {

		printk(KERN_WARNING PREFIX

		       "HPET id: %#x base: %#lx is invalid\n",

		       hpet_tbl->id, hpet_address);

		pr_warn("HPET id: %#x base: %#lx is invalid\n", hpet_tbl->id, hpet_address);

		return 0;

	}

#ifdef CONFIG_X86_64
@@ -896,21 +891,17 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table) 
	 */

	if (hpet_address == 0xfed0000000000000UL) {

		if (!hpet_force_user) {

			printk(KERN_WARNING PREFIX "HPET id: %#x "

			       "base: 0xfed0000000000000 is bogus\n "

			       "try hpet=force on the kernel command line to "

			       "fix it up to 0xfed00000.\n", hpet_tbl->id);

			pr_warn("HPET id: %#x base: 0xfed0000000000000 is bogus, try hpet=force on the kernel command line to fix it up to 0xfed00000.\n",

				hpet_tbl->id);

			hpet_address = 0;

			return 0;

		}

		printk(KERN_WARNING PREFIX

		       "HPET id: %#x base: 0xfed0000000000000 fixed up "

		       "to 0xfed00000.\n", hpet_tbl->id);

		pr_warn("HPET id: %#x base: 0xfed0000000000000 fixed up to 0xfed00000.\n",

			hpet_tbl->id);

		hpet_address >>= 32;

	}

#endif

	printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",

	       hpet_tbl->id, hpet_address);

	pr_info("HPET id: %#x base: %#lx\n", hpet_tbl->id, hpet_address);



	/*

	 * Allocate and initialize the HPET firmware resource for adding into
@@ -955,24 +946,24 @@ late_initcall(hpet_insert_resource); 
static int __init acpi_parse_fadt(struct acpi_table_header *table)

{

	if (!(acpi_gbl_FADT.boot_flags & ACPI_FADT_LEGACY_DEVICES)) {

		pr_debug("ACPI: no legacy devices present\n");

		pr_debug("no legacy devices present\n");

		x86_platform.legacy.devices.pnpbios = 0;

	}



	if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID &&

	    !(acpi_gbl_FADT.boot_flags & ACPI_FADT_8042) &&

	    x86_platform.legacy.i8042 != X86_LEGACY_I8042_PLATFORM_ABSENT) {

		pr_debug("ACPI: i8042 controller is absent\n");

		pr_debug("i8042 controller is absent\n");

		x86_platform.legacy.i8042 = X86_LEGACY_I8042_FIRMWARE_ABSENT;

	}



	if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_CMOS_RTC) {

		pr_debug("ACPI: not registering RTC platform device\n");

		pr_debug("not registering RTC platform device\n");

		x86_platform.legacy.rtc = 0;

	}



	if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_VGA) {

		pr_debug("ACPI: probing for VGA not safe\n");

		pr_debug("probing for VGA not safe\n");

		x86_platform.legacy.no_vga = 1;

	}
@@ -997,8 +988,7 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table) 
		pmtmr_ioport = acpi_gbl_FADT.pm_timer_block;

	}

	if (pmtmr_ioport)

		printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n",

		       pmtmr_ioport);

		pr_info("PM-Timer IO Port: %#x\n", pmtmr_ioport);

#endif

	return 0;

}
@@ -1024,8 +1014,7 @@ static int __init early_acpi_parse_madt_lapic_addr_ovr(void) 
	count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_OVERRIDE,

				      acpi_parse_lapic_addr_ovr, 0);

	if (count < 0) {

		printk(KERN_ERR PREFIX

		       "Error parsing LAPIC address override entry\n");

		pr_err("Error parsing LAPIC address override entry\n");

		return count;

	}
@@ -1057,8 +1046,7 @@ static int __init acpi_parse_madt_lapic_entries(void) 
				sizeof(struct acpi_table_madt),

				madt_proc, ARRAY_SIZE(madt_proc), MAX_LOCAL_APIC);

		if (ret < 0) {

			printk(KERN_ERR PREFIX

					"Error parsing LAPIC/X2APIC entries\n");

			pr_err("Error parsing LAPIC/X2APIC entries\n");

			return ret;

		}
@@ -1066,11 +1054,11 @@ static int __init acpi_parse_madt_lapic_entries(void) 
		x2count = madt_proc[1].count;

	}

	if (!count && !x2count) {

		printk(KERN_ERR PREFIX "No LAPIC entries present\n");

		pr_err("No LAPIC entries present\n");

		/* TBD: Cleanup to allow fallback to MPS */

		return -ENODEV;

	} else if (count < 0 || x2count < 0) {

		printk(KERN_ERR PREFIX "Error parsing LAPIC entry\n");

		pr_err("Error parsing LAPIC entry\n");

		/* TBD: Cleanup to allow fallback to MPS */

		return count;

	}
@@ -1080,7 +1068,7 @@ static int __init acpi_parse_madt_lapic_entries(void) 
	count = acpi_table_parse_madt(ACPI_MADT_TYPE_LOCAL_APIC_NMI,

				      acpi_parse_lapic_nmi, 0);

	if (count < 0 || x2count < 0) {

		printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");

		pr_err("Error parsing LAPIC NMI entry\n");

		/* TBD: Cleanup to allow fallback to MPS */

		return count;

	}
@@ -1139,7 +1127,7 @@ static void __init mp_config_acpi_legacy_irqs(void) 
		}



		if (idx != mp_irq_entries) {

			printk(KERN_DEBUG "ACPI: IRQ%d used by override.\n", i);

			pr_debug("ACPI: IRQ%d used by override.\n", i);

			continue;	/* IRQ already used */

		}
@@ -1179,26 +1167,24 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
	 * if "noapic" boot option, don't look for IO-APICs

	 */

	if (skip_ioapic_setup) {

		printk(KERN_INFO PREFIX "Skipping IOAPIC probe "

		       "due to 'noapic' option.\n");

		pr_info("Skipping IOAPIC probe due to 'noapic' option.\n");

		return -ENODEV;

	}



	count = acpi_table_parse_madt(ACPI_MADT_TYPE_IO_APIC, acpi_parse_ioapic,

				      MAX_IO_APICS);

	if (!count) {

		printk(KERN_ERR PREFIX "No IOAPIC entries present\n");

		pr_err("No IOAPIC entries present\n");

		return -ENODEV;

	} else if (count < 0) {

		printk(KERN_ERR PREFIX "Error parsing IOAPIC entry\n");

		pr_err("Error parsing IOAPIC entry\n");

		return count;

	}



	count = acpi_table_parse_madt(ACPI_MADT_TYPE_INTERRUPT_OVERRIDE,

				      acpi_parse_int_src_ovr, nr_irqs);

	if (count < 0) {

		printk(KERN_ERR PREFIX

		       "Error parsing interrupt source overrides entry\n");

		pr_err("Error parsing interrupt source overrides entry\n");

		/* TBD: Cleanup to allow fallback to MPS */

		return count;

	}
@@ -1218,7 +1204,7 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
	count = acpi_table_parse_madt(ACPI_MADT_TYPE_NMI_SOURCE,

				      acpi_parse_nmi_src, nr_irqs);

	if (count < 0) {

		printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");

		pr_err("Error parsing NMI SRC entry\n");

		/* TBD: Cleanup to allow fallback to MPS */

		return count;

	}
@@ -1251,8 +1237,7 @@ static void __init early_acpi_process_madt(void) 
			/*

			 * Dell Precision Workstation 410, 610 come here.

			 */

			printk(KERN_ERR PREFIX

			       "Invalid BIOS MADT, disabling ACPI\n");

			pr_err("Invalid BIOS MADT, disabling ACPI\n");

			disable_acpi();

		}

	}
@@ -1289,8 +1274,7 @@ static void __init acpi_process_madt(void) 
			/*

			 * Dell Precision Workstation 410, 610 come here.

			 */

			printk(KERN_ERR PREFIX

			       "Invalid BIOS MADT, disabling ACPI\n");

			pr_err("Invalid BIOS MADT, disabling ACPI\n");

			disable_acpi();

		}

	} else {
@@ -1300,8 +1284,7 @@ static void __init acpi_process_madt(void) 
 		 * Boot with "acpi=off" to use MPS on such a system.

 		 */

		if (smp_found_config) {

			printk(KERN_WARNING PREFIX

				"No APIC-table, disabling MPS\n");

			pr_warn("No APIC-table, disabling MPS\n");

			smp_found_config = 0;

		}

	}
@@ -1311,11 +1294,9 @@ static void __init acpi_process_madt(void) 
	 * processors, where MPS only supports physical.

	 */

	if (acpi_lapic && acpi_ioapic)

		printk(KERN_INFO "Using ACPI (MADT) for SMP configuration "

		       "information\n");

		pr_info("Using ACPI (MADT) for SMP configuration information\n");

	else if (acpi_lapic)

		printk(KERN_INFO "Using ACPI for processor (LAPIC) "

		       "configuration information\n");

		pr_info("Using ACPI for processor (LAPIC) configuration information\n");

#endif

	return;

}
@@ -1323,8 +1304,7 @@ static void __init acpi_process_madt(void) 
static int __init disable_acpi_irq(const struct dmi_system_id *d)

{

	if (!acpi_force) {

		printk(KERN_NOTICE "%s detected: force use of acpi=noirq\n",

		       d->ident);

		pr_notice("%s detected: force use of acpi=noirq\n", d->ident);

		acpi_noirq_set();

	}

	return 0;
@@ -1333,8 +1313,7 @@ static int __init disable_acpi_irq(const struct dmi_system_id *d) 
static int __init disable_acpi_pci(const struct dmi_system_id *d)

{

	if (!acpi_force) {

		printk(KERN_NOTICE "%s detected: force use of pci=noacpi\n",

		       d->ident);

		pr_notice("%s detected: force use of pci=noacpi\n", d->ident);

		acpi_disable_pci();

	}

	return 0;
@@ -1343,11 +1322,10 @@ static int __init disable_acpi_pci(const struct dmi_system_id *d) 
static int __init dmi_disable_acpi(const struct dmi_system_id *d)

{

	if (!acpi_force) {

		printk(KERN_NOTICE "%s detected: acpi off\n", d->ident);

		pr_notice("%s detected: acpi off\n", d->ident);

		disable_acpi();

	} else {

		printk(KERN_NOTICE

		       "Warning: DMI blacklist says broken, but acpi forced\n");

		pr_notice("Warning: DMI blacklist says broken, but acpi forced\n");

	}

	return 0;

}
@@ -1574,9 +1552,9 @@ int __init early_acpi_boot_init(void) 
	 */

	if (acpi_blacklisted()) {

		if (acpi_force) {

			printk(KERN_WARNING PREFIX "acpi=force override\n");

			pr_warn("acpi=force override\n");

		} else {

			printk(KERN_WARNING PREFIX "Disabling ACPI support\n");

			pr_warn("Disabling ACPI support\n");

			disable_acpi();

			return 1;

		}
@@ -1692,9 +1670,7 @@ int __init acpi_mps_check(void) 
#if defined(CONFIG_X86_LOCAL_APIC) && !defined(CONFIG_X86_MPPARSE)

/* mptable code is not built-in*/

	if (acpi_disabled || acpi_noirq) {

		printk(KERN_WARNING "MPS support code is not built-in.\n"

		       "Using acpi=off or acpi=noirq or pci=noacpi "

		       "may have problem\n");

		pr_warn("MPS support code is not built-in, using acpi=off or acpi=noirq or pci=noacpi may have problem\n");

		return 1;

	}

#endif

drivers/acpi/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -543,3 +543,8 @@ config X86_PM_TIMER 


	  You should nearly always say Y here because many modern

	  systems require this timer.



config ACPI_PRMT

	bool "Platform Runtime Mechanism Support"

	depends on EFI && X86_64

	default y

drivers/acpi/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT 
#

# ACPI Boot-Time Table Parsing

#

ifeq ($(CONFIG_ACPI_CUSTOM_DSDT),y)

tables.o: $(src)/../../include/$(subst $\",,$(CONFIG_ACPI_CUSTOM_DSDT_FILE)) ;



endif



obj-$(CONFIG_ACPI)		+= tables.o

obj-$(CONFIG_X86)		+= blacklist.o
@@ -61,6 +66,7 @@ acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o 
acpi-$(CONFIG_ACPI_LPIT)	+= acpi_lpit.o

acpi-$(CONFIG_ACPI_GENERIC_GSI) += irq.o

acpi-$(CONFIG_ACPI_WATCHDOG)	+= acpi_watchdog.o

acpi-$(CONFIG_ACPI_PRMT)	+= prmt.o



# Address translation

acpi-$(CONFIG_ACPI_ADXL)	+= acpi_adxl.o

drivers/acpi/acpi_cmos_rtc.c

+4 −2
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 * Authors: Lan Tianyu <tianyu.lan@intel.com>

 */



#define pr_fmt(fmt) "ACPI: " fmt



#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/err.h>
@@ -59,7 +61,7 @@ static int acpi_install_cmos_rtc_space_handler(struct acpi_device *adev, 
			&acpi_cmos_rtc_space_handler,

			NULL, NULL);

	if (ACPI_FAILURE(status)) {

		pr_err(PREFIX "Error installing CMOS-RTC region handler\n");

		pr_err("Error installing CMOS-RTC region handler\n");

		return -ENODEV;

	}
@@ -70,7 +72,7 @@ static void acpi_remove_cmos_rtc_space_handler(struct acpi_device *adev) 
{

	if (ACPI_FAILURE(acpi_remove_address_space_handler(adev->handle,

			ACPI_ADR_SPACE_CMOS, &acpi_cmos_rtc_space_handler)))

		pr_err(PREFIX "Error removing CMOS-RTC region handler\n");

		pr_err("Error removing CMOS-RTC region handler\n");

}



static struct acpi_scan_handler cmos_rtc_handler = {