[v2] net: pfe_eth: read PFE ESBC header flash with spi_flash_read API

5 Nov 2020

From: Biwen Li biwen.li@nxp.com
Read PFE ESBC header flash with spi_flash_read API
- logs as follows,
  Net:   SF: Detected s25fs512s with page size 256 Bytes, erase size 256
  KiB, total 64 MiB
  "Synchronous Abort" handler, esr 0x96000210
  elr: 000000008206db44 lr : 0000000082004ea0 (reloc)
  elr: 00000000b7ba6b44 lr : 00000000b7b3dea0
  x0 : 00000000b79407e8 x1 : 0000000040640000
  x2 : 0000000000000050 x3 : 0000000000000000
  x4 : 000000000000000a x5 : 0000000000000050
  x6 : 0000000000000366 x7 : 00000000b7942308
  x8 : 00000000b76407c0 x9 : 0000000000000008
  x10: 0000000000000044 x11: 00000000b7634d1c
  x12: 000000000000004f x13: 0000000000000044
  x14: 00000000b7634d98 x15: 00000000b76407c0
  x16: 0000000000000000 x17: 0000000000000000
  x18: 00000000b7636dd8 x19: 0000000000000000
  x20: 00000000b79407d0 x21: 00000000b79407e8
  x22: 0000000040640000 x23: 00000000b7634e58
  x24: 0000000000000000 x25: 0000000003800000
  x26: 00000000b7bdd000 x27: 0000000000000000
  x28: 0000000000000000 x29: 00000000b7634d10
Code: d2800003 eb03005f 54000101 d65f03c0 (f8636826)
  Resetting CPU ...
Signed-off-by: Biwen Li biwen.li@nxp.com
---
Change in v2:
    - update subject and description
board/freescale/ls1012afrdm/Kconfig | 11 +++++
 board/freescale/ls1012aqds/Kconfig  | 14 +++++--
 board/freescale/ls1012ardb/Kconfig  | 18 +++++++--
 drivers/net/pfe_eth/pfe_firmware.c  | 62 +++++++++++++++++++++++++----
 4 files changed, 92 insertions(+), 13 deletions(-)

diff --git a/board/freescale/ls1012afrdm/Kconfig b/board/freescale/ls1012afrdm/Kconfig
index 55b414e168..4ac69d7117 100644
--- a/board/freescale/ls1012afrdm/Kconfig
+++ b/board/freescale/ls1012afrdm/Kconfig
@@ -16,6 +16,10 @@ config SYS_LS_PFE_FW_ADDR
    hex "Flash address of PFE firmware"
    default 0x40a00000
+config SYS_LS_PFE_FW_LENGTH
+	hex "length of PFE firmware"
+	default 0x40000
+
 config SYS_LS_PPA_FW_ADDR
    hex "PPA Firmware Addr"
    default 0x40400000
@@ -65,6 +69,10 @@ config SYS_LS_PFE_FW_ADDR
    hex "Flash address of PFE firmware"
    default 0x40020000
+config SYS_LS_PFE_FW_LENGTH
+	hex "length of PFE firmware"
+	default 0x40000
+
 config SYS_LS_PPA_FW_ADDR
    hex "PPA Firmware Addr"
    default 0x40060000
@@ -77,6 +85,9 @@ config SYS_LS_PFE_ESBC_ADDR
    hex "PFE Firmware HDR Addr"
    default 0x401f8000
+config SYS_LS_PFE_ESBC_LENGTH
+	hex "length of PFE Firmware HDR"
+	default 0xc00
 endif
if TARGET_LS1012AFRDM || TARGET_LS1012AFRWY
diff --git a/board/freescale/ls1012aqds/Kconfig b/board/freescale/ls1012aqds/Kconfig
index 8844557aae..59b1a87665 100644
--- a/board/freescale/ls1012aqds/Kconfig
+++ b/board/freescale/ls1012aqds/Kconfig
@@ -20,6 +20,14 @@ if CHAIN_OF_TRUST
 config SYS_LS_PPA_ESBC_ADDR
    hex "PPA Firmware HDR Addr"
    default 0x40680000
+
+config SYS_LS_PFE_ESBC_ADDR
+	hex "PFE Firmware HDR Addr"
+	default 0x40700000
+
+config SYS_LS_PFE_ESBC_LENGTH
+	hex "length of PFE Firmware HDR"
+	default 0xc00
 endif
if FSL_PFE
@@ -39,9 +47,9 @@ config SYS_LS_PFE_FW_ADDR
    hex "Flash address of PFE firmware"
    default 0x40a00000
-config SYS_LS_PFE_ESBC_ADDR
-	hex "PFE Firmware HDR Addr"
-	default 0x40700000
+config SYS_LS_PFE_FW_LENGTH
+	hex "length of PFE firmware"
+	default 0x300000
config DDR_PFE_PHYS_BASEADDR
    hex "PFE DDR physical base address"
diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig
index 5a2fa91f6b..c4acea3ae2 100644
--- a/board/freescale/ls1012ardb/Kconfig
+++ b/board/freescale/ls1012ardb/Kconfig
@@ -20,6 +20,14 @@ if CHAIN_OF_TRUST
 config SYS_LS_PPA_ESBC_ADDR
    hex "PPA Firmware HDR Addr"
    default 0x40680000
