be2net: adding support for Lancer family of CNAs
Subsystems (2)
PATCH 1/1 be2net: adding support for Lancer family of CNAs
Key changes are:
- EQ ids are not assigned consecutively in Lancer. So, fix mapping of MSIx vector to EQ-id.
- BAR mapping and some req locations different for Lancer.
- TCP,UDP,IP checksum fields must be compulsorily set in TX wrb for TSO in Lancer.
- CEV_IST reg not present in Lancer; so, peek into event queue to check for new entries
- cq_create and mcc_create cmd interface is different for Lancer; handle accordingly
--- drivers/net/benet/be.h | 35 ++++++-- drivers/net/benet/be_cmds.c | 96 +++++++++++++++++------ drivers/net/benet/be_cmds.h | 42 +++++++++-- drivers/net/benet/be_hw.h | 39 ++++++++- drivers/net/benet/be_main.c | 181 +++++++++++++++++++++++++++++++------------ 5 files changed, 301 insertions(+), 92 deletions(-)
drivers/net/benet/be.h +26 -9
@@ -38,14 +38,17 @@#define BE_NAME "ServerEngines BladeEngine2 10Gbps NIC"#define BE3_NAME "ServerEngines BladeEngine3 10Gbps NIC"#define OC_NAME "Emulex OneConnect 10Gbps NIC" -#define OC_NAME1 "Emulex OneConnect 10Gbps NIC (be3)" +#define OC_NAME_BE OC_NAME "(be3)" +#define OC_NAME_LANCER OC_NAME "(Lancer)"#define DRV_DESC "ServerEngines BladeEngine 10Gbps NIC Driver"#define BE_VENDOR_ID 0x19a2 +#define EMULEX_VENDOR_ID 0x10df#define BE_DEVICE_ID1 0x211#define BE_DEVICE_ID2 0x221 -#define OC_DEVICE_ID1 0x700 -#define OC_DEVICE_ID2 0x710 +#define OC_DEVICE_ID1 0x700/* Device Id for BE2 cards */ +#define OC_DEVICE_ID2 0x710/* Device Id for BE3 cards */ +#define OC_DEVICE_ID3 0xe220/* Device id for Lancer cards */ static inline char *nic_name (struct pci_dev *pdev) {
@@ -53,7 +56,9 @@ static inline char *nic_name(struct pci_dev *pdev)case OC_DEVICE_ID1 :return OC_NAME ;case OC_DEVICE_ID2 : -return OC_NAME1 ; +return OC_NAME_BE ; +case OC_DEVICE_ID3 : +return OC_NAME_LANCER ;case BE_DEVICE_ID2 :return BE3_NAME ;default :
@@ -149,6 +154,7 @@ struct be_eq_obj {u16 min_eqd;/* in usecs */ u16 max_eqd;/* in usecs */ u16 cur_eqd;/* in usecs */ +u8 msix_vec_idx;struct napi_struct napi; };
@@ -260,6 +266,8 @@ struct be_adapter {u32 num_rx_qs;u32 big_page_size;/* Compounded page size shared by rx wrbs */ +u8 msix_vec_next_idx; +struct vlan_group *vlan_grp;u16 vlans_added;u16 max_vlans;/* Number of vlans supported */
@@ -299,8 +307,8 @@ struct be_adapter {bool sriov_enabled;struct be_vf_cfg vf_cfg[BE_MAX_VF ]; -u8 base_eq_id;u8 is_virtfn; +u32 sli_family; };#define be_physfn (adapter) (!adapter->is_virtfn)
@@ -309,6 +317,8 @@ struct be_adapter {#define BE_GEN2 2#define BE_GEN3 3 +#define lancer_chip (adapter) (adapter->pdev->device == OC_DEVICE_ID3) +extern const struct ethtool_ops be_ethtool_ops;#define tx_stats (adapter) (&adapter->tx_stats)
@@ -416,10 +426,17 @@ static inline u8 is_udp_pkt(struct sk_buff *skb)static inline void be_check_sriov_fn_type (struct be_adapter *adapter) {u8 data; - -pci_write_config_byte (adapter->pdev,0xFE ,0xAA ); -pci_read_config_byte (adapter->pdev,0xFE , &data); - adapter->is_virtfn = (data !=0xAA ); +u32 sli_intf; + +if (lancer_chip (adapter)) { +pci_read_config_dword (adapter->pdev,SLI_INTF_REG_OFFSET , + &sli_intf); + adapter->is_virtfn = (sli_intf &SLI_INTF_FT_MASK ) ?1 :0 ; + }else { +pci_write_config_byte (adapter->pdev,0xFE ,0xAA ); +pci_read_config_byte (adapter->pdev,0xFE , &data); + adapter->is_virtfn = (data !=0xAA ); + } }static inline void be_vf_eth_addr_generate (struct be_adapter *adapter,u8 *mac)
drivers/net/benet/be_cmds.c +73 -23
123 lines not on this page · raw message
drivers/net/benet/be_cmds.h +36 -6
82 lines not on this page · raw message
drivers/net/benet/be_hw.h +35 -4
@@ -32,10 +32,12 @@#define MPU_EP_CONTROL 0/********** MPU semphore ******************/ -#define MPU_EP_SEMAPHORE_OFFSET 0xac -#define EP_SEMAPHORE_POST_STAGE_MASK 0x0000FFFF -#define EP_SEMAPHORE_POST_ERR_MASK 0x1 -#define EP_SEMAPHORE_POST_ERR_SHIFT 31 +#define MPU_EP_SEMAPHORE_OFFSET 0xac +#define MPU_EP_SEMAPHORE_IF_TYPE2_OFFSET 0x400 +#define EP_SEMAPHORE_POST_STAGE_MASK 0x0000FFFF +#define EP_SEMAPHORE_POST_ERR_MASK 0x1 +#define EP_SEMAPHORE_POST_ERR_SHIFT 31 +/* MPU semphore POST stage values */ #define POST_STAGE_AWAITING_HOST_RDY 0x1/* FW awaiting goahead from host */ #define POST_STAGE_HOST_RDY 0x2/* Host has given go-ahed to FW */
@@ -66,6 +68,28 @@#define PCICFG_UE_STATUS_LOW_MASK 0xA8#define PCICFG_UE_STATUS_HI_MASK 0xAC +/******** SLI_INTF ***********************/ +#define SLI_INTF_REG_OFFSET 0x58 +#define SLI_INTF_VALID_MASK 0xE0000000 +#define SLI_INTF_VALID 0xC0000000 +#define SLI_INTF_HINT2_MASK 0x1F000000 +#define SLI_INTF_HINT2_SHIFT 24 +#define SLI_INTF_HINT1_MASK 0x00FF0000 +#define SLI_INTF_HINT1_SHIFT 16 +#define SLI_INTF_FAMILY_MASK 0x00000F00 +#define SLI_INTF_FAMILY_SHIFT 8 +#define SLI_INTF_IF_TYPE_MASK 0x0000F000 +#define SLI_INTF_IF_TYPE_SHIFT 12 +#define SLI_INTF_REV_MASK 0x000000F0 +#define SLI_INTF_REV_SHIFT 4 +#define SLI_INTF_FT_MASK 0x00000001 + + +/* SLI family */ +#define BE_SLI_FAMILY 0x0 +#define LANCER_A0_SLI_FAMILY 0xA + +/********* ISR0 Register offset **********/ #define CEV_ISR0_OFFSET 0xC18#define CEV_ISR_SIZE 4
@@ -73,6 +97,9 @@/********* Event Q door bell *************/ #define DB_EQ_OFFSET DB_CQ_OFFSET#define DB_EQ_RING_ID_MASK 0x1FF/* bits 0 - 8 */ +#define DB_EQ_RING_ID_EXT_MASK 0x3e00/* bits 9-13 */ +#define DB_EQ_RING_ID_EXT_MASK_SHIFT (2)/* qid bits 9-13 placing at 11-15 */ +/* Clear the interrupt for this eq */ #define DB_EQ_CLR_SHIFT (9)/* bit 9 */ /* Must be 1 */
@@ -85,6 +112,10 @@/********* Compl Q door bell *************/ #define DB_CQ_OFFSET 0x120#define DB_CQ_RING_ID_MASK 0x3FF/* bits 0 - 9 */ +#define DB_CQ_RING_ID_EXT_MASK 0x7C00/* bits 10-14 */ +#define DB_CQ_RING_ID_EXT_MASK_SHIFT (1)/* qid bits 10-14 +placing at 11-15 */ +/* Number of event entries processed */ #define DB_CQ_NUM_POPPED_SHIFT (16)/* bits 16 - 28 */ /* Rearm bit */
drivers/net/benet/be_main.c +131 -50
353 lines not on this page · raw message
Signature · 1 line
1.6.5.2
From: Sathya Perla <[email protected]>
Date: Mon, 22 Nov 2010 14:55:50 +0530
Quoted 11 lines
Key changes are:
- EQ ids are not assigned consecutively in Lancer. So, fix mapping of MSIx vector to EQ-id.
- BAR mapping and some req locations different for Lancer.
- TCP,UDP,IP checksum fields must be compulsorily set in TX wrb for TSO in Lancer.
-CEV_ISTreg not present in Lancer; so, peek into event queue to check for new entries
-cq_createandmcc_createcmd interface is different for Lancer; handle accordingly
Quoted 2 lines
Signed-off-by Padmanabh Ratnakar <[email protected]>Signed-off-by Sathya Perla <[email protected]>
Applied, thank you.