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

Commit 04ed5109 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI updates from Rafael Wysocki:
 "These update ACPICA to upstream revision 20170831, fix APEI to use the
  fixmap instead of ioremap_page_range(), add an operation region driver
  for TI PMIC TPS68470, add support for PCC subspace IDs to the ACPI
  CPPC driver, fix a few assorted issues and clean up some code.

  Specifics:

   - Update the ACPICA code to upstream revision 20170831 including
      * PDTT table header support (Bob Moore).
      * Cleanup and extension of internal string-to-integer conversion
        functions (Bob Moore).
      * Support for 64-bit hardware accesses (Lv Zheng).
      * ACPI PM Timer code adjustment to deal with 64-bit return values
        of acpi_hw_read() (Bob Moore).
      * Support for deferred table verification in acpiexec (Lv Zheng).

   - Fix APEI to use the fixmap instead of ioremap_page_range() which
     cannot work correctly the way the code in there attempted to use it
     and drop some code that's not necessary any more after that change
     (James Morse).

   - Clean up the APEI support code and make it use 64-bit timestamps
     (Arnd Bergmann, Dongjiu Geng, Jan Beulich).

   - Add operation region driver for TI PMIC TPS68470 (Rajmohan Mani).

   - Add support for PCC subspace IDs to the ACPI CPPC driver (George
     Cherian).

   - Fix an ACPI EC driver regression related to the handling of EC
     events during the "noirq" phases of system suspend/resume (Lv
     Zheng).

   - Delay the initialization of the lid state in the ACPI button driver
     to fix issues appearing on some systems (Hans de Goede).

   - Extend the KIOX000A "device always present" quirk to cover all
     affected BIOS versions (Hans de Goede).

   - Clean up some code in the ACPI core and drivers (Colin Ian King,
     Gustavo Silva)"

* tag 'acpi-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (24 commits)
  ACPI: Mark expected switch fall-throughs
  ACPI / LPSS: Remove redundant initialization of clk
  ACPI / CPPC: Make CPPC ACPI driver aware of PCC subspace IDs
  mailbox: PCC: Move the MAX_PCC_SUBSPACES definition to header file
  ACPI / sysfs: Make function param_set_trace_method_name() static
  ACPI / button: Delay acpi_lid_initialize_state() until first user space open
  ACPI / EC: Fix regression related to triggering source of EC event handling
  APEI / ERST: use 64-bit timestamps
  ACPI / APEI: Remove arch_apei_flush_tlb_one()
  arm64: mm: Remove arch_apei_flush_tlb_one()
  ACPI / APEI: Remove ghes_ioremap_area
  ACPI / APEI: Replace ioremap_page_range() with fixmap
  ACPI / APEI: remove the unused dead-code for SEA/NMI notification type
  ACPI / x86: Extend KIOX000A quirk to cover all affected BIOS versions
  ACPI / APEI: adjust a local variable type in ghes_ioremap_pfn_irq()
  ACPICA: Update version to 20170831
  ACPICA: Update acpi_get_timer for 64-bit interface to acpi_hw_read
  ACPICA: String conversions: Update to add new behaviors
  ACPICA: String conversions: Cleanup/format comments. No functional changes
  ACPICA: Restructure/cleanup all string-to-integer conversion functions
  ...
parents bd2cd7d5 eb5fcc31

arch/arm64/include/asm/acpi.h

+0 −12
Original line number Diff line number Diff line
@@ -126,18 +126,6 @@ static inline const char *acpi_get_enable_method(int cpu) 
 */

#define acpi_disable_cmcff 1

pgprot_t arch_apei_get_mem_attribute(phys_addr_t addr);



/*

 * Despite its name, this function must still broadcast the TLB

 * invalidation in order to ensure other CPUs don't end up with junk

 * entries as a result of speculation. Unusually, its also called in

 * IRQ context (ghes_iounmap_irq) so if we ever need to use IPIs for

 * TLB broadcasting, then we're in trouble here.

 */

static inline void arch_apei_flush_tlb_one(unsigned long addr)

{

	flush_tlb_kernel_range(addr, addr + PAGE_SIZE);

}

#endif /* CONFIG_ACPI_APEI */



#ifdef CONFIG_ACPI_NUMA

arch/arm64/include/asm/fixmap.h

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,13 @@ enum fixed_addresses { 


	FIX_EARLYCON_MEM_BASE,

	FIX_TEXT_POKE0,



#ifdef CONFIG_ACPI_APEI_GHES

	/* Used for GHES mapping from assorted contexts */

	FIX_APEI_GHES_IRQ,

	FIX_APEI_GHES_NMI,

#endif /* CONFIG_ACPI_APEI_GHES */



	__end_of_permanent_fixed_addresses,



	/*

arch/arm64/mm/mmu.c

+4 −0
Original line number Diff line number Diff line
@@ -778,6 +778,10 @@ void __init early_fixmap_init(void) 
	}

}



/*

 * Unusually, this is also called in IRQ context (ghes_iounmap_irq) so if we

 * ever need to use IPIs for TLB broadcasting, then we're in trouble here.

 */

void __set_fixmap(enum fixed_addresses idx,

			       phys_addr_t phys, pgprot_t flags)

{

arch/x86/include/asm/fixmap.h

+6 −0
Original line number Diff line number Diff line
@@ -104,6 +104,12 @@ enum fixed_addresses { 
	FIX_GDT_REMAP_BEGIN,

	FIX_GDT_REMAP_END = FIX_GDT_REMAP_BEGIN + NR_CPUS - 1,



#ifdef CONFIG_ACPI_APEI_GHES

	/* Used for GHES mapping from assorted contexts */

	FIX_APEI_GHES_IRQ,

	FIX_APEI_GHES_NMI,

#endif



	__end_of_permanent_fixed_addresses,



	/*

arch/x86/kernel/acpi/apei.c

+0 −5
Original line number Diff line number Diff line
@@ -52,8 +52,3 @@ void arch_apei_report_mem_error(int sev, struct cper_sec_mem_err *mem_err) 
	apei_mce_report_mem_error(sev, mem_err);

#endif

}
 


void arch_apei_flush_tlb_one(unsigned long addr)

{

	__flush_tlb_one(addr);

}