linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ACPICA: Handle large field appertures.
@ 2010-05-18 20:31 Alexey Starikovskiy
  2010-05-19 16:28 ` Bjorn Helgaas
  0 siblings, 1 reply; 11+ messages in thread
From: Alexey Starikovskiy @ 2010-05-18 20:31 UTC (permalink / raw)
  To: Robert Moore, Len Brown; +Cc: Linux-acpi

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
---

 source/components/executer/exfldio.c |   49 ++++++++++++++++++++++++----------
 source/components/executer/exprep.c  |   12 +++++++-
 source/include/acobject.h            |    3 +-
 3 files changed, 46 insertions(+), 18 deletions(-)


diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c
index 0cff9f9..5b08445 100644
--- a/source/components/executer/exfldio.c
+++ b/source/components/executer/exfldio.c
@@ -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,31 @@ AcpiExExtractFromField (
     }
     ACPI_MEMSET (Buffer, 0, BufferLength);
 
+    /* Simple case handling */
+
+    if (ObjDesc->CommonField.StartFieldBitOffset == 0 &&
+	ObjDesc->CommonField.BitLength ==
+	    8 * ObjDesc->CommonField.AccessByteWidth)
+    {
+	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);
+    }
+
     /* Compute the number of datums (access width data items) */
 
     DatumCount = ACPI_ROUND_UP_TO (
                         ObjDesc->CommonField.BitLength,
-                        ObjDesc->CommonField.AccessBitWidth);
+                        ObjDesc->CommonField.AccessByteWidth * 8);
     FieldDatumCount = ACPI_ROUND_UP_TO (
                         ObjDesc->CommonField.BitLength +
                         ObjDesc->CommonField.StartFieldBitOffset,
-                        ObjDesc->CommonField.AccessBitWidth);
+                        ObjDesc->CommonField.AccessByteWidth * 8);
 
     /* Priming read from the field */
 
@@ -854,11 +869,11 @@ AcpiExExtractFromField (
          * This avoids the differences in behavior between different compilers
          * concerning shift values larger than the target data width.
          */
-        if ((ObjDesc->CommonField.AccessBitWidth -
+        if ((ObjDesc->CommonField.AccessByteWidth * 8 -
             ObjDesc->CommonField.StartFieldBitOffset) < ACPI_INTEGER_BIT_SIZE)
         {
             MergedDatum |= RawDatum <<
-                (ObjDesc->CommonField.AccessBitWidth -
+                (ObjDesc->CommonField.AccessByteWidth * 8 -
                     ObjDesc->CommonField.StartFieldBitOffset);
         }
 
@@ -880,7 +895,7 @@ AcpiExExtractFromField (
     /* Mask off any extra bits in the last datum */
 
     BufferTailBits = ObjDesc->CommonField.BitLength %
-                        ObjDesc->CommonField.AccessBitWidth;
+                        (ObjDesc->CommonField.AccessByteWidth * 8);
     if (BufferTailBits)
     {
         MergedDatum &= ACPI_MASK_BITS_ABOVE (BufferTailBits);
@@ -965,18 +980,24 @@ AcpiExInsertIntoField (
         BufferLength = RequiredLength;
     }
 
+    /* Algo is limited to sizeof(UINT64), so cut the AccessByteWidth */
+    if (ObjDesc->CommonField.AccessByteWidth > sizeof(UINT64))
+    {
+	ObjDesc->CommonField.AccessByteWidth = sizeof(UINT64);
+    }
+
     /*
      * 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 (ObjDesc->CommonField.AccessByteWidth * 8 == ACPI_INTEGER_BIT_SIZE)
     {
         WidthMask = ACPI_UINT64_MAX;
     }
     else
     {
-        WidthMask = ACPI_MASK_BITS_ABOVE (ObjDesc->CommonField.AccessBitWidth);
+        WidthMask = ACPI_MASK_BITS_ABOVE (ObjDesc->CommonField.AccessByteWidth * 8);
     }
 
     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);
+                    ObjDesc->CommonField.AccessByteWidth * 8);
 
     FieldDatumCount = ACPI_ROUND_UP_TO (ObjDesc->CommonField.BitLength +
                         ObjDesc->CommonField.StartFieldBitOffset,
-                        ObjDesc->CommonField.AccessBitWidth);
+                        ObjDesc->CommonField.AccessByteWidth * 8);
 
     /* Get initial Datum from the input buffer */
 
@@ -1024,11 +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 -
+        if ((ObjDesc->CommonField.AccessByteWidth * 8 -
             ObjDesc->CommonField.StartFieldBitOffset) < ACPI_INTEGER_BIT_SIZE)
         {
             MergedDatum = RawDatum >>
-                (ObjDesc->CommonField.AccessBitWidth -
+                (ObjDesc->CommonField.AccessByteWidth * 8 -
                     ObjDesc->CommonField.StartFieldBitOffset);
         }
         else
@@ -1056,7 +1077,7 @@ AcpiExInsertIntoField (
 
     BufferTailBits = (ObjDesc->CommonField.BitLength +
             ObjDesc->CommonField.StartFieldBitOffset) %
-                ObjDesc->CommonField.AccessBitWidth;
+                (ObjDesc->CommonField.AccessByteWidth * 8);
     if (BufferTailBits)
     {
         Mask &= ACPI_MASK_BITS_ABOVE (BufferTailBits);
diff --git a/source/components/executer/exprep.c b/source/components/executer/exprep.c
index 6cc3719..b133c06 100644
--- a/source/components/executer/exprep.c
+++ b/source/components/executer/exprep.c
@@ -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);
diff --git a/source/include/acobject.h b/source/include/acobject.h
index 502132a..21c3706 100644
--- a/source/include/acobject.h
+++ b/source/include/acobject.h
@@ -381,12 +381,11 @@ typedef struct acpi_object_thermal_zone
     UINT8                           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) */


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] ACPICA: Handle large field appertures.
  2010-05-18 20:31 [PATCH] ACPICA: Handle large field appertures Alexey Starikovskiy
@ 2010-05-19 16:28 ` Bjorn Helgaas
  2010-05-19 17:35   ` Alexey Starikovskiy
  0 siblings, 1 reply; 11+ messages in thread
From: Bjorn Helgaas @ 2010-05-19 16:28 UTC (permalink / raw)
  To: Alexey Starikovskiy; +Cc: Robert Moore, Len Brown, Linux-acpi

On Tuesday, May 18, 2010 02:31:29 pm Alexey Starikovskiy wrote:
> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>

What happened to the changelogs on this and the previous few patches?

s/appertures/apertures/

Bjorn

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ACPICA: Handle large field appertures.
  2010-05-19 16:28 ` Bjorn Helgaas
