[v12,6/7] riscv: Add ifunc helper method to hwprobe.h
Checks
Context |
Check |
Description |
redhat-pt-bot/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_glibc_check--master-arm |
success
|
Testing passed
|
Commit Message
Add a little helper method so it's easier to fetch a single value from
the hwprobe function when used within an ifunc selector.
Signed-off-by: Evan Green <evan@rivosinc.com>
---
(no changes since v11)
Changes in v11:
- Remove superfluous 'signed' (Adhemerval)
- Put helper before __END_DECLS (Adhemerval)
- Add comment about +1 on non-Linux systems (Stefan)
Changes in v10:
- Avoid implicit comparisons (Adhemerval)
Changes in v9:
- Use __inline rather than inline so c89 compiles (build-many-glibcs)
Changes in v7:
- Introduced static inline helper (Richard)
sysdeps/unix/sysv/linux/riscv/sys/hwprobe.h | 29 +++++++++++++++++++++
1 file changed, 29 insertions(+)
@@ -22,6 +22,7 @@
#include <features.h>
#include <stddef.h>
+#include <errno.h>
#ifdef __has_include
# if __has_include (<asm/hwprobe.h>)
# include <asm/hwprobe.h>
@@ -79,6 +80,34 @@ typedef int (*__riscv_hwprobe_t) (struct riscv_hwprobe *__pairs, size_t __pair_c
__fortified_attr_access (__read_write__, 1, 2)
__fortified_attr_access (__read_only__, 4, 3);
+/* Helper function usable from ifunc selectors that probes a single key. */
+static __inline int
+__riscv_hwprobe_one(__riscv_hwprobe_t hwprobe_func,
+ long long int key,
+ unsigned long long int *value)
+{
+ struct riscv_hwprobe pair;
+ int rc;
+
+ /* Earlier versions of glibc pass NULL as the second ifunc parameter. Other C
+ libraries on non-Linux systems may pass +1 as this function pointer to
+ indicate no support. Users copying this function to exotic worlds
+ (non-Linux non-glibc) may want to do additional validity checks here. */
+ if (hwprobe_func == NULL)
+ return ENOSYS;
+
+ pair.key = key;
+ rc = hwprobe_func (&pair, 1, 0, NULL, 0);
+ if (rc != 0)
+ return rc;
+
+ if (pair.key < 0)
+ return ENOENT;
+
+ *value = pair.value;
+ return 0;
+}
+
__END_DECLS
#endif /* sys/hwprobe.h */