 @@ -1,14 +1,14 @@
-/* $NetBSD: ixgbe.c,v 1.205 2019/08/29 09:35:18 knakahara Exp $ */
+/* $NetBSD: ixgbe.c,v 1.206 2019/08/29 09:45:22 knakahara Exp $ */
 /******************************************************************************
   Copyright (c) 2001-2017, Intel Corporation
   All rights reserved.
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
 . Redistributions of source code must retain the above copyright notice,
       this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
 @@ -6457,27 +6457,29 @@ ixgbe_handle_que_work(struct work *wk, v
 /************************************************************************
  * ixgbe_allocate_legacy - Setup the Legacy or MSI Interrupt handler
  ************************************************************************/
 static int
 ixgbe_allocate_legacy(struct adapter *adapter,
     const struct pci_attach_args *pa)
+{
 	device_t	dev = adapter->dev;
 	struct ix_queue *que = adapter->queues;
 	struct tx_ring	*txr = adapter->tx_rings;
 	int		counts[PCI_INTR_TYPE_SIZE];
 	pci_intr_type_t intr_type, max_type;
 	char		intrbuf[PCI_INTRSTR_LEN];
 	char		wqname[MAXCOMLEN];
 	const char	*intrstr = NULL;
 	int defertx_error = 0, error;
 	/* We allocate a single interrupt resource */
 	max_type = PCI_INTR_TYPE_MSI;
 	counts[PCI_INTR_TYPE_MSIX] = 0;
 	counts[PCI_INTR_TYPE_MSI] =
 	    (adapter->feat_en & IXGBE_FEATURE_MSI) ? 1 : 0;
 	/* Check not feat_en but feat_cap to fallback to INTx */
 	counts[PCI_INTR_TYPE_INTX] =
 	    (adapter->feat_cap & IXGBE_FEATURE_LEGACY_IRQ) ? 1 : 0;
 alloc_retry:
 	if (pci_intr_alloc(pa, &adapter->osdep.intrs, counts, max_type) != 0) {
 		aprint_error_dev(dev, "couldn't alloc interrupt\n");
 @@ -6519,35 +6521,47 @@ alloc_retry:
 	if (adapter->osdep.ihs[0] == NULL) {
 		aprint_error_dev(dev,
 		    "couldn't establish interrupt%s%s\n",
 		    intrstr ? " at " : "", intrstr ? intrstr : "");
 		pci_intr_release(adapter->osdep.pc, adapter->osdep.intrs, 1);
 		adapter->osdep.intrs = NULL;
 		return ENXIO;
+	}
 	aprint_normal_dev(dev, "interrupting at %s\n", intrstr);
 	/*
 	 * Try allocating a fast interrupt and the associated deferred
 	 * processing contexts.
 	 */
-	if (!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX))
+	if (!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX)) {
 		txr->txr_si =
 		    softint_establish(SOFTINT_NET | IXGBE_SOFTINFT_FLAGS,
 			ixgbe_deferred_mq_start, txr);
 		snprintf(wqname, sizeof(wqname), "%sdeferTx", device_xname(dev));
 		defertx_error = workqueue_create(&adapter->txr_wq, wqname,
 		    ixgbe_deferred_mq_start_work, adapter, IXGBE_WORKQUEUE_PRI,
 		    IPL_NET, IXGBE_WORKQUEUE_FLAGS);
 		adapter->txr_wq_enqueued = percpu_alloc(sizeof(u_int));
+	}
 	que->que_si = softint_establish(SOFTINT_NET | IXGBE_SOFTINFT_FLAGS,
 	    ixgbe_handle_que, que);
 	snprintf(wqname, sizeof(wqname), "%sTxRx", device_xname(dev));
 	error = workqueue_create(&adapter->que_wq, wqname,
 	    ixgbe_handle_que_work, adapter, IXGBE_WORKQUEUE_PRI, IPL_NET,
 	    IXGBE_WORKQUEUE_FLAGS);
 	if ((!(adapter->feat_en & IXGBE_FEATURE_LEGACY_TX)
-		&& (txr->txr_si == NULL)) || (que->que_si == NULL)) {
+		&& ((txr->txr_si == NULL) || defertx_error != 0))
 	    || (que->que_si == NULL) || error != 0) {
 		aprint_error_dev(dev,
 		    "could not establish software interrupts\n");
 		return ENXIO;
+	}
 	/* For simplicity in the handlers */
 	adapter->active_queues = IXGBE_EIMS_ENABLE_MASK;
 	return (0);
 } /* ixgbe_allocate_legacy */
 /************************************************************************
  * ixgbe_allocate_msix - Setup MSI-X Interrupt resources and handlers