From 749468112b29b70f4c08ef4de133dfad2194b7a2 Mon Sep 17 00:00:00 2001 From: Ian Lepore Date: Fri, 7 Aug 2015 23:31:31 +0000 Subject: timecounter: Merge FreeBSD change r286429 Only process the PPS event types currently enabled in pps_params.mode. This makes the PPS API behave correctly, but isn't ideal -- we still end up capturing PPS data for non-enabled edges, we just don't process the data into an event that becomes visible outside of kern_tc. That's because the event type isn't passed to pps_capture(), so it can't do the filtering. Any solution for capture filtering is going to require touching every driver. Update #3175. --- cpukit/score/src/kern_tc.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'cpukit/score/src') diff --git a/cpukit/score/src/kern_tc.c b/cpukit/score/src/kern_tc.c index a789107528..bb8a3f110d 100644 --- a/cpukit/score/src/kern_tc.c +++ b/cpukit/score/src/kern_tc.c @@ -1902,6 +1902,9 @@ pps_event(struct pps_state *pps, int event) #endif KASSERT(pps != NULL, ("NULL pps pointer in pps_event")); + /* Nothing to do if not currently set to capture this event type. */ + if ((event & pps->ppsparam.mode) == 0) + return; /* If the timecounter was wound up underneath us, bail out. */ if (pps->capgen == 0 || pps->capgen != atomic_load_acq_int(&pps->capth->th_generation)) -- cgit v1.2.3