GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/nehalem/gma: Set up OpRegion in nb code 

Set up IGD OpRegion in northbridge and fill in GNVS' aslb.
At this point GNVS already has been set up by SSDT injection.

Required for future VBT patches that will:
* Use ACPI memory instead of CBMEM
* Use common implementation to locate VBT
* Fill in platform specific values

Change-Id: I76b31fe5fd19b50b82f57748558fb04408e0fd23
Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-on: https://review.coreboot.org/19309
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Patrick Rudolph 2017-04-12 16:54:55 +02:00 committed by Martin Roth
parent d0eb6cd8bd
commit 2be2840a1d
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/northbridge/intel/nehalem/gma.c
View File

@ -29,6 +29,8 @@
#include <pc80/vga.h> #include <pc80/vga.h>
#include <pc80/vga_io.h> #include <pc80/vga_io.h>
#include <drivers/intel/gma/intel_bios.h> #include <drivers/intel/gma/intel_bios.h>
#include <southbridge/intel/ibexpeak/nvs.h>
#include <cbmem.h>
#include "chip.h" #include "chip.h"
#include "nehalem.h" #include "nehalem.h"
@ -1095,6 +1097,30 @@ static void gma_ssdt(device_t device)
drivers_intel_gma_displays_ssdt_generate(gfx); drivers_intel_gma_displays_ssdt_generate(gfx);
} }
static unsigned long
gma_write_acpi_tables(struct device *const dev,
unsigned long current,
struct acpi_rsdp *const rsdp)
{
igd_opregion_t *opregion;
global_nvs_t *gnvs;
// FIXME: Replace by common VBT implementation writing to current
opregion = igd_make_opregion();
if (opregion) {
/* GNVS has been already set up */
gnvs = cbmem_find(CBMEM_ID_ACPI_GNVS);
if (gnvs) {
/* IGD OpRegion Base Address */
gnvs->aslb = (u32)(uintptr_t)opregion;
} else {
printk(BIOS_ERR, "Error: GNVS table not found.\n");
}
}
return current;
}
static struct pci_operations gma_pci_ops = { static struct pci_operations gma_pci_ops = {
.set_subsystem = gma_set_subsystem, .set_subsystem = gma_set_subsystem,
}; };
@ -1108,6 +1134,7 @@ static struct device_operations gma_func0_ops = {
.scan_bus = 0, .scan_bus = 0,
.enable = 0, .enable = 0,
.ops_pci = &gma_pci_ops, .ops_pci = &gma_pci_ops,
.write_acpi_tables = gma_write_acpi_tables,
}; };
static const unsigned short pci_device_ids[] = { static const unsigned short pci_device_ids[] = {

6
src/southbridge/intel/ibexpeak/lpc.c
View File

@ -620,10 +620,6 @@ static void set_subsystem(device_t dev, unsigned vendor, unsigned device)
static void southbridge_inject_dsdt(device_t dev) static void southbridge_inject_dsdt(device_t dev)
{ {
global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof(*gnvs)); global_nvs_t *gnvs = cbmem_add (CBMEM_ID_ACPI_GNVS, sizeof(*gnvs));
void *opregion;
/* Calling northbridge code as gnvs contains opregion address. */
opregion = igd_make_opregion();
if (gnvs) { if (gnvs) {
const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info(); const struct i915_gpu_controller_info *gfx = intel_gma_get_controller_info();
@ -637,8 +633,6 @@ static void southbridge_inject_dsdt(device_t dev)
gnvs->ndid = gfx->ndid; gnvs->ndid = gfx->ndid;
memcpy(gnvs->did, gfx->did, sizeof(gnvs->did)); memcpy(gnvs->did, gfx->did, sizeof(gnvs->did));
/* IGD OpRegion Base Address */
gnvs->aslb = (u32)opregion;
/* And tell SMI about it */ /* And tell SMI about it */
smm_setup_structures(gnvs, NULL, NULL); smm_setup_structures(gnvs, NULL, NULL);