Ronak Kanabar has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32117
Change subject: soc/intel/cannonlake: Vmx support based on Kconfig ......................................................................
soc/intel/cannonlake: Vmx support based on Kconfig
Change VmxEnable UPD values based on Kconfig ENABLE_VMX and remove it from Devicetree.
Change-Id: I4180c2270038a28befd6ed53c9485905025a15ba Signed-off-by: Ronak Kanabar ronak.kanabar@intel.com --- M src/mainboard/google/sarien/variants/arcada/devicetree.cb M src/mainboard/google/sarien/variants/sarien/devicetree.cb M src/soc/intel/cannonlake/romstage/fsp_params.c 3 files changed, 1 insertion(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/32117/1
diff --git a/src/mainboard/google/sarien/variants/arcada/devicetree.cb b/src/mainboard/google/sarien/variants/arcada/devicetree.cb index 6f167c2..90b92a7 100644 --- a/src/mainboard/google/sarien/variants/arcada/devicetree.cb +++ b/src/mainboard/google/sarien/variants/arcada/devicetree.cb @@ -22,7 +22,6 @@ register "SataPortsDevSlp[2]" = "1" register "InternalGfx" = "1" register "SkipExtGfxScan" = "1" - register "VmxEnable" = "1" register "PchPmSlpS3MinAssert" = "3" # 50ms register "PchPmSlpS4MinAssert" = "4" # 4s register "PchPmSlpSusMinAssert" = "4" # 4s diff --git a/src/mainboard/google/sarien/variants/sarien/devicetree.cb b/src/mainboard/google/sarien/variants/sarien/devicetree.cb index 2714b60..5b88dfc 100644 --- a/src/mainboard/google/sarien/variants/sarien/devicetree.cb +++ b/src/mainboard/google/sarien/variants/sarien/devicetree.cb @@ -26,7 +26,6 @@ register "SataPortsDevSlp[2]" = "1" register "InternalGfx" = "1" register "SkipExtGfxScan" = "1" - register "VmxEnable" = "1" register "PchPmSlpS3MinAssert" = "3" # 50ms register "PchPmSlpS4MinAssert" = "4" # 4s register "PchPmSlpSusMinAssert" = "4" # 4s diff --git a/src/soc/intel/cannonlake/romstage/fsp_params.c b/src/soc/intel/cannonlake/romstage/fsp_params.c index ffdcee4..235cda8 100644 --- a/src/soc/intel/cannonlake/romstage/fsp_params.c +++ b/src/soc/intel/cannonlake/romstage/fsp_params.c @@ -65,7 +65,7 @@ if (config->VtdDisable) m_cfg->VmxEnable = 0; else - m_cfg->VmxEnable = config->VmxEnable; + m_cfg->VmxEnable = CONFIG(ENABLE_VMX);
#if CONFIG(SOC_INTEL_COMMON_CANNONLAKE_BASE) m_cfg->SkipMpInit = !CONFIG_USE_INTEL_FSP_MP_INIT;
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Vmx support based on Kconfig ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/32117/2/src/soc/intel/cannonlake/romstage/fs... File src/soc/intel/cannonlake/romstage/fsp_params.c:
https://review.coreboot.org/#/c/32117/2/src/soc/intel/cannonlake/romstage/fs... PS2, Line 64: /* Disable Vmx if Vt-d is already disabled */ Where does this dependency come from? What does the chip.h `VtdDisable` actually do?
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Vmx support based on Kconfig ......................................................................
Patch Set 2:
(2 comments)
https://review.coreboot.org/#/c/32117/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/#/c/32117/2//COMMIT_MSG@7 PS2, Line 7: soc/intel/cannonlake: Vmx support based on Kconfig Please use a statement by adding a verb (in imperative mood):
Add Vmx support based on Kconfig
Integrate Vmx support in Kconfig
Configure Vmx support using Kconfig
https://review.coreboot.org/#/c/32117/2//COMMIT_MSG@10 PS2, Line 10: Devicetree devicetree
Rizwan Qureshi has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Vmx support based on Kconfig ......................................................................
Patch Set 2:
(1 comment)
https://review.coreboot.org/#/c/32117/2/src/soc/intel/cannonlake/romstage/fs... File src/soc/intel/cannonlake/romstage/fsp_params.c:
https://review.coreboot.org/#/c/32117/2/src/soc/intel/cannonlake/romstage/fs... PS2, Line 64: /* Disable Vmx if Vt-d is already disabled */
Where does this dependency come from? What does the chip.h […]
VT-d is a separate feature from Vmx. Ideally VT-d (Virtualization Technology for Directed I/O) can be used only when VMx is enabled. This check should be removed, or rather enabling/disabling VT-d should be dependent on Vmx being enabled/disabled.
Hello Patrick Rudolph, Subrata Banik, Aamir Bohra, Maulik V Vaghela, Rizwan Qureshi, V Sowmya, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32117
to look at the new patch set (#3).
Change subject: soc/intel/cannonlake: Configure Vmx support using Kconfig ......................................................................
soc/intel/cannonlake: Configure Vmx support using Kconfig
Change VmxEnable UPD values based on Kconfig ENABLE_VMX and remove it from Devicetree and chip.h
Remove Vmx dependency on Vt-d
Change-Id: I4180c2270038a28befd6ed53c9485905025a15ba Signed-off-by: Ronak Kanabar ronak.kanabar@intel.com --- M src/mainboard/google/sarien/variants/arcada/devicetree.cb M src/mainboard/google/sarien/variants/sarien/devicetree.cb M src/soc/intel/cannonlake/chip.h M src/soc/intel/cannonlake/romstage/fsp_params.c 4 files changed, 2 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/32117/3
build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Configure Vmx support using Kconfig ......................................................................
Patch Set 3:
(1 comment)
https://review.coreboot.org/#/c/32117/3/src/soc/intel/cannonlake/romstage/fs... File src/soc/intel/cannonlake/romstage/fsp_params.c:
https://review.coreboot.org/#/c/32117/3/src/soc/intel/cannonlake/romstage/fs... PS3, Line 64: /* Change VmxEnable UPD value accoding to ENABLE_VMX Kconfig */ 'accoding' may be misspelled - perhaps 'according'?
Hello Patrick Rudolph, Subrata Banik, Aamir Bohra, Maulik V Vaghela, Rizwan Qureshi, V Sowmya, build bot (Jenkins), Furquan Shaikh,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32117
to look at the new patch set (#4).
Change subject: soc/intel/cannonlake: Configure Vmx support using Kconfig ......................................................................
soc/intel/cannonlake: Configure Vmx support using Kconfig
Change VmxEnable UPD values based on Kconfig ENABLE_VMX and remove it from Devicetree and chip.h
Remove Vmx dependency on Vt-d
Change-Id: I4180c2270038a28befd6ed53c9485905025a15ba Signed-off-by: Ronak Kanabar ronak.kanabar@intel.com --- M src/mainboard/google/sarien/variants/arcada/devicetree.cb M src/mainboard/google/sarien/variants/sarien/devicetree.cb M src/soc/intel/cannonlake/chip.h M src/soc/intel/cannonlake/romstage/fsp_params.c 4 files changed, 2 insertions(+), 8 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/17/32117/4
Ronak Kanabar has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Configure Vmx support using Kconfig ......................................................................
Patch Set 4:
(4 comments)
https://review.coreboot.org/#/c/32117/2//COMMIT_MSG Commit Message:
https://review.coreboot.org/#/c/32117/2//COMMIT_MSG@7 PS2, Line 7: soc/intel/cannonlake: Vmx support based on Kconfig
Please use a statement by adding a verb (in imperative mood): […]
done
https://review.coreboot.org/#/c/32117/2//COMMIT_MSG@10 PS2, Line 10: Devicetree
devicetree
done
https://review.coreboot.org/#/c/32117/2/src/soc/intel/cannonlake/romstage/fs... File src/soc/intel/cannonlake/romstage/fsp_params.c:
https://review.coreboot.org/#/c/32117/2/src/soc/intel/cannonlake/romstage/fs... PS2, Line 64: /* Disable Vmx if Vt-d is already disabled */
VT-d is a separate feature from Vmx. […]
Patch set 4 I removed Vmx dependency on VTD.
https://review.coreboot.org/#/c/32117/3/src/soc/intel/cannonlake/romstage/fs... File src/soc/intel/cannonlake/romstage/fsp_params.c:
https://review.coreboot.org/#/c/32117/3/src/soc/intel/cannonlake/romstage/fs... PS3, Line 64: /* Change VmxEnable UPD value accoding to ENABLE_VMX Kconfig */
'accoding' may be misspelled - perhaps 'according'?
done
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Configure Vmx support using Kconfig ......................................................................
Patch Set 4: Code-Review+2
Lijian Zhao has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Configure Vmx support using Kconfig ......................................................................
Patch Set 5: Code-Review+2
Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Configure Vmx support using Kconfig ......................................................................
Patch Set 5: Code-Review+2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Configure Vmx support using Kconfig ......................................................................
Patch Set 5: Code-Review+2
Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32117 )
Change subject: soc/intel/cannonlake: Configure Vmx support using Kconfig ......................................................................
soc/intel/cannonlake: Configure Vmx support using Kconfig
Change VmxEnable UPD values based on Kconfig ENABLE_VMX and remove it from Devicetree and chip.h
Remove Vmx dependency on Vt-d
Change-Id: I4180c2270038a28befd6ed53c9485905025a15ba Signed-off-by: Ronak Kanabar ronak.kanabar@intel.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/32117 Reviewed-by: Lijian Zhao lijian.zhao@intel.com Reviewed-by: Furquan Shaikh furquan@google.com Reviewed-by: Nico Huber nico.h@gmx.de Reviewed-by: Patrick Rudolph siro@das-labor.org Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/mainboard/google/sarien/variants/arcada/devicetree.cb M src/mainboard/google/sarien/variants/sarien/devicetree.cb M src/soc/intel/cannonlake/chip.h M src/soc/intel/cannonlake/romstage/fsp_params.c 4 files changed, 2 insertions(+), 8 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Furquan Shaikh: Looks good to me, approved Patrick Rudolph: Looks good to me, approved Lijian Zhao: Looks good to me, approved
diff --git a/src/mainboard/google/sarien/variants/arcada/devicetree.cb b/src/mainboard/google/sarien/variants/arcada/devicetree.cb index 1507214..9ecbf00 100644 --- a/src/mainboard/google/sarien/variants/arcada/devicetree.cb +++ b/src/mainboard/google/sarien/variants/arcada/devicetree.cb @@ -22,7 +22,6 @@ register "SataPortsDevSlp[2]" = "1" register "InternalGfx" = "1" register "SkipExtGfxScan" = "1" - register "VmxEnable" = "1" register "PchPmSlpS3MinAssert" = "3" # 50ms register "PchPmSlpS4MinAssert" = "4" # 4s register "PchPmSlpSusMinAssert" = "4" # 4s diff --git a/src/mainboard/google/sarien/variants/sarien/devicetree.cb b/src/mainboard/google/sarien/variants/sarien/devicetree.cb index e4a92a9..625655b 100644 --- a/src/mainboard/google/sarien/variants/sarien/devicetree.cb +++ b/src/mainboard/google/sarien/variants/sarien/devicetree.cb @@ -26,7 +26,6 @@ register "SataPortsDevSlp[2]" = "1" register "InternalGfx" = "1" register "SkipExtGfxScan" = "1" - register "VmxEnable" = "1" register "PchPmSlpS3MinAssert" = "3" # 50ms register "PchPmSlpS4MinAssert" = "4" # 4s register "PchPmSlpSusMinAssert" = "4" # 4s diff --git a/src/soc/intel/cannonlake/chip.h b/src/soc/intel/cannonlake/chip.h index 7461d78..58b540c 100644 --- a/src/soc/intel/cannonlake/chip.h +++ b/src/soc/intel/cannonlake/chip.h @@ -354,7 +354,6 @@
/* Intel VT configuration */ uint8_t VtdDisable; - uint8_t VmxEnable;
/* * Acoustic Noise Mitigation diff --git a/src/soc/intel/cannonlake/romstage/fsp_params.c b/src/soc/intel/cannonlake/romstage/fsp_params.c index 4545f52..2ad2c93 100644 --- a/src/soc/intel/cannonlake/romstage/fsp_params.c +++ b/src/soc/intel/cannonlake/romstage/fsp_params.c @@ -61,11 +61,8 @@ m_cfg->PcdDebugInterfaceFlags = CONFIG(DRIVERS_UART_8250IO) ? 0x02 : 0x10;
- /* Disable Vmx if Vt-d is already disabled */ - if (config->VtdDisable) - m_cfg->VmxEnable = 0; - else - m_cfg->VmxEnable = config->VmxEnable; + /* Change VmxEnable UPD value according to ENABLE_VMX Kconfig */ + m_cfg->VmxEnable = CONFIG(ENABLE_VMX);
#if CONFIG(SOC_INTEL_COMMON_CANNONLAKE_BASE) if (CONFIG(USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI))
-
build bot (Jenkins) (Code Review) -
Furquan Shaikh (Code Review)
-
Lijian Zhao (Code Review)
-
Nico Huber (Code Review)
-
Patrick Rudolph (Code Review)
-
Paul Menzel (Code Review)
-
Rizwan Qureshi (Code Review)
-
Ronak Kanabar (Code Review)