coreboot-gerrit January 2019

coreboot-gerrit@coreboot.org

1 participants
1296 discussions

Change in ...coreboot[master]: Kconfig: Remove symbol names for choices
by Nico Huber (Code Review) 24 Jan '19

24 Jan '19

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30582 Change subject: Kconfig: Remove symbol names for choices ...................................................................... Kconfig: Remove symbol names for choices These are completely throwing Kconfig off, resulting in duplicate entries. Change-Id: I401467da686d5011a456b661a10170492a919c81 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M payloads/external/LinuxBoot/Kconfig M src/mainboard/intel/glkrvp/Kconfig 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/30582/1 diff --git a/payloads/external/LinuxBoot/Kconfig b/payloads/external/LinuxBoot/Kconfig index 3b8b70c..31b238c 100644 --- a/payloads/external/LinuxBoot/Kconfig +++ b/payloads/external/LinuxBoot/Kconfig @@ -219,7 +219,7 @@ endif #LINUXBOOT_BUILD_INITRAMFS -choice LINUXBOOT_INITRAMFS_COMPRESSION +choice prompt "Initramfs compression format" default LINUXBOOT_INITRAMFS_COMPRESSION_XZ diff --git a/src/mainboard/intel/glkrvp/Kconfig b/src/mainboard/intel/glkrvp/Kconfig index 9484559..94207ba 100644 --- a/src/mainboard/intel/glkrvp/Kconfig +++ b/src/mainboard/intel/glkrvp/Kconfig @@ -19,7 +19,7 @@ def_bool n select SYSTEM_TYPE_LAPTOP -choice GLK_EC +choice prompt "ON BOARD EC" default GLK_CHROME_EC help -- To view, visit https://review.coreboot.org/c/coreboot/+/30582 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I401467da686d5011a456b661a10170492a919c81 Gerrit-Change-Number: 30582 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

5 4

Change in ...coreboot[master]: cpu/intel/model_406dx: Remove the notion of CPU sockets
by Arthur Heymans (Code Review) 24 Jan '19

24 Jan '19

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31032 Change subject: cpu/intel/model_406dx: Remove the notion of CPU sockets ...................................................................... cpu/intel/model_406dx: Remove the notion of CPU sockets Change-Id: I5e8fb2e7331d02224a4199c4d05f92c603c57f78 Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/cpu/intel/fsp_model_406dx/Kconfig M src/cpu/intel/fsp_model_406dx/Makefile.inc D src/cpu/intel/socket_rPGA989/Kconfig D src/cpu/intel/socket_rPGA989/Makefile.inc M src/mainboard/adi/rcc-dff/Kconfig M src/mainboard/intel/littleplains/Kconfig M src/mainboard/intel/mohonpeak/Kconfig 7 files changed, 9 insertions(+), 21 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/31032/1 diff --git a/src/cpu/intel/fsp_model_406dx/Kconfig b/src/cpu/intel/fsp_model_406dx/Kconfig index 79658f9..f40842f 100644 --- a/src/cpu/intel/fsp_model_406dx/Kconfig +++ b/src/cpu/intel/fsp_model_406dx/Kconfig @@ -26,6 +26,7 @@ select ARCH_ROMSTAGE_X86_32 select ARCH_RAMSTAGE_X86_32 select SMP + select MMX select SSE2 select UDELAY_LAPIC select SUPPORT_CPU_UCODE_IN_CBFS diff --git a/src/cpu/intel/fsp_model_406dx/Makefile.inc b/src/cpu/intel/fsp_model_406dx/Makefile.inc index 26f4633..97bb981 100644 --- a/src/cpu/intel/fsp_model_406dx/Makefile.inc +++ b/src/cpu/intel/fsp_model_406dx/Makefile.inc @@ -17,6 +17,14 @@ subdirs-y += ../../x86/name subdirs-y += ../common +subdirs-y += ../../x86/tsc +subdirs-y += ../../x86/mtrr +subdirs-y += ../../x86/lapic +subdirs-y += ../../x86/cache +subdirs-y += ../../x86/smm +subdirs-y += ../microcode +subdirs-y += ../turbo + ramstage-y += acpi.c CPPFLAGS_romstage += -I$(src)/cpu/intel/fsp_model_406dx diff --git a/src/cpu/intel/socket_rPGA989/Kconfig b/src/cpu/intel/socket_rPGA989/Kconfig deleted file mode 100644 index 1d1f64f..0000000 --- a/src/cpu/intel/socket_rPGA989/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -config CPU_INTEL_SOCKET_RPGA989 - bool - -if CPU_INTEL_SOCKET_RPGA989 - -config SOCKET_SPECIFIC_OPTIONS # dummy - def_bool y - select MMX - select SSE - -endif diff --git a/src/cpu/intel/socket_rPGA989/Makefile.inc b/src/cpu/intel/socket_rPGA989/Makefile.inc deleted file mode 100644 index 539f285..0000000 --- a/src/cpu/intel/socket_rPGA989/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -subdirs-y += ../../x86/tsc -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/lapic -subdirs-y += ../../x86/cache -subdirs-y += ../../x86/smm -subdirs-y += ../microcode -subdirs-y += ../turbo diff --git a/src/mainboard/adi/rcc-dff/Kconfig b/src/mainboard/adi/rcc-dff/Kconfig index f87535c..e7be77c 100644 --- a/src/mainboard/adi/rcc-dff/Kconfig +++ b/src/mainboard/adi/rcc-dff/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS def_bool y - select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_FSP_RANGELEY select SOUTHBRIDGE_INTEL_FSP_RANGELEY select BOARD_ROMSIZE_KB_2048 #actual chip is 8MB diff --git a/src/mainboard/intel/littleplains/Kconfig b/src/mainboard/intel/littleplains/Kconfig index 70b9580..b5a57b7 100644 --- a/src/mainboard/intel/littleplains/Kconfig +++ b/src/mainboard/intel/littleplains/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS def_bool y - select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_FSP_RANGELEY select SOUTHBRIDGE_INTEL_FSP_RANGELEY select BOARD_ROMSIZE_KB_8192 diff --git a/src/mainboard/intel/mohonpeak/Kconfig b/src/mainboard/intel/mohonpeak/Kconfig index dc9dc84..de91ca4 100644 --- a/src/mainboard/intel/mohonpeak/Kconfig +++ b/src/mainboard/intel/mohonpeak/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS def_bool y - select CPU_INTEL_SOCKET_RPGA989 select NORTHBRIDGE_INTEL_FSP_RANGELEY select SOUTHBRIDGE_INTEL_FSP_RANGELEY select BOARD_ROMSIZE_KB_2048 #actual chip is 8MB -- To view, visit https://review.coreboot.org/c/coreboot/+/31032 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I5e8fb2e7331d02224a4199c4d05f92c603c57f78 Gerrit-Change-Number: 31032 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-MessageType: newchange

6 10

Change in ...coreboot[master]: cpu/intel/model_206ax: Remove the notion of sockets
by Arthur Heymans (Code Review) 24 Jan '19

24 Jan '19

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31031 Change subject: cpu/intel/model_206ax: Remove the notion of sockets ...................................................................... cpu/intel/model_206ax: Remove the notion of sockets With the memory controller the separate sockets becomes a useless distinction. They all used the same code anyway. Change-Id: I044d434a5b8fca75db9eb193c7ffc60f3c78212b Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/cpu/intel/model_206ax/Kconfig M src/cpu/intel/model_206ax/Makefile.inc D src/cpu/intel/socket_FCBGA1023/Kconfig D src/cpu/intel/socket_FCBGA1023/Makefile.inc D src/cpu/intel/socket_LGA1155/Kconfig D src/cpu/intel/socket_LGA1155/Makefile.inc D src/cpu/intel/socket_rPGA988B/Kconfig D src/cpu/intel/socket_rPGA988B/Makefile.inc D src/cpu/intel/socket_rPGA989/Kconfig D src/cpu/intel/socket_rPGA989/Makefile.inc M src/mainboard/apple/macbookair4_2/devicetree.cb M src/mainboard/asrock/b75pro3-m/devicetree.cb M src/mainboard/asus/maximus_iv_gene-z/devicetree.cb M src/mainboard/asus/p8h61-m_lx/devicetree.cb M src/mainboard/asus/p8h61-m_pro/devicetree.cb M src/mainboard/compulab/intense_pc/devicetree.cb M src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb M src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb M src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb M src/mainboard/google/butterfly/devicetree.cb M src/mainboard/google/link/devicetree.cb M src/mainboard/google/parrot/devicetree.cb M src/mainboard/google/stout/devicetree.cb M src/mainboard/hp/2570p/devicetree.cb M src/mainboard/hp/2760p/devicetree.cb M src/mainboard/hp/8460p/devicetree.cb M src/mainboard/hp/8470p/devicetree.cb M src/mainboard/hp/8770w/devicetree.cb M src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb M src/mainboard/hp/folio_9470m/devicetree.cb M src/mainboard/hp/revolve_810_g1/devicetree.cb M src/mainboard/intel/dcp847ske/devicetree.cb M src/mainboard/intel/emeraldlake2/devicetree.cb M src/mainboard/kontron/ktqm77/devicetree.cb M src/mainboard/lenovo/l520/devicetree.cb M src/mainboard/lenovo/s230u/devicetree.cb M src/mainboard/lenovo/t420/devicetree.cb M src/mainboard/lenovo/t420s/devicetree.cb M src/mainboard/lenovo/t430/devicetree.cb M src/mainboard/lenovo/t430s/devicetree.cb M src/mainboard/lenovo/t520/variants/t520/devicetree.cb M src/mainboard/lenovo/t520/variants/w520/devicetree.cb M src/mainboard/lenovo/t530/variants/t530/devicetree.cb M src/mainboard/lenovo/t530/variants/w530/devicetree.cb M src/mainboard/lenovo/x131e/devicetree.cb M src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb M src/mainboard/lenovo/x220/devicetree.cb M src/mainboard/lenovo/x230/devicetree.cb M src/mainboard/roda/rv11/variants/rv11/devicetree.cb M src/mainboard/roda/rv11/variants/rw11/devicetree.cb M src/mainboard/samsung/lumpy/devicetree.cb M src/mainboard/samsung/stumpy/devicetree.cb M src/mainboard/sapphire/pureplatinumh61/devicetree.cb 53 files changed, 52 insertions(+), 201 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/31/31031/1 diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig index b30cfa1..0908819 100644 --- a/src/cpu/intel/model_206ax/Kconfig +++ b/src/cpu/intel/model_206ax/Kconfig @@ -13,6 +13,7 @@ select ARCH_ROMSTAGE_X86_32 select ARCH_RAMSTAGE_X86_32 select SMP + select MMX select SSE2 select UDELAY_TSC select TSC_CONSTANT_RATE diff --git a/src/cpu/intel/model_206ax/Makefile.inc b/src/cpu/intel/model_206ax/Makefile.inc index 2c1d961..d193e60 100644 --- a/src/cpu/intel/model_206ax/Makefile.inc +++ b/src/cpu/intel/model_206ax/Makefile.inc @@ -3,6 +3,14 @@ subdirs-y += ../smm/gen1 subdirs-y += ../common +subdirs-y += ../../x86/tsc +subdirs-y += ../../x86/mtrr +subdirs-y += ../../x86/lapic +subdirs-y += ../../x86/cache +subdirs-y += ../../x86/smm +subdirs-y += ../microcode +subdirs-y += ../turbo + ramstage-y += acpi.c ramstage-y += common.c diff --git a/src/cpu/intel/socket_FCBGA1023/Kconfig b/src/cpu/intel/socket_FCBGA1023/Kconfig deleted file mode 100644 index bdac1db..0000000 --- a/src/cpu/intel/socket_FCBGA1023/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -config CPU_INTEL_SOCKET_FCBGA1023 - bool - -if CPU_INTEL_SOCKET_FCBGA1023 - -config SOCKET_SPECIFIC_OPTIONS # dummy - def_bool y - select MMX - select SSE2 - -endif diff --git a/src/cpu/intel/socket_FCBGA1023/Makefile.inc b/src/cpu/intel/socket_FCBGA1023/Makefile.inc deleted file mode 100644 index 539f285..0000000 --- a/src/cpu/intel/socket_FCBGA1023/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -subdirs-y += ../../x86/tsc -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/lapic -subdirs-y += ../../x86/cache -subdirs-y += ../../x86/smm -subdirs-y += ../microcode -subdirs-y += ../turbo diff --git a/src/cpu/intel/socket_LGA1155/Kconfig b/src/cpu/intel/socket_LGA1155/Kconfig deleted file mode 100644 index 35aac3c..0000000 --- a/src/cpu/intel/socket_LGA1155/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -config CPU_INTEL_SOCKET_LGA1155 - bool - -if CPU_INTEL_SOCKET_LGA1155 - -config SOCKET_SPECIFIC_OPTIONS # dummy - def_bool y - select MMX - select SSE - -endif # CPU_INTEL_SOCKET_LGA1155 diff --git a/src/cpu/intel/socket_LGA1155/Makefile.inc b/src/cpu/intel/socket_LGA1155/Makefile.inc deleted file mode 100644 index 539f285..0000000 --- a/src/cpu/intel/socket_LGA1155/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -subdirs-y += ../../x86/tsc -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/lapic -subdirs-y += ../../x86/cache -subdirs-y += ../../x86/smm -subdirs-y += ../microcode -subdirs-y += ../turbo diff --git a/src/cpu/intel/socket_rPGA988B/Kconfig b/src/cpu/intel/socket_rPGA988B/Kconfig deleted file mode 100644 index 753cfb3..0000000 --- a/src/cpu/intel/socket_rPGA988B/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -config CPU_INTEL_SOCKET_RPGA988B - bool - -if CPU_INTEL_SOCKET_RPGA988B - -config SOCKET_SPECIFIC_OPTIONS # dummy - def_bool y - select MMX - select SSE - -endif diff --git a/src/cpu/intel/socket_rPGA988B/Makefile.inc b/src/cpu/intel/socket_rPGA988B/Makefile.inc deleted file mode 100644 index 539f285..0000000 --- a/src/cpu/intel/socket_rPGA988B/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -subdirs-y += ../../x86/tsc -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/lapic -subdirs-y += ../../x86/cache -subdirs-y += ../../x86/smm -subdirs-y += ../microcode -subdirs-y += ../turbo diff --git a/src/cpu/intel/socket_rPGA989/Kconfig b/src/cpu/intel/socket_rPGA989/Kconfig deleted file mode 100644 index 1d1f64f..0000000 --- a/src/cpu/intel/socket_rPGA989/Kconfig +++ /dev/null @@ -1,11 +0,0 @@ -config CPU_INTEL_SOCKET_RPGA989 - bool - -if CPU_INTEL_SOCKET_RPGA989 - -config SOCKET_SPECIFIC_OPTIONS # dummy - def_bool y - select MMX - select SSE - -endif diff --git a/src/cpu/intel/socket_rPGA989/Makefile.inc b/src/cpu/intel/socket_rPGA989/Makefile.inc deleted file mode 100644 index 539f285..0000000 --- a/src/cpu/intel/socket_rPGA989/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -subdirs-y += ../../x86/tsc -subdirs-y += ../../x86/mtrr -subdirs-y += ../../x86/lapic -subdirs-y += ../../x86/cache -subdirs-y += ../../x86/smm -subdirs-y += ../microcode -subdirs-y += ../turbo diff --git a/src/mainboard/apple/macbookair4_2/devicetree.cb b/src/mainboard/apple/macbookair4_2/devicetree.cb index 287b8c0..267ecb1 100644 --- a/src/mainboard/apple/macbookair4_2/devicetree.cb +++ b/src/mainboard/apple/macbookair4_2/devicetree.cb @@ -15,9 +15,6 @@ register "gpu_panel_power_up_delay" = "2000" register "gpu_pch_backlight" = "0x13121312" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -25,6 +22,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/asrock/b75pro3-m/devicetree.cb b/src/mainboard/asrock/b75pro3-m/devicetree.cb index d209843..9eba6fc 100644 --- a/src/mainboard/asrock/b75pro3-m/devicetree.cb +++ b/src/mainboard/asrock/b75pro3-m/devicetree.cb @@ -31,9 +31,6 @@ register "gpu_panel_power_up_delay" = "0" register "gpu_pch_backlight" = "0x00000000" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -41,6 +38,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb index a3f4564..4b80f39 100644 --- a/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb +++ b/src/mainboard/asus/maximus_iv_gene-z/devicetree.cb @@ -16,9 +16,6 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on - chip cpu/intel/socket_LGA1155 - device lapic 0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -26,6 +23,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/asus/p8h61-m_lx/devicetree.cb b/src/mainboard/asus/p8h61-m_lx/devicetree.cb index 5a40b31..ef8071f 100644 --- a/src/mainboard/asus/p8h61-m_lx/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_lx/devicetree.cb @@ -16,9 +16,6 @@ chip northbridge/intel/sandybridge device cpu_cluster 0 on - chip cpu/intel/socket_LGA1155 - device lapic 0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -26,6 +23,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/asus/p8h61-m_pro/devicetree.cb b/src/mainboard/asus/p8h61-m_pro/devicetree.cb index fb12153..9407aab 100644 --- a/src/mainboard/asus/p8h61-m_pro/devicetree.cb +++ b/src/mainboard/asus/p8h61-m_pro/devicetree.cb @@ -17,9 +17,6 @@ register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" register "gfx.ndid" = "3" device cpu_cluster 0x0 on - chip cpu/intel/socket_LGA1155 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -27,6 +24,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/compulab/intense_pc/devicetree.cb b/src/mainboard/compulab/intense_pc/devicetree.cb index dfd2e69..a6bcb1d 100644 --- a/src/mainboard/compulab/intense_pc/devicetree.cb +++ b/src/mainboard/compulab/intense_pc/devicetree.cb @@ -28,9 +28,6 @@ register "gpu_panel_power_up_delay" = "0" register "gpu_pch_backlight" = "0x00000000" device cpu_cluster 0x0 on - chip cpu/intel/socket_FCBGA1023 - device lapic 0x0 on end - end chip cpu/intel/model_206ax # FIXME: check all registers register "c1_acpower" = "1" register "c1_battery" = "1" @@ -38,6 +35,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb index 2091346..7a3568a 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb +++ b/src/mainboard/gigabyte/ga-b75m-d3h/devicetree.cb @@ -4,9 +4,6 @@ register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" device cpu_cluster 0 on - chip cpu/intel/socket_LGA1155 - device lapic 0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c2_acpower" = "3" @@ -15,6 +12,7 @@ register "c2_battery" = "3" register "c3_battery" = "5" # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb index 61c342a..a00e2ee 100644 --- a/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb +++ b/src/mainboard/gigabyte/ga-b75m-d3v/devicetree.cb @@ -3,9 +3,6 @@ register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" device cpu_cluster 0 on - chip cpu/intel/socket_LGA1155 - device lapic 0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c2_acpower" = "3" @@ -14,6 +11,7 @@ register "c2_battery" = "3" register "c3_battery" = "5" # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb index bca7381..667dd9c 100644 --- a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb +++ b/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb @@ -17,9 +17,6 @@ register "gfx.ndid" = "3" register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410 }" device cpu_cluster 0x0 on - chip cpu/intel/socket_LGA1155 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -27,6 +24,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/google/butterfly/devicetree.cb b/src/mainboard/google/butterfly/devicetree.cb index b54ca9a..d8a0ee1 100644 --- a/src/mainboard/google/butterfly/devicetree.cb +++ b/src/mainboard/google/butterfly/devicetree.cb @@ -22,11 +22,9 @@ register "max_mem_clock_mhz" = "666" # DDR3-1333 device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/google/link/devicetree.cb b/src/mainboard/google/link/devicetree.cb index c3b93f0..1b27a69 100644 --- a/src/mainboard/google/link/devicetree.cb +++ b/src/mainboard/google/link/devicetree.cb @@ -21,11 +21,9 @@ register "max_mem_clock_mhz" = "666" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/google/parrot/devicetree.cb b/src/mainboard/google/parrot/devicetree.cb index e6c8a06..046db97 100644 --- a/src/mainboard/google/parrot/devicetree.cb +++ b/src/mainboard/google/parrot/devicetree.cb @@ -21,11 +21,9 @@ register "max_mem_clock_mhz" = "666" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/google/stout/devicetree.cb b/src/mainboard/google/stout/devicetree.cb index 3140782..ddcf4e2 100644 --- a/src/mainboard/google/stout/devicetree.cb +++ b/src/mainboard/google/stout/devicetree.cb @@ -23,11 +23,9 @@ register "max_mem_clock_mhz" = "666" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "tcc_offset" = "5" # TCC of 95C diff --git a/src/mainboard/hp/2570p/devicetree.cb b/src/mainboard/hp/2570p/devicetree.cb index e1f0cca..585d61d 100644 --- a/src/mainboard/hp/2570p/devicetree.cb +++ b/src/mainboard/hp/2570p/devicetree.cb @@ -31,9 +31,6 @@ register "gpu_panel_power_up_delay" = "300" register "gpu_pch_backlight" = "0x0d9c0d9c" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -41,6 +38,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/hp/2760p/devicetree.cb b/src/mainboard/hp/2760p/devicetree.cb index 15f8943..515d20f 100644 --- a/src/mainboard/hp/2760p/devicetree.cb +++ b/src/mainboard/hp/2760p/devicetree.cb @@ -31,9 +31,6 @@ register "gpu_panel_power_up_delay" = "300" register "gpu_pch_backlight" = "0x02880288" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -41,6 +38,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/hp/8460p/devicetree.cb b/src/mainboard/hp/8460p/devicetree.cb index 2964cc8..79259b4 100644 --- a/src/mainboard/hp/8460p/devicetree.cb +++ b/src/mainboard/hp/8460p/devicetree.cb @@ -31,9 +31,6 @@ register "gpu_panel_power_up_delay" = "300" register "gpu_pch_backlight" = "0x02880288" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -41,6 +38,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/hp/8470p/devicetree.cb b/src/mainboard/hp/8470p/devicetree.cb index cf55d88..2a115cc 100644 --- a/src/mainboard/hp/8470p/devicetree.cb +++ b/src/mainboard/hp/8470p/devicetree.cb @@ -31,9 +31,6 @@ register "gpu_panel_power_up_delay" = "300" register "gpu_pch_backlight" = "0x0d9c0d9c" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -41,6 +38,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/hp/8770w/devicetree.cb b/src/mainboard/hp/8770w/devicetree.cb index eb9ae22..7d74c94 100644 --- a/src/mainboard/hp/8770w/devicetree.cb +++ b/src/mainboard/hp/8770w/devicetree.cb @@ -17,9 +17,6 @@ chip northbridge/intel/sandybridge device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -27,6 +24,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb index 9d79a08..95659be 100644 --- a/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb +++ b/src/mainboard/hp/compaq_8200_elite_sff/devicetree.cb @@ -24,9 +24,6 @@ register "gpu_dp_d_hotplug" = "0" device cpu_cluster 0x0 on - chip cpu/intel/socket_LGA1155 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -34,6 +31,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/hp/folio_9470m/devicetree.cb b/src/mainboard/hp/folio_9470m/devicetree.cb index fd81a0d..5d4e5b8 100644 --- a/src/mainboard/hp/folio_9470m/devicetree.cb +++ b/src/mainboard/hp/folio_9470m/devicetree.cb @@ -31,9 +31,6 @@ register "gpu_panel_power_up_delay" = "300" register "gpu_pch_backlight" = "0x0d9c0d9c" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax # FIXME: check all registers register "c1_acpower" = "1" register "c1_battery" = "1" @@ -41,6 +38,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/hp/revolve_810_g1/devicetree.cb b/src/mainboard/hp/revolve_810_g1/devicetree.cb index 1ee64f4..4d0d639 100644 --- a/src/mainboard/hp/revolve_810_g1/devicetree.cb +++ b/src/mainboard/hp/revolve_810_g1/devicetree.cb @@ -31,9 +31,6 @@ register "gpu_panel_power_up_delay" = "300" register "gpu_pch_backlight" = "0x02880288" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax # FIXME: check all registers register "c1_acpower" = "1" register "c1_battery" = "1" @@ -41,6 +38,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/intel/dcp847ske/devicetree.cb b/src/mainboard/intel/dcp847ske/devicetree.cb index 342e116..ac152d8 100644 --- a/src/mainboard/intel/dcp847ske/devicetree.cb +++ b/src/mainboard/intel/dcp847ske/devicetree.cb @@ -13,11 +13,9 @@ register "gpu_dp_b_hotplug" = "0x06" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_battery" = "1" diff --git a/src/mainboard/intel/emeraldlake2/devicetree.cb b/src/mainboard/intel/emeraldlake2/devicetree.cb index ebfc055..60072b0 100644 --- a/src/mainboard/intel/emeraldlake2/devicetree.cb +++ b/src/mainboard/intel/emeraldlake2/devicetree.cb @@ -13,11 +13,9 @@ register "gpu_dp_b_hotplug" = "0x06" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_battery" = "3" # ACPI(C1) = MWAIT(C3) diff --git a/src/mainboard/kontron/ktqm77/devicetree.cb b/src/mainboard/kontron/ktqm77/devicetree.cb index 204fbd3..fad139a 100644 --- a/src/mainboard/kontron/ktqm77/devicetree.cb +++ b/src/mainboard/kontron/ktqm77/devicetree.cb @@ -4,11 +4,9 @@ register "gfx.did" = "{ 0x80000100, 0x80000240, 0x80000410, 0x80000410, 0x00000005 }" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/lenovo/l520/devicetree.cb b/src/mainboard/lenovo/l520/devicetree.cb index f737b18..48c2ea0 100644 --- a/src/mainboard/lenovo/l520/devicetree.cb +++ b/src/mainboard/lenovo/l520/devicetree.cb @@ -16,9 +16,6 @@ register "gpu_pch_backlight" = "0x00000000" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -26,6 +23,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/lenovo/s230u/devicetree.cb b/src/mainboard/lenovo/s230u/devicetree.cb index 1fe1f05..a9e8bab 100644 --- a/src/mainboard/lenovo/s230u/devicetree.cb +++ b/src/mainboard/lenovo/s230u/devicetree.cb @@ -15,9 +15,6 @@ register "gpu_panel_power_up_delay" = "600" register "gpu_pch_backlight" = "0x041e041e" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -25,6 +22,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/lenovo/t420/devicetree.cb b/src/mainboard/lenovo/t420/devicetree.cb index a69bb7e..47c14ef 100644 --- a/src/mainboard/lenovo/t420/devicetree.cb +++ b/src/mainboard/lenovo/t420/devicetree.cb @@ -19,11 +19,9 @@ register "gpu_pch_backlight" = "0x06100610" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA988B - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/lenovo/t420s/devicetree.cb b/src/mainboard/lenovo/t420s/devicetree.cb index 9f557b4..0f09db8 100644 --- a/src/mainboard/lenovo/t420s/devicetree.cb +++ b/src/mainboard/lenovo/t420s/devicetree.cb @@ -18,11 +18,9 @@ register "gpu_pch_backlight" = "0x06100610" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA988B - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/lenovo/t430/devicetree.cb b/src/mainboard/lenovo/t430/devicetree.cb index 72425f8..9e731f9 100644 --- a/src/mainboard/lenovo/t430/devicetree.cb +++ b/src/mainboard/lenovo/t430/devicetree.cb @@ -18,9 +18,6 @@ register "gpu_pch_backlight" = "0x11551155" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax # FIXME: check all registers register "c1_acpower" = "1" register "c1_battery" = "1" @@ -28,6 +25,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/lenovo/t430s/devicetree.cb b/src/mainboard/lenovo/t430s/devicetree.cb index 10c6e4a..2ecf05e 100644 --- a/src/mainboard/lenovo/t430s/devicetree.cb +++ b/src/mainboard/lenovo/t430s/devicetree.cb @@ -18,11 +18,9 @@ register "gpu_pch_backlight" = "0x11551155" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb index 553c14d..cf8e7ce 100644 --- a/src/mainboard/lenovo/t520/variants/t520/devicetree.cb +++ b/src/mainboard/lenovo/t520/variants/t520/devicetree.cb @@ -19,11 +19,9 @@ register "gpu_pch_backlight" = "0x06100610" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA988B - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb index 1c41b56..1770ad9 100644 --- a/src/mainboard/lenovo/t520/variants/w520/devicetree.cb +++ b/src/mainboard/lenovo/t520/variants/w520/devicetree.cb @@ -19,11 +19,9 @@ register "gpu_pch_backlight" = "0x06100610" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA988B - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb index 4114b38..1a1e707 100644 --- a/src/mainboard/lenovo/t530/variants/t530/devicetree.cb +++ b/src/mainboard/lenovo/t530/variants/t530/devicetree.cb @@ -19,11 +19,9 @@ register "gpu_pch_backlight" = "0x11551155" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb index 85add34..253096c 100644 --- a/src/mainboard/lenovo/t530/variants/w530/devicetree.cb +++ b/src/mainboard/lenovo/t530/variants/w530/devicetree.cb @@ -22,9 +22,6 @@ register "gpu_pch_backlight" = "0x11551155" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax # FIXME: check all registers register "c1_acpower" = "1" register "c1_battery" = "1" @@ -32,6 +29,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end diff --git a/src/mainboard/lenovo/x131e/devicetree.cb b/src/mainboard/lenovo/x131e/devicetree.cb index ccdff7c..589c6c9 100644 --- a/src/mainboard/lenovo/x131e/devicetree.cb +++ b/src/mainboard/lenovo/x131e/devicetree.cb @@ -18,11 +18,9 @@ register "gpu_pch_backlight" = "0x11551155" device cpu_cluster 0x0 on - chip cpu/intel/socket_rPGA989 - device lapic 0x0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" diff --git a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb index 75c49ad..8caa0d1 100644 --- a/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb +++ b/src/mainboard/lenovo/x1_carbon_gen1/devicetree.cb @@ -16,11 +16,9 @@ register "gpu_pch_backlight" = "0x11551155" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/lenovo/x220/devicetree.cb b/src/mainboard/lenovo/x220/devicetree.cb index 74d969f..0ec66f5 100644 --- a/src/mainboard/lenovo/x220/devicetree.cb +++ b/src/mainboard/lenovo/x220/devicetree.cb @@ -19,11 +19,9 @@ register "gpu_pch_backlight" = "0x06100610" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/lenovo/x230/devicetree.cb b/src/mainboard/lenovo/x230/devicetree.cb index cab0368..68e2f8e 100644 --- a/src/mainboard/lenovo/x230/devicetree.cb +++ b/src/mainboard/lenovo/x230/devicetree.cb @@ -19,11 +19,9 @@ register "gpu_pch_backlight" = "0x11551155" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb index d4a37c1..1dfa02d 100644 --- a/src/mainboard/roda/rv11/variants/rv11/devicetree.cb +++ b/src/mainboard/roda/rv11/variants/rv11/devicetree.cb @@ -31,11 +31,9 @@ register "gpu_pch_backlight" = "0x002e0000" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb index d7abde8..f101621 100644 --- a/src/mainboard/roda/rv11/variants/rw11/devicetree.cb +++ b/src/mainboard/roda/rv11/variants/rw11/devicetree.cb @@ -31,11 +31,9 @@ register "gpu_pch_backlight" = "0x13120000" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/samsung/lumpy/devicetree.cb b/src/mainboard/samsung/lumpy/devicetree.cb index ee8df2a..7199473 100644 --- a/src/mainboard/samsung/lumpy/devicetree.cb +++ b/src/mainboard/samsung/lumpy/devicetree.cb @@ -21,11 +21,9 @@ register "max_mem_clock_mhz" = "666" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_acpower" = "1" # ACPI(C1) = MWAIT(C1) diff --git a/src/mainboard/samsung/stumpy/devicetree.cb b/src/mainboard/samsung/stumpy/devicetree.cb index 43a014f..192e63d 100644 --- a/src/mainboard/samsung/stumpy/devicetree.cb +++ b/src/mainboard/samsung/stumpy/devicetree.cb @@ -15,11 +15,9 @@ register "max_mem_clock_mhz" = "666" device cpu_cluster 0 on - chip cpu/intel/socket_rPGA989 - device lapic 0 on end - end chip cpu/intel/model_206ax # Magic APIC ID to locate this chip + device lapic 0x0 on end device lapic 0xacac off end register "c1_battery" = "3" # ACPI(C1) = MWAIT(C3) diff --git a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb index f8cd3b2..95c59df 100644 --- a/src/mainboard/sapphire/pureplatinumh61/devicetree.cb +++ b/src/mainboard/sapphire/pureplatinumh61/devicetree.cb @@ -31,9 +31,6 @@ register "gpu_panel_power_up_delay" = "0" register "gpu_pch_backlight" = "0x00000000" device cpu_cluster 0x0 on - chip cpu/intel/socket_LGA1155 - device lapic 0x0 on end - end chip cpu/intel/model_206ax register "c1_acpower" = "1" register "c1_battery" = "1" @@ -41,6 +38,7 @@ register "c2_battery" = "3" register "c3_acpower" = "5" register "c3_battery" = "5" + device lapic 0x0 on end device lapic 0xacac off end end end -- To view, visit https://review.coreboot.org/c/coreboot/+/31031 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I044d434a5b8fca75db9eb193c7ffc60f3c78212b Gerrit-Change-Number: 31031 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Alexander Couzens <lynxis(a)fe80.eu> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Tristan Corrick <tristan(a)corrick.kiwi> Gerrit-MessageType: newchange

