Hello Paul Menzel, Michael Niewöhner,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/48074
to review the following change.
Change subject: spi/flashconsole: Fix internal buffer overflow
......................................................................
spi/flashconsole: Fix internal buffer overflow
Once the console's FMAP region is full, we stop clearing the line
buffer and `line_offset` is not reset anymore. Hence, sanity check
`line_offset` everytime before writing to the buffer.
Change-Id: I36e9037d7baf8c1ed8b2d0c120bfffa58c089c95
Signed-off-by: Nico Huber <nico.huber(a)secunet.com>
---
M src/drivers/spi/flashconsole.c
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/48074/1
diff --git a/src/drivers/spi/flashconsole.c b/src/drivers/spi/flashconsole.c
index 654177f..d5c4382 100644
--- a/src/drivers/spi/flashconsole.c
+++ b/src/drivers/spi/flashconsole.c
@@ -75,7 +75,8 @@
size_t region_size = region_device_sz(rdev_ptr);
- line_buffer[line_offset++] = c;
+ if (line_offset < LINE_BUFFER_SIZE)
+ line_buffer[line_offset++] = c;
if (line_offset >= LINE_BUFFER_SIZE ||
offset + line_offset >= region_size || c == '\n') {
--
To view, visit https://review.coreboot.org/c/coreboot/+/48074
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I36e9037d7baf8c1ed8b2d0c120bfffa58c089c95
Gerrit-Change-Number: 48074
Gerrit-PatchSet: 1
Gerrit-Owner: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-MessageType: newchange
Michael Niewöhner has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/40955 )
Change subject: payloads/external/GRUB2: prevent rebuild without actual changes
......................................................................
Abandoned
--
To view, visit https://review.coreboot.org/c/coreboot/+/40955
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ibf5a316d0c9761426ec2ee306d78cd56d4bf19b5
Gerrit-Change-Number: 40955
Gerrit-PatchSet: 7
Gerrit-Owner: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Denis Carikli <GNUtoo(a)no-log.org>
Gerrit-Reviewer: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net>
Gerrit-Reviewer: Martin Roth <martinroth(a)google.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: abandon
Michael Niewöhner has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46314 )
Change subject: soc/intel/skylake: Add chipset devicetree
......................................................................
soc/intel/skylake: Add chipset devicetree
Set most of the devices to off to keep current behaviour.
Change-Id: Ic4dbd965c84c3679e42a181dea0e7e618c12fb97
Signed-off-by: Felix Singer <felixsinger(a)posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46314
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Reviewed-by: Michael Niewöhner <foss(a)mniewoehner.de>
---
M src/soc/intel/skylake/Kconfig
A src/soc/intel/skylake/chipset.cb
2 files changed, 70 insertions(+), 0 deletions(-)
Approvals:
build bot (Jenkins): Verified
Tim Wawrzynczak: Looks good to me, approved
Michael Niewöhner: Looks good to me, approved
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index ba3af84..314a08b 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -282,6 +282,10 @@
hex
default 0xc35
+config CHIPSET_DEVICETREE
+ string
+ default "soc/intel/skylake/chipset.cb"
+
config IFD_CHIPSET
string
default "sklkbl"
diff --git a/src/soc/intel/skylake/chipset.cb b/src/soc/intel/skylake/chipset.cb
new file mode 100644
index 0000000..136630e
--- /dev/null
+++ b/src/soc/intel/skylake/chipset.cb
@@ -0,0 +1,66 @@
+chip soc/intel/skylake
+ device domain 0 on
+ device pci 00.0 alias system_agent on end # Host Bridge
+ device pci 01.0 alias peg0 off end # PEG0
+ device pci 01.1 alias peg1 off end # PEG1
+ device pci 01.2 alias peg2 off end # PEG2
+ device pci 02.0 alias igpu off end # Integrated Graphics Device
+ device pci 04.0 alias sa_thermal off end # SA thermal subsystem
+ device pci 05.0 alias imgu off end # Imaging Unit
+ device pci 07.0 alias chap off end # CHAP
+ device pci 08.0 alias gmm off end # Gaussian Mixture Model
+ device pci 13.0 alias ish off end # SensorHub
+ device pci 14.0 alias south_xhci off end # USB xHCI
+ device pci 14.1 alias south_xdci off end # USB xDCI (OTG)
+ device pci 14.2 alias thermal off end # Thermal Subsystem
+ device pci 14.3 alias cio off end # CIO
+ device pci 15.0 alias i2c0 off end # I2C0
+ device pci 15.1 alias i2c1 off end # I2C1
+ device pci 15.2 alias i2c2 off end # I2C2
+ device pci 15.3 alias i2c3 off end # I2C3
+ device pci 16.0 alias heci1 off end # Management Engine Interface 1
+ device pci 16.1 alias heci2 off end # Management Engine Interface 2
+ device pci 16.2 alias csme_ider off end # Management Engine IDE-R
+ device pci 16.3 alias csme_ktr off end # Management Engine KT Redirection
+ device pci 16.4 alias heci3 off end # Management Engine Interface 3
+ device pci 17.0 alias sata off end # SATA
+ device pci 19.0 alias uart2 off end # UART2
+ device pci 19.1 alias i2c5 off end # I2C5
+ device pci 19.2 alias i2c4 off end # I2C4
+ device pci 1b.0 alias pcie_rp17 off end # PCI Express Port 17
+ device pci 1b.1 alias pcie_rp18 off end # PCI Express Port 18
+ device pci 1b.2 alias pcie_rp19 off end # PCI Express Port 19
+ device pci 1b.3 alias pcie_rp20 off end # PCI Express Port 20
+ device pci 1c.0 alias pcie_rp1 off end # PCI Express Port 1
+ device pci 1c.1 alias pcie_rp2 off end # PCI Express Port 2
+ device pci 1c.2 alias pcie_rp3 off end # PCI Express Port 3
+ device pci 1c.3 alias pcie_rp4 off end # PCI Express Port 4
+ device pci 1c.4 alias pcie_rp5 off end # PCI Express Port 5
+ device pci 1c.5 alias pcie_rp6 off end # PCI Express Port 6
+ device pci 1c.6 alias pcie_rp7 off end # PCI Express Port 7
+ device pci 1c.7 alias pcie_rp8 off end # PCI Express Port 8
+ device pci 1d.0 alias pcie_rp9 off end # PCI Express Port 9
+ device pci 1d.1 alias pcie_rp10 off end # PCI Express Port 10
+ device pci 1d.2 alias pcie_rp11 off end # PCI Express Port 11
+ device pci 1d.3 alias pcie_rp12 off end # PCI Express Port 12
+ device pci 1d.4 alias pcie_rp13 off end # PCI Express Port 13
+ device pci 1d.5 alias pcie_rp14 off end # PCI Express Port 14
+ device pci 1d.6 alias pcie_rp15 off end # PCI Express Port 15
+ device pci 1d.7 alias pcie_rp16 off end # PCI Express Port 16
+ device pci 1e.0 alias uart0 off end # UART0
+ device pci 1e.1 alias uart1 off end # UART1
+ device pci 1e.2 alias gspi0 off end # GSPI0
+ device pci 1e.3 alias gspi1 off end # GSPI1
+ device pci 1e.4 alias emmc off end # EMMC
+ device pci 1e.5 alias sdio off end # SDIO
+ device pci 1e.6 alias sdxc off end # SDXC
+ device pci 1f.0 alias lpc_espi off end # LPC Interface
+ device pci 1f.1 alias p2sb off end # P2SB
+ device pci 1f.2 alias pmc off end # Power Management Controller
+ device pci 1f.3 alias hda off end # Intel HDA
+ device pci 1f.4 alias smbus off end # SMBus
+ device pci 1f.5 alias fast_spi off end # PCH SPI
+ device pci 1f.6 alias gbe off end # GbE
+ device pci 1f.7 alias tracehub off end # TraceHub
+ end
+end
--
To view, visit https://review.coreboot.org/c/coreboot/+/46314
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Ic4dbd965c84c3679e42a181dea0e7e618c12fb97
Gerrit-Change-Number: 46314
Gerrit-PatchSet: 9
Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net>
Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Michael Niewöhner <foss(a)mniewoehner.de>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Subrata Banik <subrata.banik(a)intel.com>
Gerrit-Reviewer: Tim Wawrzynczak <twawrzynczak(a)chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-MessageType: merged
Hello Furquan Shaikh, Patrick Georgi,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/48277
to review the following change.
Change subject: cbfs: mcache: Fix end-of-cache check
......................................................................
cbfs: mcache: Fix end-of-cache check
After the mcache is copied into CBMEM, it has *just* the right size to
fit the final tag with no room to spare. That means the test to check if
we walked over the end must be `end - current >= sizeof(tag)`, not
`end - current > sizeof(tag)`.
Signed-off-by: Julius Werner <jwerner(a)chromium.org>
Change-Id: I25a0d774fb3294bb4d15f31f432940bfccc84af0
---
M src/commonlib/bsd/cbfs_mcache.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/77/48277/1
diff --git a/src/commonlib/bsd/cbfs_mcache.c b/src/commonlib/bsd/cbfs_mcache.c
index d2f969d..0d5d8e0 100644
--- a/src/commonlib/bsd/cbfs_mcache.c
+++ b/src/commonlib/bsd/cbfs_mcache.c
@@ -95,7 +95,7 @@
const void *end = mcache + mcache_size;
const void *current = mcache;
- while (current + sizeof(uint32_t) < end) {
+ while (current + sizeof(uint32_t) <= end) {
const union mcache_entry *entry = current;
if (entry->magic == MCACHE_MAGIC_END)
--
To view, visit https://review.coreboot.org/c/coreboot/+/48277
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I25a0d774fb3294bb4d15f31f432940bfccc84af0
Gerrit-Change-Number: 48277
Gerrit-PatchSet: 1
Gerrit-Owner: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan(a)google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-MessageType: newchange
Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48265 )
Change subject: commonlib/bsd/cbfs_mcache: Fix the mcache size in cbmem
......................................................................
commonlib/bsd/cbfs_mcache: Fix the mcache size in cbmem
When copying over the mcache to cbmem the last MCACHE_MAGIC_END entry
is not copied over.
When stages using mcache from cbmem look for a non existing file, it
would print "CBFS mcache overflow!", which is now fixed.
Change-Id: Iec57e6a294a0cb1883c4aca94f76421efb70297d
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
---
M src/commonlib/bsd/cbfs_mcache.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/48265/1
diff --git a/src/commonlib/bsd/cbfs_mcache.c b/src/commonlib/bsd/cbfs_mcache.c
index d2f969d..66c702e 100644
--- a/src/commonlib/bsd/cbfs_mcache.c
+++ b/src/commonlib/bsd/cbfs_mcache.c
@@ -131,7 +131,7 @@
const union mcache_entry *entry = current;
if (entry->magic == MCACHE_MAGIC_FULL || entry->magic == MCACHE_MAGIC_END) {
- current += sizeof(entry->magic);
+ current += sizeof(*entry);
break;
}
--
To view, visit https://review.coreboot.org/c/coreboot/+/48265
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: Iec57e6a294a0cb1883c4aca94f76421efb70297d
Gerrit-Change-Number: 48265
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-MessageType: newchange