[PATCH 642/642] To follow the ACPI spec 3,4&5 and keep theoutput mismatch warning when 64bit address and 32bit address ofvalid but not equal to each other.

[ethan . zhao]

Signed-off-by: ethan.zhao <ethan.kernel@xxxxxxxxx>
---
 drivers/acpi/acpica/tbfadt.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/acpica/tbfadt.c b/drivers/acpi/acpica/tbfadt.c
index 3906518..f23f512 100644
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
@@ -512,7 +512,7 @@ static void acpi_tb_validate_fadt(void)
         * the 32-bit and 64-bit address fields
(FIRMWARE_CTRL/X_FIRMWARE_CTRL and
         * DSDT/X_DSDT) would indicate the presence of two FACS or two
DSDT tables.
         */
-       if (acpi_gbl_FADT.facs &&
+       if ((acpi_gbl_FADT.facs && acpi_gbl_FADT.Xfacs) &&
            (acpi_gbl_FADT.Xfacs != (u64)acpi_gbl_FADT.facs)) {
                ACPI_BIOS_WARNING((AE_INFO,
                                   "32/64X FACS address mismatch in FADT - "
@@ -523,7 +523,7 @@ static void acpi_tb_validate_fadt(void)
                acpi_gbl_FADT.Xfacs = (u64)acpi_gbl_FADT.facs;
        }

-       if (acpi_gbl_FADT.dsdt &&
+       if ((acpi_gbl_FADT.dsdt && acpi_gbl_FADT.Xdsdt) &&
            (acpi_gbl_FADT.Xdsdt != (u64)acpi_gbl_FADT.dsdt)) {
                ACPI_BIOS_WARNING((AE_INFO,
                                   "32/64X DSDT address mismatch in FADT - "
--
1.7.1

--f46d0447f21aae332f04ce580e3c
Content-Type: application/octet-stream; 
	name="To-follow-the-ACPI-spec-3-4-5-and-keep-the-compatibi.patch"
Content-Disposition: attachment; 
	filename="To-follow-the-ACPI-spec-3-4-5-and-keep-the-compatibi.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_h9ggndbr0

RnJvbSBjMTExNjIxMWE3YjMyOWMyNmIwMzcwNTY1YzM2YjA4NGNlYjA4ZjcxIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBldGhhbi56aGFvIDxldGhhbi5rZXJuZWxAZ21haWwuY29tPgpE
YXRlOiBUdWUsIDEzIE5vdiAyMDEyIDIyOjIxOjEyIC0wODAwClN1YmplY3Q6IFtQQVRDSCA2NDIv
NjQyXSBUbyBmb2xsb3cgdGhlIEFDUEkgc3BlYyAzLDQmNSBhbmQga2VlcCB0aGUgY29tcGF0aWJp
bGl0eSBhbmQgbGF0aXR1ZGUsb25seQogb3V0cHV0IG1pc21hdGNoIHdhcm5pbmcgd2hlbiA2NGJp
dCBhZGRyZXNzIGFuZCAzMmJpdCBhZGRyZXNzIG9mIEZBQ1MvRFNEVCBhcmUgYWxsCiB2YWxpZCBi
dXQgbm90IGVxdWFsIHRvIGVhY2ggb3RoZXIuCgoKU2lnbmVkLW9mZi1ieTogZXRoYW4uemhhbyA8
ZXRoYW4ua2VybmVsQGdtYWlsLmNvbT4KLS0tCiBkcml2ZXJzL2FjcGkvYWNwaWNhL3RiZmFkdC5j
IHwgICAgNCArKy0tCiAxIGZpbGVzIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlv
bnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2FjcGkvYWNwaWNhL3RiZmFkdC5jIGIvZHJpdmVy
cy9hY3BpL2FjcGljYS90YmZhZHQuYwppbmRleCAzOTA2NTE4Li5mMjNmNTEyIDEwMDY0NAotLS0g
YS9kcml2ZXJzL2FjcGkvYWNwaWNhL3RiZmFkdC5jCisrKyBiL2RyaXZlcnMvYWNwaS9hY3BpY2Ev
dGJmYWR0LmMKQEAgLTUxMiw3ICs1MTIsNyBAQCBzdGF0aWMgdm9pZCBhY3BpX3RiX3ZhbGlkYXRl
X2ZhZHQodm9pZCkKIAkgKiB0aGUgMzItYml0IGFuZCA2NC1iaXQgYWRkcmVzcyBmaWVsZHMgKEZJ
Uk1XQVJFX0NUUkwvWF9GSVJNV0FSRV9DVFJMIGFuZAogCSAqIERTRFQvWF9EU0RUKSB3b3VsZCBp
bmRpY2F0ZSB0aGUgcHJlc2VuY2Ugb2YgdHdvIEZBQ1Mgb3IgdHdvIERTRFQgdGFibGVzLgogCSAq
LwotCWlmIChhY3BpX2dibF9GQURULmZhY3MgJiYKKwlpZiAoKGFjcGlfZ2JsX0ZBRFQuZmFjcyAm
JiBhY3BpX2dibF9GQURULlhmYWNzKSAmJgogCSAgICAoYWNwaV9nYmxfRkFEVC5YZmFjcyAhPSAo
dTY0KWFjcGlfZ2JsX0ZBRFQuZmFjcykpIHsKIAkJQUNQSV9CSU9TX1dBUk5JTkcoKEFFX0lORk8s
CiAJCQkJICAgIjMyLzY0WCBGQUNTIGFkZHJlc3MgbWlzbWF0Y2ggaW4gRkFEVCAtICIKQEAgLTUy
Myw3ICs1MjMsNyBAQCBzdGF0aWMgdm9pZCBhY3BpX3RiX3ZhbGlkYXRlX2ZhZHQodm9pZCkKIAkJ
YWNwaV9nYmxfRkFEVC5YZmFjcyA9ICh1NjQpYWNwaV9nYmxfRkFEVC5mYWNzOwogCX0KIAotCWlm
IChhY3BpX2dibF9GQURULmRzZHQgJiYKKwlpZiAoKGFjcGlfZ2JsX0ZBRFQuZHNkdCAmJiBhY3Bp
X2dibF9GQURULlhkc2R0KSAmJgogCSAgICAoYWNwaV9nYmxfRkFEVC5YZHNkdCAhPSAodTY0KWFj
cGlfZ2JsX0ZBRFQuZHNkdCkpIHsKIAkJQUNQSV9CSU9TX1dBUk5JTkcoKEFFX0lORk8sCiAJCQkJ
ICAgIjMyLzY0WCBEU0RUIGFkZHJlc3MgbWlzbWF0Y2ggaW4gRkFEVCAtICIKLS0gCjEuNy4xCgo=
--f46d0447f21aae332f04ce580e3c--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/