7 14

Change in ...coreboot[master]: sb/intel/common: More SMBus block_cmd_loop()
by Patrick Georgi (Code Review) 24 Jan '19

24 Jan '19

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/26763 ) Change subject: sb/intel/common: More SMBus block_cmd_loop() ...................................................................... sb/intel/common: More SMBus block_cmd_loop() Setup to different block transactions are similar enough to have common place to call execute_command() in. Change-Id: I671fed280f47e6bc673eb7506f09ed6ed36d2804 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/26763 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/southbridge/intel/common/smbus.c 1 file changed, 24 insertions(+), 30 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/southbridge/intel/common/smbus.c b/src/southbridge/intel/common/smbus.c index 12fb9ea..fd8b6aa 100644 --- a/src/southbridge/intel/common/smbus.c +++ b/src/southbridge/intel/common/smbus.c @@ -239,6 +239,27 @@ if (flags == (BLOCK_WRITE | BLOCK_I2C)) return SMBUS_ERROR; + /* Set number of bytes to transfer. */ + /* Reset number of bytes to transfer so we notice later it + * was really updated with the transaction. */ + if (!sw_drives_nak) { + if (is_write_cmd) + outb(max_bytes, smbus_base + SMBHSTDAT0); + else + outb(0, smbus_base + SMBHSTDAT0); + } + + /* Send first byte from buffer, bytes_sent increments after + * hardware acknowledges it. + */ + if (is_write_cmd) + outb(*buf++, smbus_base + SMBBLKDAT); + + /* Start the command */ + ret = execute_command(smbus_base); + if (ret < 0) + return ret; + /* Poll for transaction completion */ do { status = inb(smbus_base + SMBHSTSTAT); @@ -301,16 +322,7 @@ /* Set the command/address... */ outb(cmd, smbus_base + SMBHSTCMD); - /* Reset number of bytes to transfer so we notice later it - * was really updated with the transaction. */ - outb(0, smbus_base + SMBHSTDAT0); - - /* Start the command */ - ret = execute_command(smbus_base); - if (ret < 0) - return ret; - - /* Poll for transaction completion */ + /* Execute block transaction. */ ret = block_cmd_loop(smbus_base, buf, max_bytes, BLOCK_READ); if (ret < 0) return ret; @@ -339,20 +351,7 @@ /* Set the command/address... */ outb(cmd, smbus_base + SMBHSTCMD); - /* Set number of bytes to transfer. */ - outb(bytes, smbus_base + SMBHSTDAT0); - - /* Send first byte from buffer, bytes_sent increments after - * hardware acknowledges it. - */ - outb(*buf++, smbus_base + SMBBLKDAT); - - /* Start the command */ - ret = execute_command(smbus_base); - if (ret < 0) - return ret; - - /* Poll for transaction completion */ + /* Execute block transaction. */ ret = block_cmd_loop(smbus_base, (u8 *)buf, bytes, BLOCK_WRITE); if (ret < 0) return ret; @@ -383,12 +382,7 @@ /* device offset */ outb(offset, smbus_base + SMBHSTDAT1); - /* Start the command */ - ret = execute_command(smbus_base); - if (ret < 0) - return ret; - - /* Poll for transaction completion */ + /* Execute block transaction. */ ret = block_cmd_loop(smbus_base, buf, bytes, BLOCK_READ | BLOCK_I2C); if (ret < 0) return ret; -- To view, visit https://review.coreboot.org/c/coreboot/+/26763 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I671fed280f47e6bc673eb7506f09ed6ed36d2804 Gerrit-Change-Number: 26763 Gerrit-PatchSet: 7 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com> 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

1 0

Change in ...coreboot[master]: sb/intel/common: SMBus block_cmd_loop()
by Patrick Georgi (Code Review) 24 Jan '19

24 Jan '19

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/21121 ) Change subject: sb/intel/common: SMBus block_cmd_loop() ...................................................................... sb/intel/common: SMBus block_cmd_loop() For debugging prints, report the number of loop spent polling instead. Change-Id: I61865aaafc9f41acd85c5dc98817d12642965ba4 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/21121 Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M src/southbridge/intel/common/smbus.c 1 file changed, 79 insertions(+), 97 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/southbridge/intel/common/smbus.c b/src/southbridge/intel/common/smbus.c index 1302798..12fb9ea 100644 --- a/src/southbridge/intel/common/smbus.c +++ b/src/southbridge/intel/common/smbus.c @@ -60,6 +60,11 @@ #define SMBUS_TIMEOUT (10 * 1000 * 100) #define SMBUS_BLOCK_MAXLEN 32 +/* block_cmd_loop flags */ +#define BLOCK_READ 0 +#define BLOCK_WRITE (1 << 0) +#define BLOCK_I2C (1 << 1) + static void smbus_delay(void) { inb(0x80); @@ -221,13 +226,70 @@ return complete_command(smbus_base); } +static int block_cmd_loop(unsigned int smbus_base, + u8 *buf, const unsigned int max_bytes, int flags) +{ + u8 status; + unsigned int loops = SMBUS_TIMEOUT; + int ret, bytes = 0; + int is_write_cmd = flags & BLOCK_WRITE; + int sw_drives_nak = flags & BLOCK_I2C; + + /* Hardware limitations. */ + if (flags == (BLOCK_WRITE | BLOCK_I2C)) + return SMBUS_ERROR; + + /* Poll for transaction completion */ + do { + status = inb(smbus_base + SMBHSTSTAT); + + if (status & SMBHSTSTS_BYTE_DONE) { /* Byte done */ + + if (is_write_cmd) { + bytes++; + if (bytes < max_bytes) + outb(*buf++, smbus_base + SMBBLKDAT); + } else { + if (bytes < max_bytes) + *buf++ = inb(smbus_base + SMBBLKDAT); + bytes++; + + /* Indicate that next byte is the last one. */ + if (sw_drives_nak && (bytes + 1 >= max_bytes)) { + outb(inb(smbus_base + SMBHSTCTL) + | SMBHSTCNT_LAST_BYTE, + smbus_base + SMBHSTCTL); + } + + } + + /* Engine internally completes the transaction + * and clears HOST_BUSY flag once the byte count + * has been reached or LAST_BYTE was set. + */ + outb(SMBHSTSTS_BYTE_DONE, smbus_base + SMBHSTSTAT); + } + + } while (--loops && !host_completed(status)); + + dprintk("%s: status = %02x, len = %d / %d, loops = %d\n", + __func__, status, bytes, max_bytes, SMBUS_TIMEOUT - loops); + + if (loops == 0) + return recover_master(smbus_base, + SMBUS_WAIT_UNTIL_DONE_TIMEOUT); + + ret = cb_err_from_stat(status); + if (ret < 0) + return ret; + + return bytes; +} + int do_smbus_block_read(unsigned int smbus_base, u8 device, u8 cmd, unsigned int max_bytes, u8 *buf) { - u8 status; int ret, slave_bytes; - int bytes_read = 0; - unsigned int loops = SMBUS_TIMEOUT; max_bytes = MIN(SMBUS_BLOCK_MAXLEN, max_bytes); @@ -249,50 +311,22 @@ return ret; /* Poll for transaction completion */ - do { - status = inb(smbus_base + SMBHSTSTAT); - - if (status & SMBHSTSTS_BYTE_DONE) { /* Byte done */ - - if (bytes_read < max_bytes) { - *buf++ = inb(smbus_base + SMBBLKDAT); - bytes_read++; - } - - /* Engine internally completes the transaction - * and clears HOST_BUSY flag once the byte count - * from slave is reached. - */ - outb(SMBHSTSTS_BYTE_DONE, smbus_base + SMBHSTSTAT); - } - } while (--loops && !host_completed(status)); - - /* Post-check we received complete message. */ - slave_bytes = inb(smbus_base + SMBHSTDAT0); - - dprintk("%s: status = %02x, len = %d / %d, loops = %d\n", - __func__, status, bytes_read, slave_bytes, loops); - - if (loops == 0) - return recover_master(smbus_base, - SMBUS_WAIT_UNTIL_DONE_TIMEOUT); - - ret = cb_err_from_stat(status); + ret = block_cmd_loop(smbus_base, buf, max_bytes, BLOCK_READ); if (ret < 0) return ret; - if (bytes_read < slave_bytes) + /* Post-check we received complete message. */ + slave_bytes = inb(smbus_base + SMBHSTDAT0); + if (ret < slave_bytes) return SMBUS_ERROR; - return bytes_read; + return ret; } int do_smbus_block_write(unsigned int smbus_base, u8 device, u8 cmd, const unsigned int bytes, const u8 *buf) { - u8 status; - int ret, bytes_sent = 0; - unsigned int loops = SMBUS_TIMEOUT; + int ret; if (bytes > SMBUS_BLOCK_MAXLEN) return SMBUS_ERROR; @@ -319,46 +353,21 @@ return ret; /* Poll for transaction completion */ - do { - status = inb(smbus_base + SMBHSTSTAT); - - if (status & SMBHSTSTS_BYTE_DONE) { - bytes_sent++; - if (bytes_sent < bytes) - outb(*buf++, smbus_base + SMBBLKDAT); - - /* Engine internally completes the transaction - * and clears HOST_BUSY flag once the byte count - * has been reached. - */ - outb(SMBHSTSTS_BYTE_DONE, smbus_base + SMBHSTSTAT); - } - } while (--loops && !host_completed(status)); - - dprintk("%s: status = %02x, len = %d / %d, loops = %d\n", - __func__, status, bytes_sent, bytes, loops); - - if (loops == 0) - return recover_master(smbus_base, - SMBUS_WAIT_UNTIL_DONE_TIMEOUT); - - ret = cb_err_from_stat(status); + ret = block_cmd_loop(smbus_base, (u8 *)buf, bytes, BLOCK_WRITE); if (ret < 0) return ret; - if (bytes_sent < bytes) + if (ret < bytes) return SMBUS_ERROR; - return bytes_sent; + return ret; } /* Only since ICH5 */ int do_i2c_block_read(unsigned int smbus_base, u8 device, unsigned int offset, const unsigned int bytes, u8 *buf) { - u8 status; - int ret, bytes_read = 0; - unsigned int loops = SMBUS_TIMEOUT; + int ret; /* Set up for a i2c block data read. * @@ -380,40 +389,13 @@ return ret; /* Poll for transaction completion */ - do { - status = inb(smbus_base + SMBHSTSTAT); - - if (status & SMBHSTSTS_BYTE_DONE) { - - if (bytes_read < bytes) { - *buf++ = inb(smbus_base + SMBBLKDAT); - bytes_read++; - } - - if (bytes_read + 1 >= bytes) { - /* indicate that next byte is the last one */ - outb(inb(smbus_base + SMBHSTCTL) - | SMBHSTCNT_LAST_BYTE, - smbus_base + SMBHSTCTL); - } - - outb(SMBHSTSTS_BYTE_DONE, smbus_base + SMBHSTSTAT); - } - } while (--loops && !host_completed(status)); - - dprintk("%s: status = %02x, len = %d / %d, loops = %d\n", - __func__, status, bytes_read, bytes, loops); - - if (loops == 0) - return recover_master(smbus_base, - SMBUS_WAIT_UNTIL_DONE_TIMEOUT); - - ret = cb_err_from_stat(status); + ret = block_cmd_loop(smbus_base, buf, bytes, BLOCK_READ | BLOCK_I2C); if (ret < 0) return ret; - if (bytes_read < bytes) + /* Post-check we received complete message. */ + if (ret < bytes) return SMBUS_ERROR; - return bytes_read; + return ret; } -- To view, visit https://review.coreboot.org/c/coreboot/+/21121 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I61865aaafc9f41acd85c5dc98817d12642965ba4 Gerrit-Change-Number: 21121 Gerrit-PatchSet: 12 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com> 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

