[GIT PULL] ACPI fixes for v5.15-rc7

[GIT PULL] ACPI fixes for v5.15-rc7

[Rafael J. Wysocki]

Hi Linus,

Please pull from the tag

 git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git \
 acpi-5.15-rc7

with top-most commit 7a7489005a80af97ba289dc0579fccd50af4fe8d

 Merge branch 'acpi-tools'

on top of commit 519d81956ee277b4419c723adfb154603c2565ba

 Linux 5.15-rc6

to receive ACPI fixes for 5.15-rc7.

These fix two regressions, one related to ACPI power resources
management and one that broke ACPI tools compilation.

Specifics:

 - Stop turning off unused ACPI power resources in an unknown state
   to address a regression introduced during the 5.14 cycle (Rafael
   Wysocki).

 - Fix an ACPI tools build issue introduced recently when the minimal
   stdarg.h was added (Miguel Bernal Marin).

Thanks!


---------------

Miguel Bernal Marin (1):
      ACPI: tools: fix compilation error

Rafael J. Wysocki (1):
      ACPI: PM: Do not turn off power resources in unknown state

---------------

 drivers/acpi/power.c          | 7 +------
 include/acpi/platform/acgcc.h | 9 +++++++--
 2 files changed, 8 insertions(+), 8 deletions(-)

Re: [GIT PULL] ACPI fixes for v5.15-rc7

[Linus Torvalds]

On Fri, Oct 22, 2021 at 9:01 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
>
>  - Fix an ACPI tools build issue introduced recently when the minimal
>    stdarg.h was added (Miguel Bernal Marin).

Hmm. ACPI already has that odd ACPI_USE_BUILTIN_STDARG case in
acgcc.h, which ends up using _exactly_ the same macros as the
<linux/stdarg.h> implementation does, and is basically exactly the
same "minimal stdarg".

Ok, so the macro argument names are different, and there are
whitespace differences, but semantically identical.

So maybe the ACPI code could drop one or the other in favor of the
identical macros?

                 Linus

Re: [GIT PULL] ACPI fixes for v5.15-rc7

[Rafael J. Wysocki]

On Fri, Oct 22, 2021 at 9:13 PM Linus Torvalds
<torvalds@linux-foundation.org> wrote:
>
> On Fri, Oct 22, 2021 at 9:01 AM Rafael J. Wysocki <rafael@kernel.org> wrote:
> >
> >  - Fix an ACPI tools build issue introduced recently when the minimal
> >    stdarg.h was added (Miguel Bernal Marin).
>
> Hmm. ACPI already has that odd ACPI_USE_BUILTIN_STDARG case in
> acgcc.h, which ends up using _exactly_ the same macros as the
> <linux/stdarg.h> implementation does, and is basically exactly the
> same "minimal stdarg".
>
> Ok, so the macro argument names are different, and there are
> whitespace differences, but semantically identical.
>
> So maybe the ACPI code could drop one or the other in favor of the
> identical macros?

The ACPI_USE_BUILTIN_STDARG check comes from the upstream code
assuming that whoever doesn't use the "common" stdarg.h will set
ACPI_USE_BUILTIN_STDARG, but we don't set it and we provide our own
stdarg.h, so we can make the following change (on top of the -rc7):

---
 include/acpi/platform/acgcc.h |   13 -------------
 1 file changed, 13 deletions(-)

Index: linux-pm/include/acpi/platform/acgcc.h
===================================================================
--- linux-pm.orig/include/acpi/platform/acgcc.h
+++ linux-pm/include/acpi/platform/acgcc.h
@@ -10,25 +10,12 @@
 #ifndef __ACGCC_H__
 #define __ACGCC_H__

-/*
- * Use compiler specific <stdarg.h> is a good practice for even when
- * -nostdinc is specified (i.e., ACPI_USE_STANDARD_HEADERS undefined.
- */
 #ifndef va_arg
-#ifdef ACPI_USE_BUILTIN_STDARG
-typedef __builtin_va_list va_list;
-#define va_start(v, l)          __builtin_va_start(v, l)
-#define va_end(v)               __builtin_va_end(v)
-#define va_arg(v, l)            __builtin_va_arg(v, l)
-#define va_copy(d, s)           __builtin_va_copy(d, s)
-#else
 #ifdef __KERNEL__
 #include <linux/stdarg.h>
 #else
-/* Used to build acpi tools */
 #include <stdarg.h>
 #endif /* __KERNEL__ */
-#endif /* ACPI_USE_BUILTIN_STDARG */
 #endif /* ! va_arg */

 #define ACPI_INLINE             __inline__

Re: [GIT PULL] ACPI fixes for v5.15-rc7

[pr-tracker-bot]

The pull request you sent on Fri, 22 Oct 2021 21:01:04 +0200:

> git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git acpi-5.15-rc7

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/1d4590f5069bff7d41d7ed1a7e7674fb9d6d502a

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html