* [PATCH v9] platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata
@ 2023-04-06 10:08 Lad Prabhakar
2023-04-06 16:07 ` Anup Patel
2023-04-06 19:31 ` Yu-Chien Peter Lin
0 siblings, 2 replies; 4+ messages in thread
From: Lad Prabhakar @ 2023-04-06 10:08 UTC (permalink / raw)
To: opensbi
I/O Coherence Port (IOCP) provides an AXI interface for connecting
external non-caching masters, such as DMA controllers. The accesses
from IOCP are coherent with D-Caches and L2 Cache.
IOCP is a specification option and is disabled on the Renesas RZ/Five
SoC (which is based on Andes AX45MP core) due to this reason IP blocks
using DMA will fail.
As a workaround for SoCs with IOCP disabled CMO needs to be handled by
software. Firstly OpenSBI configures the memory region as
"Memory, Non-cacheable, Bufferable" and passes this region as a global
shared dma pool as a DT node. With DMA_GLOBAL_POOL enabled all DMA
allocations happen from this region and synchronization callbacks are
implemented to synchronize when doing DMA transactions.
SBI_EXT_ANDES_IOCP_SW_WORKAROUND checks if the IOCP errata should be
applied to handle cache management.
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
v8->v9
* Moved vendor_ext_provider callback to andes45_sbi.c
* Updated commit message
* Dropped RB tags
v7->v8
* Fixed typo controlable -> controllable
* Included RB tag from Lin-san and Conor
v6->v7
* Added a new section for conf and control registers
* Made use of misa_extension('U')
* For unsupported funcid's now returning SBI_EINVAL
* Renamed ANDES_SBI_EXT_IOCP_SW_WORKAROUND -> SBI_EXT_ANDES_IOCP_SW_WORKAROUND
v5->v6
* Moved ANDES_SBI_EXT_IOCP_SW_WORKAROUND to andes_sbi.h
* Moved helpers to check IOCP to common header so that we re-use code
v5:
https://patchwork.ozlabs.org/project/opensbi/patch/20230213215111.32017-4-prabhakar.mahadev-lad.rj at bp.renesas.com/
---
platform/generic/Kconfig | 1 +
platform/generic/andes/Kconfig | 4 ++
platform/generic/andes/andes45_sbi.c | 51 ++++++++++++++++++++
platform/generic/andes/objects.mk | 1 +
platform/generic/include/andes/andes45.h | 23 ++++++++-
platform/generic/include/andes/andes45_sbi.h | 13 +++++
platform/generic/renesas/rzfive/rzfive.c | 2 +
7 files changed, 93 insertions(+), 2 deletions(-)
create mode 100644 platform/generic/andes/andes45_sbi.c
create mode 100644 platform/generic/include/andes/andes45_sbi.h
diff --git a/platform/generic/Kconfig b/platform/generic/Kconfig
index 1f4f8e1..6ec25db 100644
--- a/platform/generic/Kconfig
+++ b/platform/generic/Kconfig
@@ -36,6 +36,7 @@ config PLATFORM_ANDES_AE350
config PLATFORM_RENESAS_RZFIVE
bool "Renesas RZ/Five support"
select ANDES45_PMA
+ select ANDES45_SBI
default n
config PLATFORM_SIFIVE_FU540
diff --git a/platform/generic/andes/Kconfig b/platform/generic/andes/Kconfig
index 3ad4e4c..ec904dc 100644
--- a/platform/generic/andes/Kconfig
+++ b/platform/generic/andes/Kconfig
@@ -3,3 +3,7 @@
config ANDES45_PMA
bool "Andes PMA support"
default n
+
+config ANDES45_SBI
+ bool "Andes SBI support"
+ default n
diff --git a/platform/generic/andes/andes45_sbi.c b/platform/generic/andes/andes45_sbi.c
new file mode 100644
index 0000000..4539e23
--- /dev/null
+++ b/platform/generic/andes/andes45_sbi.c
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (C) 2023 Renesas Electronics Corp.
+ *
+ */
+#include <andes/andes45.h>
+#include <andes/andes45_sbi.h>
+#include <sbi/riscv_asm.h>
+#include <sbi/sbi_error.h>
+
+enum sbi_ext_andes_fid {
+ SBI_EXT_ANDES_FID0 = 0, /* Reserved for future use */
+ SBI_EXT_ANDES_IOCP_SW_WORKAROUND,
+};
+
+static bool andes45_cache_controllable(void)
+{
+ return (((csr_read(CSR_MICM_CFG) & MICM_CFG_ISZ_MASK) ||
+ (csr_read(CSR_MDCM_CFG) & MDCM_CFG_DSZ_MASK)) &&
+ (csr_read(CSR_MMSC_CFG) & MMSC_CFG_CCTLCSR_MASK) &&
+ (csr_read(CSR_MCACHE_CTL) & MCACHE_CTL_CCTL_SUEN_MASK) &&
+ misa_extension('U'));
+}
+
+static bool andes45_iocp_disabled(void)
+{
+ return (csr_read(CSR_MMSC_CFG) & MMSC_IOCP_MASK) ? false : true;
+}
+
+static bool andes45_apply_iocp_sw_workaround(void)
+{
+ return andes45_cache_controllable() & andes45_iocp_disabled();
+}
+
+int andes45_sbi_vendor_ext_provider(long funcid,
+ const struct sbi_trap_regs *regs,
+ unsigned long *out_value,
+ struct sbi_trap_info *out_trap,
+ const struct fdt_match *match)
+{
+ switch (funcid) {
+ case SBI_EXT_ANDES_IOCP_SW_WORKAROUND:
+ *out_value = andes45_apply_iocp_sw_workaround();
+ break;
+
+ default:
+ return SBI_EINVAL;
+ }
+
+ return 0;
+}
diff --git a/platform/generic/andes/objects.mk b/platform/generic/andes/objects.mk
index ea6b561..346df2d 100644
--- a/platform/generic/andes/objects.mk
+++ b/platform/generic/andes/objects.mk
@@ -6,3 +6,4 @@ carray-platform_override_modules-$(CONFIG_PLATFORM_ANDES_AE350) += andes_ae350
platform-objs-$(CONFIG_PLATFORM_ANDES_AE350) += andes/ae350.o andes/sleep.o
platform-objs-$(CONFIG_ANDES45_PMA) += andes/andes45-pma.o
+platform-objs-$(CONFIG_ANDES45_SBI) += andes/andes45_sbi.o
diff --git a/platform/generic/include/andes/andes45.h b/platform/generic/include/andes/andes45.h
index 08b3d18..f570994 100644
--- a/platform/generic/include/andes/andes45.h
+++ b/platform/generic/include/andes/andes45.h
@@ -4,7 +4,26 @@
#define CSR_MARCHID_MICROID 0xfff
/* Memory and Miscellaneous Registers */
-#define CSR_MCACHE_CTL 0x7ca
-#define CSR_MCCTLCOMMAND 0x7cc
+#define CSR_MCACHE_CTL 0x7ca
+#define CSR_MCCTLCOMMAND 0x7cc
+
+/* Configuration Control & Status Registers */
+#define CSR_MICM_CFG 0xfc0
+#define CSR_MDCM_CFG 0xfc1
+#define CSR_MMSC_CFG 0xfc2
+
+#define MICM_CFG_ISZ_OFFSET 6
+#define MICM_CFG_ISZ_MASK (0x7 << MICM_CFG_ISZ_OFFSET)
+
+#define MDCM_CFG_DSZ_OFFSET 6
+#define MDCM_CFG_DSZ_MASK (0x7 << MDCM_CFG_DSZ_OFFSET)
+
+#define MMSC_CFG_CCTLCSR_OFFSET 16
+#define MMSC_CFG_CCTLCSR_MASK (0x1 << MMSC_CFG_CCTLCSR_OFFSET)
+#define MMSC_IOCP_OFFSET 47
+#define MMSC_IOCP_MASK (0x1ULL << MMSC_IOCP_OFFSET)
+
+#define MCACHE_CTL_CCTL_SUEN_OFFSET 8
+#define MCACHE_CTL_CCTL_SUEN_MASK (0x1 << MCACHE_CTL_CCTL_SUEN_OFFSET)
#endif /* _RISCV_ANDES45_H */
diff --git a/platform/generic/include/andes/andes45_sbi.h b/platform/generic/include/andes/andes45_sbi.h
new file mode 100644
index 0000000..54e9aa2
--- /dev/null
+++ b/platform/generic/include/andes/andes45_sbi.h
@@ -0,0 +1,13 @@
+#ifndef _RISCV_ANDES45_SBI_H
+#define _RISCV_ANDES45_SBI_H
+
+#include <sbi/sbi_trap.h>
+#include <sbi_utils/fdt/fdt_helper.h>
+
+int andes45_sbi_vendor_ext_provider(long funcid,
+ const struct sbi_trap_regs *regs,
+ unsigned long *out_value,
+ struct sbi_trap_info *out_trap,
+ const struct fdt_match *match);
+
+#endif /* _RISCV_ANDES45_SBI_H */
diff --git a/platform/generic/renesas/rzfive/rzfive.c b/platform/generic/renesas/rzfive/rzfive.c
index 4d71d0d..664adfc 100644
--- a/platform/generic/renesas/rzfive/rzfive.c
+++ b/platform/generic/renesas/rzfive/rzfive.c
@@ -5,6 +5,7 @@
*/
#include <andes/andes45_pma.h>
+#include <andes/andes45_sbi.h>
#include <platform_override.h>
#include <sbi/sbi_domain.h>
#include <sbi_utils/fdt/fdt_helper.h>
@@ -55,4 +56,5 @@ const struct platform_override renesas_rzfive = {
.match_table = renesas_rzfive_match,
.early_init = renesas_rzfive_early_init,
.final_init = renesas_rzfive_final_init,
+ .vendor_ext_provider = andes45_sbi_vendor_ext_provider,
};
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v9] platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata
2023-04-06 19:31 ` Yu-Chien Peter Lin
@ 2023-04-06 11:43 ` Lad, Prabhakar
0 siblings, 0 replies; 4+ messages in thread
From: Lad, Prabhakar @ 2023-04-06 11:43 UTC (permalink / raw)
To: opensbi
Hi Lin-san,
Thank you for the review.
On Thu, Apr 6, 2023 at 12:37?PM Yu-Chien Peter Lin
<peterlin@andestech.com> wrote:
>
> Hi Prabhakar,
>
> On Thu, Apr 06, 2023 at 11:08:45AM +0100, Lad Prabhakar wrote:
> > I/O Coherence Port (IOCP) provides an AXI interface for connecting
> > external non-caching masters, such as DMA controllers. The accesses
> > from IOCP are coherent with D-Caches and L2 Cache.
> >
> > IOCP is a specification option and is disabled on the Renesas RZ/Five
> > SoC (which is based on Andes AX45MP core) due to this reason IP blocks
> > using DMA will fail.
> >
> > As a workaround for SoCs with IOCP disabled CMO needs to be handled by
> > software. Firstly OpenSBI configures the memory region as
> > "Memory, Non-cacheable, Bufferable" and passes this region as a global
> > shared dma pool as a DT node. With DMA_GLOBAL_POOL enabled all DMA
> > allocations happen from this region and synchronization callbacks are
> > implemented to synchronize when doing DMA transactions.
> >
> > SBI_EXT_ANDES_IOCP_SW_WORKAROUND checks if the IOCP errata should be
> > applied to handle cache management.
> >
> > Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> > ---
> > v8->v9
> > * Moved vendor_ext_provider callback to andes45_sbi.c
> > * Updated commit message
> > * Dropped RB tags
> >
> > v7->v8
> > * Fixed typo controlable -> controllable
> > * Included RB tag from Lin-san and Conor
> >
> > v6->v7
> > * Added a new section for conf and control registers
> > * Made use of misa_extension('U')
> > * For unsupported funcid's now returning SBI_EINVAL
> > * Renamed ANDES_SBI_EXT_IOCP_SW_WORKAROUND -> SBI_EXT_ANDES_IOCP_SW_WORKAROUND
> >
> > v5->v6
> > * Moved ANDES_SBI_EXT_IOCP_SW_WORKAROUND to andes_sbi.h
> > * Moved helpers to check IOCP to common header so that we re-use code
> >
> > v5:
> > https://patchwork.ozlabs.org/project/opensbi/patch/20230213215111.32017-4-prabhakar.mahadev-lad.rj at bp.renesas.com/
> > ---
> > platform/generic/Kconfig | 1 +
> > platform/generic/andes/Kconfig | 4 ++
> > platform/generic/andes/andes45_sbi.c | 51 ++++++++++++++++++++
> > platform/generic/andes/objects.mk | 1 +
> > platform/generic/include/andes/andes45.h | 23 ++++++++-
> > platform/generic/include/andes/andes45_sbi.h | 13 +++++
> > platform/generic/renesas/rzfive/rzfive.c | 2 +
> > 7 files changed, 93 insertions(+), 2 deletions(-)
> > create mode 100644 platform/generic/andes/andes45_sbi.c
> > create mode 100644 platform/generic/include/andes/andes45_sbi.h
> >
> > diff --git a/platform/generic/Kconfig b/platform/generic/Kconfig
> > index 1f4f8e1..6ec25db 100644
> > --- a/platform/generic/Kconfig
> > +++ b/platform/generic/Kconfig
> > @@ -36,6 +36,7 @@ config PLATFORM_ANDES_AE350
> > config PLATFORM_RENESAS_RZFIVE
> > bool "Renesas RZ/Five support"
> > select ANDES45_PMA
> > + select ANDES45_SBI
>
> andes_sbi is preferred,
> the other CPU series can reuse these files and functions.
>
Ok I'll do as per below:
* Rename ANDES45_SBI -> ANDES_SBI
* Rename andes45_sbi.c -> andes_sbi.c
* Renabme andes45_sbi.h -> andes_sbi.h
I assume you are OK with the rest of the implementation.
Cheers,
Prabhakar
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v9] platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata
2023-04-06 10:08 [PATCH v9] platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata Lad Prabhakar
@ 2023-04-06 16:07 ` Anup Patel
2023-04-06 19:31 ` Yu-Chien Peter Lin
1 sibling, 0 replies; 4+ messages in thread
From: Anup Patel @ 2023-04-06 16:07 UTC (permalink / raw)
To: opensbi
On Thu, Apr 6, 2023 at 3:39?PM Lad Prabhakar
<prabhakar.mahadev-lad.rj@bp.renesas.com> wrote:
>
> I/O Coherence Port (IOCP) provides an AXI interface for connecting
> external non-caching masters, such as DMA controllers. The accesses
> from IOCP are coherent with D-Caches and L2 Cache.
>
> IOCP is a specification option and is disabled on the Renesas RZ/Five
> SoC (which is based on Andes AX45MP core) due to this reason IP blocks
> using DMA will fail.
>
> As a workaround for SoCs with IOCP disabled CMO needs to be handled by
> software. Firstly OpenSBI configures the memory region as
> "Memory, Non-cacheable, Bufferable" and passes this region as a global
> shared dma pool as a DT node. With DMA_GLOBAL_POOL enabled all DMA
> allocations happen from this region and synchronization callbacks are
> implemented to synchronize when doing DMA transactions.
>
> SBI_EXT_ANDES_IOCP_SW_WORKAROUND checks if the IOCP errata should be
> applied to handle cache management.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
I think you missed a few Reviewed-by tags from previous revisions.
Regards,
Anup
> ---
> v8->v9
> * Moved vendor_ext_provider callback to andes45_sbi.c
> * Updated commit message
> * Dropped RB tags
>
> v7->v8
> * Fixed typo controlable -> controllable
> * Included RB tag from Lin-san and Conor
>
> v6->v7
> * Added a new section for conf and control registers
> * Made use of misa_extension('U')
> * For unsupported funcid's now returning SBI_EINVAL
> * Renamed ANDES_SBI_EXT_IOCP_SW_WORKAROUND -> SBI_EXT_ANDES_IOCP_SW_WORKAROUND
>
> v5->v6
> * Moved ANDES_SBI_EXT_IOCP_SW_WORKAROUND to andes_sbi.h
> * Moved helpers to check IOCP to common header so that we re-use code
>
> v5:
> https://patchwork.ozlabs.org/project/opensbi/patch/20230213215111.32017-4-prabhakar.mahadev-lad.rj at bp.renesas.com/
> ---
> platform/generic/Kconfig | 1 +
> platform/generic/andes/Kconfig | 4 ++
> platform/generic/andes/andes45_sbi.c | 51 ++++++++++++++++++++
> platform/generic/andes/objects.mk | 1 +
> platform/generic/include/andes/andes45.h | 23 ++++++++-
> platform/generic/include/andes/andes45_sbi.h | 13 +++++
> platform/generic/renesas/rzfive/rzfive.c | 2 +
> 7 files changed, 93 insertions(+), 2 deletions(-)
> create mode 100644 platform/generic/andes/andes45_sbi.c
> create mode 100644 platform/generic/include/andes/andes45_sbi.h
>
> diff --git a/platform/generic/Kconfig b/platform/generic/Kconfig
> index 1f4f8e1..6ec25db 100644
> --- a/platform/generic/Kconfig
> +++ b/platform/generic/Kconfig
> @@ -36,6 +36,7 @@ config PLATFORM_ANDES_AE350
> config PLATFORM_RENESAS_RZFIVE
> bool "Renesas RZ/Five support"
> select ANDES45_PMA
> + select ANDES45_SBI
> default n
>
> config PLATFORM_SIFIVE_FU540
> diff --git a/platform/generic/andes/Kconfig b/platform/generic/andes/Kconfig
> index 3ad4e4c..ec904dc 100644
> --- a/platform/generic/andes/Kconfig
> +++ b/platform/generic/andes/Kconfig
> @@ -3,3 +3,7 @@
> config ANDES45_PMA
> bool "Andes PMA support"
> default n
> +
> +config ANDES45_SBI
> + bool "Andes SBI support"
> + default n
> diff --git a/platform/generic/andes/andes45_sbi.c b/platform/generic/andes/andes45_sbi.c
> new file mode 100644
> index 0000000..4539e23
> --- /dev/null
> +++ b/platform/generic/andes/andes45_sbi.c
> @@ -0,0 +1,51 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2023 Renesas Electronics Corp.
> + *
> + */
> +#include <andes/andes45.h>
> +#include <andes/andes45_sbi.h>
> +#include <sbi/riscv_asm.h>
> +#include <sbi/sbi_error.h>
> +
> +enum sbi_ext_andes_fid {
> + SBI_EXT_ANDES_FID0 = 0, /* Reserved for future use */
> + SBI_EXT_ANDES_IOCP_SW_WORKAROUND,
> +};
> +
> +static bool andes45_cache_controllable(void)
> +{
> + return (((csr_read(CSR_MICM_CFG) & MICM_CFG_ISZ_MASK) ||
> + (csr_read(CSR_MDCM_CFG) & MDCM_CFG_DSZ_MASK)) &&
> + (csr_read(CSR_MMSC_CFG) & MMSC_CFG_CCTLCSR_MASK) &&
> + (csr_read(CSR_MCACHE_CTL) & MCACHE_CTL_CCTL_SUEN_MASK) &&
> + misa_extension('U'));
> +}
> +
> +static bool andes45_iocp_disabled(void)
> +{
> + return (csr_read(CSR_MMSC_CFG) & MMSC_IOCP_MASK) ? false : true;
> +}
> +
> +static bool andes45_apply_iocp_sw_workaround(void)
> +{
> + return andes45_cache_controllable() & andes45_iocp_disabled();
> +}
> +
> +int andes45_sbi_vendor_ext_provider(long funcid,
> + const struct sbi_trap_regs *regs,
> + unsigned long *out_value,
> + struct sbi_trap_info *out_trap,
> + const struct fdt_match *match)
> +{
> + switch (funcid) {
> + case SBI_EXT_ANDES_IOCP_SW_WORKAROUND:
> + *out_value = andes45_apply_iocp_sw_workaround();
> + break;
> +
> + default:
> + return SBI_EINVAL;
> + }
> +
> + return 0;
> +}
> diff --git a/platform/generic/andes/objects.mk b/platform/generic/andes/objects.mk
> index ea6b561..346df2d 100644
> --- a/platform/generic/andes/objects.mk
> +++ b/platform/generic/andes/objects.mk
> @@ -6,3 +6,4 @@ carray-platform_override_modules-$(CONFIG_PLATFORM_ANDES_AE350) += andes_ae350
> platform-objs-$(CONFIG_PLATFORM_ANDES_AE350) += andes/ae350.o andes/sleep.o
>
> platform-objs-$(CONFIG_ANDES45_PMA) += andes/andes45-pma.o
> +platform-objs-$(CONFIG_ANDES45_SBI) += andes/andes45_sbi.o
> diff --git a/platform/generic/include/andes/andes45.h b/platform/generic/include/andes/andes45.h
> index 08b3d18..f570994 100644
> --- a/platform/generic/include/andes/andes45.h
> +++ b/platform/generic/include/andes/andes45.h
> @@ -4,7 +4,26 @@
> #define CSR_MARCHID_MICROID 0xfff
>
> /* Memory and Miscellaneous Registers */
> -#define CSR_MCACHE_CTL 0x7ca
> -#define CSR_MCCTLCOMMAND 0x7cc
> +#define CSR_MCACHE_CTL 0x7ca
> +#define CSR_MCCTLCOMMAND 0x7cc
> +
> +/* Configuration Control & Status Registers */
> +#define CSR_MICM_CFG 0xfc0
> +#define CSR_MDCM_CFG 0xfc1
> +#define CSR_MMSC_CFG 0xfc2
> +
> +#define MICM_CFG_ISZ_OFFSET 6
> +#define MICM_CFG_ISZ_MASK (0x7 << MICM_CFG_ISZ_OFFSET)
> +
> +#define MDCM_CFG_DSZ_OFFSET 6
> +#define MDCM_CFG_DSZ_MASK (0x7 << MDCM_CFG_DSZ_OFFSET)
> +
> +#define MMSC_CFG_CCTLCSR_OFFSET 16
> +#define MMSC_CFG_CCTLCSR_MASK (0x1 << MMSC_CFG_CCTLCSR_OFFSET)
> +#define MMSC_IOCP_OFFSET 47
> +#define MMSC_IOCP_MASK (0x1ULL << MMSC_IOCP_OFFSET)
> +
> +#define MCACHE_CTL_CCTL_SUEN_OFFSET 8
> +#define MCACHE_CTL_CCTL_SUEN_MASK (0x1 << MCACHE_CTL_CCTL_SUEN_OFFSET)
>
> #endif /* _RISCV_ANDES45_H */
> diff --git a/platform/generic/include/andes/andes45_sbi.h b/platform/generic/include/andes/andes45_sbi.h
> new file mode 100644
> index 0000000..54e9aa2
> --- /dev/null
> +++ b/platform/generic/include/andes/andes45_sbi.h
> @@ -0,0 +1,13 @@
> +#ifndef _RISCV_ANDES45_SBI_H
> +#define _RISCV_ANDES45_SBI_H
> +
> +#include <sbi/sbi_trap.h>
> +#include <sbi_utils/fdt/fdt_helper.h>
> +
> +int andes45_sbi_vendor_ext_provider(long funcid,
> + const struct sbi_trap_regs *regs,
> + unsigned long *out_value,
> + struct sbi_trap_info *out_trap,
> + const struct fdt_match *match);
> +
> +#endif /* _RISCV_ANDES45_SBI_H */
> diff --git a/platform/generic/renesas/rzfive/rzfive.c b/platform/generic/renesas/rzfive/rzfive.c
> index 4d71d0d..664adfc 100644
> --- a/platform/generic/renesas/rzfive/rzfive.c
> +++ b/platform/generic/renesas/rzfive/rzfive.c
> @@ -5,6 +5,7 @@
> */
>
> #include <andes/andes45_pma.h>
> +#include <andes/andes45_sbi.h>
> #include <platform_override.h>
> #include <sbi/sbi_domain.h>
> #include <sbi_utils/fdt/fdt_helper.h>
> @@ -55,4 +56,5 @@ const struct platform_override renesas_rzfive = {
> .match_table = renesas_rzfive_match,
> .early_init = renesas_rzfive_early_init,
> .final_init = renesas_rzfive_final_init,
> + .vendor_ext_provider = andes45_sbi_vendor_ext_provider,
> };
> --
> 2.17.1
>
>
> --
> opensbi mailing list
> opensbi at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v9] platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata
2023-04-06 10:08 [PATCH v9] platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata Lad Prabhakar
2023-04-06 16:07 ` Anup Patel
@ 2023-04-06 19:31 ` Yu-Chien Peter Lin
2023-04-06 11:43 ` Lad, Prabhakar
1 sibling, 1 reply; 4+ messages in thread
From: Yu-Chien Peter Lin @ 2023-04-06 19:31 UTC (permalink / raw)
To: opensbi
Hi Prabhakar,
On Thu, Apr 06, 2023 at 11:08:45AM +0100, Lad Prabhakar wrote:
> I/O Coherence Port (IOCP) provides an AXI interface for connecting
> external non-caching masters, such as DMA controllers. The accesses
> from IOCP are coherent with D-Caches and L2 Cache.
>
> IOCP is a specification option and is disabled on the Renesas RZ/Five
> SoC (which is based on Andes AX45MP core) due to this reason IP blocks
> using DMA will fail.
>
> As a workaround for SoCs with IOCP disabled CMO needs to be handled by
> software. Firstly OpenSBI configures the memory region as
> "Memory, Non-cacheable, Bufferable" and passes this region as a global
> shared dma pool as a DT node. With DMA_GLOBAL_POOL enabled all DMA
> allocations happen from this region and synchronization callbacks are
> implemented to synchronize when doing DMA transactions.
>
> SBI_EXT_ANDES_IOCP_SW_WORKAROUND checks if the IOCP errata should be
> applied to handle cache management.
>
> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
> ---
> v8->v9
> * Moved vendor_ext_provider callback to andes45_sbi.c
> * Updated commit message
> * Dropped RB tags
>
> v7->v8
> * Fixed typo controlable -> controllable
> * Included RB tag from Lin-san and Conor
>
> v6->v7
> * Added a new section for conf and control registers
> * Made use of misa_extension('U')
> * For unsupported funcid's now returning SBI_EINVAL
> * Renamed ANDES_SBI_EXT_IOCP_SW_WORKAROUND -> SBI_EXT_ANDES_IOCP_SW_WORKAROUND
>
> v5->v6
> * Moved ANDES_SBI_EXT_IOCP_SW_WORKAROUND to andes_sbi.h
> * Moved helpers to check IOCP to common header so that we re-use code
>
> v5:
> https://patchwork.ozlabs.org/project/opensbi/patch/20230213215111.32017-4-prabhakar.mahadev-lad.rj at bp.renesas.com/
> ---
> platform/generic/Kconfig | 1 +
> platform/generic/andes/Kconfig | 4 ++
> platform/generic/andes/andes45_sbi.c | 51 ++++++++++++++++++++
> platform/generic/andes/objects.mk | 1 +
> platform/generic/include/andes/andes45.h | 23 ++++++++-
> platform/generic/include/andes/andes45_sbi.h | 13 +++++
> platform/generic/renesas/rzfive/rzfive.c | 2 +
> 7 files changed, 93 insertions(+), 2 deletions(-)
> create mode 100644 platform/generic/andes/andes45_sbi.c
> create mode 100644 platform/generic/include/andes/andes45_sbi.h
>
> diff --git a/platform/generic/Kconfig b/platform/generic/Kconfig
> index 1f4f8e1..6ec25db 100644
> --- a/platform/generic/Kconfig
> +++ b/platform/generic/Kconfig
> @@ -36,6 +36,7 @@ config PLATFORM_ANDES_AE350
> config PLATFORM_RENESAS_RZFIVE
> bool "Renesas RZ/Five support"
> select ANDES45_PMA
> + select ANDES45_SBI
andes_sbi is preferred,
the other CPU series can reuse these files and functions.
Best regards,
Peter Lin
> default n
>
> config PLATFORM_SIFIVE_FU540
> diff --git a/platform/generic/andes/Kconfig b/platform/generic/andes/Kconfig
> index 3ad4e4c..ec904dc 100644
> --- a/platform/generic/andes/Kconfig
> +++ b/platform/generic/andes/Kconfig
> @@ -3,3 +3,7 @@
> config ANDES45_PMA
> bool "Andes PMA support"
> default n
> +
> +config ANDES45_SBI
> + bool "Andes SBI support"
> + default n
> diff --git a/platform/generic/andes/andes45_sbi.c b/platform/generic/andes/andes45_sbi.c
> new file mode 100644
> index 0000000..4539e23
> --- /dev/null
> +++ b/platform/generic/andes/andes45_sbi.c
> @@ -0,0 +1,51 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright (C) 2023 Renesas Electronics Corp.
> + *
> + */
> +#include <andes/andes45.h>
> +#include <andes/andes45_sbi.h>
> +#include <sbi/riscv_asm.h>
> +#include <sbi/sbi_error.h>
> +
> +enum sbi_ext_andes_fid {
> + SBI_EXT_ANDES_FID0 = 0, /* Reserved for future use */
> + SBI_EXT_ANDES_IOCP_SW_WORKAROUND,
> +};
> +
> +static bool andes45_cache_controllable(void)
> +{
> + return (((csr_read(CSR_MICM_CFG) & MICM_CFG_ISZ_MASK) ||
> + (csr_read(CSR_MDCM_CFG) & MDCM_CFG_DSZ_MASK)) &&
> + (csr_read(CSR_MMSC_CFG) & MMSC_CFG_CCTLCSR_MASK) &&
> + (csr_read(CSR_MCACHE_CTL) & MCACHE_CTL_CCTL_SUEN_MASK) &&
> + misa_extension('U'));
> +}
> +
> +static bool andes45_iocp_disabled(void)
> +{
> + return (csr_read(CSR_MMSC_CFG) & MMSC_IOCP_MASK) ? false : true;
> +}
> +
> +static bool andes45_apply_iocp_sw_workaround(void)
> +{
> + return andes45_cache_controllable() & andes45_iocp_disabled();
> +}
> +
> +int andes45_sbi_vendor_ext_provider(long funcid,
> + const struct sbi_trap_regs *regs,
> + unsigned long *out_value,
> + struct sbi_trap_info *out_trap,
> + const struct fdt_match *match)
> +{
> + switch (funcid) {
> + case SBI_EXT_ANDES_IOCP_SW_WORKAROUND:
> + *out_value = andes45_apply_iocp_sw_workaround();
> + break;
> +
> + default:
> + return SBI_EINVAL;
> + }
> +
> + return 0;
> +}
> diff --git a/platform/generic/andes/objects.mk b/platform/generic/andes/objects.mk
> index ea6b561..346df2d 100644
> --- a/platform/generic/andes/objects.mk
> +++ b/platform/generic/andes/objects.mk
> @@ -6,3 +6,4 @@ carray-platform_override_modules-$(CONFIG_PLATFORM_ANDES_AE350) += andes_ae350
> platform-objs-$(CONFIG_PLATFORM_ANDES_AE350) += andes/ae350.o andes/sleep.o
>
> platform-objs-$(CONFIG_ANDES45_PMA) += andes/andes45-pma.o
> +platform-objs-$(CONFIG_ANDES45_SBI) += andes/andes45_sbi.o
> diff --git a/platform/generic/include/andes/andes45.h b/platform/generic/include/andes/andes45.h
> index 08b3d18..f570994 100644
> --- a/platform/generic/include/andes/andes45.h
> +++ b/platform/generic/include/andes/andes45.h
> @@ -4,7 +4,26 @@
> #define CSR_MARCHID_MICROID 0xfff
>
> /* Memory and Miscellaneous Registers */
> -#define CSR_MCACHE_CTL 0x7ca
> -#define CSR_MCCTLCOMMAND 0x7cc
> +#define CSR_MCACHE_CTL 0x7ca
> +#define CSR_MCCTLCOMMAND 0x7cc
> +
> +/* Configuration Control & Status Registers */
> +#define CSR_MICM_CFG 0xfc0
> +#define CSR_MDCM_CFG 0xfc1
> +#define CSR_MMSC_CFG 0xfc2
> +
> +#define MICM_CFG_ISZ_OFFSET 6
> +#define MICM_CFG_ISZ_MASK (0x7 << MICM_CFG_ISZ_OFFSET)
> +
> +#define MDCM_CFG_DSZ_OFFSET 6
> +#define MDCM_CFG_DSZ_MASK (0x7 << MDCM_CFG_DSZ_OFFSET)
> +
> +#define MMSC_CFG_CCTLCSR_OFFSET 16
> +#define MMSC_CFG_CCTLCSR_MASK (0x1 << MMSC_CFG_CCTLCSR_OFFSET)
> +#define MMSC_IOCP_OFFSET 47
> +#define MMSC_IOCP_MASK (0x1ULL << MMSC_IOCP_OFFSET)
> +
> +#define MCACHE_CTL_CCTL_SUEN_OFFSET 8
> +#define MCACHE_CTL_CCTL_SUEN_MASK (0x1 << MCACHE_CTL_CCTL_SUEN_OFFSET)
>
> #endif /* _RISCV_ANDES45_H */
> diff --git a/platform/generic/include/andes/andes45_sbi.h b/platform/generic/include/andes/andes45_sbi.h
> new file mode 100644
> index 0000000..54e9aa2
> --- /dev/null
> +++ b/platform/generic/include/andes/andes45_sbi.h
> @@ -0,0 +1,13 @@
> +#ifndef _RISCV_ANDES45_SBI_H
> +#define _RISCV_ANDES45_SBI_H
> +
> +#include <sbi/sbi_trap.h>
> +#include <sbi_utils/fdt/fdt_helper.h>
> +
> +int andes45_sbi_vendor_ext_provider(long funcid,
> + const struct sbi_trap_regs *regs,
> + unsigned long *out_value,
> + struct sbi_trap_info *out_trap,
> + const struct fdt_match *match);
> +
> +#endif /* _RISCV_ANDES45_SBI_H */
> diff --git a/platform/generic/renesas/rzfive/rzfive.c b/platform/generic/renesas/rzfive/rzfive.c
> index 4d71d0d..664adfc 100644
> --- a/platform/generic/renesas/rzfive/rzfive.c
> +++ b/platform/generic/renesas/rzfive/rzfive.c
> @@ -5,6 +5,7 @@
> */
>
> #include <andes/andes45_pma.h>
> +#include <andes/andes45_sbi.h>
> #include <platform_override.h>
> #include <sbi/sbi_domain.h>
> #include <sbi_utils/fdt/fdt_helper.h>
> @@ -55,4 +56,5 @@ const struct platform_override renesas_rzfive = {
> .match_table = renesas_rzfive_match,
> .early_init = renesas_rzfive_early_init,
> .final_init = renesas_rzfive_final_init,
> + .vendor_ext_provider = andes45_sbi_vendor_ext_provider,
> };
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-04-06 19:31 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-06 10:08 [PATCH v9] platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata Lad Prabhakar
2023-04-06 16:07 ` Anup Patel
2023-04-06 19:31 ` Yu-Chien Peter Lin
2023-04-06 11:43 ` Lad, Prabhakar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.