* [PATCH edk2-platforms] Silicon/Fip006Dxe: map NOR_FLASH_INFO FSR flag with instance flag
@ 2017-11-30 18:58 Ard Biesheuvel
2017-12-01 12:59 ` Leif Lindholm
0 siblings, 1 reply; 3+ messages in thread
From: Ard Biesheuvel @ 2017-11-30 18:58 UTC (permalink / raw)
To: edk2-devel; +Cc: leif.lindholm, Pipat Methavanitpong, Ard Biesheuvel
From: Pipat Methavanitpong <methavanitpong.pipat@socionext.com>
Now that we incorporated NorFlashInfoLib into the Fip006Dxe driver,
replace the code that explicitly enables flag status register polling
for Micron NOR flash with a test of the flags field provided by
NorFlashInfoLib, which carries the same information.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Pipat Methavanitpong <methavanitpong.pipat@socionext.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c | 22 +++++++-------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c
index a521b1f3d167..8d6bca8739d0 100644
--- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c
+++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c
@@ -1129,6 +1129,7 @@ NorFlashCreateInstance (
{
EFI_STATUS Status;
NOR_FLASH_INSTANCE* Instance;
+ NOR_FLASH_INFO *FlashInfo;
UINT8 JedecId[3];
ASSERT(NorFlashInstance != NULL);
@@ -1157,23 +1158,15 @@ NorFlashCreateInstance (
NorFlashReset (Instance);
NorFlashReadID (Instance, JedecId);
+ Status = NorFlashGetInfo (JedecId, &FlashInfo, FALSE);
+ if (EFI_ERROR (Status)) {
+ goto FreeInstance;
+ }
- DEBUG_CODE_BEGIN ();
- {
- NOR_FLASH_INFO *FlashInfo;
-
- Status = NorFlashGetInfo (JedecId, &FlashInfo, FALSE);
- if (EFI_ERROR (Status)) {
- goto FreeInstance;
- }
-
- NorFlashPrintInfo (FlashInfo);
- FreePool (FlashInfo);
- }
- DEBUG_CODE_END ();
+ NorFlashPrintInfo (FlashInfo);
Instance->Flags = 0;
- if (JedecId[0] == NOR_FLASH_ID_STMICRO) {
+ if (FlashInfo->Flags & NOR_FLASH_WRITE_FSR) {
Instance->Flags = NOR_FLASH_POLL_FSR;
}
@@ -1198,6 +1191,7 @@ NorFlashCreateInstance (
}
*NorFlashInstance = Instance;
+ FreePool (FlashInfo);
return EFI_SUCCESS;
FreeInstance:
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH edk2-platforms] Silicon/Fip006Dxe: map NOR_FLASH_INFO FSR flag with instance flag
2017-11-30 18:58 [PATCH edk2-platforms] Silicon/Fip006Dxe: map NOR_FLASH_INFO FSR flag with instance flag Ard Biesheuvel
@ 2017-12-01 12:59 ` Leif Lindholm
2017-12-01 17:52 ` Ard Biesheuvel
0 siblings, 1 reply; 3+ messages in thread
From: Leif Lindholm @ 2017-12-01 12:59 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel, Pipat Methavanitpong
On Thu, Nov 30, 2017 at 06:58:28PM +0000, Ard Biesheuvel wrote:
> From: Pipat Methavanitpong <methavanitpong.pipat@socionext.com>
>
> Now that we incorporated NorFlashInfoLib into the Fip006Dxe driver,
> replace the code that explicitly enables flag status register polling
> for Micron NOR flash with a test of the flags field provided by
> NorFlashInfoLib, which carries the same information.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Pipat Methavanitpong <methavanitpong.pipat@socionext.com>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
> Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c | 22 +++++++-------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c
> index a521b1f3d167..8d6bca8739d0 100644
> --- a/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c
> +++ b/Silicon/Socionext/SynQuacer/Drivers/Fip006Dxe/NorFlashDxe.c
> @@ -1129,6 +1129,7 @@ NorFlashCreateInstance (
> {
> EFI_STATUS Status;
> NOR_FLASH_INSTANCE* Instance;
> + NOR_FLASH_INFO *FlashInfo;
> UINT8 JedecId[3];
>
> ASSERT(NorFlashInstance != NULL);
> @@ -1157,23 +1158,15 @@ NorFlashCreateInstance (
> NorFlashReset (Instance);
>
> NorFlashReadID (Instance, JedecId);
> + Status = NorFlashGetInfo (JedecId, &FlashInfo, FALSE);
> + if (EFI_ERROR (Status)) {
> + goto FreeInstance;
> + }
>
> - DEBUG_CODE_BEGIN ();
> - {
> - NOR_FLASH_INFO *FlashInfo;
> -
> - Status = NorFlashGetInfo (JedecId, &FlashInfo, FALSE);
> - if (EFI_ERROR (Status)) {
> - goto FreeInstance;
> - }
> -
> - NorFlashPrintInfo (FlashInfo);
> - FreePool (FlashInfo);
> - }
> - DEBUG_CODE_END ();
> + NorFlashPrintInfo (FlashInfo);
>
> Instance->Flags = 0;
> - if (JedecId[0] == NOR_FLASH_ID_STMICRO) {
> + if (FlashInfo->Flags & NOR_FLASH_WRITE_FSR) {
> Instance->Flags = NOR_FLASH_POLL_FSR;
> }
>
> @@ -1198,6 +1191,7 @@ NorFlashCreateInstance (
> }
>
> *NorFlashInstance = Instance;
> + FreePool (FlashInfo);
> return EFI_SUCCESS;
>
> FreeInstance:
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH edk2-platforms] Silicon/Fip006Dxe: map NOR_FLASH_INFO FSR flag with instance flag
2017-12-01 12:59 ` Leif Lindholm
@ 2017-12-01 17:52 ` Ard Biesheuvel
0 siblings, 0 replies; 3+ messages in thread
From: Ard Biesheuvel @ 2017-12-01 17:52 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org, Pipat Methavanitpong
On 1 December 2017 at 12:59, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> On Thu, Nov 30, 2017 at 06:58:28PM +0000, Ard Biesheuvel wrote:
>> From: Pipat Methavanitpong <methavanitpong.pipat@socionext.com>
>>
>> Now that we incorporated NorFlashInfoLib into the Fip006Dxe driver,
>> replace the code that explicitly enables flag status register polling
>> for Micron NOR flash with a test of the flags field provided by
>> NorFlashInfoLib, which carries the same information.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.1
>> Signed-off-by: Pipat Methavanitpong <methavanitpong.pipat@socionext.com>
>> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
>
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>
Thanks. Pushed as bfde902ae7bf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-01 17:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-30 18:58 [PATCH edk2-platforms] Silicon/Fip006Dxe: map NOR_FLASH_INFO FSR flag with instance flag Ard Biesheuvel
2017-12-01 12:59 ` Leif Lindholm
2017-12-01 17:52 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox