lapic: skip setting intrcnt if lapic is not present
ClosedPublic
Actions

Authored by royger on Sep 4 2018, 3:13 PM.

Details

Reviewers

jhb

Commits

rS338630: lapic: skip setting intrcnt if lapic is not present

Summary

Instead of panicking. Legacy PVH mode doesn't provide a lapic, and
since native_lapic_intrcnt is called unconditionally this would cause
the assert to trigger. Change the assert into a continue in order to
take into account the possibility of systems without a lapic.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

royger created this revision.Sep 4 2018, 3:13 PM

Harbormaster completed remote builds in B19383: Diff 47641.Sep 4 2018, 3:13 PM

jhb added inline comments.Sep 4 2018, 6:45 PM

sys/x86/x86/local_apic.c
852 ↗	(On Diff #47641)	Is there a single check we can do here to skip the entire loop? Alternatively, would it be cleaner perhaps to add a new apic_ops hook?

royger added inline comments.Sep 5 2018, 9:04 AM

sys/x86/x86/local_apic.c
852 ↗	(On Diff #47641)	I cannot see an easy check. `lapics` is allocated in `apic_setup_local` as long as there's a valid enumerator. I think this would be better part of the `struct pic` somehow rather than `apic_ops`?

jhb accepted this revision.Sep 6 2018, 5:52 PM

jhb added inline comments.

sys/x86/x86/local_apic.c
852 ↗	(On Diff #47641)	I don't think a pic method would help (and if so I could probably just reuse the existing "register_sources" hook) as the lapic PIC is added in apic_setup_local as well. I guess your existing patch is the best approach for now.