1 0

Change in ...coreboot[master]: sb/intel/common: SMBus complete_command()
by Patrick Georgi (Code Review) 24 Jan '19

24 Jan '19

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/21120 ) Change subject: sb/intel/common: SMBus complete_command() ...................................................................... sb/intel/common: SMBus complete_command() Adds helper to test for SMBHSTSTAT flags for hardware having finished or failed a transaction. Change-Id: Idea15e03edde7aeedf198c1529f09c24a5bc0b06 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/21120 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/southbridge/intel/common/smbus.c 1 file changed, 65 insertions(+), 54 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/southbridge/intel/common/smbus.c b/src/southbridge/intel/common/smbus.c index fb7f8e5..1302798 100644 --- a/src/southbridge/intel/common/smbus.c +++ b/src/southbridge/intel/common/smbus.c @@ -65,6 +65,14 @@ inb(0x80); } +static int host_completed(u8 status) +{ + if (status & SMBHSTSTS_HOST_BUSY) + return 0; + status &= ~(SMBHSTSTS_SMBALERT_STS | SMBHSTSTS_INUSE_STS); + return status != 0; +} + static int recover_master(int smbus_base, int ret) { /* TODO: Depending of the failure, drive KILL transaction @@ -74,6 +82,17 @@ return ret; } +static int cb_err_from_stat(u8 status) +{ + /* Ignore the "In Use" status... */ + status &= ~(SMBHSTSTS_SMBALERT_STS | SMBHSTSTS_INUSE_STS); + + if (status == SMBHSTSTS_INTR) + return 0; + + return SMBUS_ERROR; +} + static int setup_command(unsigned int smbus_base, u8 ctrl, u8 xmitadd) { unsigned int loops = SMBUS_TIMEOUT; @@ -128,26 +147,28 @@ return 0; } -static int smbus_wait_until_done(u16 smbus_base) +static int complete_command(unsigned int smbus_base) { unsigned int loops = SMBUS_TIMEOUT; - unsigned char byte; + u8 status; + do { smbus_delay(); - if (--loops == 0) - break; - byte = inb(smbus_base + SMBHSTSTAT); - } while ((byte & SMBHSTSTS_HOST_BUSY) - || (byte & ~(SMBHSTSTS_INUSE_STS | SMBHSTSTS_HOST_BUSY)) == 0); - return loops ? 0 : -1; + status = inb(smbus_base + SMBHSTSTAT); + } while (--loops && !host_completed(status)); + + if (loops == 0) + return recover_master(smbus_base, + SMBUS_WAIT_UNTIL_DONE_TIMEOUT); + + return cb_err_from_stat(status); } int do_smbus_read_byte(unsigned int smbus_base, u8 device, unsigned int address) { int ret; - unsigned char status; - unsigned char byte; + u8 byte; /* Set up for a byte data read. */ ret = setup_command(smbus_base, I801_BYTE_DATA, XMIT_READ(device)); @@ -166,25 +187,18 @@ return ret; /* Poll for transaction completion */ - if (smbus_wait_until_done(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_DONE_TIMEOUT; - - status = inb(smbus_base + SMBHSTSTAT); - - /* Ignore the "In Use" status... */ - status &= ~(SMBHSTSTS_SMBALERT_STS | SMBHSTSTS_INUSE_STS); + ret = complete_command(smbus_base); + if (ret < 0) + return ret; /* Read results of transaction */ byte = inb(smbus_base + SMBHSTDAT0); - if (status != SMBHSTSTS_INTR) - return SMBUS_ERROR; return byte; } int do_smbus_write_byte(unsigned int smbus_base, u8 device, unsigned int address, unsigned int data) { - unsigned char status; int ret; /* Set up for a byte data write. */ @@ -204,19 +218,7 @@ return ret; /* Poll for transaction completion */ - if (smbus_wait_until_done(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_DONE_TIMEOUT; - - status = inb(smbus_base + SMBHSTSTAT); - - /* Ignore the "In Use" status... */ - status &= ~(SMBHSTSTS_SMBALERT_STS | SMBHSTSTS_INUSE_STS); - - /* Read results of transaction */ - if (status != SMBHSTSTS_INTR) - return SMBUS_ERROR; - - return 0; + return complete_command(smbus_base); } int do_smbus_block_read(unsigned int smbus_base, u8 device, u8 cmd, @@ -248,12 +250,7 @@ /* Poll for transaction completion */ do { - loops--; status = inb(smbus_base + SMBHSTSTAT); - if (status & (SMBHSTSTS_FAILED | /* FAILED */ - SMBHSTSTS_BUS_ERR | /* BUS ERR */ - SMBHSTSTS_DEV_ERR)) /* DEV ERR */ - return SMBUS_ERROR; if (status & SMBHSTSTS_BYTE_DONE) { /* Byte done */ @@ -266,9 +263,9 @@ * and clears HOST_BUSY flag once the byte count * from slave is reached. */ - outb(status, smbus_base + SMBHSTSTAT); + outb(SMBHSTSTS_BYTE_DONE, smbus_base + SMBHSTSTAT); } - } while ((status & SMBHSTSTS_HOST_BUSY) && loops); + } while (--loops && !host_completed(status)); /* Post-check we received complete message. */ slave_bytes = inb(smbus_base + SMBHSTDAT0); @@ -276,6 +273,14 @@ dprintk("%s: status = %02x, len = %d / %d, loops = %d\n", __func__, status, bytes_read, slave_bytes, loops); + if (loops == 0) + return recover_master(smbus_base, + SMBUS_WAIT_UNTIL_DONE_TIMEOUT); + + ret = cb_err_from_stat(status); + if (ret < 0) + return ret; + if (bytes_read < slave_bytes) return SMBUS_ERROR; @@ -315,12 +320,7 @@ /* Poll for transaction completion */ do { - loops--; status = inb(smbus_base + SMBHSTSTAT); - if (status & (SMBHSTSTS_FAILED | /* FAILED */ - SMBHSTSTS_BUS_ERR | /* BUS ERR */ - SMBHSTSTS_DEV_ERR)) /* DEV ERR */ - return SMBUS_ERROR; if (status & SMBHSTSTS_BYTE_DONE) { bytes_sent++; @@ -331,13 +331,21 @@ * and clears HOST_BUSY flag once the byte count * has been reached. */ - outb(status, smbus_base + SMBHSTSTAT); + outb(SMBHSTSTS_BYTE_DONE, smbus_base + SMBHSTSTAT); } - } while ((status & SMBHSTSTS_HOST_BUSY) && loops); + } while (--loops && !host_completed(status)); dprintk("%s: status = %02x, len = %d / %d, loops = %d\n", __func__, status, bytes_sent, bytes, loops); + if (loops == 0) + return recover_master(smbus_base, + SMBUS_WAIT_UNTIL_DONE_TIMEOUT); + + ret = cb_err_from_stat(status); + if (ret < 0) + return ret; + if (bytes_sent < bytes) return SMBUS_ERROR; @@ -373,12 +381,7 @@ /* Poll for transaction completion */ do { - loops--; status = inb(smbus_base + SMBHSTSTAT); - if (status & (SMBHSTSTS_FAILED | /* FAILED */ - SMBHSTSTS_BUS_ERR | /* BUS ERR */ - SMBHSTSTS_DEV_ERR)) /* DEV ERR */ - return SMBUS_ERROR; if (status & SMBHSTSTS_BYTE_DONE) { @@ -394,13 +397,21 @@ smbus_base + SMBHSTCTL); } - outb(status, smbus_base + SMBHSTSTAT); + outb(SMBHSTSTS_BYTE_DONE, smbus_base + SMBHSTSTAT); } - } while ((status & SMBHSTSTS_HOST_BUSY) && loops); + } while (--loops && !host_completed(status)); dprintk("%s: status = %02x, len = %d / %d, loops = %d\n", __func__, status, bytes_read, bytes, loops); + if (loops == 0) + return recover_master(smbus_base, + SMBUS_WAIT_UNTIL_DONE_TIMEOUT); + + ret = cb_err_from_stat(status); + if (ret < 0) + return ret; + if (bytes_read < bytes) return SMBUS_ERROR; -- To view, visit https://review.coreboot.org/c/coreboot/+/21120 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Idea15e03edde7aeedf198c1529f09c24a5bc0b06 Gerrit-Change-Number: 21120 Gerrit-PatchSet: 11 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com> 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

