From c5d6af43fb544423fa103f523ac85356b3ff3725 Mon Sep 17 00:00:00 2001 From: Keith Hui Date: Mon, 20 Mar 2023 02:03:47 -0400 Subject: nb/intel/snb: Abolish mainboard_should_reset_usb() Of the 13 mainboards that implement mainboard_should_reset_usb() hook, all but one do the same: Stop MRC from resetting USB when resuming from S3 suspend. This hook turns out is only here to facilitate a USB reset workaround on samsung/stumpy for an old ChromeOS kernel which is no longer needed. Drop the workaround, the hook, and headers no longer used. roda/rv11/early_init.c is left with no useful code after this patch, so drop it entirely from both bootblock and romstage. Change-Id: Ib3a5a00c0a6b1528e39435784919223d16b3914e Signed-off-by: Keith Hui Reviewed-on: https://review.coreboot.org/c/coreboot/+/72496 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/northbridge/intel/sandybridge/raminit_mrc.c | 2 +- src/northbridge/intel/sandybridge/sandybridge.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/northbridge/intel/sandybridge') diff --git a/src/northbridge/intel/sandybridge/raminit_mrc.c b/src/northbridge/intel/sandybridge/raminit_mrc.c index aec300b5ef..a2a44c422e 100644 --- a/src/northbridge/intel/sandybridge/raminit_mrc.c +++ b/src/northbridge/intel/sandybridge/raminit_mrc.c @@ -328,7 +328,7 @@ void perform_raminit(int s3resume) struct mrc_var_data *mrc_var; /* Prepare USB controller early in S3 resume */ - if (!mainboard_should_reset_usb(s3resume)) + if (s3resume) enable_usb_bar(); memset(&pei_data, 0, sizeof(pei_data)); diff --git a/src/northbridge/intel/sandybridge/sandybridge.h b/src/northbridge/intel/sandybridge/sandybridge.h index 1e8786410d..0eaa4ec340 100644 --- a/src/northbridge/intel/sandybridge/sandybridge.h +++ b/src/northbridge/intel/sandybridge/sandybridge.h @@ -65,7 +65,6 @@ void early_init_dmi(void); /* mainboard_early_init: Optional callback, run after console init but before raminit. */ void mainboard_early_init(int s3resume); -int mainboard_should_reset_usb(int s3resume); void perform_raminit(int s3resume); void report_memory_config(void); enum platform_type get_platform_type(void); -- cgit v1.2.3