diff mbox series

[v4,03/16] lib: sbi: Configure PMP late in coldboot and warmboot path

Message ID 20201020093930.2551352-4-anup.patel@wdc.com
State Accepted
Headers show
Series OpenSBI domain support | expand

Commit Message

Anup Patel Oct. 20, 2020, 9:39 a.m. UTC 
We factor-out PMP configuration from sbi_hart_init() as a separate
sbi_hart_pmp_configure() function and do the PMP configuration very
late in coldboot and warmboot path just before platform_final_init().

Eventually, this enable us to configure PMP totally based on OpenSBI
domain where OpenSBI domains can be parsed from device-tree in any of
the platform operations except platform_final_init().

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
 include/sbi/sbi_hart.h | 1 +
 lib/sbi/sbi_hart.c     | 4 ++--
 lib/sbi/sbi_init.c     | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

Comments

Anup Patel Oct. 21, 2020, 7:05 a.m. UTC | #1 
> -----Original Message-----
> From: Anup Patel <Anup.Patel@wdc.com>
> Sent: 20 October 2020 15:09
> To: Atish Patra <Atish.Patra@wdc.com>; Alistair Francis
> <Alistair.Francis@wdc.com>
> Cc: Anup Patel <anup@brainfault.org>; opensbi@lists.infradead.org; Anup
> Patel <Anup.Patel@wdc.com>; Alistair Francis <Alistair.Francis@wdc.com>
> Subject: [PATCH v4 03/16] lib: sbi: Configure PMP late in coldboot and
> warmboot path
> 
> We factor-out PMP configuration from sbi_hart_init() as a separate
> sbi_hart_pmp_configure() function and do the PMP configuration very late
> in coldboot and warmboot path just before platform_final_init().
> 
> Eventually, this enable us to configure PMP totally based on OpenSBI domain
> where OpenSBI domains can be parsed from device-tree in any of the
> platform operations except platform_final_init().
> 
> Signed-off-by: Anup Patel <anup.patel@wdc.com>
> Reviewed-by: Atish Patra <atish.patra@wdc.com>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> ---
>  include/sbi/sbi_hart.h | 1 +
>  lib/sbi/sbi_hart.c     | 4 ++--
>  lib/sbi/sbi_init.c     | 8 ++++++++
>  3 files changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/include/sbi/sbi_hart.h b/include/sbi/sbi_hart.h index
> 0ba68f0..9207f4c 100644
> --- a/include/sbi/sbi_hart.h
> +++ b/include/sbi/sbi_hart.h
> @@ -45,6 +45,7 @@ void sbi_hart_pmp_dump(struct sbi_scratch *scratch);
> int  sbi_hart_pmp_check_addr(struct sbi_scratch *scratch,
>  			     unsigned long daddr, unsigned long mode,
>  			     unsigned long attr);
> +int sbi_hart_pmp_configure(struct sbi_scratch *scratch);
>  bool sbi_hart_has_feature(struct sbi_scratch *scratch, unsigned long
> feature);  void sbi_hart_get_features_str(struct sbi_scratch *scratch,
>  			       char *features_str, int nfstr); diff --git
> a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c index edf79b7..7244f1c 100644
> --- a/lib/sbi/sbi_hart.c
> +++ b/lib/sbi/sbi_hart.c
> @@ -224,7 +224,7 @@ int sbi_hart_pmp_check_addr(struct sbi_scratch
> *scratch,
>  	return SBI_OK;
>  }
> 
> -static int pmp_init(struct sbi_scratch *scratch, u32 hartid)
> +int sbi_hart_pmp_configure(struct sbi_scratch *scratch)
>  {
>  	u32 pmp_idx = 0;
>  	unsigned long fw_start, fw_size_log2;
> @@ -462,7 +462,7 @@ int sbi_hart_init(struct sbi_scratch *scratch, u32
> hartid, bool cold_boot)
>  	if (rc)
>  		return rc;
> 
> -	return pmp_init(scratch, hartid);
> +	return 0;
>  }
> 
>  void __attribute__((noreturn)) sbi_hart_hang(void) diff --git
> a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c index 65d81ba..85a5f13 100644
> --- a/lib/sbi/sbi_init.c
> +++ b/lib/sbi/sbi_init.c
> @@ -210,6 +210,10 @@ static void __noreturn init_coldboot(struct
> sbi_scratch *scratch, u32 hartid)
>  	if (rc)
>  		sbi_hart_hang();
> 
> +	rc = sbi_hart_pmp_configure(scratch);
> +	if (rc)
> +		sbi_hart_hang();
> +
>  	rc = sbi_platform_final_init(plat, TRUE);
>  	if (rc)
>  		sbi_hart_hang();
> @@ -266,6 +270,10 @@ static void __noreturn init_warmboot(struct
> sbi_scratch *scratch, u32 hartid)
>  	if (rc)
>  		sbi_hart_hang();
> 
> +	rc = sbi_hart_pmp_configure(scratch);
> +	if (rc)
> +		sbi_hart_hang();
> +
>  	rc = sbi_platform_final_init(plat, FALSE);
>  	if (rc)
>  		sbi_hart_hang();
> --
> 2.25.1

