[commit] r6293 - trunk/src/southbridge/amd/sb800

[repository service]

Author: zbao
Date: Mon Jan 24 08:50:07 2011
New Revision: 6293
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6293

Log:
Change fadt revision back to 3.
The AcpiPmaCntBlk have to be set.
Further research is needed to find out why.

Signed-off-by: Zheng Bao 
Acked-by: Zheng Bao

Modified:
   trunk/src/southbridge/amd/sb800/early_setup.c
   trunk/src/southbridge/amd/sb800/fadt.c

Modified: trunk/src/southbridge/amd/sb800/early_setup.c
==============================================================================
--- trunk/src/southbridge/amd/sb800/early_setup.c	Sun Jan 23 07:47:09 2011	(r6292)
+++ trunk/src/southbridge/amd/sb800/early_setup.c	Mon Jan 24 08:50:07 2011	(r6293)
@@ -55,9 +55,12 @@
    pmio_write(0x66, ACPI_CPU_CONTROL & 0xFF);
    pmio_write(0x67, ACPI_CPU_CONTROL >> 8);

-	pmio_write(0x6A, 0);	/* AcpiSmiCmdLo */
+	pmio_write(0x6A, 0xB0);	/* AcpiSmiCmdLo */
    pmio_write(0x6B, 0);	/* AcpiSmiCmdHi */

+	pmio_write(0x6E, 0xB8);	/* AcpiPmaCntBlkLo */
+	pmio_write(0x6F, 0);	/* AcpiPmaCntBlkHi */
+
    pmio_write(0x6C, ACPI_PMA_CNT_BLK & 0xFF);
    pmio_write(0x6D, ACPI_PMA_CNT_BLK >> 8);

Modified: trunk/src/southbridge/amd/sb800/fadt.c
==============================================================================
--- trunk/src/southbridge/amd/sb800/fadt.c	Sun Jan 23 07:47:09 2011	(r6292)
+++ trunk/src/southbridge/amd/sb800/fadt.c	Mon Jan 24 08:50:07 2011	(r6293)
@@ -38,7 +38,7 @@
    memset((void *)fadt, 0, sizeof(acpi_fadt_t));
    memcpy(header->signature, "FACP", 4);
    header->length = 244;
-	header->revision = 1;	/* TODO: 3 will make linux hang. */
+	header->revision = 3;
    memcpy(header->oem_id, OEM_ID, 6);
    memcpy(header->oem_table_id, "COREBOOT", 8);
    memcpy(header->asl_compiler_id, ASLC, 4);

[Myles Watson]

> Log:
> Change fadt revision back to 3.
> The AcpiPmaCntBlk have to be set.
> Further research is needed to find out why.
>
> Signed-off-by: Zheng Bao 
> Acked-by: Zheng Bao
>
> Modified:
>    trunk/src/southbridge/amd/sb800/early_setup.c
>    trunk/src/southbridge/amd/sb800/fadt.c
> Modified: trunk/src/southbridge/amd/sb800/early_setup.c
>
> ====
> --- trunk/src/southbridge/amd/sb800/early_setup.c	Sun Jan 23 07:47:09
> 2011	(r6292)
> +++ trunk/src/southbridge/amd/sb800/early_setup.c	Mon Jan 24 08:50:07
> 2011	(r6293)
> @@ -55,9 +55,12 @@
>    pmio_write(0x66, ACPI_CPU_CONTROL & 0xFF);
>    pmio_write(0x67, ACPI_CPU_CONTROL >> 8);
> pmio_write(0x6A, 0);	/* AcpiSmiCmdLo */
>
> pmio_write(0x6A, 0xB0);	/* AcpiSmiCmdLo */
> pmio_write(0x6B, 0);	/* AcpiSmiCmdHi */
>
> pmio_write(0x6E, 0xB8);	/* AcpiPmaCntBlkLo */
>
> pmio_write(0x6F, 0);	/* AcpiPmaCntBlkHi */
>
> pmio_write(0x6C, ACPI_PMA_CNT_BLK & 0xFF);
>  pmio_write(0x6D, ACPI_PMA_CNT_BLK >> 8);

What's the difference between AcpiPmaCntBlk & ACPI_PMA_CNT_BLK?

Thanks,
Myles