Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport upstream bug fixes for control register handling #2318

Merged
merged 2 commits into from
Feb 6, 2025

Conversation

markjdb
Copy link
Contributor

@markjdb markjdb commented Feb 5, 2025

These are needed in order to boot bhyve guests on CheriBSD.

The logic in update_special_reg_field was reversed. Fix by swapping the
order of the arguments.

PR:		282505
Fixes:		f1fb1d5 ("arm64: Support more ID register field types")
Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D47437

(cherry picked from commit ce284dded5d5db6b1bceda309dccba616f485ade)
When comparing two ID registers to create a common userspace view we
have an option where we set an exact value only if the two are
different. This is only used in one field in the cache type register
that is accessible by userspace without being trapped by the kernel.

In preparation for trapping access to this register to handle it in
the kernel in some situations fix the 'if different' check.

Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D47811

(cherry picked from commit 14006c96214a772ba2e2f07bb4301657d8c2055a)
@bsdjhb bsdjhb merged commit 8e84bc4 into CTSRD-CHERI:dev Feb 6, 2025
29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants