Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40915 )
Change subject: mb/purism/librem_bdw: Convert to use override devicetree
......................................................................
mb/purism/librem_bdw: Convert to use override devicetree
Since the variants' devicetrees are almost identical, convert to
using an overridetree setup for simplicity.
Signed-off-by: Matt DeVillier <matt.devillier(a)puri.sm>
Change-Id: I07fb5a09e578bf299081b26e010317385a6c5f7f
---
M src/mainboard/purism/librem_bdw/Kconfig
R src/mainboard/purism/librem_bdw/devicetree.cb
D src/mainboard/purism/librem_bdw/variants/librem13v1/devicetree.cb
A src/mainboard/purism/librem_bdw/variants/librem13v1/overridetree.cb
A src/mainboard/purism/librem_bdw/variants/librem15v2/overridetree.cb
5 files changed, 31 insertions(+), 83 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/15/40915/1
diff --git a/src/mainboard/purism/librem_bdw/Kconfig b/src/mainboard/purism/librem_bdw/Kconfig
index 7a8bc22..1f17f75 100644
--- a/src/mainboard/purism/librem_bdw/Kconfig
+++ b/src/mainboard/purism/librem_bdw/Kconfig
@@ -17,9 +17,9 @@
default "librem13v1" if BOARD_PURISM_LIBREM13_V1
default "librem15v2" if BOARD_PURISM_LIBREM15_V2
-config DEVICETREE
+config OVERRIDE_DEVICETREE
string
- default "variants/$(CONFIG_VARIANT_DIR)/devicetree.cb"
+ default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
config DRIVERS_PS2_KEYBOARD
def_bool y
diff --git a/src/mainboard/purism/librem_bdw/variants/librem15v2/devicetree.cb b/src/mainboard/purism/librem_bdw/devicetree.cb
similarity index 90%
rename from src/mainboard/purism/librem_bdw/variants/librem15v2/devicetree.cb
rename to src/mainboard/purism/librem_bdw/devicetree.cb
index cbd59be..13b9e5e 100644
--- a/src/mainboard/purism/librem_bdw/variants/librem15v2/devicetree.cb
+++ b/src/mainboard/purism/librem_bdw/devicetree.cb
@@ -21,14 +21,6 @@
register "gen1_dec" = "0x00000381"
register "gen2_dec" = "0x000c0081"
- # Port 0 is HDD
- # Port 1 is M.2 NGFF
- register "sata_port_map" = "0x3"
-
- # Port tuning for link stability
- register "sata_port0_gen3_dtle" = "7"
- register "sata_port1_gen3_dtle" = "9"
-
device cpu_cluster 0 on
device lapic 0 on end
end
@@ -58,7 +50,7 @@
device pci 1c.3 on end # PCIe Port #4 - WiFi
device pci 1c.4 on end # PCIe Port #5
device pci 1c.5 on end # PCIe Port #6 - M.2 NVMe
- device pci 1d.0 on end # USB2 EHCI
+ device pci 1d.0 off end # USB2 EHCI
device pci 1e.0 off end # PCI bridge
device pci 1f.0 on
chip ec/purism/librem
diff --git a/src/mainboard/purism/librem_bdw/variants/librem13v1/devicetree.cb b/src/mainboard/purism/librem_bdw/variants/librem13v1/devicetree.cb
deleted file mode 100644
index 98b5163..0000000
--- a/src/mainboard/purism/librem_bdw/variants/librem13v1/devicetree.cb
+++ /dev/null
@@ -1,72 +0,0 @@
-chip soc/intel/broadwell
-
- # Enable eDP Hotplug with 6ms pulse
- register "gpu_dp_d_hotplug" = "0x06"
-
- # Enable DDI1 Hotplug with 6ms pulse
- register "gpu_dp_b_hotplug" = "0x06"
-
- # Set backlight PWM value for eDP
- register "gpu_pch_backlight_pwm_hz" = "200"
-
- # Enable Panel and configure power delays
- register "gpu_panel_port_select" = "1" # eDP
- register "gpu_panel_power_cycle_delay" = "6" # 500ms
- register "gpu_panel_power_up_delay" = "2000" # 200ms
- register "gpu_panel_power_down_delay" = "500" # 50ms
- register "gpu_panel_power_backlight_on_delay" = "2000" # 200ms
- register "gpu_panel_power_backlight_off_delay" = "2000" # 200ms
-
- # EC host command ranges are in 0x380-0x383 & 0x80-0x8f
- register "gen1_dec" = "0x00000381"
- register "gen2_dec" = "0x000c0081"
-
- # Port 0 is HDD
- # Port 3 is M.2 NGFF
- register "sata_port_map" = "0x9"
-
- # Port 0 tuning for link stability
- register "sata_port0_gen3_dtle" = "9"
- register "sata_port3_gen3_dtle" = "9"
-
- device cpu_cluster 0 on
- device lapic 0 on end
- end
- device domain 0 on
- device pci 00.0 on end # host bridge
- device pci 02.0 on end # vga controller
- device pci 03.0 on end # mini-hd audio
- device pci 13.0 off end # Smart Sound Audio DSP
- device pci 14.0 on end # USB3 XHCI
- device pci 15.0 off end # Serial I/O DMA
- device pci 15.1 off end # I2C0
- device pci 15.2 off end # I2C1
- device pci 15.3 off end # GSPI0
- device pci 15.4 off end # GSPI1
- device pci 15.5 off end # UART0
- device pci 15.6 off end # UART1
- device pci 16.0 off end # Management Engine Interface 1
- device pci 16.1 off end # Management Engine Interface 2
- device pci 16.2 off end # Management Engine IDE-R
- device pci 16.3 off end # Management Engine KT
- device pci 17.0 off end # SDIO
- device pci 19.0 off end # GbE
- device pci 1b.0 on end # High Definition Audio
- device pci 1c.0 on end # PCIe Port #1
- device pci 1c.1 off end # PCIe Port #2
- device pci 1c.2 on end # PCIe Port #3 - LAN
- device pci 1c.3 on end # PCIe Port #4 - WiFi
- device pci 1c.4 on end # PCIe Port #5
- device pci 1c.5 on end # PCIe Port #6 - M.2 NVMe
- device pci 1d.0 off end # USB2 EHCI
- device pci 1e.0 off end # PCI bridge
- device pci 1f.0 on
- chip ec/purism/librem
- device pnp 0c09.0 on end
- end
- end # LPC bridge
- device pci 1f.2 on end # SATA Controller
- device pci 1f.3 on end # SMBus
- device pci 1f.6 off end # Thermal
- end
-end
diff --git a/src/mainboard/purism/librem_bdw/variants/librem13v1/overridetree.cb b/src/mainboard/purism/librem_bdw/variants/librem13v1/overridetree.cb
new file mode 100644
index 0000000..d3d0ae7
--- /dev/null
+++ b/src/mainboard/purism/librem_bdw/variants/librem13v1/overridetree.cb
@@ -0,0 +1,14 @@
+chip soc/intel/broadwell
+
+ # Port 0 is HDD
+ # Port 3 is M.2 NGFF
+ register "sata_port_map" = "0x9"
+
+ # Port tuning for link stability
+ register "sata_port0_gen3_dtle" = "9"
+ register "sata_port3_gen3_dtle" = "9"
+
+ device domain 0 on
+ device pci 1c.2 on end # PCIe Port #3 - LAN
+ end
+end
diff --git a/src/mainboard/purism/librem_bdw/variants/librem15v2/overridetree.cb b/src/mainboard/purism/librem_bdw/variants/librem15v2/overridetree.cb
new file mode 100644
index 0000000..c0c8d03
--- /dev/null
+++ b/src/mainboard/purism/librem_bdw/variants/librem15v2/overridetree.cb
@@ -0,0 +1,14 @@
+chip soc/intel/broadwell
+
+ # Port 0 is HDD
+ # Port 1 is M.2 NGFF
+ register "sata_port_map" = "0x3"
+
+ # Port tuning for link stability
+ register "sata_port0_gen3_dtle" = "7"
+ register "sata_port1_gen3_dtle" = "9"
+
+ device domain 0 on
+ device pci 1d.0 on end # USB2 EHCI
+ end
+end
--
To view, visit https://review.coreboot.org/c/coreboot/+/40915
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I07fb5a09e578bf299081b26e010317385a6c5f7f
Gerrit-Change-Number: 40915
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-MessageType: newchange
Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40914 )
Change subject: mb/purism/librem_bdw: cleanup 15v2 devicetree
......................................................................
mb/purism/librem_bdw: cleanup 15v2 devicetree
The Librem 15v2 only uses SATA ports 0/1, so the DTLE settings
for ports 2/3 have no consequence. Drop them to make overridetree
conversion cleaner.
Signed-off-by: Matt DeVillier <matt.devillier(a)puri.sm>
Change-Id: I4145feecb389be90f317249426e58752c03aef76
---
M src/mainboard/purism/librem_bdw/variants/librem15v2/devicetree.cb
1 file changed, 0 insertions(+), 2 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/14/40914/1
diff --git a/src/mainboard/purism/librem_bdw/variants/librem15v2/devicetree.cb b/src/mainboard/purism/librem_bdw/variants/librem15v2/devicetree.cb
index 32c3ed1..cbd59be 100644
--- a/src/mainboard/purism/librem_bdw/variants/librem15v2/devicetree.cb
+++ b/src/mainboard/purism/librem_bdw/variants/librem15v2/devicetree.cb
@@ -28,8 +28,6 @@
# Port tuning for link stability
register "sata_port0_gen3_dtle" = "7"
register "sata_port1_gen3_dtle" = "9"
- register "sata_port2_gen3_dtle" = "9"
- register "sata_port3_gen3_dtle" = "7"
device cpu_cluster 0 on
device lapic 0 on end
--
To view, visit https://review.coreboot.org/c/coreboot/+/40914
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I4145feecb389be90f317249426e58752c03aef76
Gerrit-Change-Number: 40914
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-MessageType: newchange
Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/39869 )
Change subject: payloads/seabios: Add Hardware IRQ Kconfig
......................................................................
payloads/seabios: Add Hardware IRQ Kconfig
Certain Intel SoC platforms require SeaBIOS' HARDWARE_IRQ
option to be deselected in order for the platform to boot.
Add a Kconfig to properly select the HARDWARE_IRQ enablement
based on platform, and write to SeaBIOS' .config file in
cases where it needs to be disabled.
Test: build/boot google/clapper (Baytrail) and google/cyan
(Braswell), verify boards boot vs hanging at boot menu prompt.
Change-Id: I23e9b30d2d1042c86bd10f134d6fe361edaf8cb2
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
---
M payloads/external/SeaBIOS/Kconfig
M payloads/external/SeaBIOS/Makefile
2 files changed, 14 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/69/39869/1
diff --git a/payloads/external/SeaBIOS/Kconfig b/payloads/external/SeaBIOS/Kconfig
index e816775..abe8815 100644
--- a/payloads/external/SeaBIOS/Kconfig
+++ b/payloads/external/SeaBIOS/Kconfig
@@ -51,6 +51,17 @@
variations during option ROM code execution. It is not
known if all option ROMs will behave properly with this option.
+config SEABIOS_HARDWARE_IRQ
+ prompt "Hardware Interrupts"
+ default n if SOC_INTEL_BAYTRAIL || SOC_INTEL_BRASWELL || SOC_INTEL_APOLLOLAKE
+ default y
+ bool
+ help
+ Program and support hardware interrupts using the i8259
+ programmable interrupt controller (PIC). This option should
+ be enabled for all platforms except for those which require
+ it to be disabled (eg, Baytrail/Braswell and successors)
+
config SEABIOS_VGA_COREBOOT
prompt "Include generated option rom that implements legacy VGA BIOS compatibility"
default y if !VENDOR_EMULATION
diff --git a/payloads/external/SeaBIOS/Makefile b/payloads/external/SeaBIOS/Makefile
index 0086775..cd646d9 100644
--- a/payloads/external/SeaBIOS/Makefile
+++ b/payloads/external/SeaBIOS/Makefile
@@ -72,6 +72,9 @@
ifneq ($(CONFIG_SEABIOS_DEBUG_LEVEL),-1)
echo "CONFIG_DEBUG_LEVEL=$(CONFIG_SEABIOS_DEBUG_LEVEL)" >> seabios/.config
endif
+ifneq ($(CONFIG_SEABIOS_HARDWARE_IRQ),y)
+ echo "# CONFIG_HARDWARE_IRQ is not set" >> seabios/.config
+endif
# This shows how to force a previously set .config option *off*
# echo "# CONFIG_SMBIOS is not set" >> seabios/.config
$(MAKE) -C seabios olddefconfig OUT=out/
--
To view, visit https://review.coreboot.org/c/coreboot/+/39869
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I23e9b30d2d1042c86bd10f134d6fe361edaf8cb2
Gerrit-Change-Number: 39869
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-MessageType: newchange
Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/40907 )
Change subject: mb/google/reef: add default non-ChromeOS FMAP
......................................................................
mb/google/reef: add default non-ChromeOS FMAP
Add a FMAP which supports SMMSTORE and non-ChromeOS payloads,
since Apollo Lake-based devices like Reef cannot use an
automatically-generated FMAP due to strict layout requirements.
Change-Id: If570f92f4f81c0e29777c87756fc5e45af549064
Signed-off-by: Matt DeVillier <matt.devillier(a)gmail.com>
---
M src/mainboard/google/reef/Kconfig
A src/mainboard/google/reef/default.fmd
2 files changed, 27 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/07/40907/1
diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig
index 5d782b1..6b970b2 100644
--- a/src/mainboard/google/reef/Kconfig
+++ b/src/mainboard/google/reef/Kconfig
@@ -100,4 +100,7 @@
default 0xe00 if CHROMEOS
default 0xc00
+config FMDFILE
+ default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/default.fmd" if !CHROMEOS
+
endif # BOARD_GOOGLE_REEF
diff --git a/src/mainboard/google/reef/default.fmd b/src/mainboard/google/reef/default.fmd
new file mode 100644
index 0000000..6e6b64f
--- /dev/null
+++ b/src/mainboard/google/reef/default.fmd
@@ -0,0 +1,24 @@
+FLASH 16M {
+ SI_DESC@0x0 0x1000
+ SI_BIOS@0x1000 0xf6f000 {
+ IFWI@0x0 0x1ff000
+ # SMMSTORE requires 64k alignment
+ SMMSTORE@0xa5e000 0x40000
+ RW_MRC_CACHE 0x10000
+ FMAP 0x300
+ COREBOOT(CBFS)
+ BIOS_UNUSABLE 0x4f000
+ }
+ DEVICE_EXTENSION@0xf7f000 0x80000
+ # Currently, it is required that the BIOS region be a multiple of 8KiB.
+ # This is required so that the recovery mechanism can find SIGN_CSE
+ # region aligned to 4K at the center of BIOS region. Since the
+ # descriptor at the beginning uses 4K and BIOS starts at an offset of
+ # 4K, a hole of 4K is created towards the end of the flash to compensate
+ # for the size requirement of BIOS region.
+ # FIT tool thus creates descriptor with following regions:
+ # Descriptor --> 0 to 4K
+ # BIOS --> 4K to 0xf7f000
+ # Device ext --> 0xf7f000 to 0xfff000
+ UNUSED_HOLE@0xfff000 0x1000
+}
--
To view, visit https://review.coreboot.org/c/coreboot/+/40907
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: If570f92f4f81c0e29777c87756fc5e45af549064
Gerrit-Change-Number: 40907
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-MessageType: newchange
Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40858 )
Change subject: mb/supermicro/x11: drop DeepSx config from devicetree
......................................................................
mb/supermicro/x11: drop DeepSx config from devicetree
Drop the DeepSx config as it's unsupported and disabled for the boards.
Change-Id: I91cd15b26a41f376561630cf45ffa192745eae84
Signed-off-by: Michael Niewöhner <foss(a)mniewoehner.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40858
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi(a)google.com>
Reviewed-by: Angel Pons <th3fanbus(a)gmail.com>
---
M src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
build bot (Jenkins): Verified
Patrick Georgi: Looks good to me, approved
Angel Pons: Looks good to me, but someone else must approve
diff --git a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
index 998f3dd..0dd37ee 100644
--- a/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
+++ b/src/mainboard/supermicro/x11-lga1151-series/devicetree.cb
@@ -2,7 +2,6 @@
register "deep_s5_enable_ac" = "0"
register "deep_s5_enable_dc" = "0"
- register "deep_sx_config" = "DSX_EN_LAN_WAKE_PIN"
# Enable "Intel Speed Shift Technology"
register "speed_shift_enable" = "1"
--
To view, visit https://review.coreboot.org/c/coreboot/+/40858
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I91cd15b26a41f376561630cf45ffa192745eae84
Gerrit-Change-Number: 40858
Gerrit-PatchSet: 3
Gerrit-Owner: Michael Niewöhner
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/39538 )
Change subject: soc/intel/skylake: Configure ASPM and L1 substates for PCH root ports
......................................................................
Patch Set 14:
(1 comment)
https://review.coreboot.org/c/coreboot/+/39538/14/src/soc/intel/skylake/chi…
File src/soc/intel/skylake/chip.h:
https://review.coreboot.org/c/coreboot/+/39538/14/src/soc/intel/skylake/chi…
PS14, Line 286: PcieRpAspm
> I see the issue. In your opinion, should they be renamed?
Sure, that's what I meant.
>
> Regarding CamelCase, there doesn't seem to be an aversion to following FSP identifiers when it comes to UPDs.
Yes and it often turned out to be a bad idea. Sometimes the UPDs
collide with some of coreboot's code or concepts. But the people
adding their copies to `chip.h` don't know coreboot, and don't
care if they create a shim around FSP instead of a proper coreboot.
In this case, though, I really just wanted to point out that you
use the same name with different values. Actually, I don't expect
anybody to fall into this trap. But everytime somebody does some-
thing like this, it's another bad example in the tree.
--
To view, visit https://review.coreboot.org/c/coreboot/+/39538
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I36150858485715016158595c832c142b0582ddb8
Gerrit-Change-Number: 39538
Gerrit-PatchSet: 14
Gerrit-Owner: Benjamin Doron <benjamin.doron00(a)gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com>
Gerrit-Reviewer: Benjamin Doron <benjamin.doron00(a)gmail.com>
Gerrit-Reviewer: Matt DeVillier <matt.devillier(a)gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org>
Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Comment-Date: Sat, 02 May 2020 13:42:19 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Nico Huber <nico.h(a)gmx.de>
Comment-In-Reply-To: Benjamin Doron <benjamin.doron00(a)gmail.com>
Gerrit-MessageType: comment