14 Nov
2025
14 Nov
'25
3:41 p.m.
On Fri, Nov 14, 2025 at 03:34:32PM +0000, James Clark wrote:
[...]
@@ -80,12 +80,11 @@ static ssize_t format_attr_contextid_show(struct device *dev, struct device_attribute *attr, char *page) {
- int pid_fmt = ETM_OPT_CTXTID;
- #if IS_ENABLED(CONFIG_CORESIGHT_SOURCE_ETM4X)
- pid_fmt = is_kernel_in_hyp_mode() ? ETM_OPT_CTXTID2 : ETM_OPT_CTXTID;
- if (is_kernel_in_hyp_mode())
return contextid2_show(dev, attr, page);As said, this function now is only used for ETM4, we can remove "#if IS_ENABLED(...)".
Otherwise, LGTM:
Reviewed-by: Leo Yan leo.yan@arm.com
Unfortunately it's still needed to make the build work. is_kernel_in_hyp_mode() results in an undefined symbol when building for arm32 so it needs to be ifdef'd out. I can add a comment though.
Maybe "#ifdef CONFIG_ARM64" is more suitable?