Deleted Added
full compact
sfxge_intr.c (277894) sfxge_intr.c (279351)
1/*-
2 * Copyright (c) 2010-2011 Solarflare Communications, Inc.
3 * All rights reserved.
4 *
5 * This software was developed in part by Philip Paeps under contract for
6 * Solarflare Communications, Inc.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 14 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2010-2011 Solarflare Communications, Inc.
3 * All rights reserved.
4 *
5 * This software was developed in part by Philip Paeps under contract for
6 * Solarflare Communications, Inc.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 14 unchanged lines hidden (view full) ---

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/sfxge/sfxge_intr.c 277894 2015-01-29 19:09:14Z arybchik $");
31__FBSDID("$FreeBSD: head/sys/dev/sfxge/sfxge_intr.c 279351 2015-02-27 07:39:09Z arybchik $");
32
33#include <sys/param.h>
34#include <sys/bus.h>
35#include <sys/kernel.h>
36#include <sys/malloc.h>
37#include <sys/queue.h>
38#include <sys/rman.h>
39#include <sys/smp.h>

--- 89 unchanged lines hidden (view full) ---

129 enp = sc->enp;
130 intr = &sc->intr;
131 index = evq->index;
132
133 KASSERT(intr != NULL, ("intr == NULL"));
134 KASSERT(intr->type == EFX_INTR_MESSAGE,
135 ("intr->type != EFX_INTR_MESSAGE"));
136
32
33#include <sys/param.h>
34#include <sys/bus.h>
35#include <sys/kernel.h>
36#include <sys/malloc.h>
37#include <sys/queue.h>
38#include <sys/rman.h>
39#include <sys/smp.h>

--- 89 unchanged lines hidden (view full) ---

129 enp = sc->enp;
130 intr = &sc->intr;
131 index = evq->index;
132
133 KASSERT(intr != NULL, ("intr == NULL"));
134 KASSERT(intr->type == EFX_INTR_MESSAGE,
135 ("intr->type != EFX_INTR_MESSAGE"));
136
137 if (intr->state != SFXGE_INTR_STARTED)
137 if (__predict_false(intr->state != SFXGE_INTR_STARTED))
138 return;
139
140 (void)efx_intr_status_message(enp, index, &fatal);
141
142 if (fatal) {
143 (void)efx_intr_disable(enp);
144 (void)efx_intr_fatal(enp);
145 return;

--- 417 unchanged lines hidden ---
138 return;
139
140 (void)efx_intr_status_message(enp, index, &fatal);
141
142 if (fatal) {
143 (void)efx_intr_disable(enp);
144 (void)efx_intr_fatal(enp);
145 return;

--- 417 unchanged lines hidden ---