Skip to contentSkip to conversation

Add SiFive TMC0 and SMC0 driver

PATCH Applied Nick Hu 2 participants 18 messages Oct 20, 2025 – Oct 28, 2025 SiFive drivers

lore
Share & tools
lore

Nick Hu

author
#0 lore raw

v7 cover Add SiFive TMC0 and SMC0 driver

SiFive TMC0 and SMC0 are the power controllers that controls the Tile and CoreComplex power domain. Add the drivers to support the power management features such as HSM STOP and System Suspend.

Features such as power management may require flushing the entire cache before entering a non-retention power state. To support this, a simple cache flush framework is introduced to allow the external CMO to perform a full cache flush.

---
Changes in v7:
- Update the change log of PATCH 9 and PATCH 12 because the TMC0 and SMC0 are moved to the lib/utils/hsm and lib/utils/suspend.
- Add new commit to Extend the sbi_ipi_raw_send() to use all available IPI device in PATCH 8 and use it in PATCH 9
- Add system_resume callback for system suspend
- Since the SMC0 driver need the aplic_reinit_all(), update the
SMC0 Kconfig option to depend upon the APLIC Kconfig option
- Link to v6: https://lore.kernel.org/r/[email protected]

Changes in v6:
- Rename the aplic_restore() to aplic_reinit_all()
- Remove fdt_hsm_sifive_tmc0_cold_init() from TMC0 header file
- Remove the sifive_dev_platform.c
- Add a dummy inline flavor of fdt_cmo_init() for the case where CONFIG_FDT_CACHE is disabled
- Link to v5: https://lore.kernel.org/r/[email protected]

Changes in v5:
- Put the SiFive TMC0 driver to the fdt_early_driver
- Fix the format of the comments in SiFive TMC0 driver

Changes in v4:
- Call fdt_cmo_init() directly as part of generic_early_init()
- Rename SBI_HART_EXT_XSF* to SBI_HART_EXT_XSIFIVE*
- Move the TMC0 driver to the lib/utils/hsm/
- Move the SMC0 driver to the lib/utils/suspend/

Changes in v3:
- Add the SiFive TMC and SMC driver

Changes in v2:
- Since the platform override hooks was deprecated, use the fdt_driver for initializing the sifive_dev_platform.

---
Nick Hu (10):
lib: utils: Add cache flush library
lib: utils: Add FDT cache library
lib: utils/cache: Add fdt cmo helpers
lib: sbi: Add SiFive proprietary xsfcflushdlone
lib: sbi: Add SiFive proprietary xsfcease
lib: sbi: Extends sbi_ipi_raw_send() to use all available IPI devices
lib: utils/irqchip: Add APLIC restore function
platform: sifive: Add SiFive TMC0 driver
lib: utils/timer: Expose timer update function
platform: sifive: Add SiFive SMC0 driver

Vincent Chen (1):
utils: cache: Add SiFive ccache controller

 include/sbi/sbi_hart.h                        |   4 +
 include/sbi_utils/cache/cache.h               |  69 +++
 include/sbi_utils/cache/fdt_cache.h           |  34 ++
 include/sbi_utils/cache/fdt_cmo_helper.h      |  34 ++
 include/sbi_utils/hsm/fdt_hsm_sifive_inst.h   |  20 +
 include/sbi_utils/hsm/fdt_hsm_sifive_tmc0.h   |  19 +
 include/sbi_utils/ipi/aclint_mswi.h           |   1 +
 include/sbi_utils/irqchip/aplic.h             |   3 +
 .../suspend/fdt_suspend_sifive_smc0.h         |  18 +
 include/sbi_utils/timer/aclint_mtimer.h       |   5 +
 lib/sbi/sbi_hart.c                            |   2 +
 lib/utils/Kconfig                             |   2 +
 lib/utils/cache/Kconfig                       |  23 +
 lib/utils/cache/cache.c                       |  46 ++
 lib/utils/cache/fdt_cache.c                   |  87 ++++
 lib/utils/cache/fdt_cache_drivers.carray      |   3 +
 lib/utils/cache/fdt_cmo_helper.c              | 112 +++++
 lib/utils/cache/fdt_sifive_ccache.c           | 175 +++++++
 lib/utils/cache/objects.mk                    |  14 +
 lib/utils/hsm/Kconfig                         |   5 +
 lib/utils/hsm/fdt_hsm_sifive_tmc0.c           | 468 ++++++++++++++++++
 lib/utils/hsm/objects.mk                      |   2 +
 lib/utils/ipi/aclint_mswi.c                   |   5 +
 lib/utils/irqchip/aplic.c                     | 160 +++---
 lib/utils/suspend/Kconfig                     |   4 +
 lib/utils/suspend/fdt_suspend_sifive_smc0.c   | 323 ++++++++++++
 lib/utils/suspend/objects.mk                  |   3 +
 lib/utils/timer/aclint_mtimer.c               |  28 +-
 platform/generic/Kconfig                      |   5 +
 platform/generic/configs/defconfig            |   5 +
 platform/generic/platform.c                   |   3 +-
 platform/generic/sifive/objects.mk            |   3 +
 platform/generic/sifive/sifive_dev_platform.c |  57 +++
 33 files changed, 1667 insertions(+), 75 deletions(-)
 create mode 100644 include/sbi_utils/cache/cache.h
 create mode 100644 include/sbi_utils/cache/fdt_cache.h
 create mode 100644 include/sbi_utils/cache/fdt_cmo_helper.h
 create mode 100644 include/sbi_utils/hsm/fdt_hsm_sifive_inst.h
 create mode 100644 include/sbi_utils/hsm/fdt_hsm_sifive_tmc0.h
 create mode 100644 include/sbi_utils/suspend/fdt_suspend_sifive_smc0.h
 create mode 100644 lib/utils/cache/Kconfig
 create mode 100644 lib/utils/cache/cache.c
 create mode 100644 lib/utils/cache/fdt_cache.c
 create mode 100644 lib/utils/cache/fdt_cache_drivers.carray
 create mode 100644 lib/utils/cache/fdt_cmo_helper.c
 create mode 100644 lib/utils/cache/fdt_sifive_ccache.c
 create mode 100644 lib/utils/cache/objects.mk
 create mode 100644 lib/utils/hsm/fdt_hsm_sifive_tmc0.c
 create mode 100644 lib/utils/suspend/fdt_suspend_sifive_smc0.c
 create mode 100644 platform/generic/sifive/sifive_dev_platform.c

--
2.17.1

--
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi

To: [email protected]

---
Nick Hu (11):
lib: utils: Add cache flush library
lib: utils: Add FDT cache library
lib: utils/cache: Add fdt cmo helpers
lib: sbi: Add SiFive proprietary xsfcflushdlone
lib: sbi: Add SiFive proprietary xsfcease
lib: utils/irqchip: Add APLIC restore function
lib: sbi: Extends sbi_ipi_raw_send() to use all available IPI devices
lib: utils/hsm: Add SiFive TMC0 driver
lib: utils/timer: Expose timer update function
lib: sbi: Add system_resume callback for restoring the system
lib: utils/suspend: Add SiFive SMC0 driver

Vincent Chen (1):
utils: cache: Add SiFive ccache controller

 include/sbi/sbi_hart.h                      |   4 +
 include/sbi/sbi_ipi.h                       |   2 +-
 include/sbi/sbi_system.h                    |   7 +
 include/sbi_utils/cache/cache.h             |  69 ++++++
 include/sbi_utils/cache/fdt_cache.h         |  34 +++
 include/sbi_utils/cache/fdt_cmo_helper.h    |  40 +++
 include/sbi_utils/hsm/fdt_hsm_sifive_inst.h |  20 ++
 include/sbi_utils/hsm/fdt_hsm_sifive_tmc0.h |  14 ++
 include/sbi_utils/irqchip/aplic.h           |   3 +
 include/sbi_utils/timer/aclint_mtimer.h     |   5 +
 lib/sbi/sbi_hart.c                          |   2 +
 lib/sbi/sbi_hsm.c                           |   7 +-
 lib/sbi/sbi_ipi.c                           |  16 +-
 lib/sbi/sbi_system.c                        |  17 ++
 lib/utils/Kconfig                           |   2 +
 lib/utils/cache/Kconfig                     |  23 ++
 lib/utils/cache/cache.c                     |  46 ++++
 lib/utils/cache/fdt_cache.c                 |  87 +++++++
 lib/utils/cache/fdt_cache_drivers.carray    |   3 +
 lib/utils/cache/fdt_cmo_helper.c            | 112 +++++++++
 lib/utils/cache/fdt_sifive_ccache.c         | 175 +++++++++++++
 lib/utils/cache/objects.mk                  |  14 ++
 lib/utils/hsm/Kconfig                       |   5 +
 lib/utils/hsm/fdt_hsm_sifive_tmc0.c         | 367 ++++++++++++++++++++++++++++
 lib/utils/hsm/objects.mk                    |   3 +
 lib/utils/irqchip/aplic.c                   | 164 +++++++------
 lib/utils/suspend/Kconfig                   |   4 +
 lib/utils/suspend/fdt_suspend_sifive_smc0.c | 318 ++++++++++++++++++++++++
 lib/utils/suspend/objects.mk                |   3 +
 lib/utils/timer/aclint_mtimer.c             |  28 ++-
 platform/generic/andes/ae350.c              |   2 +-
 platform/generic/configs/defconfig          |   4 +
 platform/generic/platform.c                 |   3 +-
 33 files changed, 1520 insertions(+), 83 deletions(-)

---
base-commit: e3eb59a396ac55975e3debecfc5b71418eb62248
change-id: 20250829-cache-upstream-93730838a1a6

Best regards,

Signature · 7 lines
Nick Hu <[email protected]>


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#1 lore raw

PATCH v7 1/12 lib: utils: Add cache flush library

The current RISC-V CMO only defines how to flush a cache block. However, certain use cases, such as power management, may require flushing the entire cache. Therefore, a framework is being introduced to allow vendors to flush the entire cache using their own methods.

