enic: Support newer version of firmware devcmd CMD_MCPU_FW_INFO

This patch provides support to the newer version of firmware devcmd CMD_MCPU_FW_INFO
that returns additional information (ASIC type and revision) about the underlying hardware.
This knowledge is required by the driver to implement any hardware specific features.

Signed-off-by: Vasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David Wang <dwang2@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index c489e72107de..c089b362a36f 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -408,10 +408,17 @@ int vnic_dev_fw_info(struct vnic_dev *vdev,
                 if (!vdev->fw_info)
                         return -ENOMEM;
 
+                memset(vdev->fw_info, 0, sizeof(struct vnic_devcmd_fw_info));
+
                 a0 = vdev->fw_info_pa;
+                a1 = sizeof(struct vnic_devcmd_fw_info);
 
                 /* only get fw_info once and cache it */
                 err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO, &a0, &a1, wait);
+                if (err == ERR_ECMDUNKNOWN) {
+                        err = vnic_dev_cmd(vdev, CMD_MCPU_FW_INFO_OLD,
+                                &a0, &a1, wait);
+                }
         }
 
         *fw_info = vdev->fw_info;