@ 2010-05-19 17:35   ` Alexey Starikovskiy
  0 siblings, 0 replies; 11+ messages in thread
From: Alexey Starikovskiy @ 2010-05-19 17:35 UTC (permalink / raw)
  To: Bjorn Helgaas; +Cc: Alexey Starikovskiy, Robert Moore, Len Brown, Linux-acpi

19.05.2010 20:28, Bjorn Helgaas пишет:
> On Tuesday, May 18, 2010 02:31:29 pm Alexey Starikovskiy wrote:
>    
>> Signed-off-by: Alexey Starikovskiy<astarikovskiy@suse.de>
>>      
> What happened to the changelogs on this and the previous few patches?
>
> s/appertures/apertures/
>
> Bjorn
> --
> 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
>    
These were "old" patches, about a year ago... I sent them just as a 
reminder to Bob, not as request
for inclusion.

Thanks for spell check, will update.

Alex.
--
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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH] ACPICA: Handle large field appertures.
       [not found] <4911F71203A09E4D9981D27F9D830858709F2D04@orsmsx503.amr.corp.intel.com>
@ 2010-05-25 10:56 ` Alexey Starikovskiy
  2010-05-25 10:59 ` [PATCH] ACPICA: Handle large field apertures Alexey Starikovskiy
  1 sibling, 0 replies; 11+ messages in thread
From: Alexey Starikovskiy @ 2010-05-25 10:56 UTC (permalink / raw)
  To: Robert Moore, Len Brown; +Cc: Linux-acpi

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
---

 source/components/executer/exfldio.c |   67 ++++++++++++++++++++++------------
 source/components/executer/exprep.c  |   12 +++++-
 source/include/acobject.h            |    3 +-
 3 files changed, 54 insertions(+), 28 deletions(-)


diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c
index 3276bc4..2e70763 100644
--- a/source/components/executer/exfldio.c
+++ b/source/components/executer/exfldio.c
@@ -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);
diff --git a/source/components/executer/exprep.c b/source/components/executer/exprep.c
index 0709676..95fa502 100644
--- a/source/components/executer/exprep.c
+++ b/source/components/executer/exprep.c
@@ -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);
diff --git a/source/include/acobject.h b/source/include/acobject.h
index cb6e199..e9c3d0a 100644
--- a/source/include/acobject.h
+++ b/source/include/acobject.h
@@ -381,12 +381,11 @@ typedef struct acpi_object_thermal_zone
     UINT8                           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) */


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH] ACPICA: Handle large field apertures.
       [not found] <4911F71203A09E4D9981D27F9D830858709F2D04@orsmsx503.amr.corp.intel.com>
  2010-05-25 10:56 ` [PATCH] ACPICA: Handle large field appertures Alexey Starikovskiy
