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

nb/intel/sandybridge,haswell: Use chromeos_reserve_ram_oops() 

Communicate the RAMOOPS section via ChromeOS GNVS.

Change-Id: I75170e6e34c20db88efa268080d2c38916b31f37
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50606
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Kyösti Mälkki 2021-02-10 19:11:55 +02:00
parent dc0c02fe34
commit b8b41338aa
4 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/northbridge/intel/haswell/acpi/hostbridge.asl
View File

@ -182,11 +182,6 @@ Device (PDRC)
Memory32Fixed (ReadWrite, 0xfed20000, 0x00020000) // Misc ICH Memory32Fixed (ReadWrite, 0xfed20000, 0x00020000) // Misc ICH
Memory32Fixed (ReadWrite, 0xfed40000, 0x00005000) // Misc ICH Memory32Fixed (ReadWrite, 0xfed40000, 0x00005000) // Misc ICH
Memory32Fixed (ReadWrite, 0xfed45000, 0x0004b000) // Misc ICH Memory32Fixed (ReadWrite, 0xfed45000, 0x0004b000) // Misc ICH
#if CONFIG(CHROMEOS_RAMOOPS)
Memory32Fixed (ReadWrite, CONFIG_CHROMEOS_RAMOOPS_RAM_START,
CONFIG_CHROMEOS_RAMOOPS_RAM_SIZE)
#endif
}) })
// Current Resource Settings // Current Resource Settings

9
src/northbridge/intel/haswell/northbridge.c
View File

@ -14,6 +14,7 @@
#include <boot/tables.h> #include <boot/tables.h>
#include <security/intel/txt/txt_register.h> #include <security/intel/txt/txt_register.h>
#include <southbridge/intel/lynxpoint/pch.h> #include <southbridge/intel/lynxpoint/pch.h>
#include <vendorcode/google/chromeos/chromeos.h>
#include "chip.h" #include "chip.h"
#include "haswell.h" #include "haswell.h"
@ -335,11 +336,9 @@ static void mc_add_dram_resources(struct device *dev, int *resource_cnt)
mmio_resource(dev, index++, (0xa0000 >> 10), (0xc0000 - 0xa0000) >> 10); mmio_resource(dev, index++, (0xa0000 >> 10), (0xc0000 - 0xa0000) >> 10);
reserved_ram_resource(dev, index++, (0xc0000 >> 10), (0x100000 - 0xc0000) >> 10); reserved_ram_resource(dev, index++, (0xc0000 >> 10), (0x100000 - 0xc0000) >> 10);
#if CONFIG(CHROMEOS_RAMOOPS) if (CONFIG(CHROMEOS_RAMOOPS))
reserved_ram_resource(dev, index++, chromeos_reserve_ram_oops(dev, index++);
CONFIG_CHROMEOS_RAMOOPS_RAM_START >> 10,
CONFIG_CHROMEOS_RAMOOPS_RAM_SIZE >> 10);
#endif
*resource_cnt = index; *resource_cnt = index;
} }

5
src/northbridge/intel/sandybridge/acpi/sandybridge.asl
View File

@ -20,11 +20,6 @@ Device (PDRC)
Memory32Fixed(ReadWrite, 0xfed40000, 0x00005000) // TPM TIS Memory32Fixed(ReadWrite, 0xfed40000, 0x00005000) // TPM TIS
Memory32Fixed(ReadWrite, 0xfed45000, 0x0004b000) // Misc ICH Memory32Fixed(ReadWrite, 0xfed45000, 0x0004b000) // Misc ICH
#if CONFIG(CHROMEOS_RAMOOPS)
Memory32Fixed(ReadWrite, CONFIG_CHROMEOS_RAMOOPS_RAM_START,
CONFIG_CHROMEOS_RAMOOPS_RAM_SIZE)
#endif
/* Required for SandyBridge sighting 3715511 */ /* Required for SandyBridge sighting 3715511 */
Memory32Fixed(ReadWrite, 0x20000000, 0x00200000) Memory32Fixed(ReadWrite, 0x20000000, 0x00200000)
Memory32Fixed(ReadWrite, 0x40000000, 0x00200000) Memory32Fixed(ReadWrite, 0x40000000, 0x00200000)

8
src/northbridge/intel/sandybridge/northbridge.c
View File

@ -14,6 +14,7 @@
#include "chip.h" #include "chip.h"
#include "sandybridge.h" #include "sandybridge.h"
#include <cpu/intel/smm_reloc.h> #include <cpu/intel/smm_reloc.h>
#include <vendorcode/google/chromeos/chromeos.h>
/* IGD UMA memory */ /* IGD UMA memory */
static uint64_t uma_memory_base = 0; static uint64_t uma_memory_base = 0;
@ -67,11 +68,8 @@ static void add_fixed_resources(struct device *dev, int index)
reserved_ram_resource(dev, index++, 0xc0000 >> 10, (0x100000 - 0xc0000) >> 10); reserved_ram_resource(dev, index++, 0xc0000 >> 10, (0x100000 - 0xc0000) >> 10);
#if CONFIG(CHROMEOS_RAMOOPS) if (CONFIG(CHROMEOS_RAMOOPS))
reserved_ram_resource(dev, index++, chromeos_reserve_ram_oops(dev, index++);
CONFIG_CHROMEOS_RAMOOPS_RAM_START >> 10,
CONFIG_CHROMEOS_RAMOOPS_RAM_SIZE >> 10);
#endif
if (is_sandybridge()) { if (is_sandybridge()) {
/* Required for SandyBridge sighting 3715511 */ /* Required for SandyBridge sighting 3715511 */