| Message ID | 20190409110844.14746-4-anthony.perard@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Specific platform to run OVMF in Xen PVH and HVM guests | expand |
On 04/09/19 13:08, Anthony PERARD wrote: > Copy of OvmfPkg/ResetVector, with one changes: > - SEC_DEFAULT_CR0: enable cache (bit 30 or CD set to 0) > > Xen copies the OVMF code to RAM, there is no need to disable cache. > > This new module will later be modified to add a new entry point, more > detail in a following commit "OvmfPkg/XenResetVector: Add new entry point > for Xen PVH" OK. The present patch in itself is a bit too heavy (two files are copied for no apparent reason -- they don't see any real changes here), so one might be tempted to suggest "create XenResetVector.inf in the currently existing directory, for sharing more source code". But the above paragraph explains why a full copy is justified / desirable. > Value FILE_GUID of XenResetVector have not changed compare to ResetVector > because it is a special value. (1) Yes, please mention "gEfiFirmwareVolumeTopFileGuid" here. With that commit message update: Reviewed-by: Laszlo Ersek <lersek@redhat.com> Thanks, Laszlo > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> > --- > OvmfPkg/XenOvmf.dsc | 2 +- > OvmfPkg/XenOvmf.fdf | 2 +- > OvmfPkg/{ResetVector/ResetVector.inf => XenResetVector/XenResetVector.inf} | 5 +++-- > {UefiCpuPkg/ResetVector/Vtf0 => OvmfPkg/XenResetVector}/Ia16/Real16ToFlat32.asm | 4 +++- > OvmfPkg/{ResetVector => XenResetVector}/Ia32/PageTables64.asm | 2 ++ > OvmfPkg/{ResetVector/ResetVector.nasmb => XenResetVector/XenResetVector.nasmb} | 2 ++ > 6 files changed, 12 insertions(+), 5 deletions(-) > > diff --git a/OvmfPkg/XenOvmf.dsc b/OvmfPkg/XenOvmf.dsc > index bfe9190735..6161133fa8 100644 > --- a/OvmfPkg/XenOvmf.dsc > +++ b/OvmfPkg/XenOvmf.dsc > @@ -503,7 +503,7 @@ [PcdsDynamicDefault] > # > ################################################################################ > [Components] > - OvmfPkg/ResetVector/ResetVector.inf > + OvmfPkg/XenResetVector/XenResetVector.inf > > # > # SEC Phase modules > diff --git a/OvmfPkg/XenOvmf.fdf b/OvmfPkg/XenOvmf.fdf > index 612ffb2e01..292cf4b492 100644 > --- a/OvmfPkg/XenOvmf.fdf > +++ b/OvmfPkg/XenOvmf.fdf > @@ -124,7 +124,7 @@ [FV.SECFV] > # > INF OvmfPkg/Sec/SecMain.inf > > -INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf > +INF RuleOverride=RESET_VECTOR OvmfPkg/XenResetVector/XenResetVector.inf > > ################################################################################ > [FV.PEIFV] > diff --git a/OvmfPkg/ResetVector/ResetVector.inf b/OvmfPkg/XenResetVector/XenResetVector.inf > similarity index 88% > copy from OvmfPkg/ResetVector/ResetVector.inf > copy to OvmfPkg/XenResetVector/XenResetVector.inf > index d1e5d4d9bd..5c05f02285 100644 > --- a/OvmfPkg/ResetVector/ResetVector.inf > +++ b/OvmfPkg/XenResetVector/XenResetVector.inf > @@ -2,6 +2,7 @@ > # Reset Vector > # > # Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> > +# Copyright (c) 2019, Citrix Systems, Inc. > # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the BSD License > @@ -14,7 +15,7 @@ > > [Defines] > INF_VERSION = 0x00010005 > - BASE_NAME = ResetVector > + BASE_NAME = XenResetVector > FILE_GUID = 1BA0062E-C779-4582-8566-336AE8F78F09 > MODULE_TYPE = SEC > VERSION_STRING = 1.1 > @@ -26,7 +27,7 @@ [Defines] > # > > [Sources] > - ResetVector.nasmb > + XenResetVector.nasmb > > [Packages] > OvmfPkg/OvmfPkg.dec > diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm b/OvmfPkg/XenResetVector/Ia16/Real16ToFlat32.asm > similarity index 94% > copy from UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm > copy to OvmfPkg/XenResetVector/Ia16/Real16ToFlat32.asm > index bc68c8dd74..e22e92c8a6 100644 > --- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm > +++ b/OvmfPkg/XenResetVector/Ia16/Real16ToFlat32.asm > @@ -3,6 +3,8 @@ > ; Transition from 16 bit real mode into 32 bit flat protected mode > ; > ; Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR> > +; Copyright (c) 2019, Citrix Systems, Inc. > +; > ; This program and the accompanying materials > ; are licensed and made available under the terms and conditions of the BSD License > ; which accompanies this distribution. The full text of the license may be found at > @@ -13,7 +15,7 @@ > ; > ;------------------------------------------------------------------------------ > > -%define SEC_DEFAULT_CR0 0x40000023 > +%define SEC_DEFAULT_CR0 0x00000023 > %define SEC_DEFAULT_CR4 0x640 > > BITS 16 > diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/XenResetVector/Ia32/PageTables64.asm > similarity index 95% > copy from OvmfPkg/ResetVector/Ia32/PageTables64.asm > copy to OvmfPkg/XenResetVector/Ia32/PageTables64.asm > index db1590aedd..ded466031b 100644 > --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm > +++ b/OvmfPkg/XenResetVector/Ia32/PageTables64.asm > @@ -3,6 +3,8 @@ > ; Sets the CR3 register for 64-bit paging > ; > ; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR> > +; Copyright (c) 2019, Citrix Systems, Inc. > +; > ; This program and the accompanying materials > ; are licensed and made available under the terms and conditions of the BSD License > ; which accompanies this distribution. The full text of the license may be found at > diff --git a/OvmfPkg/ResetVector/ResetVector.nasmb b/OvmfPkg/XenResetVector/XenResetVector.nasmb > similarity index 94% > copy from OvmfPkg/ResetVector/ResetVector.nasmb > copy to OvmfPkg/XenResetVector/XenResetVector.nasmb > index 29cbad3677..49f2bab001 100644 > --- a/OvmfPkg/ResetVector/ResetVector.nasmb > +++ b/OvmfPkg/XenResetVector/XenResetVector.nasmb > @@ -3,6 +3,8 @@ > ; This file includes all other code files to assemble the reset vector code > ; > ; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR> > +; Copyright (c) 2019, Citrix Systems, Inc. > +; > ; This program and the accompanying materials > ; are licensed and made available under the terms and conditions of the BSD License > ; which accompanies this distribution. The full text of the license may be found at >
diff --git a/OvmfPkg/XenOvmf.dsc b/OvmfPkg/XenOvmf.dsc index bfe9190735..6161133fa8 100644 --- a/OvmfPkg/XenOvmf.dsc +++ b/OvmfPkg/XenOvmf.dsc @@ -503,7 +503,7 @@ [PcdsDynamicDefault] # ################################################################################ [Components] - OvmfPkg/ResetVector/ResetVector.inf + OvmfPkg/XenResetVector/XenResetVector.inf # # SEC Phase modules diff --git a/OvmfPkg/XenOvmf.fdf b/OvmfPkg/XenOvmf.fdf index 612ffb2e01..292cf4b492 100644 --- a/OvmfPkg/XenOvmf.fdf +++ b/OvmfPkg/XenOvmf.fdf @@ -124,7 +124,7 @@ [FV.SECFV] # INF OvmfPkg/Sec/SecMain.inf -INF RuleOverride=RESET_VECTOR OvmfPkg/ResetVector/ResetVector.inf +INF RuleOverride=RESET_VECTOR OvmfPkg/XenResetVector/XenResetVector.inf ################################################################################ [FV.PEIFV] diff --git a/OvmfPkg/ResetVector/ResetVector.inf b/OvmfPkg/XenResetVector/XenResetVector.inf similarity index 88% copy from OvmfPkg/ResetVector/ResetVector.inf copy to OvmfPkg/XenResetVector/XenResetVector.inf index d1e5d4d9bd..5c05f02285 100644 --- a/OvmfPkg/ResetVector/ResetVector.inf +++ b/OvmfPkg/XenResetVector/XenResetVector.inf @@ -2,6 +2,7 @@ # Reset Vector # # Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR> +# Copyright (c) 2019, Citrix Systems, Inc. # # This program and the accompanying materials # are licensed and made available under the terms and conditions of the BSD License @@ -14,7 +15,7 @@ [Defines] INF_VERSION = 0x00010005 - BASE_NAME = ResetVector + BASE_NAME = XenResetVector FILE_GUID = 1BA0062E-C779-4582-8566-336AE8F78F09 MODULE_TYPE = SEC VERSION_STRING = 1.1 @@ -26,7 +27,7 @@ [Defines] # [Sources] - ResetVector.nasmb + XenResetVector.nasmb [Packages] OvmfPkg/OvmfPkg.dec diff --git a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm b/OvmfPkg/XenResetVector/Ia16/Real16ToFlat32.asm similarity index 94% copy from UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm copy to OvmfPkg/XenResetVector/Ia16/Real16ToFlat32.asm index bc68c8dd74..e22e92c8a6 100644 --- a/UefiCpuPkg/ResetVector/Vtf0/Ia16/Real16ToFlat32.asm +++ b/OvmfPkg/XenResetVector/Ia16/Real16ToFlat32.asm @@ -3,6 +3,8 @@ ; Transition from 16 bit real mode into 32 bit flat protected mode ; ; Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR> +; Copyright (c) 2019, Citrix Systems, Inc. +; ; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BSD License ; which accompanies this distribution. The full text of the license may be found at @@ -13,7 +15,7 @@ ; ;------------------------------------------------------------------------------ -%define SEC_DEFAULT_CR0 0x40000023 +%define SEC_DEFAULT_CR0 0x00000023 %define SEC_DEFAULT_CR4 0x640 BITS 16 diff --git a/OvmfPkg/ResetVector/Ia32/PageTables64.asm b/OvmfPkg/XenResetVector/Ia32/PageTables64.asm similarity index 95% copy from OvmfPkg/ResetVector/Ia32/PageTables64.asm copy to OvmfPkg/XenResetVector/Ia32/PageTables64.asm index db1590aedd..ded466031b 100644 --- a/OvmfPkg/ResetVector/Ia32/PageTables64.asm +++ b/OvmfPkg/XenResetVector/Ia32/PageTables64.asm @@ -3,6 +3,8 @@ ; Sets the CR3 register for 64-bit paging ; ; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR> +; Copyright (c) 2019, Citrix Systems, Inc. +; ; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BSD License ; which accompanies this distribution. The full text of the license may be found at diff --git a/OvmfPkg/ResetVector/ResetVector.nasmb b/OvmfPkg/XenResetVector/XenResetVector.nasmb similarity index 94% copy from OvmfPkg/ResetVector/ResetVector.nasmb copy to OvmfPkg/XenResetVector/XenResetVector.nasmb index 29cbad3677..49f2bab001 100644 --- a/OvmfPkg/ResetVector/ResetVector.nasmb +++ b/OvmfPkg/XenResetVector/XenResetVector.nasmb @@ -3,6 +3,8 @@ ; This file includes all other code files to assemble the reset vector code ; ; Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR> +; Copyright (c) 2019, Citrix Systems, Inc. +; ; This program and the accompanying materials ; are licensed and made available under the terms and conditions of the BSD License ; which accompanies this distribution. The full text of the license may be found at
Copy of OvmfPkg/ResetVector, with one changes: - SEC_DEFAULT_CR0: enable cache (bit 30 or CD set to 0) Xen copies the OVMF code to RAM, there is no need to disable cache. This new module will later be modified to add a new entry point, more detail in a following commit "OvmfPkg/XenResetVector: Add new entry point for Xen PVH" Value FILE_GUID of XenResetVector have not changed compare to ResetVector because it is a special value. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> --- OvmfPkg/XenOvmf.dsc | 2 +- OvmfPkg/XenOvmf.fdf | 2 +- OvmfPkg/{ResetVector/ResetVector.inf => XenResetVector/XenResetVector.inf} | 5 +++-- {UefiCpuPkg/ResetVector/Vtf0 => OvmfPkg/XenResetVector}/Ia16/Real16ToFlat32.asm | 4 +++- OvmfPkg/{ResetVector => XenResetVector}/Ia32/PageTables64.asm | 2 ++ OvmfPkg/{ResetVector/ResetVector.nasmb => XenResetVector/XenResetVector.nasmb} | 2 ++ 6 files changed, 12 insertions(+), 5 deletions(-)