@ 2010-05-25 10:59 ` Alexey Starikovskiy
  2010-05-25 16:16   ` Len Brown
  2010-05-26  2:39   ` Lin Ming
  1 sibling, 2 replies; 11+ messages in thread
From: Alexey Starikovskiy @ 2010-05-25 10:59 UTC (permalink / raw)
  To: Robert Moore, Len Brown; +Cc: Linux-acpi

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.

Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
---

 source/components/executer/exfldio.c |   67 ++++++++++++++++++++++------------
 source/components/executer/exprep.c  |   12 +++++-
 source/include/acobject.h            |    3 +-
 3 files changed, 54 insertions(+), 28 deletions(-)


diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c
index 3276bc4..2e70763 100644
--- a/source/components/executer/exfldio.c
+++ b/source/components/executer/exfldio.c
@@ -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);
diff --git a/source/components/executer/exprep.c b/source/components/executer/exprep.c
index 0709676..95fa502 100644
--- a/source/components/executer/exprep.c
+++ b/source/components/executer/exprep.c
@@ -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);
diff --git a/source/include/acobject.h b/source/include/acobject.h
index cb6e199..e9c3d0a 100644
--- a/source/include/acobject.h
+++ b/source/include/acobject.h
@@ -381,12 +381,11 @@ typedef struct acpi_object_thermal_zone
     UINT8                           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) */


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] ACPICA: Handle large field apertures.
  2010-05-25 10:59 ` [PATCH] ACPICA: Handle large field apertures Alexey Starikovskiy
@ 2010-05-25 16:16   ` Len Brown
  2010-05-26  2:39   ` Lin Ming
  1 sibling, 0 replies; 11+ messages in thread
From: Len Brown @ 2010-05-25 16:16 UTC (permalink / raw)
  To: Alexey Starikovskiy; +Cc: Robert Moore, Linux-acpi

Please cc: devel@acpica.org on patches to the ACPICA tree.

thanks,
Len Brown, Intel Open Source Technology Center


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ACPICA: Handle large field apertures.
  2010-05-25 10:59 ` [PATCH] ACPICA: Handle large field apertures Alexey Starikovskiy
  2010-05-25 16:16   ` Len Brown
@ 2010-05-26  2:39   ` Lin Ming
  2010-05-26  2:49     ` Lin Ming
  1 sibling, 1 reply; 11+ messages in thread
From: Lin Ming @ 2010-05-26  2:39 UTC (permalink / raw)
  To: Alexey Starikovskiy; +Cc: Moore, Robert, Len Brown, Linux-acpi@vger.kernel.org

On Tue, 2010-05-25 at 18:59 +0800, Alexey Starikovskiy wrote:
> 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?

diff --git a/source/components/executer/exprep.c b/source/components/executer/exprep.c
index 95fa502..65cbe39 100644
--- a/source/components/executer/exprep.c
+++ b/source/components/executer/exprep.c
@@ -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

> 
> Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de>
> ---
> 
>  source/components/executer/exfldio.c |   67 ++++++++++++++++++++++------------
>  source/components/executer/exprep.c  |   12 +++++-
>  source/include/acobject.h            |    3 +-
>  3 files changed, 54 insertions(+), 28 deletions(-)
> 
> 
> diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c
> index 3276bc4..2e70763 100644
> --- a/source/components/executer/exfldio.c
> +++ b/source/components/executer/exfldio.c
> @@ -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);
> diff --git a/source/components/executer/exprep.c b/source/components/executer/exprep.c
> index 0709676..95fa502 100644
> --- a/source/components/executer/exprep.c
> +++ b/source/components/executer/exprep.c
> @@ -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);
> diff --git a/source/include/acobject.h b/source/include/acobject.h
> index cb6e199..e9c3d0a 100644
> --- a/source/include/acobject.h
> +++ b/source/include/acobject.h
> @@ -381,12 +381,11 @@ typedef struct acpi_object_thermal_zone
>      UINT8                           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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] ACPICA: Handle large field apertures.
  2010-05-26  2:39   ` Lin Ming
@ 2010-05-26  2:49     ` Lin Ming
  2010-05-26  7:30       ` Alexey Starikovskiy
  0 siblings, 1 reply; 11+ messages in thread
From: Lin Ming @ 2010-05-26  2:49 UTC (permalink / raw)
  To: Alexey Starikovskiy; +Cc: Moore, Robert, Len Brown, Linux-acpi@vger.kernel.org

On Wed, 2010-05-26 at 10:39 +0800, Lin Ming wrote:
> On Tue, 2010-05-25 at 18:59 +0800, Alexey Starikovskiy wrote:
> > 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?
> 
> diff --git a/source/components/executer/exprep.c b/source/components/executer/exprep.c
> index 95fa502..65cbe39 100644
> --- a/source/components/executer/exprep.c
> +++ b/source/components/executer/exprep.c
> @@ -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)) {

Better to test AccessByteWidth as below,

+                if (!(AccessByteWidth & ~0xFF)) {


> +		    ObjDesc->CommonField.AccessByteWidth = AccessByteWidth;
> +                }
>  	    }
>  	}
>  
> ---
> Lin Ming



^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ACPICA: Handle large field apertures.
  2010-05-26  2:49     ` Lin Ming
