Attachment #181305 for bug #218113





	if (adapter->msix_mem != NULL)
		bus_release_resource(dev, SYS_RES_MEMORY,
		    adapter->memrid, adapter->msix_mem);

	if (adapter->memory != NULL)
		bus_release_resource(dev, SYS_RES_MEMORY,

			em_enable_vectors_82574(adapter);
#endif
		/* Map the MSIX BAR */
		adapter->memrid = PCIR_BAR(EM_MSIX_BAR);
		adapter->msix_mem = bus_alloc_resource_any(dev,
		    SYS_RES_MEMORY, &adapter->memrid, RF_ACTIVE);
       		if (adapter->msix_mem == NULL) {
			/* May not be enabled */
               		device_printf(adapter->dev,

msi:
	if (adapter->msix_mem != NULL) {
		bus_release_resource(dev, SYS_RES_MEMORY,
		    adapter->memrid, adapter->msix_mem);
		adapter->msix_mem = NULL;
	}
       	val = 1;

Lines 400-405 Link Here

(-)sys/dev/e1000/if_em.h (+1 lines)
400	struct resource *memory;	400	struct resource *memory;
401	struct resource *flash;	401	struct resource *flash;
402	struct resource *msix_mem;	402	struct resource *msix_mem;
		403	int memrid;
403		404
404	struct resource *res;	405	struct resource *res;
405	void *tag;	406	void *tag;

Lines 2901-2907 Link Here

(-)sys/dev/e1000/if_igb.c (-1 / +1 lines)
2901	msi:	2901	msi:
2902	if (adapter->msix_mem != NULL) {	2902	if (adapter->msix_mem != NULL) {
2903	bus_release_resource(dev, SYS_RES_MEMORY,	2903	bus_release_resource(dev, SYS_RES_MEMORY,
2904	PCIR_BAR(IGB_MSIX_BAR), adapter->msix_mem);	2904	adapter->memrid, adapter->msix_mem);
2905	adapter->msix_mem = NULL;	2905	adapter->msix_mem = NULL;
2906	}	2906	}
2907	msgs = 1;	2907	msgs = 1;

Return to bug 218113

Lines 2800-2806 Link Here

(-)sys/dev/e1000/if_em.c (-4 / +4 lines)
2800		2800
2801	if (adapter->msix_mem != NULL)	2801	if (adapter->msix_mem != NULL)
2802	bus_release_resource(dev, SYS_RES_MEMORY,	2802	bus_release_resource(dev, SYS_RES_MEMORY,
2803	PCIR_BAR(EM_MSIX_BAR), adapter->msix_mem);	2803	adapter->memrid, adapter->msix_mem);
2804		2804
2805	if (adapter->memory != NULL)	2805	if (adapter->memory != NULL)
2806	bus_release_resource(dev, SYS_RES_MEMORY,	2806	bus_release_resource(dev, SYS_RES_MEMORY,
Lines 2834-2842 Link Here
2834	em_enable_vectors_82574(adapter);	2834	em_enable_vectors_82574(adapter);
2835	#endif	2835	#endif
2836	/* Map the MSIX BAR */	2836	/* Map the MSIX BAR */
2837	int rid = PCIR_BAR(EM_MSIX_BAR);	2837	adapter->memrid = PCIR_BAR(EM_MSIX_BAR);
2838	adapter->msix_mem = bus_alloc_resource_any(dev,	2838	adapter->msix_mem = bus_alloc_resource_any(dev,
2839	SYS_RES_MEMORY, &rid, RF_ACTIVE);	2839	SYS_RES_MEMORY, &adapter->memrid, RF_ACTIVE);
2840	if (adapter->msix_mem == NULL) {	2840	if (adapter->msix_mem == NULL) {
2841	/* May not be enabled */	2841	/* May not be enabled */
2842	device_printf(adapter->dev,	2842	device_printf(adapter->dev,
Lines 2887-2893 Link Here
2887	msi:	2887	msi:
2888	if (adapter->msix_mem != NULL) {	2888	if (adapter->msix_mem != NULL) {
2889	bus_release_resource(dev, SYS_RES_MEMORY,	2889	bus_release_resource(dev, SYS_RES_MEMORY,
2890	PCIR_BAR(EM_MSIX_BAR), adapter->msix_mem);	2890	adapter->memrid, adapter->msix_mem);
2891	adapter->msix_mem = NULL;	2891	adapter->msix_mem = NULL;
2892	}	2892	}
2893	val = 1;	2893	val = 1;