Applied this patch to the riscv/opensbi repo

Regards,
Anup
diff mbox series

Patch

diff --git a/include/sbi/sbi_hart.h b/include/sbi/sbi_hart.h
index 0ba68f0..9207f4c 100644
--- a/include/sbi/sbi_hart.h
+++ b/include/sbi/sbi_hart.h
@@ -45,6 +45,7 @@  void sbi_hart_pmp_dump(struct sbi_scratch *scratch);
 int  sbi_hart_pmp_check_addr(struct sbi_scratch *scratch,
 			     unsigned long daddr, unsigned long mode,
 			     unsigned long attr);
+int sbi_hart_pmp_configure(struct sbi_scratch *scratch);
 bool sbi_hart_has_feature(struct sbi_scratch *scratch, unsigned long feature);
 void sbi_hart_get_features_str(struct sbi_scratch *scratch,
 			       char *features_str, int nfstr);
diff --git a/lib/sbi/sbi_hart.c b/lib/sbi/sbi_hart.c
index edf79b7..7244f1c 100644
--- a/lib/sbi/sbi_hart.c
+++ b/lib/sbi/sbi_hart.c
@@ -224,7 +224,7 @@  int sbi_hart_pmp_check_addr(struct sbi_scratch *scratch,
 	return SBI_OK;
 }
 
-static int pmp_init(struct sbi_scratch *scratch, u32 hartid)
+int sbi_hart_pmp_configure(struct sbi_scratch *scratch)
 {
 	u32 pmp_idx = 0;
 	unsigned long fw_start, fw_size_log2;
@@ -462,7 +462,7 @@  int sbi_hart_init(struct sbi_scratch *scratch, u32 hartid, bool cold_boot)
 	if (rc)
 		return rc;
 
-	return pmp_init(scratch, hartid);
+	return 0;
 }
 
 void __attribute__((noreturn)) sbi_hart_hang(void)
diff --git a/lib/sbi/sbi_init.c b/lib/sbi/sbi_init.c
index 65d81ba..85a5f13 100644
--- a/lib/sbi/sbi_init.c
+++ b/lib/sbi/sbi_init.c
@@ -210,6 +210,10 @@  static void __noreturn init_coldboot(struct sbi_scratch *scratch, u32 hartid)
 	if (rc)
 		sbi_hart_hang();
 
+	rc = sbi_hart_pmp_configure(scratch);
+	if (rc)
+		sbi_hart_hang();
+
 	rc = sbi_platform_final_init(plat, TRUE);
 	if (rc)
 		sbi_hart_hang();
@@ -266,6 +270,10 @@  static void __noreturn init_warmboot(struct sbi_scratch *scratch, u32 hartid)
 	if (rc)
 		sbi_hart_hang();
 
+	rc = sbi_hart_pmp_configure(scratch);
+	if (rc)
+		sbi_hart_hang();
+
 	rc = sbi_platform_final_init(plat, FALSE);
 	if (rc)
 		sbi_hart_hang();