@ 2010-05-26  7:30       ` Alexey Starikovskiy
  2010-05-26  7:31         ` Lin Ming
  0 siblings, 1 reply; 11+ messages in thread
From: Alexey Starikovskiy @ 2010-05-26  7:30 UTC (permalink / raw)
  To: Lin Ming; +Cc: Moore, Robert, Len Brown, Linux-acpi@vger.kernel.org

Hi Ming,

26.05.2010 06:49, Lin Ming пишет:
> Better to test AccessByteWidth as below,
Why not just 'if (AccessByteWidth > 255)' ?
> 
> +                if (!(AccessByteWidth & ~0xFF)) {
> 

--
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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] ACPICA: Handle large field apertures.
  2010-05-26  7:30       ` Alexey Starikovskiy
@ 2010-05-26  7:31         ` Lin Ming
  2010-05-26 17:51           ` Moore, Robert
  0 siblings, 1 reply; 11+ messages in thread
From: Lin Ming @ 2010-05-26  7:31 UTC (permalink / raw)
  To: Alexey Starikovskiy; +Cc: Moore, Robert, Len Brown, Linux-acpi@vger.kernel.org

On Wed, 2010-05-26 at 15:30 +0800, Alexey Starikovskiy wrote:
> Hi Ming,
> 
> 26.05.2010 06:49, Lin Ming пишет:
> > Better to test AccessByteWidth as below,
> Why not just 'if (AccessByteWidth > 255)' ?

OK, that's more clear.

> > 
> > +                if (!(AccessByteWidth & ~0xFF)) {
> > 
> 

--
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

^ permalink raw reply	[flat|nested] 11+ messages in thread

* RE: [PATCH] ACPICA: Handle large field apertures.
  2010-05-26  7:31         ` Lin Ming
@ 2010-05-26 17:51           ` Moore, Robert
  0 siblings, 0 replies; 11+ messages in thread
From: Moore, Robert @ 2010-05-26 17:51 UTC (permalink / raw)
  To: Lin, Ming M, Alexey Starikovskiy; +Cc: Len Brown, Linux-acpi@vger.kernel.org

Shouldn't this be:

if (AccessByteWidth < 256)
{
    ObjDesc->CommonField.AccessByteWidth = (UINT8) AccessByteWidth;
}


>-----Original Message-----
>From: Lin, Ming M
>Sent: Wednesday, May 26, 2010 12:32 AM
>To: Alexey Starikovskiy
>Cc: Moore, Robert; Len Brown; Linux-acpi@vger.kernel.org
>Subject: Re: [PATCH] ACPICA: Handle large field apertures.
>
>On Wed, 2010-05-26 at 15:30 +0800, Alexey Starikovskiy wrote:
>> Hi Ming,
>>
>> 26.05.2010 06:49, Lin Ming пишет:
>> > Better to test AccessByteWidth as below,
>> Why not just 'if (AccessByteWidth > 255)' ?
>
>OK, that's more clear.
>
>> >
>> > +                if (!(AccessByteWidth & ~0xFF)) {
>> >
>>

--
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

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2010-05-26 17:51 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <4911F71203A09E4D9981D27F9D830858709F2D04@orsmsx503.amr.corp.intel.com>
2010-05-25 10:56 ` [PATCH] ACPICA: Handle large field appertures Alexey Starikovskiy
2010-05-25 10:59 ` [PATCH] ACPICA: Handle large field apertures Alexey Starikovskiy
2010-05-25 16:16   ` Len Brown
2010-05-26  2:39   ` Lin Ming
2010-05-26  2:49     ` Lin Ming
2010-05-26  7:30       ` Alexey Starikovskiy
2010-05-26  7:31         ` Lin Ming
2010-05-26 17:51           ` Moore, Robert
2010-05-18 20:31 [PATCH] ACPICA: Handle large field appertures Alexey Starikovskiy
2010-05-19 16:28 ` Bjorn Helgaas
2010-05-19 17:35   ` Alexey Starikovskiy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).