xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Pull more ACPI updates from Rafael Wysocki:
 "These are mostly fixes and cleanups, a few new quirks, a couple of
  updates related to the handling of ACPI tables and ACPICA copyrights
  refreshment.

  Specifics:

   - Update the ACPICA kernel code to upstream revision 20180105
     including:
       * Assorted fixes (Jung-uk Kim)
       * Support for X32 ABI compilation (Anuj Mittal)
       * Update of ACPICA copyrights to 2018 (Bob Moore)

   - Prepare for future modifications to avoid executing the _STA
     control method too early (Hans de Goede)

   - Make the processor performance control library code ignore _PPC
     notifications if they cannot be handled and fix up the C1 idle
     state definition when it is used as a fallback state (Chen Yu,
     Yazen Ghannam)

   - Make it possible to use the SPCR table on x86 and to replace the
     original IORT table with a new one from initrd (Prarit Bhargava,
     Shunyong Yang)

   - Add battery-related quirks for Asus UX360UA and UX410UAK and add
     quirks for table parsing on Dell XPS 9570 and Precision M5530 (Kai
     Heng Feng)

   - Address static checker warnings in the CPPC code (Gustavo Silva)

   - Avoid printing a raw pointer to the kernel log in the smart battery
     driver (Greg Kroah-Hartman)"

* tag 'acpi-part2-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: sbshc: remove raw pointer from printk() message
  ACPI: SPCR: Make SPCR available to x86
  ACPI / CPPC: Use 64-bit arithmetic instead of 32-bit
  ACPI / tables: Add IORT to injectable table list
  ACPI / bus: Parse tables as term_list for Dell XPS 9570 and Precision M5530
  ACPICA: Update version to 20180105
  ACPICA: All acpica: Update copyrights to 2018
  ACPI / processor: Set default C1 idle state description
  ACPI / battery: Add quirk for Asus UX360UA and UX410UAK
  ACPI: processor_perflib: Do not send _PPC change notification if not ready
  ACPI / scan: Use acpi_bus_get_status() to initialize ACPI_TYPE_DEVICE devs
  ACPI / bus: Do not call _STA on battery devices with unmet dependencies
  PCI: acpiphp_ibm: prepare for acpi_get_object_info() no longer returning status
  ACPI: export acpi_bus_get_status_handle()
  ACPICA: Add a missing pair of parentheses
  ACPICA: Prefer ACPI_TO_POINTER() over ACPI_ADD_PTR()
  ACPICA: Avoid NULL pointer arithmetic
  ACPICA: Linux: add support for X32 ABI compilation
  ACPI / video: Use true for boolean value
This commit is contained in:
Linus Torvalds
2018-02-09 09:44:25 -08:00
parent a051c14b8d d4abd46b7e
commit 54ce685cae
247 changed files with 366 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/acpi/acbuffer.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/acconfig.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/acexcep.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/acnames.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/acoutput.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/acpi.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/acpiosxf.h
View File

@@ -7,7 +7,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

4
include/acpi/acpixf.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@
/* Current ACPICA subsystem version in YYYYMMDD format */
#define ACPI_CA_VERSION 0x20171215
#define ACPI_CA_VERSION 0x20180105
#include <acpi/acconfig.h>
#include <acpi/actypes.h>

2
include/acpi/acrestyp.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/actbl.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/actbl1.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/actbl2.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/actbl3.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

12
include/acpi/actypes.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -485,7 +485,7 @@ typedef u8 acpi_owner_id;
/*
* Constants with special meanings
*/
#define ACPI_ROOT_OBJECT ACPI_ADD_PTR (acpi_handle, NULL, ACPI_MAX_PTR)
#define ACPI_ROOT_OBJECT ((acpi_handle) ACPI_TO_POINTER (ACPI_MAX_PTR))
#define ACPI_WAIT_FOREVER 0xFFFF /* u16, as per ACPI spec */
#define ACPI_DO_NOT_WAIT 0
@@ -532,13 +532,13 @@ typedef u64 acpi_integer;
#define ACPI_CAST_INDIRECT_PTR(t, p) ((t **) (acpi_uintptr_t) (p))
#define ACPI_ADD_PTR(t, a, b) ACPI_CAST_PTR (t, (ACPI_CAST_PTR (u8, (a)) + (acpi_size)(b)))
#define ACPI_SUB_PTR(t, a, b) ACPI_CAST_PTR (t, (ACPI_CAST_PTR (u8, (a)) - (acpi_size)(b)))
#define ACPI_PTR_DIFF(a, b) (acpi_size) (ACPI_CAST_PTR (u8, (a)) - ACPI_CAST_PTR (u8, (b)))
#define ACPI_PTR_DIFF(a, b) ((acpi_size) (ACPI_CAST_PTR (u8, (a)) - ACPI_CAST_PTR (u8, (b))))
/* Pointer/Integer type conversions */
#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) NULL,(acpi_size) i)
#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) NULL)
#define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) NULL)
#define ACPI_TO_POINTER(i) ACPI_ADD_PTR (void, (void *) 0, (acpi_size) (i))
#define ACPI_TO_INTEGER(p) ACPI_PTR_DIFF (p, (void *) 0)
#define ACPI_OFFSET(d, f) ACPI_PTR_DIFF (&(((d *) 0)->f), (void *) 0)
#define ACPI_PHYSADDR_TO_PTR(i) ACPI_TO_POINTER(i)
#define ACPI_PTR_TO_PHYSADDR(i) ACPI_TO_INTEGER(i)

2
include/acpi/acuuid.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/platform/acenv.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/platform/acenvex.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/platform/acgcc.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/platform/acgccex.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

2
include/acpi/platform/acintel.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

4
include/acpi/platform/aclinux.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -206,7 +206,7 @@
#define ACPI_FLUSH_CPU_CACHE()
#define ACPI_CAST_PTHREAD_T(pthread) ((acpi_thread_id) (pthread))
#if defined(__ia64__) || defined(__x86_64__) ||\
#if defined(__ia64__) || (defined(__x86_64__) && !defined(__ILP32__)) ||\
defined(__aarch64__) || defined(__PPC64__) ||\
defined(__s390x__)
#define ACPI_MACHINE_WIDTH 64

2
include/acpi/platform/aclinuxex.h
View File

@@ -5,7 +5,7 @@
*****************************************************************************/
/*
* Copyright (C) 2000 - 2017, Intel Corp.
* Copyright (C) 2000 - 2018, Intel Corp.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without

7
include/linux/acpi.h
View File

@@ -1263,9 +1263,12 @@ static inline bool acpi_has_watchdog(void) { return false; }
#ifdef CONFIG_ACPI_SPCR_TABLE
extern bool qdf2400_e44_present;
int parse_spcr(bool earlycon);
int acpi_parse_spcr(bool enable_earlycon, bool enable_console);
#else
static inline int parse_spcr(bool earlycon) { return 0; }
static inline int acpi_parse_spcr(bool enable_earlycon, bool enable_console)
{
return 0;
}
#endif
#if IS_ENABLED(CONFIG_ACPI_GENERIC_GSI)

4
include/linux/serial_core.h
View File

@@ -376,10 +376,10 @@ extern int of_setup_earlycon(const struct earlycon_id *match,
const char *options);
#ifdef CONFIG_SERIAL_EARLYCON
extern bool earlycon_init_is_deferred __initdata;
extern bool earlycon_acpi_spcr_enable __initdata;
int setup_earlycon(char *buf);
#else
static const bool earlycon_init_is_deferred;
static const bool earlycon_acpi_spcr_enable;
static inline int setup_earlycon(char *buf) { return 0; }
#endif