ofw_cpu: fix __riscv preprocessor check
ClosedPublic
Actions

Authored by mhorne on Dec 17 2024, 8:01 PM.

Details

Reviewers

imp
jrtc27
jhb

Group Reviewers

riscv

Commits

rGaa766e2a03f0: ofw_cpu: fix __riscv preprocessor check

Summary

The canonical name is riscv, not riscv__. Newer compilers no longer
emit the latter.

This re-enables finding the nominal frequency from the CPU's clock.

I checked, and there are no remaining mistakes like this in the tree.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Skipped

Unit

Tests Skipped

Build Status

Buildable 61219
Build 58103: arc lint + arc unit

Event Timeline

mhorne created this revision.Dec 17 2024, 8:01 PM

Herald added a subscriber: imp. · View Herald TranscriptDec 17 2024, 8:01 PM

mhorne requested review of this revision.Dec 17 2024, 8:01 PM

Harbormaster completed remote builds in B61219: Diff 148174.Dec 17 2024, 8:01 PM

Do we need to update arch(7)?

This revision is now accepted and ready to land.Dec 17 2024, 8:03 PM

In D48122#1097216, @imp wrote:

Do we need to update arch(7)?

No, that seems to be correct already.

From grepping the tree this doesn't actually have any consequences currently, right, other than possible prints? The only real use I see is cpufreq, which we don't currently have for RISC-V.

jhb accepted this revision.Dec 18 2024, 9:40 PM

jhb added a subscriber: jhb.

jhb added inline comments.

sys/dev/ofw/ofw_cpu.c
279	If we moved the variable declarations to here, would that reduce the need for the second #if above? That might be preferable as a followup commit to keep the number of #if's down.

imp added inline comments.Dec 19 2024, 4:08 PM

sys/dev/ofw/ofw_cpu.c
46	Add #define HAS_CLOCK here. Ideally this would be global, but that makes this change too large. (of course, this is tweaking an otherwise boring tweak, so maybe a followup)
209	#ifdef HAS_CLOCK
279	#ifdef HAS_CLOCK

My suggestions likely are out of scope, though...

mhorne added inline comments.Dec 19 2024, 5:13 PM

sys/dev/ofw/ofw_cpu.c
46	Yes, ideally a global coming from the kernel config. Leaving that part for another day :)
279	D48149. I will still commit this one as-is first, somewhat redundantly.