Re: [edk2-devel] [edk2-platforms/devel-MinPlatform][PATCH 3/5] LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem
Hi, For me it looks good also, I do not see any change that will not allow to call WS ME on reset (as we currently have for Workstation). BR Adam > -Original Message- > From: Piwko, Maciej > Sent: Wednesday, April 24, 2019 3:45 PM > To: Gao, Zhichao ; Bu, Daocheng > ; devel@edk2.groups.io; Kwolek, Adam > > Cc: Oram, Isaac W ; Gao, Liming > > Subject: RE: [edk2-platforms/devel-MinPlatform][PATCH 3/5] > LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem > > Hi, > > For me the change seems fine. > The only concern that I have may be related to the fact, the resetting the > system we may also want to inform the ME engine about that fact and choose > proper reset type. > I'm adding Adam, who can comment on the reset functionality from ME > UEFIFW perspective. > > Adam, could you also look at this change? > > Thanks, > Maciej > > > -Original Message- > From: Gao, Zhichao > Sent: Monday, April 22, 2019 4:50 AM > To: Bu, Daocheng ; devel@edk2.groups.io > Cc: Piwko, Maciej ; Oram, Isaac W > ; Gao, Liming > Subject: RE: [edk2-platforms/devel-MinPlatform][PATCH 3/5] > LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem > > Hi, > > I didn't receive any comments with this patch yet. Maybe you missed this > email. > The new added function is only a few part of the ResetSystemRuntimeDxe to > provide the reset function. > As I know, platforms always have their own ResetSystemLib instance and do > not use the instance in MdeModulePkg. > While the platform contains a driver base on the new interface(the driver may > be in the edk2 repo), the driver would not find the interface's implement and > cause a link error. > I suggest all platform code should update it to avoid the link error if the > platform is working with the edk2 master repo. > > Thanks, > Zhichao > > > -Original Message- > > From: Bu, Daocheng > > Sent: Monday, April 15, 2019 3:56 PM > > To: Gao, Zhichao ; devel@edk2.groups.io > > Cc: Piwko, Maciej ; Oram, Isaac W > > ; Gao, Liming > > Subject: RE: [edk2-platforms/devel-MinPlatform][PATCH 3/5] > > LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem > > > > > > Hi Maciej, > > > > Please help review this code from PCH perspective. > > If you approve this change , please also help cherry pick this change > > to ServerSiliconPkg\Pch\SouthClusterLbg pkg @10nm trunk. > > > > Thanks, > > Amos > > > > UEFI FW, IAFW or System Firmware is more generic & accurate it's not > > BIOS anymore! > > > > -Original Message- > > From: Gao, Zhichao > > Sent: Monday, April 15, 2019 11:08 AM > > To: devel@edk2.groups.io > > Cc: Piwko, Maciej ; Bu, Daocheng > > ; Oram, Isaac W ; Gao, > > Liming > > Subject: [edk2-platforms/devel-MinPlatform][PATCH 3/5] > > LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1460 > > > > Add a new API ResetSystem to this ResetSystemLib instance. > > It only adds the basic functions from ResetSystemRuntimeDxe. > > Lacking of this interface may cause link error, if some drivers use > > this new API and link to this library instance. > > Make the ResetPlatformSpecific's parameters same with the interface in > > Edk2 repo. > > Notes: > > This library API only provide a basic function of reset. If the > > consumers want full functions, they should use the instance in the > > MdeModulePkg and make sure the depex driver is dispatched. > > > > Cc: "Piwko, Maciej" > > Cc: "Bu, Daocheng" > > Cc: "Oram, Isaac W" > > Cc: Liming Gao > > Signed-off-by: Zhichao Gao > > --- > > .../DxeRuntimeResetSystemLib/PchReset.c | 47 +-- > > 1 file changed, 44 insertions(+), 3 deletions(-) > > > > diff --git > > a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset. > > c > > b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset. > > c > > index cdc0f19c17..673f42e72c 100644 > > --- > > a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset. > > c > > +++ > > b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchRes > > +++ et.c > > @@ -1,6 +1,6 @@ > > /** @file > > > > -Copyright (c) 2018, Intel Corporation. All rights reserved. > > +Copyright (c) 2018 - 2019, Intel Corporation. All rights > > +reserved. > > This program and the accompanying materials are licensed and made > > available under the terms and conditions of the BSD License that > > accompanies this distribution. > > The full text of the license may be found at @@ -255,7 +255,6 @@ > > ResetShutdown ( > > /** > >Calling this function causes the system to enter a power state for > > platform specific. > > > > - @param[in] ResetStatus The status code for the reset. > >@param[in] DataSize The size of ResetData in bytes. > >@param[in] ResetDataOptional element used to introduce a > platform > > specific reset. > >The exact type of t
Re: [edk2-devel] [edk2-platforms/devel-MinPlatform][PATCH 3/5] LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem
Hi, For me the change seems fine. The only concern that I have may be related to the fact, the resetting the system we may also want to inform the ME engine about that fact and choose proper reset type. I'm adding Adam, who can comment on the reset functionality from ME UEFIFW perspective. Adam, could you also look at this change? Thanks, Maciej -Original Message- From: Gao, Zhichao Sent: Monday, April 22, 2019 4:50 AM To: Bu, Daocheng ; devel@edk2.groups.io Cc: Piwko, Maciej ; Oram, Isaac W ; Gao, Liming Subject: RE: [edk2-platforms/devel-MinPlatform][PATCH 3/5] LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem Hi, I didn't receive any comments with this patch yet. Maybe you missed this email. The new added function is only a few part of the ResetSystemRuntimeDxe to provide the reset function. As I know, platforms always have their own ResetSystemLib instance and do not use the instance in MdeModulePkg. While the platform contains a driver base on the new interface(the driver may be in the edk2 repo), the driver would not find the interface's implement and cause a link error. I suggest all platform code should update it to avoid the link error if the platform is working with the edk2 master repo. Thanks, Zhichao > -Original Message- > From: Bu, Daocheng > Sent: Monday, April 15, 2019 3:56 PM > To: Gao, Zhichao ; devel@edk2.groups.io > Cc: Piwko, Maciej ; Oram, Isaac W > ; Gao, Liming > Subject: RE: [edk2-platforms/devel-MinPlatform][PATCH 3/5] > LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem > > > Hi Maciej, > > Please help review this code from PCH perspective. > If you approve this change , please also help cherry pick this change > to ServerSiliconPkg\Pch\SouthClusterLbg pkg @10nm trunk. > > Thanks, > Amos > > UEFI FW, IAFW or System Firmware is more generic & accurate it's not > BIOS anymore! > > -Original Message- > From: Gao, Zhichao > Sent: Monday, April 15, 2019 11:08 AM > To: devel@edk2.groups.io > Cc: Piwko, Maciej ; Bu, Daocheng > ; Oram, Isaac W ; Gao, > Liming > Subject: [edk2-platforms/devel-MinPlatform][PATCH 3/5] > LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1460 > > Add a new API ResetSystem to this ResetSystemLib instance. > It only adds the basic functions from ResetSystemRuntimeDxe. > Lacking of this interface may cause link error, if some drivers use > this new API and link to this library instance. > Make the ResetPlatformSpecific's parameters same with the interface in > Edk2 repo. > Notes: > This library API only provide a basic function of reset. If the > consumers want full functions, they should use the instance in the > MdeModulePkg and make sure the depex driver is dispatched. > > Cc: "Piwko, Maciej" > Cc: "Bu, Daocheng" > Cc: "Oram, Isaac W" > Cc: Liming Gao > Signed-off-by: Zhichao Gao > --- > .../DxeRuntimeResetSystemLib/PchReset.c | 47 +-- > 1 file changed, 44 insertions(+), 3 deletions(-) > > diff --git > a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset. > c > b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset. > c > index cdc0f19c17..673f42e72c 100644 > --- > a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset. > c > +++ > b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchRes > +++ et.c > @@ -1,6 +1,6 @@ > /** @file > > -Copyright (c) 2018, Intel Corporation. All rights reserved. > +Copyright (c) 2018 - 2019, Intel Corporation. All rights > +reserved. > This program and the accompanying materials are licensed and made > available under the terms and conditions of the BSD License that > accompanies this distribution. > The full text of the license may be found at @@ -255,7 +255,6 @@ > ResetShutdown ( > /** >Calling this function causes the system to enter a power state for > platform specific. > > - @param[in] ResetStatus The status code for the reset. >@param[in] DataSize The size of ResetData in bytes. >@param[in] ResetDataOptional element used to introduce a > platform > specific reset. >The exact type of the reset is > defined by the EFI_GUID that follows @@ -265,7 +264,6 @@ ResetShutdown > ( VOID EFIAPI ResetPlatformSpecific ( > - IN EFI_STATUS ResetStatus, >IN UINTNDataSize, >IN VOID *ResetData OPTIONAL >) > @@ -306,6 +304,49 @@ EnterS3WithImmediateWake ( >PchReset (mPchResetInstance, (PCH_RESET_TYPE) EfiResetWarm); } > > +/** > + The ResetSystem function resets the entire platform. > + > + @param[in] ResetType The type of reset to perform. > + @param[in] ResetStatusThe status code for the reset. > + @param[in] DataSize The size, in bytes, of ResetData. > + @param[in] ResetData For a ResetType of EfiResetCold, EfiRese
Re: [edk2-devel] [edk2-platforms/devel-MinPlatform][PATCH 3/5] LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem
Hi, I didn't receive any comments with this patch yet. Maybe you missed this email. The new added function is only a few part of the ResetSystemRuntimeDxe to provide the reset function. As I know, platforms always have their own ResetSystemLib instance and do not use the instance in MdeModulePkg. While the platform contains a driver base on the new interface(the driver may be in the edk2 repo), the driver would not find the interface's implement and cause a link error. I suggest all platform code should update it to avoid the link error if the platform is working with the edk2 master repo. Thanks, Zhichao > -Original Message- > From: Bu, Daocheng > Sent: Monday, April 15, 2019 3:56 PM > To: Gao, Zhichao ; devel@edk2.groups.io > Cc: Piwko, Maciej ; Oram, Isaac W > ; Gao, Liming > Subject: RE: [edk2-platforms/devel-MinPlatform][PATCH 3/5] > LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem > > > Hi Maciej, > > Please help review this code from PCH perspective. > If you approve this change , please also help cherry pick this change to > ServerSiliconPkg\Pch\SouthClusterLbg pkg @10nm trunk. > > Thanks, > Amos > > UEFI FW, IAFW or System Firmware is more generic & accurate it's not BIOS > anymore! > > -Original Message- > From: Gao, Zhichao > Sent: Monday, April 15, 2019 11:08 AM > To: devel@edk2.groups.io > Cc: Piwko, Maciej ; Bu, Daocheng > ; Oram, Isaac W ; Gao, > Liming > Subject: [edk2-platforms/devel-MinPlatform][PATCH 3/5] > LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1460 > > Add a new API ResetSystem to this ResetSystemLib instance. > It only adds the basic functions from ResetSystemRuntimeDxe. > Lacking of this interface may cause link error, if some drivers use this new > API > and link to this library instance. > Make the ResetPlatformSpecific's parameters same with the interface in > Edk2 repo. > Notes: > This library API only provide a basic function of reset. If the consumers want > full functions, they should use the instance in the MdeModulePkg and make > sure the depex driver is dispatched. > > Cc: "Piwko, Maciej" > Cc: "Bu, Daocheng" > Cc: "Oram, Isaac W" > Cc: Liming Gao > Signed-off-by: Zhichao Gao > --- > .../DxeRuntimeResetSystemLib/PchReset.c | 47 +-- > 1 file changed, 44 insertions(+), 3 deletions(-) > > diff --git > a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset. > c > b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset. > c > index cdc0f19c17..673f42e72c 100644 > --- > a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset. > c > +++ > b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchRes > +++ et.c > @@ -1,6 +1,6 @@ > /** @file > > -Copyright (c) 2018, Intel Corporation. All rights reserved. > +Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved. > This program and the accompanying materials are licensed and made > available under the terms and conditions of the BSD License that > accompanies this distribution. > The full text of the license may be found at @@ -255,7 +255,6 @@ > ResetShutdown ( > /** >Calling this function causes the system to enter a power state for platform > specific. > > - @param[in] ResetStatus The status code for the reset. >@param[in] DataSize The size of ResetData in bytes. >@param[in] ResetDataOptional element used to introduce a > platform > specific reset. >The exact type of the reset is defined by > the EFI_GUID that > follows @@ -265,7 +264,6 @@ ResetShutdown ( VOID EFIAPI > ResetPlatformSpecific ( > - IN EFI_STATUS ResetStatus, >IN UINTNDataSize, >IN VOID *ResetData OPTIONAL >) > @@ -306,6 +304,49 @@ EnterS3WithImmediateWake ( >PchReset (mPchResetInstance, (PCH_RESET_TYPE) EfiResetWarm); } > > +/** > + The ResetSystem function resets the entire platform. > + > + @param[in] ResetType The type of reset to perform. > + @param[in] ResetStatusThe status code for the reset. > + @param[in] DataSize The size, in bytes, of ResetData. > + @param[in] ResetData For a ResetType of EfiResetCold, EfiResetWarm, > or EfiResetShutdown > +the data buffer starts with a Null-terminated > string, optionally > +followed by additional binary data. The string > is a description > +that the caller may use to further indicate the > reason for the > +system reset. > +**/ > +VOID > +EFIAPI > +ResetSystem ( > + IN EFI_RESET_TYPE ResetType, > + IN EFI_STATUS ResetStatus, > + IN UINTNDataSize, > + IN VOID *ResetData OPTIONAL > + ) > +{ > + switch (ResetType) { > + case EfiReset
Re: [edk2-devel] [edk2-platforms/devel-MinPlatform][PATCH 3/5] LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem
Hi Maciej, Please help review this code from PCH perspective. If you approve this change , please also help cherry pick this change to ServerSiliconPkg\Pch\SouthClusterLbg pkg @10nm trunk. Thanks, Amos UEFI FW, IAFW or System Firmware is more generic & accurate it's not BIOS anymore! -Original Message- From: Gao, Zhichao Sent: Monday, April 15, 2019 11:08 AM To: devel@edk2.groups.io Cc: Piwko, Maciej ; Bu, Daocheng ; Oram, Isaac W ; Gao, Liming Subject: [edk2-platforms/devel-MinPlatform][PATCH 3/5] LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1460 Add a new API ResetSystem to this ResetSystemLib instance. It only adds the basic functions from ResetSystemRuntimeDxe. Lacking of this interface may cause link error, if some drivers use this new API and link to this library instance. Make the ResetPlatformSpecific's parameters same with the interface in Edk2 repo. Notes: This library API only provide a basic function of reset. If the consumers want full functions, they should use the instance in the MdeModulePkg and make sure the depex driver is dispatched. Cc: "Piwko, Maciej" Cc: "Bu, Daocheng" Cc: "Oram, Isaac W" Cc: Liming Gao Signed-off-by: Zhichao Gao --- .../DxeRuntimeResetSystemLib/PchReset.c | 47 +-- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c index cdc0f19c17..673f42e72c 100644 --- a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c +++ b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchRes +++ et.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2018, Intel Corporation. All rights reserved. +Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at @@ -255,7 +255,6 @@ ResetShutdown ( /** Calling this function causes the system to enter a power state for platform specific. - @param[in] ResetStatus The status code for the reset. @param[in] DataSize The size of ResetData in bytes. @param[in] ResetDataOptional element used to introduce a platform specific reset. The exact type of the reset is defined by the EFI_GUID that follows @@ -265,7 +264,6 @@ ResetShutdown ( VOID EFIAPI ResetPlatformSpecific ( - IN EFI_STATUS ResetStatus, IN UINTNDataSize, IN VOID *ResetData OPTIONAL ) @@ -306,6 +304,49 @@ EnterS3WithImmediateWake ( PchReset (mPchResetInstance, (PCH_RESET_TYPE) EfiResetWarm); } +/** + The ResetSystem function resets the entire platform. + + @param[in] ResetType The type of reset to perform. + @param[in] ResetStatusThe status code for the reset. + @param[in] DataSize The size, in bytes, of ResetData. + @param[in] ResetData For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown +the data buffer starts with a Null-terminated string, optionally +followed by additional binary data. The string is a description +that the caller may use to further indicate the reason for the +system reset. +**/ +VOID +EFIAPI +ResetSystem ( + IN EFI_RESET_TYPE ResetType, + IN EFI_STATUS ResetStatus, + IN UINTNDataSize, + IN VOID *ResetData OPTIONAL + ) +{ + switch (ResetType) { + case EfiResetWarm: +ResetWarm (); +break; + + case EfiResetCold: +ResetCold (); +break; + + case EfiResetShutdown: +ResetShutdown (); +return ; + + case EfiResetPlatformSpecific: +ResetPlatformSpecific (DataSize, ResetData); +return; + + default: +return ; + } +} + /** PchReset Runtime DXE Driver Entry Point\n - Introduction\n -- 2.21.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39085): https://edk2.groups.io/g/devel/message/39085 Mute This Topic: https://groups.io/mt/31137370/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
[edk2-devel] [edk2-platforms/devel-MinPlatform][PATCH 3/5] LewisburgPkg/DxeRuntimeResetSystemLib: Add a new API ResetSystem
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1460 Add a new API ResetSystem to this ResetSystemLib instance. It only adds the basic functions from ResetSystemRuntimeDxe. Lacking of this interface may cause link error, if some drivers use this new API and link to this library instance. Make the ResetPlatformSpecific's parameters same with the interface in Edk2 repo. Notes: This library API only provide a basic function of reset. If the consumers want full functions, they should use the instance in the MdeModulePkg and make sure the depex driver is dispatched. Cc: "Piwko, Maciej" Cc: "Bu, Daocheng" Cc: "Oram, Isaac W" Cc: Liming Gao Signed-off-by: Zhichao Gao --- .../DxeRuntimeResetSystemLib/PchReset.c | 47 +-- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c index cdc0f19c17..673f42e72c 100644 --- a/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c +++ b/Silicon/Intel/LewisburgPkg/Library/DxeRuntimeResetSystemLib/PchReset.c @@ -1,6 +1,6 @@ /** @file -Copyright (c) 2018, Intel Corporation. All rights reserved. +Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved. This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. The full text of the license may be found at @@ -255,7 +255,6 @@ ResetShutdown ( /** Calling this function causes the system to enter a power state for platform specific. - @param[in] ResetStatus The status code for the reset. @param[in] DataSize The size of ResetData in bytes. @param[in] ResetDataOptional element used to introduce a platform specific reset. The exact type of the reset is defined by the EFI_GUID that follows @@ -265,7 +264,6 @@ ResetShutdown ( VOID EFIAPI ResetPlatformSpecific ( - IN EFI_STATUS ResetStatus, IN UINTNDataSize, IN VOID *ResetData OPTIONAL ) @@ -306,6 +304,49 @@ EnterS3WithImmediateWake ( PchReset (mPchResetInstance, (PCH_RESET_TYPE) EfiResetWarm); } +/** + The ResetSystem function resets the entire platform. + + @param[in] ResetType The type of reset to perform. + @param[in] ResetStatusThe status code for the reset. + @param[in] DataSize The size, in bytes, of ResetData. + @param[in] ResetData For a ResetType of EfiResetCold, EfiResetWarm, or EfiResetShutdown +the data buffer starts with a Null-terminated string, optionally +followed by additional binary data. The string is a description +that the caller may use to further indicate the reason for the +system reset. +**/ +VOID +EFIAPI +ResetSystem ( + IN EFI_RESET_TYPE ResetType, + IN EFI_STATUS ResetStatus, + IN UINTNDataSize, + IN VOID *ResetData OPTIONAL + ) +{ + switch (ResetType) { + case EfiResetWarm: +ResetWarm (); +break; + + case EfiResetCold: +ResetCold (); +break; + + case EfiResetShutdown: +ResetShutdown (); +return ; + + case EfiResetPlatformSpecific: +ResetPlatformSpecific (DataSize, ResetData); +return; + + default: +return ; + } +} + /** PchReset Runtime DXE Driver Entry Point\n - Introduction\n -- 2.21.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#39051): https://edk2.groups.io/g/devel/message/39051 Mute This Topic: https://groups.io/mt/31137370/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-