---
 include/sbi_utils/cache/cache.h | 69 +++++++++++++++++++++++++++++++++++++++++
 lib/utils/Kconfig               |  2 ++
 lib/utils/cache/Kconfig         |  9 ++++++
 lib/utils/cache/cache.c         | 46 +++++++++++++++++++++++++++
 lib/utils/cache/objects.mk      |  7 +++++
 5 files changed, 133 insertions(+)
include/sbi_utils/cache/cache.h new file +69 -0
new file mode 100644
index 0000000000000000000000000000000000000000..70d9286f9a0a63b8fe13827925163db84f88bdc2
@@ -0,0 +1,69 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 SiFive Inc.
+ */
+
+#ifndef __CACHE_H__
+#define __CACHE_H__
+
+#include <sbi/sbi_list.h>
+#include <sbi/sbi_types.h>
+
+#define CACHE_NAME_LEN	32
+
+struct cache_device;
+
+struct cache_ops {
+	/** Warm init **/
+	int (*warm_init)(struct cache_device *dev);
+	/** Flush entire cache **/
+	int (*cache_flush_all)(struct cache_device *dev);
+};
+
+struct cache_device {
+	/** Name of the device **/
+	char name[CACHE_NAME_LEN];
+	/** List node for search **/
+	struct sbi_dlist node;
+	/** Point to the next level cache **/
+	struct cache_device *next;
+	/** Cache Management Operations **/
+	struct cache_ops *ops;
+	/** CPU private cache **/
+	bool cpu_private;
+	/** The unique id of this cache device **/
+	u32 id;
+};
+
+/**
+ * Find a registered cache device
+ *
+ * @param id unique ID of the cache device
+ *
+ * @return the cache device or NULL
+ */
+struct cache_device *cache_find(u32 id);
+
+/**
+ * Register a cache device
+ *
+ * cache_device->id must be initialized already and must not change during the life
+ * of the cache_device object.
+ *
+ * @param dev the cache device to register
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int cache_add(struct cache_device *dev);
+
+/**
+ * Flush the entire cache
+ *
+ * @param dev the cache to flush
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int cache_flush_all(struct cache_device *dev);
+
+#endif
lib/utils/Kconfig +2 -0
index 901ba564610ce8619f585b31cca3e9eadc358b31..5a5b3b1e0f1c0ce2f638593bcf186b617803110d 100644
@@ -2,6 +2,8 @@
 
 menu "Utils and Drivers Support"
 
+source "$(OPENSBI_SRC_DIR)/lib/utils/cache/Kconfig"
+
 source "$(OPENSBI_SRC_DIR)/lib/utils/cppc/Kconfig"
 
 source "$(OPENSBI_SRC_DIR)/lib/utils/fdt/Kconfig"
lib/utils/cache/Kconfig new file +9 -0
new file mode 100644
index 0000000000000000000000000000000000000000..24aa41bcf966cd42c719d995fa2f9f6ab62ad904
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: BSD-2-Clause
+
+menu "Cache Support"
+
+config CACHE
+	bool "Cache support"
+	default n
+
+endmenu
lib/utils/cache/cache.c new file +46 -0

46 lines not on this page · raw message

lib/utils/cache/objects.mk new file +7 -0
new file mode 100644
index 0000000000000000000000000000000000000000..21d30ce8e18236eb90d666b884e10918a9a8fa0b
@@ -0,0 +1,7 @@
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+# Copyright (c) 2025 SiFive
+#
+
+libsbiutils-objs-$(CONFIG_CACHE) += cache/cache.o
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#2 lore raw

PATCH v7 2/12 lib: utils: Add FDT cache library

In reply to Nick Hu

Add the FDT cache library so we can build up the cache topology via the 'next-level-cache' DT property.

---
 include/sbi_utils/cache/fdt_cache.h      | 34 +++++++++++++
 lib/utils/cache/Kconfig                  |  6 +++
 lib/utils/cache/fdt_cache.c              | 87 ++++++++++++++++++++++++++++++++
 lib/utils/cache/fdt_cache_drivers.carray |  3 ++
 lib/utils/cache/objects.mk               |  3 ++
 platform/generic/configs/defconfig       |  1 +
 6 files changed, 134 insertions(+)
include/sbi_utils/cache/fdt_cache.h new file +34 -0
new file mode 100644
index 0000000000000000000000000000000000000000..b377d6f502ff1496497172a7e09f3cca239003a9
@@ -0,0 +1,34 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 SiFive Inc.
+ */
+
+#ifndef __FDT_CACHE_H__
+#define __FDT_CACHE_H__
+
+#include <sbi_utils/cache/cache.h>
+
+/**
+ * Register a cache device using information from the DT
+ *
+ * @param fdt devicetree blob
+ * @param noff offset of a node in the devicetree blob
+ * @param dev cache device to register for this devicetree node
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int fdt_cache_add(const void *fdt, int noff, struct cache_device *dev);
+
+/**
+ * Get the cache device referencd by the "next-level-cache" property of a DT node
+ *
+ * @param fdt devicetree blob
+ * @param noff offset of a node in the devicetree blob
+ * @param out_dev location to return the cache device
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int fdt_next_cache_get(const void *fdt, int noff, struct cache_device **out_dev);
+
+#endif
lib/utils/cache/Kconfig +6 -0
index 24aa41bcf966cd42c719d995fa2f9f6ab62ad904..106021762f33229e66bf91c648c3c9febc4d325c 100644
@@ -2,6 +2,12 @@
 
 menu "Cache Support"
 
+config FDT_CACHE
+	bool "FDT based cache drivers"
+	depends on FDT
+	select CACHE
+	default n
+
 config CACHE
 	bool "Cache support"
 	default n
lib/utils/cache/fdt_cache.c new file +87 -0

87 lines not on this page · raw message

lib/utils/cache/fdt_cache_drivers.carray new file +3 -0
new file mode 100644
index 0000000000000000000000000000000000000000..c1b1791c553a69a809a0930081fbff8952d30c74
@@ -0,0 +1,3 @@
+HEADER: sbi_utils/cache/fdt_cache.h
+TYPE: const struct fdt_driver
+NAME: fdt_cache_drivers
lib/utils/cache/objects.mk +3 -0
index 21d30ce8e18236eb90d666b884e10918a9a8fa0b..2fcf9666592700ff7c1fb924c5b9ea2de722fc2a 100644
@@ -4,4 +4,7 @@
 # Copyright (c) 2025 SiFive
 #
 
+libsbiutils-objs-$(CONFIG_FDT_CACHE) += cache/fdt_cache.o
+libsbiutils-objs-$(CONFIG_FDT_CACHE) += cache/fdt_cache_drivers.carray.o
+
 libsbiutils-objs-$(CONFIG_CACHE) += cache/cache.o
platform/generic/configs/defconfig +1 -0
index fb90bb3e3c561fa169d8aeb6aed80f5146f0254f..7107e225cdd78287a296ca898c33659ecc89c969 100644
@@ -9,6 +9,7 @@ CONFIG_PLATFORM_STARFIVE_JH7110=y
 CONFIG_PLATFORM_THEAD=y
 CONFIG_PLATFORM_MIPS_P8700=y
 CONFIG_PLATFORM_OPENHWGROUP_OPENPITON=y
+CONFIG_FDT_CACHE=y
 CONFIG_FDT_CPPC=y
 CONFIG_FDT_CPPC_RPMI=y
 CONFIG_FDT_GPIO=y
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#3 lore raw

PATCH v7 3/12 utils: cache: Add SiFive ccache controller

In reply to Nick Hu

From: Vincent Chen <[email protected]>

SiFive Composable cache is a L3 share cache of the core complex. Add this driver to support the share cache maintenance operations via the MMIO registers.

---
 lib/utils/cache/Kconfig             |   8 ++
 lib/utils/cache/fdt_sifive_ccache.c | 175 ++++++++++++++++++++++++++++++++++++
 lib/utils/cache/objects.mk          |   3 +
 platform/generic/configs/defconfig  |   1 +
 4 files changed, 187 insertions(+)
lib/utils/cache/Kconfig +8 -0
index 106021762f33229e66bf91c648c3c9febc4d325c..1c7abdc9ad93319569807b4e25623cac871c6ce3 100644
@@ -8,6 +8,14 @@ config FDT_CACHE
 	select CACHE
 	default n
 
+if FDT_CACHE
+
+config FDT_CACHE_SIFIVE_CCACHE
+	bool "SiFive CCACHE FDT cache driver"
+	default n
+
+endif
+
 config CACHE
 	bool "Cache support"
 	default n
lib/utils/cache/fdt_sifive_ccache.c new file +175 -0

175 lines not on this page · raw message

lib/utils/cache/objects.mk +3 -0
index 2fcf9666592700ff7c1fb924c5b9ea2de722fc2a..a343eb8c4bd495a1596845c1fd02420277023430 100644
@@ -7,4 +7,7 @@
 libsbiutils-objs-$(CONFIG_FDT_CACHE) += cache/fdt_cache.o
 libsbiutils-objs-$(CONFIG_FDT_CACHE) += cache/fdt_cache_drivers.carray.o
 
+carray-fdt_cache_drivers-$(CONFIG_FDT_CACHE_SIFIVE_CCACHE) += fdt_sifive_ccache
+libsbiutils-objs-$(CONFIG_FDT_CACHE_SIFIVE_CCACHE) += cache/fdt_sifive_ccache.o
+
 libsbiutils-objs-$(CONFIG_CACHE) += cache/cache.o
platform/generic/configs/defconfig +1 -0
index 7107e225cdd78287a296ca898c33659ecc89c969..86decbd0755e74c658b23e0097d103ded25a10d1 100644
@@ -10,6 +10,7 @@ CONFIG_PLATFORM_THEAD=y
 CONFIG_PLATFORM_MIPS_P8700=y
 CONFIG_PLATFORM_OPENHWGROUP_OPENPITON=y
 CONFIG_FDT_CACHE=y
+CONFIG_FDT_CACHE_SIFIVE_CCACHE=y
 CONFIG_FDT_CPPC=y
 CONFIG_FDT_CPPC_RPMI=y
 CONFIG_FDT_GPIO=y
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#4 lore raw

PATCH v7 4/12 lib: utils/cache: Add fdt cmo helpers

In reply to Nick Hu

Add the helpers to build up the cache hierarchy via FDT and provide some cmo functions for the user who want to flush the entire cache.

---
 include/sbi_utils/cache/fdt_cmo_helper.h |  40 +++++++++++
 lib/utils/cache/fdt_cmo_helper.c         | 112 +++++++++++++++++++++++++++++++
 lib/utils/cache/objects.mk               |   1 +
 platform/generic/platform.c              |   3 +-
 4 files changed, 155 insertions(+), 1 deletion(-)
include/sbi_utils/cache/fdt_cmo_helper.h new file +40 -0
new file mode 100644
index 0000000000000000000000000000000000000000..a6a28db9ede2722d8261d2e077eeb7710cff0893
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 SiFive Inc.
+ */
+
+#ifndef __FDT_CMO_HELPER_H__
+#define __FDT_CMO_HELPER_H__
+
+#ifdef CONFIG_FDT_CACHE
+/**
+ * Flush the private first level cache of the current hart
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int fdt_cmo_private_flc_flush_all(void);
+
+/**
+ * Flush the last level cache of the current hart
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int fdt_cmo_llc_flush_all(void);
+
+/**
+ * Initialize the cache devices for each hart
+ *
+ * @param fdt devicetree blob
+ * @param cold_boot cold init or warm init
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int fdt_cmo_init(bool cold_boot);
+
+#else
+
+static inline int fdt_cmo_init(bool cold_boot) { return 0; }
+
+#endif /* CONFIG_FDT_CACHE */
+#endif /* __FDT_CMO_HELPER_H__ */
lib/utils/cache/fdt_cmo_helper.c new file +112 -0

112 lines not on this page · raw message

lib/utils/cache/objects.mk +1 -0
index a343eb8c4bd495a1596845c1fd02420277023430..6829a966784732127d93180b3eb46ed24de5bc7d 100644
@@ -6,6 +6,7 @@
 
 libsbiutils-objs-$(CONFIG_FDT_CACHE) += cache/fdt_cache.o
 libsbiutils-objs-$(CONFIG_FDT_CACHE) += cache/fdt_cache_drivers.carray.o
+libsbiutils-objs-$(CONFIG_FDT_CACHE) += cache/fdt_cmo_helper.o
 
 carray-fdt_cache_drivers-$(CONFIG_FDT_CACHE_SIFIVE_CCACHE) += fdt_sifive_ccache
 libsbiutils-objs-$(CONFIG_FDT_CACHE_SIFIVE_CCACHE) += cache/fdt_sifive_ccache.o
platform/generic/platform.c +2 -1
index 91140958a0f4294428221c91fe2792eb6b1b02d5..e66f99fa8a88d1badd3843305e34486a548bf465 100644
@@ -17,6 +17,7 @@
 #include <sbi/sbi_string.h>
 #include <sbi/sbi_system.h>
 #include <sbi/sbi_tlb.h>
+#include <sbi_utils/cache/fdt_cmo_helper.h>
 #include <sbi_utils/fdt/fdt_domain.h>
 #include <sbi_utils/fdt/fdt_driver.h>
 #include <sbi_utils/fdt/fdt_fixup.h>
@@ -230,7 +231,7 @@ int generic_early_init(bool cold_boot)
 		fdt_driver_init_all(fdt, fdt_early_drivers);
 	}
 
-	return 0;
+	return fdt_cmo_init(cold_boot);
 }
 
 int generic_final_init(bool cold_boot)
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
#5 lore raw

Re: [PATCH v7 04/12] lib: utils/cache: Add fdt cmo helpers

Quoted 122 lines · Nick Hu

Add the helpers to build up the cache hierarchy via FDT and provide some cmo functions for the user who want to flush the entire cache.

---
 include/sbi_utils/cache/fdt_cmo_helper.h |  40 +++++++++++
 lib/utils/cache/fdt_cmo_helper.c         | 112 +++++++++++++++++++++++++++++++
 lib/utils/cache/objects.mk               |   1 +
 platform/generic/platform.c              |   3 +-
 4 files changed, 155 insertions(+), 1 deletion(-)
