Attachment 181305 Details for Bug 218113 – msix resource management

[patch] msix resource management

e1000.msix.diff (text/plain), 1.89 KB, created by Kaho Toshikazu on 2017-03-30 04:25:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kaho Toshikazu

Created: 2017-03-30 04:25:41 UTC

Size: 1.89 KB

patch

obsolete

>Index: sys/dev/e1000/if_em.c
>===================================================================
>--- sys/dev/e1000/if_em.c	(revision 316131)
>+++ sys/dev/e1000/if_em.c	(working copy)
>@@ -2800,7 +2800,7 @@
> 
> 	if (adapter->msix_mem != NULL)
> 		bus_release_resource(dev, SYS_RES_MEMORY,
>-		    PCIR_BAR(EM_MSIX_BAR), adapter->msix_mem);
>+		    adapter->memrid, adapter->msix_mem);
> 
> 	if (adapter->memory != NULL)
> 		bus_release_resource(dev, SYS_RES_MEMORY,
>@@ -2834,9 +2834,9 @@
> 			em_enable_vectors_82574(adapter);
> #endif
> 		/* Map the MSIX BAR */
>-		int rid = PCIR_BAR(EM_MSIX_BAR);
>+		adapter->memrid = PCIR_BAR(EM_MSIX_BAR);
> 		adapter->msix_mem = bus_alloc_resource_any(dev,
>-		    SYS_RES_MEMORY, &rid, RF_ACTIVE);
>+		    SYS_RES_MEMORY, &adapter->memrid, RF_ACTIVE);
>        		if (adapter->msix_mem == NULL) {
> 			/* May not be enabled */
>                		device_printf(adapter->dev,
>@@ -2887,7 +2887,7 @@
> msi:
> 	if (adapter->msix_mem != NULL) {
> 		bus_release_resource(dev, SYS_RES_MEMORY,
>-		    PCIR_BAR(EM_MSIX_BAR), adapter->msix_mem);
>+		    adapter->memrid, adapter->msix_mem);
> 		adapter->msix_mem = NULL;
> 	}
>        	val = 1;
>Index: sys/dev/e1000/if_em.h
>===================================================================
>--- sys/dev/e1000/if_em.h	(revision 316131)
>+++ sys/dev/e1000/if_em.h	(working copy)
>@@ -400,6 +400,7 @@
> 	struct resource *memory;
> 	struct resource *flash;
> 	struct resource *msix_mem;
>+	int		memrid;
> 
> 	struct resource	*res;
> 	void		*tag;
>Index: sys/dev/e1000/if_igb.c
>===================================================================
>--- sys/dev/e1000/if_igb.c	(revision 316131)
>+++ sys/dev/e1000/if_igb.c	(working copy)
>@@ -2901,7 +2901,7 @@
> msi:
>        	if (adapter->msix_mem != NULL) {
> 		bus_release_resource(dev, SYS_RES_MEMORY,
>-		    PCIR_BAR(IGB_MSIX_BAR), adapter->msix_mem);
>+		    adapter->memrid, adapter->msix_mem);
> 		adapter->msix_mem = NULL;
> 	}
>        	msgs = 1;

Actions: View | Diff

Attachments on bug 218113: 181227 | 181305