[PATCH 2/2] bsps/nand: Update Xilinx NAND driver
Gedare Bloom
gedare at rtems.org
Mon Jan 30 15:23:41 UTC 2023
ok to these two
On Thu, Jan 26, 2023 at 11:31 AM Kinsey Moore <kinsey.moore at oarcorp.com> wrote:
>
> This resovles gcc warnings by updating to the latest Xilinx NAND
> controller driver.
> ---
> bsps/include/dev/nand/xnandpsu.h | 4 +++-
> bsps/include/dev/nand/xnandpsu_bbm.h | 2 +-
> bsps/include/dev/nand/xnandpsu_hw.h | 2 +-
> bsps/include/dev/nand/xnandpsu_onfi.h | 2 +-
> bsps/shared/dev/nand/VERSION | 22 +++++++++++++---------
> bsps/shared/dev/nand/xnandpsu.c | 14 ++++++++------
> bsps/shared/dev/nand/xnandpsu_bbm.c | 2 +-
> bsps/shared/dev/nand/xnandpsu_onfi.c | 2 +-
> 8 files changed, 29 insertions(+), 21 deletions(-)
>
> diff --git a/bsps/include/dev/nand/xnandpsu.h b/bsps/include/dev/nand/xnandpsu.h
> index 3625299fb2..a93a74eb85 100644
> --- a/bsps/include/dev/nand/xnandpsu.h
> +++ b/bsps/include/dev/nand/xnandpsu.h
> @@ -7,7 +7,7 @@
> /**
> *
> * @file xnandpsu.h
> -* @addtogroup nandpsu_v1_10
> +* @addtogroup Overview
> * @{
> * @details
> *
> @@ -152,6 +152,8 @@
> * 1.10 akm 10/20/21 Fix gcc warnings.
> * 1.10 akm 12/21/21 Validate input parameters before use.
> * 1.10 akm 01/05/22 Remove assert checks form static and internal APIs.
> +* 1.11 akm 03/31/22 Fix unused parameter warning.
> +* 1.11 akm 03/31/22 Fix misleading-indentation warning.
> *
> * </pre>
> *
> diff --git a/bsps/include/dev/nand/xnandpsu_bbm.h b/bsps/include/dev/nand/xnandpsu_bbm.h
> index 4d4fafffa3..b6b39dc990 100644
> --- a/bsps/include/dev/nand/xnandpsu_bbm.h
> +++ b/bsps/include/dev/nand/xnandpsu_bbm.h
> @@ -7,7 +7,7 @@
> /**
> *
> * @file xnandpsu_bbm.h
> -* @addtogroup nandpsu_v1_10
> +* @addtogroup Overview
> * @{
> *
> * This file implements the Bad Block Management(BBM) functionality. This is
> diff --git a/bsps/include/dev/nand/xnandpsu_hw.h b/bsps/include/dev/nand/xnandpsu_hw.h
> index 47e6c8fddc..e3a648b136 100644
> --- a/bsps/include/dev/nand/xnandpsu_hw.h
> +++ b/bsps/include/dev/nand/xnandpsu_hw.h
> @@ -7,7 +7,7 @@
> /**
> *
> * @file xnandpsu_hw.h
> -* @addtogroup nandpsu_v1_10
> +* @addtogroup Overview
> * @{
> *
> * This file contains identifiers and low-level macros/functions for the Arasan
> diff --git a/bsps/include/dev/nand/xnandpsu_onfi.h b/bsps/include/dev/nand/xnandpsu_onfi.h
> index 7523ff48ea..97ea3c404e 100644
> --- a/bsps/include/dev/nand/xnandpsu_onfi.h
> +++ b/bsps/include/dev/nand/xnandpsu_onfi.h
> @@ -7,7 +7,7 @@
> /**
> *
> * @file xnandpsu_onfi.h
> -* @addtogroup nandpsu_v1_10
> +* @addtogroup Overview
> * @{
> *
> * This file defines all the ONFI 3.1 specific commands and values.
> diff --git a/bsps/shared/dev/nand/VERSION b/bsps/shared/dev/nand/VERSION
> index c0afe6e031..5e4eb00fe9 100644
> --- a/bsps/shared/dev/nand/VERSION
> +++ b/bsps/shared/dev/nand/VERSION
> @@ -5,16 +5,20 @@ Import from:
>
> https://github.com/Xilinx/embeddedsw.git
>
> -commit 8a89579489c88ea5acd23d7d439ac928659c26cf
> -Author: msreeram <manikanta.sreeram at xilinx.com>
> -AuthorDate: Wed Apr 6 23:24:38 2022 -0600
> +commit 5330a64c8efd14f0eef09befdbb8d3d738c33ec2
> +Refs: <xilinx_v2022.2>
> +Author: Nicole Baze <nicole.baze at xilinx.com>
> +AuthorDate: Mon Oct 3 13:27:19 2022 -0700
> Commit: Siva Addepalli <sivaprasad.addepalli at xilinx.com>
> -CommitDate: Fri Apr 8 16:47:15 2022 +0530
> +CommitDate: Fri Oct 7 10:26:16 2022 +0530
>
> - update license file for EmbeddedSW 2022.1 release
> + xilpm: versal: server: Fix bug in AIE2 zeroization
>
> - Update license file for EmbeddedSW 2022.1 release
> + There is a bug in AIE2 zeriozation function when polling for memory
> + zeroization complete. Currently the entire memory register is being
> + checked against zero but instead we need to check the bits specific
> + to the memory tiles. This patch updates the zeroization check by
> + adding a mask so that only the desired bits are checked for zero.
>
> - Signed-off-by: Manikanta Sreeram <msreeram at xilinx.com>
> -
> - Acked-by : Meena Paleti <meena.paleti at xilinx.com>
> + Signed-off-by: Nicole Baze <nicole.baze at xilinx.com>
> + Acked-by: Jesus De Haro <jesus.de-haro at xilinx.com>
> diff --git a/bsps/shared/dev/nand/xnandpsu.c b/bsps/shared/dev/nand/xnandpsu.c
> index a2e2235906..89451d19f8 100644
> --- a/bsps/shared/dev/nand/xnandpsu.c
> +++ b/bsps/shared/dev/nand/xnandpsu.c
> @@ -7,7 +7,7 @@
> /**
> *
> * @file xnandpsu.c
> -* @addtogroup nandpsu_v1_10
> +* @addtogroup Overview
> * @{
> *
> * This file contains the implementation of the interface functions for
> @@ -88,6 +88,8 @@
> * 1.10 akm 10/20/21 Fix gcc warnings.
> * 1.10 akm 12/21/21 Validate input parameters before use.
> * 1.10 akm 01/05/22 Remove assert checks form static and internal APIs.
> +* 1.11 akm 03/31/22 Fix unused parameter warning.
> +* 1.11 akm 03/31/22 Fix misleading-indentation warning.
> *
> * </pre>
> *
> @@ -175,7 +177,7 @@ static s32 XNandPsu_ProgramPage(XNandPsu *InstancePtr, u32 Target, u32 Page,
> static s32 XNandPsu_ReadPage(XNandPsu *InstancePtr, u32 Target, u32 Page,
> u32 Col, u8 *Buf);
>
> -static s32 XNandPsu_CheckOnDie(XNandPsu *InstancePtr, OnfiParamPage *Param);
> +static s32 XNandPsu_CheckOnDie(XNandPsu *InstancePtr);
>
> static void XNandPsu_SetEccAddrSize(XNandPsu *InstancePtr);
>
> @@ -380,7 +382,7 @@ static s32 XNandPsu_FlashInit(XNandPsu *InstancePtr)
> XNandPsu_InitTimingMode(InstancePtr, &Param[Index]);
> XNandPsu_InitFeatures(InstancePtr, &Param[Index]);
> if ((!InstancePtr->Features.EzNand) != 0U) {
> - Status =XNandPsu_CheckOnDie(InstancePtr,&Param[Index]);
> + Status =XNandPsu_CheckOnDie(InstancePtr);
> if (Status != XST_SUCCESS) {
> InstancePtr->Features.OnDie = 0U;
> }
> @@ -642,7 +644,7 @@ static void XNandPsu_InitTimingMode(XNandPsu *InstancePtr, OnfiParamPage *Param)
> * @note None
> *
> ******************************************************************************/
> -static s32 XNandPsu_CheckOnDie(XNandPsu *InstancePtr, OnfiParamPage *Param)
> +static s32 XNandPsu_CheckOnDie(XNandPsu *InstancePtr)
> {
> s32 Status = XST_FAILURE;
> u8 JedecId[2] = {0U};
> @@ -1976,8 +1978,8 @@ static s32 XNandPsu_ReadPage(XNandPsu *InstancePtr, u32 Target, u32 Page,
> RegVal |= XNANDPSU_INTR_STS_EN_MUL_BIT_ERR_STS_EN_MASK |
> XNANDPSU_INTR_STS_EN_ERR_INTR_STS_EN_MASK;
>
> - XNandPsu_WriteReg((InstancePtr)->Config.BaseAddress,
> - XNANDPSU_INTR_STS_EN_OFFSET, RegVal);
> + XNandPsu_WriteReg((InstancePtr)->Config.BaseAddress,
> + XNANDPSU_INTR_STS_EN_OFFSET, RegVal);
> /* Program Page Size */
> XNandPsu_SetPageSize(InstancePtr);
> /* Program Column, Page, Block address */
> diff --git a/bsps/shared/dev/nand/xnandpsu_bbm.c b/bsps/shared/dev/nand/xnandpsu_bbm.c
> index c43a2ba62f..dd59148536 100644
> --- a/bsps/shared/dev/nand/xnandpsu_bbm.c
> +++ b/bsps/shared/dev/nand/xnandpsu_bbm.c
> @@ -7,7 +7,7 @@
> /**
> *
> * @file xnandpsu_bbm.c
> -* @addtogroup nandpsu_v1_10
> +* @addtogroup Overview
> * @{
> *
> * This file implements the Bad Block Management (BBM) functionality.
> diff --git a/bsps/shared/dev/nand/xnandpsu_onfi.c b/bsps/shared/dev/nand/xnandpsu_onfi.c
> index cd230f247f..0009722bfe 100644
> --- a/bsps/shared/dev/nand/xnandpsu_onfi.c
> +++ b/bsps/shared/dev/nand/xnandpsu_onfi.c
> @@ -7,7 +7,7 @@
> /**
> *
> * @file xnandpsu_onfi.c
> -* @addtogroup nandpsu_v1_10
> +* @addtogroup Overview
> * @{
> *
> * This file contains the implementation of ONFI specific functions.
> --
> 2.30.2
>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
More information about the devel
mailing list