mb/x/acpi_tables: Rename to mainboard_fill_gnvs()

Rename acpi_create_gnvs() functions under mb/ to reflect
their changed functionality.

Remove now empty mb/acpi_tables.c files.

Change-Id: Ia366867ef73d1ade9805dc29b8e14b3073f44f60
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48707
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2020-06-29 02:56:49 +03:00 committed by Nico Huber
parent 8a5f157fdf
commit a9766c7ada
105 changed files with 92 additions and 203 deletions

View File

@ -36,6 +36,7 @@ __weak uint32_t *gnvs_cbmc_ptr(struct global_nvs *gnvs_)
} }
__weak void soc_fill_gnvs(struct global_nvs *gnvs_) { } __weak void soc_fill_gnvs(struct global_nvs *gnvs_) { }
__weak void mainboard_fill_gnvs(struct global_nvs *gnvs_) { }
void *gnvs_get_or_create(void) void *gnvs_get_or_create(void)
{ {

View File

@ -35,5 +35,6 @@ void acpi_create_gnvs(struct global_nvs *gnvs);
void acpi_init_gnvs(struct global_nvs *gnvs); void acpi_init_gnvs(struct global_nvs *gnvs);
void soc_fill_gnvs(struct global_nvs *gnvs); void soc_fill_gnvs(struct global_nvs *gnvs);
void mainboard_fill_gnvs(struct global_nvs *gnvs);
#endif #endif

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801jx/nvs.h> #include <southbridge/intel/i82801jx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable both COM ports */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Disable USB ports in S3 by default */ /* Disable USB ports in S3 by default */
gnvs->s3u0 = 0; gnvs->s3u0 = 0;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/lynxpoint/nvs.h> #include <southbridge/intel/lynxpoint/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->cmap = 0x01; /* Enable COM 1 port */ gnvs->cmap = 0x01; /* Enable COM 1 port */

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/lynxpoint/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801jx/nvs.h> #include <southbridge/intel/i82801jx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */

View File

@ -4,7 +4,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801jx/nvs.h> #include <southbridge/intel/i82801jx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->cmap = 0x01; /* Enable COM 1 port */ gnvs->cmap = 0x01; /* Enable COM 1 port */

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* critical temp that will shutdown the pc == 95C degrees */ /* critical temp that will shutdown the pc == 95C degrees */
gnvs->tcrt = 95; gnvs->tcrt = 95;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -5,7 +5,7 @@
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/nvs.h> #include <soc/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);

View File

@ -4,7 +4,7 @@
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
/* FIXME: check this function. */ /* FIXME: check this function. */
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -13,7 +13,7 @@
#include "../qemu-i440fx/acpi.h" #include "../qemu-i440fx/acpi.h"
#include <southbridge/intel/i82801ix/nvs.h> #include <southbridge/intel/i82801ix/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->apic = 1; gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */ gnvs->mpen = 1; /* Enable Multi Processing */

View File

@ -6,7 +6,7 @@
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/nvs.h> #include <soc/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->cmap = 1; /* COM 1 port */ gnvs->cmap = 1; /* COM 1 port */

View File

@ -9,7 +9,7 @@
#include "mainboard.h" #include "mainboard.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable COM port(s) */ /* Enable COM port(s) */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -4,7 +4,7 @@
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = CRITICAL_TEMPERATURE; gnvs->tcrt = CRITICAL_TEMPERATURE;
gnvs->tpsv = PASSIVE_TEMPERATURE; gnvs->tpsv = PASSIVE_TEMPERATURE;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->lptp = 0; /* LPT port */ gnvs->lptp = 0; /* LPT port */

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -6,7 +6,7 @@
#include <soc/nvs.h> #include <soc/nvs.h>
#include <variant/thermal.h> #include <variant/thermal.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;

View File

@ -7,7 +7,7 @@
#include <southbridge/intel/lynxpoint/pch.h> #include <southbridge/intel/lynxpoint/pch.h>
#include <variant/thermal.h> #include <variant/thermal.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;

View File

@ -4,7 +4,7 @@
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Disable USB ports in S3 by default */ /* Disable USB ports in S3 by default */
gnvs->s3u0 = 0; gnvs->s3u0 = 0;

View File

@ -6,7 +6,7 @@
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/nvs.h> #include <soc/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);

View File

@ -7,7 +7,7 @@
#include <soc/nvs.h> #include <soc/nvs.h>
#include <variant/thermal.h> #include <variant/thermal.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;

View File

@ -4,7 +4,7 @@
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Disable USB ports in S3 by default */ /* Disable USB ports in S3 by default */
gnvs->s3u0 = 0; gnvs->s3u0 = 0;

View File

@ -11,7 +11,7 @@
#include "thermal.h" #include "thermal.h"
#include "onboard.h" #include "onboard.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Disable USB ports in S3 by default */ /* Disable USB ports in S3 by default */
gnvs->s3u0 = 0; gnvs->s3u0 = 0;

View File

@ -5,7 +5,7 @@
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/nvs.h> #include <soc/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);

View File

@ -8,7 +8,7 @@
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;

View File

@ -12,7 +12,7 @@
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Disable USB ports in S3 by default */ /* Disable USB ports in S3 by default */
gnvs->s3u0 = 0; gnvs->s3u0 = 0;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/lynxpoint/nvs.h> #include <southbridge/intel/lynxpoint/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
// the lid is open by default. // the lid is open by default.
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable both COM ports */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;

View File

@ -8,7 +8,7 @@
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -4,7 +4,7 @@
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable USB ports in S3 by default */ /* Enable USB ports in S3 by default */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->cmap = 0x01; /* Enable COM 1 port */ gnvs->cmap = 0x01; /* Enable COM 1 port */

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801jx/nvs.h> #include <southbridge/intel/i82801jx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */ gnvs->osys = 2002; /* At least WINXP SP2 (HPET fix) */

View File

@ -7,7 +7,7 @@
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;

View File

@ -8,7 +8,7 @@
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/nvs.h> #include <soc/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);

View File

@ -10,7 +10,7 @@
#include <boardid.h> #include <boardid.h>
#include "onboard.h" #include "onboard.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);

View File

@ -7,7 +7,7 @@
#include <soc/nvs.h> #include <soc/nvs.h>
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable USB ports in S3 */ /* Enable USB ports in S3 */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable both COM ports */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;

View File

@ -4,7 +4,7 @@
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = CRITICAL_TEMPERATURE; gnvs->tcrt = CRITICAL_TEMPERATURE;
gnvs->tpsv = PASSIVE_TEMPERATURE; gnvs->tpsv = PASSIVE_TEMPERATURE;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -7,7 +7,7 @@
#include <device/device.h> #include <device/device.h>
#include <southbridge/intel/i82801ix/nvs.h> #include <southbridge/intel/i82801ix/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->apic = 1; gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */ gnvs->mpen = 1; /* Enable Multi Processing */

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/ibexpeak/nvs.h> #include <southbridge/intel/ibexpeak/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/lynxpoint/nvs.h> #include <southbridge/intel/lynxpoint/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default. */ /* The lid is open by default. */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable both COM ports */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->pwrs = 1; /* Power state (AC = 1) */ gnvs->pwrs = 1; /* Power state (AC = 1) */
gnvs->cmap = 0x01; /* Enable COM 1 port */ gnvs->cmap = 0x01; /* Enable COM 1 port */

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -7,7 +7,7 @@
#include <device/device.h> #include <device/device.h>
#include <southbridge/intel/i82801ix/nvs.h> #include <southbridge/intel/i82801ix/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->apic = 1; gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */ gnvs->mpen = 1; /* Enable Multi Processing */

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/ibexpeak/nvs.h> #include <southbridge/intel/ibexpeak/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable both COM ports */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi.h> #include <acpi/acpi.h>
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);
} }

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/ibexpeak/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -6,7 +6,7 @@
#include <soc/acpi.h> #include <soc/acpi.h>
#include <soc/nvs.h> #include <soc/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);

View File

@ -6,7 +6,7 @@
#include <soc/nvs.h> #include <soc/nvs.h>
#include <string.h> #include <string.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);

View File

@ -1,10 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-only */
#include <acpi/acpi.h>
#include <acpi/acpi_gnvs.h>
#include <soc/acpi.h>
#include <soc/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/i82801gx/nvs.h> #include <southbridge/intel/i82801gx/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable both COM ports */ /* Enable both COM ports */
gnvs->cmap = 0x01; gnvs->cmap = 0x01;

View File

@ -7,7 +7,7 @@
#include <device/device.h> #include <device/device.h>
#include <southbridge/intel/i82801ix/nvs.h> #include <southbridge/intel/i82801ix/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->apic = 1; gnvs->apic = 1;
gnvs->mpen = 1; /* Enable Multi Processing */ gnvs->mpen = 1; /* Enable Multi Processing */

View File

@ -5,7 +5,7 @@
#include <variant/thermal.h> #include <variant/thermal.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* The lid is open by default */ /* The lid is open by default */
gnvs->lids = 1; gnvs->lids = 1;

View File

@ -8,7 +8,7 @@
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* /*
* Disable 3G in suspend by default. * Disable 3G in suspend by default.

View File

@ -7,7 +7,7 @@
#include "thermal.h" #include "thermal.h"
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
/* Enable Front USB ports in S3 by default */ /* Enable Front USB ports in S3 by default */
gnvs->s3u0 = 1; gnvs->s3u0 = 1;

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -4,7 +4,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <soc/nvs.h> #include <soc/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
acpi_init_gnvs(gnvs); acpi_init_gnvs(gnvs);

