Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1393965 > unrolled thread
| Started by | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| First post | 2016-05-04 07:50 +0200 |
| Last post | 2016-05-06 01:50 +0200 |
| Articles | 20 on this page of 31 — 6 participants |
Back to article view | Back to linux.kernel
[PATCH 00/15] ACPICA: 20160422 Release Lv Zheng <lv.zheng@intel.com> - 2016-05-04 07:50 +0200
[PATCH 07/15] ACPICA: Renamed some #defined flag constants for clarity Lv Zheng <lv.zheng@intel.com> - 2016-05-04 07:50 +0200
[PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls Lv Zheng <lv.zheng@intel.com> - 2016-05-04 07:50 +0200
Re: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls Prarit Bhargava <prarit@redhat.com> - 2016-05-04 17:20 +0200
Re: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls "Rafael J. Wysocki" <rafael@kernel.org> - 2016-05-04 21:30 +0200
RE: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls <Mario_Limonciello@Dell.com> - 2016-05-04 22:40 +0200
Re: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls "Rafael J. Wysocki" <rafael@kernel.org> - 2016-05-04 22:50 +0200
[PATCH 05/15] ACPICA: ACPI 6.0: Update _BIX support for new package element Lv Zheng <lv.zheng@intel.com> - 2016-05-04 07:50 +0200
[PATCH 09/15] ACPICA: Utilities: Add ACPI_IS_ALIGNED() macro Lv Zheng <lv.zheng@intel.com> - 2016-05-04 07:50 +0200
[PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release Lv Zheng <lv.zheng@intel.com> - 2016-05-04 07:50 +0200
Re: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-05-04 23:40 +0200
Re: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-05-04 23:40 +0200
RE: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release "Zheng, Lv" <lv.zheng@intel.com> - 2016-05-05 04:20 +0200
RE: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release "Zheng, Lv" <lv.zheng@intel.com> - 2016-05-05 04:20 +0200
[PATCH 10/15] ACPICA: Hardware: Add optimized access bit width support Lv Zheng <lv.zheng@intel.com> - 2016-05-04 07:50 +0200
[PATCH 15/15] ACPICA: Update version to 20160422 Lv Zheng <lv.zheng@intel.com> - 2016-05-04 08:00 +0200
[PATCH 06/15] ACPICA: ACPI 6.0, tools/iasl: Add support for new resource descriptors Lv Zheng <lv.zheng@intel.com> - 2016-05-04 08:00 +0200
[PATCH v2 10/13] ACPICA: ACPI 2.0, Hardware: Add access_width/bit_offset support in acpi_hw_read() Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:00 +0200
[PATCH v2 04/13] ACPICA: ACPI 6.0: Update _BIX support for new package element Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:00 +0200
[PATCH v2 07/13] ACPICA: Utilities: Add ACPI_IS_ALIGNED() macro Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:00 +0200
[PATCH v2 02/13] ACPICA: Refactor evaluate_object to reduce nesting Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:00 +0200
[PATCH v2 06/13] ACPICA: Renamed some #defined flag constants for clarity Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:00 +0200
[PATCH v2 09/13] ACPICA: Executer: Introduce a set of macros to handle bit width mask generation Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:00 +0200
[PATCH v2 00/13] ACPICA: 20160422 Release Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:00 +0200
[PATCH v2 05/13] ACPICA: ACPI 6.0, tools/iasl: Add support for new resource descriptors Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:00 +0200
[PATCH v2 08/13] ACPICA: Hardware: Add optimized access bit width support Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:00 +0200
[PATCH v2 03/13] ACPICA: ACPI 6.1: Support for new PCCT subtable Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:10 +0200
[PATCH v2 13/13] ACPICA: Update version to 20160422 Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:10 +0200
[PATCH v2 11/13] ACPICA: ACPI 2.0, Hardware: Add access_width/bit_offset support for acpi_hw_write() Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:10 +0200
[PATCH v2 12/13] ACPICA: Move all ASCII utilities to a common file Lv Zheng <lv.zheng@intel.com> - 2016-05-05 07:10 +0200
Re: [PATCH v2 00/13] ACPICA: 20160422 Release "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2016-05-06 01:50 +0200
Page 1 of 2 [1] 2 Next page →
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-04 07:50 +0200 |
| Subject | [PATCH 00/15] ACPICA: 20160422 Release |
| Message-ID | <ruXR7-6ki-5@gated-at.bofh.it> |
The 20160422 ACPICA kernel-resident subsystem updates are linuxized based
on the linux-pm/linux-next branch.
NOTE:
1. Indentation improvement
The [PATCH 02] is a result of an ACPICA release process fix. It requires
much of human intervention, and many linuxized patches in my hand that are
not upstreamed to the ACPICA are burnt by this commit, which takes weeks or
months to recover. So hope we can do it only once. The [PATCH 01] can
reduce the painful manual work when we have to re-do it.
2. AcessWidth/BitOffset support
The old way of hardware access code has been working for many years. The
commits in this release cycle enables AccessWidth/BitOffset support. Though
the commits of AccessWidth/BitOffset support are written in the regression
safer way, it may still break users because of unknown cases. But we need
to have it in the upstream so that it can be used by as many as possible
users in order to obtain the feedback to reveal the unknown cases.
The patchset has passed the following build/boot tests.
Build tests are performed as follows:
1. i386 + allyes
2. i386 + allno
3. i386 + default + ACPI_DEBUGGER=y
4. i386 + default + ACPI_DEBUGGER=n + ACPI_DEBUG=y
5. i386 + default + ACPI_DEBUG=n + ACPI=y
6. i386 + default + ACPI=n
7. x86_64 + allyes
8. x86_64 + allno
9. x86_64 + default + ACPI_DEBUGGER=y
10.x86_64 + default + ACPI_DEBUGGER=n + ACPI_DEBUG=y
11.x86_64 + default + ACPI_DEBUG=n + ACPI=y
12.x86_64 + default + ACPI=n
Boot tests are performed as follows:
1. i386 + default + ACPI_DEBUGGER=y
2. x86_64 + default + ACPI_DEBUGGER=y
Where:
1. i386: machine named as "Dell Inspiron Mini 1010"
2. x86_64: machine named as "HP Compaq 8200 Elite SFF PC"
3. default: kernel configuration with following items enabled:
All hardware drivers related to the machines of i386/x86_64
All "drivers/acpi" configurations
All "drivers/platform" drivers
All other drivers that link the APIs provided by ACPICA subsystem
The divergences checking result:
Before applying (20160318 Release):
494 lines
After applying (20160422 Release):
485 lines
The reduction is caused by recently merged module level improvement.
Bob Moore (7):
ACPICA: Refactor evaluate_object to reduce nesting
ACPICA: ACPI 6.1: Support for new PCCT subtable
ACPICA: ACPI 6.0: Update _BIX support for new package element
ACPICA: ACPI 6.0, tools/iasl: Add support for new resource
descriptors
ACPICA: Renamed some #defined flag constants for clarity
ACPICA: Move all ASCII utilities to a common file
ACPICA: Update version to 20160422
Lv Zheng (7):
ACPICA: Linuxize: reduce divergences for 20160422 release
ACPICA: Divergence: remove unwanted spaces for typedef
ACPICA: Utilities: Add ACPI_IS_ALIGNED() macro
ACPICA: Hardware: Add optimized access bit width support
ACPICA: Executer: Introduce a set of macros to handle bit width mask
generation
ACPICA: Hardware: Add access_width/bit_offset support in
acpi_hw_read()
ACPICA: Hardware: Add access_width/bit_offset support for
acpi_hw_write()
Prarit Bhargava (1):
ACPICA: Dispatcher: Update thread ID for recursive method calls
drivers/acpi/acpica/Makefile | 1 +
drivers/acpi/acpica/acdebug.h | 6 +-
drivers/acpi/acpica/acevents.h | 1 +
drivers/acpi/acpica/acinterp.h | 2 +-
drivers/acpi/acpica/aclocal.h | 61 ++---
drivers/acpi/acpica/acmacros.h | 15 +-
drivers/acpi/acpica/acpredef.h | 5 +-
drivers/acpi/acpica/acresrc.h | 8 +-
drivers/acpi/acpica/actables.h | 2 -
drivers/acpi/acpica/acutils.h | 35 +--
drivers/acpi/acpica/dbcmds.c | 4 +-
drivers/acpi/acpica/dbconvert.c | 4 +-
drivers/acpi/acpica/dbexec.c | 2 +-
drivers/acpi/acpica/dbinput.c | 6 +-
drivers/acpi/acpica/dbnames.c | 4 +-
drivers/acpi/acpica/dbxface.c | 4 +-
drivers/acpi/acpica/dscontrol.c | 4 +-
drivers/acpi/acpica/dsinit.c | 2 +-
drivers/acpi/acpica/dsmethod.c | 5 +-
drivers/acpi/acpica/dsutils.c | 2 +-
drivers/acpi/acpica/dswload.c | 4 +-
drivers/acpi/acpica/dswload2.c | 4 +-
drivers/acpi/acpica/dswstate.c | 10 +-
drivers/acpi/acpica/evgpe.c | 4 +-
drivers/acpi/acpica/evgpeblk.c | 4 +-
drivers/acpi/acpica/evgpeutil.c | 4 +-
drivers/acpi/acpica/evhandler.c | 2 +-
drivers/acpi/acpica/evmisc.c | 3 +-
drivers/acpi/acpica/evrgnini.c | 2 +-
drivers/acpi/acpica/evxfgpe.c | 2 +-
drivers/acpi/acpica/exconcat.c | 4 +-
drivers/acpi/acpica/exconvrt.c | 4 +-
drivers/acpi/acpica/excreate.c | 2 +-
drivers/acpi/acpica/exfield.c | 4 +-
drivers/acpi/acpica/exfldio.c | 14 +-
drivers/acpi/acpica/exnames.c | 2 +-
drivers/acpi/acpica/exoparg3.c | 8 +-
drivers/acpi/acpica/exoparg6.c | 2 +-
drivers/acpi/acpica/exregion.c | 6 +-
drivers/acpi/acpica/exresnte.c | 4 +-
drivers/acpi/acpica/exresolv.c | 2 +-
drivers/acpi/acpica/exresop.c | 4 +-
drivers/acpi/acpica/exstorob.c | 4 +-
drivers/acpi/acpica/hwgpe.c | 6 +-
drivers/acpi/acpica/hwregs.c | 270 ++++++++++++++++++--
drivers/acpi/acpica/hwxface.c | 7 +-
drivers/acpi/acpica/nsconvert.c | 6 +-
drivers/acpi/acpica/nsnames.c | 2 +-
drivers/acpi/acpica/nsobject.c | 4 +-
drivers/acpi/acpica/nsprepkg.c | 86 +++++++
drivers/acpi/acpica/nsrepair.c | 2 +-
drivers/acpi/acpica/nsrepair2.c | 6 +-
drivers/acpi/acpica/nsutils.c | 8 +-
drivers/acpi/acpica/nsxfeval.c | 113 ++++----
drivers/acpi/acpica/nsxfname.c | 6 +-
drivers/acpi/acpica/nsxfobj.c | 6 +-
drivers/acpi/acpica/psargs.c | 2 +-
drivers/acpi/acpica/psparse.c | 4 +-
drivers/acpi/acpica/psutils.c | 2 +-
drivers/acpi/acpica/psxface.c | 2 +-
drivers/acpi/acpica/rscalc.c | 90 +++----
drivers/acpi/acpica/rscreate.c | 2 +-
drivers/acpi/acpica/rsdumpinfo.c | 9 +-
drivers/acpi/acpica/rsmisc.c | 2 +-
drivers/acpi/acpica/rsserial.c | 21 +-
drivers/acpi/acpica/rsutils.c | 12 +-
drivers/acpi/acpica/rsxface.c | 6 +-
drivers/acpi/acpica/tbdata.c | 15 +-
drivers/acpi/acpica/tbfadt.c | 2 +-
drivers/acpi/acpica/tbfind.c | 2 +-
drivers/acpi/acpica/tbinstal.c | 6 +-
drivers/acpi/acpica/tbutils.c | 33 +--
drivers/acpi/acpica/tbxface.c | 6 +-
drivers/acpi/acpica/tbxfroot.c | 8 +-
drivers/acpi/acpica/utalloc.c | 5 +-
drivers/acpi/acpica/utascii.c | 140 ++++++++++
drivers/acpi/acpica/utbuffer.c | 24 +-
drivers/acpi/acpica/utcache.c | 7 +-
drivers/acpi/acpica/utcopy.c | 16 +-
drivers/acpi/acpica/utids.c | 8 +-
drivers/acpi/acpica/utmath.c | 4 +-
drivers/acpi/acpica/utobject.c | 18 +-
drivers/acpi/acpica/utosi.c | 4 +-
drivers/acpi/acpica/utownerid.c | 6 +-
drivers/acpi/acpica/utprint.c | 14 +-
drivers/acpi/acpica/utstring.c | 71 +----
drivers/acpi/acpica/utxface.c | 4 +-
include/acpi/acpiosxf.h | 8 +-
include/acpi/acpixf.h | 23 +-
include/acpi/acrestyp.h | 1 +
include/acpi/actbl3.h | 23 +-
include/acpi/actypes.h | 41 +--
.../acpi/os_specific/service_layers/oslinuxtbl.c | 47 ++--
.../acpi/os_specific/service_layers/osunixxf.c | 24 +-
tools/power/acpi/tools/acpidump/Makefile | 1 +
tools/power/acpi/tools/acpidump/apdump.c | 10 +-
96 files changed, 964 insertions(+), 553 deletions(-)
create mode 100644 drivers/acpi/acpica/utascii.c
--
1.7.10
[toc] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-04 07:50 +0200 |
| Subject | [PATCH 07/15] ACPICA: Renamed some #defined flag constants for clarity |
| Message-ID | <ruXR9-6ki-27@gated-at.bofh.it> |
| In reply to | #1393965 |
From: Bob Moore <robert.moore@intel.com>
ACPICA commit 438905b205e64e742f9670a0970419c426264831
Expanded a couple of cryptic names.
Link: https://github.com/acpica/acpica/commit/438905b2
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
drivers/acpi/acpica/aclocal.h | 30 +++++++++++++++---------------
drivers/acpi/acpica/psutils.c | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 166a67f..13331d7 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -856,24 +856,24 @@ struct acpi_parse_state {
/* Parse object flags */
-#define ACPI_PARSEOP_GENERIC 0x01
-#define ACPI_PARSEOP_NAMED 0x02
-#define ACPI_PARSEOP_DEFERRED 0x04
-#define ACPI_PARSEOP_BYTELIST 0x08
-#define ACPI_PARSEOP_IN_STACK 0x10
-#define ACPI_PARSEOP_TARGET 0x20
-#define ACPI_PARSEOP_IN_CACHE 0x80
+#define ACPI_PARSEOP_GENERIC 0x01
+#define ACPI_PARSEOP_NAMED_OBJECT 0x02
+#define ACPI_PARSEOP_DEFERRED 0x04
+#define ACPI_PARSEOP_BYTELIST 0x08
+#define ACPI_PARSEOP_IN_STACK 0x10
+#define ACPI_PARSEOP_TARGET 0x20
+#define ACPI_PARSEOP_IN_CACHE 0x80
/* Parse object disasm_flags */
-#define ACPI_PARSEOP_IGNORE 0x01
-#define ACPI_PARSEOP_PARAMLIST 0x02
-#define ACPI_PARSEOP_EMPTY_TERMLIST 0x04
-#define ACPI_PARSEOP_PREDEF_CHECKED 0x08
-#define ACPI_PARSEOP_CLOSING_PAREN 0x10
-#define ACPI_PARSEOP_COMPOUND 0x20
-#define ACPI_PARSEOP_ASSIGNMENT 0x40
-#define ACPI_PARSEOP_ELSEIF 0x80
+#define ACPI_PARSEOP_IGNORE 0x01
+#define ACPI_PARSEOP_PARAMETER_LIST 0x02
+#define ACPI_PARSEOP_EMPTY_TERMLIST 0x04
+#define ACPI_PARSEOP_PREDEFINED_CHECKED 0x08
+#define ACPI_PARSEOP_CLOSING_PAREN 0x10
+#define ACPI_PARSEOP_COMPOUND_ASSIGNMENT 0x20
+#define ACPI_PARSEOP_ASSIGNMENT 0x40
+#define ACPI_PARSEOP_ELSEIF 0x80
/*****************************************************************************
*
diff --git a/drivers/acpi/acpica/psutils.c b/drivers/acpi/acpica/psutils.c
index b28b0da..89cb4bf 100644
--- a/drivers/acpi/acpica/psutils.c
+++ b/drivers/acpi/acpica/psutils.c
@@ -128,7 +128,7 @@ union acpi_parse_object *acpi_ps_alloc_op(u16 opcode, u8 *aml)
if (op_info->flags & AML_DEFER) {
flags = ACPI_PARSEOP_DEFERRED;
} else if (op_info->flags & AML_NAMED) {
- flags = ACPI_PARSEOP_NAMED;
+ flags = ACPI_PARSEOP_NAMED_OBJECT;
} else if (opcode == AML_INT_BYTELIST_OP) {
flags = ACPI_PARSEOP_BYTELIST;
}
--
1.7.10
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-04 07:50 +0200 |
| Subject | [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls |
| Message-ID | <ruXRa-6ki-29@gated-at.bofh.it> |
| In reply to | #1393965 |
From: Prarit Bhargava <prarit@redhat.com> ACPICA commit 7a3bd2d962f221809f25ddb826c9e551b916eb25 Set the mutex owner thread ID. Original patch from: Prarit Bhargava <prarit@redhat.com> Link: https://github.com/acpica/acpica/commit/7a3bd2d9 Signed-off-by: Prarit Bhargava <prarit@redhat.com> Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> --- drivers/acpi/acpica/dsmethod.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index ddfec05..47c7b52 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c @@ -428,6 +428,9 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node, obj_desc->method.mutex->mutex. original_sync_level = obj_desc->method.mutex->mutex.sync_level; + + obj_desc->method.mutex->mutex.thread_id = + acpi_os_get_thread_id(); } } -- 1.7.10
[toc] | [prev] | [next] | [standalone]
| From | Prarit Bhargava <prarit@redhat.com> |
|---|---|
| Date | 2016-05-04 17:20 +0200 |
| Subject | Re: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls |
| Message-ID | <rv6KL-6s5-45@gated-at.bofh.it> |
| In reply to | #1393967 |
On 05/04/2016 01:48 AM, Lv Zheng wrote: > From: Prarit Bhargava <prarit@redhat.com> > > ACPICA commit 7a3bd2d962f221809f25ddb826c9e551b916eb25 > > Set the mutex owner thread ID. > Original patch from: Prarit Bhargava <prarit@redhat.com> > > Link: https://github.com/acpica/acpica/commit/7a3bd2d9 > Signed-off-by: Prarit Bhargava <prarit@redhat.com> > Signed-off-by: Bob Moore <robert.moore@intel.com> > Signed-off-by: Lv Zheng <lv.zheng@intel.com> cc'ing Mario @ Dell and stable. P. > --- > drivers/acpi/acpica/dsmethod.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c > index ddfec05..47c7b52 100644 > --- a/drivers/acpi/acpica/dsmethod.c > +++ b/drivers/acpi/acpica/dsmethod.c > @@ -428,6 +428,9 @@ acpi_ds_begin_method_execution(struct acpi_namespace_node *method_node, > obj_desc->method.mutex->mutex. > original_sync_level = > obj_desc->method.mutex->mutex.sync_level; > + > + obj_desc->method.mutex->mutex.thread_id = > + acpi_os_get_thread_id(); > } > } > >
[toc] | [prev] | [next] | [standalone]
| From | "Rafael J. Wysocki" <rafael@kernel.org> |
|---|---|
| Date | 2016-05-04 21:30 +0200 |
| Subject | Re: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls |
| Message-ID | <rvaEJ-1v3-81@gated-at.bofh.it> |
| In reply to | #1394446 |
On Wed, May 4, 2016 at 5:10 PM, Prarit Bhargava <prarit@redhat.com> wrote: > > > On 05/04/2016 01:48 AM, Lv Zheng wrote: >> From: Prarit Bhargava <prarit@redhat.com> >> >> ACPICA commit 7a3bd2d962f221809f25ddb826c9e551b916eb25 >> >> Set the mutex owner thread ID. >> Original patch from: Prarit Bhargava <prarit@redhat.com> >> >> Link: https://github.com/acpica/acpica/commit/7a3bd2d9 >> Signed-off-by: Prarit Bhargava <prarit@redhat.com> >> Signed-off-by: Bob Moore <robert.moore@intel.com> >> Signed-off-by: Lv Zheng <lv.zheng@intel.com> > > cc'ing Mario @ Dell and stable. It won't help if you CC stable at this point. What stable series should this go into?
[toc] | [prev] | [next] | [standalone]
| From | <Mario_Limonciello@Dell.com> |
|---|---|
| Date | 2016-05-04 22:40 +0200 |
| Subject | RE: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls |
| Message-ID | <rvbKq-2q1-17@gated-at.bofh.it> |
| In reply to | #1394666 |
> -----Original Message----- > From: rjwysocki@gmail.com [mailto:rjwysocki@gmail.com] On Behalf Of > Rafael J. Wysocki > Sent: Wednesday, May 4, 2016 2:23 PM > To: Prarit Bhargava <prarit@redhat.com> > Cc: Lv Zheng <lv.zheng@intel.com>; Rafael J. Wysocki > <rafael.j.wysocki@intel.com>; Rafael J. Wysocki <rjw@rjwysocki.net>; Len > Brown <len.brown@intel.com>; Lv Zheng <zetalog@gmail.com>; Linux > Kernel Mailing List <linux-kernel@vger.kernel.org>; ACPI Devel Maling List > <linux-acpi@vger.kernel.org>; Bob Moore <robert.moore@intel.com>; > Limonciello, Mario <Mario_Limonciello@Dell.com>; stable > <stable@vger.kernel.org> > Subject: Re: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for > recursive method calls > > On Wed, May 4, 2016 at 5:10 PM, Prarit Bhargava <prarit@redhat.com> > wrote: > > > > > > On 05/04/2016 01:48 AM, Lv Zheng wrote: > >> From: Prarit Bhargava <prarit@redhat.com> > >> > >> ACPICA commit 7a3bd2d962f221809f25ddb826c9e551b916eb25 > >> > >> Set the mutex owner thread ID. > >> Original patch from: Prarit Bhargava <prarit@redhat.com> > >> > >> Link: https://github.com/acpica/acpica/commit/7a3bd2d9 > >> Signed-off-by: Prarit Bhargava <prarit@redhat.com> > >> Signed-off-by: Bob Moore <robert.moore@intel.com> > >> Signed-off-by: Lv Zheng <lv.zheng@intel.com> > > > > cc'ing Mario @ Dell and stable. > > It won't help if you CC stable at this point. > > What stable series should this go into? At least I was really hoping to see this land in kernels that are in the common distros today: 4.4, 4.2 and 3.19.
[toc] | [prev] | [next] | [standalone]
| From | "Rafael J. Wysocki" <rafael@kernel.org> |
|---|---|
| Date | 2016-05-04 22:50 +0200 |
| Subject | Re: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for recursive method calls |
| Message-ID | <rvbU5-2vN-5@gated-at.bofh.it> |
| In reply to | #1394706 |
On Wed, May 4, 2016 at 10:30 PM, <Mario_Limonciello@dell.com> wrote: >> -----Original Message----- >> From: rjwysocki@gmail.com [mailto:rjwysocki@gmail.com] On Behalf Of >> Rafael J. Wysocki >> Sent: Wednesday, May 4, 2016 2:23 PM >> To: Prarit Bhargava <prarit@redhat.com> >> Cc: Lv Zheng <lv.zheng@intel.com>; Rafael J. Wysocki >> <rafael.j.wysocki@intel.com>; Rafael J. Wysocki <rjw@rjwysocki.net>; Len >> Brown <len.brown@intel.com>; Lv Zheng <zetalog@gmail.com>; Linux >> Kernel Mailing List <linux-kernel@vger.kernel.org>; ACPI Devel Maling List >> <linux-acpi@vger.kernel.org>; Bob Moore <robert.moore@intel.com>; >> Limonciello, Mario <Mario_Limonciello@Dell.com>; stable >> <stable@vger.kernel.org> >> Subject: Re: [PATCH 08/15] ACPICA: Dispatcher: Update thread ID for >> recursive method calls >> >> On Wed, May 4, 2016 at 5:10 PM, Prarit Bhargava <prarit@redhat.com> >> wrote: >> > >> > >> > On 05/04/2016 01:48 AM, Lv Zheng wrote: >> >> From: Prarit Bhargava <prarit@redhat.com> >> >> >> >> ACPICA commit 7a3bd2d962f221809f25ddb826c9e551b916eb25 >> >> >> >> Set the mutex owner thread ID. >> >> Original patch from: Prarit Bhargava <prarit@redhat.com> >> >> >> >> Link: https://github.com/acpica/acpica/commit/7a3bd2d9 >> >> Signed-off-by: Prarit Bhargava <prarit@redhat.com> >> >> Signed-off-by: Bob Moore <robert.moore@intel.com> >> >> Signed-off-by: Lv Zheng <lv.zheng@intel.com> >> > >> > cc'ing Mario @ Dell and stable. >> >> It won't help if you CC stable at this point. >> >> What stable series should this go into? > > At least I was really hoping to see this land in kernels that are in the common distros today: 4.4, 4.2 and 3.19. > OK, let's make it "all applicable", then. Applied and queued up as a fix for v4.6, thanks everybody!
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-04 07:50 +0200 |
| Subject | [PATCH 05/15] ACPICA: ACPI 6.0: Update _BIX support for new package element |
| Message-ID | <ruXRa-6ki-31@gated-at.bofh.it> |
| In reply to | #1393965 |
From: Bob Moore <robert.moore@intel.com>
ACPICA commit 3451e6d49d37919c13ec2c0019a31534b0dfc0c0
One integer was added at the end of the _BIX method, and the
version number was incremented.
Link: https://github.com/acpica/acpica/commit/3451e6d4
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
drivers/acpi/acpica/acpredef.h | 5 ++-
drivers/acpi/acpica/nsprepkg.c | 86 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 4ca426b..888440b 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -129,7 +129,8 @@ enum acpi_return_package_types {
ACPI_PTYPE2_REV_FIXED = 9,
ACPI_PTYPE2_FIX_VAR = 10,
ACPI_PTYPE2_VAR_VAR = 11,
- ACPI_PTYPE2_UUID_PAIR = 12
+ ACPI_PTYPE2_UUID_PAIR = 12,
+ ACPI_PTYPE_CUSTOM = 13
};
/* Support macros for users of the predefined info table */
@@ -340,7 +341,7 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
{{"_BIX", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (16 Int),(4 Str) */
- PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,
+ PACKAGE_INFO(ACPI_PTYPE_CUSTOM, ACPI_RTYPE_INTEGER, 16,
ACPI_RTYPE_STRING, 4, 0),
{{"_BLT",
diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
index fde5a09..fbedc6e 100644
--- a/drivers/acpi/acpica/nsprepkg.c
+++ b/drivers/acpi/acpica/nsprepkg.c
@@ -62,6 +62,10 @@ acpi_ns_check_package_elements(struct acpi_evaluate_info *info,
u32 count1,
u8 type2, u32 count2, u32 start_index);
+static acpi_status
+acpi_ns_custom_package(struct acpi_evaluate_info *info,
+ union acpi_operand_object **elements, u32 count);
+
/*******************************************************************************
*
* FUNCTION: acpi_ns_check_package
@@ -135,6 +139,11 @@ acpi_ns_check_package(struct acpi_evaluate_info *info,
* PTYPE2 packages contain subpackages
*/
switch (package->ret_info.type) {
+ case ACPI_PTYPE_CUSTOM:
+
+ status = acpi_ns_custom_package(info, elements, count);
+ break;
+
case ACPI_PTYPE1_FIXED:
/*
* The package count is fixed and there are no subpackages
@@ -626,6 +635,83 @@ package_too_small:
/*******************************************************************************
*
+ * FUNCTION: acpi_ns_custom_package
+ *
+ * PARAMETERS: info - Method execution information block
+ * elements - Pointer to the package elements array
+ * count - Element count for the package
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Check a returned package object for the correct count and
+ * correct type of all sub-objects.
+ *
+ * NOTE: Currently used for the _BIX method only. When needed for two or more
+ * methods, probably a detect/dispatch mechanism will be required.
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ns_custom_package(struct acpi_evaluate_info *info,
+ union acpi_operand_object **elements, u32 count)
+{
+ u32 expected_count;
+ u32 version;
+ acpi_status status = AE_OK;
+
+ ACPI_FUNCTION_NAME(ns_custom_package);
+
+ /* Get version number, must be Integer */
+
+ if ((*elements)->common.type != ACPI_TYPE_INTEGER) {
+ ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+ info->node_flags,
+ "Return Package has invalid object type for version number"));
+ return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
+ }
+
+ version = (u32)(*elements)->integer.value;
+ expected_count = 21; /* Version 1 */
+
+ if (version == 0) {
+ expected_count = 20; /* Version 0 */
+ }
+
+ if (count < expected_count) {
+ ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+ info->node_flags,
+ "Return Package is too small - found %u elements, expected %u",
+ count, expected_count));
+ return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
+ } else if (count > expected_count) {
+ ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
+ "%s: Return Package is larger than needed - "
+ "found %u, expected %u\n",
+ info->full_pathname, count, expected_count));
+ }
+
+ /* Validate all elements of the returned package */
+
+ status = acpi_ns_check_package_elements(info, elements,
+ ACPI_RTYPE_INTEGER, 16,
+ ACPI_RTYPE_STRING, 4, 0);
+ if (ACPI_FAILURE(status)) {
+ return_ACPI_STATUS(status);
+ }
+
+ /* Version 1 has a single trailing integer */
+
+ if (version > 0) {
+ status = acpi_ns_check_package_elements(info, elements + 20,
+ ACPI_RTYPE_INTEGER, 1,
+ 0, 0, 20);
+ }
+
+ return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
* FUNCTION: acpi_ns_check_package_elements
*
* PARAMETERS: info - Method execution information block
--
1.7.10
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-04 07:50 +0200 |
| Subject | [PATCH 09/15] ACPICA: Utilities: Add ACPI_IS_ALIGNED() macro |
| Message-ID | <ruXRa-6ki-39@gated-at.bofh.it> |
| In reply to | #1393965 |
This patch introduces ACPI_IS_ALIGNED() macro. Lv Zheng. Signed-off-by: Lv Zheng <lv.zheng@intel.com> --- drivers/acpi/acpica/acmacros.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h index 73f6653..ecbaaba 100644 --- a/drivers/acpi/acpica/acmacros.h +++ b/drivers/acpi/acpica/acmacros.h @@ -262,7 +262,8 @@ /* Generic (power-of-two) rounding */ -#define ACPI_IS_POWER_OF_TWO(a) (((a) & ((a) - 1)) == 0) +#define ACPI_IS_ALIGNED(a, s) (((a) & ((s) - 1)) == 0) +#define ACPI_IS_POWER_OF_TWO(a) ACPI_IS_ALIGNED(a, a) /* * Bitmask creation -- 1.7.10
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-04 07:50 +0200 |
| Subject | [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release |
| Message-ID | <ruXRa-6ki-35@gated-at.bofh.it> |
| In reply to | #1393965 |
The patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20160422 release can be
applied with reduced human intervention.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
drivers/acpi/acpica/aclocal.h | 2 +-
drivers/acpi/acpica/acresrc.h | 2 +-
drivers/acpi/acpica/actables.h | 2 +-
drivers/acpi/acpica/dsfield.c | 4 ++--
drivers/acpi/acpica/dswstate.c | 2 +-
drivers/acpi/acpica/exconfig.c | 2 +-
drivers/acpi/acpica/exregion.c | 2 +-
drivers/acpi/acpica/exresop.c | 2 +-
drivers/acpi/acpica/hwgpe.c | 10 +++++-----
drivers/acpi/acpica/hwregs.c | 4 ++--
drivers/acpi/acpica/hwxface.c | 2 +-
drivers/acpi/acpica/nspredef.c | 2 +-
drivers/acpi/acpica/nsxfname.c | 2 +-
drivers/acpi/acpica/rscalc.c | 2 +-
drivers/acpi/acpica/tbxface.c | 2 +-
drivers/acpi/acpica/utcopy.c | 8 ++++----
drivers/acpi/acpica/utlock.c | 4 ++--
drivers/acpi/acpica/utmath.c | 4 ++--
include/acpi/acpiosxf.h | 2 +-
19 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
index 083b16a..379797e 100644
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
@@ -541,7 +541,7 @@ struct acpi_gpe_device_info {
typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *
gpe_xrupt_info,
- struct acpi_gpe_block_info *gpe_block,
+ struct acpi_gpe_block_info * gpe_block,
void *context);
/* Information about each particular fixed event */
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index 83e9a29..baacde8 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -223,7 +223,7 @@ acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
* rscalc
*/
acpi_status
-acpi_rs_get_list_length(u8 * aml_buffer,
+acpi_rs_get_list_length(u8 *aml_buffer,
u32 aml_buffer_length, acpi_size * size_needed);
acpi_status
diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
index 848ad3a..fa81099 100644
--- a/drivers/acpi/acpica/actables.h
+++ b/drivers/acpi/acpica/actables.h
@@ -131,7 +131,7 @@ acpi_status acpi_tb_allocate_owner_id(u32 table_index);
acpi_status acpi_tb_release_owner_id(u32 table_index);
-acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *owner_id);
+acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id * owner_id);
/*
* tbutils - table manager utilities
diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index 6a4b603..0cd777f 100644
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -147,8 +147,8 @@ acpi_ds_create_external_region(acpi_status lookup_status,
******************************************************************************/
acpi_status
-acpi_ds_create_buffer_field(union acpi_parse_object *op,
- struct acpi_walk_state *walk_state)
+acpi_ds_create_buffer_field(union acpi_parse_object * op,
+ struct acpi_walk_state * walk_state)
{
union acpi_parse_object *arg;
struct acpi_namespace_node *node;
diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
index 3a26ddb..6ec8dca 100644
--- a/drivers/acpi/acpica/dswstate.c
+++ b/drivers/acpi/acpica/dswstate.c
@@ -143,7 +143,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
******************************************************************************/
acpi_status
-acpi_ds_result_push(union acpi_operand_object * object,
+acpi_ds_result_push(union acpi_operand_object *object,
struct acpi_walk_state * walk_state)
{
union acpi_generic_state *state;
diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
index a1d177d..03d2eb0 100644
--- a/drivers/acpi/acpica/exconfig.c
+++ b/drivers/acpi/acpica/exconfig.c
@@ -334,7 +334,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
acpi_status
acpi_ex_load_op(union acpi_operand_object *obj_desc,
union acpi_operand_object *target,
- struct acpi_walk_state *walk_state)
+ struct acpi_walk_state * walk_state)
{
union acpi_operand_object *ddb_handle;
struct acpi_table_header *table_header;
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 076074d..3bcea59 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -333,7 +333,7 @@ acpi_ex_system_io_space_handler(u32 function,
case ACPI_WRITE:
status = acpi_hw_write_port((acpi_io_address) address,
- (u32) * value, bit_width);
+ (u32)*value, bit_width);
break;
default:
diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
index cc2c26c..da6bf0e 100644
--- a/drivers/acpi/acpica/exresop.c
+++ b/drivers/acpi/acpica/exresop.c
@@ -131,7 +131,7 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
acpi_status
acpi_ex_resolve_operands(u16 opcode,
- union acpi_operand_object ** stack_ptr,
+ union acpi_operand_object **stack_ptr,
struct acpi_walk_state * walk_state)
{
union acpi_operand_object *obj_desc;
diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
index 1c4f451..8cc5cc0 100644
--- a/drivers/acpi/acpica/hwgpe.c
+++ b/drivers/acpi/acpica/hwgpe.c
@@ -315,8 +315,8 @@ acpi_hw_gpe_enable_write(u8 enable_mask,
******************************************************************************/
acpi_status
-acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
- struct acpi_gpe_block_info *gpe_block, void *context)
+acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
+ struct acpi_gpe_block_info * gpe_block, void *context)
{
u32 i;
acpi_status status;
@@ -352,8 +352,8 @@ acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
******************************************************************************/
acpi_status
-acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
- struct acpi_gpe_block_info *gpe_block, void *context)
+acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
+ struct acpi_gpe_block_info * gpe_block, void *context)
{
u32 i;
acpi_status status;
@@ -390,7 +390,7 @@ acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
******************************************************************************/
acpi_status
-acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
+acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
struct acpi_gpe_block_info * gpe_block,
void *context)
{
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 035fb52..65b300d 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -157,7 +157,7 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
*
******************************************************************************/
-acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
+acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address * reg)
{
u64 address;
u64 value64;
@@ -214,7 +214,7 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
*
******************************************************************************/
-acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
+acpi_status acpi_hw_write(u32 value, struct acpi_generic_address * reg)
{
u64 address;
acpi_status status;
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index 7caaaf3..312769d 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -212,7 +212,7 @@ ACPI_EXPORT_SYMBOL(acpi_read)
* DESCRIPTION: Write to either memory or IO space.
*
******************************************************************************/
-acpi_status acpi_write(u64 value, struct acpi_generic_address *reg)
+acpi_status acpi_write(u64 value, struct acpi_generic_address * reg)
{
u32 width;
u64 address;
diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
index 6d78445..bd7ddcc 100644
--- a/drivers/acpi/acpica/nspredef.c
+++ b/drivers/acpi/acpica/nspredef.c
@@ -220,7 +220,7 @@ exit:
******************************************************************************/
acpi_status
-acpi_ns_check_object_type(struct acpi_evaluate_info *info,
+acpi_ns_check_object_type(struct acpi_evaluate_info * info,
union acpi_operand_object **return_object_ptr,
u32 expected_btypes, u32 package_index)
{
diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
index 285b820..41f97e8 100644
--- a/drivers/acpi/acpica/nsxfname.c
+++ b/drivers/acpi/acpica/nsxfname.c
@@ -278,7 +278,7 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
acpi_status
acpi_get_object_info(acpi_handle handle,
- struct acpi_device_info **return_buffer)
+ struct acpi_device_info ** return_buffer)
{
struct acpi_namespace_node *node;
struct acpi_device_info *info;
diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
index 2b1209d..8763ce6 100644
--- a/drivers/acpi/acpica/rscalc.c
+++ b/drivers/acpi/acpica/rscalc.c
@@ -397,7 +397,7 @@ acpi_rs_get_aml_length(struct acpi_resource *resource,
******************************************************************************/
acpi_status
-acpi_rs_get_list_length(u8 * aml_buffer,
+acpi_rs_get_list_length(u8 *aml_buffer,
u32 aml_buffer_length, acpi_size * size_needed)
{
acpi_status status;
diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 326df65..72a239e 100644
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -328,7 +328,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_with_size)
acpi_status
acpi_get_table(char *signature,
- u32 instance, struct acpi_table_header **out_table)
+ u32 instance, struct acpi_table_header ** out_table)
{
acpi_size tbl_size;
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
index 98d53e5..5ba8cb8 100644
--- a/drivers/acpi/acpica/utcopy.c
+++ b/drivers/acpi/acpica/utcopy.c
@@ -53,7 +53,7 @@ ACPI_MODULE_NAME("utcopy")
static acpi_status
acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
union acpi_object *external_object,
- u8 * data_space, acpi_size * buffer_space_used);
+ u8 *data_space, acpi_size * buffer_space_used);
static acpi_status
acpi_ut_copy_ielement_to_ielement(u8 object_type,
@@ -63,7 +63,7 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
static acpi_status
acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,
- u8 * buffer, acpi_size * space_used);
+ u8 *buffer, acpi_size * space_used);
static acpi_status
acpi_ut_copy_esimple_to_isimple(union acpi_object *user_obj,
@@ -111,7 +111,7 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
static acpi_status
acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
union acpi_object *external_object,
- u8 * data_space, acpi_size * buffer_space_used)
+ u8 *data_space, acpi_size * buffer_space_used)
{
acpi_status status = AE_OK;
@@ -331,7 +331,7 @@ acpi_ut_copy_ielement_to_eelement(u8 object_type,
static acpi_status
acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,
- u8 * buffer, acpi_size * space_used)
+ u8 *buffer, acpi_size * space_used)
{
union acpi_object *external_object;
acpi_status status;
diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c
index 3cd0978..9cc64b6 100644
--- a/drivers/acpi/acpica/utlock.c
+++ b/drivers/acpi/acpica/utlock.c
@@ -124,7 +124,7 @@ acpi_status acpi_ut_acquire_read_lock(struct acpi_rw_lock *lock)
return (status);
}
-acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
+acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock * lock)
{
acpi_status status;
@@ -160,7 +160,7 @@ acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
*
******************************************************************************/
-acpi_status acpi_ut_acquire_write_lock(struct acpi_rw_lock *lock)
+acpi_status acpi_ut_acquire_write_lock(struct acpi_rw_lock * lock)
{
acpi_status status;
diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
index 6673720..2fbc682 100644
--- a/drivers/acpi/acpica/utmath.c
+++ b/drivers/acpi/acpica/utmath.c
@@ -236,8 +236,8 @@ acpi_ut_divide(u64 in_dividend,
}
remainder.full = remainder.full - dividend.full;
- remainder.part.hi = (u32) - ((s32) remainder.part.hi);
- remainder.part.lo = (u32) - ((s32) remainder.part.lo);
+ remainder.part.hi = (u32)-((s32) remainder.part.hi);
+ remainder.part.lo = (u32)-((s32) remainder.part.lo);
if (remainder.part.lo) {
remainder.part.hi--;
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 6026308..dfdcf5a 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -96,7 +96,7 @@ acpi_physical_address acpi_os_get_root_pointer(void);
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override
acpi_status
acpi_os_predefined_override(const struct acpi_predefined_names *init_val,
- acpi_string *new_val);
+ acpi_string * new_val);
#endif
#ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override
--
1.7.10
[toc] | [prev] | [next] | [standalone]
| From | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| Date | 2016-05-04 23:40 +0200 |
| Subject | Re: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release |
| Message-ID | <rvcGu-3hG-17@gated-at.bofh.it> |
| In reply to | #1393970 |
On Wednesday, May 04, 2016 01:48:07 PM Lv Zheng wrote:
> The patch reduces source code differences between the Linux kernel and the
> ACPICA upstream so that the linuxized ACPICA 20160422 release can be
> applied with reduced human intervention.
>
> Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Like previously, this adds white space where it shouldn't.
> ---
> drivers/acpi/acpica/aclocal.h | 2 +-
> drivers/acpi/acpica/acresrc.h | 2 +-
> drivers/acpi/acpica/actables.h | 2 +-
> drivers/acpi/acpica/dsfield.c | 4 ++--
> drivers/acpi/acpica/dswstate.c | 2 +-
> drivers/acpi/acpica/exconfig.c | 2 +-
> drivers/acpi/acpica/exregion.c | 2 +-
> drivers/acpi/acpica/exresop.c | 2 +-
> drivers/acpi/acpica/hwgpe.c | 10 +++++-----
> drivers/acpi/acpica/hwregs.c | 4 ++--
> drivers/acpi/acpica/hwxface.c | 2 +-
> drivers/acpi/acpica/nspredef.c | 2 +-
> drivers/acpi/acpica/nsxfname.c | 2 +-
> drivers/acpi/acpica/rscalc.c | 2 +-
> drivers/acpi/acpica/tbxface.c | 2 +-
> drivers/acpi/acpica/utcopy.c | 8 ++++----
> drivers/acpi/acpica/utlock.c | 4 ++--
> drivers/acpi/acpica/utmath.c | 4 ++--
> include/acpi/acpiosxf.h | 2 +-
> 19 files changed, 30 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
> index 083b16a..379797e 100644
> --- a/drivers/acpi/acpica/aclocal.h
> +++ b/drivers/acpi/acpica/aclocal.h
> @@ -541,7 +541,7 @@ struct acpi_gpe_device_info {
>
> typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *
> gpe_xrupt_info,
> - struct acpi_gpe_block_info *gpe_block,
> + struct acpi_gpe_block_info * gpe_block,
> void *context);
No, please don't add that white space.
> /* Information about each particular fixed event */
> diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
> index 83e9a29..baacde8 100644
> --- a/drivers/acpi/acpica/acresrc.h
> +++ b/drivers/acpi/acpica/acresrc.h
> @@ -223,7 +223,7 @@ acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
> * rscalc
> */
> acpi_status
> -acpi_rs_get_list_length(u8 * aml_buffer,
> +acpi_rs_get_list_length(u8 *aml_buffer,
> u32 aml_buffer_length, acpi_size * size_needed);
Why do you fix one and not the other?
>
> acpi_status
> diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
> index 848ad3a..fa81099 100644
> --- a/drivers/acpi/acpica/actables.h
> +++ b/drivers/acpi/acpica/actables.h
> @@ -131,7 +131,7 @@ acpi_status acpi_tb_allocate_owner_id(u32 table_index);
>
> acpi_status acpi_tb_release_owner_id(u32 table_index);
>
> -acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *owner_id);
> +acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id * owner_id);
The added white space does not adhere to the kernel coding style.
> /*
> * tbutils - table manager utilities
> diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
> index 6a4b603..0cd777f 100644
> --- a/drivers/acpi/acpica/dsfield.c
> +++ b/drivers/acpi/acpica/dsfield.c
> @@ -147,8 +147,8 @@ acpi_ds_create_external_region(acpi_status lookup_status,
> ******************************************************************************/
>
> acpi_status
> -acpi_ds_create_buffer_field(union acpi_parse_object *op,
> - struct acpi_walk_state *walk_state)
> +acpi_ds_create_buffer_field(union acpi_parse_object * op,
> + struct acpi_walk_state * walk_state)
Same here.
> {
> union acpi_parse_object *arg;
> struct acpi_namespace_node *node;
> diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
> index 3a26ddb..6ec8dca 100644
> --- a/drivers/acpi/acpica/dswstate.c
> +++ b/drivers/acpi/acpica/dswstate.c
> @@ -143,7 +143,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
> ******************************************************************************/
>
> acpi_status
> -acpi_ds_result_push(union acpi_operand_object * object,
> +acpi_ds_result_push(union acpi_operand_object *object,
> struct acpi_walk_state * walk_state)
Why do you fix one and not the other?
> {
> union acpi_generic_state *state;
> diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
> index a1d177d..03d2eb0 100644
> --- a/drivers/acpi/acpica/exconfig.c
> +++ b/drivers/acpi/acpica/exconfig.c
> @@ -334,7 +334,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
> acpi_status
> acpi_ex_load_op(union acpi_operand_object *obj_desc,
> union acpi_operand_object *target,
> - struct acpi_walk_state *walk_state)
> + struct acpi_walk_state * walk_state)
More damaged white space.
> {
> union acpi_operand_object *ddb_handle;
> struct acpi_table_header *table_header;
> diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
> index 076074d..3bcea59 100644
> --- a/drivers/acpi/acpica/exregion.c
> +++ b/drivers/acpi/acpica/exregion.c
> @@ -333,7 +333,7 @@ acpi_ex_system_io_space_handler(u32 function,
> case ACPI_WRITE:
>
> status = acpi_hw_write_port((acpi_io_address) address,
> - (u32) * value, bit_width);
> + (u32)*value, bit_width);
> break;
>
> default:
> diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
> index cc2c26c..da6bf0e 100644
> --- a/drivers/acpi/acpica/exresop.c
> +++ b/drivers/acpi/acpica/exresop.c
> @@ -131,7 +131,7 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
>
> acpi_status
> acpi_ex_resolve_operands(u16 opcode,
> - union acpi_operand_object ** stack_ptr,
> + union acpi_operand_object **stack_ptr,
> struct acpi_walk_state * walk_state)
Why do you fix one and not the other?
> {
> union acpi_operand_object *obj_desc;
> diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
> index 1c4f451..8cc5cc0 100644
> --- a/drivers/acpi/acpica/hwgpe.c
> +++ b/drivers/acpi/acpica/hwgpe.c
> @@ -315,8 +315,8 @@ acpi_hw_gpe_enable_write(u8 enable_mask,
> ******************************************************************************/
>
> acpi_status
> -acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
> - struct acpi_gpe_block_info *gpe_block, void *context)
> +acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
> + struct acpi_gpe_block_info * gpe_block, void *context)
More damaged white space.
And analogously below.
I'm assuming that the rest of the series won't apply without this patch,
so I'm not going to try to apply it.
Please revise and resend.
Thanks,
Rafael
> {
> u32 i;
> acpi_status status;
> @@ -352,8 +352,8 @@ acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
> ******************************************************************************/
>
> acpi_status
> -acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
> - struct acpi_gpe_block_info *gpe_block, void *context)
> +acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
> + struct acpi_gpe_block_info * gpe_block, void *context)
> {
> u32 i;
> acpi_status status;
> @@ -390,7 +390,7 @@ acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
> ******************************************************************************/
>
> acpi_status
> -acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
> +acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
> struct acpi_gpe_block_info * gpe_block,
> void *context)
> {
> diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
> index 035fb52..65b300d 100644
> --- a/drivers/acpi/acpica/hwregs.c
> +++ b/drivers/acpi/acpica/hwregs.c
> @@ -157,7 +157,7 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
> *
> ******************************************************************************/
>
> -acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
> +acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address * reg)
> {
> u64 address;
> u64 value64;
> @@ -214,7 +214,7 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
> *
> ******************************************************************************/
>
> -acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
> +acpi_status acpi_hw_write(u32 value, struct acpi_generic_address * reg)
> {
> u64 address;
> acpi_status status;
> diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
> index 7caaaf3..312769d 100644
> --- a/drivers/acpi/acpica/hwxface.c
> +++ b/drivers/acpi/acpica/hwxface.c
> @@ -212,7 +212,7 @@ ACPI_EXPORT_SYMBOL(acpi_read)
> * DESCRIPTION: Write to either memory or IO space.
> *
> ******************************************************************************/
> -acpi_status acpi_write(u64 value, struct acpi_generic_address *reg)
> +acpi_status acpi_write(u64 value, struct acpi_generic_address * reg)
> {
> u32 width;
> u64 address;
> diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
> index 6d78445..bd7ddcc 100644
> --- a/drivers/acpi/acpica/nspredef.c
> +++ b/drivers/acpi/acpica/nspredef.c
> @@ -220,7 +220,7 @@ exit:
> ******************************************************************************/
>
> acpi_status
> -acpi_ns_check_object_type(struct acpi_evaluate_info *info,
> +acpi_ns_check_object_type(struct acpi_evaluate_info * info,
> union acpi_operand_object **return_object_ptr,
> u32 expected_btypes, u32 package_index)
> {
> diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
> index 285b820..41f97e8 100644
> --- a/drivers/acpi/acpica/nsxfname.c
> +++ b/drivers/acpi/acpica/nsxfname.c
> @@ -278,7 +278,7 @@ static char *acpi_ns_copy_device_id(struct acpi_pnp_device_id *dest,
>
> acpi_status
> acpi_get_object_info(acpi_handle handle,
> - struct acpi_device_info **return_buffer)
> + struct acpi_device_info ** return_buffer)
> {
> struct acpi_namespace_node *node;
> struct acpi_device_info *info;
> diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
> index 2b1209d..8763ce6 100644
> --- a/drivers/acpi/acpica/rscalc.c
> +++ b/drivers/acpi/acpica/rscalc.c
> @@ -397,7 +397,7 @@ acpi_rs_get_aml_length(struct acpi_resource *resource,
> ******************************************************************************/
>
> acpi_status
> -acpi_rs_get_list_length(u8 * aml_buffer,
> +acpi_rs_get_list_length(u8 *aml_buffer,
> u32 aml_buffer_length, acpi_size * size_needed)
> {
> acpi_status status;
> diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
> index 326df65..72a239e 100644
> --- a/drivers/acpi/acpica/tbxface.c
> +++ b/drivers/acpi/acpica/tbxface.c
> @@ -328,7 +328,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_with_size)
>
> acpi_status
> acpi_get_table(char *signature,
> - u32 instance, struct acpi_table_header **out_table)
> + u32 instance, struct acpi_table_header ** out_table)
> {
> acpi_size tbl_size;
>
> diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
> index 98d53e5..5ba8cb8 100644
> --- a/drivers/acpi/acpica/utcopy.c
> +++ b/drivers/acpi/acpica/utcopy.c
> @@ -53,7 +53,7 @@ ACPI_MODULE_NAME("utcopy")
> static acpi_status
> acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
> union acpi_object *external_object,
> - u8 * data_space, acpi_size * buffer_space_used);
> + u8 *data_space, acpi_size * buffer_space_used);
>
> static acpi_status
> acpi_ut_copy_ielement_to_ielement(u8 object_type,
> @@ -63,7 +63,7 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
>
> static acpi_status
> acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,
> - u8 * buffer, acpi_size * space_used);
> + u8 *buffer, acpi_size * space_used);
>
> static acpi_status
> acpi_ut_copy_esimple_to_isimple(union acpi_object *user_obj,
> @@ -111,7 +111,7 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj,
> static acpi_status
> acpi_ut_copy_isimple_to_esimple(union acpi_operand_object *internal_object,
> union acpi_object *external_object,
> - u8 * data_space, acpi_size * buffer_space_used)
> + u8 *data_space, acpi_size * buffer_space_used)
> {
> acpi_status status = AE_OK;
>
> @@ -331,7 +331,7 @@ acpi_ut_copy_ielement_to_eelement(u8 object_type,
>
> static acpi_status
> acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object *internal_object,
> - u8 * buffer, acpi_size * space_used)
> + u8 *buffer, acpi_size * space_used)
> {
> union acpi_object *external_object;
> acpi_status status;
> diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c
> index 3cd0978..9cc64b6 100644
> --- a/drivers/acpi/acpica/utlock.c
> +++ b/drivers/acpi/acpica/utlock.c
> @@ -124,7 +124,7 @@ acpi_status acpi_ut_acquire_read_lock(struct acpi_rw_lock *lock)
> return (status);
> }
>
> -acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
> +acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock * lock)
> {
> acpi_status status;
>
> @@ -160,7 +160,7 @@ acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
> *
> ******************************************************************************/
>
> -acpi_status acpi_ut_acquire_write_lock(struct acpi_rw_lock *lock)
> +acpi_status acpi_ut_acquire_write_lock(struct acpi_rw_lock * lock)
> {
> acpi_status status;
>
> diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
> index 6673720..2fbc682 100644
> --- a/drivers/acpi/acpica/utmath.c
> +++ b/drivers/acpi/acpica/utmath.c
> @@ -236,8 +236,8 @@ acpi_ut_divide(u64 in_dividend,
> }
>
> remainder.full = remainder.full - dividend.full;
> - remainder.part.hi = (u32) - ((s32) remainder.part.hi);
> - remainder.part.lo = (u32) - ((s32) remainder.part.lo);
> + remainder.part.hi = (u32)-((s32) remainder.part.hi);
> + remainder.part.lo = (u32)-((s32) remainder.part.lo);
>
> if (remainder.part.lo) {
> remainder.part.hi--;
> diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
> index 6026308..dfdcf5a 100644
> --- a/include/acpi/acpiosxf.h
> +++ b/include/acpi/acpiosxf.h
> @@ -96,7 +96,7 @@ acpi_physical_address acpi_os_get_root_pointer(void);
> #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override
> acpi_status
> acpi_os_predefined_override(const struct acpi_predefined_names *init_val,
> - acpi_string *new_val);
> + acpi_string * new_val);
> #endif
>
> #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override
>
[toc] | [prev] | [next] | [standalone]
| From | "Rafael J. Wysocki" <rjw@rjwysocki.net> |
|---|---|
| Date | 2016-05-04 23:40 +0200 |
| Subject | Re: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release |
| Message-ID | <rvcGu-3hG-25@gated-at.bofh.it> |
| In reply to | #1394731 |
On Wednesday, May 04, 2016 11:37:51 PM Rafael J. Wysocki wrote:
> On Wednesday, May 04, 2016 01:48:07 PM Lv Zheng wrote:
> > The patch reduces source code differences between the Linux kernel and the
> > ACPICA upstream so that the linuxized ACPICA 20160422 release can be
> > applied with reduced human intervention.
> >
> > Signed-off-by: Lv Zheng <lv.zheng@intel.com>
>
> Like previously, this adds white space where it shouldn't.
>
> > ---
> > drivers/acpi/acpica/aclocal.h | 2 +-
> > drivers/acpi/acpica/acresrc.h | 2 +-
> > drivers/acpi/acpica/actables.h | 2 +-
> > drivers/acpi/acpica/dsfield.c | 4 ++--
> > drivers/acpi/acpica/dswstate.c | 2 +-
> > drivers/acpi/acpica/exconfig.c | 2 +-
> > drivers/acpi/acpica/exregion.c | 2 +-
> > drivers/acpi/acpica/exresop.c | 2 +-
> > drivers/acpi/acpica/hwgpe.c | 10 +++++-----
> > drivers/acpi/acpica/hwregs.c | 4 ++--
> > drivers/acpi/acpica/hwxface.c | 2 +-
> > drivers/acpi/acpica/nspredef.c | 2 +-
> > drivers/acpi/acpica/nsxfname.c | 2 +-
> > drivers/acpi/acpica/rscalc.c | 2 +-
> > drivers/acpi/acpica/tbxface.c | 2 +-
> > drivers/acpi/acpica/utcopy.c | 8 ++++----
> > drivers/acpi/acpica/utlock.c | 4 ++--
> > drivers/acpi/acpica/utmath.c | 4 ++--
> > include/acpi/acpiosxf.h | 2 +-
> > 19 files changed, 30 insertions(+), 30 deletions(-)
> >
> > diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
> > index 083b16a..379797e 100644
> > --- a/drivers/acpi/acpica/aclocal.h
> > +++ b/drivers/acpi/acpica/aclocal.h
> > @@ -541,7 +541,7 @@ struct acpi_gpe_device_info {
> >
> > typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *
> > gpe_xrupt_info,
> > - struct acpi_gpe_block_info *gpe_block,
> > + struct acpi_gpe_block_info * gpe_block,
> > void *context);
>
> No, please don't add that white space.
>
> > /* Information about each particular fixed event */
> > diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
> > index 83e9a29..baacde8 100644
> > --- a/drivers/acpi/acpica/acresrc.h
> > +++ b/drivers/acpi/acpica/acresrc.h
> > @@ -223,7 +223,7 @@ acpi_rs_get_aei_method_data(struct acpi_namespace_node *node,
> > * rscalc
> > */
> > acpi_status
> > -acpi_rs_get_list_length(u8 * aml_buffer,
> > +acpi_rs_get_list_length(u8 *aml_buffer,
> > u32 aml_buffer_length, acpi_size * size_needed);
>
> Why do you fix one and not the other?
>
> >
> > acpi_status
> > diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
> > index 848ad3a..fa81099 100644
> > --- a/drivers/acpi/acpica/actables.h
> > +++ b/drivers/acpi/acpica/actables.h
> > @@ -131,7 +131,7 @@ acpi_status acpi_tb_allocate_owner_id(u32 table_index);
> >
> > acpi_status acpi_tb_release_owner_id(u32 table_index);
> >
> > -acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *owner_id);
> > +acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id * owner_id);
>
> The added white space does not adhere to the kernel coding style.
>
> > /*
> > * tbutils - table manager utilities
> > diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
> > index 6a4b603..0cd777f 100644
> > --- a/drivers/acpi/acpica/dsfield.c
> > +++ b/drivers/acpi/acpica/dsfield.c
> > @@ -147,8 +147,8 @@ acpi_ds_create_external_region(acpi_status lookup_status,
> > ******************************************************************************/
> >
> > acpi_status
> > -acpi_ds_create_buffer_field(union acpi_parse_object *op,
> > - struct acpi_walk_state *walk_state)
> > +acpi_ds_create_buffer_field(union acpi_parse_object * op,
> > + struct acpi_walk_state * walk_state)
>
> Same here.
>
> > {
> > union acpi_parse_object *arg;
> > struct acpi_namespace_node *node;
> > diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
> > index 3a26ddb..6ec8dca 100644
> > --- a/drivers/acpi/acpica/dswstate.c
> > +++ b/drivers/acpi/acpica/dswstate.c
> > @@ -143,7 +143,7 @@ acpi_ds_result_pop(union acpi_operand_object **object,
> > ******************************************************************************/
> >
> > acpi_status
> > -acpi_ds_result_push(union acpi_operand_object * object,
> > +acpi_ds_result_push(union acpi_operand_object *object,
> > struct acpi_walk_state * walk_state)
>
> Why do you fix one and not the other?
>
> > {
> > union acpi_generic_state *state;
> > diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
> > index a1d177d..03d2eb0 100644
> > --- a/drivers/acpi/acpica/exconfig.c
> > +++ b/drivers/acpi/acpica/exconfig.c
> > @@ -334,7 +334,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
> > acpi_status
> > acpi_ex_load_op(union acpi_operand_object *obj_desc,
> > union acpi_operand_object *target,
> > - struct acpi_walk_state *walk_state)
> > + struct acpi_walk_state * walk_state)
>
> More damaged white space.
>
> > {
> > union acpi_operand_object *ddb_handle;
> > struct acpi_table_header *table_header;
> > diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
> > index 076074d..3bcea59 100644
> > --- a/drivers/acpi/acpica/exregion.c
> > +++ b/drivers/acpi/acpica/exregion.c
> > @@ -333,7 +333,7 @@ acpi_ex_system_io_space_handler(u32 function,
> > case ACPI_WRITE:
> >
> > status = acpi_hw_write_port((acpi_io_address) address,
> > - (u32) * value, bit_width);
> > + (u32)*value, bit_width);
> > break;
> >
> > default:
> > diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
> > index cc2c26c..da6bf0e 100644
> > --- a/drivers/acpi/acpica/exresop.c
> > +++ b/drivers/acpi/acpica/exresop.c
> > @@ -131,7 +131,7 @@ acpi_ex_check_object_type(acpi_object_type type_needed,
> >
> > acpi_status
> > acpi_ex_resolve_operands(u16 opcode,
> > - union acpi_operand_object ** stack_ptr,
> > + union acpi_operand_object **stack_ptr,
> > struct acpi_walk_state * walk_state)
>
> Why do you fix one and not the other?
>
> > {
> > union acpi_operand_object *obj_desc;
> > diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
> > index 1c4f451..8cc5cc0 100644
> > --- a/drivers/acpi/acpica/hwgpe.c
> > +++ b/drivers/acpi/acpica/hwgpe.c
> > @@ -315,8 +315,8 @@ acpi_hw_gpe_enable_write(u8 enable_mask,
> > ******************************************************************************/
> >
> > acpi_status
> > -acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
> > - struct acpi_gpe_block_info *gpe_block, void *context)
> > +acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
> > + struct acpi_gpe_block_info * gpe_block, void *context)
>
> More damaged white space.
>
> And analogously below.
>
> I'm assuming that the rest of the series won't apply without this patch,
> so I'm not going to try to apply it.
>
> Please revise and resend.
Of course, patch [8/15] has been applied already, so no need to resend it.
Thanks,
Rafael
[toc] | [prev] | [next] | [standalone]
| From | "Zheng, Lv" <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-05 04:20 +0200 |
| Subject | RE: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release |
| Message-ID | <rvh3s-7GB-11@gated-at.bofh.it> |
| In reply to | #1394732 |
Hi,
> From: linux-acpi-owner@vger.kernel.org [mailto:linux-acpi-
> owner@vger.kernel.org] On Behalf Of Rafael J. Wysocki
> Subject: Re: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422
> release
>
> On Wednesday, May 04, 2016 11:37:51 PM Rafael J. Wysocki wrote:
> > On Wednesday, May 04, 2016 01:48:07 PM Lv Zheng wrote:
> > > The patch reduces source code differences between the Linux kernel and
> the
> > > ACPICA upstream so that the linuxized ACPICA 20160422 release can be
> > > applied with reduced human intervention.
> > >
> > > Signed-off-by: Lv Zheng <lv.zheng@intel.com>
> >
> > Like previously, this adds white space where it shouldn't.
> >
> > > ---
> > > drivers/acpi/acpica/aclocal.h | 2 +-
> > > drivers/acpi/acpica/acresrc.h | 2 +-
> > > drivers/acpi/acpica/actables.h | 2 +-
> > > drivers/acpi/acpica/dsfield.c | 4 ++--
> > > drivers/acpi/acpica/dswstate.c | 2 +-
> > > drivers/acpi/acpica/exconfig.c | 2 +-
> > > drivers/acpi/acpica/exregion.c | 2 +-
> > > drivers/acpi/acpica/exresop.c | 2 +-
> > > drivers/acpi/acpica/hwgpe.c | 10 +++++-----
> > > drivers/acpi/acpica/hwregs.c | 4 ++--
> > > drivers/acpi/acpica/hwxface.c | 2 +-
> > > drivers/acpi/acpica/nspredef.c | 2 +-
> > > drivers/acpi/acpica/nsxfname.c | 2 +-
> > > drivers/acpi/acpica/rscalc.c | 2 +-
> > > drivers/acpi/acpica/tbxface.c | 2 +-
> > > drivers/acpi/acpica/utcopy.c | 8 ++++----
> > > drivers/acpi/acpica/utlock.c | 4 ++--
> > > drivers/acpi/acpica/utmath.c | 4 ++--
> > > include/acpi/acpiosxf.h | 2 +-
> > > 19 files changed, 30 insertions(+), 30 deletions(-)
> > >
> > > diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
> > > index 083b16a..379797e 100644
> > > --- a/drivers/acpi/acpica/aclocal.h
> > > +++ b/drivers/acpi/acpica/aclocal.h
> > > @@ -541,7 +541,7 @@ struct acpi_gpe_device_info {
> > >
> > > typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *
> > > gpe_xrupt_info,
> > > - struct acpi_gpe_block_info
> *gpe_block,
> > > + struct acpi_gpe_block_info *
> gpe_block,
> > > void *context);
> >
> > No, please don't add that white space.
> >
> > > /* Information about each particular fixed event */
> > > diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
> > > index 83e9a29..baacde8 100644
> > > --- a/drivers/acpi/acpica/acresrc.h
> > > +++ b/drivers/acpi/acpica/acresrc.h
> > > @@ -223,7 +223,7 @@ acpi_rs_get_aei_method_data(struct
> acpi_namespace_node *node,
> > > * rscalc
> > > */
> > > acpi_status
> > > -acpi_rs_get_list_length(u8 * aml_buffer,
> > > +acpi_rs_get_list_length(u8 *aml_buffer,
> > > u32 aml_buffer_length, acpi_size * size_needed);
> >
> > Why do you fix one and not the other?
> >
> > >
> > > acpi_status
> > > diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
> > > index 848ad3a..fa81099 100644
> > > --- a/drivers/acpi/acpica/actables.h
> > > +++ b/drivers/acpi/acpica/actables.h
> > > @@ -131,7 +131,7 @@ acpi_status acpi_tb_allocate_owner_id(u32
> table_index);
> > >
> > > acpi_status acpi_tb_release_owner_id(u32 table_index);
> > >
> > > -acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id
> *owner_id);
> > > +acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *
> owner_id);
> >
> > The added white space does not adhere to the kernel coding style.
> >
> > > /*
> > > * tbutils - table manager utilities
> > > diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
> > > index 6a4b603..0cd777f 100644
> > > --- a/drivers/acpi/acpica/dsfield.c
> > > +++ b/drivers/acpi/acpica/dsfield.c
> > > @@ -147,8 +147,8 @@ acpi_ds_create_external_region(acpi_status
> lookup_status,
> > >
> ****************************************************************
> **************/
> > >
> > > acpi_status
> > > -acpi_ds_create_buffer_field(union acpi_parse_object *op,
> > > - struct acpi_walk_state *walk_state)
> > > +acpi_ds_create_buffer_field(union acpi_parse_object * op,
> > > + struct acpi_walk_state * walk_state)
> >
> > Same here.
> >
> > > {
> > > union acpi_parse_object *arg;
> > > struct acpi_namespace_node *node;
> > > diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
> > > index 3a26ddb..6ec8dca 100644
> > > --- a/drivers/acpi/acpica/dswstate.c
> > > +++ b/drivers/acpi/acpica/dswstate.c
> > > @@ -143,7 +143,7 @@ acpi_ds_result_pop(union acpi_operand_object
> **object,
> > >
> ****************************************************************
> **************/
> > >
> > > acpi_status
> > > -acpi_ds_result_push(union acpi_operand_object * object,
> > > +acpi_ds_result_push(union acpi_operand_object *object,
> > > struct acpi_walk_state * walk_state)
> >
> > Why do you fix one and not the other?
> >
> > > {
> > > union acpi_generic_state *state;
> > > diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
> > > index a1d177d..03d2eb0 100644
> > > --- a/drivers/acpi/acpica/exconfig.c
> > > +++ b/drivers/acpi/acpica/exconfig.c
> > > @@ -334,7 +334,7 @@ acpi_ex_region_read(union acpi_operand_object
> *obj_desc, u32 length, u8 *buffer)
> > > acpi_status
> > > acpi_ex_load_op(union acpi_operand_object *obj_desc,
> > > union acpi_operand_object *target,
> > > - struct acpi_walk_state *walk_state)
> > > + struct acpi_walk_state * walk_state)
> >
> > More damaged white space.
> >
> > > {
> > > union acpi_operand_object *ddb_handle;
> > > struct acpi_table_header *table_header;
> > > diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
> > > index 076074d..3bcea59 100644
> > > --- a/drivers/acpi/acpica/exregion.c
> > > +++ b/drivers/acpi/acpica/exregion.c
> > > @@ -333,7 +333,7 @@ acpi_ex_system_io_space_handler(u32 function,
> > > case ACPI_WRITE:
> > >
> > > status = acpi_hw_write_port((acpi_io_address) address,
> > > - (u32) * value, bit_width);
> > > + (u32)*value, bit_width);
> > > break;
> > >
> > > default:
> > > diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
> > > index cc2c26c..da6bf0e 100644
> > > --- a/drivers/acpi/acpica/exresop.c
> > > +++ b/drivers/acpi/acpica/exresop.c
> > > @@ -131,7 +131,7 @@ acpi_ex_check_object_type(acpi_object_type
> type_needed,
> > >
> > > acpi_status
> > > acpi_ex_resolve_operands(u16 opcode,
> > > - union acpi_operand_object ** stack_ptr,
> > > + union acpi_operand_object **stack_ptr,
> > > struct acpi_walk_state * walk_state)
> >
> > Why do you fix one and not the other?
> >
> > > {
> > > union acpi_operand_object *obj_desc;
> > > diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
> > > index 1c4f451..8cc5cc0 100644
> > > --- a/drivers/acpi/acpica/hwgpe.c
> > > +++ b/drivers/acpi/acpica/hwgpe.c
> > > @@ -315,8 +315,8 @@ acpi_hw_gpe_enable_write(u8 enable_mask,
> > >
> ****************************************************************
> **************/
> > >
> > > acpi_status
> > > -acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
> > > - struct acpi_gpe_block_info *gpe_block, void
> *context)
> > > +acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
> > > + struct acpi_gpe_block_info * gpe_block, void
> *context)
> >
> > More damaged white space.
> >
> > And analogously below.
> >
> > I'm assuming that the rest of the series won't apply without this patch,
> > so I'm not going to try to apply it.
> >
> > Please revise and resend.
>
> Of course, patch [8/15] has been applied already, so no need to resend it.
[Lv Zheng]
OK, I'll drop PATCH 08 from v2.
Thanks and best regards
-Lv
>
> Thanks,
> Rafael
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
[toc] | [prev] | [next] | [standalone]
| From | "Zheng, Lv" <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-05 04:20 +0200 |
| Subject | RE: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422 release |
| Message-ID | <rvh3s-7GB-9@gated-at.bofh.it> |
| In reply to | #1394731 |
Hi,
> From: Rafael J. Wysocki [mailto:rjw@rjwysocki.net]
> Subject: Re: [PATCH 01/15] ACPICA: Linuxize: reduce divergences for 20160422
> release
>
> On Wednesday, May 04, 2016 01:48:07 PM Lv Zheng wrote:
> > The patch reduces source code differences between the Linux kernel and the
> > ACPICA upstream so that the linuxized ACPICA 20160422 release can be
> > applied with reduced human intervention.
> >
> > Signed-off-by: Lv Zheng <lv.zheng@intel.com>
>
> Like previously, this adds white space where it shouldn't.
>
> > ---
> > drivers/acpi/acpica/aclocal.h | 2 +-
> > drivers/acpi/acpica/acresrc.h | 2 +-
> > drivers/acpi/acpica/actables.h | 2 +-
> > drivers/acpi/acpica/dsfield.c | 4 ++--
> > drivers/acpi/acpica/dswstate.c | 2 +-
> > drivers/acpi/acpica/exconfig.c | 2 +-
> > drivers/acpi/acpica/exregion.c | 2 +-
> > drivers/acpi/acpica/exresop.c | 2 +-
> > drivers/acpi/acpica/hwgpe.c | 10 +++++-----
> > drivers/acpi/acpica/hwregs.c | 4 ++--
> > drivers/acpi/acpica/hwxface.c | 2 +-
> > drivers/acpi/acpica/nspredef.c | 2 +-
> > drivers/acpi/acpica/nsxfname.c | 2 +-
> > drivers/acpi/acpica/rscalc.c | 2 +-
> > drivers/acpi/acpica/tbxface.c | 2 +-
> > drivers/acpi/acpica/utcopy.c | 8 ++++----
> > drivers/acpi/acpica/utlock.c | 4 ++--
> > drivers/acpi/acpica/utmath.c | 4 ++--
> > include/acpi/acpiosxf.h | 2 +-
> > 19 files changed, 30 insertions(+), 30 deletions(-)
> >
> > diff --git a/drivers/acpi/acpica/aclocal.h b/drivers/acpi/acpica/aclocal.h
> > index 083b16a..379797e 100644
> > --- a/drivers/acpi/acpica/aclocal.h
> > +++ b/drivers/acpi/acpica/aclocal.h
> > @@ -541,7 +541,7 @@ struct acpi_gpe_device_info {
> >
> > typedef acpi_status(*acpi_gpe_callback) (struct acpi_gpe_xrupt_info *
> > gpe_xrupt_info,
> > - struct acpi_gpe_block_info
> *gpe_block,
> > + struct acpi_gpe_block_info *
> gpe_block,
> > void *context);
>
> No, please don't add that white space.
[Lv Zheng]
This is the result after running ACPICA release automation tool from the following point:
https://github.com/acpica/acpica/commit/e714615f
The command to confirm the result is:
# generate/linux/gen-repo e714615f
The spaces added by this patch are fixed by this ACPICA commit:
https://github.com/acpica/acpica/commit/b2294cae
This commit is released in this ACPICA release cycle as [PATCH 02].
So what have been made wrong here will be made correct by PATCH 02.
>
> > /* Information about each particular fixed event */
> > diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
> > index 83e9a29..baacde8 100644
> > --- a/drivers/acpi/acpica/acresrc.h
> > +++ b/drivers/acpi/acpica/acresrc.h
> > @@ -223,7 +223,7 @@ acpi_rs_get_aei_method_data(struct
> acpi_namespace_node *node,
> > * rscalc
> > */
> > acpi_status
> > -acpi_rs_get_list_length(u8 * aml_buffer,
> > +acpi_rs_get_list_length(u8 *aml_buffer,
> > u32 aml_buffer_length, acpi_size * size_needed);
>
> Why do you fix one and not the other?
[Lv Zheng]
ACPICA release scripts have already been aware of u8 as a type, so the indentation is not wrong after running ACPICA release scripts.
While acpi_size is not, acpi_size is fixed by the above mentioned commit:
https://github.com/acpica/acpica/commit/b2294cae
This commit is released in this ACPICA release cycle as [PATCH 02].
So what haven't been fixed here will be fixed by [PATCH 02].
>
> >
> > acpi_status
> > diff --git a/drivers/acpi/acpica/actables.h b/drivers/acpi/acpica/actables.h
> > index 848ad3a..fa81099 100644
> > --- a/drivers/acpi/acpica/actables.h
> > +++ b/drivers/acpi/acpica/actables.h
> > @@ -131,7 +131,7 @@ acpi_status acpi_tb_allocate_owner_id(u32
> table_index);
> >
> > acpi_status acpi_tb_release_owner_id(u32 table_index);
> >
> > -acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id
> *owner_id);
> > +acpi_status acpi_tb_get_owner_id(u32 table_index, acpi_owner_id *
> owner_id);
>
> The added white space does not adhere to the kernel coding style.
[Lv Zheng]
As acpi_gpe_block_info, ACPICA release scripts wasn't aware of acpi_owner_id as a type.
>
> > /*
> > * tbutils - table manager utilities
> > diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
> > index 6a4b603..0cd777f 100644
> > --- a/drivers/acpi/acpica/dsfield.c
> > +++ b/drivers/acpi/acpica/dsfield.c
> > @@ -147,8 +147,8 @@ acpi_ds_create_external_region(acpi_status
> lookup_status,
> >
> ****************************************************************
> **************/
> >
> > acpi_status
> > -acpi_ds_create_buffer_field(union acpi_parse_object *op,
> > - struct acpi_walk_state *walk_state)
> > +acpi_ds_create_buffer_field(union acpi_parse_object * op,
> > + struct acpi_walk_state * walk_state)
>
> Same here.
[Lv Zheng]
As acpi_gpe_block_info, ACPICA release scripts wasn't aware of acpi_walk_state as a type.
>
> > {
> > union acpi_parse_object *arg;
> > struct acpi_namespace_node *node;
> > diff --git a/drivers/acpi/acpica/dswstate.c b/drivers/acpi/acpica/dswstate.c
> > index 3a26ddb..6ec8dca 100644
> > --- a/drivers/acpi/acpica/dswstate.c
> > +++ b/drivers/acpi/acpica/dswstate.c
> > @@ -143,7 +143,7 @@ acpi_ds_result_pop(union acpi_operand_object
> **object,
> >
> ****************************************************************
> **************/
> >
> > acpi_status
> > -acpi_ds_result_push(union acpi_operand_object * object,
> > +acpi_ds_result_push(union acpi_operand_object *object,
> > struct acpi_walk_state * walk_state)
>
> Why do you fix one and not the other?
[Lv Zheng]
As u8, ACPICA release scripts have been aware of acpi_opearnd_object as a type.
As acpi_gpe_block_info, ACPICA release scripts wasn't aware of acpi_walk_state as a type.
>
> > {
> > union acpi_generic_state *state;
> > diff --git a/drivers/acpi/acpica/exconfig.c b/drivers/acpi/acpica/exconfig.c
> > index a1d177d..03d2eb0 100644
> > --- a/drivers/acpi/acpica/exconfig.c
> > +++ b/drivers/acpi/acpica/exconfig.c
> > @@ -334,7 +334,7 @@ acpi_ex_region_read(union acpi_operand_object
> *obj_desc, u32 length, u8 *buffer)
> > acpi_status
> > acpi_ex_load_op(union acpi_operand_object *obj_desc,
> > union acpi_operand_object *target,
> > - struct acpi_walk_state *walk_state)
> > + struct acpi_walk_state * walk_state)
>
> More damaged white space.
[Lv Zheng]
Ditto.
>
> > {
> > union acpi_operand_object *ddb_handle;
> > struct acpi_table_header *table_header;
> > diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
> > index 076074d..3bcea59 100644
> > --- a/drivers/acpi/acpica/exregion.c
> > +++ b/drivers/acpi/acpica/exregion.c
> > @@ -333,7 +333,7 @@ acpi_ex_system_io_space_handler(u32 function,
> > case ACPI_WRITE:
> >
> > status = acpi_hw_write_port((acpi_io_address) address,
> > - (u32) * value, bit_width);
> > + (u32)*value, bit_width);
> > break;
> >
> > default:
> > diff --git a/drivers/acpi/acpica/exresop.c b/drivers/acpi/acpica/exresop.c
> > index cc2c26c..da6bf0e 100644
> > --- a/drivers/acpi/acpica/exresop.c
> > +++ b/drivers/acpi/acpica/exresop.c
> > @@ -131,7 +131,7 @@ acpi_ex_check_object_type(acpi_object_type
> type_needed,
> >
> > acpi_status
> > acpi_ex_resolve_operands(u16 opcode,
> > - union acpi_operand_object ** stack_ptr,
> > + union acpi_operand_object **stack_ptr,
> > struct acpi_walk_state * walk_state)
>
> Why do you fix one and not the other?
[Lv Zheng]
Ditto.
>
> > {
> > union acpi_operand_object *obj_desc;
> > diff --git a/drivers/acpi/acpica/hwgpe.c b/drivers/acpi/acpica/hwgpe.c
> > index 1c4f451..8cc5cc0 100644
> > --- a/drivers/acpi/acpica/hwgpe.c
> > +++ b/drivers/acpi/acpica/hwgpe.c
> > @@ -315,8 +315,8 @@ acpi_hw_gpe_enable_write(u8 enable_mask,
> >
> ****************************************************************
> **************/
> >
> > acpi_status
> > -acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
> > - struct acpi_gpe_block_info *gpe_block, void
> *context)
> > +acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
> > + struct acpi_gpe_block_info * gpe_block, void
> *context)
>
> More damaged white space.
>
> And analogously below.
>
> I'm assuming that the rest of the series won't apply without this patch,
> so I'm not going to try to apply it.
>
> Please revise and resend.
[Lv Zheng]
The only way to make it looking correct is to merge PATCH 01 into PATCH 02.
But I need to make sure that I won't have to make this release cycle more than twice...
Otherwise I need to keep them separated in order to reduce human interventions.
Thanks and best regards
-Lv
>
> Thanks,
> Rafael
>
>
> > {
> > u32 i;
> > acpi_status status;
> > @@ -352,8 +352,8 @@ acpi_hw_disable_gpe_block(struct
> acpi_gpe_xrupt_info *gpe_xrupt_info,
> >
> ****************************************************************
> **************/
> >
> > acpi_status
> > -acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
> > - struct acpi_gpe_block_info *gpe_block, void *context)
> > +acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info * gpe_xrupt_info,
> > + struct acpi_gpe_block_info * gpe_block, void *context)
> > {
> > u32 i;
> > acpi_status status;
> > @@ -390,7 +390,7 @@ acpi_hw_clear_gpe_block(struct
> acpi_gpe_xrupt_info *gpe_xrupt_info,
> >
> ****************************************************************
> **************/
> >
> > acpi_status
> > -acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info
> *gpe_xrupt_info,
> > +acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *
> gpe_xrupt_info,
> > struct acpi_gpe_block_info * gpe_block,
> > void *context)
> > {
> > diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
> > index 035fb52..65b300d 100644
> > --- a/drivers/acpi/acpica/hwregs.c
> > +++ b/drivers/acpi/acpica/hwregs.c
> > @@ -157,7 +157,7 @@ acpi_hw_validate_register(struct
> acpi_generic_address *reg,
> > *
> >
> ****************************************************************
> **************/
> >
> > -acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
> > +acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address * reg)
> > {
> > u64 address;
> > u64 value64;
> > @@ -214,7 +214,7 @@ acpi_status acpi_hw_read(u32 *value, struct
> acpi_generic_address *reg)
> > *
> >
> ****************************************************************
> **************/
> >
> > -acpi_status acpi_hw_write(u32 value, struct acpi_generic_address *reg)
> > +acpi_status acpi_hw_write(u32 value, struct acpi_generic_address * reg)
> > {
> > u64 address;
> > acpi_status status;
> > diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
> > index 7caaaf3..312769d 100644
> > --- a/drivers/acpi/acpica/hwxface.c
> > +++ b/drivers/acpi/acpica/hwxface.c
> > @@ -212,7 +212,7 @@ ACPI_EXPORT_SYMBOL(acpi_read)
> > * DESCRIPTION: Write to either memory or IO space.
> > *
> >
> ****************************************************************
> **************/
> > -acpi_status acpi_write(u64 value, struct acpi_generic_address *reg)
> > +acpi_status acpi_write(u64 value, struct acpi_generic_address * reg)
> > {
> > u32 width;
> > u64 address;
> > diff --git a/drivers/acpi/acpica/nspredef.c b/drivers/acpi/acpica/nspredef.c
> > index 6d78445..bd7ddcc 100644
> > --- a/drivers/acpi/acpica/nspredef.c
> > +++ b/drivers/acpi/acpica/nspredef.c
> > @@ -220,7 +220,7 @@ exit:
> >
> ****************************************************************
> **************/
> >
> > acpi_status
> > -acpi_ns_check_object_type(struct acpi_evaluate_info *info,
> > +acpi_ns_check_object_type(struct acpi_evaluate_info * info,
> > union acpi_operand_object **return_object_ptr,
> > u32 expected_btypes, u32 package_index)
> > {
> > diff --git a/drivers/acpi/acpica/nsxfname.c b/drivers/acpi/acpica/nsxfname.c
> > index 285b820..41f97e8 100644
> > --- a/drivers/acpi/acpica/nsxfname.c
> > +++ b/drivers/acpi/acpica/nsxfname.c
> > @@ -278,7 +278,7 @@ static char *acpi_ns_copy_device_id(struct
> acpi_pnp_device_id *dest,
> >
> > acpi_status
> > acpi_get_object_info(acpi_handle handle,
> > - struct acpi_device_info **return_buffer)
> > + struct acpi_device_info ** return_buffer)
> > {
> > struct acpi_namespace_node *node;
> > struct acpi_device_info *info;
> > diff --git a/drivers/acpi/acpica/rscalc.c b/drivers/acpi/acpica/rscalc.c
> > index 2b1209d..8763ce6 100644
> > --- a/drivers/acpi/acpica/rscalc.c
> > +++ b/drivers/acpi/acpica/rscalc.c
> > @@ -397,7 +397,7 @@ acpi_rs_get_aml_length(struct acpi_resource
> *resource,
> >
> ****************************************************************
> **************/
> >
> > acpi_status
> > -acpi_rs_get_list_length(u8 * aml_buffer,
> > +acpi_rs_get_list_length(u8 *aml_buffer,
> > u32 aml_buffer_length, acpi_size * size_needed)
> > {
> > acpi_status status;
> > diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
> > index 326df65..72a239e 100644
> > --- a/drivers/acpi/acpica/tbxface.c
> > +++ b/drivers/acpi/acpica/tbxface.c
> > @@ -328,7 +328,7 @@ ACPI_EXPORT_SYMBOL(acpi_get_table_with_size)
> >
> > acpi_status
> > acpi_get_table(char *signature,
> > - u32 instance, struct acpi_table_header **out_table)
> > + u32 instance, struct acpi_table_header ** out_table)
> > {
> > acpi_size tbl_size;
> >
> > diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c
> > index 98d53e5..5ba8cb8 100644
> > --- a/drivers/acpi/acpica/utcopy.c
> > +++ b/drivers/acpi/acpica/utcopy.c
> > @@ -53,7 +53,7 @@ ACPI_MODULE_NAME("utcopy")
> > static acpi_status
> > acpi_ut_copy_isimple_to_esimple(union acpi_operand_object
> *internal_object,
> > union acpi_object *external_object,
> > - u8 * data_space, acpi_size *
> buffer_space_used);
> > + u8 *data_space, acpi_size *
> buffer_space_used);
> >
> > static acpi_status
> > acpi_ut_copy_ielement_to_ielement(u8 object_type,
> > @@ -63,7 +63,7 @@ acpi_ut_copy_ielement_to_ielement(u8 object_type,
> >
> > static acpi_status
> > acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object
> *internal_object,
> > - u8 * buffer, acpi_size * space_used);
> > + u8 *buffer, acpi_size * space_used);
> >
> > static acpi_status
> > acpi_ut_copy_esimple_to_isimple(union acpi_object *user_obj,
> > @@ -111,7 +111,7 @@ acpi_ut_copy_ipackage_to_ipackage(union
> acpi_operand_object *source_obj,
> > static acpi_status
> > acpi_ut_copy_isimple_to_esimple(union acpi_operand_object
> *internal_object,
> > union acpi_object *external_object,
> > - u8 * data_space, acpi_size *
> buffer_space_used)
> > + u8 *data_space, acpi_size *
> buffer_space_used)
> > {
> > acpi_status status = AE_OK;
> >
> > @@ -331,7 +331,7 @@ acpi_ut_copy_ielement_to_eelement(u8 object_type,
> >
> > static acpi_status
> > acpi_ut_copy_ipackage_to_epackage(union acpi_operand_object
> *internal_object,
> > - u8 * buffer, acpi_size * space_used)
> > + u8 *buffer, acpi_size * space_used)
> > {
> > union acpi_object *external_object;
> > acpi_status status;
> > diff --git a/drivers/acpi/acpica/utlock.c b/drivers/acpi/acpica/utlock.c
> > index 3cd0978..9cc64b6 100644
> > --- a/drivers/acpi/acpica/utlock.c
> > +++ b/drivers/acpi/acpica/utlock.c
> > @@ -124,7 +124,7 @@ acpi_status acpi_ut_acquire_read_lock(struct
> acpi_rw_lock *lock)
> > return (status);
> > }
> >
> > -acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
> > +acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock * lock)
> > {
> > acpi_status status;
> >
> > @@ -160,7 +160,7 @@ acpi_status acpi_ut_release_read_lock(struct
> acpi_rw_lock *lock)
> > *
> >
> ****************************************************************
> **************/
> >
> > -acpi_status acpi_ut_acquire_write_lock(struct acpi_rw_lock *lock)
> > +acpi_status acpi_ut_acquire_write_lock(struct acpi_rw_lock * lock)
> > {
> > acpi_status status;
> >
> > diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c
> > index 6673720..2fbc682 100644
> > --- a/drivers/acpi/acpica/utmath.c
> > +++ b/drivers/acpi/acpica/utmath.c
> > @@ -236,8 +236,8 @@ acpi_ut_divide(u64 in_dividend,
> > }
> >
> > remainder.full = remainder.full - dividend.full;
> > - remainder.part.hi = (u32) - ((s32) remainder.part.hi);
> > - remainder.part.lo = (u32) - ((s32) remainder.part.lo);
> > + remainder.part.hi = (u32)-((s32) remainder.part.hi);
> > + remainder.part.lo = (u32)-((s32) remainder.part.lo);
> >
> > if (remainder.part.lo) {
> > remainder.part.hi--;
> > diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
> > index 6026308..dfdcf5a 100644
> > --- a/include/acpi/acpiosxf.h
> > +++ b/include/acpi/acpiosxf.h
> > @@ -96,7 +96,7 @@ acpi_physical_address acpi_os_get_root_pointer(void);
> > #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_predefined_override
> > acpi_status
> > acpi_os_predefined_override(const struct acpi_predefined_names *init_val,
> > - acpi_string *new_val);
> > + acpi_string * new_val);
> > #endif
> >
> > #ifndef ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_table_override
> >
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-04 07:50 +0200 |
| Subject | [PATCH 10/15] ACPICA: Hardware: Add optimized access bit width support |
| Message-ID | <ruXRa-6ki-37@gated-at.bofh.it> |
| In reply to | #1393965 |
ACPICA commit c49a751b4dae7baec1790748a2b4b6e8ab599f51
For Access Size = 0, it actually can use user expected access bit width.
This patch implements this.
Besides of the ACPICA upstream commit, this patch also includes a fix fixing
the issue reported by the FreeBSD community.
The old register descriptors are translated in acpi_tb_init_generic_address()
with access_width being filled with 0. This breaks code in
acpi_hw_get_access_bit_width() when the registers are 16-bit IO ports and their
bit_width fields are filled with 16. The rapid fix is meant to make code
written for acpi_hw_get_access_bit_width() regression safer before the issue is
correctly fixed from acpi_tb_init_generic_address(). Reported by
John Baldwin <jhb@freebsd.org>, fixed by Lv Zheng <lv.zheng@intel.com>, tested
by Jung-uk Kim <jkim@freebsd.org>.
Link: https://github.com/acpica/acpica/commit/c49a751b
Reported-by: John Baldwin <jhb@freebsd.org>
Tested-by Jung-uk Kim <jkim@freebsd.org>.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
drivers/acpi/acpica/hwregs.c | 49 ++++++++++++++++++++++++++++++++++++++++--
1 file changed, 47 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 035fb52..892e677 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -51,6 +51,10 @@ ACPI_MODULE_NAME("hwregs")
#if (!ACPI_REDUCED_HARDWARE)
/* Local Prototypes */
+static u8
+acpi_hw_get_access_bit_width(struct acpi_generic_address *reg,
+ u8 max_bit_width);
+
static acpi_status
acpi_hw_read_multiple(u32 *value,
struct acpi_generic_address *register_a,
@@ -65,6 +69,48 @@ acpi_hw_write_multiple(u32 value,
/******************************************************************************
*
+ * FUNCTION: acpi_hw_get_access_bit_width
+ *
+ * PARAMETERS: reg - GAS register structure
+ * max_bit_width - Max bit_width supported (32 or 64)
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Obtain optimal access bit width
+ *
+ ******************************************************************************/
+
+static u8
+acpi_hw_get_access_bit_width(struct acpi_generic_address *reg, u8 max_bit_width)
+{
+ u64 address;
+
+ if (!reg->access_width) {
+ /*
+ * Detect old register descriptors where only the bit_width field
+ * makes senses. The target address is copied to handle possible
+ * alignment issues.
+ */
+ ACPI_MOVE_64_TO_64(&address, ®->address);
+ if (!reg->bit_offset && reg->bit_width &&
+ ACPI_IS_POWER_OF_TWO(reg->bit_width) &&
+ ACPI_IS_ALIGNED(reg->bit_width, 8) &&
+ ACPI_IS_ALIGNED(address, reg->bit_width)) {
+ return (reg->bit_width);
+ } else {
+ if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
+ return (32);
+ } else {
+ return (max_bit_width);
+ }
+ }
+ } else {
+ return (1 << (reg->access_width + 2));
+ }
+}
+
+/******************************************************************************
+ *
* FUNCTION: acpi_hw_validate_register
*
* PARAMETERS: reg - GAS register structure
@@ -122,8 +168,7 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
/* Validate the bit_width, convert access_width into number of bits */
- access_width = reg->access_width ? reg->access_width : 1;
- access_width = 1 << (access_width + 2);
+ access_width = acpi_hw_get_access_bit_width(reg, max_bit_width);
bit_width =
ACPI_ROUND_UP(reg->bit_offset + reg->bit_width, access_width);
if (max_bit_width < bit_width) {
--
1.7.10
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-04 08:00 +0200 |
| Subject | [PATCH 15/15] ACPICA: Update version to 20160422 |
| Message-ID | <ruY0P-6oT-11@gated-at.bofh.it> |
| In reply to | #1393965 |
From: Bob Moore <robert.moore@intel.com> ACPICA commit a2327ba410e19c2aabaf34b711dbadf7d1dcf346 Version 20160422. Link: https://github.com/acpica/acpica/commit/a2327ba4 Signed-off-by: Bob Moore <robert.moore@intel.com> Signed-off-by: Lv Zheng <lv.zheng@intel.com> --- include/acpi/acpixf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 366b364..4e4c214 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -46,7 +46,7 @@ /* Current ACPICA subsystem version in YYYYMMDD format */ -#define ACPI_CA_VERSION 0x20160318 +#define ACPI_CA_VERSION 0x20160422 #include <acpi/acconfig.h> #include <acpi/actypes.h> -- 1.7.10
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-04 08:00 +0200 |
| Subject | [PATCH 06/15] ACPICA: ACPI 6.0, tools/iasl: Add support for new resource descriptors |
| Message-ID | <ruY0P-6oT-13@gated-at.bofh.it> |
| In reply to | #1393965 |
From: Bob Moore <robert.moore@intel.com>
ACPICA commit 5a0555ece4ba9917e5842b21d88469ae06b4e815
Adds full support for:
i2c_serial_bus_v2
spi_serial_bus_v2
uart_serial_bus_v2
Compiler, Disassembler, Resource Manager, acpi_help.
Link: https://github.com/acpica/acpica/commit/5a0555ec
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
drivers/acpi/acpica/rsdumpinfo.c | 9 +++++----
drivers/acpi/acpica/rsserial.c | 21 ++++++++++++++++++---
include/acpi/acrestyp.h | 1 +
3 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/drivers/acpi/acpica/rsdumpinfo.c b/drivers/acpi/acpica/rsdumpinfo.c
index 5c34913..61e8f16 100644
--- a/drivers/acpi/acpica/rsdumpinfo.c
+++ b/drivers/acpi/acpica/rsdumpinfo.c
@@ -330,19 +330,20 @@ struct acpi_rsdump_info acpi_rs_dump_fixed_dma[4] = {
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET (common_serial_bus.type), "Type", acpi_gbl_sbt_decode}, \
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.producer_consumer), "ProducerConsumer", acpi_gbl_consume_decode}, \
{ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.slave_mode), "SlaveMode", acpi_gbl_sm_decode}, \
+ {ACPI_RSD_1BITFLAG, ACPI_RSD_OFFSET (common_serial_bus.connection_sharing),"ConnectionSharing", acpi_gbl_shr_decode}, \
{ACPI_RSD_UINT8, ACPI_RSD_OFFSET (common_serial_bus.type_revision_id), "TypeRevisionId", NULL}, \
{ACPI_RSD_UINT16, ACPI_RSD_OFFSET (common_serial_bus.type_data_length), "TypeDataLength", NULL}, \
{ACPI_RSD_SOURCE, ACPI_RSD_OFFSET (common_serial_bus.resource_source), "ResourceSource", NULL}, \
{ACPI_RSD_UINT16, ACPI_RSD_OFFSET (common_serial_bus.vendor_length), "VendorLength", NULL}, \
{ACPI_RSD_SHORTLISTX,ACPI_RSD_OFFSET (common_serial_bus.vendor_data), "VendorData", NULL},
-struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[10] = {
+struct acpi_rsdump_info acpi_rs_dump_common_serial_bus[11] = {
{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_common_serial_bus),
"Common Serial Bus", NULL},
ACPI_RS_DUMP_COMMON_SERIAL_BUS
};
-struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[13] = {
+struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[14] = {
{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_i2c_serial_bus),
"I2C Serial Bus", NULL},
ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG,
@@ -355,7 +356,7 @@ struct acpi_rsdump_info acpi_rs_dump_i2c_serial_bus[13] = {
"SlaveAddress", NULL},
};
-struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[17] = {
+struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[18] = {
{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_spi_serial_bus),
"Spi Serial Bus", NULL},
ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_1BITFLAG,
@@ -376,7 +377,7 @@ struct acpi_rsdump_info acpi_rs_dump_spi_serial_bus[17] = {
"ConnectionSpeed", NULL},
};
-struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[19] = {
+struct acpi_rsdump_info acpi_rs_dump_uart_serial_bus[20] = {
{ACPI_RSD_TITLE, ACPI_RSD_TABLE_SIZE(acpi_rs_dump_uart_serial_bus),
"Uart Serial Bus", NULL},
ACPI_RS_DUMP_COMMON_SERIAL_BUS {ACPI_RSD_2BITFLAG,
diff --git a/drivers/acpi/acpica/rsserial.c b/drivers/acpi/acpica/rsserial.c
index 8a01296..b82c061 100644
--- a/drivers/acpi/acpica/rsserial.c
+++ b/drivers/acpi/acpica/rsserial.c
@@ -151,7 +151,7 @@ struct acpi_rsconvert_info acpi_rs_convert_gpio[18] = {
*
******************************************************************************/
-struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[16] = {
+struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[17] = {
{ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,
ACPI_RS_SIZE(struct acpi_resource_i2c_serialbus),
ACPI_RSC_TABLE_SIZE(acpi_rs_convert_i2c_serial_bus)},
@@ -177,6 +177,11 @@ struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[16] = {
AML_OFFSET(common_serial_bus.flags),
1},
+ {ACPI_RSC_1BITFLAG,
+ ACPI_RS_OFFSET(data.common_serial_bus.connection_sharing),
+ AML_OFFSET(common_serial_bus.flags),
+ 2},
+
{ACPI_RSC_MOVE8,
ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),
AML_OFFSET(common_serial_bus.type_revision_id),
@@ -237,7 +242,7 @@ struct acpi_rsconvert_info acpi_rs_convert_i2c_serial_bus[16] = {
*
******************************************************************************/
-struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[20] = {
+struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[21] = {
{ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,
ACPI_RS_SIZE(struct acpi_resource_spi_serialbus),
ACPI_RSC_TABLE_SIZE(acpi_rs_convert_spi_serial_bus)},
@@ -263,6 +268,11 @@ struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[20] = {
AML_OFFSET(common_serial_bus.flags),
1},
+ {ACPI_RSC_1BITFLAG,
+ ACPI_RS_OFFSET(data.common_serial_bus.connection_sharing),
+ AML_OFFSET(common_serial_bus.flags),
+ 2},
+
{ACPI_RSC_MOVE8,
ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),
AML_OFFSET(common_serial_bus.type_revision_id),
@@ -339,7 +349,7 @@ struct acpi_rsconvert_info acpi_rs_convert_spi_serial_bus[20] = {
*
******************************************************************************/
-struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[22] = {
+struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[23] = {
{ACPI_RSC_INITGET, ACPI_RESOURCE_TYPE_SERIAL_BUS,
ACPI_RS_SIZE(struct acpi_resource_uart_serialbus),
ACPI_RSC_TABLE_SIZE(acpi_rs_convert_uart_serial_bus)},
@@ -365,6 +375,11 @@ struct acpi_rsconvert_info acpi_rs_convert_uart_serial_bus[22] = {
AML_OFFSET(common_serial_bus.flags),
1},
+ {ACPI_RSC_1BITFLAG,
+ ACPI_RS_OFFSET(data.common_serial_bus.connection_sharing),
+ AML_OFFSET(common_serial_bus.flags),
+ 2},
+
{ACPI_RSC_MOVE8,
ACPI_RS_OFFSET(data.common_serial_bus.type_revision_id),
AML_OFFSET(common_serial_bus.type_revision_id),
diff --git a/include/acpi/acrestyp.h b/include/acpi/acrestyp.h
index cf2acb8..16c1892 100644
--- a/include/acpi/acrestyp.h
+++ b/include/acpi/acrestyp.h
@@ -417,6 +417,7 @@ struct acpi_resource_gpio {
u8 type; \
u8 producer_consumer; /* For values, see Producer/Consumer above */\
u8 slave_mode; \
+ u8 connection_sharing; \
u8 type_revision_id; \
u16 type_data_length; \
u16 vendor_length; \
--
1.7.10
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-05 07:00 +0200 |
| Subject | [PATCH v2 10/13] ACPICA: ACPI 2.0, Hardware: Add access_width/bit_offset support in acpi_hw_read() |
| Message-ID | <rvjyi-1lB-1@gated-at.bofh.it> |
| In reply to | #1393965 |
ACPICA commit 96ece052d4d073aae4f935f0ff0746646aea1174
ACPICA commit 3d8583a054e410f2ea4d73b48986facad9cfc0d4
This patch adds access_width/bit_offset support in acpi_hw_read().
This also enables GAS definition where bit_width is not a power of
two. Lv Zheng.
Link: https://github.com/acpica/acpica/commit/96ece052
Link: https://github.com/acpica/acpica/commit/3d8583a0
Link: https://bugs.acpica.org/show_bug.cgi?id=1240
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
---
drivers/acpi/acpica/hwregs.c | 75 ++++++++++++++++++++++++++++++++++--------
1 file changed, 62 insertions(+), 13 deletions(-)
diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
index 892e677..6eee012 100644
--- a/drivers/acpi/acpica/hwregs.c
+++ b/drivers/acpi/acpica/hwregs.c
@@ -195,17 +195,19 @@ acpi_hw_validate_register(struct acpi_generic_address *reg,
* 64-bit values is not needed.
*
* LIMITATIONS: <These limitations also apply to acpi_hw_write>
- * bit_width must be exactly 8, 16, or 32.
* space_ID must be system_memory or system_IO.
- * bit_offset and access_width are currently ignored, as there has
- * not been a need to implement these.
*
******************************************************************************/
acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
{
u64 address;
+ u8 access_width;
+ u32 bit_width;
+ u8 bit_offset;
u64 value64;
+ u32 value32;
+ u8 index;
acpi_status status;
ACPI_FUNCTION_NAME(hw_read);
@@ -217,28 +219,75 @@ acpi_status acpi_hw_read(u32 *value, struct acpi_generic_address *reg)
return (status);
}
- /* Initialize entire 32-bit return value to zero */
-
+ /*
+ * Initialize entire 32-bit return value to zero, convert access_width
+ * into number of bits based
+ */
*value = 0;
+ access_width = acpi_hw_get_access_bit_width(reg, 32);
+ bit_width = reg->bit_offset + reg->bit_width;
+ bit_offset = reg->bit_offset;
/*
* Two address spaces supported: Memory or IO. PCI_Config is
* not supported here because the GAS structure is insufficient
*/
- if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
- status = acpi_os_read_memory((acpi_physical_address)
- address, &value64, reg->bit_width);
+ index = 0;
+ while (bit_width) {
+ if (bit_offset >= access_width) {
+ value32 = 0;
+ bit_offset -= access_width;
+ } else {
+ if (reg->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY) {
+ status =
+ acpi_os_read_memory((acpi_physical_address)
+ address +
+ index *
+ ACPI_DIV_8
+ (access_width),
+ &value64, access_width);
+ value32 = (u32)value64;
+ } else { /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
+
+ status = acpi_hw_read_port((acpi_io_address)
+ address +
+ index *
+ ACPI_DIV_8
+ (access_width),
+ &value32,
+ access_width);
+ }
- *value = (u32)value64;
- } else { /* ACPI_ADR_SPACE_SYSTEM_IO, validated earlier */
+ /*
+ * Use offset style bit masks because:
+ * bit_offset < access_width/bit_width < access_width, and
+ * access_width is ensured to be less than 32-bits by
+ * acpi_hw_validate_register().
+ */
+ if (bit_offset) {
+ value32 &= ACPI_MASK_BITS_BELOW(bit_offset);
+ bit_offset = 0;
+ }
+ if (bit_width < access_width) {
+ value32 &= ACPI_MASK_BITS_ABOVE(bit_width);
+ }
+ }
+
+ /*
+ * Use offset style bit writes because "Index * AccessWidth" is
+ * ensured to be less than 32-bits by acpi_hw_validate_register().
+ */
+ ACPI_SET_BITS(value, index * access_width,
+ ACPI_MASK_BITS_ABOVE_32(access_width), value32);
- status = acpi_hw_read_port((acpi_io_address)
- address, value, reg->bit_width);
+ bit_width -=
+ bit_width > access_width ? access_width : bit_width;
+ index++;
}
ACPI_DEBUG_PRINT((ACPI_DB_IO,
"Read: %8.8X width %2d from %8.8X%8.8X (%s)\n",
- *value, reg->bit_width, ACPI_FORMAT_UINT64(address),
+ *value, access_width, ACPI_FORMAT_UINT64(address),
acpi_ut_get_region_name(reg->space_id)));
return (status);
--
1.7.10
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-05 07:00 +0200 |
| Subject | [PATCH v2 04/13] ACPICA: ACPI 6.0: Update _BIX support for new package element |
| Message-ID | <rvjyi-1lB-5@gated-at.bofh.it> |
| In reply to | #1393965 |
From: Bob Moore <robert.moore@intel.com>
ACPICA commit 3451e6d49d37919c13ec2c0019a31534b0dfc0c0
One integer was added at the end of the _BIX method, and the
version number was incremented.
Link: https://github.com/acpica/acpica/commit/3451e6d4
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
---
drivers/acpi/acpica/acpredef.h | 5 ++-
drivers/acpi/acpica/nsprepkg.c | 86 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 89 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index 4ca426b..888440b 100644
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -129,7 +129,8 @@ enum acpi_return_package_types {
ACPI_PTYPE2_REV_FIXED = 9,
ACPI_PTYPE2_FIX_VAR = 10,
ACPI_PTYPE2_VAR_VAR = 11,
- ACPI_PTYPE2_UUID_PAIR = 12
+ ACPI_PTYPE2_UUID_PAIR = 12,
+ ACPI_PTYPE_CUSTOM = 13
};
/* Support macros for users of the predefined info table */
@@ -340,7 +341,7 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
{{"_BIX", METHOD_0ARGS,
METHOD_RETURNS(ACPI_RTYPE_PACKAGE)}}, /* Fixed-length (16 Int),(4 Str) */
- PACKAGE_INFO(ACPI_PTYPE1_FIXED, ACPI_RTYPE_INTEGER, 16,
+ PACKAGE_INFO(ACPI_PTYPE_CUSTOM, ACPI_RTYPE_INTEGER, 16,
ACPI_RTYPE_STRING, 4, 0),
{{"_BLT",
diff --git a/drivers/acpi/acpica/nsprepkg.c b/drivers/acpi/acpica/nsprepkg.c
index fde5a09..fbedc6e 100644
--- a/drivers/acpi/acpica/nsprepkg.c
+++ b/drivers/acpi/acpica/nsprepkg.c
@@ -62,6 +62,10 @@ acpi_ns_check_package_elements(struct acpi_evaluate_info *info,
u32 count1,
u8 type2, u32 count2, u32 start_index);
+static acpi_status
+acpi_ns_custom_package(struct acpi_evaluate_info *info,
+ union acpi_operand_object **elements, u32 count);
+
/*******************************************************************************
*
* FUNCTION: acpi_ns_check_package
@@ -135,6 +139,11 @@ acpi_ns_check_package(struct acpi_evaluate_info *info,
* PTYPE2 packages contain subpackages
*/
switch (package->ret_info.type) {
+ case ACPI_PTYPE_CUSTOM:
+
+ status = acpi_ns_custom_package(info, elements, count);
+ break;
+
case ACPI_PTYPE1_FIXED:
/*
* The package count is fixed and there are no subpackages
@@ -626,6 +635,83 @@ package_too_small:
/*******************************************************************************
*
+ * FUNCTION: acpi_ns_custom_package
+ *
+ * PARAMETERS: info - Method execution information block
+ * elements - Pointer to the package elements array
+ * count - Element count for the package
+ *
+ * RETURN: Status
+ *
+ * DESCRIPTION: Check a returned package object for the correct count and
+ * correct type of all sub-objects.
+ *
+ * NOTE: Currently used for the _BIX method only. When needed for two or more
+ * methods, probably a detect/dispatch mechanism will be required.
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ns_custom_package(struct acpi_evaluate_info *info,
+ union acpi_operand_object **elements, u32 count)
+{
+ u32 expected_count;
+ u32 version;
+ acpi_status status = AE_OK;
+
+ ACPI_FUNCTION_NAME(ns_custom_package);
+
+ /* Get version number, must be Integer */
+
+ if ((*elements)->common.type != ACPI_TYPE_INTEGER) {
+ ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+ info->node_flags,
+ "Return Package has invalid object type for version number"));
+ return_ACPI_STATUS(AE_AML_OPERAND_TYPE);
+ }
+
+ version = (u32)(*elements)->integer.value;
+ expected_count = 21; /* Version 1 */
+
+ if (version == 0) {
+ expected_count = 20; /* Version 0 */
+ }
+
+ if (count < expected_count) {
+ ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname,
+ info->node_flags,
+ "Return Package is too small - found %u elements, expected %u",
+ count, expected_count));
+ return_ACPI_STATUS(AE_AML_OPERAND_VALUE);
+ } else if (count > expected_count) {
+ ACPI_DEBUG_PRINT((ACPI_DB_REPAIR,
+ "%s: Return Package is larger than needed - "
+ "found %u, expected %u\n",
+ info->full_pathname, count, expected_count));
+ }
+
+ /* Validate all elements of the returned package */
+
+ status = acpi_ns_check_package_elements(info, elements,
+ ACPI_RTYPE_INTEGER, 16,
+ ACPI_RTYPE_STRING, 4, 0);
+ if (ACPI_FAILURE(status)) {
+ return_ACPI_STATUS(status);
+ }
+
+ /* Version 1 has a single trailing integer */
+
+ if (version > 0) {
+ status = acpi_ns_check_package_elements(info, elements + 20,
+ ACPI_RTYPE_INTEGER, 1,
+ 0, 0, 20);
+ }
+
+ return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
* FUNCTION: acpi_ns_check_package_elements
*
* PARAMETERS: info - Method execution information block
--
1.7.10
[toc] | [prev] | [next] | [standalone]
| From | Lv Zheng <lv.zheng@intel.com> |
|---|---|
| Date | 2016-05-05 07:00 +0200 |
| Subject | [PATCH v2 07/13] ACPICA: Utilities: Add ACPI_IS_ALIGNED() macro |
| Message-ID | <rvjyi-1lB-7@gated-at.bofh.it> |
| In reply to | #1393965 |
This patch introduces ACPI_IS_ALIGNED() macro. Lv Zheng. Signed-off-by: Lv Zheng <lv.zheng@intel.com> --- drivers/acpi/acpica/acmacros.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/acpica/acmacros.h b/drivers/acpi/acpica/acmacros.h index 73f6653..ecbaaba 100644 --- a/drivers/acpi/acpica/acmacros.h +++ b/drivers/acpi/acpica/acmacros.h @@ -262,7 +262,8 @@ /* Generic (power-of-two) rounding */ -#define ACPI_IS_POWER_OF_TWO(a) (((a) & ((a) - 1)) == 0) +#define ACPI_IS_ALIGNED(a, s) (((a) & ((s) - 1)) == 0) +#define ACPI_IS_POWER_OF_TWO(a) ACPI_IS_ALIGNED(a, a) /* * Bitmask creation -- 1.7.10
[toc] | [prev] | [next] | [standalone]
Page 1 of 2 [1] 2 Next page →
Back to top | Article view | linux.kernel
csiph-web