include/sbi_utils/cache/fdt_cmo_helper.h new file +40 -0
new file mode 100644
index 0000000000000000000000000000000000000000..a6a28db9ede2722d8261d2e077eeb7710cff0893
@@ -0,0 +1,40 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 SiFive Inc.
+ */
+
+#ifndef __FDT_CMO_HELPER_H__
+#define __FDT_CMO_HELPER_H__
+
+#ifdef CONFIG_FDT_CACHE
+/**
+ * Flush the private first level cache of the current hart
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int fdt_cmo_private_flc_flush_all(void);
+
+/**
+ * Flush the last level cache of the current hart
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int fdt_cmo_llc_flush_all(void);
+
+/**
+ * Initialize the cache devices for each hart
+ *
+ * @param fdt devicetree blob
+ * @param cold_boot cold init or warm init
+ *
+ * @return 0 on success, or a negative error code on failure
+ */
+int fdt_cmo_init(bool cold_boot);
+
+#else
+
+static inline int fdt_cmo_init(bool cold_boot) { return 0; }
+
+#endif /* CONFIG_FDT_CACHE */
+#endif /* __FDT_CMO_HELPER_H__ */
lib/utils/cache/fdt_cmo_helper.c new file +56 -0
new file mode 100644
index 0000000000000000000000000000000000000000..6d2e853dd735735092c57db2398f97a64de3ab5e
@@ -0,0 +1,112 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 SiFive Inc.
+ */
+
+#include <libfdt.h>
+#include <sbi/sbi_error.h>
+#include <sbi/sbi_scratch.h>
+#include <sbi_utils/cache/fdt_cache.h>
+#include <sbi_utils/cache/fdt_cmo_helper.h>
+#include <sbi_utils/fdt/fdt_helper.h>
+
+static unsigned long flc_offset;
+
+#define get_hart_flc(_s) \
+       sbi_scratch_read_type(_s, struct cache_device *, flc_offset)
+#define set_hart_flc(_s, _p) \
+       sbi_scratch_write_type(_s, struct cache_device *, flc_offset, _p)
+
+int fdt_cmo_private_flc_flush_all(void)
+{
+       struct cache_device *flc = get_hart_flc(sbi_scratch_thishart_ptr());
+
+       if (!flc || !flc->cpu_private)
+               return SBI_ENODEV;
+
+       return cache_flush_all(flc);
+}
+
+int fdt_cmo_llc_flush_all(void)
+{
+       struct cache_device *llc = get_hart_flc(sbi_scratch_thishart_ptr());
+
+       if (!llc)
+               return SBI_ENODEV;
+
+       while (llc->next)
+               llc = llc->next;
+
+       return cache_flush_all(llc);
+}
+
+static int fdt_cmo_cold_init(const void *fdt)
+{
+       struct sbi_scratch *scratch;
+       struct cache_device *dev;
+       int cpu_offset, cpus_offset, rc;
+       u32 hartid;
+
+       cpus_offset = fdt_path_offset(fdt, "/cpus");
+       if (cpus_offset < 0)
+               return SBI_EINVAL;
+
+       fdt_for_each_subnode(cpu_offset, fdt, cpus_offset) {
+               rc = fdt_parse_hart_id(fdt, cpu_offset, &hartid);

lib/utils/cache/fdt_cmo_helper.c line 66

Quoted 10 lines
lib/utils/cache/fdt_cmo_helper.c new file +10 -0
+               if (rc)
+                       continue;
+
+               scratch = sbi_hartid_to_scratch(hartid);
+               if (!scratch)
+                       continue;
+
+               rc = fdt_next_cache_get(fdt, cpu_offset, &dev);
+               if (rc)
+                       return rc;

The "next-level-cache" property might be absent in CPU DT nodes so fdt_next_cache_get() must return SBI_ENOENT when it is absent.

Also, over here we must handle "rc == SBI_ENOENT" as special case as follows:

lib/utils/cache/fdt_cmo_helper.c +3 -1
index 6d2e853d..d87bab76 100644
@@ -62,8 +62,10 @@ static int fdt_cmo_cold_init(const void *fdt)
                        continue;
 
                rc = fdt_next_cache_get(fdt, cpu_offset, &dev);
-               if (rc)
+               if (rc && rc != SBI_ENOENT)
                        return rc;
+               if (rc == SBI_ENOENT)
+                       dev = NULL;
 
                set_hart_flc(scratch, dev);
        }

I will take care of the above at the time of merging this series.

Regards,
Anup

Signature · 3 lines
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#6 lore raw

PATCH v7 5/12 lib: sbi: Add SiFive proprietary xsfcflushdlone

In reply to Nick Hu

Using ISA string "xsfcflushdlone" to detect the support of the SiFive L1D cache flush custom instruction.

---
 include/sbi/sbi_hart.h | 2 ++
 lib/sbi/sbi_hart.c     | 1 +
 2 files changed, 3 insertions(+)
include/sbi/sbi_hart.h +2 -0
index 82b19dcfd4582b39e1dafb6bdb41d2fbe77dc419..fdcf400aa8c494cd941c412294bd0c118c5ec2af 100644
@@ -81,6 +81,8 @@ enum sbi_hart_extensions {
 	SBI_HART_EXT_SSCTR,
 	/** HART has Ssstateen extension **/
 	SBI_HART_EXT_SSSTATEEN,
+	/** Hart has Xsfcflushdlone extension */
+	SBI_HART_EXT_XSIFIVE_CFLUSH_D_L1,
 
 	/** Maximum index of Hart extension */
 	SBI_HART_EXT_MAX,
lib/sbi/sbi_hart.c +1 -0
index 1b50f67198d5c2416b3db988c4ac05eba6b9cd53..4159dff54387f677d4fddcf115ebc9f9ed9be86d 100644
@@ -715,6 +715,7 @@ const struct sbi_hart_ext_data sbi_hart_ext[] = {
 	__SBI_HART_EXT_DATA(smctr, SBI_HART_EXT_SMCTR),
 	__SBI_HART_EXT_DATA(ssctr, SBI_HART_EXT_SSCTR),
 	__SBI_HART_EXT_DATA(ssstateen, SBI_HART_EXT_SSSTATEEN),
+	__SBI_HART_EXT_DATA(xsfcflushdlone, SBI_HART_EXT_XSIFIVE_CFLUSH_D_L1),
 };
 
 _Static_assert(SBI_HART_EXT_MAX == array_size(sbi_hart_ext),
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#7 lore raw

PATCH v7 6/12 lib: sbi: Add SiFive proprietary xsfcease

In reply to Nick Hu

Using ISA string "xsfcease" to detect the support of the custom instruction "CEASE".

---
 include/sbi/sbi_hart.h | 2 ++
 lib/sbi/sbi_hart.c     | 1 +
 2 files changed, 3 insertions(+)
include/sbi/sbi_hart.h +2 -0
index fdcf400aa8c494cd941c412294bd0c118c5ec2af..ff682fb4579291cd9e5fb36ca5ab392aa376d37f 100644
@@ -83,6 +83,8 @@ enum sbi_hart_extensions {
 	SBI_HART_EXT_SSSTATEEN,
 	/** Hart has Xsfcflushdlone extension */
 	SBI_HART_EXT_XSIFIVE_CFLUSH_D_L1,
+	/** Hart has Xsfcease extension */
+	SBI_HART_EXT_XSIFIVE_CEASE,
 
 	/** Maximum index of Hart extension */
 	SBI_HART_EXT_MAX,
lib/sbi/sbi_hart.c +1 -0
index 4159dff54387f677d4fddcf115ebc9f9ed9be86d..de1358180f208dd9ca9bf2feeb43ab648999847e 100644
@@ -716,6 +716,7 @@ const struct sbi_hart_ext_data sbi_hart_ext[] = {
 	__SBI_HART_EXT_DATA(ssctr, SBI_HART_EXT_SSCTR),
 	__SBI_HART_EXT_DATA(ssstateen, SBI_HART_EXT_SSSTATEEN),
 	__SBI_HART_EXT_DATA(xsfcflushdlone, SBI_HART_EXT_XSIFIVE_CFLUSH_D_L1),
+	__SBI_HART_EXT_DATA(xsfcease, SBI_HART_EXT_XSIFIVE_CEASE),
 };
 
 _Static_assert(SBI_HART_EXT_MAX == array_size(sbi_hart_ext),
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#8 lore raw

PATCH v7 7/12 lib: utils/irqchip: Add APLIC restore function

In reply to Nick Hu

Since the APLIC may enter a reset state upon system wake-up from a platform low power state, adding a restore function to reinitialize the APLIC.

---
 include/sbi_utils/irqchip/aplic.h |   3 +
 lib/utils/irqchip/aplic.c         | 164 ++++++++++++++++++++++----------------
 2 files changed, 99 insertions(+), 68 deletions(-)
include/sbi_utils/irqchip/aplic.h +3 -0
index e31f48a45019e1874e3223e3fb232f553890d06d..cbfcd3fd17bc09a644bf47e7d2716123c25a305e 100644
@@ -33,6 +33,7 @@ struct aplic_delegate_data {
 struct aplic_data {
 	/* Private members */
 	struct sbi_irqchip_device irqchip;
+	struct sbi_dlist node;
 	/* Public members */
 	unsigned long addr;
 	unsigned long size;
@@ -48,4 +49,6 @@ struct aplic_data {
 
 int aplic_cold_irqchip_init(struct aplic_data *aplic);
 
+void aplic_reinit_all(void);
+
 #endif
lib/utils/irqchip/aplic.c +96 -68

199 lines not on this page · raw message

Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#9 lore raw

PATCH v7 8/12 lib: sbi: Extends sbi_ipi_raw_send() to use all available IPI devices

In reply to Nick Hu

A platform may contain multiple IPI devices. In certain use cases, such as power management, it may be necessary to send an IPI through a specific device to wake up a CPU. For example, if an IMSIC is powered down and reset, the core cannot receive IPIs from it, so the wake-up must instead be triggered through the CLINT.

---
 include/sbi/sbi_ipi.h          |  2 +-
 lib/sbi/sbi_hsm.c              |  2 +-
 lib/sbi/sbi_ipi.c              | 16 +++++++++++++---
 platform/generic/andes/ae350.c |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)
include/sbi/sbi_ipi.h +1 -1
index 26d1b66b7cfffbaa6f7cadd0fab8c810adfb1811..2c231041662bfb55b2f962ca48d724cf6aa53f6d 100644
@@ -88,7 +88,7 @@ int sbi_ipi_send_halt(ulong hmask, ulong hbase);
 
 void sbi_ipi_process(void);
 
-int sbi_ipi_raw_send(u32 hartindex);
+int sbi_ipi_raw_send(u32 hartindex, bool all_devices);
 
 void sbi_ipi_raw_clear(bool all_devices);
 
lib/sbi/sbi_hsm.c +1 -1
index bb274b33d6ee5e3db9953f4b591502e4522d99d1..0d97b43e0cd8f7b4fc97407ef01007485e3f5a24 100644
@@ -364,7 +364,7 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch,
 	   (hsm_device_has_hart_secondary_boot() && !init_count)) {
 		rc = hsm_device_hart_start(hartid, scratch->warmboot_addr);
 	} else {
-		rc = sbi_ipi_raw_send(hartindex);
+		rc = sbi_ipi_raw_send(hartindex, true);
 	}
 
 	if (!rc)
lib/sbi/sbi_ipi.c +13 -3
index ed9ccffb6c96cdfa1151a22d07c2bfc8181769bd..5b2d2f72eeb918a8877b4b8fbf201f2b9628f069 100644
@@ -88,7 +88,7 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 remote_hartindex,
 	 */
 	if (!__atomic_fetch_or(&ipi_data->ipi_type,
 				BIT(event), __ATOMIC_RELAXED))
-		ret = sbi_ipi_raw_send(remote_hartindex);
+		ret = sbi_ipi_raw_send(remote_hartindex, false);
 
 	sbi_pmu_ctr_incr_fw(SBI_PMU_FW_IPI_SENT);
 
@@ -271,8 +271,10 @@ void sbi_ipi_process(void)
 	}
 }
 
-int sbi_ipi_raw_send(u32 hartindex)
+int sbi_ipi_raw_send(u32 hartindex, bool all_devices)
 {
+	struct sbi_ipi_device_node *entry;
+
 	if (!ipi_dev || !ipi_dev->ipi_send)
 		return SBI_EINVAL;
 
@@ -287,7 +289,15 @@ int sbi_ipi_raw_send(u32 hartindex)
 	 */
 	wmb();
 
-	ipi_dev->ipi_send(hartindex);
+	if (all_devices) {
+		sbi_list_for_each_entry(entry, &ipi_dev_node_list, head) {
+			if (entry->dev->ipi_send)
+				entry->dev->ipi_send(hartindex);
+		}
+	} else {
+		ipi_dev->ipi_send(hartindex);
+	}
+
 	return 0;
 }
 
platform/generic/andes/ae350.c +1 -1
index f06e207d80f58703098ef805a14e1f8764c2cb16..0808065745af21f5d65f0114ca33a23949280296 100644
@@ -35,7 +35,7 @@ static int ae350_hart_start(u32 hartid, ulong saddr)
 	 * 2) the target hart is non-sleepable 25-series hart0
 	 */
 	if (!sbi_init_count(hartindex) || (is_andes(25) && hartid == 0))
-		return sbi_ipi_raw_send(hartindex);
+		return sbi_ipi_raw_send(hartindex, false);
 
 	/* Write wakeup command to the sleep hart */
 	smu_set_command(&smu, WAKEUP_CMD, hartid);
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
Reviewed-by on v7 8/12
#10 lore raw

Re: [PATCH v7 08/12] lib: sbi: Extends sbi_ipi_raw_send() to use all available IPI devices

Quoted 9 lines · Nick Hu

A platform may contain multiple IPI devices. In certain use cases, such as power management, it may be necessary to send an IPI through a specific device to wake up a CPU. For example, if an IMSIC is powered down and reset, the core cannot receive IPIs from it, so the wake-up must instead be triggered through the CLINT.

LGTM.

Regards,
Anup

Quoted 92 lines
---
 include/sbi/sbi_ipi.h          |  2 +-
 lib/sbi/sbi_hsm.c              |  2 +-
 lib/sbi/sbi_ipi.c              | 16 +++++++++++++---
 platform/generic/andes/ae350.c |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)
include/sbi/sbi_ipi.h +1 -1
index 26d1b66b7cfffbaa6f7cadd0fab8c810adfb1811..2c231041662bfb55b2f962ca48d724cf6aa53f6d 100644
@@ -88,7 +88,7 @@ int sbi_ipi_send_halt(ulong hmask, ulong hbase);
 
 void sbi_ipi_process(void);
 
-int sbi_ipi_raw_send(u32 hartindex);
+int sbi_ipi_raw_send(u32 hartindex, bool all_devices);
 
 void sbi_ipi_raw_clear(bool all_devices);
 
lib/sbi/sbi_hsm.c +1 -1
index bb274b33d6ee5e3db9953f4b591502e4522d99d1..0d97b43e0cd8f7b4fc97407ef01007485e3f5a24 100644
@@ -364,7 +364,7 @@ int sbi_hsm_hart_start(struct sbi_scratch *scratch,
           (hsm_device_has_hart_secondary_boot() && !init_count)) {
                rc = hsm_device_hart_start(hartid, scratch->warmboot_addr);
        } else {
-               rc = sbi_ipi_raw_send(hartindex);
+               rc = sbi_ipi_raw_send(hartindex, true);
        }
 
        if (!rc)
lib/sbi/sbi_ipi.c +13 -3
index ed9ccffb6c96cdfa1151a22d07c2bfc8181769bd..5b2d2f72eeb918a8877b4b8fbf201f2b9628f069 100644
@@ -88,7 +88,7 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 remote_hartindex,
         */
        if (!__atomic_fetch_or(&ipi_data->ipi_type,
                                BIT(event), __ATOMIC_RELAXED))
-               ret = sbi_ipi_raw_send(remote_hartindex);
+               ret = sbi_ipi_raw_send(remote_hartindex, false);
 
        sbi_pmu_ctr_incr_fw(SBI_PMU_FW_IPI_SENT);
 
@@ -271,8 +271,10 @@ void sbi_ipi_process(void)
        }
 }
 
