ionic: add asic codes to firmware interface file

Now that the firmware has learned how to properly report
the asic type id, add the values to our interface file.

The sharp-eyed reviewers will catch that the CAPRI value
changed here from 0 to 1.  This comes with the FW actually
defining it correctly.  This is safe for us to change as
nothing actually uses that value yet.

Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/pensando/ionic/ionic.h b/drivers/net/ethernet/pensando/ionic/ionic.h
index 1c61390677f7a396e650f1d5c56b689508153afd..0639bf56bd3afaf134f1142cfb87d46ad29273f9 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic.h
@@ -18,8 +18,6 @@ struct ionic_lif;
 #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_PF    0x1002
 #define PCI_DEVICE_ID_PENSANDO_IONIC_ETH_VF    0x1003
 
-#define IONIC_ASIC_TYPE_ELBA   2
-
 #define DEVCMD_TIMEOUT                 5
 #define IONIC_ADMINQ_TIME_SLICE                msecs_to_jiffies(100)
 

diff --git a/drivers/net/ethernet/pensando/ionic/ionic_if.h b/drivers/net/ethernet/pensando/ionic/ionic_if.h
index 9c85c0706c6e1e1e0bcf33e730757eb788961140..6ea190f1a706c29001929b0d6b98d931cbe1a239 100644 (file)
--- a/drivers/net/ethernet/pensando/ionic/ionic_if.h
+++ b/drivers/net/ethernet/pensando/ionic/ionic_if.h
@@ -3209,7 +3209,11 @@ union ionic_adminq_comp {
 #define IONIC_BAR0_INTR_CTRL_OFFSET            0x2000
 #define IONIC_DEV_CMD_DONE                     0x00000001
 
-#define IONIC_ASIC_TYPE_CAPRI                  0
+#define IONIC_ASIC_TYPE_NONE                   0
+#define IONIC_ASIC_TYPE_CAPRI                  1
+#define IONIC_ASIC_TYPE_ELBA                   2
+#define IONIC_ASIC_TYPE_GIGLIO                 3
+#define IONIC_ASIC_TYPE_SALINA                 4
 
 /**
  * struct ionic_doorbell - Doorbell register layout