4 files changed, 208 insertions, 123 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 7211cb07426..362d16f1d25 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -51,6 +51,7 @@
 
 #include "bnx2x_reg.h"
 #include "bnx2x_fw_defs.h"
+#include "bnx2x_mfw_req.h"
 #include "bnx2x_hsi.h"
 #include "bnx2x_link.h"
 #include "bnx2x_sp.h"
@@ -1317,6 +1318,7 @@ struct bnx2x {
 #define NO_ISCSI_FLAG                   (1 << 14)
 #define NO_FCOE_FLAG                    (1 << 15)
 #define BC_SUPPORTS_PFC_STATS           (1 << 17)
+#define BC_SUPPORTS_FCOE_FEATURES       (1 << 19)
 #define USING_SINGLE_MSIX_FLAG          (1 << 20)
 #define BC_SUPPORTS_DCBX_MSG_NON_PMF    (1 << 21)
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index e7c390c66b2..76b6e65790f 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -10,6 +10,7 @@
 #define BNX2X_HSI_H
 
 #include "bnx2x_fw_defs.h"
+#include "bnx2x_mfw_req.h"
 
 #define FW_ENCODE_32BIT_PATTERN         0x1e1e1e1e
 
@@ -33,12 +34,6 @@ struct license_key {
         u32 reserved_b[4];
 };
 
-
-#define PORT_0                  0
-#define PORT_1                  1
-#define PORT_MAX                2
-#define NVM_PATH_MAX            2
-
 /****************************************************************************
  * Shared HW configuration                                                  *
  ****************************************************************************/
@@ -1252,6 +1247,7 @@ struct drv_func_mb {
         #define REQ_BC_VER_4_VRFY_AFEX_SUPPORTED        0x00070002
         #define REQ_BC_VER_4_SFP_TX_DISABLE_SUPPORTED   0x00070014
         #define REQ_BC_VER_4_PFC_STATS_SUPPORTED        0x00070201
+        #define REQ_BC_VER_4_FCOE_FEATURES              0x00070209
 
         #define DRV_MSG_CODE_DCBX_ADMIN_PMF_MSG         0xb0000000
         #define DRV_MSG_CODE_DCBX_PMF_DRV_OK            0xb2000000
@@ -2700,118 +2696,6 @@ struct host_func_stats {
 /* VIC definitions */
 #define VICSTATST_UIF_INDEX 2
 
-/* current drv_info version */
-#define DRV_INFO_CUR_VER 1
-
-/* drv_info op codes supported */
-enum drv_info_opcode {
-        ETH_STATS_OPCODE,
-        FCOE_STATS_OPCODE,
-        ISCSI_STATS_OPCODE
-};
-
-#define ETH_STAT_INFO_VERSION_LEN       12
-/*  Per PCI Function Ethernet Statistics required from the driver */
-struct eth_stats_info {
-        /* Function's Driver Version. padded to 12 */
-        u8 version[ETH_STAT_INFO_VERSION_LEN];
-        /* Locally Admin Addr. BigEndian EIU48. Actual size is 6 bytes */
-        u8 mac_local[8];
-        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
-        u8 mac_add2[8];         /* Additional Programmed MAC Addr 2. */
-        u32 mtu_size;           /* MTU Size. Note   : Negotiated MTU */
-        u32 feature_flags;      /* Feature_Flags. */
-#define FEATURE_ETH_CHKSUM_OFFLOAD_MASK         0x01
-#define FEATURE_ETH_LSO_MASK                    0x02
-#define FEATURE_ETH_BOOTMODE_MASK               0x1C
-#define FEATURE_ETH_BOOTMODE_SHIFT              2
-#define FEATURE_ETH_BOOTMODE_NONE               (0x0 << 2)
-#define FEATURE_ETH_BOOTMODE_PXE                (0x1 << 2)
-#define FEATURE_ETH_BOOTMODE_ISCSI              (0x2 << 2)
-#define FEATURE_ETH_BOOTMODE_FCOE               (0x3 << 2)
-#define FEATURE_ETH_TOE_MASK                    0x20
-        u32 lso_max_size;       /* LSO MaxOffloadSize. */
-        u32 lso_min_seg_cnt;    /* LSO MinSegmentCount. */
-        /* Num Offloaded Connections TCP_IPv4. */
-        u32 ipv4_ofld_cnt;
-        /* Num Offloaded Connections TCP_IPv6. */
-        u32 ipv6_ofld_cnt;
-        u32 promiscuous_mode;   /* Promiscuous Mode. non-zero true */
-        u32 txq_size;           /* TX Descriptors Queue Size */
-        u32 rxq_size;           /* RX Descriptors Queue Size */
-        /* TX Descriptor Queue Avg Depth. % Avg Queue Depth since last poll */
-        u32 txq_avg_depth;
-        /* RX Descriptors Queue Avg Depth. % Avg Queue Depth since last poll */
-        u32 rxq_avg_depth;
-        /* IOV_Offload. 0=none; 1=MultiQueue, 2=VEB 3= VEPA*/
-        u32 iov_offload;
-        /* Number of NetQueue/VMQ Config'd. */
-        u32 netq_cnt;
-        u32 vf_cnt;             /* Num VF assigned to this PF. */
-};
-
-/*  Per PCI Function FCOE Statistics required from the driver */
-struct fcoe_stats_info {
-        u8 version[12];         /* Function's Driver Version. */
-        u8 mac_local[8];        /* Locally Admin Addr. */
-        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
-        u8 mac_add2[8];         /* Additional Programmed MAC Addr 2. */
-        /* QoS Priority (per 802.1p). 0-7255 */
-        u32 qos_priority;
-        u32 txq_size;           /* FCoE TX Descriptors Queue Size. */
-        u32 rxq_size;           /* FCoE RX Descriptors Queue Size. */
-        /* FCoE TX Descriptor Queue Avg Depth. */
-        u32 txq_avg_depth;
-        /* FCoE RX Descriptors Queue Avg Depth. */
-        u32 rxq_avg_depth;
-        u32 rx_frames_lo;       /* FCoE RX Frames received. */
-        u32 rx_frames_hi;       /* FCoE RX Frames received. */
-        u32 rx_bytes_lo;        /* FCoE RX Bytes received. */
-        u32 rx_bytes_hi;        /* FCoE RX Bytes received. */
-        u32 tx_frames_lo;       /* FCoE TX Frames sent. */
-        u32 tx_frames_hi;       /* FCoE TX Frames sent. */
-        u32 tx_bytes_lo;        /* FCoE TX Bytes sent. */
-        u32 tx_bytes_hi;        /* FCoE TX Bytes sent. */
-};
-
-/* Per PCI  Function iSCSI Statistics required from the driver*/
-struct iscsi_stats_info {
-        u8 version[12];         /* Function's Driver Version. */
-        u8 mac_local[8];        /* Locally Admin iSCSI MAC Addr. */
-        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
-        /* QoS Priority (per 802.1p). 0-7255 */
-        u32 qos_priority;
-        u8 initiator_name[64];  /* iSCSI Boot Initiator Node name. */
-        u8 ww_port_name[64];    /* iSCSI World wide port name */
-        u8 boot_target_name[64];/* iSCSI Boot Target Name. */
-        u8 boot_target_ip[16];  /* iSCSI Boot Target IP. */
-        u32 boot_target_portal; /* iSCSI Boot Target Portal. */
-        u8 boot_init_ip[16];    /* iSCSI Boot Initiator IP Address. */
-        u32 max_frame_size;     /* Max Frame Size. bytes */
-        u32 txq_size;           /* PDU TX Descriptors Queue Size. */
-        u32 rxq_size;           /* PDU RX Descriptors Queue Size. */
-        u32 txq_avg_depth;      /* PDU TX Descriptor Queue Avg Depth. */
-        u32 rxq_avg_depth;      /* PDU RX Descriptors Queue Avg Depth. */
-        u32 rx_pdus_lo;         /* iSCSI PDUs received. */
-        u32 rx_pdus_hi;         /* iSCSI PDUs received. */
-        u32 rx_bytes_lo;        /* iSCSI RX Bytes received. */
-        u32 rx_bytes_hi;        /* iSCSI RX Bytes received. */
-        u32 tx_pdus_lo;         /* iSCSI PDUs sent. */
-        u32 tx_pdus_hi;         /* iSCSI PDUs sent. */
-        u32 tx_bytes_lo;        /* iSCSI PDU TX Bytes sent. */
-        u32 tx_bytes_hi;        /* iSCSI PDU TX Bytes sent. */
-        u32 pcp_prior_map_tbl;  /* C-PCP to S-PCP Priority MapTable.
-                                 * 9 nibbles, the position of each nibble
-                                 * represents the C-PCP value, the value
-                                 * of the nibble = S-PCP value.
-                                 */
-};
-
-union drv_info_to_mcp {
-        struct eth_stats_info   ether_stat;
-        struct fcoe_stats_info  fcoe_stat;
-        struct iscsi_stats_info iscsi_stat;
-};
 
 /* stats collected for afex.
  * NOTE: structure is exactly as expected to be received by the switch.
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 8ddc78e0d94..5b8b521bdbc 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -74,6 +74,8 @@
 #define FW_FILE_NAME_E1H        "bnx2x/bnx2x-e1h-" FW_FILE_VERSION ".fw"
 #define FW_FILE_NAME_E2         "bnx2x/bnx2x-e2-" FW_FILE_VERSION ".fw"
 
+#define MAC_LEADING_ZERO_CNT (ALIGN(ETH_ALEN, sizeof(u32)) - ETH_ALEN)
+
 /* Time in jiffies before concluding the transmitter is hung */
 #define TX_TIMEOUT              (5*HZ)
 
@@ -3060,7 +3062,8 @@ static void bnx2x_drv_info_fcoe_stat(struct bnx2x *bp)
         struct fcoe_stats_info *fcoe_stat =
                 &bp->slowpath->drv_info_to_mcp.fcoe_stat;
 
-        memcpy(fcoe_stat->mac_local, bp->fip_mac, ETH_ALEN);
+        memcpy(fcoe_stat->mac_local + MAC_LEADING_ZERO_CNT,
+               bp->fip_mac, ETH_ALEN);
 
         fcoe_stat->qos_priority =
                 app->traffic_type_priority[LLFC_TRAFFIC_TYPE_FCOE];
@@ -3151,7 +3154,8 @@ static void bnx2x_drv_info_iscsi_stat(struct bnx2x *bp)
         struct iscsi_stats_info *iscsi_stat =
                 &bp->slowpath->drv_info_to_mcp.iscsi_stat;
 
-        memcpy(iscsi_stat->mac_local, bp->cnic_eth_dev.iscsi_mac, ETH_ALEN);
+        memcpy(iscsi_stat->mac_local + MAC_LEADING_ZERO_CNT,
+               bp->cnic_eth_dev.iscsi_mac, ETH_ALEN);
 
         iscsi_stat->qos_priority =
                 app->traffic_type_priority[LLFC_TRAFFIC_TYPE_ISCSI];
@@ -9732,6 +9736,9 @@ static void __devinit bnx2x_get_common_hwinfo(struct bnx2x *bp)
         bp->flags |= (val >= REQ_BC_VER_4_PFC_STATS_SUPPORTED) ?
                         BC_SUPPORTS_PFC_STATS : 0;
 
+        bp->flags |= (val >= REQ_BC_VER_4_FCOE_FEATURES) ?
+                        BC_SUPPORTS_FCOE_FEATURES : 0;
+
         bp->flags |= (val >= REQ_BC_VER_4_DCBX_ADMIN_MSG_NON_PMF) ?
                         BC_SUPPORTS_DCBX_MSG_NON_PMF : 0;
         boot_mode = SHMEM_RD(bp,
@@ -12548,21 +12555,45 @@ static int bnx2x_drv_ctl(struct net_device *dev, struct drv_ctl_info *ctl)
                 break;
         }
         case DRV_CTL_ULP_REGISTER_CMD: {
-                int ulp_type = ctl->data.ulp_type;
+                int ulp_type = ctl->data.register_data.ulp_type;
 
                 if (CHIP_IS_E3(bp)) {
                         int idx = BP_FW_MB_IDX(bp);
-                        u32 cap;
+                        u32 cap = SHMEM2_RD(bp, drv_capabilities_flag[idx]);
+                        int path = BP_PATH(bp);
+                        int port = BP_PORT(bp);
+                        int i;
+                        u32 scratch_offset;
+                        u32 *host_addr;
 
-                        cap = SHMEM2_RD(bp, drv_capabilities_flag[idx]);
+                        /* first write capability to shmem2 */
                         if (ulp_type == CNIC_ULP_ISCSI)
                                 cap |= DRV_FLAGS_CAPABILITIES_LOADED_ISCSI;
                         else if (ulp_type == CNIC_ULP_FCOE)
                                 cap |= DRV_FLAGS_CAPABILITIES_LOADED_FCOE;
                         SHMEM2_WR(bp, drv_capabilities_flag[idx], cap);
+
+                        if ((ulp_type != CNIC_ULP_FCOE) ||
+                            (!SHMEM2_HAS(bp, ncsi_oem_data_addr)) ||
+                            (!(bp->flags &  BC_SUPPORTS_FCOE_FEATURES)))
+                                break;
+
+                        /* if reached here - should write fcoe capabilities */
+                        scratch_offset = SHMEM2_RD(bp, ncsi_oem_data_addr);
+                        if (!scratch_offset)
+                                break;
+                        scratch_offset += offsetof(struct glob_ncsi_oem_data,
+                                                   fcoe_features[path][port]);
+                        host_addr = (u32 *) &(ctl->data.register_data.
+                                              fcoe_features);
+                        for (i = 0; i < sizeof(struct fcoe_capabilities);
+                             i += 4)
+                                REG_WR(bp, scratch_offset + i,
+                                       *(host_addr + i/4));
                 }
                 break;
         }
+
         case DRV_CTL_ULP_UNREGISTER_CMD: {
                 int ulp_type = ctl->data.ulp_type;
 
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h
new file mode 100644
index 00000000000..ddd5106ad2f
--- /dev/null
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h
@@ -0,0 +1,168 @@
+/* bnx2x_mfw_req.h: Broadcom Everest network driver.
+ *
+ * Copyright (c) 2012 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation.
+ */
+
+#ifndef BNX2X_MFW_REQ_H
+#define BNX2X_MFW_REQ_H
+
+#define PORT_0                  0
+#define PORT_1                  1
+#define PORT_MAX                2
+#define NVM_PATH_MAX            2
+
+/* FCoE capabilities required from the driver */
+struct fcoe_capabilities {
+        u32 capability1;
+        /* Maximum number of I/Os per connection */
+        #define FCOE_IOS_PER_CONNECTION_MASK    0x0000ffff
+        #define FCOE_IOS_PER_CONNECTION_SHIFT   0
+        /* Maximum number of Logins per port */
+        #define FCOE_LOGINS_PER_PORT_MASK       0xffff0000
+        #define FCOE_LOGINS_PER_PORT_SHIFT   16
+
+        u32 capability2;
+        /* Maximum number of exchanges */
+        #define FCOE_NUMBER_OF_EXCHANGES_MASK   0x0000ffff
+        #define FCOE_NUMBER_OF_EXCHANGES_SHIFT  0
+        /* Maximum NPIV WWN per port */
+        #define FCOE_NPIV_WWN_PER_PORT_MASK     0xffff0000
+        #define FCOE_NPIV_WWN_PER_PORT_SHIFT    16
+
+        u32 capability3;
+        /* Maximum number of targets supported */
+        #define FCOE_TARGETS_SUPPORTED_MASK     0x0000ffff
+        #define FCOE_TARGETS_SUPPORTED_SHIFT    0
+        /* Maximum number of outstanding commands across all connections */
+        #define FCOE_OUTSTANDING_COMMANDS_MASK  0xffff0000
+        #define FCOE_OUTSTANDING_COMMANDS_SHIFT 16
+
+        u32 capability4;
+        #define FCOE_CAPABILITY4_STATEFUL                       0x00000001
+        #define FCOE_CAPABILITY4_STATELESS                      0x00000002
+        #define FCOE_CAPABILITY4_CAPABILITIES_REPORTED_VALID    0x00000004
+};
+
+struct glob_ncsi_oem_data {
+        u32 driver_version;
+        u32 unused[3];
+        struct fcoe_capabilities fcoe_features[NVM_PATH_MAX][PORT_MAX];
+};
+
+/* current drv_info version */
+#define DRV_INFO_CUR_VER 2
+
+/* drv_info op codes supported */
+enum drv_info_opcode {
+        ETH_STATS_OPCODE,
+        FCOE_STATS_OPCODE,
+        ISCSI_STATS_OPCODE
+};
+
+#define ETH_STAT_INFO_VERSION_LEN       12
+/*  Per PCI Function Ethernet Statistics required from the driver */
+struct eth_stats_info {
+        /* Function's Driver Version. padded to 12 */
+        u8 version[ETH_STAT_INFO_VERSION_LEN];
+        /* Locally Admin Addr. BigEndian EIU48. Actual size is 6 bytes */
+        u8 mac_local[8];
+        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
+        u8 mac_add2[8];         /* Additional Programmed MAC Addr 2. */
+        u32 mtu_size;           /* MTU Size. Note   : Negotiated MTU */
+        u32 feature_flags;      /* Feature_Flags. */
+#define FEATURE_ETH_CHKSUM_OFFLOAD_MASK         0x01
+#define FEATURE_ETH_LSO_MASK                    0x02
+#define FEATURE_ETH_BOOTMODE_MASK               0x1C
+#define FEATURE_ETH_BOOTMODE_SHIFT              2
+#define FEATURE_ETH_BOOTMODE_NONE               (0x0 << 2)
+#define FEATURE_ETH_BOOTMODE_PXE                (0x1 << 2)
+#define FEATURE_ETH_BOOTMODE_ISCSI              (0x2 << 2)
+#define FEATURE_ETH_BOOTMODE_FCOE               (0x3 << 2)
+#define FEATURE_ETH_TOE_MASK                    0x20
+        u32 lso_max_size;       /* LSO MaxOffloadSize. */
+        u32 lso_min_seg_cnt;    /* LSO MinSegmentCount. */
+        /* Num Offloaded Connections TCP_IPv4. */
+        u32 ipv4_ofld_cnt;
+        /* Num Offloaded Connections TCP_IPv6. */
+        u32 ipv6_ofld_cnt;
+        u32 promiscuous_mode;   /* Promiscuous Mode. non-zero true */
+        u32 txq_size;           /* TX Descriptors Queue Size */
+        u32 rxq_size;           /* RX Descriptors Queue Size */
+        /* TX Descriptor Queue Avg Depth. % Avg Queue Depth since last poll */
+        u32 txq_avg_depth;
+        /* RX Descriptors Queue Avg Depth. % Avg Queue Depth since last poll */
+        u32 rxq_avg_depth;
+        /* IOV_Offload. 0=none; 1=MultiQueue, 2=VEB 3= VEPA*/
+        u32 iov_offload;
+        /* Number of NetQueue/VMQ Config'd. */
+        u32 netq_cnt;
+        u32 vf_cnt;             /* Num VF assigned to this PF. */
+};
+
+/*  Per PCI Function FCOE Statistics required from the driver */
+struct fcoe_stats_info {
+        u8 version[12];         /* Function's Driver Version. */
+        u8 mac_local[8];        /* Locally Admin Addr. */
+        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
+        u8 mac_add2[8];         /* Additional Programmed MAC Addr 2. */
+        /* QoS Priority (per 802.1p). 0-7255 */
+        u32 qos_priority;
+        u32 txq_size;           /* FCoE TX Descriptors Queue Size. */
+        u32 rxq_size;           /* FCoE RX Descriptors Queue Size. */
+        /* FCoE TX Descriptor Queue Avg Depth. */
+        u32 txq_avg_depth;
+        /* FCoE RX Descriptors Queue Avg Depth. */
+        u32 rxq_avg_depth;
+        u32 rx_frames_lo;       /* FCoE RX Frames received. */
+        u32 rx_frames_hi;       /* FCoE RX Frames received. */
+        u32 rx_bytes_lo;        /* FCoE RX Bytes received. */
+        u32 rx_bytes_hi;        /* FCoE RX Bytes received. */
+        u32 tx_frames_lo;       /* FCoE TX Frames sent. */
+        u32 tx_frames_hi;       /* FCoE TX Frames sent. */
+        u32 tx_bytes_lo;        /* FCoE TX Bytes sent. */
+        u32 tx_bytes_hi;        /* FCoE TX Bytes sent. */
+};
+
+/* Per PCI  Function iSCSI Statistics required from the driver*/
+struct iscsi_stats_info {
+        u8 version[12];         /* Function's Driver Version. */
+        u8 mac_local[8];        /* Locally Admin iSCSI MAC Addr. */
+        u8 mac_add1[8];         /* Additional Programmed MAC Addr 1. */
+        /* QoS Priority (per 802.1p). 0-7255 */
+        u32 qos_priority;
+        u8 initiator_name[64];  /* iSCSI Boot Initiator Node name. */
+        u8 ww_port_name[64];    /* iSCSI World wide port name */
+        u8 boot_target_name[64];/* iSCSI Boot Target Name. */
+        u8 boot_target_ip[16];  /* iSCSI Boot Target IP. */
+        u32 boot_target_portal; /* iSCSI Boot Target Portal. */
+        u8 boot_init_ip[16];    /* iSCSI Boot Initiator IP Address. */
+        u32 max_frame_size;     /* Max Frame Size. bytes */
+        u32 txq_size;           /* PDU TX Descriptors Queue Size. */
+        u32 rxq_size;           /* PDU RX Descriptors Queue Size. */
+        u32 txq_avg_depth;      /* PDU TX Descriptor Queue Avg Depth. */
+        u32 rxq_avg_depth;      /* PDU RX Descriptors Queue Avg Depth. */
+        u32 rx_pdus_lo;         /* iSCSI PDUs received. */
+        u32 rx_pdus_hi;         /* iSCSI PDUs received. */
+        u32 rx_bytes_lo;        /* iSCSI RX Bytes received. */
+        u32 rx_bytes_hi;        /* iSCSI RX Bytes received. */
+        u32 tx_pdus_lo;         /* iSCSI PDUs sent. */
+        u32 tx_pdus_hi;         /* iSCSI PDUs sent. */
+        u32 tx_bytes_lo;        /* iSCSI PDU TX Bytes sent. */
+        u32 tx_bytes_hi;        /* iSCSI PDU TX Bytes sent. */
+        u32 pcp_prior_map_tbl;  /* C-PCP to S-PCP Priority MapTable.
+                                 * 9 nibbles, the position of each nibble
+                                 * represents the C-PCP value, the value
+                                 * of the nibble = S-PCP value.
+                                 */
+};
+
+union drv_info_to_mcp {
+        struct eth_stats_info   ether_stat;
+        struct fcoe_stats_info  fcoe_stat;
+        struct iscsi_stats_info iscsi_stat;
+};
+#endif /* BNX2X_MFW_REQ_H */