-int sbi_ipi_raw_send(u32 hartindex)
+int sbi_ipi_raw_send(u32 hartindex, bool all_devices)
 {
+       struct sbi_ipi_device_node *entry;
+
        if (!ipi_dev || !ipi_dev->ipi_send)
                return SBI_EINVAL;
 
@@ -287,7 +289,15 @@ int sbi_ipi_raw_send(u32 hartindex)
         */
        wmb();
 
-       ipi_dev->ipi_send(hartindex);
+       if (all_devices) {
+               sbi_list_for_each_entry(entry, &ipi_dev_node_list, head) {
+                       if (entry->dev->ipi_send)
+                               entry->dev->ipi_send(hartindex);
+               }
+       } else {
+               ipi_dev->ipi_send(hartindex);
+       }
+
        return 0;
 }
 
platform/generic/andes/ae350.c +1 -2
index f06e207d80f58703098ef805a14e1f8764c2cb16..0808065745af21f5d65f0114ca33a23949280296 100644
@@ -35,7 +35,7 @@ static int ae350_hart_start(u32 hartid, ulong saddr)
         * 2) the target hart is non-sleepable 25-series hart0
         */
        if (!sbi_init_count(hartindex) || (is_andes(25) && hartid == 0))
-               return sbi_ipi_raw_send(hartindex);
+               return sbi_ipi_raw_send(hartindex, false);
 
        /* Write wakeup command to the sleep hart */
        smu_set_command(&smu, WAKEUP_CMD, hartid);
 
--

2.34.1

Signature · 3 lines
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#11 lore raw

PATCH v7 9/12 lib: utils/hsm: Add SiFive TMC0 driver

In reply to Nick Hu

The SiFive TMC0 controls the tile power domains on SiFive platform. The CPU enters the low power state via the CEASE instruction after configuring the TMC0. Any devices that inside the tile power domain will be power gated, including the private cache. Therefore flushing the private cache before entering the low power state.

---
 include/sbi_utils/hsm/fdt_hsm_sifive_inst.h |  20 ++
 lib/utils/hsm/Kconfig                       |   5 +
 lib/utils/hsm/fdt_hsm_sifive_tmc0.c         | 310 ++++++++++++++++++++++++++++
 lib/utils/hsm/objects.mk                    |   3 +
 platform/generic/configs/defconfig          |   1 +
 5 files changed, 339 insertions(+)
include/sbi_utils/hsm/fdt_hsm_sifive_inst.h new file +20 -0
new file mode 100644
index 0000000000000000000000000000000000000000..de8aba190fd782e497e6f71662e734fac7b076fe
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 SiFive Inc.
+ */
+
+#ifndef __FDT_HSM_SIFIVE_INST_H__
+#define __FDT_HSM_SIFIVE_INST_H__
+
+static inline void sifive_cease(void)
+{
+	__asm__ __volatile__(".insn 0x30500073" ::: "memory");
+}
+
+static inline void sifive_cflush(void)
+{
+	__asm__ __volatile__(".insn 0xfc000073" ::: "memory");
+}
+
+#endif
lib/utils/hsm/Kconfig +5 -0
index 1ad7958fb582a3ee561dfaec4afd738054b58906..5861b064aa35c14a8b3f78e61a4e27ae0482258e 100644
@@ -14,6 +14,11 @@ config FDT_HSM_RPMI
 	depends on FDT_MAILBOX && RPMI_MAILBOX
 	default n
 
+config FDT_HSM_SIFIVE_TMC0
+	bool "FDT SiFive TMC v0 driver"
+	depends on FDT_CACHE
+	default n
+
 endif
 
 endmenu
lib/utils/hsm/fdt_hsm_sifive_tmc0.c new file +310 -0

310 lines not on this page · raw message

lib/utils/hsm/objects.mk +3 -0
index c13d81f78dd69ceb37cf83b19b10bc95c3dcfaff..6fbae628aa615e8ddcd41d01973303f2e36100d1 100644
@@ -9,3 +9,6 @@
 
 carray-fdt_early_drivers-$(CONFIG_FDT_HSM_RPMI) += fdt_hsm_rpmi
 libsbiutils-objs-$(CONFIG_FDT_HSM_RPMI) += hsm/fdt_hsm_rpmi.o
+
+carray-fdt_early_drivers-$(CONFIG_FDT_HSM_SIFIVE_TMC0) += fdt_hsm_sifive_tmc0
+libsbiutils-objs-$(CONFIG_FDT_HSM_SIFIVE_TMC0) += hsm/fdt_hsm_sifive_tmc0.o
\ No newline at end of file
platform/generic/configs/defconfig +1 -0
index 86decbd0755e74c658b23e0097d103ded25a10d1..897d552813121f22c812e9760d2b144f41141c49 100644
@@ -19,6 +19,7 @@ CONFIG_FDT_GPIO_SIFIVE=y
 CONFIG_FDT_GPIO_STARFIVE=y
 CONFIG_FDT_HSM=y
 CONFIG_FDT_HSM_RPMI=y
+CONFIG_FDT_HSM_SIFIVE_TMC0=y
 CONFIG_FDT_I2C=y
 CONFIG_FDT_I2C_SIFIVE=y
 CONFIG_FDT_I2C_DW=y
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
Reviewed-by on v7 9/12
#12 lore raw

Re: [PATCH v7 09/12] lib: utils/hsm: Add SiFive TMC0 driver

Quoted 11 lines · Nick Hu

The SiFive TMC0 controls the tile power domains on SiFive platform. The CPU enters the low power state via the CEASE instruction after configuring the TMC0. Any devices that inside the tile power domain will be power gated, including the private cache. Therefore flushing the private cache before entering the low power state.

LGTM.

Regards,
Anup

Quoted 399 lines
---
 include/sbi_utils/hsm/fdt_hsm_sifive_inst.h |  20 ++
 lib/utils/hsm/Kconfig                       |   5 +
 lib/utils/hsm/fdt_hsm_sifive_tmc0.c         | 310 ++++++++++++++++++++++++++++
 lib/utils/hsm/objects.mk                    |   3 +
 platform/generic/configs/defconfig          |   1 +
 5 files changed, 339 insertions(+)
include/sbi_utils/hsm/fdt_hsm_sifive_inst.h new file +20 -0
new file mode 100644
index 0000000000000000000000000000000000000000..de8aba190fd782e497e6f71662e734fac7b076fe
@@ -0,0 +1,20 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 SiFive Inc.
+ */
+
+#ifndef __FDT_HSM_SIFIVE_INST_H__
+#define __FDT_HSM_SIFIVE_INST_H__
+
+static inline void sifive_cease(void)
+{
+       __asm__ __volatile__(".insn 0x30500073" ::: "memory");
+}
+
+static inline void sifive_cflush(void)
+{
+       __asm__ __volatile__(".insn 0xfc000073" ::: "memory");
+}
+
+#endif
lib/utils/hsm/Kconfig +5 -0
index 1ad7958fb582a3ee561dfaec4afd738054b58906..5861b064aa35c14a8b3f78e61a4e27ae0482258e 100644
@@ -14,6 +14,11 @@ config FDT_HSM_RPMI
        depends on FDT_MAILBOX && RPMI_MAILBOX
        default n
 
+config FDT_HSM_SIFIVE_TMC0
+       bool "FDT SiFive TMC v0 driver"
+       depends on FDT_CACHE
+       default n
+
 endif
 
 endmenu