View File

@ -1,8 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0-or-later */
#include <acpi/acpi_gnvs.h>
#include <southbridge/intel/lynxpoint/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs)
{
}

View File

@ -3,7 +3,7 @@
#include <acpi/acpi_gnvs.h> #include <acpi/acpi_gnvs.h>
#include <southbridge/intel/bd82x6x/nvs.h> #include <southbridge/intel/bd82x6x/nvs.h>
void acpi_create_gnvs(struct global_nvs *gnvs) void mainboard_fill_gnvs(struct global_nvs *gnvs)
{ {
gnvs->tcrt = 100; gnvs->tcrt = 100;
gnvs->tpsv = 90; gnvs->tpsv = 90;

View File

@ -489,7 +489,7 @@ static void southcluster_inject_dsdt(const struct device *device)
if (!gnvs) if (!gnvs)
return; return;
acpi_create_gnvs(gnvs); mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa(); acpi_inject_nvsa();
} }

View File

@ -370,7 +370,7 @@ void southcluster_inject_dsdt(const struct device *device)
if (!gnvs) if (!gnvs)
return; return;
acpi_create_gnvs(gnvs); mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa(); acpi_inject_nvsa();
} }

View File

@ -616,7 +616,8 @@ static void southcluster_inject_dsdt(const struct device *device)
return; return;
soc_fill_gnvs(gnvs); soc_fill_gnvs(gnvs);
acpi_create_gnvs(gnvs); mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa(); acpi_inject_nvsa();
} }

View File

@ -247,7 +247,7 @@ void southcluster_inject_dsdt(const struct device *device)
if (!gnvs) if (!gnvs)
return; return;
acpi_create_gnvs(gnvs); mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa(); acpi_inject_nvsa();
} }

View File

@ -665,7 +665,7 @@ void southbridge_inject_dsdt(const struct device *dev)
return; return;
soc_fill_gnvs(gnvs); soc_fill_gnvs(gnvs);
acpi_create_gnvs(gnvs); mainboard_fill_gnvs(gnvs);
acpi_inject_nvsa(); acpi_inject_nvsa();
} }

Some files were not shown because too many files have changed in this diff Show More