coreboot-gerrit March 2021

coreboot-gerrit@coreboot.org

1 participants
7266 discussions

Change in coreboot[master]: mb/google/brya: Fix a few mistakes in brya0 overridetree
by Tim Wawrzynczak (Code Review) 01 Mar '21

01 Mar '21

Tim Wawrzynczak has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/51145 ) Change subject: mb/google/brya: Fix a few mistakes in brya0 overridetree ...................................................................... mb/google/brya: Fix a few mistakes in brya0 overridetree 1) Both SAR sensors had a UID of `2`, making them indistinguishable 2) No `device` underneath max98357a `chip` Change-Id: Icf586229532819a7779652cbee73755b036dfbdc Signed-off-by: Tim Wawrzynczak <twawrzynczak(a)chromium.org> --- M src/mainboard/google/brya/variants/brya0/overridetree.cb 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/51145/1 diff --git a/src/mainboard/google/brya/variants/brya0/overridetree.cb b/src/mainboard/google/brya/variants/brya0/overridetree.cb index 030d19e..b70f156 100644 --- a/src/mainboard/google/brya/variants/brya0/overridetree.cb +++ b/src/mainboard/google/brya/variants/brya0/overridetree.cb @@ -73,7 +73,7 @@ register "desc" = ""SAR1 Proximity Sensor"" register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_H19_IRQ)" register "speed" = "I2C_SPEED_FAST" - register "uid" = "2" + register "uid" = "1" register "reg_gnrl_ctrl0" = "0x16" register "reg_gnrl_ctrl1" = "0x21" register "reg_afe_ctrl0" = "0x00" @@ -183,6 +183,7 @@ register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A11)" register "sdmode_delay" = "5" + device generic 0 on end end end device ref gspi1 on -- To view, visit https://review.coreboot.org/c/coreboot/+/51145 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Icf586229532819a7779652cbee73755b036dfbdc Gerrit-Change-Number: 51145 Gerrit-PatchSet: 1 Gerrit-Owner: Tim Wawrzynczak <twawrzynczak(a)chromium.org> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: util/chromeos: Use the same inventory each time and verify checksums
by Paul Menzel (Code Review) 01 Mar '21

01 Mar '21

Attention is currently required from: Leah Rowe. Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/51144 ) Change subject: util/chromeos: Use the same inventory each time and verify checksums ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: Please sign off the commit. -- To view, visit https://review.coreboot.org/c/coreboot/+/51144 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If0166518d252a36d8f9a9c17d375fbdd9e3116f6 Gerrit-Change-Number: 51144 Gerrit-PatchSet: 1 Gerrit-Owner: Leah Rowe <leahleahrowerowe(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Matt DeVillier <matt.devillier(a)gmail.com> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Attention: Leah Rowe <leahleahrowerowe(a)gmail.com> Gerrit-Comment-Date: Mon, 01 Mar 2021 15:37:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[master]: util/chromeos: Use the same inventory each time and verify checksums
by Leah Rowe (Code Review) 01 Mar '21

01 Mar '21

Leah Rowe has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/51144 ) Change subject: util/chromeos: Use the same inventory each time and verify checksums ...................................................................... util/chromeos: Use the same inventory each time and verify checksums Coreboot wasn't doing any integrity checks. Furthermore, the latest inventory file from Google was always being used, which meant that it was not certain which version would be used. This commit uses a version of the inventory from archive.org, verifies its checksum and then, using sha1 checksums defined inside the inventory file, verifies the checksums of recovery images. This is obviously a huge boon to security and reliability. Change-Id: If0166518d252a36d8f9a9c17d375fbdd9e3116f6 --- M util/chromeos/crosfirmware.sh 1 file changed, 50 insertions(+), 22 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/51144/1 diff --git a/util/chromeos/crosfirmware.sh b/util/chromeos/crosfirmware.sh index 25c88fa..b1ce94d 100755 --- a/util/chromeos/crosfirmware.sh +++ b/util/chromeos/crosfirmware.sh @@ -31,7 +31,7 @@ get_inventory() { _conf=$1 - _url=https://dl.google.com/dl/edgedl/chromeos/recovery/recovery.conf + _url="http://web.archive.org/web/20210211071412/https://dl.google.com/dl/edgedl/c…" echo "Downloading recovery image inventory..." @@ -42,12 +42,26 @@ { _url=$1 _file=$2 + _cfgfile=$3 echo "Downloading recovery image" curl "$_url" > "$_file.zip" - echo "Decompressing recovery image" - unzip -q "$_file.zip" - rm "$_file.zip" + + _file_sha1="$(sha1sum ${_file}.zip)" + sha1_list="$(grep sha1 ${_cfgfile} | sed 's/sha1=//g')" + + echo "Verifying sha1sum of recovery image from inventory..." + for _sha1 in ${sha1_list}; do + if [ "${_sha1} ${_file}.zip" = "${_file_sha1}" ]; then + unzip -q "${_file}.zip" + rm "${_file}.zip" + echo "...correct sha1sum found. File downloaded and extracted." + return 0 + fi + done + rm "${_file}.zip" + echo "...sha1sum not found in the inventory. Recovery image deleted." + return 1 } extract_partition() @@ -98,14 +112,19 @@ _board=$1 _url=$2 _file=$3 + _cfgfile=$4 # for searching sha1sums when verifying images - download_image $_url $_file + download_image $_url $_file $_cfgfile - extract_partition ROOT-A $_file root-a.ext2 - extract_shellball root-a.ext2 chromeos-firmwareupdate-$_board - rm $_file root-a.ext2 + if [ -f "${_file}" ]; then + extract_partition ROOT-A $_file root-a.ext2 + extract_shellball root-a.ext2 chromeos-firmwareupdate-$_board + rm $_file root-a.ext2 - extract_coreboot chromeos-firmwareupdate-$_board + extract_coreboot chromeos-firmwareupdate-$_board + else + echo "${_file}.zip was not downloaded. Skipping extraction." + fi } # @@ -116,32 +135,41 @@ exit_if_dependencies_are_missing -if [ "$BOARD" == "all" ]; then - CONF=$( mktemp ) - get_inventory $CONF +CONF="$( mktemp )" +CONF_SHA1_FILE="$( mktemp )" +get_inventory "${CONF}" +echo "acaf7450481136e72a1ee6c4fe3a2dea992d028f ${CONF}" > "${CONF_SHA1_FILE}" + +echo "Verifying checksum of downloaded Inventory file" +if ! sha1sum -c "${CONF_SHA1_FILE}" >/dev/null 2>&1; then + echo "$(cat $CONF_SHA1_FILE)" + echo "$(sha1sum $CONF)" + echo "Checksum verification failed. Nothing will be downloaded" + rm -f "${CONF}" "${CONF_SHA1_FILE}" + exit 1 +fi +echo "Checksum verified. Further checks will be performed on recovery images." + +if [ "$BOARD" == "all" ]; then grep ^name= $CONF| while read _line; do name=$( echo $_line | cut -f2 -d= ) echo Processing board $name eval $( grep -v hwid= $CONF | grep -A11 "$_line" | \ grep '$url=\|file=$' ) BOARD=$( echo $url | cut -f3 -d_ ) - do_one_board $BOARD $url $file + do_one_board $BOARD $url $file $CONF done - - rm "$CONF" elif [ "$BOARD" != "" ]; then - CONF=$( mktemp ) - get_inventory $CONF - echo Processing board $BOARD - eval $( grep $BOARD $CONF | grep '$url=\|file=$' ) - do_one_board $BOARD $url $file - - rm "$CONF" + eval $( grep $BOARD ${CONF} | grep '$url=\|file=$' ) + do_one_board $BOARD $url $file $CONF else echo "Usage: $0 <boardname>" echo " $0 all" echo + rm -f "${CONF}" "${CONF_SHA1_FILE}" exit 1 fi + +rm -f "${CONF}" "${CONF_SHA1_FILE}" -- To view, visit https://review.coreboot.org/c/coreboot/+/51144 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: If0166518d252a36d8f9a9c17d375fbdd9e3116f6 Gerrit-Change-Number: 51144 Gerrit-PatchSet: 1 Gerrit-Owner: Leah Rowe <leahleahrowerowe(a)gmail.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/google/dedede/var/storo: Add camera support
by Andy Yeh (Code Review) 01 Mar '21

