2 files changed, 31 insertions, 7 deletions

diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index 6a5b578a69e1..08d5d42da260 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -74,6 +74,7 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev,
         struct vnic_dev_bar *bar, unsigned int num_bars)
 {
         struct vnic_resource_header __iomem *rh;
+        struct mgmt_barmap_hdr __iomem *mrh;
         struct vnic_resource __iomem *r;
         u8 type;
 
@@ -85,22 +86,32 @@ static int vnic_dev_discover_res(struct vnic_dev *vdev,
                 return -EINVAL;
         }
 
-        rh = bar->vaddr;
+        rh  = bar->vaddr;
+        mrh = bar->vaddr;
         if (!rh) {
                 pr_err("vNIC BAR0 res hdr not mem-mapped\n");
                 return -EINVAL;
         }
 
-        if (ioread32(&rh->magic) != VNIC_RES_MAGIC ||
-            ioread32(&rh->version) != VNIC_RES_VERSION) {
-                pr_err("vNIC BAR0 res magic/version error "
-                        "exp (%lx/%lx) curr (%x/%x)\n",
+        /* Check for mgmt vnic in addition to normal vnic */
+        if ((ioread32(&rh->magic) != VNIC_RES_MAGIC) ||
+                (ioread32(&rh->version) != VNIC_RES_VERSION)) {
+                if ((ioread32(&mrh->magic) != MGMTVNIC_MAGIC) ||
+                        (ioread32(&mrh->version) != MGMTVNIC_VERSION)) {
+                        pr_err("vNIC BAR0 res magic/version error "
+                        "exp (%lx/%lx) or (%lx/%lx), curr (%x/%x)\n",
                         VNIC_RES_MAGIC, VNIC_RES_VERSION,
+                        MGMTVNIC_MAGIC, MGMTVNIC_VERSION,
                         ioread32(&rh->magic), ioread32(&rh->version));
-                return -EINVAL;
+                        return -EINVAL;
+                }
         }
 
-        r = (struct vnic_resource __iomem *)(rh + 1);
+        if (ioread32(&mrh->magic) == MGMTVNIC_MAGIC)
+                r = (struct vnic_resource __iomem *)(mrh + 1);
+        else
+                r = (struct vnic_resource __iomem *)(rh + 1);
+
 
         while ((type = ioread8(&r->type)) != RES_TYPE_EOL) {
 
diff --git a/drivers/net/enic/vnic_resource.h b/drivers/net/enic/vnic_resource.h
index 810287beff14..e0a73f1ca6f4 100644
--- a/drivers/net/enic/vnic_resource.h
+++ b/drivers/net/enic/vnic_resource.h
@@ -22,6 +22,11 @@
 
 #define VNIC_RES_MAGIC          0x766E6963L     /* 'vnic' */
 #define VNIC_RES_VERSION        0x00000000L
+#define MGMTVNIC_MAGIC          0x544d474dL     /* 'MGMT' */
+#define MGMTVNIC_VERSION        0x00000000L
+
+/* The MAC address assigned to the CFG vNIC is fixed. */
+#define MGMTVNIC_MAC            { 0x02, 0x00, 0x54, 0x4d, 0x47, 0x4d }
 
 /* vNIC resource types */
 enum vnic_res_type {
@@ -52,6 +57,14 @@ struct vnic_resource_header {
         u32 version;
 };
 
+struct mgmt_barmap_hdr {
+        u32 magic;                      /* magic number */
+        u32 version;                    /* header format version */
+        u16 lif;                        /* loopback lif for mgmt frames */
+        u16 pci_slot;                   /* installed pci slot */
+        char serial[16];                /* card serial number */
+};
+
 struct vnic_resource {
         u8 type;
         u8 bar;