Michał Żygowski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37998 )
Change subject: amd/agesa/state_machine: Add BeforeInitLate hooks ......................................................................
amd/agesa/state_machine: Add BeforeInitLate hooks
Add missing BeforeInitLate hooks in order to bring back certain options that were lost on postcar migration. This will also allow to disable CDIT again that caused AmdInitLate error on 00730F01.
Signed-off-by: Michał Żygowski michal.zygowski@3mdeb.com Change-Id: I1226e9c0c8a92920f2569ec0f85d0be0adcc9e30 --- M src/drivers/amd/agesa/state_machine.c M src/northbridge/amd/agesa/family14/state_machine.c M src/northbridge/amd/agesa/family15tn/state_machine.c M src/northbridge/amd/agesa/family16kb/state_machine.c M src/northbridge/amd/agesa/state_machine.h M src/northbridge/amd/pi/00730F01/state_machine.c 6 files changed, 22 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/98/37998/1
diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c index 482b615..1678f84 100644 --- a/src/drivers/amd/agesa/state_machine.c +++ b/src/drivers/amd/agesa/state_machine.c @@ -223,6 +223,8 @@ case AMD_INIT_LATE: { AMD_LATE_PARAMS *param = (void *)StdHeader; + platform_BeforeInitLate(cb, param); + board_BeforeInitLate(cb, param); status = module_dispatch(func, StdHeader); platform_AfterInitLate(cb, param); completion_InitLate(cb, param); @@ -364,6 +366,8 @@ board_BeforeInitEnv(struct sysinfo *cb, AMD_ENV_PARAMS *Env) { } void __weak board_BeforeInitMid(struct sysinfo *cb, AMD_MID_PARAMS *Mid) { } +void __weak +board_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { }
AGESA_STATUS __weak fchs3earlyrestore(AMD_CONFIG_PARAMS *StdHeader) diff --git a/src/northbridge/amd/agesa/family14/state_machine.c b/src/northbridge/amd/agesa/family14/state_machine.c index 91a8f70..175056c 100644 --- a/src/northbridge/amd/agesa/family14/state_machine.c +++ b/src/northbridge/amd/agesa/family14/state_machine.c @@ -104,6 +104,10 @@ amd_initcpuio(); }
+void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +{ +} + void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { sb_Late_Post(); diff --git a/src/northbridge/amd/agesa/family15tn/state_machine.c b/src/northbridge/amd/agesa/family15tn/state_machine.c index 473edfc..dafb64c 100644 --- a/src/northbridge/amd/agesa/family15tn/state_machine.c +++ b/src/northbridge/amd/agesa/family15tn/state_machine.c @@ -70,6 +70,10 @@ amd_initcpuio(); }
+void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +{ +} + void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { } diff --git a/src/northbridge/amd/agesa/family16kb/state_machine.c b/src/northbridge/amd/agesa/family16kb/state_machine.c index fea097f..7794f2d 100644 --- a/src/northbridge/amd/agesa/family16kb/state_machine.c +++ b/src/northbridge/amd/agesa/family16kb/state_machine.c @@ -77,6 +77,10 @@ amd_initcpuio(); }
+void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +{ +} + void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { } diff --git a/src/northbridge/amd/agesa/state_machine.h b/src/northbridge/amd/agesa/state_machine.h index c4a3054..6e86f53 100644 --- a/src/northbridge/amd/agesa/state_machine.h +++ b/src/northbridge/amd/agesa/state_machine.h @@ -84,6 +84,8 @@ void platform_BeforeInitMid(struct sysinfo *cb, AMD_MID_PARAMS *Mid); void board_BeforeInitMid(struct sysinfo *cb, AMD_MID_PARAMS *Mid);
+void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late); +void board_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late); void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late); void completion_InitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late);
diff --git a/src/northbridge/amd/pi/00730F01/state_machine.c b/src/northbridge/amd/pi/00730F01/state_machine.c index b567f38..7e5ca5b 100644 --- a/src/northbridge/amd/pi/00730F01/state_machine.c +++ b/src/northbridge/amd/pi/00730F01/state_machine.c @@ -58,11 +58,13 @@ amd_initcpuio(); }
-void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { }
- +void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +{ +}
void platform_BeforeInitResume(struct sysinfo *cb, AMD_RESUME_PARAMS *Resume) {
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37998 )
Change subject: amd/agesa/state_machine: Add BeforeInitLate hooks ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/37998/1/src/drivers/amd/agesa/state... File src/drivers/amd/agesa/state_machine.c:
https://review.coreboot.org/c/coreboot/+/37998/1/src/drivers/amd/agesa/state... PS1, Line 369: void __weak open brace '{' following function definitions go on the next line
Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37998 )
Change subject: amd/agesa/state_machine: Add BeforeInitLate hooks ......................................................................
Patch Set 1: Code-Review+2
Michał Żygowski has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37998 )
Change subject: amd/agesa/state_machine: Add BeforeInitLate hooks ......................................................................
Patch Set 1:
The change can be submitted I think.
Kyösti Mälkki has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37998 )
Change subject: amd/agesa/state_machine: Add BeforeInitLate hooks ......................................................................
amd/agesa/state_machine: Add BeforeInitLate hooks
Add missing BeforeInitLate hooks in order to bring back certain options that were lost on postcar migration. This will also allow to disable CDIT again that caused AmdInitLate error on 00730F01.
Signed-off-by: Michał Żygowski michal.zygowski@3mdeb.com Change-Id: I1226e9c0c8a92920f2569ec0f85d0be0adcc9e30 Reviewed-on: https://review.coreboot.org/c/coreboot/+/37998 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Kyösti Mälkki kyosti.malkki@gmail.com --- M src/drivers/amd/agesa/state_machine.c M src/northbridge/amd/agesa/family14/state_machine.c M src/northbridge/amd/agesa/family15tn/state_machine.c M src/northbridge/amd/agesa/family16kb/state_machine.c M src/northbridge/amd/agesa/state_machine.h M src/northbridge/amd/pi/00730F01/state_machine.c 6 files changed, 22 insertions(+), 2 deletions(-)
Approvals: build bot (Jenkins): Verified Kyösti Mälkki: Looks good to me, approved
diff --git a/src/drivers/amd/agesa/state_machine.c b/src/drivers/amd/agesa/state_machine.c index 482b615..1678f84 100644 --- a/src/drivers/amd/agesa/state_machine.c +++ b/src/drivers/amd/agesa/state_machine.c @@ -223,6 +223,8 @@ case AMD_INIT_LATE: { AMD_LATE_PARAMS *param = (void *)StdHeader; + platform_BeforeInitLate(cb, param); + board_BeforeInitLate(cb, param); status = module_dispatch(func, StdHeader); platform_AfterInitLate(cb, param); completion_InitLate(cb, param); @@ -364,6 +366,8 @@ board_BeforeInitEnv(struct sysinfo *cb, AMD_ENV_PARAMS *Env) { } void __weak board_BeforeInitMid(struct sysinfo *cb, AMD_MID_PARAMS *Mid) { } +void __weak +board_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { }
AGESA_STATUS __weak fchs3earlyrestore(AMD_CONFIG_PARAMS *StdHeader) diff --git a/src/northbridge/amd/agesa/family14/state_machine.c b/src/northbridge/amd/agesa/family14/state_machine.c index ab96b75..b49dac0 100644 --- a/src/northbridge/amd/agesa/family14/state_machine.c +++ b/src/northbridge/amd/agesa/family14/state_machine.c @@ -103,6 +103,10 @@ amd_initcpuio(); }
+void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +{ +} + void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { sb_Late_Post(); diff --git a/src/northbridge/amd/agesa/family15tn/state_machine.c b/src/northbridge/amd/agesa/family15tn/state_machine.c index 473edfc..dafb64c 100644 --- a/src/northbridge/amd/agesa/family15tn/state_machine.c +++ b/src/northbridge/amd/agesa/family15tn/state_machine.c @@ -70,6 +70,10 @@ amd_initcpuio(); }
+void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +{ +} + void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { } diff --git a/src/northbridge/amd/agesa/family16kb/state_machine.c b/src/northbridge/amd/agesa/family16kb/state_machine.c index fea097f..7794f2d 100644 --- a/src/northbridge/amd/agesa/family16kb/state_machine.c +++ b/src/northbridge/amd/agesa/family16kb/state_machine.c @@ -77,6 +77,10 @@ amd_initcpuio(); }
+void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +{ +} + void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { } diff --git a/src/northbridge/amd/agesa/state_machine.h b/src/northbridge/amd/agesa/state_machine.h index c4a3054..6e86f53 100644 --- a/src/northbridge/amd/agesa/state_machine.h +++ b/src/northbridge/amd/agesa/state_machine.h @@ -84,6 +84,8 @@ void platform_BeforeInitMid(struct sysinfo *cb, AMD_MID_PARAMS *Mid); void board_BeforeInitMid(struct sysinfo *cb, AMD_MID_PARAMS *Mid);
+void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late); +void board_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late); void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late); void completion_InitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late);
diff --git a/src/northbridge/amd/pi/00730F01/state_machine.c b/src/northbridge/amd/pi/00730F01/state_machine.c index b567f38..7e5ca5b 100644 --- a/src/northbridge/amd/pi/00730F01/state_machine.c +++ b/src/northbridge/amd/pi/00730F01/state_machine.c @@ -58,11 +58,13 @@ amd_initcpuio(); }
-void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +void platform_BeforeInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) { }
- +void platform_AfterInitLate(struct sysinfo *cb, AMD_LATE_PARAMS *Late) +{ +}
void platform_BeforeInitResume(struct sysinfo *cb, AMD_RESUME_PARAMS *Resume) {