Change in coreboot[master]: mb/amd/majolica: Add PSP support for board majolica

[Bao Zheng (Code Review)]

Hello Zheng Bao,

I'd like you to do a code review. Please visit

https://review.coreboot.org/c/coreboot/+/48529

to review the following change.

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Kconfig
M src/mainboard/amd/majolica/Makefile.inc
2 files changed, 11 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/1

diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig
index f811c39..c202220 100644
--- a/src/mainboard/amd/majolica/Kconfig
+++ b/src/mainboard/amd/majolica/Kconfig
@@ -4,6 +4,7 @@

config BOARD_SPECIFIC_OPTIONS
    def_bool y
+	select BOARD_ROMSIZE_KB_16384
    select SOC_AMD_CEZANNE
    select MISSING_BOARD_RESET

@@ -17,6 +18,12 @@
 config MAINBOARD_PART_NUMBER
    default "MAJOLICA"

+config AMD_FWM_POSITION_INDEX
+	int
+	default 4
+	help
+	  TODO: might need to be adapted for better placement of files in cbfs
+
 config MAJOLICA_HAVE_MCHP_FW
    bool "Have Microchip EC firmware?"
    default n
diff --git a/src/mainboard/amd/majolica/Makefile.inc b/src/mainboard/amd/majolica/Makefile.inc
index ce3119c..0b58b29 100644
--- a/src/mainboard/amd/majolica/Makefile.inc
+++ b/src/mainboard/amd/majolica/Makefile.inc
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only

+APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_Updatable.bin
+APCB_SOURCES_68 =$(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_Updatable.bin
+APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_DefaultRecovery.bin
+
 PHONY+=add_mchp_fw
 INTERMEDIATE+=add_mchp_fw

[Bao Zheng (Code Review)]

Bao Zheng has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 1:

This patchset has been tested on Majolica. We can get message from serial port.
-----------
coreboot-4.13-444-gd30696c42c-dirty Thu Dec 10 06:07:26 UTC 2020 bootblock starting (log level: 7)...
Family_Model: 00a50f00
PMxC0 STATUS: 0x800 BIT11
FMAP: Found "FLASH" version 1.1 at 0x30000.
FMAP: base = 0xff000000 size = 0x1000000 #areas = 5
FMAP: area COREBOOT found @ 31000 (16576512 bytes)
CBFS: mcache @0x02012800 built for 7 files, used 0x17c of 0x2000 bytes
CBFS: Found 'fallback/romstage' @0x80 size 0x1dd4 in mcache @0x02012838
BS: bootblock times (exec / console): total (unknown) / 40 ms

[Bao Zheng (Code Review)]

Bao Zheng has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 3:

This patchset is tested on board majolica. It needs the PSP firmware and APCB in mainboard folder.

Can I uploaded the blobs？

[Marshall Dawson (Code Review)]

Marshall Dawson has uploaded a new patch set (#5) to the change originally created by Bao Zheng. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Kconfig
M src/mainboard/amd/majolica/Makefile.inc
2 files changed, 11 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/5

[Felix Held (Code Review)]

Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 12:

i just did a test by checking out this tree and building an image including the ec blob, but it gets stuck at post code 0xeec5000d on my majolica board with cezanne apu without much activity before that

[Felix Held (Code Review)]

Attention is currently required from: Bao Zheng.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 13:

(1 comment)

File src/mainboard/amd/majolica/Kconfig:

https://review.coreboot.org/c/coreboot/+/48529/comment/42cffba4_912a46c7 
PS13, Line 7: 	select BOARD_ROMSIZE_KB_16384
i'd put this in a separate patch before this one, since it's not about the psp support itself, but about the missing flash size for majolica

[Bao Zheng (Code Review)]

Hello build bot (Jenkins), Jason Glenesk, Patrick Georgi, Martin Roth, Marshall Dawson, Zheng Bao, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48529

to look at the new patch set (#14).

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Kconfig
M src/mainboard/amd/majolica/Makefile.inc
2 files changed, 14 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/14

[Bao Zheng (Code Review)]

Bao Zheng has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 15:

(1 comment)

File src/mainboard/amd/majolica/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/48529/comment/a719c0d2_ecf09841 
PS15, Line 4: APCB_CZN_D4_Updatable.bin
APCB_CZN_D4_Updatable_68.bin

[Bao Zheng (Code Review)]

Hello build bot (Jenkins), Jason Glenesk, Patrick Georgi, Martin Roth, Marshall Dawson, Zheng Bao, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48529

to look at the new patch set (#16).

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Kconfig
M src/mainboard/amd/majolica/Makefile.inc
2 files changed, 13 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/16

[Bao Zheng (Code Review)]

Hello build bot (Jenkins), Jason Glenesk, Patrick Georgi, Martin Roth, Marshall Dawson, Zheng Bao, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48529

to look at the new patch set (#22).

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Makefile.inc
1 file changed, 7 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/22

[Felix Held (Code Review)]

Attention is currently required from: Bao Zheng.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 22:

(2 comments)

File src/mainboard/amd/majolica/Kconfig:

https://review.coreboot.org/c/coreboot/+/48529/comment/71e47528_2bb25cf2 
PS20, Line 21: config AMD_FWM_POSITION_INDEX
i wonder why this is dropped in newer versions. if i remember correctly, i needed that on mandolin for the build not to fail, since due to the ec firmware being present and the fmap being at the beginning at the flash, the cbfs didn't cover the location that would be used by default

File src/mainboard/amd/majolica/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/48529/comment/ade24cb2_e3d19ac1 
PS22, Line 7: PHONY+=add_mchp_fw
            : INTERMEDIATE+=add_mchp_fw
those two lines shouldn't be in here; I guess something went wrong during a rebase. see https://review.coreboot.org/c/coreboot/+/49358/6/src/mainboard/amd/majolica/...

[Bao Zheng (Code Review)]

Attention is currently required from: Bao Zheng.
Hello build bot (Jenkins), Jason Glenesk, Patrick Georgi, Martin Roth, Marshall Dawson, Zheng Bao, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48529

to look at the new patch set (#23).

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Makefile.inc
1 file changed, 4 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/23

[Bao Zheng (Code Review)]

Hello build bot (Jenkins), Jason Glenesk, Patrick Georgi, Martin Roth, Marshall Dawson, Zheng Bao, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48529

to look at the new patch set (#24).

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Kconfig
M src/mainboard/amd/majolica/Makefile.inc
2 files changed, 10 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/24

[Bao Zheng (Code Review)]

Attention is currently required from: Felix Held.
Bao Zheng has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 26:

(3 comments)

File src/mainboard/amd/majolica/Kconfig:

https://review.coreboot.org/c/coreboot/+/48529/comment/661b0208_b35f648a 
PS13, Line 7: 	select BOARD_ROMSIZE_KB_16384
> i'd put this in a separate patch before this one, since it's not about the psp support itself, but a […]

Done

File src/mainboard/amd/majolica/Kconfig:

https://review.coreboot.org/c/coreboot/+/48529/comment/35676ab6_16d33295 
PS20, Line 21: config AMD_FWM_POSITION_INDEX
> i wonder why this is dropped in newer versions. […]

Done

File src/mainboard/amd/majolica/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/48529/comment/d7501aad_52318117 
PS22, Line 7: PHONY+=add_mchp_fw
            : INTERMEDIATE+=add_mchp_fw
> those two lines shouldn't be in here; I guess something went wrong during a rebase. […]

Done

[Bao Zheng (Code Review)]

Attention is currently required from: Felix Held.
Bao Zheng has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 26:

(1 comment)

File src/mainboard/amd/majolica/Makefile.inc:

https://review.coreboot.org/c/coreboot/+/48529/comment/4e4019d8_7f5a41c3 
PS15, Line 4: APCB_CZN_D4_Updatable.bin
> APCB_CZN_D4_Updatable_68. […]

Done

[Felix Held (Code Review)]

Attention is currently required from: Bao Zheng.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 26: Code-Review+2

[Bao Zheng (Code Review)]

Attention is currently required from: Bao Zheng.
Hello build bot (Jenkins), Jason Glenesk, Patrick Georgi, Martin Roth, Marshall Dawson, Zheng Bao, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48529

to look at the new patch set (#27).

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Kconfig
1 file changed, 18 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/27

[Bao Zheng (Code Review)]

Hello build bot (Jenkins), Jason Glenesk, Patrick Georgi, Martin Roth, Marshall Dawson, Zheng Bao, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48529

to look at the new patch set (#28).

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Kconfig
M src/mainboard/amd/majolica/Makefile.inc
2 files changed, 10 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/28

[Bao Zheng (Code Review)]

Hello build bot (Jenkins), Jason Glenesk, Patrick Georgi, Martin Roth, Marshall Dawson, Zheng Bao, Felix Held,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48529

to look at the new patch set (#29).

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
---
M src/mainboard/amd/majolica/Kconfig
M src/mainboard/amd/majolica/Makefile.inc
2 files changed, 10 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/48529/29

[Felix Held (Code Review)]

Attention is currently required from: Bao Zheng.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

Patch Set 29: Code-Review+2

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48529 )

Change subject: mb/amd/majolica: Add PSP support for board majolica
......................................................................

mb/amd/majolica: Add PSP support for board majolica

Change-Id: Ia2470a7297c7003c7975c7d9b977f2f97174efea
Signed-off-by: Zheng Bao 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48529
Reviewed-by: Felix Held 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/amd/majolica/Kconfig
M src/mainboard/amd/majolica/Makefile.inc
2 files changed, 10 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Felix Held: Looks good to me, approved

diff --git a/src/mainboard/amd/majolica/Kconfig b/src/mainboard/amd/majolica/Kconfig
index 7e2301e..ce8a498 100644
--- a/src/mainboard/amd/majolica/Kconfig
+++ b/src/mainboard/amd/majolica/Kconfig
@@ -18,6 +18,12 @@
 config MAINBOARD_PART_NUMBER
    default "MAJOLICA"

+config AMD_FWM_POSITION_INDEX
+	int
+	default 4
+	help
+	  TODO: might need to be adapted for better placement of files in cbfs
+
 config MAJOLICA_HAVE_MCHP_FW
    bool "Have Microchip EC firmware?"
    default n
diff --git a/src/mainboard/amd/majolica/Makefile.inc b/src/mainboard/amd/majolica/Makefile.inc
index 8c35d9a..56eb6f2 100644
--- a/src/mainboard/amd/majolica/Makefile.inc
+++ b/src/mainboard/amd/majolica/Makefile.inc
@@ -1,5 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only

+APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_Updatable.bin
+APCB_SOURCES_68 = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_Updatable_68.bin
+APCB_SOURCES_RECOVERY = $(MAINBOARD_BLOBS_DIR)/APCB_CZN_D4_DefaultRecovery.bin
+
 ifeq ($(CONFIG_MAJOLICA_HAVE_MCHP_FW),y)
 $(call add_intermediate, add_mchp_fw)
    $(CBFSTOOL) $(obj)/coreboot.pre write -r EC -f $(CONFIG_MAJOLICA_MCHP_FW_FILE) --fill-upward