Attention is currently required from: Alexander Couzens, Alicja Michalska, Angel Pons, Christian Walter, Dinesh Gehlot, Eran Mitrani, Erik van den Bogaert, Felix Held, Felix Singer, Frans Hendriks, Fred Reitberger, Intel coreboot Reviewers, Jakub "Kuba" Czapiga, Jason Glenesk, Jason Nien, Jayvik Desai, Jeremy Soller, Jonathon Hall, Jérémy Compostella, Kapil Porwal, Martin L Roth, Martin Roth, Matt DeVillier, Maxim Polyakov, Michael Niewöhner, Michał Kopeć, Michał Żygowski, Nicholas Chin, Nick Vaccaro, Patrick Rudolph, Piotr Król, Pranava Y N, Stefan Ott, Subrata Banik, Tarun, Tim Crawford, Werner Zeh, yuchi.chen(a)intel.com.
Shuo Liu has posted comments on this change by Shuo Liu. ( https://review.coreboot.org/c/coreboot/+/86571?usp=email )
Change subject: Kconfig: Update prompt and help text for CBFS_SIZE
......................................................................
Patch Set 9:
(3 comments)
File src/Kconfig:
https://review.coreboot.org/c/coreboot/+/86571/comment/ebaa6943_c567dc27?us… :
PS8, Line 644: Firmware
> N.B. […]
Fix applied.
https://review.coreboot.org/c/coreboot/+/86571/comment/cad82fbf_f16667ce?us… :
PS8, Line 646: Firmware Descriptor
> ```suggestion […]
Fix applied.
https://review.coreboot.org/c/coreboot/+/86571/comment/ad293abe_6c771c0f?us… :
PS8, Line 648: non-default
> ```suggestion […]
Fix applied.
--
To view, visit https://review.coreboot.org/c/coreboot/+/86571?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I762042fae6357ee368b22a47b8e1168902041675
Gerrit-Change-Number: 86571
Gerrit-PatchSet: 9
Gerrit-Owner: Shuo Liu <shuo.liu(a)intel.com>
Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu>
Gerrit-Reviewer: Alicja Michalska <ahplka19(a)gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Reviewer: Eran Mitrani <mitrani(a)google.com>
Gerrit-Reviewer: Erik van den Bogaert <ebogaert(a)eltan.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Frans Hendriks <fhendriks(a)eltan.com>
Gerrit-Reviewer: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-Reviewer: Intel coreboot Reviewers <intel_coreboot_reviewers(a)intel.com>
Gerrit-Reviewer: Jakub "Kuba" Czapiga <czapiga(a)google.com>
Gerrit-Reviewer: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Reviewer: Jason Nien <jason.nien(a)amd.corp-partner.google.com>
Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com>
Gerrit-Reviewer: Jeremy Soller <jeremy(a)system76.com>
Gerrit-Reviewer: Jonathon Hall <jonathon.hall(a)puri.sm>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Martin Roth <martin.roth(a)amd.corp-partner.google.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Maxim Polyakov <max.senia.poliak(a)gmail.com>
Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Reviewer: Michał Kopeć <michal.kopec(a)3mdeb.com>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Reviewer: Pranava Y N <pranavayn(a)google.com>
Gerrit-Reviewer: Stefan Ott <coreboot(a)desire.ch>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: Tarun <tstuli(a)gmail.com>
Gerrit-Reviewer: Tim Crawford <tcrawford(a)system76.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Reviewer: yuchi.chen(a)intel.com
Gerrit-CC: Jérémy Compostella <jeremy.compostella(a)intel.com>
Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Attention: Stefan Ott <coreboot(a)desire.ch>
Gerrit-Attention: Eran Mitrani <mitrani(a)google.com>
Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Attention: Jakub "Kuba" Czapiga <czapiga(a)google.com>
Gerrit-Attention: Jérémy Compostella <jeremy.compostella(a)intel.com>
Gerrit-Attention: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Attention: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Attention: Jonathon Hall <jonathon.hall(a)puri.sm>
Gerrit-Attention: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Attention: Intel coreboot Reviewers <intel_coreboot_reviewers(a)intel.com>
Gerrit-Attention: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Attention: Subrata Banik <subratabanik(a)google.com>
Gerrit-Attention: Michał Kopeć <michal.kopec(a)3mdeb.com>
Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Attention: Alexander Couzens <lynxis(a)fe80.eu>
Gerrit-Attention: Nicholas Chin <nic.c3.14(a)gmail.com>
Gerrit-Attention: Fred Reitberger <reitbergerfred(a)gmail.com>
Gerrit-Attention: Pranava Y N <pranavayn(a)google.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Attention: Frans Hendriks <fhendriks(a)eltan.com>
Gerrit-Attention: Jason Nien <jason.nien(a)amd.corp-partner.google.com>
Gerrit-Attention: Jeremy Soller <jeremy(a)system76.com>
Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Attention: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Attention: Martin Roth <martin.roth(a)amd.corp-partner.google.com>
Gerrit-Attention: Tarun <tstuli(a)gmail.com>
Gerrit-Attention: Erik van den Bogaert <ebogaert(a)eltan.com>
Gerrit-Attention: Jayvik Desai <jayvik(a)google.com>
Gerrit-Attention: Tim Crawford <tcrawford(a)system76.com>
Gerrit-Attention: Jason Glenesk <jason.glenesk(a)gmail.com>
Gerrit-Attention: yuchi.chen(a)intel.com
Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Attention: Alicja Michalska <ahplka19(a)gmail.com>
Gerrit-Attention: Maxim Polyakov <max.senia.poliak(a)gmail.com>
Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Comment-Date: Fri, 28 Feb 2025 06:32:51 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Matt DeVillier <matt.devillier(a)gmail.com>
Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com>
Shuo Liu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86638?usp=email )
Change subject: Kconfig: Add OVERRIDE_CBFS_MMAP_WINDOW
......................................................................
Kconfig: Add OVERRIDE_CBFS_MMAP_WINDOW
cbfstool by default uses an mmap window of $CONFIG_ROM_SIZE-16M:
4G-16M:16M (flash-base:mmio-base:size), which only allows
coreboot owned flash region size smaller than 16MB.
Select OVERRIDE_CBFS_MMAP_WINDOW if the default behavior needs
to be changed, where cbfstool add commands will be used with
extra options to specify a customized mmap window setting, by
--mmap $(CONFIG_MMAP_FLASH_BASE):$(CONFIG_MMAP_MMIO_BASE):
$(CONFIG_MMAP_SIZE)
The usages could be various, e.g. it helps if a mainboard target
uses a coreboot owned flash region larger than 16MB.
Change-Id: I5f049ef62893c254cef274521324a3b90c6ff70d
Signed-off-by: Shuo Liu <shuo.liu(a)intel.com>
---
M Makefile.mk
M src/Kconfig
M src/arch/x86/Makefile.mk
3 files changed, 25 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/86638/1
diff --git a/Makefile.mk b/Makefile.mk
index 0542aef..d9ed443 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -983,6 +983,10 @@
cbfs-autogen-attributes=-g
endif
+ifeq ($(CONFIG_OVERRIDE_CBFS_MMAP_WINDOW),y)
+ cbfs-mmap-win=--mmap $(CONFIG_MMAP_FLASH_BASE):$(CONFIG_MMAP_MMIO_BASE):$(CONFIG_MMAP_SIZE)
+endif
+
# cbfs-add-cmd-for-region
# $(call cbfs-add-cmd-for-region,file in extract_nth format,region name)
#
@@ -999,6 +1003,7 @@
extract_nth,3,$(1))),-t $(call extract_nth,3,$(1))) \
$(if $(call extract_nth,4,$(1)),-c $(call extract_nth,4,$(1))) \
$(cbfs-autogen-attributes) \
+ $(cbfs-mmap-win) \
-r $(2) \
$(if $(call extract_nth,6,$(1)),-a $(call extract_nth,6,$(file)), \
$(if $(call extract_nth,5,$(file)),-b $(call extract_nth,5,$(file)))) \
diff --git a/src/Kconfig b/src/Kconfig
index 3914a38..3385fcf 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -1515,6 +1515,25 @@
(bootblock, romstage, verstage, ramstage, postcar) in
src/arch/${ARCH}/Makefile.mk.
+config OVERRIDE_CBFS_MMAP_WINDOW
+ bool
+ default n
+ help
+ if set as y, all cbfs add commands will use overridden mmio window by
+ adding --mmap $CONFIG_CBFS_FLASH_BASE:$CONFIG_CBFS_MMIO_BASE:$CONFIG_CBFS_MMAP_SIZE
+
+config MMAP_FLASH_BASE
+ depends on OVERRIDE_CBFS_MMAP_WINDOW
+ hex
+
+config MMAP_MMIO_BASE
+ depends on OVERRIDE_CBFS_MMAP_WINDOW
+ hex
+
+config MMAP_SIZE
+ depends on OVERRIDE_CBFS_MMAP_WINDOW
+ hex
+
###############################################################################
# Set default values for symbols created before mainboards. This allows the
# option to be displayed in the general menu, but the default to be loaded in
diff --git a/src/arch/x86/Makefile.mk b/src/arch/x86/Makefile.mk
index a455a09..4cd7309 100644
--- a/src/arch/x86/Makefile.mk
+++ b/src/arch/x86/Makefile.mk
@@ -85,7 +85,7 @@
add_bootblock = \
$(CBFSTOOL) $(1) add -f $(2) -n bootblock -t bootblock $(TXTIBB) \
-b -$(call file-size,$(2)) \
- $(cbfs-autogen-attributes) $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS)
+ $(cbfs-autogen-attributes) $(cbfs-mmap-win) $(TS_OPTIONS) $(CBFSTOOL_ADD_CMD_OPTIONS)
endif
ifneq ($(CONFIG_CBFS_VERIFICATION),y)
--
To view, visit https://review.coreboot.org/c/coreboot/+/86638?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I5f049ef62893c254cef274521324a3b90c6ff70d
Gerrit-Change-Number: 86638
Gerrit-PatchSet: 1
Gerrit-Owner: Shuo Liu <shuo.liu(a)intel.com>
Keith Hui has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/86636?usp=email )
Change subject: mb/asus/p8z77-m: Move SIO ACPI device config to bootblock
......................................................................
mb/asus/p8z77-m: Move SIO ACPI device config to bootblock
ACPI S3 suspend has been failing on this mainboard for about 5 months
as of this writing. This move fixes the regression. The removal of
these three settings from devicetree also realized a small image
size reduction.
TEST=Now again able to enter S3 suspend and return to where I was.
Change-Id: I35189b7977c83b3a2666dded8267b9021f0ea3f3
Signed-off-by: Keith Hui <buurin(a)gmail.com>
---
M src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c
M src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb
2 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/36/86636/1
diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c
index 76eba43..7e4647c 100644
--- a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c
+++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/early_init.c
@@ -12,6 +12,7 @@
#define SERIAL_DEV PNP_DEV(CONFIG_SUPERIO_PNP_BASE, NCT6779D_SP1)
#define GPIO0_DEV PNP_DEV(CONFIG_SUPERIO_PNP_BASE, NCT6779D_WDT1_GPIO01_V)
+#define ACPI_DEV PNP_DEV(CONFIG_SUPERIO_PNP_BASE, NCT6779D_ACPI)
void bootblock_mainboard_early_init(void)
{
@@ -26,6 +27,11 @@
pnp_write_config(GPIO0_DEV, 0xe0, 0x7f);
pnp_write_config(GPIO0_DEV, 0xe1, 0x00);
+ pnp_set_logical_device(ACPI_DEV);
+ pnp_write_config(ACPI_DEV, 0xe4, 0x10); /* Enable 3VSBSW#, needed for S3 suspend */
+ pnp_write_config(ACPI_DEV, 0xe7, 0x11); /* HWM reset by LRESET#, 0.5s S3 delay */
+ pnp_write_config(ACPI_DEV, 0xf2, 0x5d); /* Enable RSTOUT[0-2]# and PME */
+
nuvoton_pnp_exit_conf_state(GPIO0_DEV);
/*
diff --git a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb
index e84125b..058ce76 100644
--- a/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb
+++ b/src/mainboard/asus/p8x7x-series/variants/p8z77-m/overridetree.cb
@@ -56,11 +56,7 @@
device pnp 2e.108 on # GPIO 0
drq 0xe1 = 0x80 # GP07 high turns DRAM_LED off
end
- device pnp 2e.a on # ACPI
- drq 0xe4 = 0x10 # Enable 3VSBSW#, needed for S3 suspend
- drq 0xe7 = 0x11 # HWM reset by LRESET#, 0.5s S3 delay for compatibility
- drq 0xf2 = 0x5d # Enable RSTOUT[0-2]# and PME
- end
+ device pnp 2e.a on end # ACPI
device pnp 2e.b on # HWM, front panel LED
io 0x60 = 0x290 # HWM address
io 0x62 = 0 # SB-TSI address (not used)
--
To view, visit https://review.coreboot.org/c/coreboot/+/86636?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I35189b7977c83b3a2666dded8267b9021f0ea3f3
Gerrit-Change-Number: 86636
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <buurin(a)gmail.com>
Attention is currently required from: Dinesh Gehlot, Jayvik Desai, Kapil Porwal, Nick Vaccaro.
Brian Hsu has posted comments on this change by Brian Hsu. ( https://review.coreboot.org/c/coreboot/+/86602?usp=email )
Change subject: mb/google/nissa/var/guren: Add initial override devicetree
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Dear all, if no concern, please kindly help to submit the CL. Thanks a lot.
--
To view, visit https://review.coreboot.org/c/coreboot/+/86602?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ia43a78c340426069571172319be1675b3d94eba4
Gerrit-Change-Number: 86602
Gerrit-PatchSet: 1
Gerrit-Owner: Brian Hsu <brian_hsu(a)pegatron.corp-partner.google.com>
Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Reviewer: Eric Lai <ericllai(a)google.com>
Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com>
Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Daniel Peng <daniel_peng(a)pegatron.corp-partner.google.com>
Gerrit-CC: David Li <david_li(a)pegatron.corp-partner.google.com>
Gerrit-CC: Samuel Chen <samuel_chen(a)pegatron.corp-partner.google.com>
Gerrit-CC: Wayne3 Wang <wayne3_wang(a)pegatron.corp-partner.google.com>
Gerrit-Attention: Jayvik Desai <jayvik(a)google.com>
Gerrit-Attention: Dinesh Gehlot <digehlot(a)google.com>
Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com>
Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org>
Gerrit-Comment-Date: Fri, 28 Feb 2025 04:36:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No