Erin Lo has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31835
Change subject: google/kukui: Init SSPM ......................................................................
google/kukui: Init SSPM
Load SSPM firmware and boot up SSPM.
BUG=b:80501386 BRANCH=none Test=We can see "sspm is alive" in ATF stage if SSPM enabled and ipi success
Change-Id: I9285034fc8ce38b40134f5eb7b986a663175e620 Signed-off-by: Erin Lo erin.lo@mediatek.com --- M src/mainboard/google/kukui/Makefile.inc M src/mainboard/google/kukui/mainboard.c 2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/31835/1
diff --git a/src/mainboard/google/kukui/Makefile.inc b/src/mainboard/google/kukui/Makefile.inc index a0556c1..807a11d 100644 --- a/src/mainboard/google/kukui/Makefile.inc +++ b/src/mainboard/google/kukui/Makefile.inc @@ -25,3 +25,8 @@ ramstage-y += mainboard.c ramstage-y += memlayout.ld ramstage-y += reset.c + +cbfs-files-y += sspm.bin +sspm.bin-file := 3rdparty/blobs/mainboard/google/kukui/sspm.bin +sspm.bin-type := raw +sspm.bin-compression := $(CBFS_COMPRESS_FLAG) diff --git a/src/mainboard/google/kukui/mainboard.c b/src/mainboard/google/kukui/mainboard.c index e1d8f5f..6447223 100644 --- a/src/mainboard/google/kukui/mainboard.c +++ b/src/mainboard/google/kukui/mainboard.c @@ -16,6 +16,7 @@ #include <device/device.h> #include <soc/gpio.h> #include <soc/mmu_operations.h> +#include <soc/sspm.h> #include <soc/usb.h>
static void configure_emmc(void) @@ -41,6 +42,7 @@ { configure_emmc(); configure_usb(); + sspm_init(); }
static void mainboard_enable(struct device *dev)
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/kukui: Init SSPM ......................................................................
Patch Set 1: Code-Review+2
LGTM, but again, you need to upload the blob first.
Hello Julius Werner, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31835
to look at the new patch set (#2).
Change subject: google/kukui: Init SSPM ......................................................................
google/kukui: Init SSPM
Load SSPM firmware and boot up SSPM.
BUG=b:80501386 BRANCH=none Test=We can see "SSPM is alive" in ATF stage if SSPM enabled and ipi success
Change-Id: I9285034fc8ce38b40134f5eb7b986a663175e620 Signed-off-by: Erin Lo erin.lo@mediatek.com --- M src/mainboard/google/kukui/Makefile.inc M src/mainboard/google/kukui/mainboard.c 2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/31835/2
Erin Lo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/kukui: Init SSPM ......................................................................
Patch Set 2:
Patch Set 1: Code-Review+2
LGTM, but again, you need to upload the blob first.
Here is sspm.bin https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/b...
Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/kukui: Init SSPM ......................................................................
Patch Set 2:
Seems like there'll be build failure if we don't merge the SSPM bin file first?
@Julius/Patrick, I have no experience on this - should we put the blob to Coreboot's 3rdparty/blob (which is a submodule, but I don't know where to find its real repo?) or ChromiumOS's 3rdparty/blob ?
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/kukui: Init SSPM ......................................................................
Patch Set 2:
@Julius/Patrick, I have no experience on this - should we put the blob to Coreboot's 3rdparty/blob (which is a submodule, but I don't know where to find its real repo?) or ChromiumOS's 3rdparty/blob ?
coreboot's 3rdparty/blob. For landing the patch upstream, it's important that it works upstream. Afterwards, we can consider whether we want to create a separate coreboot-private-files ebuild for Chromium for this or just use the blob from the upstream repo. (Since we're not planning to build the blob from source -- right? -- maybe special handling is not needed.)
The real upstream blobs repo is at https://review.coreboot.org/blobs.git. If you have a normal upstream checkout of coreboot, it is automatically checked out as a submodule. You can just do cd 3rdparty/blobs and then create a branch, add a commit and push it to Gerrit like with any other git repo. (Note that MediaTek should upload this blob since it's their IP they're releasing. They should make sure that they're submitting a suitable license file with it that allows unlimited, irrevocable, royalty-free distribution.)
Erin Lo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/kukui: Init SSPM ......................................................................
Patch Set 2:
Here is sspm.bin https://review.coreboot.org/c/blobs/+/32698
Hello Julius Werner, You-Cheng Syu, Hung-Te Lin, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31835
to look at the new patch set (#6).
Change subject: google/kukui: Init SSPM ......................................................................
google/kukui: Init SSPM
Load SSPM firmware and boot up SSPM.
BUG=b:80501386 BRANCH=none Test=We can see "SSPM is alive" in ATF stage if SSPM enabled and ipi success
Change-Id: I9285034fc8ce38b40134f5eb7b986a663175e620 Signed-off-by: Erin Lo erin.lo@mediatek.com --- M src/mainboard/google/kukui/Makefile.inc M src/mainboard/google/kukui/mainboard.c 2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/31835/6
You-Cheng Syu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/kukui: Init SSPM ......................................................................
Patch Set 6:
In file included from src/soc/mediatek/common/bl31_plat_params.c:17: src/soc/mediatek/common/include/soc/bl31_plat_params.h:19:10: fatal error: arm-trusted-firmware/plat/mediatek/common/plat_params.h: No such file or directory #include <arm-trusted-firmware/plat/mediatek/common/plat_params.h> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[1]: *** [Makefile:356: /cb-build/coreboot-gerrit.0/GOOGLE_KUKUI/ramstage/soc/mediatek/common/bl31_plat_params.o] Error 1 make[1]: Leaving directory '/home/coreboot/slave-root/workspace/coreboot-gerrit'
Has the build failure been addressed yet? If so, please upload again with different git hash.
Hello Julius Werner, You-Cheng Syu, Hung-Te Lin, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31835
to look at the new patch set (#7).
Change subject: google/kukui: Init SSPM ......................................................................
google/kukui: Init SSPM
Load SSPM firmware and boot up SSPM.
BUG=b:80501386 BRANCH=none Test=We can see "SSPM is alive" in ATF stage if SSPM enabled and ipi success
Change-Id: I9285034fc8ce38b40134f5eb7b986a663175e620 Signed-off-by: Erin Lo erin.lo@mediatek.com --- M src/mainboard/google/kukui/Makefile.inc M src/mainboard/google/kukui/mainboard.c 2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/31835/7
Erin Lo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/kukui: Init SSPM ......................................................................
Patch Set 7:
sspm.bin is located at https://review.coreboot.org/c/blobs/+/32698/4
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/kukui: Init SSPM ......................................................................
Patch Set 7:
(2 comments)
https://review.coreboot.org/c/coreboot/+/31835/7/src/mainboard/google/kukui/... File src/mainboard/google/kukui/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/31835/7/src/mainboard/google/kukui/... PS7, Line 29: cbfs-files-y += sspm.bin ...and this should go in mt8183/Makefile.inc.
https://review.coreboot.org/c/coreboot/+/31835/7/src/mainboard/google/kukui/... File src/mainboard/google/kukui/mainboard.c:
https://review.coreboot.org/c/coreboot/+/31835/7/src/mainboard/google/kukui/... PS7, Line 79: sspm_init(); The SSPM would be needed for all MT8183 board, right? In that case, I think this should go in mt8183/soc.c...
Erin Lo has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/kukui: Init SSPM ......................................................................
Patch Set 7:
(2 comments)
https://review.coreboot.org/c/coreboot/+/31835/7/src/mainboard/google/kukui/... File src/mainboard/google/kukui/Makefile.inc:
https://review.coreboot.org/c/coreboot/+/31835/7/src/mainboard/google/kukui/... PS7, Line 29: cbfs-files-y += sspm.bin
...and this should go in mt8183/Makefile.inc.
Done
https://review.coreboot.org/c/coreboot/+/31835/7/src/mainboard/google/kukui/... File src/mainboard/google/kukui/mainboard.c:
https://review.coreboot.org/c/coreboot/+/31835/7/src/mainboard/google/kukui/... PS7, Line 79: sspm_init();
The SSPM would be needed for all MT8183 board, right? In that case, I think this should go in mt8183 […]
Done
Hello Julius Werner, You-Cheng Syu, Hung-Te Lin, build bot (Jenkins), Patrick Georgi, Martin Roth,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/31835
to look at the new patch set (#8).
Change subject: google/mt8183: Init SSPM ......................................................................
google/mt8183: Init SSPM
Load SSPM firmware and boot up SSPM.
BUG=b:80501386 BRANCH=none Test=We can see "SSPM is alive" in ATF stage if SSPM enabled and ipi success
Change-Id: I9285034fc8ce38b40134f5eb7b986a663175e620 Signed-off-by: Erin Lo erin.lo@mediatek.com --- M src/soc/mediatek/mt8183/Makefile.inc M src/soc/mediatek/mt8183/soc.c 2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/31835/8
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/mt8183: Init SSPM ......................................................................
Patch Set 8: Code-Review+2
Yu-Ping Wu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: google/mt8183: Init SSPM ......................................................................
Patch Set 8: Code-Review+1
Hung-Te Lin has uploaded a new patch set (#10) to the change originally created by Erin Lo. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
soc/mediatek/mt8183: Init SSPM
Load SSPM firmware and boot up SSPM.
BUG=b:80501386 BRANCH=none Test=We can see "SSPM is alive" in ATF stage if SSPM enabled and ipi success
Change-Id: I9285034fc8ce38b40134f5eb7b986a663175e620 Signed-off-by: Erin Lo erin.lo@mediatek.com --- M src/soc/mediatek/mt8183/Makefile.inc M src/soc/mediatek/mt8183/soc.c 2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/31835/10
Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 10: Code-Review+1
try if build passes now
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 12:
Hmmm... looks like 3rdparty/blobs needs to be manually uprevved nowadays (has that always been the case?). Let me fix that for you...
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 13: Code-Review+2
Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 13:
Hmmm... looks like 3rdparty/blobs needs to be manually uprevved nowadays (has that always been the case?). Let me fix that for you...
Thank so much. I didn't find an easy way to verify that...
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 13:
Need non-uploader approval here as well. Hung-te?
Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 13: Code-Review+2
Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 13:
Needs a rebase... Erin? (Not sure if it matters how to resolve the conflict.)
Hung-Te Lin has uploaded a new patch set (#14) to the change originally created by Erin Lo. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
soc/mediatek/mt8183: Init SSPM
Load SSPM firmware and boot up SSPM.
BUG=b:80501386 BRANCH=none Test=We can see "SSPM is alive" in ATF stage if SSPM enabled and ipi success
Change-Id: I9285034fc8ce38b40134f5eb7b986a663175e620 Signed-off-by: Erin Lo erin.lo@mediatek.com --- M src/soc/mediatek/mt8183/Makefile.inc M src/soc/mediatek/mt8183/soc.c 2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/31835/14
Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 14: Code-Review+2
I solved the conflict.
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 14:
Patch Set 12:
Hmmm... looks like 3rdparty/blobs needs to be manually uprevved nowadays (has that always been the case?).
It has been always been the case to my knowledge.
Hung-Te Lin has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 14:
submodule seems updated. so we're ready to merge this?
Patrick Georgi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
Patch Set 14: Code-Review+2
Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31835 )
Change subject: soc/mediatek/mt8183: Init SSPM ......................................................................
soc/mediatek/mt8183: Init SSPM
Load SSPM firmware and boot up SSPM.
BUG=b:80501386 BRANCH=none Test=We can see "SSPM is alive" in ATF stage if SSPM enabled and ipi success
Change-Id: I9285034fc8ce38b40134f5eb7b986a663175e620 Signed-off-by: Erin Lo erin.lo@mediatek.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/31835 Reviewed-by: Hung-Te Lin hungte@chromium.org Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/mediatek/mt8183/Makefile.inc M src/soc/mediatek/mt8183/soc.c 2 files changed, 7 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved Hung-Te Lin: Looks good to me, approved
diff --git a/src/soc/mediatek/mt8183/Makefile.inc b/src/soc/mediatek/mt8183/Makefile.inc index edf71a8..2f44882 100644 --- a/src/soc/mediatek/mt8183/Makefile.inc +++ b/src/soc/mediatek/mt8183/Makefile.inc @@ -56,6 +56,11 @@ ramstage-y += ../common/wdt.c ramstage-y += md_ctrl.c
+cbfs-files-y += sspm.bin +sspm.bin-file := 3rdparty/blobs/soc/mediatek/mt8183/sspm.bin +sspm.bin-type := raw +sspm.bin-compression := $(CBFS_COMPRESS_FLAG) + CPPFLAGS_common += -Isrc/soc/mediatek/mt8183/include CPPFLAGS_common += -Isrc/soc/mediatek/common/include
diff --git a/src/soc/mediatek/mt8183/soc.c b/src/soc/mediatek/mt8183/soc.c index 501ae19..c9c2147 100644 --- a/src/soc/mediatek/mt8183/soc.c +++ b/src/soc/mediatek/mt8183/soc.c @@ -17,6 +17,7 @@ #include <soc/emi.h> #include <soc/md_ctrl.h> #include <soc/mmu_operations.h> +#include <soc/sspm.h> #include <symbols.h>
static void soc_read_resources(struct device *dev) @@ -28,6 +29,7 @@ { mtk_mmu_disable_l2c_sram(); mtk_md_early_init(); + sspm_init(); }
static struct device_operations soc_ops = {