On Tue, 15 Aug 2023 at 10:43, Abdellatif El Khlifi
<abdellatif.elkhl...@arm.com> wrote:
>
> enable the 32-bit version of sandbox
>
> Initially NVMXIP came with sandbox64 support.
> Let's enable sandbox support as well.
>
> Signed-off-by: Abdellatif El Khlifi <abdellatif.elkhl...@arm.com>
> Cc: Tom Rini <tr...@konsulko.com>
> Cc: Simon Glass <s...@chromium.org>
> ---
> arch/sandbox/dts/sandbox.dts | 14 ++++++++++++++
> configs/sandbox_defconfig | 4 ++--
> drivers/mtd/nvmxip/nvmxip-uclass.c | 6 +++---
> drivers/mtd/nvmxip/nvmxip.c | 13 +++++++++++--
> drivers/mtd/nvmxip/nvmxip_qspi.c | 10 +++++++++-
> test/dm/Makefile | 2 +-
> 6 files changed, 40 insertions(+), 9 deletions(-)
Reviewed-by: Simon Glass <s...@chromium.org>
>
> diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
> index 12d3eff5fa..1d38a939c4 100644
> --- a/arch/sandbox/dts/sandbox.dts
> +++ b/arch/sandbox/dts/sandbox.dts
> @@ -97,6 +97,20 @@
> compatible = "sandbox,spi";
> cs-gpios = <0>, <&gpio_a 0>;
> };
> +
> + nvmxip-qspi1@08000000 {
> + compatible = "nvmxip,qspi";
> + reg = <0x08000000 0x00200000>;
> + lba_shift = <9>;
> + lba = <4096>;
> + };
> +
> + nvmxip-qspi2@08200000 {
> + compatible = "nvmxip,qspi";
> + reg = <0x08200000 0x00100000>;
> + lba_shift = <9>;
> + lba = <2048>;
> + };
> };
>
> #include "sandbox.dtsi"
> diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
> index 1cd1c2ed7c..296f9d7326 100644
> --- a/configs/sandbox_defconfig
> +++ b/configs/sandbox_defconfig
> @@ -145,7 +145,6 @@ CONFIG_IP_DEFRAG=y
> CONFIG_BOOTP_SERVERIP=y
> CONFIG_IPV6=y
> CONFIG_DM_DMA=y
> -CONFIG_DEVRES=y
> CONFIG_DEBUG_DEVRES=y
> CONFIG_SIMPLE_PM_BUS=y
> CONFIG_ADC=y
> @@ -184,6 +183,7 @@ CONFIG_DMA_CHANNELS=y
> CONFIG_SANDBOX_DMA=y
> CONFIG_FASTBOOT_FLASH=y
> CONFIG_FASTBOOT_FLASH_MMC_DEV=0
> +CONFIG_ARM_FFA_TRANSPORT=y
> CONFIG_GPIO_HOG=y
> CONFIG_DM_GPIO_LOOKUP_LABEL=y
> CONFIG_QCOM_PMIC_GPIO=y
> @@ -227,6 +227,7 @@ CONFIG_SPI_FLASH_SPANSION=y
> CONFIG_SPI_FLASH_STMICRO=y
> CONFIG_SPI_FLASH_SST=y
> CONFIG_SPI_FLASH_WINBOND=y
> +CONFIG_NVMXIP_QSPI=y
> CONFIG_MULTIPLEXER=y
> CONFIG_MUX_MMIO=y
> CONFIG_NVME_PCI=y
> @@ -345,4 +346,3 @@ CONFIG_TEST_FDTDEC=y
> CONFIG_UNIT_TEST=y
> CONFIG_UT_TIME=y
> CONFIG_UT_DM=y
> -CONFIG_ARM_FFA_TRANSPORT=y
> diff --git a/drivers/mtd/nvmxip/nvmxip-uclass.c
> b/drivers/mtd/nvmxip/nvmxip-uclass.c
> index 6d8eb177b5..7177f8f314 100644
> --- a/drivers/mtd/nvmxip/nvmxip-uclass.c
> +++ b/drivers/mtd/nvmxip/nvmxip-uclass.c
> @@ -9,7 +9,7 @@
> #include <common.h>
> #include <dm.h>
> #include <log.h>
> -#if CONFIG_IS_ENABLED(SANDBOX64)
> +#if CONFIG_IS_ENABLED(SANDBOX)
> #include <asm/test.h>
> #endif
> #include <linux/bitops.h>
> @@ -39,7 +39,7 @@ static int nvmxip_post_bind(struct udevice *udev)
> char bdev_name[NVMXIP_BLKDEV_NAME_SZ + 1];
> int devnum;
>
> -#if CONFIG_IS_ENABLED(SANDBOX64)
> +#if CONFIG_IS_ENABLED(SANDBOX)
> sandbox_set_enable_memio(true);
> #endif
>
> @@ -62,7 +62,7 @@ static int nvmxip_post_bind(struct udevice *udev)
> return ret;
> }
>
> - log_info("[%s]: the block device %s ready for use\n", udev->name,
> bdev_name);
> + log_debug("[%s]: the block device %s ready for use\n", udev->name,
> bdev_name);
>
> return 0;
> }
> diff --git a/drivers/mtd/nvmxip/nvmxip.c b/drivers/mtd/nvmxip/nvmxip.c
> index a359e3b482..9191e69a40 100644
> --- a/drivers/mtd/nvmxip/nvmxip.c
> +++ b/drivers/mtd/nvmxip/nvmxip.c
> @@ -11,6 +11,7 @@
> #include <log.h>
> #include <mapmem.h>
> #include <asm/io.h>
> +#include <linux/bitfield.h>
> #include <linux/bitops.h>
> #include <linux/errno.h>
> #include "nvmxip.h"
> @@ -26,9 +27,17 @@
> *
> * Always return 0.
> */
> -static int nvmxip_mmio_rawread(const phys_addr_t address, u64 *value)
> +static int nvmxip_mmio_rawread(const u64 *address, u64 *value)
> {
> +#if CONFIG_IS_ENABLED(PHYS_64BIT)
> *value = readq(address);
> +#else
> + u32 h_word, l_word;
> +
> + l_word = readl(address);
> + h_word = readl((u8 *)address + sizeof(u32));
> + *value = FIELD_PREP(GENMASK_ULL(63, 32), h_word) | l_word;
> +#endif
> return 0;
> }
>
> @@ -67,7 +76,7 @@ static ulong nvmxip_blk_read(struct udevice *dev, lbaint_t
> blknr, lbaint_t blkcn
> /* assumption: the data is virtually contiguous */
>
> for (qdata_idx = 0 ; qdata_idx < qwords ; qdata_idx++)
> - nvmxip_mmio_rawread((phys_addr_t)(virt_blkaddr + qdata_idx),
> pdst++);
> + nvmxip_mmio_rawread(virt_blkaddr + qdata_idx, pdst++);
>
> log_debug("[%s]: src[0]: 0x%llx , dst[0]: 0x%llx , src[-1]:
> 0x%llx , dst[-1]: 0x%llx\n",
> dev->name,
> diff --git a/drivers/mtd/nvmxip/nvmxip_qspi.c
> b/drivers/mtd/nvmxip/nvmxip_qspi.c
> index 7221fd1cb4..b6b94ca57f 100644
> --- a/drivers/mtd/nvmxip/nvmxip_qspi.c
> +++ b/drivers/mtd/nvmxip/nvmxip_qspi.c
> @@ -17,6 +17,14 @@ DECLARE_GLOBAL_DATA_PTR;
>
> #define NVMXIP_QSPI_DRV_NAME "nvmxip_qspi"
>
> +/* Select the right physical address formatting according to the platform */
> +#ifdef CONFIG_PHYS_64BIT
> +#define PhysAddrLength "ll"
> +#else
> +#define PhysAddrLength ""
> +#endif
> +#define PHYS_ADDR_LN "%" PhysAddrLength "x"
Could this go in a standard header?
> +
> /**
> * nvmxip_qspi_of_to_plat() -read from DT
> * @dev: the NVMXIP device
> @@ -50,7 +58,7 @@ static int nvmxip_qspi_of_to_plat(struct udevice *dev)
> return -EINVAL;
> }
>
> - log_debug("[%s]: XIP device base addr: 0x%llx , lba_shift: %d , lbas:
> %lu\n",
> + log_debug("[%s]: XIP device base addr: " PHYS_ADDR_LN " , lba_shift:
> %d , lbas: %lu\n",
> dev->name, plat->phys_base, plat->lba_shift, plat->lba);
>
> return 0;
> diff --git a/test/dm/Makefile b/test/dm/Makefile
> index 7ed00733c1..77172d9012 100644
> --- a/test/dm/Makefile
> +++ b/test/dm/Makefile
> @@ -18,7 +18,7 @@ obj-$(CONFIG_UT_DM) += test-uclass.o
> obj-$(CONFIG_UT_DM) += core.o
> obj-$(CONFIG_UT_DM) += read.o
> obj-$(CONFIG_UT_DM) += phys2bus.o
> -ifeq ($(CONFIG_NVMXIP_QSPI)$(CONFIG_SANDBOX64),yy)
> +ifeq ($(CONFIG_NVMXIP_QSPI),y)
> obj-y += nvmxip.o
> endif
>
> --
> 2.25.1
>
Regars,
Simon
