Change in coreboot[master]: src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top()
Michael Niewöhner has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/36386 )
Change subject: src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top() ......................................................................
src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top()
As stated in CB:36334 cbmem_top() should not be called before memory is initialized. Since this is not the case anyways remove the guard that checks if MRC is finished and returns NULL if not.
Change-Id: I964a20a5e9aa69fdb75413c36a17d34b7ba00098 Signed-off-by: Michael Niewöhner foss@mniewoehner.de --- M src/soc/intel/cannonlake/memmap.c M src/soc/intel/icelake/memmap.c M src/soc/intel/skylake/memmap.c 3 files changed, 0 insertions(+), 27 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/36386/1
diff --git a/src/soc/intel/cannonlake/memmap.c b/src/soc/intel/cannonlake/memmap.c index b2aecc7..858a207 100644 --- a/src/soc/intel/cannonlake/memmap.c +++ b/src/soc/intel/cannonlake/memmap.c @@ -109,15 +109,6 @@ { struct ebda_config ebda_cfg;
- /* - * Check if Tseg has been initialized, we will use this as a flag - * to check if the MRC is done, and only then continue to read the - * PRMMR_BASE MSR. The system hangs if PRMRR_BASE MSR is read before - * PRMRR_MASK MSR lock bit is set. - */ - if (sa_get_tseg_base() == 0) - return NULL; - retrieve_ebda_object(&ebda_cfg);
return (void *)(uintptr_t)ebda_cfg.cbmem_top; diff --git a/src/soc/intel/icelake/memmap.c b/src/soc/intel/icelake/memmap.c index d60d3d0..9a39839 100644 --- a/src/soc/intel/icelake/memmap.c +++ b/src/soc/intel/icelake/memmap.c @@ -108,15 +108,6 @@ { struct ebda_config ebda_cfg;
- /* - * Check if Tseg has been initialized, we will use this as a flag - * to check if the MRC is done, and only then continue to read the - * PRMMR_BASE MSR. The system hangs if PRMRR_BASE MSR is read before - * PRMRR_MASK MSR lock bit is set. - */ - if (sa_get_tseg_base() == 0) - return NULL; - retrieve_ebda_object(&ebda_cfg);
return (void *)(uintptr_t)ebda_cfg.cbmem_top; diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c index 19a6b5f..69efce8 100644 --- a/src/soc/intel/skylake/memmap.c +++ b/src/soc/intel/skylake/memmap.c @@ -109,15 +109,6 @@ { struct ebda_config ebda_cfg;
- /* - * Check if Tseg has been initialized, we will use this as a flag - * to check if the MRC is done, and only then continue to read the - * PRMMR_BASE MSR. The system hangs if PRMRR_BASE MSR is read before - * PRMRR_MASK MSR lock bit is set. - */ - if (sa_get_tseg_base() == 0) - return NULL; - retrieve_ebda_object(&ebda_cfg);
return (void *)(uintptr_t)ebda_cfg.cbmem_top;
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36386 )
Change subject: src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top() ......................................................................
Uploaded patch set 2: New patch set was added with same tree, parent, and commit message as Patch Set 1.
Hello Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/36386
to look at the new patch set (#2).
Change subject: src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top() ......................................................................
src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top()
As stated in CB:36334 cbmem_top() should not be called before memory is initialized. Since this is not the case anyways remove the guard that checks if MRC is finished and returns NULL if not.
Change-Id: I964a20a5e9aa69fdb75413c36a17d34b7ba00098 Signed-off-by: Michael Niewöhner foss@mniewoehner.de --- M src/soc/intel/cannonlake/memmap.c M src/soc/intel/icelake/memmap.c M src/soc/intel/skylake/memmap.c 3 files changed, 0 insertions(+), 27 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/86/36386/2
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36386 )
Change subject: src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top() ......................................................................
Patch Set 2: Code-Review+2
(1 comment)
https://review.coreboot.org/c/coreboot/+/36386/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/c/coreboot/+/36386/2//COMMIT_MSG@10 PS2, Line 10: Since this is not the case anyways remove the guard that : checks if MRC is finished and returns NULL if not. Just "Therefore drop the check to see if MRC finished."
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36386 )
Change subject: src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top() ......................................................................
Uploaded patch set 4: Patch Set 3 was rebased.
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/36386 )
Change subject: src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top() ......................................................................
Patch Set 4: Code-Review+2
Arthur Heymans has submitted this change. ( https://review.coreboot.org/c/coreboot/+/36386 )
Change subject: src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top() ......................................................................
src/soc/intel: skl,cnl,icl: remove unneeded check in cbmem_top()
As stated in CB:36334 cbmem_top() should not be called before memory is initialized. Therefore drop the check to see if MRC finished.
Change-Id: I964a20a5e9aa69fdb75413c36a17d34b7ba00098 Signed-off-by: Michael Niewöhner foss@mniewoehner.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/36386 Reviewed-by: Arthur Heymans arthur@aheymans.xyz Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/cannonlake/memmap.c M src/soc/intel/icelake/memmap.c M src/soc/intel/skylake/memmap.c 3 files changed, 0 insertions(+), 27 deletions(-)
Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved
diff --git a/src/soc/intel/cannonlake/memmap.c b/src/soc/intel/cannonlake/memmap.c index 2239f13..80aa97d 100644 --- a/src/soc/intel/cannonlake/memmap.c +++ b/src/soc/intel/cannonlake/memmap.c @@ -257,15 +257,6 @@ { struct ebda_config ebda_cfg;
- /* - * Check if Tseg has been initialized, we will use this as a flag - * to check if the MRC is done, and only then continue to read the - * PRMMR_BASE MSR. The system hangs if PRMRR_BASE MSR is read before - * PRMRR_MASK MSR lock bit is set. - */ - if (sa_get_tseg_base() == 0) - return NULL; - retrieve_ebda_object(&ebda_cfg);
return (void *)(uintptr_t)ebda_cfg.tolum_base; diff --git a/src/soc/intel/icelake/memmap.c b/src/soc/intel/icelake/memmap.c index 122cb1a..00f45cf 100644 --- a/src/soc/intel/icelake/memmap.c +++ b/src/soc/intel/icelake/memmap.c @@ -236,15 +236,6 @@ { struct ebda_config ebda_cfg;
- /* - * Check if Tseg has been initialized, we will use this as a flag - * to check if the MRC is done, and only then continue to read the - * PRMMR_BASE MSR. The system hangs if PRMRR_BASE MSR is read before - * PRMRR_MASK MSR lock bit is set. - */ - if (sa_get_tseg_base() == 0) - return NULL; - retrieve_ebda_object(&ebda_cfg);
return (void *)(uintptr_t)ebda_cfg.tolum_base; diff --git a/src/soc/intel/skylake/memmap.c b/src/soc/intel/skylake/memmap.c index 780c73c..c6ccd71 100644 --- a/src/soc/intel/skylake/memmap.c +++ b/src/soc/intel/skylake/memmap.c @@ -258,15 +258,6 @@ { struct ebda_config ebda_cfg;
- /* - * Check if Tseg has been initialized, we will use this as a flag - * to check if the MRC is done, and only then continue to read the - * PRMMR_BASE MSR. The system hangs if PRMRR_BASE MSR is read before - * PRMRR_MASK MSR lock bit is set. - */ - if (sa_get_tseg_base() == 0) - return NULL; - retrieve_ebda_object(&ebda_cfg);
return (void *)(uintptr_t)ebda_cfg.tolum_base;
-
Arthur Heymans (Code Review) -
Michael Niewöhner (Code Review)