01 Mar '21

Attention is currently required from: Martin Roth, Henry Sun, zanxi chen, Paul Menzel, Weimin Wu, Andy Yeh, Karthik Ramasubramanian. Andy Yeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/50995 ) Change subject: mb/google/dedede/var/storo: Add camera support ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: > If there is only one type of MIPI, and it's by default, we don't need to have SSFC for Storo for now […] henry is correct. no need check whether EEPROM is provisioned in coreboot. -- To view, visit https://review.coreboot.org/c/coreboot/+/50995 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I98d5708d1955406c2e46db972903057bb3d12dcc Gerrit-Change-Number: 50995 Gerrit-PatchSet: 2 Gerrit-Owner: zanxi chen <chenzanxi(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: Andy Yeh <andy.yeh(a)intel.com> Gerrit-Reviewer: Henry Sun <henrysun(a)google.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Tao Xia <xiatao5(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin Roth <martinroth(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-CC: Weimin Wu <wuweimin(a)huaqin.corp-partner.google.com> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-Attention: Henry Sun <henrysun(a)google.com> Gerrit-Attention: zanxi chen <chenzanxi(a)huaqin.corp-partner.google.com> Gerrit-Attention: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Attention: Weimin Wu <wuweimin(a)huaqin.corp-partner.google.com> Gerrit-Attention: Andy Yeh <andy.yeh(a)intel.com> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Comment-Date: Mon, 01 Mar 2021 15:19:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Henry Sun <henrysun(a)google.com> Comment-In-Reply-To: zanxi chen <chenzanxi(a)huaqin.corp-partner.google.com> Comment-In-Reply-To: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: sb/ti/pcixx12: Remove NOOP chip driver
by Arthur Heymans (Code Review) 01 Mar '21

01 Mar '21

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/51135 ) Change subject: sb/ti/pcixx12: Remove NOOP chip driver ...................................................................... sb/ti/pcixx12: Remove NOOP chip driver Change-Id: I46bc854239e723a1685279f634e635b72e7b3af9 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/mainboard/getac/p470/devicetree.cb M src/southbridge/ti/pcixx12/pcixx12.c 2 files changed, 1 insertion(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/35/51135/1 diff --git a/src/mainboard/getac/p470/devicetree.cb b/src/mainboard/getac/p470/devicetree.cb index 230cad4..94ffd19 100644 --- a/src/mainboard/getac/p470/devicetree.cb +++ b/src/mainboard/getac/p470/devicetree.cb @@ -64,11 +64,7 @@ device pci 1d.2 on end # USB UHCI device pci 1d.3 on end # USB UHCI device pci 1d.7 on end # USB2 EHCI - device pci 1e.0 on - chip southbridge/ti/pcixx12 - - end - end # PCI bridge + device pci 1e.0 on end # PCI bridge device pci 1e.2 off end # AC'97 Audio device pci 1e.3 off end # AC'97 Modem device pci 1f.0 on # LPC bridge diff --git a/src/southbridge/ti/pcixx12/pcixx12.c b/src/southbridge/ti/pcixx12/pcixx12.c index dec3577..f1c0a4a 100644 --- a/src/southbridge/ti/pcixx12/pcixx12.c +++ b/src/southbridge/ti/pcixx12/pcixx12.c @@ -38,12 +38,3 @@ .vendor = 0x104c, .device = 0x8039, }; - -static void southbridge_init(struct device *dev) -{ -} - -struct chip_operations southbridge_ti_pcixx12_ops = { - CHIP_NAME("Texas Instruments PCIxx12 Cardbus Controller") - .enable_dev = southbridge_init, -}; -- To view, visit https://review.coreboot.org/c/coreboot/+/51135 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I46bc854239e723a1685279f634e635b72e7b3af9 Gerrit-Change-Number: 51135 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: mb/google/dedede/var/storo: Add camera support
by Henry Sun (Code Review) 01 Mar '21

01 Mar '21

Attention is currently required from: Martin Roth, zanxi chen, Paul Menzel, Weimin Wu, Andy Yeh, Karthik Ramasubramanian. Henry Sun has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/50995 ) Change subject: mb/google/dedede/var/storo: Add camera support ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Done If there is only one type of MIPI, and it's by default, we don't need to have SSFC for Storo for now. Because SSFC should be model specific, "0" should also mean the default configurations. Thanks. -- To view, visit https://review.coreboot.org/c/coreboot/+/50995 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I98d5708d1955406c2e46db972903057bb3d12dcc Gerrit-Change-Number: 50995 Gerrit-PatchSet: 2 Gerrit-Owner: zanxi chen <chenzanxi(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: Andy Yeh <andy.yeh(a)intel.com> Gerrit-Reviewer: Henry Sun <henrysun(a)google.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Tao Xia <xiatao5(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin Roth <martinroth(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-CC: Weimin Wu <wuweimin(a)huaqin.corp-partner.google.com> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-Attention: zanxi chen <chenzanxi(a)huaqin.corp-partner.google.com> Gerrit-Attention: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Attention: Weimin Wu <wuweimin(a)huaqin.corp-partner.google.com> Gerrit-Attention: Andy Yeh <andy.yeh(a)intel.com> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Comment-Date: Mon, 01 Mar 2021 14:46:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: zanxi chen <chenzanxi(a)huaqin.corp-partner.google.com> Comment-In-Reply-To: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-MessageType: comment

