Differential D33873

cam: Fix wiring fence post error
ClosedPublic
Actions

Authored by imp on Jan 12 2022, 9:46 PM.

Details

Reviewers

jhb

Group Reviewers

cam

Commits

rG272e4f538467: cam: Fix wiring fence post error

Summary

If the last matching device entry partially matched in camperiphunit,
but then hit a continue case, we'd mistakenly think we had a match on
that entry. This lead to a number of problems downstream (usually a
belief that we had a duplicate wiring hint because unit = 0 is the
default). Fix this by branching to the bottom of the loop to set wired
to false rather than relying on 'continue' to set that as a side effect.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

imp created this revision.Jan 12 2022, 9:46 PM

Herald added a reviewer: cam. · View Herald TranscriptJan 12 2022, 9:46 PM

imp requested review of this revision.Jan 12 2022, 9:46 PM

Harbormaster completed remote builds in B43894: Diff 101390.Jan 12 2022, 9:46 PM

imp added inline comments.Jan 12 2022, 9:51 PM

sys/cam/cam_periph.c
558	and here's where we mistakenly think we have a duplicate
649	This is the use of the 'wired' that is incorrect as a result of this bug...

jhb accepted this revision.Jan 12 2022, 9:57 PM

jhb added a subscriber: jhb.

jhb added inline comments.

sys/cam/cam_periph.c
613–616	You could perhaps keep using continue if you wanted by making this a for-loop instead: for (wired = false; resource_find_dev(...) == 0; wired = false) {