lib/utils/hsm/fdt_hsm_sifive_tmc0.c new file +310 -0
new file mode 100644
index 0000000000000000000000000000000000000000..8b08a7d1bf025f033ee0ebbe02fb97c70d0afeef
@@ -0,0 +1,310 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 SiFive
+ */
+
+#include <libfdt.h>
+#include <sbi/riscv_asm.h>
+#include <sbi/riscv_io.h>
+#include <sbi/sbi_bitops.h>
+#include <sbi/sbi_console.h>
+#include <sbi/sbi_error.h>
+#include <sbi/sbi_hart.h>
+#include <sbi/sbi_heap.h>
+#include <sbi/sbi_hsm.h>
+#include <sbi/sbi_ipi.h>
+#include <sbi_utils/cache/fdt_cmo_helper.h>
+#include <sbi_utils/fdt/fdt_driver.h>
+#include <sbi_utils/fdt/fdt_helper.h>
+#include <sbi_utils/hsm/fdt_hsm_sifive_inst.h>
+
+struct sifive_tmc0 {
+       unsigned long reg;
+       struct sbi_dlist node;
+       u32 id;
+};
+
+static SBI_LIST_HEAD(tmc0_list);
+static unsigned long tmc0_offset;
+
+#define tmc0_ptr_get(__scratch)                                \
+       sbi_scratch_read_type((__scratch), struct sifive_tmc0 *, tmc0_offset)
+
+#define tmc0_ptr_set(__scratch, __tmc0)                        \
+       sbi_scratch_write_type((__scratch), struct sifive_tmc0 *, tmc0_offset, (__tmc0))
+
+/* TMC.PGPREP */
+#define SIFIVE_TMC_PGPREP_OFF                  0x0
+#define SIFIVE_TMC_PGPREP_ENA_REQ              BIT(31)
+#define SIFIVE_TMC_PGPREP_ENA_ACK              BIT(30)
+#define SIFIVE_TMC_PGPREP_DIS_REQ              BIT(29)
+#define SIFIVE_TMC_PGPREP_DIS_ACK              BIT(28)
+#define SIFIVE_TMC_PGPREP_CLFPNOTQ             BIT(18)
+#define SIFIVE_TMC_PGPREP_PMCENAERR            BIT(17)
+#define SIFIVE_TMC_PGPREP_PMCDENY              BIT(16)
+#define SIFIVE_TMC_PGPREP_BUSERR               BIT(15)
+#define SIFIVE_TMC_PGPREP_WAKE_DETECT          BIT(12)
+#define SIFIVE_TMC_PGPREP_INTERNAL_ABORT       BIT(2)
+#define SIFIVE_TMC_PGPREP_ENARSP               (SIFIVE_TMC_PGPREP_CLFPNOTQ | \
+                                                SIFIVE_TMC_PGPREP_PMCENAERR | \
+                                                SIFIVE_TMC_PGPREP_PMCDENY | \
+                                                SIFIVE_TMC_PGPREP_BUSERR | \
+                                                SIFIVE_TMC_PGPREP_WAKE_DETECT)
+
+/* TMC.PG */
+#define SIFIVE_TMC_PG_OFF                      0x4
+#define SIFIVE_TMC_PG_ENA_REQ                  BIT(31)
+#define SIFIVE_TMC_PG_ENA_ACK                  BIT(30)
+#define SIFIVE_TMC_PG_DIS_REQ                  BIT(29)
+#define SIFIVE_TMC_PG_DIS_ACK                  BIT(28)
+#define SIFIVE_TMC_PG_PMC_ENA_ERR              BIT(17)
+#define SIFIVE_TMC_PG_PMC_DENY                 BIT(16)
+#define SIFIVE_TMC_PG_BUS_ERR                  BIT(15)
+#define SIFIVE_TMC_PG_MASTNOTQ                 BIT(14)
+#define SIFIVE_TMC_PG_WARM_RESET               BIT(1)
+#define SIFIVE_TMC_PG_ENARSP                   (SIFIVE_TMC_PG_PMC_ENA_ERR | \
+                                                SIFIVE_TMC_PG_PMC_DENY | \
+                                                SIFIVE_TMC_PG_BUS_ERR | \
+                                                SIFIVE_TMC_PG_MASTNOTQ)
+
+/* TMC.RESUMEPC */
+#define SIFIVE_TMC_RESUMEPC_LO                 0x10
+#define SIFIVE_TMC_RESUMEPC_HI                 0x14
+
+/* TMC.WAKEMASK */
+#define SIFIVE_TMC_WAKE_MASK_OFF               0x20
+#define SIFIVE_TMC_WAKE_MASK_WREQ              BIT(31)
+#define SIFIVE_TMC_WAKE_MASK_ACK               BIT(30)
+
+static void sifive_tmc0_set_resumepc(physical_addr_t addr)
+{
+       struct sifive_tmc0 *tmc0 = tmc0_ptr_get(sbi_scratch_thishart_ptr());
+
+       writel((u32)addr, (void *)(tmc0->reg + SIFIVE_TMC_RESUMEPC_LO));
+#if __riscv_xlen > 32
+       writel((u32)(addr >> 32), (void *)(tmc0->reg + SIFIVE_TMC_RESUMEPC_HI));
+#endif
+}
+
+static u32 sifive_tmc0_set_pgprep_enareq(void)
+{
+       struct sifive_tmc0 *tmc0 = tmc0_ptr_get(sbi_scratch_thishart_ptr());
+       unsigned long reg = tmc0->reg + SIFIVE_TMC_PGPREP_OFF;
+       u32 v = readl((void *)reg);
+
+       writel(v | SIFIVE_TMC_PGPREP_ENA_REQ, (void *)reg);
+       while (!(readl((void *)reg) & SIFIVE_TMC_PGPREP_ENA_ACK));
+
+       v = readl((void *)reg);
+       return v & SIFIVE_TMC_PGPREP_INTERNAL_ABORT;
+}
+
+static void sifive_tmc0_set_pgprep_disreq(void)
+{
+       struct sifive_tmc0 *tmc0 = tmc0_ptr_get(sbi_scratch_thishart_ptr());
+       unsigned long reg = tmc0->reg + SIFIVE_TMC_PGPREP_OFF;
+       u32 v = readl((void *)reg);
+
+       writel(v | SIFIVE_TMC_PGPREP_DIS_REQ, (void *)reg);
+       while (!(readl((void *)reg) & SIFIVE_TMC_PGPREP_DIS_ACK));
+}
+
+static u32 sifive_tmc0_get_pgprep_enarsp(void)
+{
+       struct sifive_tmc0 *tmc0 = tmc0_ptr_get(sbi_scratch_thishart_ptr());
+       unsigned long reg = tmc0->reg + SIFIVE_TMC_PGPREP_OFF;
+       u32 v = readl((void *)reg);
+
+       return v & SIFIVE_TMC_PGPREP_ENARSP;
+}
+
+static void sifive_tmc0_set_pg_enareq(void)
+{
+       struct sifive_tmc0 *tmc0 = tmc0_ptr_get(sbi_scratch_thishart_ptr());
+       unsigned long reg = tmc0->reg + SIFIVE_TMC_PG_OFF;
+       u32 v = readl((void *)reg);
+
+       writel(v | SIFIVE_TMC_PG_ENA_REQ, (void *)reg);
+}
+
+static int sifive_tmc0_prep(void)
+{
+       struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
+       u32 rc;
+
+       if (!tmc0_ptr_get(scratch))
+               return SBI_ENODEV;
+
+       rc = sifive_tmc0_set_pgprep_enareq();
+       if (rc) {
+               sbi_printf("TMC0 error: Internal Abort (Wake detect)\n");
+               goto fail;
+       }
+
+       rc = sifive_tmc0_get_pgprep_enarsp();
+       if (rc) {
+               sifive_tmc0_set_pgprep_disreq();
+               sbi_printf("TMC0 error: error response code: 0x%x\n", rc);
+               goto fail;
+       }
+
+       sifive_tmc0_set_resumepc(scratch->warmboot_addr);
+
+       return SBI_OK;
+
+fail:
+       return SBI_EFAIL;
+}
+
+static int sifive_tmc0_enter(void)
+{
+       struct sbi_scratch *scratch = sbi_scratch_thishart_ptr();
+       u32 rc;
+
+       /* Flush cache and check if there is wake detect or bus error */
+       if (fdt_cmo_private_flc_flush_all() &&
+           sbi_hart_has_extension(scratch, SBI_HART_EXT_XSIFIVE_CFLUSH_D_L1))
+               sifive_cflush();
+
+       rc = sifive_tmc0_get_pgprep_enarsp();
+       if (rc) {
+               sbi_printf("TMC0 error: error response code: 0x%x\n", rc);
+               goto fail;
+       }
+
+       if (sbi_hart_has_extension(scratch, SBI_HART_EXT_XSIFIVE_CEASE)) {
+               sifive_tmc0_set_pg_enareq();
+               while (1)
+                       sifive_cease();
+       }
+
+       rc = SBI_ENOTSUPP;
+fail:
+       sifive_tmc0_set_pgprep_disreq();
+       return rc;
+}
+
+static int sifive_tmc0_tile_pg(void)
+{
+       int rc;
+
+       rc = sifive_tmc0_prep();
+       if (rc)
+               return rc;
+
+       return sifive_tmc0_enter();
+}
+
+static int sifive_tmc0_start(u32 hartid, ulong saddr)
+{
+       /*
+        * In system suspend, the IMSIC will be reset in SiFive platform so
+        * we use the CLINT IPI as the wake event.
+        */
+       sbi_ipi_raw_send(sbi_hartid_to_hartindex(hartid), true);
+
+       return SBI_OK;
+}
+
+static int sifive_tmc0_stop(void)
+{
+       unsigned long mie = csr_read(CSR_MIE);
+       int rc;
+       /* Set IPI as wake up source */
+       csr_set(CSR_MIE, MIP_MEIP | MIP_MSIP);
+
+       rc = sifive_tmc0_tile_pg();
+       if (rc) {
+               csr_write(CSR_MIE, mie);
+               return rc;
+       }
+
+       return SBI_OK;
+}
+
+static struct sbi_hsm_device tmc0_hsm_dev = {
+       .name = "SiFive TMC0",
+       .hart_start = sifive_tmc0_start,
+       .hart_stop = sifive_tmc0_stop,
+};
+
+static int sifive_tmc0_bind_cpu(struct sifive_tmc0 *tmc0)
+{
+       const void *fdt = fdt_get_address();
+       struct sbi_scratch *scratch;
+       int cpus_off, cpu_off, rc;
+       const fdt32_t *val;
+       u32 hartid;
+
+       cpus_off = fdt_path_offset(fdt, "/cpus");
+       if (cpus_off < 0)
+               return SBI_ENOENT;
+
+       fdt_for_each_subnode(cpu_off, fdt, cpus_off) {
+               rc = fdt_parse_hart_id(fdt, cpu_off, &hartid);
+               if (rc)
+                       continue;
+
+               scratch = sbi_hartid_to_scratch(hartid);
+               if (!scratch)
+                       continue;
+
+               val = fdt_getprop(fdt, cpu_off, "power-domains", NULL);
+               if (!val)
+                       return SBI_ENOENT;
+
+               if (tmc0->id == fdt32_to_cpu(val[0])) {
+                       tmc0_ptr_set(scratch, tmc0);
+                       return SBI_OK;
+               }
+       }
+
+       return SBI_ENODEV;
+}
+
+static int sifive_tmc0_probe(const void *fdt, int nodeoff, const struct fdt_match *match)
+{
+       struct sifive_tmc0 *tmc0;
+       u64 addr;
+       int rc;
+
+       if (!tmc0_offset) {
+               tmc0_offset = sbi_scratch_alloc_type_offset(struct sifive_tmc0 *);
+               if (!tmc0_offset)
+                       return SBI_ENOMEM;
+
+               sbi_hsm_set_device(&tmc0_hsm_dev);
+       }
+
+       tmc0 = sbi_zalloc(sizeof(*tmc0));
+       if (!tmc0)
+               return SBI_ENOMEM;
+
+       rc = fdt_get_node_addr_size(fdt, nodeoff, 0, &addr, NULL);
+       if (rc)
+               goto free_tmc0;
+
+       tmc0->reg = (unsigned long)addr;
+       tmc0->id = fdt_get_phandle(fdt_get_address(), nodeoff);
+
+       rc = sifive_tmc0_bind_cpu(tmc0);
+       if (rc)
+               goto free_tmc0;
+
+       return SBI_OK;
+
+free_tmc0:
+       sbi_free(tmc0);
+       return rc;
+}
+
+static const struct fdt_match sifive_tmc0_match[] = {
+       { .compatible = "sifive,tmc0" },
+       { },
+};
+
+const struct fdt_driver fdt_hsm_sifive_tmc0 = {
+       .match_table = sifive_tmc0_match,
+       .init = sifive_tmc0_probe,
+};
lib/utils/hsm/objects.mk +3 -0
index c13d81f78dd69ceb37cf83b19b10bc95c3dcfaff..6fbae628aa615e8ddcd41d01973303f2e36100d1 100644
@@ -9,3 +9,6 @@
 
 carray-fdt_early_drivers-$(CONFIG_FDT_HSM_RPMI) += fdt_hsm_rpmi
 libsbiutils-objs-$(CONFIG_FDT_HSM_RPMI) += hsm/fdt_hsm_rpmi.o