1 0

Change in coreboot[master]: mb/google/dedede/var/storo: Add camera support
by zanxi chen (Code Review) 01 Mar '21

01 Mar '21

Attention is currently required from: Martin Roth, Henry Sun, Paul Menzel, Weimin Wu, Andy Yeh, Karthik Ramasubramanian. zanxi chen has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/50995 ) Change subject: mb/google/dedede/var/storo: Add camera support ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: > Henry, […] Done -- To view, visit https://review.coreboot.org/c/coreboot/+/50995 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I98d5708d1955406c2e46db972903057bb3d12dcc Gerrit-Change-Number: 50995 Gerrit-PatchSet: 2 Gerrit-Owner: zanxi chen <chenzanxi(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: Andy Yeh <andy.yeh(a)intel.com> Gerrit-Reviewer: Henry Sun <henrysun(a)google.com> Gerrit-Reviewer: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Tao Xia <xiatao5(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Martin Roth <martinroth(a)google.com> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-CC: Weimin Wu <wuweimin(a)huaqin.corp-partner.google.com> Gerrit-Attention: Martin Roth <martinroth(a)google.com> Gerrit-Attention: Henry Sun <henrysun(a)google.com> Gerrit-Attention: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Attention: Weimin Wu <wuweimin(a)huaqin.corp-partner.google.com> Gerrit-Attention: Andy Yeh <andy.yeh(a)intel.com> Gerrit-Attention: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-Comment-Date: Mon, 01 Mar 2021 13:04:58 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Karthik Ramasubramanian <kramasub(a)google.com> Gerrit-MessageType: comment

1 0

Change in libgfxinit[master]: f
by Angel Pons (Code Review) 01 Mar '21

