Skip to contentSkip to conversation

platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata

PATCH Superseded Lad Prabhakar 4 participants 4 messages Apr 6, 2023

v9 of 10 Superseded Latest is v10 →

lore
Share & tools
lore
#0 lore raw

PATCH v9 1/1 platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata

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.

---
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
platform/generic/Kconfig +1 -0
index 1f4f8e1..6ec25db 100644
@@ -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
platform/generic/andes/Kconfig +4 -0
index 3ad4e4c..ec904dc 100644
@@ -3,3 +3,7 @@
 config ANDES45_PMA
 	bool "Andes PMA support"
 	default n
+
+config ANDES45_SBI
+	bool "Andes SBI support"
+	default n
platform/generic/andes/andes45_sbi.c new file +51 -0

51 lines not on this page · raw message

platform/generic/andes/objects.mk +1 -0
index ea6b561..346df2d 100644
@@ -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
platform/generic/include/andes/andes45.h +21 -2
index 08b3d18..f570994 100644
@@ -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 */
platform/generic/include/andes/andes45_sbi.h new file +13 -0
new file mode 100644
index 0000000..54e9aa2
@@ -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 */
platform/generic/renesas/rzfive/rzfive.c +2 -0
index 4d71d0d..664adfc 100644
@@ -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,
 };
Signature · 1 line
2.17.1
#1 lore raw

PATCH v9 1/1 platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata

Hi Prabhakar,

Quoted 58 lines · Lad Prabhakar

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.

---
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
platform/generic/Kconfig +0 -0
index 1f4f8e1..6ec25db 100644

platform/generic/Kconfig config PLATFORM_ANDES_AE350 · line 39

Quoted 4 lines
platform/generic/Kconfig +1 -0
@@ -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

Quoted 154 lines
platform/generic/Kconfig +0 -0
 	default n
 
 config PLATFORM_SIFIVE_FU540
platform/generic/andes/Kconfig +4 -0
index 3ad4e4c..ec904dc 100644
@@ -3,3 +3,7 @@
 config ANDES45_PMA
 	bool "Andes PMA support"
 	default n
+
+config ANDES45_SBI
+	bool "Andes SBI support"
+	default n
platform/generic/andes/andes45_sbi.c new file +51 -0
new file mode 100644
index 0000000..4539e23
@@ -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;
+}
platform/generic/andes/objects.mk +1 -0
index ea6b561..346df2d 100644
@@ -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
platform/generic/include/andes/andes45.h +21 -2
index 08b3d18..f570994 100644
@@ -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 */
platform/generic/include/andes/andes45_sbi.h new file +13 -0
new file mode 100644
index 0000000..54e9aa2
@@ -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 */
platform/generic/renesas/rzfive/rzfive.c +2 -0
index 4d71d0d..664adfc 100644
@@ -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,
 };
Signature · 1 line
2.17.1
#2 lore raw

PATCH v9 1/1 platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata

Hi Lin-san,

Thank you for the review.

Quoted 57 lines · On Thu, Apr 6, 2023 at 12:37?PM Yu-Chien Peter Lin <[email protected]>…

Hi Prabhakar,

Quoted 53 lines · Lad Prabhakar

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.

---
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
Quoted 13 lines

platform/generic/Kconfig config PLATFORM_ANDES_AE350 · line 39

Quoted 9 lines
platform/generic/Kconfig +1 -0
index 1f4f8e1..6ec25db 100644
@@ -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

#3 lore raw

PATCH v9 1/1 platform: generic: andes/renesas: Add SBI EXT to check for enabling IOCP errata

In reply to Lad Prabhakar
Quoted 16 lines · On Thu, Apr 6, 2023 at 3:39?PM Lad Prabhakar…

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.

Quoted 4 lines

SBI_EXT_ANDES_IOCP_SW_WORKAROUND checks if the IOCP errata should be applied to handle cache management.

I think you missed a few Reviewed-by tags from previous revisions.

Regards,
Anup

Quoted 202 lines

---
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
platform/generic/Kconfig +1 -0
index 1f4f8e1..6ec25db 100644
@@ -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
platform/generic/andes/Kconfig +4 -0
index 3ad4e4c..ec904dc 100644
@@ -3,3 +3,7 @@
 config ANDES45_PMA
        bool "Andes PMA support"
        default n
+
+config ANDES45_SBI
+       bool "Andes SBI support"
+       default n
platform/generic/andes/andes45_sbi.c new file +51 -0
new file mode 100644
index 0000000..4539e23
@@ -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;
+}
platform/generic/andes/objects.mk +1 -0
index ea6b561..346df2d 100644
@@ -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
platform/generic/include/andes/andes45.h +21 -2
index 08b3d18..f570994 100644
@@ -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 */
platform/generic/include/andes/andes45_sbi.h new file +13 -0
new file mode 100644
index 0000000..54e9aa2
@@ -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 */
platform/generic/renesas/rzfive/rzfive.c +2 -1
index 4d71d0d..664adfc 100644
@@ -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