+
+carray-fdt_early_drivers-$(CONFIG_FDT_HSM_SIFIVE_TMC0) += fdt_hsm_sifive_tmc0
+libsbiutils-objs-$(CONFIG_FDT_HSM_SIFIVE_TMC0) += hsm/fdt_hsm_sifive_tmc0.o
\ No newline at end of file
platform/generic/configs/defconfig +1 -1
index 86decbd0755e74c658b23e0097d103ded25a10d1..897d552813121f22c812e9760d2b144f41141c49 100644
@@ -19,6 +19,7 @@ CONFIG_FDT_GPIO_SIFIVE=y
 CONFIG_FDT_GPIO_STARFIVE=y
 CONFIG_FDT_HSM=y
 CONFIG_FDT_HSM_RPMI=y
+CONFIG_FDT_HSM_SIFIVE_TMC0=y
 CONFIG_FDT_I2C=y
 CONFIG_FDT_I2C_SIFIVE=y
 CONFIG_FDT_I2C_DW=y
 
--

2.34.1

--
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi

Signature · 3 lines
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#13 lore raw

PATCH v7 10/12 lib: utils/timer: Expose timer update function

In reply to Nick Hu

Exposing the ACLINT timer update APIs so the user can update the mtimer after waking up from the non-retentive suspend.

---
 include/sbi_utils/timer/aclint_mtimer.h |  5 +++++
 lib/utils/timer/aclint_mtimer.c         | 28 +++++++++++++++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
include/sbi_utils/timer/aclint_mtimer.h +5 -0
index a245e13e285f2ad658fce7db6366fe8b7bae8c2a..f8d2e5b4c210164c8a737e82643e5e49807753c4 100644
@@ -42,6 +42,11 @@ struct aclint_mtimer_data {
 	void (*time_wr)(bool timecmp, u64 value, volatile u64 *addr);
 };
 
+struct aclint_mtimer_data *aclint_get_mtimer_data(void);
+
+void aclint_mtimer_update(struct aclint_mtimer_data *mt,
+			  struct aclint_mtimer_data *ref);
+
 void aclint_mtimer_sync(struct aclint_mtimer_data *mt);
 
 void aclint_mtimer_set_reference(struct aclint_mtimer_data *mt,
lib/utils/timer/aclint_mtimer.c +21 -7
index 3db3c3be2575e4ddd0180c90f254f7733b7c1daa..fd6189aaa52ad92ca28330fcf0f701ac0b8c337f 100644
@@ -109,28 +109,42 @@ static struct sbi_timer_device mtimer = {
 	.timer_event_stop = mtimer_event_stop
 };
 
-void aclint_mtimer_sync(struct aclint_mtimer_data *mt)
+struct aclint_mtimer_data *aclint_get_mtimer_data(void)
+{
+	return mtimer_get_hart_data_ptr(sbi_scratch_thishart_ptr());
+}
+
+void aclint_mtimer_update(struct aclint_mtimer_data *mt,
+			  struct aclint_mtimer_data *ref)
 {
 	u64 v1, v2, mv, delta;
 	u64 *mt_time_val, *ref_time_val;
-	struct aclint_mtimer_data *reference;
 
-	/* Sync-up non-shared MTIME if reference is available */
-	if (mt->has_shared_mtime || !mt->time_delta_reference)
+	if (!mt || !ref || !mt->time_rd || !mt->time_wr || !ref->time_rd)
 		return;
 
-	reference = mt->time_delta_reference;
 	mt_time_val = (void *)mt->mtime_addr;
-	ref_time_val = (void *)reference->mtime_addr;
+	ref_time_val = (void *)ref->mtime_addr;
 	if (!atomic_raw_xchg_ulong(&mt->time_delta_computed, 1)) {
 		v1 = mt->time_rd(mt_time_val);
-		mv = reference->time_rd(ref_time_val);
+		mv = ref->time_rd(ref_time_val);
 		v2 = mt->time_rd(mt_time_val);
 		delta = mv - ((v1 / 2) + (v2 / 2));
 		mt->time_wr(false, mt->time_rd(mt_time_val) + delta,
 			    mt_time_val);
 	}
+}
 
+void aclint_mtimer_sync(struct aclint_mtimer_data *mt)
+{
+	struct aclint_mtimer_data *reference;
+
+	/* Sync-up non-shared MTIME if reference is available */
+	if (mt->has_shared_mtime || !mt->time_delta_reference)
+		return;
+
+	reference = mt->time_delta_reference;
+	aclint_mtimer_update(mt, reference);
 }
 
 void aclint_mtimer_set_reference(struct aclint_mtimer_data *mt,
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#14 lore raw

PATCH v7 11/12 lib: sbi: Add system_resume callback for restoring the system

In reply to Nick Hu

The last core who performs the system suspend is responsible for restoring the system after waking up. Add the system_resume callback for restoring the system from suspend.

---
 include/sbi/sbi_system.h |  7 +++++++
 lib/sbi/sbi_hsm.c        |  5 ++++-
 lib/sbi/sbi_system.c     | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
include/sbi/sbi_system.h +7 -0
index 0fdcc98cce5dac43583e68ffa8c98e79fd95dad4..f48a019a06b6957b5ab9cb4b9ef795a899a34ff9 100644
@@ -69,11 +69,18 @@ struct sbi_system_suspend_device {
 	 *     return from system_suspend() may ignore this parameter.
 	 */
 	int (*system_suspend)(u32 sleep_type, unsigned long mmode_resume_addr);
+
+	/**
+	 * Resume the system from system suspend
+	 */
+	void (*system_resume)(void);
 };
 
 const struct sbi_system_suspend_device *sbi_system_suspend_get_device(void);
 void sbi_system_suspend_set_device(struct sbi_system_suspend_device *dev);
 void sbi_system_suspend_test_enable(void);
+void sbi_system_resume(void);
+bool sbi_system_is_suspended(void);
 bool sbi_system_suspend_supported(u32 sleep_type);
 int sbi_system_suspend(u32 sleep_type, ulong resume_addr, ulong opaque);
 
lib/sbi/sbi_hsm.c +4 -1
index 0d97b43e0cd8f7b4fc97407ef01007485e3f5a24..0a355f9c2372075aaf303cba2aa5683993c4c079 100644
@@ -455,7 +455,10 @@ void sbi_hsm_hart_resume_start(struct sbi_scratch *scratch)
 					 SBI_HSM_STATE_RESUME_PENDING))
 		sbi_hart_hang();
 
-	hsm_device_hart_resume();
+	if (sbi_system_is_suspended())
+		sbi_system_resume();
+	else
+		hsm_device_hart_resume();
 }
 
 void __noreturn sbi_hsm_hart_resume_finish(struct sbi_scratch *scratch,
lib/sbi/sbi_system.c +17 -0
index cd0f4ba42bbe67e606bc821870716f7342eaf0d2..5500b05d22882bd43d84a1b715529cd8a26bee3f 100644
@@ -87,6 +87,7 @@ void __noreturn sbi_system_reset(u32 reset_type, u32 reset_reason)
 }
 
 static const struct sbi_system_suspend_device *suspend_dev = NULL;
+static bool system_suspended;
 
 const struct sbi_system_suspend_device *sbi_system_suspend_get_device(void)
 {
@@ -137,6 +138,19 @@ bool sbi_system_suspend_supported(u32 sleep_type)
 	       suspend_dev->system_suspend_check(sleep_type) == 0;
 }
 
+bool sbi_system_is_suspended(void)
+{
+	return system_suspended;
+}
+
+void sbi_system_resume(void)
+{
+	if (suspend_dev && suspend_dev->system_resume)
+		suspend_dev->system_resume();
+
+	system_suspended = false;
+}
+
 int sbi_system_suspend(u32 sleep_type, ulong resume_addr, ulong opaque)
 {
 	struct sbi_domain *dom = sbi_domain_thishart_ptr();
@@ -189,11 +203,14 @@ int sbi_system_suspend(u32 sleep_type, ulong resume_addr, ulong opaque)
 	__sbi_hsm_suspend_non_ret_save(scratch);
 
 	/* Suspend */
+	system_suspended = true;
 	ret = suspend_dev->system_suspend(sleep_type, scratch->warmboot_addr);
 	if (ret != SBI_OK) {
 		if (!sbi_hsm_hart_change_state(scratch, SBI_HSM_STATE_SUSPENDED,
 					       SBI_HSM_STATE_STARTED))
 			sbi_hart_hang();
+
+		system_suspended = false;
 		return ret;
 	}
 
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
Reviewed-by on v7 11/12
#15 lore raw

Re: [PATCH v7 11/12] lib: sbi: Add system_resume callback for restoring the system

Quoted 7 lines · Nick Hu

The last core who performs the system suspend is responsible for restoring the system after waking up. Add the system_resume callback for restoring the system from suspend.

LGTM.

Regards,
Anup

Quoted 96 lines
---
 include/sbi/sbi_system.h |  7 +++++++
 lib/sbi/sbi_hsm.c        |  5 ++++-
 lib/sbi/sbi_system.c     | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 1 deletion(-)
include/sbi/sbi_system.h +7 -0
index 0fdcc98cce5dac43583e68ffa8c98e79fd95dad4..f48a019a06b6957b5ab9cb4b9ef795a899a34ff9 100644
@@ -69,11 +69,18 @@ struct sbi_system_suspend_device {
         *     return from system_suspend() may ignore this parameter.
         */
        int (*system_suspend)(u32 sleep_type, unsigned long mmode_resume_addr);
+
+       /**
+        * Resume the system from system suspend
+        */
+       void (*system_resume)(void);
 };
 
 const struct sbi_system_suspend_device *sbi_system_suspend_get_device(void);
 void sbi_system_suspend_set_device(struct sbi_system_suspend_device *dev);
 void sbi_system_suspend_test_enable(void);
+void sbi_system_resume(void);
+bool sbi_system_is_suspended(void);
 bool sbi_system_suspend_supported(u32 sleep_type);
 int sbi_system_suspend(u32 sleep_type, ulong resume_addr, ulong opaque);
 
lib/sbi/sbi_hsm.c +4 -1
index 0d97b43e0cd8f7b4fc97407ef01007485e3f5a24..0a355f9c2372075aaf303cba2aa5683993c4c079 100644
@@ -455,7 +455,10 @@ void sbi_hsm_hart_resume_start(struct sbi_scratch *scratch)
                                         SBI_HSM_STATE_RESUME_PENDING))
                sbi_hart_hang();
 