+
+config SYS_LS_PFE_ESBC_ADDR
+	hex "PFE Firmware HDR Addr"
+	default 0x40640000
+
+config SYS_LS_PFE_ESBC_LENGTH
+	hex "length of PFE Firmware HDR"
+	default 0xc00
 endif
if FSL_PFE
@@ -33,9 +41,9 @@ config SYS_LS_PFE_FW_ADDR
    hex "Flash address of PFE firmware"
    default 0x40a00000
-config SYS_LS_PFE_ESBC_ADDR
-	hex "PFE Firmware HDR Addr"
-	default 0x40640000
+config SYS_LS_PFE_FW_LENGTH
+	hex "length of PFE firmware"
+	default 0x300000
config DDR_PFE_PHYS_BASEADDR
    hex "PFE DDR physical base address"
@@ -89,6 +97,10 @@ config SYS_LS_PFE_FW_ADDR
    hex "Flash address of PFE firmware"
    default 0x40a00000
+config SYS_LS_PFE_FW_LENGTH
+	hex "length of PFE firmware"
+	default 0x300000
+
 config DDR_PFE_PHYS_BASEADDR
    hex "PFE DDR physical base address"
    default 0x03800000
diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c
index d414c750d4..d6718822b2 100644
--- a/drivers/net/pfe_eth/pfe_firmware.c
+++ b/drivers/net/pfe_eth/pfe_firmware.c
@@ -24,6 +24,9 @@
 #define PFE_FIRMWARE_FIT_CNF_NAME	"config@1"
static const void *pfe_fit_addr;
+#ifdef CONFIG_CHAIN_OF_TRUST
+static const void *pfe_esbc_hdr_addr;
+#endif
/*
  * PFE elf firmware loader.
@@ -166,10 +169,10 @@ static int pfe_fit_check(void)
int pfe_spi_flash_init(void)
 {
-	struct spi_flash *pfe_flash;
+	struct spi_flash *pfe_flash = NULL;
    struct udevice *new;
    int ret = 0;
-	void *addr = malloc(CONFIG_SYS_QE_FMAN_FW_LENGTH);
+	void *addr = malloc(CONFIG_SYS_LS_PFE_FW_LENGTH);
if (!addr)
    	return -ENOMEM;
@@ -179,24 +182,69 @@ int pfe_spi_flash_init(void)
    			     CONFIG_ENV_SPI_MAX_HZ,
    			     CONFIG_ENV_SPI_MODE,
    			     &new);
+	if (ret) {
+		printf("SF: failed to probe spi\n");
+		goto exit1;
+	}
+
pfe_flash = dev_get_uclass_priv(new);
    if (!pfe_flash) {
    	printf("SF: probe for pfe failed\n");
-		free(addr);
-		return -ENODEV;
+		ret = -ENODEV;
+		goto exit1;
    }
ret = spi_flash_read(pfe_flash,
    		     CONFIG_SYS_LS_PFE_FW_ADDR,
-			     CONFIG_SYS_QE_FMAN_FW_LENGTH,
+			     CONFIG_SYS_LS_PFE_FW_LENGTH,
    		     addr);
-	if (ret)
+	if (ret) {
    	printf("SF: read for pfe failed\n");
+		goto exit1;
+	}
+
+#ifdef CONFIG_CHAIN_OF_TRUST
+	void *hdr_addr = malloc(CONFIG_SYS_LS_PFE_ESBC_LENGTH);
+
+	if (!hdr_addr) {
+		ret = -ENOMEM;
+		goto exit1;
+	}
+	ret = spi_flash_read(pfe_flash,
+			     CONFIG_SYS_LS_PFE_ESBC_ADDR,
+			     CONFIG_SYS_LS_PFE_ESBC_LENGTH,
+			     hdr_addr);
+	if (ret) {
+		printf("SF: failed to read pfe esbc header\n");
+		goto exit2;
+	}
+
+	pfe_esbc_hdr_addr = hdr_addr;
+#endif
    pfe_fit_addr = addr;
    spi_flash_free(pfe_flash);
+	goto exit;
+#ifdef CONFIG_CHAIN_OF_TRUST
+exit2:
+	if (hdr_addr) {
+		free(hdr_addr);
+		hdr_addr = NULL;
+	}
+#endif
+exit1:
+	if (addr) {
+		free(addr);
+		addr = NULL;
+	}
+exit:
+	if (pfe_flash) {
+		spi_flash_free(pfe_flash);
+		pfe_flash = NULL;
+	}
+
    return ret;
 }
@@ -233,7 +281,7 @@ int pfe_firmware_init(void)
    	goto err;
#ifdef CONFIG_CHAIN_OF_TRUST
-	pfe_esbc_hdr = CONFIG_SYS_LS_PFE_ESBC_ADDR;
+	pfe_esbc_hdr = (uintptr_t)pfe_esbc_hdr_addr;
    pfe_img_addr = (uintptr_t)pfe_fit_addr;
    if (fsl_check_boot_mode_secure() != 0) {
    	/*
-- 
2.17.1


    

Biwen Li

tags (0)

participants (1)