sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/intel/sandybridge: Clean up post Haswell SPD mapping API migration

Browse Source 
With migration to Haswell SPD mapping interface complete:

1.  Remove weak stubs meant to ensure smooth transition and
    internalizes mainboard_get_spd() within raminit.c.
2.  Remove post-mainboard SPD data sanitization code in raminit_mrc.c,
    now that it fills its own SPD data.
3.  Remove old prototypes from raminit_native.h
4a. Drops raminit_native.h from raminit.c, as individual headers
    therein are already included.
4b. Drop another header from raminit.c IWYU identified as unneeded.
    asus/p8z77-m still builds afterwards.
    (sandybridge to receive a full IWYU cleanup later.)

Change-Id: Ie073c1386cd0a645069f0e1416263b4fa359b74b
Signed-off-by: Keith Hui <buurin@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76991
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Keith Hui
2023-07-29 11:08:09 -04:00
committed by Felix Held
parent 45e4ab4a66
commit adaeb11021
3 changed files with 2 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/northbridge/intel/sandybridge/raminit.c
View File

@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0-only */ /* SPDX-License-Identifier: GPL-2.0-only */
#include <console/console.h> #include <console/console.h>
#include <commonlib/region.h>
#include <cf9_reset.h> #include <cf9_reset.h>
#include <string.h> #include <string.h>
#include <cbfs.h> #include <cbfs.h>
@@ -20,7 +19,6 @@
#include <types.h> #include <types.h>
#include "raminit.h" #include "raminit.h"
#include "raminit_native.h"
#include "raminit_common.h" #include "raminit_common.h"
#include "sandybridge.h" #include "sandybridge.h"
#include "chip.h" #include "chip.h"
@@ -140,7 +138,7 @@ static int verify_crc16_spds_ddr3(spd_raw_data *spd, ramctr_timing *ctrl)
return match; return match;
} }
void read_spd(spd_raw_data * spd, u8 addr, bool id_only) static void read_spd(spd_raw_data *spd, u8 addr, bool id_only)
{ {
int j; int j;
if (id_only) { if (id_only) {
@@ -152,10 +150,7 @@ void read_spd(spd_raw_data * spd, u8 addr, bool id_only)
} }
} }
/* Temporary stub */ static void mainboard_get_spd(spd_raw_data *spd, bool id_only)
__weak void mb_get_spd_map(struct spd_info *spdi) {}
__weak void mainboard_get_spd(spd_raw_data *spd, bool id_only)
{ {
const struct northbridge_intel_sandybridge_config *cfg = config_of_soc(); const struct northbridge_intel_sandybridge_config *cfg = config_of_soc();
unsigned int i; unsigned int i;

16
src/northbridge/intel/sandybridge/raminit_mrc.c
View File

@@ -312,9 +312,6 @@ static void devicetree_fill_pei_data(struct pei_data *pei_data)
pei_data->usb3.xhci_streams = cfg->usb3.xhci_streams; pei_data->usb3.xhci_streams = cfg->usb3.xhci_streams;
} }
/* Temporary stub */
__weak void mb_get_spd_map(struct spd_info *spdi) {}
static void spd_fill_pei_data(struct pei_data *pei_data) static void spd_fill_pei_data(struct pei_data *pei_data)
{ {
struct spd_info spdi = {0}; struct spd_info spdi = {0};
@@ -397,19 +394,6 @@ void perform_raminit(int s3resume)
(!pei_data.spd_addresses[2] && !pei_data.spd_data[2][0]) + (!pei_data.spd_addresses[2] && !pei_data.spd_data[2][0]) +
(!pei_data.spd_addresses[3] && !pei_data.spd_data[3][0]) * 2; (!pei_data.spd_addresses[3] && !pei_data.spd_data[3][0]) * 2;
/* Fix spd_data. MRC only uses spd_data[0] and ignores the other */
for (size_t i = 1; i < ARRAY_SIZE(pei_data.spd_data); i++) {
if (pei_data.spd_data[i][0] && !pei_data.spd_data[0][0]) {
memcpy(pei_data.spd_data[0], pei_data.spd_data[i],
sizeof(pei_data.spd_data[0]));
} else if (pei_data.spd_data[i][0] && pei_data.spd_data[0][0]) {
if (memcmp(pei_data.spd_data[i], pei_data.spd_data[0],
sizeof(pei_data.spd_data[0])) != 0)
die("Onboard SPDs must match each other");
}
}
disable_p2p(); disable_p2p();
pei_data.boot_mode = s3resume ? 2 : 0; pei_data.boot_mode = s3resume ? 2 : 0;

4
src/northbridge/intel/sandybridge/raminit_native.h
View File

@@ -8,8 +8,4 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
/* The order is: ch0dimmA, ch0dimmB, ch1dimmA, ch1dimmB */
void read_spd(spd_raw_data *spd, u8 addr, bool id_only);
void mainboard_get_spd(spd_raw_data *spd, bool id_only);
#endif /* RAMINIT_NATIVE_H */ #endif /* RAMINIT_NATIVE_H */