01 Mar '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/libgfxinit/+/51134 ) Change subject: f ...................................................................... f Change-Id: Id66a9ad07f102480b9ee3bf9087c02d0516f1c7b Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M common/hw-gfx-dp_info.adb 1 file changed, 48 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/34/51134/1 diff --git a/common/hw-gfx-dp_info.adb b/common/hw-gfx-dp_info.adb index 4d7c13e..6e87dba 100644 --- a/common/hw-gfx-dp_info.adb +++ b/common/hw-gfx-dp_info.adb @@ -72,6 +72,48 @@ end loop; end Write_Lspcon_Mode; + procedure Detect_Dual_Mode (Port : in T; Success : out Boolean) + is + Length : I2C.Transfer_Length := 16; + Buffer : I2C.Transfer_Data; + Adp_Id : Word8; + begin + Time.U_Delay (1000); + Aux_Ch.I2C_Read + (Port => Port, + Address => 16#40#, + Length => Length, + Data => Buffer, + Success => Success); + if not Success then + pragma Debug (Debug.Put_Line ("Could not read dual-mode HDMI ID.")); + return; + end if; + if Length /= 16 then + pragma Debug (Debug.Put ("Unexpected length in dual-mode HDMI ID read: ")); + pragma Debug (Debug.Put_Line (Length'Image)); + return; + end if; + pragma Debug (Debug.Put ("Dual-mode HDMI ID: ")); + for Idx in 0 .. 15 loop + pragma Debug (Debug.Put_Word8 (Buffer (Idx))); + end loop; + pragma Debug (Debug.New_Line); + Aux_Ch.I2C_Read_Byte + (Port => Port, + Address => 16#40#, + Offset => 16#10#, + Value => Adp_Id, + Success => Success); + if not Success then + pragma Debug (Debug.Put_Line ("Could not read dual-mode adaptor ID.")); + return; + end if; + pragma Debug (Debug.Put ("Dual-mode adaptor ID: ")); + pragma Debug (Debug.Put_Word8 (Adp_Id)); + pragma Debug (Debug.New_Line); + end Detect_Dual_Mode; + procedure Set_Lspcon_To_Pcon_Mode (Port : in T; Success : out Boolean) is Wanted_Mode : constant Word8 := LSPCON_MODE_PCON; @@ -149,6 +191,12 @@ begin pragma Debug (Debug.Put_Line (GNAT.Source_Info.Enclosing_Entity)); + Detect_Dual_Mode (Port, Success); + + if not Success then + pragma Debug (Debug.Put_Line ("Could not detect dual mode.")); + end if; + Set_Lspcon_To_Pcon_Mode (Port, Success); if not Success then -- To view, visit https://review.coreboot.org/c/libgfxinit/+/51134 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: Id66a9ad07f102480b9ee3bf9087c02d0516f1c7b Gerrit-Change-Number: 51134 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

Change in libgfxinit[master]: [WIP] LSPCON
by Angel Pons (Code Review) 01 Mar '21

01 Mar '21

Angel Pons has uploaded this change for review. ( https://review.coreboot.org/c/libgfxinit/+/51133 ) Change subject: [WIP] LSPCON ...................................................................... [WIP] LSPCON Change-Id: Idfa9bdff47a6591000cd5092d64a4cd4f8dbdc8d Signed-off-by: Angel Pons <th3fanbus(a)gmail.com> --- M common/Makefile.inc M common/hw-gfx-gma-config.ads.template 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/libgfxinit refs/changes/33/51133/1 diff --git a/common/Makefile.inc b/common/Makefile.inc index b1ed074..15abacf 100644 --- a/common/Makefile.inc +++ b/common/Makefile.inc @@ -48,12 +48,14 @@ gfxinit-y += hw-gfx-framebuffer_filler.ads CONFIG_GFX_GMA_PCH ?= No_PCH +CONFIG_GFX_GMA_LSPCON_PORT ?= Disabled CONFIG_GFX_GMA_PANEL_2_PORT ?= Disabled CONFIG_GFX_GMA_GENERATION := $(call strip_quotes,$(CONFIG_GFX_GMA_GENERATION)) CONFIG_GFX_GMA_CPU := $(call strip_quotes,$(CONFIG_GFX_GMA_CPU)) CONFIG_GFX_GMA_CPU_VARIANT := $(call strip_quotes,$(CONFIG_GFX_GMA_CPU_VARIANT)) CONFIG_GFX_GMA_PCH := $(call strip_quotes,$(CONFIG_GFX_GMA_PCH)) +CONFIG_GFX_GMA_LSPCON_PORT := $(call strip_quotes,$(CONFIG_GFX_GMA_LSPCON_PORT)) CONFIG_GFX_GMA_PANEL_1_PORT := $(call strip_quotes,$(CONFIG_GFX_GMA_PANEL_1_PORT)) CONFIG_GFX_GMA_PANEL_2_PORT := $(call strip_quotes,$(CONFIG_GFX_GMA_PANEL_2_PORT)) CONFIG_GFX_GMA_ANALOG_I2C_PORT := $(call strip_quotes,$(CONFIG_GFX_GMA_ANALOG_I2C_PORT)) @@ -79,6 +81,7 @@ GFX_GMA_COMMON_SUBSTITUTIONS := \ -e's/<<GEN>>/$(CONFIG_GFX_GMA_GENERATION)/' \ -e's/<<PCH>>/$(CONFIG_GFX_GMA_PCH)/' \ + -e's/<<LSPCON_PORT>>/$(CONFIG_GFX_GMA_LSPCON_PORT)/' \ -e's/<<PANEL_1_PORT>>/$(CONFIG_GFX_GMA_PANEL_1_PORT)/' \ -e's/<<PANEL_2_PORT>>/$(CONFIG_GFX_GMA_PANEL_2_PORT)/' \ -e's/<<ANALOG_I2C_PORT>>/$(CONFIG_GFX_GMA_ANALOG_I2C_PORT)/' \ diff --git a/common/hw-gfx-gma-config.ads.template b/common/hw-gfx-gma-config.ads.template index 1177218..fb013f4 100644 --- a/common/hw-gfx-gma-config.ads.template +++ b/common/hw-gfx-gma-config.ads.template @@ -65,6 +65,8 @@ (Panel_1 => <<PANEL_1_PORT>>, Panel_2 => <<PANEL_2_PORT>>); + Lspcon_Port : constant Port_Type := <<LSPCON_PORT>>; + Analog_I2C_Port : constant PCH_Port := <<ANALOG_I2C_PORT>>; EDP_Low_Voltage_Swing : constant Boolean := False; -- To view, visit https://review.coreboot.org/c/libgfxinit/+/51133 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: libgfxinit Gerrit-Branch: master Gerrit-Change-Id: Idfa9bdff47a6591000cd5092d64a4cd4f8dbdc8d Gerrit-Change-Number: 51133 Gerrit-PatchSet: 1 Gerrit-Owner: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: newchange

1 0

Change in coreboot[master]: tests: Add lib/imd-test test case
by Jan Dabros (Code Review) 01 Mar '21

01 Mar '21

Hello Anna Karaś, I'd like you to do a code review. Please visit https://review.coreboot.org/c/coreboot/+/44669 to review the following change. Change subject: tests: Add lib/imd-test test case ...................................................................... tests: Add lib/imd-test test case Implement unit tests for src/lib/imd.c module. Signed-off-by: Anna Karas <aka(a)semihalf.com> Signed-off-by: Jan Dabros <jsd(a)semihalf.com> Change-Id: I9d3ab45c3da2a21c910f52a84526b60c39ff1fe7 --- M tests/lib/Makefile.inc A tests/lib/imd-test.c 2 files changed, 813 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/44669/1 diff --git a/tests/lib/Makefile.inc b/tests/lib/Makefile.inc index b66d386..3062bca 100644 --- a/tests/lib/Makefile.inc +++ b/tests/lib/Makefile.inc @@ -3,6 +3,7 @@ tests-y += string-test tests-y += b64_decode-test tests-y += hexstrtobin-test +tests-y += imd-test string-test-srcs += tests/lib/string-test.c string-test-srcs += src/lib/string.c @@ -13,3 +14,7 @@ hexstrtobin-test-srcs += tests/lib/hexstrtobin-test.c hexstrtobin-test-srcs += src/lib/hexstrtobin.c + +imd-test-srcs += tests/lib/imd-test.c +imd-test-srcs += tests/stubs/console.c +imd-test-srcs += src/lib/imd.c \ No newline at end of file diff --git a/tests/lib/imd-test.c b/tests/lib/imd-test.c new file mode 100644 index 0000000..01a9e19 --- /dev/null +++ b/tests/lib/imd-test.c @@ -0,0 +1,808 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include <imd.h> +#include <cbmem.h> +#include <stdlib.h> +#include <stdio.h> +#include <types.h> +#include <tests/test.h> +#include <limits.h> +#include <commonlib/bsd/helpers.h> + +void *calloc(size_t nitems, size_t size); +void *memset(void * ptr, int value, size_t num); + +/* In-memory data structures. */ +struct imd_root_pointer { + uint32_t magic; + /* Relative to upper limit/offset. */ + int32_t root_offset; +} __packed; + +struct imd_entry { + uint32_t magic; + /* start is located relative to imd_root */ + int32_t start_offset; + uint32_t size; + uint32_t id; +} __packed; + +struct imd_root { + uint32_t max_entries; + uint32_t num_entries; + uint32_t flags; + uint32_t entry_align; + /* Used for fixing the size of an imd. Relative to the root. */ + int32_t max_offset; + struct imd_entry entries[0]; +} __packed; + +/* Auxiliary functions and definitions. */ + +#define CBMEM_ID_IMD_ROOT 0xff4017ff +#define CBMEM_ID_IMD_SMALL 0x53a11439 + +#define IMD_FLAG_LOCKED 1 + +const uint32_t IMD_ROOT_PTR_MAGIC = 0xc0389481; +const uint32_t IMD_ENTRY_MAGIC = ~0xc0389481; +const uint32_t SMALL_REGION_ID = CBMEM_ID_IMD_SMALL; + +#define LIMIT_SZ (LIMIT_ALIGN + 1) +#define RP_SZ sizeof(struct imd_root_pointer) +#define ROOT_SZ sizeof(struct imd_root) +#define ENTRY_SZ sizeof(struct imd_entry) +#define IMD_SZ sizeof(struct imd) +#define CURSOR_SZ sizeof(struct imd_cursor) + +#define LG_ROOT_SIZE align_up_pow2(sizeof(struct imd_root_pointer) +\ + sizeof(struct imd_root) + 3 * sizeof(struct imd_entry)) +#define LG_ENTRY_ALIGN (2 * sizeof(int32_t)) +#define LG_ENTRY_SIZE (2 * sizeof(int32_t)) +#define LG_ENTRY_ID 0xA001 + +#define SM_ROOT_SIZE LG_ROOT_SIZE +#define SM_ENTRY_ALIGN sizeof(uint32_t) +#define SM_ENTRY_SIZE sizeof(uint32_t) +#define SM_ENTRY_ID 0xB001 + +uint32_t align_up_pow2(uint32_t x) { + return (IS_POWER_OF_2(x) ? x : 1 << (32 - __builtin_clz(x - 1))); +} + +size_t max_entries(size_t root_size) { + return (root_size - RP_SZ - ROOT_SZ) / ENTRY_SZ; +} + +/* + * Mainly, we should check that imd_handle_init() aligns upper_limit properly + * for various inputs. Upper limit is the _exclusive_ address, so we expect + * ALIGN_DOWN. + */ +static void test_imd_handle_init(void **state) +{ + int i; + void *base; + struct imd imd; + uintptr_t test_inputs[] = {0, 0xDEAA, 0xF0F0F0F0, ((1ULL << 32) + 4), + ((1ULL << 60) - 100)}; + + for (i = 0; i < ARRAY_SIZE(test_inputs); i++) { + base = (void *)test_inputs[i]; + + imd_handle_init(&imd, (void *)base); + + assert_int_equal(imd.lg.limit % LIMIT_ALIGN, 0); + assert_int_equal(imd.lg.limit, ALIGN_DOWN(test_inputs[i], LIMIT_ALIGN)); + assert_ptr_equal(imd.lg.r, NULL); + + /* Small allocations not initialized */ + assert_ptr_equal(imd.sm.limit, NULL); + assert_ptr_equal(imd.sm.r, NULL); + } +} + +static void test_imd_handle_init_partial_recovery(void **state) +{ + void *base; + struct imd imd = {0}; + const struct imd_entry *entry; + struct imdr *imdr; + struct imd_root *r; + + imd_handle_init_partial_recovery(&imd); + assert_null(imd.lg.limit); + assert_null(imd.sm.limit); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + imd_handle_init_partial_recovery(&imd); + + assert_non_null(imd.lg.r); + assert_null(imd.sm.limit); + + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + entry = imd_entry_add(&imd, SMALL_REGION_ID, LG_ENTRY_SIZE); + assert_non_null(entry); + + imd_handle_init_partial_recovery(&imd); + + assert_non_null(imd.lg.r); + assert_non_null(imd.sm.limit); + + imdr = &imd.lg; + r = (struct imd_root *) (imdr->r); + + assert_ptr_equal(((void *)r + entry->start_offset + LG_ENTRY_SIZE), imd.sm.limit); + assert_non_null(imd.sm.r); + + free(base); +} + +static void test_imd_create_empty(void **state) +{ + struct imd imd = {0}; + void *base; + struct imdr *imdr; + struct imd_root *r; + struct imd_entry *e; + + /* Expect failure, since imd handle is not initialized */ + assert_int_equal(-1, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + base = malloc(sizeof(struct imd_root_pointer) + sizeof(struct imd_root)); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + /* Try incorrect sizes */ + assert_int_equal(-1, imd_create_empty(&imd, sizeof(struct imd_root_pointer) + + sizeof(struct imd_root), LG_ENTRY_ALIGN)); + assert_int_equal(-1, imd_create_empty(&imd, LG_ROOT_SIZE, 2 * LG_ROOT_SIZE)); + + /* Working case */ + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + + /* Only large allocation initialized with one entry for the root region */ + imdr = &imd.lg; + r = (struct imd_root *) (imdr->r); + assert_non_null(r); + + e = &r->entries[r->num_entries - 1]; + + assert_int_equal(max_entries(LG_ROOT_SIZE), r->max_entries); + assert_int_equal(1, r->num_entries); + assert_int_equal(0, r->flags); + assert_int_equal(LG_ENTRY_ALIGN, r->entry_align); + assert_int_equal(0, r->max_offset); + assert_ptr_equal(e, &r->entries); + + assert_int_equal(IMD_ENTRY_MAGIC, e->magic); + assert_int_equal(0, e->start_offset); + assert_int_equal(LG_ROOT_SIZE, e->size); + assert_int_equal(CBMEM_ID_IMD_ROOT, e->id); + + free(base); +} + +static void test_imd_create_tiered_empty(void **state) +{ + void *base; + size_t sm_region_size, lg_region_wrong_size; + struct imd imd = {0}; + struct imd_root *r; + struct imd_entry *fst_lg_entry, *snd_lg_entry, *sm_entry; + + /* Uninitialized imd handle */ + assert_int_equal(-1, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + LG_ROOT_SIZE, SM_ENTRY_ALIGN)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + /* Too small root_size for small region */ + assert_int_equal(-1, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + sizeof(int32_t), 2 * sizeof(int32_t))); + + /* Fail when large region doesn't have capacity for more than 1 entry */ + lg_region_wrong_size = sizeof(struct imd_root_pointer) + sizeof(struct imd_root) + + sizeof(struct imd_entry); + assert_int_equal(-1, imd_create_tiered_empty(&imd, lg_region_wrong_size, + LG_ENTRY_ALIGN, SM_ROOT_SIZE, + SM_ENTRY_ALIGN)); + + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + SM_ROOT_SIZE, SM_ENTRY_ALIGN)); + + r = imd.lg.r; + + /* One entry for root_region and one for small allocations */ + assert_int_equal(2, r->num_entries); + + fst_lg_entry = &r->entries[0]; + assert_int_equal(IMD_ENTRY_MAGIC, fst_lg_entry->magic); + assert_int_equal(0, fst_lg_entry->start_offset); + assert_int_equal(LG_ROOT_SIZE, fst_lg_entry->size); + assert_int_equal(CBMEM_ID_IMD_ROOT, fst_lg_entry->id); + + sm_region_size = SM_ROOT_SIZE - RP_SZ - ROOT_SZ; + sm_region_size /= ENTRY_SZ; + sm_region_size *= SM_ENTRY_ALIGN; + sm_region_size += SM_ROOT_SIZE; + sm_region_size = ALIGN_UP(sm_region_size, LG_ENTRY_ALIGN); + + snd_lg_entry = &r->entries[1]; + assert_int_equal(IMD_ENTRY_MAGIC, snd_lg_entry->magic); + assert_int_equal(-sm_region_size, snd_lg_entry->start_offset); + assert_int_equal(CBMEM_ID_IMD_SMALL, snd_lg_entry->id); + + assert_int_equal(sm_region_size, snd_lg_entry->size); + + r = imd.sm.r; + assert_int_equal(1, r->num_entries); + + sm_entry = &r->entries[0]; + assert_int_equal(IMD_ENTRY_MAGIC, sm_entry->magic); + assert_int_equal(0, sm_entry->start_offset); + assert_int_equal(SM_ROOT_SIZE, sm_entry->size); + assert_int_equal(CBMEM_ID_IMD_ROOT, sm_entry->id); + + free(base); +} + +/* Tests for imdr_recover. */ +static void test_imd_recover(void **state) +{ + int32_t offset_copy; + uint32_t rp_magic_copy, num_entries_copy, e_magic_copy; + uint32_t size_copy, diff; + void *base; + struct imd imd = {0}; + struct imdr *imdr; + struct imd_root_pointer *rp; + struct imd_root *r; + struct imd_entry *lg_root_entry, *sm_root_entry, *ptr; + const struct imd_entry *lg_entry; + + /* Fail when the limit for lg was not set. */ + imdr = &imd.lg; + imdr->limit = (uintptr_t) NULL; + assert_int_equal(-1, imd_recover(&imd)); + + /* Set the limit for lg. */ + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + /* Fail when the root pointer is not valid. */ + rp = (void *)imdr->limit - RP_SZ; + assert_non_null(rp); + + rp_magic_copy = rp->magic; + rp->magic = 0; + assert_int_equal(-1, imd_recover(&imd)); + rp->magic = rp_magic_copy; + + /* Set the root pointer. */ + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + SM_ROOT_SIZE, SM_ENTRY_ALIGN)); + r = imd.lg.r; + assert_int_equal(2, r->num_entries); + r = imd.sm.r; + assert_int_equal(1, r->num_entries); + r = imd.lg.r; + + /* Fail if the number of entries exceeds the maximum number of entries. */ + num_entries_copy = r->num_entries; + r->num_entries = r->max_entries + 1; + assert_int_equal(-1, imd_recover(&imd)); + r->num_entries = num_entries_copy; + + /* Fail if entry align is not a power of 2. */ + r->entry_align += 1; + assert_int_equal(-1, imd_recover(&imd)); + r->entry_align--; + + + /* Fail when an entry is not valid. */ + lg_root_entry = &r->entries[0]; + e_magic_copy = lg_root_entry->magic; + lg_root_entry->magic = 0; + assert_int_equal(-1, imd_recover(&imd)); + lg_root_entry->magic = e_magic_copy; + + /* Add new entries: large and small. */ + lg_entry = imd_entry_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE); + assert_non_null(lg_entry); + assert_int_equal(3, r->num_entries); + + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, SM_ENTRY_SIZE)); + r = imd.sm.r; + assert_int_equal(2, r->num_entries); + r = imd.lg.r; + + /* Fail when start_addr is lower than low_limit. */ + r->max_offset = lg_entry->start_offset + sizeof(int32_t); + assert_int_equal(-1, imd_recover(&imd)); + r->max_offset = 0; + + /* Fail when start_addr is at least imdr->limit. */ + offset_copy = lg_entry->start_offset; + ptr = (struct imd_entry *)lg_entry; + ptr->start_offset = (void *)imdr->limit - (void *)r; + assert_int_equal(-1, imd_recover(&imd)); + ptr->start_offset = offset_copy; + + /* Fail when (start_addr + e->size) is higher than imdr->limit. */ + size_copy = lg_entry->size; + diff = (void *)imdr->limit - ((void *)r + lg_entry->start_offset); + ptr->size = diff + 1; + assert_int_equal(-1, imd_recover(&imd)); + ptr->size = size_copy; + + /* End of tests for imdr_recover(). */ + + /* Succeed if small region is not present. */ + sm_root_entry = &r->entries[1]; + sm_root_entry->id = 0; + assert_int_equal(0, imd_recover(&imd)); + sm_root_entry->id = SMALL_REGION_ID; + + /* Continue if small region is present. */ + assert_int_equal(0, imd_recover(&imd)); + + free(base); +} + +static void test_imd_limit_size(void **state) +{ + void *base; + struct imd imd = {0}; + size_t root_size, max_size; + struct imdr *imdr; + + max_size = align_up_pow2(RP_SZ + ROOT_SZ + 3 * ENTRY_SZ); + + assert_int_equal(-1, imd_limit_size(&imd, max_size)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + imdr = &imd.lg; + root_size = align_up_pow2(RP_SZ + ROOT_SZ + 2 * ENTRY_SZ); + imdr->r = (void *)imdr->limit - root_size; + + imd_create_empty(&imd, root_size, LG_ENTRY_ALIGN); + assert_int_equal(-1, imd_limit_size(&imd, root_size - 1)); + assert_int_equal(0, imd_limit_size(&imd, max_size)); + + /* Cannot create such a big entry */ + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, max_size - root_size + 1)); + + free(base); +} + +static void test_imd_lockdown(void **state) +{ + struct imd imd = {0}; + struct imdr *imdr; + struct imd_root *r_lg, *r_sm; + + assert_int_equal(-1, imd_lockdown(&imd)); + + imdr = &imd.lg; + imdr->r = malloc(ROOT_SZ); + if (imdr->r == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + r_lg = (struct imd_root *) (imdr->r); + + assert_int_equal(0, imd_lockdown(&imd)); + assert_true(r_lg->flags & IMD_FLAG_LOCKED); + + imdr = &imd.sm; + imdr->r = malloc(ROOT_SZ); + if (imdr->r == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + r_sm = (struct imd_root *) (imdr->r); + + assert_int_equal(0, imd_lockdown(&imd)); + assert_true(r_sm->flags & IMD_FLAG_LOCKED); + + free(imd.lg.r); + free(imd.sm.r); +} + +static void test_imd_region_used(void **state) +{ + struct imd imd = {0}; + struct imd_entry *first_entry, *new_entry; + struct imdr *imdr; + struct imd_root *r; + size_t size; + void *imd_base; + void *base; + + assert_int_equal(-1, imd_region_used(&imd, &base, &size)); + + imd_base = malloc(LIMIT_SZ); + if (imd_base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)imd_base)); + + assert_int_equal(-1, imd_region_used(&imd, &base, &size)); + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + assert_int_equal(0, imd_region_used(&imd, &base, &size)); + + imdr = &imd.lg; + r = (struct imd_root *) (imdr->r); + first_entry = &r->entries[r->num_entries - 1]; + + assert_int_equal(r + first_entry->start_offset, (uintptr_t)base); + assert_int_equal(first_entry->size, size); + + assert_non_null(imd_entry_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE)); + assert_int_equal(2, r->num_entries); + + assert_int_equal(0, imd_region_used(&imd, &base, &size)); + + new_entry = &r->entries[r->num_entries - 1]; + + assert_true((void *)r + new_entry->start_offset == base); + assert_int_equal(first_entry->size + new_entry->size, size); + + free(imd_base); +} + +static void test_imd_entry_add(void **state) +{ + int i; + struct imd imd = {0}; + size_t entry_size = 0; + size_t used_size; + ssize_t entry_offset; + void *base; + struct imd_root *r, *sm_r, *lg_r; + struct imd_entry *first_entry, *new_entry; +__unused struct imd_root_pointer *rp; + + /* No small region case. */ + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + + r = (struct imd_root *)imd.lg.r; + first_entry = &r->entries[r->num_entries - 1]; + + /* Fail when root is locked. */ + r->flags = IMD_FLAG_LOCKED; + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + r->flags = 0; + + /* Fail when the maximum number of entries has been reached. */ + r->num_entries = r->max_entries; + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + r->num_entries = 1; + + /* Fail when entry size is 0 */ + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, 0)); + + /* Fail when entry size (after alignment) overflows imd total size. */ + entry_size = 2049; + r->max_offset = -entry_size; + assert_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + r->max_offset = 0; + entry_size = 2 * sizeof(int32_t); + + /* Finally succeed. */ + assert_non_null(imd_entry_add(&imd, LG_ENTRY_ID, entry_size)); + assert_int_equal(2, r->num_entries); + + new_entry = &r->entries[r->num_entries - 1]; + assert_int_equal(ENTRY_SZ, (void *)new_entry - (void *)first_entry); + + assert_int_equal(IMD_ENTRY_MAGIC, new_entry->magic); + assert_int_equal(LG_ENTRY_ID, new_entry->id); + assert_int_equal(entry_size, new_entry->size); + + used_size = ALIGN_UP(entry_size, r->entry_align); + entry_offset = first_entry->start_offset - used_size; + assert_int_equal(entry_offset, new_entry->start_offset); + + /* Use small region case. */ + imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, SM_ROOT_SIZE, + SM_ENTRY_ALIGN); + + lg_r = imd.lg.r; + sm_r = imd.sm.r; + + /* All five new entries should be added to small allocations */ + for (i = 0; i < 5; i++) { + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, SM_ENTRY_SIZE)); + assert_int_equal(i+2, sm_r->num_entries); + assert_int_equal(2, lg_r->num_entries); + } + + /* But next should fall back on large region */ + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, SM_ENTRY_SIZE)); + assert_int_equal(6, sm_r->num_entries); + assert_int_equal(3, lg_r->num_entries); + + /* + * Small allocation is created when occupies less than 1/4 of available + * small region. Verify this. + */ + imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, SM_ROOT_SIZE, + SM_ENTRY_ALIGN); + + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, -sm_r->max_offset / 4 + 1)); + assert_int_equal(1, sm_r->num_entries); + assert_int_equal(3, lg_r->num_entries); + + /* Next two should go into small region */ + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, -sm_r->max_offset / 4)); + assert_int_equal(2, sm_r->num_entries); + assert_int_equal(3, lg_r->num_entries); + + /* (1/4 * 3/4) */ + assert_non_null(imd_entry_add(&imd, SM_ENTRY_ID, -sm_r->max_offset / 16 * 3)); + assert_int_equal(3, sm_r->num_entries); + assert_int_equal(3, lg_r->num_entries); + + free(base); +} + +static void test_imd_entry_find(void **state) +{ + struct imd imd = {0}; + void *base; + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + SM_ROOT_SIZE, SM_ENTRY_ALIGN)); + + assert_non_null(imd_entry_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE)); + + assert_non_null(imd_entry_find(&imd, LG_ENTRY_ID)); + assert_non_null(imd_entry_find(&imd, SMALL_REGION_ID)); + + /* Try random id, should fail */ + assert_null(imd_entry_find(&imd, 0xC001)); + + free(base); +} + +static void test_imd_entry_find_or_add(void **state) +{ + struct imd imd = {0}; + const struct imd_entry *entry; + struct imd_root *r; + void *base; + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_null(imd_entry_find_or_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE)); + + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + entry = imd_entry_find_or_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE); + assert_non_null(entry); + + r = (struct imd_root *)imd.lg.r; + + assert_int_equal(entry->id, LG_ENTRY_ID); + assert_int_equal(2, r->num_entries); + assert_non_null(imd_entry_find_or_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE)); + assert_int_equal(2, r->num_entries); + + free(base); +} + +static void test_imd_entry_size(void **state) +{ + struct imd_entry entry = { .size = LG_ENTRY_SIZE }; + + assert_int_equal(LG_ENTRY_SIZE, imd_entry_size(&entry)); + + entry.size = 0; + assert_int_equal(0, imd_entry_size(&entry)); +} + +static void test_imd_entry_at(void **state) +{ + struct imd imd = {0}; + struct imd_root *r; + struct imd_entry *e = NULL; + const struct imd_entry *entry; + void *base; + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN)); + + /* Fail when entry is NULL */ + assert_null(imd_entry_at(&imd, e)); + + entry = imd_entry_add(&imd, LG_ENTRY_ID, LG_ENTRY_SIZE); + assert_non_null(entry); + + r = (struct imd_root *) (imd.lg.r); + assert_ptr_equal((void *)r + entry->start_offset, imd_entry_at(&imd, entry)); + + free(base); +} + +static void test_imd_entry_id(void **state) +{ + struct imd_entry entry = { .id = LG_ENTRY_ID }; + + assert_int_equal(LG_ENTRY_ID, imd_entry_id(&entry)); +} + +static void test_imd_entry_remove(void **state) +{ + void *base; + struct imd imd = {0}; + struct imd_root *r; + const struct imd_entry *fst_lg_entry, *snd_lg_entry, *fst_sm_entry; + const struct imd_entry *e = NULL; + + /* Uninitialized handle */ + assert_int_equal(-1, imd_entry_remove(&imd, e)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + LG_ROOT_SIZE, SM_ENTRY_ALIGN)); + + r = imd.lg.r; + assert_int_equal(2, r->num_entries); + fst_lg_entry = &r->entries[0]; + snd_lg_entry = &r->entries[1]; + + /* Only last entry can be removed */ + assert_int_equal(-1, imd_entry_remove(&imd, fst_lg_entry)); + + r->flags = IMD_FLAG_LOCKED; + assert_int_equal(-1, imd_entry_remove(&imd, snd_lg_entry)); + r->flags = 0; + + r = imd.sm.r; + assert_int_equal(1, r->num_entries); + fst_sm_entry = &r->entries[0]; + + /* Fail trying to remove root entry */ + assert_int_equal(-1, imd_entry_remove(&imd, fst_sm_entry)); + assert_int_equal(1, r->num_entries); + + r = imd.lg.r; + assert_int_equal(0, imd_entry_remove(&imd, snd_lg_entry)); + assert_int_equal(1, r->num_entries); + + /* Fail trying to remove root entry */ + assert_int_equal(-1, imd_entry_remove(&imd, fst_lg_entry)); + assert_int_equal(1, r->num_entries); + + free(base); +} + +static void test_imd_cursor_init(void **state) +{ + struct imd imd = {0}; + struct imd_cursor cursor; + + assert_int_equal(-1, imd_cursor_init(NULL, NULL)); + assert_int_equal(-1, imd_cursor_init(NULL, &cursor)); + assert_int_equal(-1, imd_cursor_init(&imd, NULL)); + assert_int_equal(0, imd_cursor_init(&imd, &cursor)); + + assert_ptr_equal(cursor.imdr[0], &imd.lg); + assert_ptr_equal(cursor.imdr[1], &imd.sm); +} + +static void test_imd_cursor_next(void **state) +{ + void *base; + struct imd imd = {0}; + struct imd_cursor cursor; + struct imd_root *r; + const struct imd_entry *entry; + struct imd_entry *fst_lg_entry, *snd_lg_entry, *fst_sm_entry; + assert_int_equal(0, imd_cursor_init(&imd, &cursor)); + + cursor.current_imdr = 3; + cursor.current_entry = 0; + assert_null(imd_cursor_next(&cursor)); + + cursor.current_imdr = 0; + assert_null(imd_cursor_next(&cursor)); + + base = malloc(LIMIT_SZ); + if (base == NULL) + fail_msg("Cannot allocate enough memory - fail test"); + imd_handle_init(&imd, (void *)(LIMIT_SZ + (uintptr_t)base)); + + assert_int_equal(0, imd_create_tiered_empty(&imd, LG_ROOT_SIZE, LG_ENTRY_ALIGN, + SM_ROOT_SIZE, SM_ENTRY_ALIGN)); + + r = imd.lg.r; + entry = imd_cursor_next(&cursor); + assert_non_null(entry); + + fst_lg_entry = &r->entries[0]; + assert_int_equal(fst_lg_entry->id, entry->id); + assert_ptr_equal(fst_lg_entry, entry); + + entry = imd_cursor_next(&cursor); + assert_non_null(entry); + + snd_lg_entry = &r->entries[1]; + assert_int_equal(snd_lg_entry->id, entry->id); + assert_ptr_equal(snd_lg_entry, entry); + + entry = imd_cursor_next(&cursor); + assert_non_null(entry); + + r = imd.sm.r; + fst_sm_entry = &r->entries[0]; + assert_int_equal(fst_sm_entry->id, entry->id); + assert_ptr_equal(fst_sm_entry, entry); + + entry = imd_cursor_next(&cursor); + assert_null(entry); +} + +int main(void) +{ + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_imd_handle_init), + cmocka_unit_test(test_imd_handle_init_partial_recovery), + cmocka_unit_test(test_imd_create_empty), + cmocka_unit_test(test_imd_create_tiered_empty), + cmocka_unit_test(test_imd_recover), + cmocka_unit_test(test_imd_limit_size), + cmocka_unit_test(test_imd_lockdown), + cmocka_unit_test(test_imd_region_used), + cmocka_unit_test(test_imd_entry_add), + cmocka_unit_test(test_imd_entry_find), + cmocka_unit_test(test_imd_entry_find_or_add), + cmocka_unit_test(test_imd_entry_size), + cmocka_unit_test(test_imd_entry_at), + cmocka_unit_test(test_imd_entry_id), + cmocka_unit_test(test_imd_entry_remove), + cmocka_unit_test(test_imd_cursor_init), + cmocka_unit_test(test_imd_cursor_next), + }; + + return cmocka_run_group_tests(tests, NULL, NULL); +} + -- To view, visit https://review.coreboot.org/c/coreboot/+/44669 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I9d3ab45c3da2a21c910f52a84526b60c39ff1fe7 Gerrit-Change-Number: 44669 Gerrit-PatchSet: 1 Gerrit-Owner: Jan Dabros <jsd(a)semihalf.com> Gerrit-Reviewer: Anna Karaś <aka(a)semihalf.com> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

6 17

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit March 2021