-       hsm_device_hart_resume();
+       if (sbi_system_is_suspended())
+               sbi_system_resume();
+       else
+               hsm_device_hart_resume();
 }
 
 void __noreturn sbi_hsm_hart_resume_finish(struct sbi_scratch *scratch,
lib/sbi/sbi_system.c +17 -1
index cd0f4ba42bbe67e606bc821870716f7342eaf0d2..5500b05d22882bd43d84a1b715529cd8a26bee3f 100644
@@ -87,6 +87,7 @@ void __noreturn sbi_system_reset(u32 reset_type, u32 reset_reason)
 }
 
 static const struct sbi_system_suspend_device *suspend_dev = NULL;
+static bool system_suspended;
 
 const struct sbi_system_suspend_device *sbi_system_suspend_get_device(void)
 {
@@ -137,6 +138,19 @@ bool sbi_system_suspend_supported(u32 sleep_type)
               suspend_dev->system_suspend_check(sleep_type) == 0;
 }
 
+bool sbi_system_is_suspended(void)
+{
+       return system_suspended;
+}
+
+void sbi_system_resume(void)
+{
+       if (suspend_dev && suspend_dev->system_resume)
+               suspend_dev->system_resume();
+
+       system_suspended = false;
+}
+
 int sbi_system_suspend(u32 sleep_type, ulong resume_addr, ulong opaque)
 {
        struct sbi_domain *dom = sbi_domain_thishart_ptr();
@@ -189,11 +203,14 @@ int sbi_system_suspend(u32 sleep_type, ulong resume_addr, ulong opaque)
        __sbi_hsm_suspend_non_ret_save(scratch);
 
        /* Suspend */
+       system_suspended = true;
        ret = suspend_dev->system_suspend(sleep_type, scratch->warmboot_addr);
        if (ret != SBI_OK) {
                if (!sbi_hsm_hart_change_state(scratch, SBI_HSM_STATE_SUSPENDED,
                                               SBI_HSM_STATE_STARTED))
                        sbi_hart_hang();
+
+               system_suspended = false;
                return ret;
        }
 
 
--

2.34.1

Signature · 3 lines
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
author
#16 lore raw

PATCH v7 12/12 lib: utils/suspend: Add SiFive SMC0 driver

In reply to Nick Hu

The SiFive SMC0 controls the clock and power domain of the core complex on the SiFive platform. The core complex enters the low power state after the secondary cores enter the tile power gating and last core execute the CEASE instruction with the corresponding SMC0 configurations. The devices that inside both tile power domain and core complex power domain will be off, including caches and timer. Therefore we need to flush the last level cache before entering the core complex power gating and update the timer after waking up.

---
 include/sbi_utils/hsm/fdt_hsm_sifive_tmc0.h |  14 ++
 lib/utils/hsm/fdt_hsm_sifive_tmc0.c         |  57 +++++
 lib/utils/suspend/Kconfig                   |   4 +
 lib/utils/suspend/fdt_suspend_sifive_smc0.c | 318 ++++++++++++++++++++++++++++
 lib/utils/suspend/objects.mk                |   3 +
 platform/generic/configs/defconfig          |   1 +
 6 files changed, 397 insertions(+)
include/sbi_utils/hsm/fdt_hsm_sifive_tmc0.h new file +14 -0
new file mode 100644
index 0000000000000000000000000000000000000000..06cfb390f6af32f11856d869caf52b212aceb9b0
@@ -0,0 +1,14 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2025 SiFive Inc.
+ */
+
+#ifndef __FDT_HSM_SIFIVE_TMC0_H__
+#define __FDT_HSM_SIFIVE_TMC0_H__
+
+int sifive_tmc0_set_wakemask_enareq(u32 hartid);
+void sifive_tmc0_set_wakemask_disreq(u32 hartid);
+bool sifive_tmc0_is_pg(u32 hartid);
+
+#endif
lib/utils/hsm/fdt_hsm_sifive_tmc0.c +57 -0

69 lines not on this page · raw message

lib/utils/suspend/Kconfig +4 -0
index 2cbea75c265fa1995c7ee7a5f5f9e0b7369418fc..6c09d95253d2cd5a57c5f2676f8e65dddd8676f0 100644
@@ -14,6 +14,10 @@ config FDT_SUSPEND_RPMI
 	depends on FDT_MAILBOX && RPMI_MAILBOX
 	default n
 
+config FDT_SUSPEND_SIFIVE_SMC0
+	bool "FDT SIFIVE SMC0 suspend driver"
+	depends on FDT_HSM_SIFIVE_TMC0 && IRQCHIP_APLIC
+	default n
 endif
 
 endmenu
lib/utils/suspend/fdt_suspend_sifive_smc0.c new file +318 -0

318 lines not on this page · raw message

lib/utils/suspend/objects.mk +3 -0
index 9c386248be3074e1cb0a037903926a4fda982cd1..1fb29b5e794123986bc7167bb92504bcf4d3eb09 100644
@@ -9,3 +9,6 @@
 
 carray-fdt_early_drivers-$(CONFIG_FDT_SUSPEND_RPMI) += fdt_suspend_rpmi
 libsbiutils-objs-$(CONFIG_FDT_SUSPEND_RPMI) += suspend/fdt_suspend_rpmi.o
+
+carray-fdt_early_drivers-$(CONFIG_FDT_SUSPEND_SIFIVE_SMC0) += fdt_suspend_sifive_smc0
+libsbiutils-objs-$(CONFIG_FDT_SUSPEND_SIFIVE_SMC0) += suspend/fdt_suspend_sifive_smc0.o
platform/generic/configs/defconfig +1 -0
index 897d552813121f22c812e9760d2b144f41141c49..554c5e1bc69243b572e570a1bd3221b3c3fd1db0 100644
@@ -56,6 +56,7 @@ CONFIG_FDT_SERIAL_XILINX_UARTLITE=y
 CONFIG_SERIAL_SEMIHOSTING=y
 CONFIG_FDT_SUSPEND=y
 CONFIG_FDT_SUSPEND_RPMI=y
+CONFIG_FDT_SUSPEND_SIFIVE_SMC0=y
 CONFIG_FDT_TIMER=y
 CONFIG_FDT_TIMER_MTIMER=y
 CONFIG_FDT_TIMER_PLMT=y
Signature · 7 lines
2.34.1


-- 
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi
Applied
#17 lore raw
In reply to Nick Hu
Quoted 58 lines · Nick Hu

SiFive TMC0 and SMC0 are the power controllers that controls the Tile and CoreComplex power domain. Add the drivers to support the power management features such as HSM STOP and System Suspend.

Features such as power management may require flushing the entire cache before entering a non-retention power state. To support this, a simple cache flush framework is introduced to allow the external CMO to perform a full cache flush.

---
Changes in v7:
- Update the change log of PATCH 9 and PATCH 12 because the TMC0 and SMC0 are moved to the lib/utils/hsm and lib/utils/suspend.
- Add new commit to Extend the sbi_ipi_raw_send() to use all available IPI device in PATCH 8 and use it in PATCH 9
- Add system_resume callback for system suspend
- Since the SMC0 driver need the aplic_reinit_all(), update the
SMC0 Kconfig option to depend upon the APLIC Kconfig option
- Link to v6: https://lore.kernel.org/r/[email protected]

Changes in v6:
- Rename the aplic_restore() to aplic_reinit_all()
- Remove fdt_hsm_sifive_tmc0_cold_init() from TMC0 header file
- Remove the sifive_dev_platform.c
- Add a dummy inline flavor of fdt_cmo_init() for the case where CONFIG_FDT_CACHE is disabled
- Link to v5: https://lore.kernel.org/r/[email protected]

Changes in v5:
- Put the SiFive TMC0 driver to the fdt_early_driver
- Fix the format of the comments in SiFive TMC0 driver

Changes in v4:
- Call fdt_cmo_init() directly as part of generic_early_init()
- Rename SBI_HART_EXT_XSF* to SBI_HART_EXT_XSIFIVE*
- Move the TMC0 driver to the lib/utils/hsm/
- Move the SMC0 driver to the lib/utils/suspend/

Changes in v3:
- Add the SiFive TMC and SMC driver

Changes in v2:
- Since the platform override hooks was deprecated, use the fdt_driver for initializing the sifive_dev_platform.

---
Nick Hu (10):
lib: utils: Add cache flush library
lib: utils: Add FDT cache library
lib: utils/cache: Add fdt cmo helpers
lib: sbi: Add SiFive proprietary xsfcflushdlone
lib: sbi: Add SiFive proprietary xsfcease
lib: sbi: Extends sbi_ipi_raw_send() to use all available IPI devices
lib: utils/irqchip: Add APLIC restore function
platform: sifive: Add SiFive TMC0 driver
lib: utils/timer: Expose timer update function
platform: sifive: Add SiFive SMC0 driver

Quoted 3 lines

Vincent Chen (1):
utils: cache: Add SiFive ccache controller

Applied this series to the riscv/opensbi repo.

Thanks,
Anup

Signature · 3 lines
opensbi mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/opensbi