1 0

Change in ...coreboot[master]: sb/intel/common: SMBus execute_command()
by Patrick Georgi (Code Review) 24 Jan '19

24 Jan '19

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/21119 ) Change subject: sb/intel/common: SMBus execute_command() ...................................................................... sb/intel/common: SMBus execute_command() Implement the common start of transaction. Fixes a problem where smbus_wait_until_active() can miss SMBHSTSTS_HOST_BUSY being set, if transaction completes very fast. Or if we are single-stepping or executing under SerialIce emulation. Change-Id: Icb27d7d6a1c54968950ca292dbae05415f97e461 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/21119 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/southbridge/intel/common/smbus.c 1 file changed, 37 insertions(+), 40 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/southbridge/intel/common/smbus.c b/src/southbridge/intel/common/smbus.c index b2a78c9..fb7f8e5 100644 --- a/src/southbridge/intel/common/smbus.c +++ b/src/southbridge/intel/common/smbus.c @@ -101,19 +101,31 @@ return 0; } -static int smbus_wait_until_active(u16 smbus_base) +static int execute_command(unsigned int smbus_base) { - unsigned long loops; - loops = SMBUS_TIMEOUT; + unsigned int loops = SMBUS_TIMEOUT; + u8 status; + + /* Start the command. */ + outb((inb(smbus_base + SMBHSTCTL) | SMBHSTCNT_START), + smbus_base + SMBHSTCTL); + + /* Poll for it to start. */ do { - unsigned char val; smbus_delay(); - val = inb(smbus_base + SMBHSTSTAT); - if ((val & SMBHSTSTS_HOST_BUSY)) { - break; - } - } while (--loops); - return loops ? 0 : -1; + + /* If we poll too slow, we could miss HOST_BUSY flag + * set and detect INTR or x_ERR flags instead here. + */ + status = inb(smbus_base + SMBHSTSTAT); + status &= ~(SMBHSTSTS_SMBALERT_STS | SMBHSTSTS_INUSE_STS); + } while (--loops && status == 0); + + if (loops == 0) + return recover_master(smbus_base, + SMBUS_WAIT_UNTIL_ACTIVE_TIMEOUT); + + return 0; } static int smbus_wait_until_done(u16 smbus_base) @@ -149,12 +161,9 @@ outb(0, smbus_base + SMBHSTDAT0); /* Start the command */ - outb((inb(smbus_base + SMBHSTCTL) | SMBHSTCNT_START), - smbus_base + SMBHSTCTL); - - /* poll for it to start */ - if (smbus_wait_until_active(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_ACTIVE_TIMEOUT; + ret = execute_command(smbus_base); + if (ret < 0) + return ret; /* Poll for transaction completion */ if (smbus_wait_until_done(smbus_base) < 0) @@ -190,12 +199,9 @@ outb(data, smbus_base + SMBHSTDAT0); /* Start the command */ - outb((inb(smbus_base + SMBHSTCTL) | SMBHSTCNT_START), - smbus_base + SMBHSTCTL); - - /* poll for it to start */ - if (smbus_wait_until_active(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_ACTIVE_TIMEOUT; + ret = execute_command(smbus_base); + if (ret < 0) + return ret; /* Poll for transaction completion */ if (smbus_wait_until_done(smbus_base) < 0) @@ -236,12 +242,9 @@ outb(0, smbus_base + SMBHSTDAT0); /* Start the command */ - outb((inb(smbus_base + SMBHSTCTL) | SMBHSTCNT_START), - smbus_base + SMBHSTCTL); - - /* poll for it to start */ - if (smbus_wait_until_active(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_ACTIVE_TIMEOUT; + ret = execute_command(smbus_base); + if (ret < 0) + return ret; /* Poll for transaction completion */ do { @@ -306,12 +309,9 @@ outb(*buf++, smbus_base + SMBBLKDAT); /* Start the command */ - outb((inb(smbus_base + SMBHSTCTL) | SMBHSTCNT_START), - smbus_base + SMBHSTCTL); - - /* poll for it to start */ - if (smbus_wait_until_active(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_ACTIVE_TIMEOUT; + ret = execute_command(smbus_base); + if (ret < 0) + return ret; /* Poll for transaction completion */ do { @@ -367,12 +367,9 @@ outb(offset, smbus_base + SMBHSTDAT1); /* Start the command */ - outb((inb(smbus_base + SMBHSTCTL) | SMBHSTCNT_START), - smbus_base + SMBHSTCTL); - - /* poll for it to start */ - if (smbus_wait_until_active(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_ACTIVE_TIMEOUT; + ret = execute_command(smbus_base); + if (ret < 0) + return ret; /* Poll for transaction completion */ do { -- To view, visit https://review.coreboot.org/c/coreboot/+/21119 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Icb27d7d6a1c54968950ca292dbae05415f97e461 Gerrit-Change-Number: 21119 Gerrit-PatchSet: 11 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com> 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

1 0

Change in ...coreboot[master]: sb/intel/common: SMBus setup_command()
by Patrick Georgi (Code Review) 24 Jan '19

24 Jan '19

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/21118 ) Change subject: sb/intel/common: SMBus setup_command() ...................................................................... sb/intel/common: SMBus setup_command() Implements the common parts of any SMBus transaction with a stub to log and recover (TBD) from timeout errors. Bits in SMBHSTCTL register are no longer preserved between transactions. Change-Id: I7ce14d3e895c30d595a94ce29ce0dc8cf51eb453 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Reviewed-on: https://review.coreboot.org/c/21118 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Arthur Heymans <arthur(a)aheymans.xyz> --- M src/southbridge/intel/common/smbus.c 1 file changed, 84 insertions(+), 93 deletions(-) Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved diff --git a/src/southbridge/intel/common/smbus.c b/src/southbridge/intel/common/smbus.c index de4ff91..b2a78c9 100644 --- a/src/southbridge/intel/common/smbus.c +++ b/src/southbridge/intel/common/smbus.c @@ -53,6 +53,10 @@ #define SMBHSTSTS_INTR (1 << 1) #define SMBHSTSTS_HOST_BUSY (1 << 0) +/* For SMBXMITADD register. */ +#define XMIT_WRITE(dev) (((dev) << 1) | 0) +#define XMIT_READ(dev) (((dev) << 1) | 1) + #define SMBUS_TIMEOUT (10 * 1000 * 100) #define SMBUS_BLOCK_MAXLEN 32 @@ -61,31 +65,40 @@ inb(0x80); } -static int smbus_wait_until_ready(u16 smbus_base) +static int recover_master(int smbus_base, int ret) { - unsigned int loops = SMBUS_TIMEOUT; - unsigned char byte; - do { - smbus_delay(); - if (--loops == 0) - break; - byte = inb(smbus_base + SMBHSTSTAT); - } while (byte & SMBHSTSTS_HOST_BUSY); - return loops ? 0 : -1; + /* TODO: Depending of the failure, drive KILL transaction + * or force soft reset on SMBus master controller. + */ + printk(BIOS_ERR, "SMBus: Fatal master timeout (%d)\n", ret); + return ret; } -static int smbus_wait_until_done(u16 smbus_base) +static int setup_command(unsigned int smbus_base, u8 ctrl, u8 xmitadd) { unsigned int loops = SMBUS_TIMEOUT; - unsigned char byte; + u8 host_busy; + do { smbus_delay(); - if (--loops == 0) - break; - byte = inb(smbus_base + SMBHSTSTAT); - } while ((byte & SMBHSTSTS_HOST_BUSY) - || (byte & ~(SMBHSTSTS_INUSE_STS | SMBHSTSTS_HOST_BUSY)) == 0); - return loops ? 0 : -1; + host_busy = inb(smbus_base + SMBHSTSTAT) & SMBHSTSTS_HOST_BUSY; + } while (--loops && host_busy); + + if (loops == 0) + return recover_master(smbus_base, + SMBUS_WAIT_UNTIL_READY_TIMEOUT); + + /* Clear any lingering errors, so the transaction will run. */ + outb(inb(smbus_base + SMBHSTSTAT), smbus_base + SMBHSTSTAT); + + /* Set up transaction */ + /* Disable interrupts */ + outb(ctrl, (smbus_base + SMBHSTCTL)); + + /* Set the device I'm talking to. */ + outb(xmitadd, smbus_base + SMBXMITADD); + + return 0; } static int smbus_wait_until_active(u16 smbus_base) @@ -103,27 +116,34 @@ return loops ? 0 : -1; } +static int smbus_wait_until_done(u16 smbus_base) +{ + unsigned int loops = SMBUS_TIMEOUT; + unsigned char byte; + do { + smbus_delay(); + if (--loops == 0) + break; + byte = inb(smbus_base + SMBHSTSTAT); + } while ((byte & SMBHSTSTS_HOST_BUSY) + || (byte & ~(SMBHSTSTS_INUSE_STS | SMBHSTSTS_HOST_BUSY)) == 0); + return loops ? 0 : -1; +} + int do_smbus_read_byte(unsigned int smbus_base, u8 device, unsigned int address) { + int ret; unsigned char status; unsigned char byte; - if (smbus_wait_until_ready(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_READY_TIMEOUT; - /* Set up transaction */ - /* Disable interrupts */ - outb(inb(smbus_base + SMBHSTCTL) & ~SMBHSTCNT_INTREN, - smbus_base + SMBHSTCTL); - /* Set the device I'm talking to */ - outb(((device & 0x7f) << 1) | 1, smbus_base + SMBXMITADD); + /* Set up for a byte data read. */ + ret = setup_command(smbus_base, I801_BYTE_DATA, XMIT_READ(device)); + if (ret < 0) + return ret; + /* Set the command/address... */ - outb(address & 0xff, smbus_base + SMBHSTCMD); - /* Set up for a byte data read */ - outb((inb(smbus_base + SMBHSTCTL) & 0xe3) | I801_BYTE_DATA, - (smbus_base + SMBHSTCTL)); - /* Clear any lingering errors, so the transaction will run */ - outb(inb(smbus_base + SMBHSTSTAT), smbus_base + SMBHSTSTAT); + outb(address, smbus_base + SMBHSTCMD); /* Clear the data byte... */ outb(0, smbus_base + SMBHSTDAT0); @@ -156,25 +176,17 @@ unsigned int address, unsigned int data) { unsigned char status; + int ret; - if (smbus_wait_until_ready(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_READY_TIMEOUT; + /* Set up for a byte data write. */ + ret = setup_command(smbus_base, I801_BYTE_DATA, XMIT_WRITE(device)); + if (ret < 0) + return ret; - /* Set up transaction */ - /* Disable interrupts */ - outb(inb(smbus_base + SMBHSTCTL) & ~SMBHSTCNT_INTREN, - smbus_base + SMBHSTCTL); - /* Set the device I'm talking to */ - outb(((device & 0x7f) << 1) & ~0x01, smbus_base + SMBXMITADD); /* Set the command/address... */ - outb(address & 0xff, smbus_base + SMBHSTCMD); - /* Set up for a byte data read */ - outb((inb(smbus_base + SMBHSTCTL) & 0xe3) | I801_BYTE_DATA, - (smbus_base + SMBHSTCTL)); - /* Clear any lingering errors, so the transaction will run */ - outb(inb(smbus_base + SMBHSTSTAT), smbus_base + SMBHSTSTAT); + outb(address, smbus_base + SMBHSTCMD); - /* Clear the data byte... */ + /* Set the data byte... */ outb(data, smbus_base + SMBHSTDAT0); /* Start the command */ @@ -205,27 +217,19 @@ unsigned int max_bytes, u8 *buf) { u8 status; - int slave_bytes; + int ret, slave_bytes; int bytes_read = 0; unsigned int loops = SMBUS_TIMEOUT; - if (smbus_wait_until_ready(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_READY_TIMEOUT; max_bytes = MIN(SMBUS_BLOCK_MAXLEN, max_bytes); - /* Set up transaction */ - /* Disable interrupts */ - outb(inb(smbus_base + SMBHSTCTL) & ~SMBHSTCNT_INTREN, - smbus_base + SMBHSTCTL); - /* Set the device I'm talking to */ - outb(((device & 0x7f) << 1) | 1, smbus_base + SMBXMITADD); + /* Set up for a block data read. */ + ret = setup_command(smbus_base, I801_BLOCK_DATA, XMIT_READ(device)); + if (ret < 0) + return ret; + /* Set the command/address... */ - outb(cmd & 0xff, smbus_base + SMBHSTCMD); - /* Set up for a block data read */ - outb((inb(smbus_base + SMBHSTCTL) & 0xc3) | I801_BLOCK_DATA, - (smbus_base + SMBHSTCTL)); - /* Clear any lingering errors, so the transaction will run */ - outb(inb(smbus_base + SMBHSTSTAT), smbus_base + SMBHSTSTAT); + outb(cmd, smbus_base + SMBHSTCMD); /* Reset number of bytes to transfer so we notice later it * was really updated with the transaction. */ @@ -279,30 +283,21 @@ const unsigned int bytes, const u8 *buf) { u8 status; - int bytes_sent = 0; + int ret, bytes_sent = 0; unsigned int loops = SMBUS_TIMEOUT; if (bytes > SMBUS_BLOCK_MAXLEN) return SMBUS_ERROR; - if (smbus_wait_until_ready(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_READY_TIMEOUT; + /* Set up for a block data write. */ + ret = setup_command(smbus_base, I801_BLOCK_DATA, XMIT_WRITE(device)); + if (ret < 0) + return ret; - /* Set up transaction */ - /* Disable interrupts */ - outb(inb(smbus_base + SMBHSTCTL) & ~SMBHSTCNT_INTREN, - smbus_base + SMBHSTCTL); - /* Set the device I'm talking to */ - outb(((device & 0x7f) << 1) & ~0x01, smbus_base + SMBXMITADD); /* Set the command/address... */ - outb(cmd & 0xff, smbus_base + SMBHSTCMD); - /* Set up for a block data write */ - outb((inb(smbus_base + SMBHSTCTL) & 0xc3) | I801_BLOCK_DATA, - (smbus_base + SMBHSTCTL)); - /* Clear any lingering errors, so the transaction will run */ - outb(inb(smbus_base + SMBHSTSTAT), smbus_base + SMBHSTSTAT); + outb(cmd, smbus_base + SMBHSTCMD); - /* set number of bytes to transfer */ + /* Set number of bytes to transfer. */ outb(bytes, smbus_base + SMBHSTDAT0); /* Send first byte from buffer, bytes_sent increments after @@ -354,27 +349,23 @@ unsigned int offset, const unsigned int bytes, u8 *buf) { u8 status; - int bytes_read = 0; + int ret, bytes_read = 0; unsigned int loops = SMBUS_TIMEOUT; - if (smbus_wait_until_ready(smbus_base) < 0) - return SMBUS_WAIT_UNTIL_READY_TIMEOUT; - /* Set upp transaction */ - /* Disable interrupts */ - outb(inb(smbus_base + SMBHSTCTL) & SMBHSTCNT_INTREN, - smbus_base + SMBHSTCTL); - /* Set the device I'm talking to */ - outb((device & 0x7f) << 1, smbus_base + SMBXMITADD); + /* Set up for a i2c block data read. + * + * FIXME: Address parameter changes to XMIT_READ(device) with + * some revision of PCH. Presumably hardware revisions that + * do not have i2c block write support internally set LSB. + */ + ret = setup_command(smbus_base, I801_I2C_BLOCK_DATA, + XMIT_WRITE(device)); + if (ret < 0) + return ret; /* device offset */ outb(offset, smbus_base + SMBHSTDAT1); - /* Set up for a i2c block data read */ - outb((inb(smbus_base + SMBHSTCTL) & 0xc3) | I801_I2C_BLOCK_DATA, - (smbus_base + SMBHSTCTL)); - - /* Clear any lingering errors, so the transaction will run */ - outb(inb(smbus_base + SMBHSTSTAT), smbus_base + SMBHSTSTAT); /* Start the command */ outb((inb(smbus_base + SMBHSTCTL) | SMBHSTCNT_START), smbus_base + SMBHSTCTL); -- To view, visit https://review.coreboot.org/c/coreboot/+/21118 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I7ce14d3e895c30d595a94ce29ce0dc8cf51eb453 Gerrit-Change-Number: 21118 Gerrit-PatchSet: 11 Gerrit-Owner: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: Kyösti Mälkki <kyosti.malkki(a)gmail.com> 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

1 0

Change in ...coreboot[master]: riscv: add support to select the privilege level of the payload running
by Philipp Hug (Code Review) 24 Jan '19

24 Jan '19

Philipp Hug has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/29494 ) Change subject: riscv: add support to select the privilege level of the payload running ...................................................................... Patch Set 28: I like the refactoring done in this change, but I would not add Kconfigs for the privilege level. This should be determined by the type of payload. Can you drop the Kconfig changes here, leave the refactoring and call the ramstage/rampayload in m-mode and payload in s-mode by default. We should execute bbl as a rampayload. -- To view, visit https://review.coreboot.org/c/coreboot/+/29494 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I96961246cd257b63cf167238aa0cf6e65272b951 Gerrit-Change-Number: 29494 Gerrit-PatchSet: 28 Gerrit-Owner: Xiang Wang <wxjstz(a)126.com> Gerrit-Reviewer: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Philipp Hug <philipp(a)hug.cx> Gerrit-Reviewer: Shawn C <citypw(a)gmail.com> Gerrit-Reviewer: Xiang Wang <wxjstz(a)126.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: ron minnich <rminnich(a)gmail.com> Gerrit-Comment-Date: Thu, 24 Jan 2019 11:44:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in ...coreboot[master]: riscv: ARCH_RISCV_RV{32,64} selects ARCH_RISCV
by ron minnich (Code Review) 24 Jan '19

24 Jan '19

ron minnich has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31042 Change subject: riscv: ARCH_RISCV_RV{32,64} selects ARCH_RISCV ...................................................................... riscv: ARCH_RISCV_RV{32,64} selects ARCH_RISCV ARCH_RISCV_RV{32,64} will now select ARCH_RISCV. Change-Id: Ia7a1a8f0bfab20e91b8429dd6dd3e9a4180a0a5b Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- M src/arch/riscv/Kconfig M src/soc/sifive/fu540/Kconfig M src/soc/ucb/riscv/Kconfig 3 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/42/31042/1 diff --git a/src/arch/riscv/Kconfig b/src/arch/riscv/Kconfig index 5bde804..9d325af 100644 --- a/src/arch/riscv/Kconfig +++ b/src/arch/riscv/Kconfig @@ -40,10 +40,12 @@ config ARCH_RISCV_RV64 bool default n + select ARCH_RISCV config ARCH_RISCV_RV32 bool default n + select ARCH_RISCV config ARCH_RISCV_PMP bool @@ -52,7 +54,6 @@ config ARCH_BOOTBLOCK_RISCV bool default n - select ARCH_RISCV select C_ENVIRONMENT_BOOTBLOCK config ARCH_VERSTAGE_RISCV diff --git a/src/soc/sifive/fu540/Kconfig b/src/soc/sifive/fu540/Kconfig index 7910b37..6ebde33 100644 --- a/src/soc/sifive/fu540/Kconfig +++ b/src/soc/sifive/fu540/Kconfig @@ -13,7 +13,6 @@ config SOC_SIFIVE_FU540 bool - select ARCH_RISCV select ARCH_RISCV_RV64 select ARCH_RISCV_S select ARCH_RISCV_U diff --git a/src/soc/ucb/riscv/Kconfig b/src/soc/ucb/riscv/Kconfig index 5a43aa6..aa352d9 100644 --- a/src/soc/ucb/riscv/Kconfig +++ b/src/soc/ucb/riscv/Kconfig @@ -1,5 +1,4 @@ config SOC_UCB_RISCV - select ARCH_RISCV select ARCH_RISCV_RV64 select ARCH_RISCV_S select ARCH_RISCV_U -- To view, visit https://review.coreboot.org/c/coreboot/+/31042 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia7a1a8f0bfab20e91b8429dd6dd3e9a4180a0a5b Gerrit-Change-Number: 31042 Gerrit-PatchSet: 1 Gerrit-Owner: ron minnich <rminnich(a)gmail.com> Gerrit-MessageType: newchange

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2019