ACPICA: Handle large field appertures.
A message that is not in the archive (sent off-list or not yet received): 4911F71203A09E4D9981D27F9D830858709F2D04@orsmsx503.amr.corp.intel.com
PATCH 1/1 ACPICA: Handle large field appertures.
---
source/components/executer/exfldio.c | 67 ++++++++++++++++++++++------------ source/components/executer/exprep.c | 12 +++++- source/include/acobject.h | 3 +- 3 files changed, 54 insertions(+), 28 deletions(-)
source/components/executer/exfldio.c +43 -24
@@ -233,9 +233,8 @@ AcpiExSetupRegion (* (Region length is specified in bytes) */ if (RgnDesc->Region.Length < - (ObjDesc->CommonField.BaseByteOffset + - FieldDatumByteOffset + - ObjDesc->CommonField.AccessByteWidth)) + (ObjDesc->CommonField.BaseByteOffset + FieldDatumByteOffset + + ObjDesc->CommonField.AccessByteWidth)) {if (AcpiGbl_EnableInterpreterSlack) {
@@ -795,6 +794,7 @@ AcpiExExtractFromField (UINT32 DatumCount;UINT32 FieldDatumCount;UINT32 i; +UINT32 AccessBitWidth;ACPI_FUNCTION_TRACE (ExExtractFromField);
@@ -802,8 +802,7 @@ AcpiExExtractFromField (/* Validate target buffer and clear it */ -if (BufferLength < -ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength)) +if (BufferLength <ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength)) { ACPI_ERROR ((AE_INFO, "Field size %u (bits) is too large for buffer (%u)",
@@ -813,15 +812,30 @@ AcpiExExtractFromField ( }ACPI_MEMSET (Buffer,0 , BufferLength); +/* Simple case handling */ + AccessBitWidth =ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); +if (ObjDesc->CommonField.StartFieldBitOffset ==0 && + ObjDesc->CommonField.BitLength == AccessBitWidth) + { + Status =AcpiExFieldDatumIo (ObjDesc,0 , Buffer,ACPI_READ ); +return_ACPI_STATUS (Status); + } + +/* Algo is limited to sizeof(UINT64), so cut the AccessByteWidth */ +if (ObjDesc->CommonField.AccessByteWidth >sizeof (UINT64 )) + { + ObjDesc->CommonField.AccessByteWidth =sizeof (UINT64 ); + AccessBitWidth =ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); + } +/* Compute the number of datums (access width data items) */ DatumCount =ACPI_ROUND_UP_TO ( - ObjDesc->CommonField.BitLength, - ObjDesc->CommonField.AccessBitWidth); + ObjDesc->CommonField.BitLength, AccessBitWidth); FieldDatumCount =ACPI_ROUND_UP_TO ( ObjDesc->CommonField.BitLength + ObjDesc->CommonField.StartFieldBitOffset, - ObjDesc->CommonField.AccessBitWidth); + AccessBitWidth);/* Priming read from the field */
@@ -854,12 +868,11 @@ AcpiExExtractFromField (* This avoids the differences in behavior between different compilers * concerning shift values larger than the target data width. */ -if ((ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset) <ACPI_INTEGER_BIT_SIZE ) +if (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset < +ACPI_INTEGER_BIT_SIZE ) { MergedDatum |= RawDatum << - (ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset); + (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset); }if (i == DatumCount)
@@ -879,8 +892,7 @@ AcpiExExtractFromField (/* Mask off any extra bits in the last datum */ - BufferTailBits = ObjDesc->CommonField.BitLength % - ObjDesc->CommonField.AccessBitWidth; + BufferTailBits = ObjDesc->CommonField.BitLength % AccessBitWidth;if (BufferTailBits) { MergedDatum &=ACPI_MASK_BITS_ABOVE (BufferTailBits);
@@ -928,6 +940,7 @@ AcpiExInsertIntoField (UINT32 FieldDatumCount;UINT32 i;UINT32 RequiredLength; +UINT32 AccessBitWidth;void *NewBuffer;
@@ -965,18 +978,26 @@ AcpiExInsertIntoField ( BufferLength = RequiredLength; } +/* Algo is limited to sizeof(UINT64), so cut the AccessByteWidth */ +if (ObjDesc->CommonField.AccessByteWidth >sizeof (UINT64 )) + { + ObjDesc->CommonField.AccessByteWidth =sizeof (UINT64 ); + } + + AccessBitWidth =ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); +/* * Create the bitmasks used for bit insertion. * Note: This if/else is used to bypass compiler differences with the * shift operator */ -if (ObjDesc->CommonField.AccessBitWidth ==ACPI_INTEGER_BIT_SIZE ) +if (AccessBitWidth ==ACPI_INTEGER_BIT_SIZE ) { WidthMask =ACPI_UINT64_MAX ; }else { - WidthMask =ACPI_MASK_BITS_ABOVE (ObjDesc->CommonField.AccessBitWidth); + WidthMask =ACPI_MASK_BITS_ABOVE (AccessBitWidth); } Mask = WidthMask &
@@ -985,11 +1006,11 @@ AcpiExInsertIntoField (/* Compute the number of datums (access width data items) */ DatumCount =ACPI_ROUND_UP_TO (ObjDesc->CommonField.BitLength, - ObjDesc->CommonField.AccessBitWidth); + AccessBitWidth); FieldDatumCount =ACPI_ROUND_UP_TO (ObjDesc->CommonField.BitLength + ObjDesc->CommonField.StartFieldBitOffset, - ObjDesc->CommonField.AccessBitWidth); + AccessBitWidth);/* Get initial Datum from the input buffer */
@@ -1024,12 +1045,11 @@ AcpiExInsertIntoField (* This avoids the differences in behavior between different compilers * concerning shift values larger than the target data width. */ -if ((ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset) <ACPI_INTEGER_BIT_SIZE ) +if (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset < +ACPI_INTEGER_BIT_SIZE ) { MergedDatum = RawDatum >> - (ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset); + (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset); }else {
@@ -1055,8 +1075,7 @@ AcpiExInsertIntoField (/* Mask off any extra bits in the last datum */ BufferTailBits = (ObjDesc->CommonField.BitLength + - ObjDesc->CommonField.StartFieldBitOffset) % - ObjDesc->CommonField.AccessBitWidth; + ObjDesc->CommonField.StartFieldBitOffset) % AccessBitWidth;if (BufferTailBits) { Mask &=ACPI_MASK_BITS_ABOVE (BufferTailBits);
source/components/executer/exprep.c +10 -2
@@ -455,8 +455,6 @@ AcpiExPrepCommonFieldObject ( ObjDesc->CommonField.AccessByteWidth = (UINT8 )ACPI_DIV_8 (AccessBitWidth);/* 1, 2, 4, 8 */ - ObjDesc->CommonField.AccessBitWidth = (UINT8 ) AccessBitWidth; -/* * BaseByteOffset is the address of the start of the field within the * region. It is the byte address of the first *datum* (field-width data
@@ -567,6 +565,16 @@ AcpiExPrepFieldValue ( ObjDesc->Field.RegionObj =AcpiNsGetAttachedObject (Info->RegionNode); +/* allow full data read from EC address space */ +if (ObjDesc->Field.RegionObj->Region.SpaceId ==ACPI_ADR_SPACE_EC ) { +if (ObjDesc->CommonField.BitLength >8 ) { + ObjDesc->CommonField.AccessByteWidth = +ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength); + } + } + + +/* An additional reference for the container */ AcpiUtAddReference (ObjDesc->Field.RegionObj);
source/include/acobject.h +1 -2
@@ -381,12 +381,11 @@ typedef struct acpi_object_thermal_zoneUINT8 FieldFlags;/* Access, update, and lock bits */ \UINT8 Attribute;/* From AccessAs keyword */ \UINT8 AccessByteWidth;/* Read/Write size in bytes */ \ +UINT8 StartFieldBitOffset;/* Bit offset within first field datum (0-63) */ \ACPI_NAMESPACE_NODE *Node;/* Link back to parent node */ \UINT32 BitLength;/* Length of field in bits */ \UINT32 BaseByteOffset;/* Byte offset within containing object */ \UINT32 Value;/* Value to store into the Bank or Index register */ \ -UINT8 StartFieldBitOffset;/* Bit offset within first field datum (0-63) */ \ -UINT8 AccessBitWidth;/* Read/Write size in bits (8-64) */ typedef struct acpi_object_field_common /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
PATCH 1/1 ACPICA: Handle large field apertures.
In reply to a message not in the archiveAllow field reads of more than 64 bits if the field is properly aligned. EC driver will be able to read in bursts of up to 32 bytes with this patch.
---
source/components/executer/exfldio.c | 67 ++++++++++++++++++++++------------ source/components/executer/exprep.c | 12 +++++- source/include/acobject.h | 3 +- 3 files changed, 54 insertions(+), 28 deletions(-)
source/components/executer/exfldio.c +43 -24
@@ -233,9 +233,8 @@ AcpiExSetupRegion (* (Region length is specified in bytes) */ if (RgnDesc->Region.Length < - (ObjDesc->CommonField.BaseByteOffset + - FieldDatumByteOffset + - ObjDesc->CommonField.AccessByteWidth)) + (ObjDesc->CommonField.BaseByteOffset + FieldDatumByteOffset + + ObjDesc->CommonField.AccessByteWidth)) {if (AcpiGbl_EnableInterpreterSlack) {
@@ -795,6 +794,7 @@ AcpiExExtractFromField (UINT32 DatumCount;UINT32 FieldDatumCount;UINT32 i; +UINT32 AccessBitWidth;ACPI_FUNCTION_TRACE (ExExtractFromField);
@@ -802,8 +802,7 @@ AcpiExExtractFromField (/* Validate target buffer and clear it */ -if (BufferLength < -ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength)) +if (BufferLength <ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength)) { ACPI_ERROR ((AE_INFO, "Field size %u (bits) is too large for buffer (%u)",
@@ -813,15 +812,30 @@ AcpiExExtractFromField ( }ACPI_MEMSET (Buffer,0 , BufferLength); +/* Simple case handling */ + AccessBitWidth =ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); +if (ObjDesc->CommonField.StartFieldBitOffset ==0 && + ObjDesc->CommonField.BitLength == AccessBitWidth) + { + Status =AcpiExFieldDatumIo (ObjDesc,0 , Buffer,ACPI_READ ); +return_ACPI_STATUS (Status); + } + +/* Algo is limited to sizeof(UINT64), so cut the AccessByteWidth */ +if (ObjDesc->CommonField.AccessByteWidth >sizeof (UINT64 )) + { + ObjDesc->CommonField.AccessByteWidth =sizeof (UINT64 ); + AccessBitWidth =ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); + } +/* Compute the number of datums (access width data items) */ DatumCount =ACPI_ROUND_UP_TO ( - ObjDesc->CommonField.BitLength, - ObjDesc->CommonField.AccessBitWidth); + ObjDesc->CommonField.BitLength, AccessBitWidth); FieldDatumCount =ACPI_ROUND_UP_TO ( ObjDesc->CommonField.BitLength + ObjDesc->CommonField.StartFieldBitOffset, - ObjDesc->CommonField.AccessBitWidth); + AccessBitWidth);/* Priming read from the field */
@@ -854,12 +868,11 @@ AcpiExExtractFromField (* This avoids the differences in behavior between different compilers * concerning shift values larger than the target data width. */ -if ((ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset) <ACPI_INTEGER_BIT_SIZE ) +if (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset < +ACPI_INTEGER_BIT_SIZE ) { MergedDatum |= RawDatum << - (ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset); + (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset); }if (i == DatumCount)
@@ -879,8 +892,7 @@ AcpiExExtractFromField (/* Mask off any extra bits in the last datum */ - BufferTailBits = ObjDesc->CommonField.BitLength % - ObjDesc->CommonField.AccessBitWidth; + BufferTailBits = ObjDesc->CommonField.BitLength % AccessBitWidth;if (BufferTailBits) { MergedDatum &=ACPI_MASK_BITS_ABOVE (BufferTailBits);
@@ -928,6 +940,7 @@ AcpiExInsertIntoField (UINT32 FieldDatumCount;UINT32 i;UINT32 RequiredLength; +UINT32 AccessBitWidth;void *NewBuffer;
@@ -965,18 +978,26 @@ AcpiExInsertIntoField ( BufferLength = RequiredLength; } +/* Algo is limited to sizeof(UINT64), so cut the AccessByteWidth */ +if (ObjDesc->CommonField.AccessByteWidth >sizeof (UINT64 )) + { + ObjDesc->CommonField.AccessByteWidth =sizeof (UINT64 ); + } + + AccessBitWidth =ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); +/* * Create the bitmasks used for bit insertion. * Note: This if/else is used to bypass compiler differences with the * shift operator */ -if (ObjDesc->CommonField.AccessBitWidth ==ACPI_INTEGER_BIT_SIZE ) +if (AccessBitWidth ==ACPI_INTEGER_BIT_SIZE ) { WidthMask =ACPI_UINT64_MAX ; }else { - WidthMask =ACPI_MASK_BITS_ABOVE (ObjDesc->CommonField.AccessBitWidth); + WidthMask =ACPI_MASK_BITS_ABOVE (AccessBitWidth); } Mask = WidthMask &
@@ -985,11 +1006,11 @@ AcpiExInsertIntoField (/* Compute the number of datums (access width data items) */ DatumCount =ACPI_ROUND_UP_TO (ObjDesc->CommonField.BitLength, - ObjDesc->CommonField.AccessBitWidth); + AccessBitWidth); FieldDatumCount =ACPI_ROUND_UP_TO (ObjDesc->CommonField.BitLength + ObjDesc->CommonField.StartFieldBitOffset, - ObjDesc->CommonField.AccessBitWidth); + AccessBitWidth);/* Get initial Datum from the input buffer */
@@ -1024,12 +1045,11 @@ AcpiExInsertIntoField (* This avoids the differences in behavior between different compilers * concerning shift values larger than the target data width. */ -if ((ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset) <ACPI_INTEGER_BIT_SIZE ) +if (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset < +ACPI_INTEGER_BIT_SIZE ) { MergedDatum = RawDatum >> - (ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset); + (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset); }else {
@@ -1055,8 +1075,7 @@ AcpiExInsertIntoField (/* Mask off any extra bits in the last datum */ BufferTailBits = (ObjDesc->CommonField.BitLength + - ObjDesc->CommonField.StartFieldBitOffset) % - ObjDesc->CommonField.AccessBitWidth; + ObjDesc->CommonField.StartFieldBitOffset) % AccessBitWidth;if (BufferTailBits) { Mask &=ACPI_MASK_BITS_ABOVE (BufferTailBits);
source/components/executer/exprep.c +10 -2
@@ -455,8 +455,6 @@ AcpiExPrepCommonFieldObject ( ObjDesc->CommonField.AccessByteWidth = (UINT8 )ACPI_DIV_8 (AccessBitWidth);/* 1, 2, 4, 8 */ - ObjDesc->CommonField.AccessBitWidth = (UINT8 ) AccessBitWidth; -/* * BaseByteOffset is the address of the start of the field within the * region. It is the byte address of the first *datum* (field-width data
@@ -567,6 +565,16 @@ AcpiExPrepFieldValue ( ObjDesc->Field.RegionObj =AcpiNsGetAttachedObject (Info->RegionNode); +/* allow full data read from EC address space */ +if (ObjDesc->Field.RegionObj->Region.SpaceId ==ACPI_ADR_SPACE_EC ) { +if (ObjDesc->CommonField.BitLength >8 ) { + ObjDesc->CommonField.AccessByteWidth = +ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength); + } + } + + +/* An additional reference for the container */ AcpiUtAddReference (ObjDesc->Field.RegionObj);
source/include/acobject.h +1 -2
@@ -381,12 +381,11 @@ typedef struct acpi_object_thermal_zoneUINT8 FieldFlags;/* Access, update, and lock bits */ \UINT8 Attribute;/* From AccessAs keyword */ \UINT8 AccessByteWidth;/* Read/Write size in bytes */ \ +UINT8 StartFieldBitOffset;/* Bit offset within first field datum (0-63) */ \ACPI_NAMESPACE_NODE *Node;/* Link back to parent node */ \UINT32 BitLength;/* Length of field in bits */ \UINT32 BaseByteOffset;/* Byte offset within containing object */ \UINT32 Value;/* Value to store into the Bank or Index register */ \ -UINT8 StartFieldBitOffset;/* Bit offset within first field datum (0-63) */ \ -UINT8 AccessBitWidth;/* Read/Write size in bits (8-64) */ typedef struct acpi_object_field_common /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */
Len Brown
reviewerRe: [PATCH] ACPICA: Handle large field apertures.
Please cc: [email protected] on patches to the ACPICA tree.
thanks,
Len Brown, Intel Open Source Technology Center
Re: [PATCH] ACPICA: Handle large field apertures.
In reply to Alexey StarikovskiyQuoted 2 lines · Alexey Starikovskiy
Allow field reads of more than 64 bits if the field is properly aligned. EC driver will be able to read in bursts of up to 32 bytes with this patch.
Hi, Alexey,
Got a divide-by-zero fault when running aslts test.
$cd aslts/src/runtime/collections/functional/region $iasl MAIN.asl
$acpiexec -bex,mn00 region.aml
......
Floating point exception
It's because in the region test case, ObjDesc->CommonField.BitLength is 2048 and ObjDesc->CommonField.AccessByteWidth is UINT8,
ObjDesc->CommonField.AccessByteWidth =
ACPI_ROUND_BITS_UP_TO_BYTES(ObjDesc->CommonField.BitLength);
so this assignment causes ObjDesc->CommonField.AccessByteWidth to zero.
Although this test case nearly can not exist in real BIOS aml code, but how about add below code to do more check?
source/components/executer/exprep.c +7 -2
@@ -511,6 +511,7 @@ AcpiExPrepFieldValue (ACPI_OPERAND_OBJECT *ObjDesc;ACPI_OPERAND_OBJECT *SecondDesc =NULL ;UINT32 Type; +UINT32 AccessByteWidth;ACPI_STATUS Status;
@@ -568,8 +569,12 @@ AcpiExPrepFieldValue (/* allow full data read from EC address space */ if (ObjDesc->Field.RegionObj->Region.SpaceId ==ACPI_ADR_SPACE_EC ) {if (ObjDesc->CommonField.BitLength >8 ) { - ObjDesc->CommonField.AccessByteWidth = -ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength); + AccessByteWidth =ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength); + +/* The max of ObjDesc->CommonField.AccessByteWidth is 0xFF */ +if (!(AccessByteWidth >>8 )) { + ObjDesc->CommonField.AccessByteWidth = AccessByteWidth; + } } }
---
Lin Ming
Quoted 234 lines
Signed-off-by Alexey Starikovskiy <[email protected]>---
source/components/executer/exfldio.c | 67 ++++++++++++++++++++++------------ source/components/executer/exprep.c | 12 +++++- source/include/acobject.h | 3 +- 3 files changed, 54 insertions(+), 28 deletions(-)source/components/executer/exfldio.c +43
-24@@ -233,9 +233,8 @@ AcpiExSetupRegion (* (Region length is specified in bytes) */ if (RgnDesc->Region.Length < - (ObjDesc->CommonField.BaseByteOffset + - FieldDatumByteOffset + - ObjDesc->CommonField.AccessByteWidth)) + (ObjDesc->CommonField.BaseByteOffset + FieldDatumByteOffset + + ObjDesc->CommonField.AccessByteWidth)) {if (AcpiGbl_EnableInterpreterSlack) {@@ -795,6 +794,7 @@ AcpiExExtractFromField (UINT32 DatumCount;UINT32 FieldDatumCount;UINT32 i; +UINT32 AccessBitWidth;ACPI_FUNCTION_TRACE (ExExtractFromField);@@ -802,8 +802,7 @@ AcpiExExtractFromField (/* Validate target buffer and clear it */ -if (BufferLength < -ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength)) +if (BufferLength <ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength)) { ACPI_ERROR ((AE_INFO, "Field size %u (bits) is too large for buffer (%u)",@@ -813,15 +812,30 @@ AcpiExExtractFromField ( }ACPI_MEMSET (Buffer,0 , BufferLength); +/* Simple case handling */ + AccessBitWidth =ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); +if (ObjDesc->CommonField.StartFieldBitOffset ==0 && + ObjDesc->CommonField.BitLength == AccessBitWidth) + { + Status =AcpiExFieldDatumIo (ObjDesc,0 , Buffer,ACPI_READ ); +return_ACPI_STATUS (Status); + } + +/* Algo is limited to sizeof(UINT64), so cut the AccessByteWidth */ +if (ObjDesc->CommonField.AccessByteWidth >sizeof (UINT64 )) + { + ObjDesc->CommonField.AccessByteWidth =sizeof (UINT64 ); + AccessBitWidth =ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); + } +/* Compute the number of datums (access width data items) */ DatumCount =ACPI_ROUND_UP_TO ( - ObjDesc->CommonField.BitLength, - ObjDesc->CommonField.AccessBitWidth); + ObjDesc->CommonField.BitLength, AccessBitWidth); FieldDatumCount =ACPI_ROUND_UP_TO ( ObjDesc->CommonField.BitLength + ObjDesc->CommonField.StartFieldBitOffset, - ObjDesc->CommonField.AccessBitWidth); + AccessBitWidth);/* Priming read from the field */ @@ -854,12 +868,11 @@ AcpiExExtractFromField (* This avoids the differences in behavior between different compilers * concerning shift values larger than the target data width. */ -if ((ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset) <ACPI_INTEGER_BIT_SIZE ) +if (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset < +ACPI_INTEGER_BIT_SIZE ) { MergedDatum |= RawDatum << - (ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset); + (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset); }if (i == DatumCount)@@ -879,8 +892,7 @@ AcpiExExtractFromField (/* Mask off any extra bits in the last datum */ - BufferTailBits = ObjDesc->CommonField.BitLength % - ObjDesc->CommonField.AccessBitWidth; + BufferTailBits = ObjDesc->CommonField.BitLength % AccessBitWidth;if (BufferTailBits) { MergedDatum &=ACPI_MASK_BITS_ABOVE (BufferTailBits);@@ -928,6 +940,7 @@ AcpiExInsertIntoField (UINT32 FieldDatumCount;UINT32 i;UINT32 RequiredLength; +UINT32 AccessBitWidth;void *NewBuffer;@@ -965,18 +978,26 @@ AcpiExInsertIntoField ( BufferLength = RequiredLength; } +/* Algo is limited to sizeof(UINT64), so cut the AccessByteWidth */ +if (ObjDesc->CommonField.AccessByteWidth >sizeof (UINT64 )) + { + ObjDesc->CommonField.AccessByteWidth =sizeof (UINT64 ); + } + + AccessBitWidth =ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); +/* * Create the bitmasks used for bit insertion. * Note: This if/else is used to bypass compiler differences with the * shift operator */ -if (ObjDesc->CommonField.AccessBitWidth ==ACPI_INTEGER_BIT_SIZE ) +if (AccessBitWidth ==ACPI_INTEGER_BIT_SIZE ) { WidthMask =ACPI_UINT64_MAX ; }else { - WidthMask =ACPI_MASK_BITS_ABOVE (ObjDesc->CommonField.AccessBitWidth); + WidthMask =ACPI_MASK_BITS_ABOVE (AccessBitWidth); } Mask = WidthMask &@@ -985,11 +1006,11 @@ AcpiExInsertIntoField (/* Compute the number of datums (access width data items) */ DatumCount =ACPI_ROUND_UP_TO (ObjDesc->CommonField.BitLength, - ObjDesc->CommonField.AccessBitWidth); + AccessBitWidth); FieldDatumCount =ACPI_ROUND_UP_TO (ObjDesc->CommonField.BitLength + ObjDesc->CommonField.StartFieldBitOffset, - ObjDesc->CommonField.AccessBitWidth); + AccessBitWidth);/* Get initial Datum from the input buffer */ @@ -1024,12 +1045,11 @@ AcpiExInsertIntoField (* This avoids the differences in behavior between different compilers * concerning shift values larger than the target data width. */ -if ((ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset) <ACPI_INTEGER_BIT_SIZE ) +if (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset < +ACPI_INTEGER_BIT_SIZE ) { MergedDatum = RawDatum >> - (ObjDesc->CommonField.AccessBitWidth - - ObjDesc->CommonField.StartFieldBitOffset); + (AccessBitWidth - ObjDesc->CommonField.StartFieldBitOffset); }else {@@ -1055,8 +1075,7 @@ AcpiExInsertIntoField (/* Mask off any extra bits in the last datum */ BufferTailBits = (ObjDesc->CommonField.BitLength + - ObjDesc->CommonField.StartFieldBitOffset) % - ObjDesc->CommonField.AccessBitWidth; + ObjDesc->CommonField.StartFieldBitOffset) % AccessBitWidth;if (BufferTailBits) { Mask &=ACPI_MASK_BITS_ABOVE (BufferTailBits);source/components/executer/exprep.c +10
-2@@ -455,8 +455,6 @@ AcpiExPrepCommonFieldObject ( ObjDesc->CommonField.AccessByteWidth = (UINT8 )ACPI_DIV_8 (AccessBitWidth);/* 1, 2, 4, 8 */ - ObjDesc->CommonField.AccessBitWidth = (UINT8 ) AccessBitWidth; -/* * BaseByteOffset is the address of the start of the field within the * region. It is the byte address of the first *datum* (field-width data @@ -567,6 +565,16 @@ AcpiExPrepFieldValue ( ObjDesc->Field.RegionObj =AcpiNsGetAttachedObject (Info->RegionNode); +/* allow full data read from EC address space */ +if (ObjDesc->Field.RegionObj->Region.SpaceId ==ACPI_ADR_SPACE_EC ) { +if (ObjDesc->CommonField.BitLength >8 ) { + ObjDesc->CommonField.AccessByteWidth = +ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength); + } + } + + +/* An additional reference for the container */ AcpiUtAddReference (ObjDesc->Field.RegionObj);source/include/acobject.h +1
-3@@ -381,12 +381,11 @@ typedef struct acpi_object_thermal_zoneUINT8 FieldFlags;/* Access, update, and lock bits */ \UINT8 Attribute;/* From AccessAs keyword */ \UINT8 AccessByteWidth;/* Read/Write size in bytes */ \ +UINT8 StartFieldBitOffset;/* Bit offset within first field datum (0-63) */ \ACPI_NAMESPACE_NODE *Node;/* Link back to parent node */ \UINT32 BitLength;/* Length of field in bits */ \UINT32 BaseByteOffset;/* Byte offset within containing object */ \UINT32 Value;/* Value to store into the Bank or Index register */ \ -UINT8 StartFieldBitOffset;/* Bit offset within first field datum (0-63) */ \ -UINT8 AccessBitWidth;/* Read/Write size in bits (8-64) */ typedef struct acpi_object_field_common /* COMMON FIELD (for BUFFER, REGION, BANK, and INDEX fields) */ --To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ACPICA: Handle large field apertures.
Quoted 38 lines · Lin Ming
Quoted 2 lines · Alexey Starikovskiy
Allow field reads of more than 64 bits if the field is properly aligned. EC driver will be able to read in bursts of up to 32 bytes with this patch.
Hi, Alexey,
Got a divide-by-zero fault when running aslts test.
$cd aslts/src/runtime/collections/functional/region $iasl MAIN.asl
$acpiexec -bex,mn00 region.aml
......
Floating point exceptionIt's because in the region test case,
ObjDesc->CommonField.BitLengthis 2048 andObjDesc->CommonField.AccessByteWidthis UINT8,
ObjDesc->CommonField.AccessByteWidth=ACPI_ROUND_BITS_UP_TO_BYTES(ObjDesc->CommonField.BitLength);so this assignment causes
ObjDesc->CommonField.AccessByteWidthto zero.Although this test case nearly can not exist in real BIOS aml code, but how about add below code to do more check?
source/components/executer/exprep.c +1
-0@@ -511,6 +511,7 @@ AcpiExPrepFieldValue (ACPI_OPERAND_OBJECT *ObjDesc;ACPI_OPERAND_OBJECT *SecondDesc =NULL ;UINT32 Type; +UINT32 AccessByteWidth;ACPI_STATUS Status;
source/components/executer/exprep.c AcpiExPrepFieldValue ( · line 575
Quoted 9 lines
source/components/executer/exprep.c +4
-2@@ -568,8 +569,12 @@ AcpiExPrepFieldValue (/* allow full data read from EC address space */ if (ObjDesc->Field.RegionObj->Region.SpaceId ==ACPI_ADR_SPACE_EC ) {if (ObjDesc->CommonField.BitLength >8 ) { - ObjDesc->CommonField.AccessByteWidth = -ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength); + AccessByteWidth =ACPI_ROUND_BITS_UP_TO_BYTES (ObjDesc->CommonField.BitLength); + +/* The max of ObjDesc->CommonField.AccessByteWidth is 0xFF */ +if (!(AccessByteWidth >>8 )) {
Better to test AccessByteWidth as below,
+ if (!(AccessByteWidth & ~0xFF)) {
Quoted 7 lines
source/components/executer/exprep.c +2
-1+ ObjDesc->CommonField.AccessByteWidth = AccessByteWidth; + } } } ---Lin Ming
Re: [PATCH] ACPICA: Handle large field apertures.
Hi Ming,
26.05.2010 06:49, Lin Ming пишет:
Quoted 1 line
Better to test AccessByteWidth as below,
Why not just 'if (AccessByteWidth > 255)' ?
Quoted 3 lines
+ if (!(AccessByteWidth & ~0xFF)) {
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ACPICA: Handle large field apertures.
Quoted 5 lines · Alexey Starikovskiy
Hi Ming,
26.05.2010 06:49, Lin Ming пишет:
Quoted 1 line
Better to test AccessByteWidth as below,
Why not just 'if (AccessByteWidth > 255)' ?
OK, that's more clear.
Quoted 4 lines
Quoted 3 lines
+ if (!(AccessByteWidth & ~0xFF)) {
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH] ACPICA: Handle large field apertures.
Shouldn't this be:
if (AccessByteWidth < 256)
{
ObjDesc->CommonField.AccessByteWidth = (UINT8) AccessByteWidth;
}Quoted 7 lines
-----Original Message-----
From: Lin, Ming M
Sent: Wednesday, May 26, 2010 12:32 AM
To: Alexey Starikovskiy
Cc: Moore, Robert; Len Brown; [email protected]
Subject: Re: [PATCH] ACPICA: Handle large field apertures.
Quoted 13 lines
Quoted 5 lines · Alexey Starikovskiy
Hi Ming,
26.05.2010 06:49, Lin Ming пишет:
Quoted 1 line
Better to test AccessByteWidth as below,
Why not just 'if (AccessByteWidth > 255)' ?
OK, that's more clear.
Quoted 4 lines
Quoted 3 lines
+ if (!(AccessByteWidth & ~0xFF)) {
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html