bnxt_en: Support new 5760X P7 devices
Michael Chan
maintainercover bnxt_en: Support new 5760X P7 devices
This series completes the basic support for the new 5760X P7 devices with new PCI IDs added in the last patch.
Thie first patch fixes a backing store issue introduced in the last patchset last week. The 2nd patch is the new firmware interface required to support the new chips. The next few patches are doorbell changes, refactoring, and new hardware interface structures. New changes to support packet reception including TPA are added in patch 10. The next 4 patches are ethernet link related changes to support the new chip.
Ajit Khaparde (1):
bnxt_en: Refactor RSS capability fields
Hongguang Gao (1):
bnxt_en: Consolidate DB offset calculation
Michael Chan (13):
bnxt_en: Fix backing store V2 logic
bnxt_en: Update firmware interface to 1.10.3.15
bnxt_en: Define basic P7 macros
bnxt_en: Implement the new toggle bit doorbell mechanism on P7 chips
bnxt_en: Add new P7 hardware interface definitions
bnxt_en: Refactor RX VLAN acceleration logic.
bnxt_en: Refactor and refine bnxt_tpa_start() and bnxt_tpa_end().
bnxt_en: Add support for new RX and TPA_START completion types for P7
bnxt_en: Refactor ethtool speeds logic
bnxt_en: Support new firmware link parameters
bnxt_en: Support force speed using the new HWRM fields
bnxt_en: Report the new ethtool link modes in the new firmware
interface
bnxt_en: Add 5760X (P7) PCI IDs
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 383 ++++++++++--- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 189 ++++++- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 315 +++++++++-- drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 521 +++++++++++++----- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 10 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 4 + 6 files changed, 1132 insertions(+), 290 deletions(-)
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 1/15 bnxt_en: Fix backing store V2 logic
The current code determines the last backing store valid type during bnxt_hwrm_func_backing_store_qcaps_v2(). In effect, the last type is determined based on what firmware advertises. The more correct way is to determine it based on what the driver is configuring. The driver may not configure all the backing store types advertised by firmware.
Move the logic to determine the last type to bnxt_backing_store_cfg_v2(). We need to pass the legacy enable flags to the function in case only the legacy types are being configured.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 17 +++++++++++------ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + 2 files changed, 12 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +11 -6
@@ -7249,7 +7249,6 @@ static int bnxt_hwrm_func_backing_store_qcaps_v2(struct bnxt *bp) {struct hwrm_func_backing_store_qcaps_v2_output *resp;struct hwrm_func_backing_store_qcaps_v2_input *req; -u16 last_valid_type =BNXT_CTX_INV ;struct bnxt_ctx_mem_info *ctx;u16 type;int rc;
@@ -7281,7 +7280,6 @@ static int bnxt_hwrm_func_backing_store_qcaps_v2(struct bnxt *bp)continue ; ctxm->type =le16_to_cpu (resp->type); - last_valid_type = ctxm->type; ctxm->entry_size =le16_to_cpu (resp->entry_size); ctxm->flags = flags; ctxm->instance_bmap =le32_to_cpu (resp->instance_bit_map);
@@ -7298,8 +7296,6 @@ static int bnxt_hwrm_func_backing_store_qcaps_v2(struct bnxt *bp) i++, p++) ctxm->split[i] =le32_to_cpu (*p); } -if (last_valid_type <BNXT_CTX_V2_MAX ) - ctx->ctx_arr[last_valid_type].last = true; rc =bnxt_alloc_all_ctx_pg_info (bp,BNXT_CTX_V2_MAX ); ctx_done:
@@ -7751,13 +7747,22 @@ static int bnxt_hwrm_func_backing_store_cfg_v2(struct bnxt *bp,return rc; } -static int bnxt_backing_store_cfg_v2 (struct bnxt *bp) +static int bnxt_backing_store_cfg_v2 (struct bnxt *bp,u32 ena) {struct bnxt_ctx_mem_info *ctx = bp->ctx;struct bnxt_ctx_mem_type *ctxm; +u16 last_type;int rc =0 ;u16 type; +if (!ena) +return 0 ; +else if (ena &FUNC_BACKING_STORE_CFG_REQ_ENABLES_TIM ) + last_type =BNXT_CTX_MAX -1 ; +else + last_type =BNXT_CTX_L2_MAX -1 ; + ctx->ctx_arr[last_type].last =1 ; +for (type =0 ; type <BNXT_CTX_V2_MAX ; type++) { ctxm = &ctx->ctx_arr[type];
@@ -7904,7 +7909,7 @@ static int bnxt_alloc_ctx_mem(struct bnxt *bp) ena |=FUNC_BACKING_STORE_CFG_REQ_DFLT_ENABLES ;if (bp->fw_cap &BNXT_FW_CAP_BACKING_STORE_V2 ) - rc =bnxt_backing_store_cfg_v2 (bp); + rc =bnxt_backing_store_cfg_v2 (bp, ena);else rc =bnxt_hwrm_func_backing_store_cfg (bp, ena);if (rc) {
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -1611,6 +1611,7 @@ struct bnxt_ctx_mem_type {#define BNXT_CTX_XPAR FUNC_BACKING_STORE_QCAPS_V2_REQ_TYPE_XID_PARTITION#define BNXT_CTX_MAX (BNXT_CTX_TIM + 1) +#define BNXT_CTX_L2_MAX (BNXT_CTX_FTQM + 1)#define BNXT_CTX_V2_MAX (BNXT_CTX_XPAR + 1)#define BNXT_CTX_INV ((u16)-1)
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 2/15 bnxt_en: Update firmware interface to 1.10.3.15
In reply to Michael ChanThis updated interface supports the new 5760X P7 chip family. It has the changes to support the new link speeds/modes and other changes for the basic L2 features.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 521 +++++++++++++----- 2 files changed, 388 insertions(+), 135 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -1
@@ -18,7 +18,7 @@*/ #define DRV_VER_MAJ 1#define DRV_VER_MIN 10 -#define DRV_VER_UPD 2 +#define DRV_VER_UPD 3#include <linux/ethtool.h> #include <linux/interrupt.h>
drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h +387 -134
840 lines not on this page · raw message
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 3/15 bnxt_en: Define basic P7 macros
In reply to Michael ChanRepurpose the BNXT_FLAG_CHIP_SR2 flag by renaming it to BNXT_FLAG_CHIP_P7 since the SR2 chip never went to production. The SR2 statictics structure is also renamed for the P7 chip. Define the basic P7 doorbell bits (Epoch. Toggle, etc) and implement the Epoch bit logic. The next higher bit beyond the legal doorbell mask is the Epoch bit used for doorbells on P7 chips. This bit is used by the chip to detect dropped doorbells.
The 57608 chip ID belonging to the P7 family is also defined. Note that the PCI ID is not added until the last patch in the series.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 21 ++++++++-- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 40 ++++++++++++++----- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- 3 files changed, 48 insertions(+), 15 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +17 -4
@@ -260,6 +260,10 @@ static bool bnxt_vf_pciid(enum board_idx idx)bnxt_writeq (bp, (db)->db_key64 |DBR_TYPE_NQ |DB_RING_IDX (db, idx),\ (db)->doorbell) +#define BNXT_DB_NQ_P7 (db, idx) \ + bnxt_writeq(bp, (db)->db_key64 | DBR_TYPE_NQ_MASK | \ + DB_RING_IDX(db, idx), (db)->doorbell) +#define BNXT_DB_CQ_ARM (db, idx) \ writel(DB_CP_REARM_FLAGS | DB_RING_IDX(db, idx), (db)->doorbell)
@@ -269,7 +273,9 @@ static bool bnxt_vf_pciid(enum board_idx idx)static void bnxt_db_nq (struct bnxt *bp,struct bnxt_db_info *db,u32 idx) { -if (bp->flags &BNXT_FLAG_CHIP_P5_PLUS ) +if (bp->flags &BNXT_FLAG_CHIP_P7 ) +BNXT_DB_NQ_P7 (db, idx); +else if (bp->flags &BNXT_FLAG_CHIP_P5_PLUS )BNXT_DB_NQ_P5 (db, idx);else BNXT_DB_CQ (db, idx);
@@ -5784,7 +5790,7 @@ static int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)if (BNXT_CHIP_P5 (bp)) bp->hw_ring_stats_size =BNXT_RING_STATS_SIZE_P5 ;else - bp->hw_ring_stats_size =BNXT_RING_STATS_SIZE_P5_SR2 ; + bp->hw_ring_stats_size =BNXT_RING_STATS_SIZE_P7 ; } }hwrm_req_drop (bp, req);
@@ -6015,6 +6021,10 @@ static void bnxt_set_db_mask(struct bnxt *bp, struct bnxt_db_info *db, db->db_ring_mask = bp->cp_ring_mask;break ; } +if (bp->flags &BNXT_FLAG_CHIP_P7 ) { + db->db_epoch_mask = db->db_ring_mask +1 ; + db->db_epoch_shift =DBR_EPOCH_SFT -ilog2 (db->db_epoch_mask); + } } static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type,
@@ -6041,6 +6051,9 @@ static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type,break ; } db->db_key64 |= (u64 )xid <<DBR_XID_SFT ; + +if (bp->flags &BNXT_FLAG_CHIP_P7 ) + db->db_key64 |=DBR_VALID ; }else { db->doorbell = bp->bar1 + map_idx *0x80 ;switch (ring_type) {
@@ -14014,8 +14027,8 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (BNXT_CHIP_P5_PLUS (bp)) { bp->flags |=BNXT_FLAG_CHIP_P5_PLUS ; -if (BNXT_CHIP_SR2 (bp)) - bp->flags |=BNXT_FLAG_CHIP_SR2 ; +if (BNXT_CHIP_P7 (bp)) + bp->flags |=BNXT_FLAG_CHIP_P7 ; } rc =bnxt_alloc_rss_indir_tbl (bp);
drivers/net/ethernet/broadcom/bnxt/bnxt.h +30 -10
@@ -541,6 +541,8 @@ struct nqe_cn {#define NQ_CN_TYPE_SFT 0#define NQ_CN_TYPE_CQ_NOTIFICATION 0x30UL#define NQ_CN_TYPE_LAST NQ_CN_TYPE_CQ_NOTIFICATION +#define NQ_CN_TOGGLE_MASK 0xc0UL +#define NQ_CN_TOGGLE_SFT 6__le16 reserved16;__le32 cq_handle_low;__le32 v;
@@ -561,6 +563,10 @@ struct nqe_cn {#define BNXT_SET_NQ_HDL (cpr) \ (((cpr)->cp_ring_type << BNXT_NQ_HDL_TYPE_SHIFT) | (cpr)->cp_idx) +#define NQE_CN_TYPE (type) ((type) & NQ_CN_TYPE_MASK) +#define NQE_CN_TOGGLE (type) (((type) & NQ_CN_TOGGLE_MASK) >> \ + NQ_CN_TOGGLE_SFT) +#define DB_IDX_MASK 0xffffff#define DB_IDX_VALID (0x1 << 26)#define DB_IRQ_DIS (0x1 << 27)
@@ -576,9 +582,14 @@ struct nqe_cn {/* 64-bit doorbell */ #define DBR_INDEX_MASK 0x0000000000ffffffULL +#define DBR_EPOCH_MASK 0x01000000UL +#define DBR_EPOCH_SFT 24 +#define DBR_TOGGLE_MASK 0x06000000UL +#define DBR_TOGGLE_SFT 25#define DBR_XID_MASK 0x000fffff00000000ULL#define DBR_XID_SFT 32#define DBR_PATH_L2 (0x1ULL << 56) +#define DBR_VALID (0x1ULL << 58)#define DBR_TYPE_SQ (0x0ULL << 60)#define DBR_TYPE_RQ (0x1ULL << 60)#define DBR_TYPE_SRQ (0x2ULL << 60)
@@ -591,6 +602,7 @@ struct nqe_cn {#define DBR_TYPE_CQ_CUTOFF_ACK (0x9ULL << 60)#define DBR_TYPE_NQ (0xaULL << 60)#define DBR_TYPE_NQ_ARM (0xbULL << 60) +#define DBR_TYPE_NQ_MASK (0xeULL << 60)#define DBR_TYPE_NULL (0xfULL << 60)#define DB_PF_OFFSET_P5 0x10000
@@ -819,9 +831,17 @@ struct bnxt_db_info {u32 db_key32; };u32 db_ring_mask; +u32 db_epoch_mask; +u8 db_epoch_shift; }; -#define DB_RING_IDX (db, idx) ((idx) & (db)->db_ring_mask) +#define DB_EPOCH (db, idx) (((idx) & (db)->db_epoch_mask) << \ + ((db)->db_epoch_shift)) + +#define DB_TOGGLE (tgl) ((tgl) << DBR_TOGGLE_SFT) + +#define DB_RING_IDX (db, idx) (((idx) & (db)->db_ring_mask) | \ + DB_EPOCH(db, idx))struct bnxt_tx_ring_info {struct bnxt_napi *bnapi;
@@ -1803,14 +1823,14 @@ struct bnxt {#define CHIP_NUM_57504 0x1751#define CHIP_NUM_57502 0x1752 +#define CHIP_NUM_57608 0x1760 +#define CHIP_NUM_58802 0xd802#define CHIP_NUM_58804 0xd804#define CHIP_NUM_58808 0xd808u8 chip_rev; -#define CHIP_NUM_58818 0xd818 -#define BNXT_CHIP_NUM_5730X (chip_num) \ ((chip_num) >= CHIP_NUM_57301 && \ (chip_num) <= CHIP_NUM_57304)
@@ -1888,7 +1908,7 @@ struct bnxt { BNXT_FLAG_ROCEV2_CAP)#define BNXT_FLAG_NO_AGG_RINGS 0x20000#define BNXT_FLAG_RX_PAGE_MODE 0x40000 -#define BNXT_FLAG_CHIP_SR2 0x80000 +#define BNXT_FLAG_CHIP_P7 0x80000#define BNXT_FLAG_MULTI_HOST 0x100000#define BNXT_FLAG_DSN_VALID 0x200000#define BNXT_FLAG_DOUBLE_DB 0x400000
@@ -1918,8 +1938,8 @@ struct bnxt { (bp)->max_tpa_v2) && !is_kdump_kernel())#define BNXT_RX_JUMBO_MODE (bp) ((bp)->flags & BNXT_FLAG_JUMBO) -#define BNXT_CHIP_SR2 (bp) \ - ((bp)->chip_num == CHIP_NUM_58818) +#define BNXT_CHIP_P7 (bp) \ + ((bp)->chip_num == CHIP_NUM_57608)#define BNXT_CHIP_P5 (bp) \ ((bp)->chip_num == CHIP_NUM_57508 || \
@@ -1928,7 +1948,7 @@ struct bnxt {/* Chip class phase 5 */ #define BNXT_CHIP_P5_PLUS (bp) \ - (BNXT_CHIP_P5(bp) || BNXT_CHIP_SR2(bp)) + (BNXT_CHIP_P5(bp) || BNXT_CHIP_P7(bp))/* Chip class phase 4.x */ #define BNXT_CHIP_P4 (bp) \
@@ -2272,15 +2292,15 @@ struct bnxt {#define BNXT_NUM_TX_RING_STATS 8#define BNXT_NUM_TPA_RING_STATS 4#define BNXT_NUM_TPA_RING_STATS_P5 5 -#define BNXT_NUM_TPA_RING_STATS_P5_SR2 6 +#define BNXT_NUM_TPA_RING_STATS_P7 6#define BNXT_RING_STATS_SIZE_P5 \ ((BNXT_NUM_RX_RING_STATS + BNXT_NUM_TX_RING_STATS + \ BNXT_NUM_TPA_RING_STATS_P5) * 8) -#define BNXT_RING_STATS_SIZE_P5_SR2 \ +#define BNXT_RING_STATS_SIZE_P7 \ ((BNXT_NUM_RX_RING_STATS + BNXT_NUM_TX_RING_STATS + \ - BNXT_NUM_TPA_RING_STATS_P5_SR2) * 8) + BNXT_NUM_TPA_RING_STATS_P7) * 8)#define BNXT_GET_RING_STATS64 (sw, counter) \ (*((sw) + offsetof(struct ctx_hw_stats, counter) / 8))
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +1 -1
@@ -513,7 +513,7 @@ static int bnxt_get_num_tpa_ring_stats(struct bnxt *bp)if (bp->max_tpa_v2) {if (BNXT_CHIP_P5 (bp))return BNXT_NUM_TPA_RING_STATS_P5 ; -return BNXT_NUM_TPA_RING_STATS_P5_SR2 ; +return BNXT_NUM_TPA_RING_STATS_P7 ; }return BNXT_NUM_TPA_RING_STATS ; }
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 4/15 bnxt_en: Consolidate DB offset calculation
In reply to Michael ChanFrom: Hongguang Gao <[email protected]>
The doorbell offset on P5 chips is hard coded. On the new P7 chips, it is returned by the firmware. Simplify the logic that determines this offset and store it in a new db_offset field in struct bnxt. Also, provide this offset to the RoCE driver in struct bnxt_en_dev.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 16 +++++++--------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 10 ++++------ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 4 ++++ 4 files changed, 16 insertions(+), 15 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +7 -9
@@ -6031,10 +6031,6 @@ static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type, u32 map_idx, u32 xid) {if (bp->flags &BNXT_FLAG_CHIP_P5_PLUS ) { -if (BNXT_PF (bp)) - db->doorbell = bp->bar1 +DB_PF_OFFSET_P5 ; -else - db->doorbell = bp->bar1 +DB_VF_OFFSET_P5 ;switch (ring_type) {case HWRM_RING_ALLOC_TX : db->db_key64 =DBR_PATH_L2 |DBR_TYPE_SQ ;
@@ -6054,6 +6050,8 @@ static void bnxt_set_db(struct bnxt *bp, struct bnxt_db_info *db, u32 ring_type,if (bp->flags &BNXT_FLAG_CHIP_P7 ) db->db_key64 |=DBR_VALID ; + + db->doorbell = bp->bar1 + bp->db_offset; }else { db->doorbell = bp->bar1 + map_idx *0x80 ;switch (ring_type) {
@@ -7146,7 +7144,6 @@ static int bnxt_hwrm_func_qcfg(struct bnxt *bp) {struct hwrm_func_qcfg_output *resp;struct hwrm_func_qcfg_input *req; -u32 min_db_offset =0 ;u16 flags;int rc;
@@ -7204,16 +7201,17 @@ static int bnxt_hwrm_func_qcfg(struct bnxt *bp)if (bp->db_size) goto func_qcfg_exit; -if (bp->flags &BNXT_FLAG_CHIP_P5_PLUS ) { + bp->db_offset =le16_to_cpu (resp->legacy_l2_db_size_kb) *1024 ; +if (BNXT_CHIP_P5 (bp)) {if (BNXT_PF (bp)) - min_db_offset =DB_PF_OFFSET_P5 ; + bp->db_offset =DB_PF_OFFSET_P5 ;else - min_db_offset =DB_VF_OFFSET_P5 ; + bp->db_offset =DB_VF_OFFSET_P5 ; } bp->db_size =PAGE_ALIGN (le16_to_cpu (resp->l2_doorbell_bar_size_kb) *1024 );if (!bp->db_size || bp->db_size >pci_resource_len (bp->pdev,2 ) || - bp->db_size <= min_db_offset) + bp->db_size <= bp->db_offset) bp->db_size =pci_resource_len (bp->pdev,2 ); func_qcfg_exit:
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -2216,6 +2216,7 @@ struct bnxt {/* ensure atomic 64-bit doorbell writes on 32-bit systems. */ spinlock_t db_lock;#endif +int db_offset;/* db_offset within db_size */ int db_size;#define BNXT_NTP_FLTR_MAX_FLTR 4096
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +4 -6
@@ -42,13 +42,10 @@ static void bnxt_fill_msix_vecs(struct bnxt *bp, struct bnxt_msix_entry *ent)for (i =0 ; i < num_msix; i++) { ent[i].vector = bp->irq_tbl[idx + i].vector; ent[i].ring_idx = idx + i; -if (bp->flags &BNXT_FLAG_CHIP_P5_PLUS ) { - ent[i].db_offset =DB_PF_OFFSET_P5 ; -if (BNXT_VF (bp)) - ent[i].db_offset =DB_VF_OFFSET_P5 ; - }else { +if (bp->flags &BNXT_FLAG_CHIP_P5_PLUS ) + ent[i].db_offset = bp->db_offset; +else ent[i].db_offset = (idx + i) *0x80 ; - } } }
@@ -333,6 +330,7 @@ static void bnxt_set_edev_info(struct bnxt_en_dev *edev, struct bnxt *bp) edev->pdev = bp->pdev; edev->l2_db_size = bp->db_size; edev->l2_db_size_nc = bp->db_size; + edev->l2_db_offset = bp->db_offset;if (bp->flags &BNXT_FLAG_ROCEV1_CAP ) edev->flags |=BNXT_EN_FLAG_ROCEV1_CAP ;
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h +4 -0
@@ -73,6 +73,10 @@ struct bnxt_en_dev {* bytes mapped as non- * cacheable. */ +int l2_db_offset;/* Doorbell offset in +* bytes within +* l2_db_size_nc. +*/ u16 chip_num;u16 hw_ring_stats_size;u16 pf_port_id;
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 5/15 bnxt_en: Implement the new toggle bit doorbell mechanism on P7 chips
In reply to Michael ChanThe new chip family passes the Toggle bits to the driver in the NQE notification. The driver now stores this value and sends it back to hardware when it re-arms the RX and TX CQs. Together with the earlier patch that guarantees the driver will only re-arm the CQ at the end of NAPI polling if it has seen a new NQE, this method allows the hardware to detect any dropped doorbells.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 17 +++++++++++++---- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +13 -4
@@ -2880,13 +2880,18 @@ static void __bnxt_poll_cqs_done(struct bnxt *bp, struct bnxt_napi *bnapi,struct bnxt_db_info *db;if (cpr2->had_work_done) { +u32 tgl =0 ; + +if (dbr_type ==DBR_TYPE_CQ_ARMALL ) { + cpr2->had_nqe_notify =0 ; + tgl = cpr2->toggle; + } db = &cpr2->cp_db; -bnxt_writeq (bp, db->db_key64 | dbr_type | +bnxt_writeq (bp, + db->db_key64 | dbr_type |DB_TOGGLE (tgl) |DB_RING_IDX (db, cpr2->cp_raw_cons), db->doorbell); cpr2->had_work_done =0 ; -if (dbr_type ==DBR_TYPE_CQ_ARMALL ) - cpr2->had_nqe_notify =0 ; } }__bnxt_poll_work_done (bp, bnapi, budget);
@@ -2912,6 +2917,8 @@ static int bnxt_poll_p5(struct napi_struct *napi, int budget) work_done =__bnxt_poll_cqs (bp, bnapi, budget); }while (1 ) { +u16 type; + cons =RING_CMP (raw_cons); nqcmp = &cpr->nq_desc_ring[CP_RING (cons)][CP_IDX (cons)];
@@ -2933,7 +2940,8 @@ static int bnxt_poll_p5(struct napi_struct *napi, int budget)*/ dma_rmb (); -if (nqcmp->type ==cpu_to_le16 (NQ_CN_TYPE_CQ_NOTIFICATION )) { + type =le16_to_cpu (nqcmp->type); +if (NQE_CN_TYPE (type) ==NQ_CN_TYPE_CQ_NOTIFICATION ) {u32 idx =le32_to_cpu (nqcmp->cq_handle_low);u32 cq_type =BNXT_NQ_HDL_TYPE (idx);struct bnxt_cp_ring_info *cpr2;
@@ -2946,6 +2954,7 @@ static int bnxt_poll_p5(struct napi_struct *napi, int budget) idx =BNXT_NQ_HDL_IDX (idx); cpr2 = &cpr->cp_ring_arr[idx]; cpr2->had_nqe_notify =1 ; + cpr2->toggle =NQE_CN_TOGGLE (type); work_done +=__bnxt_poll_work (bp, cpr2, budget - work_done); cpr->has_more_work |= cpr2->has_more_work;
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -0
@@ -1038,6 +1038,7 @@ struct bnxt_cp_ring_info { u8 had_work_done:1; u8 has_more_work:1; u8 had_nqe_notify:1; +u8 toggle;u8 cp_ring_type;u8 cp_idx;
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 6/15 bnxt_en: Refactor RSS capability fields
In reply to Michael ChanFrom: Ajit Khaparde <[email protected]>
Add a new rss_cap field in the per device struct bnxt and move all the RSS capability fields there. It will be easier to add new RSS capabilities for the new P7 chips.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 25 ++++++++++--------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 7 +++--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 6 ++--- 3 files changed, 20 insertions(+), 18 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +13 -12
@@ -4268,7 +4268,7 @@ static int bnxt_alloc_vnic_attributes(struct bnxt *bp) goto out; } vnic_skip_grps: -if ((bp->flags &BNXT_FLAG_NEW_RSS_CAP ) && +if ((bp->rss_cap &BNXT_RSS_CAP_NEW_RSS_CAP ) && !(vnic->flags &BNXT_VNIC_RSS_FLAG ))continue ;
@@ -5765,7 +5765,8 @@ static int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)int rc; bp->hw_ring_stats_size =sizeof (struct ctx_hw_stats ); - bp->flags &= ~(BNXT_FLAG_NEW_RSS_CAP |BNXT_FLAG_ROCE_MIRROR_CAP ); + bp->flags &= ~BNXT_FLAG_ROCE_MIRROR_CAP ; + bp->rss_cap &= ~BNXT_RSS_CAP_NEW_RSS_CAP ;if (bp->hwrm_spec_code <0x10600 )return 0 ;
@@ -5780,7 +5781,7 @@ static int bnxt_hwrm_vnic_qcaps(struct bnxt *bp)if (!(bp->flags &BNXT_FLAG_CHIP_P5_PLUS ) && (flags &VNIC_QCAPS_RESP_FLAGS_RSS_DFLT_CR_CAP )) - bp->flags |=BNXT_FLAG_NEW_RSS_CAP ; + bp->rss_cap |=BNXT_RSS_CAP_NEW_RSS_CAP ;if (flags &VNIC_QCAPS_RESP_FLAGS_ROCE_MIRRORING_CAPABLE_VNIC_CAP ) bp->flags |=BNXT_FLAG_ROCE_MIRROR_CAP ;
@@ -5793,7 +5794,7 @@ static int bnxt_hwrm_vnic_qcaps(struct bnxt *bp) !(bp->fw_cap & BNXT_FW_CAP_EXT_HW_STATS_SUPPORTED))) bp->fw_cap |= BNXT_FW_CAP_VLAN_RX_STRIP;if (flags &VNIC_QCAPS_RESP_FLAGS_RSS_HASH_TYPE_DELTA_CAP ) - bp->fw_cap |=BNXT_FW_CAP_RSS_HASH_TYPE_DELTA ; + bp->rss_cap |=BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA ; bp->max_tpa_v2 =le16_to_cpu (resp->max_aggs_supported);if (bp->max_tpa_v2) {if (BNXT_CHIP_P5 (bp))
@@ -6456,7 +6457,7 @@ __bnxt_hwrm_reserve_pf_rings(struct bnxt *bp, int tx_rings, int rx_rings, req->num_cmpl_rings =cpu_to_le16 (cp_rings); req->num_hw_ring_grps =cpu_to_le16 (ring_grps); req->num_rsscos_ctxs =cpu_to_le16 (1 ); -if (!(bp->flags &BNXT_FLAG_NEW_RSS_CAP ) && +if (!(bp->rss_cap &BNXT_RSS_CAP_NEW_RSS_CAP ) &&bnxt_rfs_supported (bp)) req->num_rsscos_ctxs =cpu_to_le16 (ring_grps +1 );
@@ -9133,7 +9134,7 @@ static int bnxt_alloc_rfs_vnics(struct bnxt *bp) vnic = &bp->vnic_info[vnic_id]; vnic->flags |=BNXT_VNIC_RFS_FLAG ; -if (bp->flags &BNXT_FLAG_NEW_RSS_CAP ) +if (bp->rss_cap &BNXT_RSS_CAP_NEW_RSS_CAP ) vnic->flags |=BNXT_VNIC_RFS_NEW_RSS_FLAG ; rc =bnxt_hwrm_vnic_alloc (bp, vnic_id, ring_id,1 );if (rc) {
@@ -9227,7 +9228,7 @@ static int bnxt_init_chip(struct bnxt *bp, bool irq_re_init) rc =bnxt_setup_vnic (bp,0 );if (rc) goto err_out; -if (bp->fw_cap &BNXT_FW_CAP_RSS_HASH_TYPE_DELTA ) +if (bp->rss_cap &BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA )bnxt_hwrm_update_rss_hash_cfg (bp);if (bp->flags &BNXT_FLAG_RFS ) {
@@ -11555,7 +11556,7 @@ static bool bnxt_rfs_supported(struct bnxt *bp)return false;if (BNXT_PF (bp) && !BNXT_CHIP_TYPE_NITRO_A0 (bp))return true; -if (bp->flags &BNXT_FLAG_NEW_RSS_CAP ) +if (bp->rss_cap &BNXT_RSS_CAP_NEW_RSS_CAP )return true;return false; }
@@ -11576,7 +11577,7 @@ static bool bnxt_rfs_capable(struct bnxt *bp) max_rss_ctxs =bnxt_get_max_func_rss_ctxs (bp);/* RSS contexts not a limiting factor */ -if (bp->flags &BNXT_FLAG_NEW_RSS_CAP ) +if (bp->rss_cap &BNXT_RSS_CAP_NEW_RSS_CAP ) max_rss_ctxs = max_vnics;if (vnics > max_vnics || vnics > max_rss_ctxs) {if (bp->rx_nr_rings >1 )
@@ -12697,15 +12698,15 @@ static int bnxt_fw_init_one_p2(struct bnxt *bp)static void bnxt_set_dflt_rss_hash_type (struct bnxt *bp) { - bp->flags &= ~BNXT_FLAG_UDP_RSS_CAP ; + bp->rss_cap &= ~BNXT_RSS_CAP_UDP_RSS_CAP ; bp->rss_hash_cfg =VNIC_RSS_CFG_REQ_HASH_TYPE_IPV4 |VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 |VNIC_RSS_CFG_REQ_HASH_TYPE_IPV6 |VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6 ; -if (bp->fw_cap &BNXT_FW_CAP_RSS_HASH_TYPE_DELTA ) +if (bp->rss_cap &BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA ) bp->rss_hash_delta = bp->rss_hash_cfg;if (BNXT_CHIP_P4_PLUS (bp) && bp->hwrm_spec_code >=0x10501 ) { - bp->flags |=BNXT_FLAG_UDP_RSS_CAP ; + bp->rss_cap |=BNXT_RSS_CAP_UDP_RSS_CAP ; bp->rss_hash_cfg |=VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4 |VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6 ; }
drivers/net/ethernet/broadcom/bnxt/bnxt.h +4 -3
@@ -1900,8 +1900,6 @@ struct bnxt {#define BNXT_FLAG_RFS 0x100#define BNXT_FLAG_SHARED_RINGS 0x200#define BNXT_FLAG_PORT_STATS 0x400 -#define BNXT_FLAG_UDP_RSS_CAP 0x800 -#define BNXT_FLAG_NEW_RSS_CAP 0x2000#define BNXT_FLAG_WOL_CAP 0x4000#define BNXT_FLAG_ROCEV1_CAP 0x8000#define BNXT_FLAG_ROCEV2_CAP 0x10000
@@ -2021,6 +2019,10 @@ struct bnxt {u16 rss_indir_tbl_entries;u32 rss_hash_cfg;u32 rss_hash_delta; +u32 rss_cap; +#define BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA BIT(0) +#define BNXT_RSS_CAP_UDP_RSS_CAP BIT(1) +#define BNXT_RSS_CAP_NEW_RSS_CAP BIT(2)u16 max_mtu;u8 max_tc;
@@ -2086,7 +2088,6 @@ struct bnxt {#define BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2 BIT_ULL(16)#define BNXT_FW_CAP_PCIE_STATS_SUPPORTED BIT_ULL(17)#define BNXT_FW_CAP_EXT_STATS_SUPPORTED BIT_ULL(18) -#define BNXT_FW_CAP_RSS_HASH_TYPE_DELTA BIT_ULL(19)#define BNXT_FW_CAP_ERR_RECOVER_RELOAD BIT_ULL(20)#define BNXT_FW_CAP_HOT_RESET BIT_ULL(21)#define BNXT_FW_CAP_PTP_RTC BIT_ULL(22)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +3 -3
@@ -1203,7 +1203,7 @@ static int bnxt_srxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)if (tuple ==4 ) rss_hash_cfg |=VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV4 ; }else if (cmd->flow_type ==UDP_V4_FLOW ) { -if (tuple ==4 && !(bp->flags &BNXT_FLAG_UDP_RSS_CAP )) +if (tuple ==4 && !(bp->rss_cap &BNXT_RSS_CAP_UDP_RSS_CAP ))return -EINVAL ; rss_hash_cfg &= ~VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV4 ;if (tuple ==4 )
@@ -1213,7 +1213,7 @@ static int bnxt_srxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)if (tuple ==4 ) rss_hash_cfg |=VNIC_RSS_CFG_REQ_HASH_TYPE_TCP_IPV6 ; }else if (cmd->flow_type ==UDP_V6_FLOW ) { -if (tuple ==4 && !(bp->flags &BNXT_FLAG_UDP_RSS_CAP )) +if (tuple ==4 && !(bp->rss_cap &BNXT_RSS_CAP_UDP_RSS_CAP ))return -EINVAL ; rss_hash_cfg &= ~VNIC_RSS_CFG_REQ_HASH_TYPE_UDP_IPV6 ;if (tuple ==4 )
@@ -1253,7 +1253,7 @@ static int bnxt_srxfh(struct bnxt *bp, struct ethtool_rxnfc *cmd)if (bp->rss_hash_cfg == rss_hash_cfg)return 0 ; -if (bp->fw_cap &BNXT_FW_CAP_RSS_HASH_TYPE_DELTA ) +if (bp->rss_cap &BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA ) bp->rss_hash_delta = bp->rss_hash_cfg ^ rss_hash_cfg; bp->rss_hash_cfg = rss_hash_cfg;if (netif_running (bp->dev)) {
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 7/15 bnxt_en: Add new P7 hardware interface definitions
In reply to Michael ChanAdd new RX, TX, and TPA hardware interface structures and macros for the P7 chips.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 85 ++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.h +84 -1
@@ -139,11 +139,15 @@ struct tx_cmp {__le32 tx_cmp_flags_type;#define CMP_TYPE (0x3f << 0)#define CMP_TYPE_TX_L2_CMP 0 +#define CMP_TYPE_TX_L2_COAL_CMP 2 +#define CMP_TYPE_TX_L2_PKT_TS_CMP 4#define CMP_TYPE_RX_L2_CMP 17#define CMP_TYPE_RX_AGG_CMP 18#define CMP_TYPE_RX_L2_TPA_START_CMP 19#define CMP_TYPE_RX_L2_TPA_END_CMP 21#define CMP_TYPE_RX_TPA_AGG_CMP 22 +#define CMP_TYPE_RX_L2_V3_CMP 23 +#define CMP_TYPE_RX_L2_TPA_START_V3_CMP 25#define CMP_TYPE_STATUS_CMP 32#define CMP_TYPE_REMOTE_DRIVER_REQ 34#define CMP_TYPE_REMOTE_DRIVER_RESP 36
@@ -170,9 +174,13 @@ struct tx_cmp {#define TX_CMP_ERRORS_DMA_ERROR (1 << 6)#define TX_CMP_ERRORS_HINT_TOO_SHORT (1 << 7) -__le32 tx_cmp_unsed_3; +__le32 sq_cons_idx; +#define TX_CMP_SQ_CONS_IDX_MASK 0x00ffffff }; +#define TX_CMP_SQ_CONS_IDX (txcmp) \ + (le32_to_cpu((txcmp)->sq_cons_idx) & TX_CMP_SQ_CONS_IDX_MASK) +struct rx_cmp {__le32 rx_cmp_len_flags_type;#define RX_CMP_CMP_TYPE (0x3f << 0)
@@ -200,8 +208,20 @@ struct rx_cmp {#define RX_CMP_AGG_BUFS_SHIFT 1#define RX_CMP_RSS_HASH_TYPE (0x7f << 9)#define RX_CMP_RSS_HASH_TYPE_SHIFT 9 +#define RX_CMP_V3_RSS_EXT_OP_LEGACY (0xf << 12) +#define RX_CMP_V3_RSS_EXT_OP_LEGACY_SHIFT 12 +#define RX_CMP_V3_RSS_EXT_OP_NEW (0xf << 8) +#define RX_CMP_V3_RSS_EXT_OP_NEW_SHIFT 8#define RX_CMP_PAYLOAD_OFFSET (0xff << 16)#define RX_CMP_PAYLOAD_OFFSET_SHIFT 16 +#define RX_CMP_SUB_NS_TS (0xf << 16) +#define RX_CMP_SUB_NS_TS_SHIFT 16 +#define RX_CMP_METADATA1 (0xf << 28) +#define RX_CMP_METADATA1_SHIFT 28 +#define RX_CMP_METADATA1_TPID_SEL (0x7 << 28) +#define RX_CMP_METADATA1_TPID_8021Q (0x1 << 28) +#define RX_CMP_METADATA1_TPID_8021AD (0x0 << 28) +#define RX_CMP_METADATA1_VALID (0x8 << 28)__le32 rx_cmp_rss_hash; };
@@ -215,6 +235,30 @@ struct rx_cmp { (((le32_to_cpu ((rxcmp)->rx_cmp_misc_v1) &RX_CMP_RSS_HASH_TYPE ) >>\ RX_CMP_RSS_HASH_TYPE_SHIFT) & RSS_PROFILE_ID_MASK) +#define RX_CMP_V3_HASH_TYPE_LEGACY (rxcmp) \ + ((le32_to_cpu((rxcmp)->rx_cmp_misc_v1) & RX_CMP_V3_RSS_EXT_OP_LEGACY) >>\ + RX_CMP_V3_RSS_EXT_OP_LEGACY_SHIFT) + +#define RX_CMP_V3_HASH_TYPE_NEW (rxcmp) \ + ((le32_to_cpu((rxcmp)->rx_cmp_misc_v1) & RX_CMP_V3_RSS_EXT_OP_NEW) >>\ + RX_CMP_V3_RSS_EXT_OP_NEW_SHIFT) + +#define RX_CMP_V3_HASH_TYPE (bp, rxcmp) \ + (((bp)->rss_cap & BNXT_RSS_CAP_RSS_TCAM) ? \ + RX_CMP_V3_HASH_TYPE_NEW(rxcmp) : \ + RX_CMP_V3_HASH_TYPE_LEGACY(rxcmp)) + +#define EXT_OP_INNER_4 0x0 +#define EXT_OP_OUTER_4 0x2 +#define EXT_OP_INNFL_3 0x8 +#define EXT_OP_OUTFL_3 0xa + +#define RX_CMP_VLAN_VALID (rxcmp) \ + ((rxcmp)->rx_cmp_misc_v1 & cpu_to_le32(RX_CMP_METADATA1_VALID)) + +#define RX_CMP_VLAN_TPID_SEL (rxcmp) \ + (le32_to_cpu((rxcmp)->rx_cmp_misc_v1) & RX_CMP_METADATA1_TPID_SEL) +struct rx_cmp_ext {__le32 rx_cmp_flags2;#define RX_CMP_FLAGS2_IP_CS_CALC 0x1
@@ -262,6 +306,9 @@ struct rx_cmp_ext {#define RX_CMPL_CFA_CODE_MASK (0xffff << 16)#define RX_CMPL_CFA_CODE_SFT 16 +#define RX_CMPL_METADATA0_TCI_MASK (0xffff << 16) +#define RX_CMPL_METADATA0_VID_MASK (0x0fff << 16) +#define RX_CMPL_METADATA0_SFT 16__le32 rx_cmp_timestamp; };
@@ -287,6 +334,10 @@ struct rx_cmp_ext { ((le32_to_cpu ((rxcmpl1)->rx_cmp_cfa_code_errors_v2) & \ RX_CMPL_CFA_CODE_MASK) >> RX_CMPL_CFA_CODE_SFT) +#define RX_CMP_METADATA0_TCI (rxcmp1) \ + ((le32_to_cpu((rxcmp1)->rx_cmp_cfa_code_errors_v2) & \ + RX_CMPL_METADATA0_TCI_MASK) >> RX_CMPL_METADATA0_SFT) +struct rx_agg_cmp {__le32 rx_agg_cmp_len_flags_type;#define RX_AGG_CMP_TYPE (0x3f << 0)
@@ -329,10 +380,18 @@ struct rx_tpa_start_cmp {#define RX_TPA_START_CMP_V1 (0x1 << 0)#define RX_TPA_START_CMP_RSS_HASH_TYPE (0x7f << 9)#define RX_TPA_START_CMP_RSS_HASH_TYPE_SHIFT 9 +#define RX_TPA_START_CMP_V3_RSS_HASH_TYPE (0x1ff << 7) +#define RX_TPA_START_CMP_V3_RSS_HASH_TYPE_SHIFT 7#define RX_TPA_START_CMP_AGG_ID (0x7f << 25)#define RX_TPA_START_CMP_AGG_ID_SHIFT 25#define RX_TPA_START_CMP_AGG_ID_P5 (0xffff << 16)#define RX_TPA_START_CMP_AGG_ID_SHIFT_P5 16 +#define RX_TPA_START_CMP_METADATA1 (0xf << 28) +#define RX_TPA_START_CMP_METADATA1_SHIFT 28 +#define RX_TPA_START_METADATA1_TPID_SEL (0x7 << 28) +#define RX_TPA_START_METADATA1_TPID_8021Q (0x1 << 28) +#define RX_TPA_START_METADATA1_TPID_8021AD (0x0 << 28) +#define RX_TPA_START_METADATA1_VALID (0x8 << 28)__le32 rx_tpa_start_cmp_rss_hash; };
@@ -346,6 +405,11 @@ struct rx_tpa_start_cmp { RX_TPA_START_CMP_RSS_HASH_TYPE) >> \ RX_TPA_START_CMP_RSS_HASH_TYPE_SHIFT) & RSS_PROFILE_ID_MASK) +#define TPA_START_V3_HASH_TYPE (rx_tpa_start) \ + (((le32_to_cpu((rx_tpa_start)->rx_tpa_start_cmp_misc_v1) & \ + RX_TPA_START_CMP_V3_RSS_HASH_TYPE) >> \ + RX_TPA_START_CMP_V3_RSS_HASH_TYPE_SHIFT) & RSS_PROFILE_ID_MASK) +#define TPA_START_AGG_ID (rx_tpa_start) \ ((le32_to_cpu((rx_tpa_start)->rx_tpa_start_cmp_misc_v1) & \ RX_TPA_START_CMP_AGG_ID) >> RX_TPA_START_CMP_AGG_ID_SHIFT)
@@ -358,6 +422,14 @@ struct rx_tpa_start_cmp { ((rx_tpa_start)->rx_tpa_start_cmp_len_flags_type & \ cpu_to_le32(RX_TPA_START_CMP_FLAGS_ERROR)) +#define TPA_START_VLAN_VALID (rx_tpa_start) \ + ((rx_tpa_start)->rx_tpa_start_cmp_misc_v1 & \ + cpu_to_le32(RX_TPA_START_METADATA1_VALID)) + +#define TPA_START_VLAN_TPID_SEL (rx_tpa_start) \ + (le32_to_cpu((rx_tpa_start)->rx_tpa_start_cmp_misc_v1) & \ + RX_TPA_START_METADATA1_TPID_SEL) +struct rx_tpa_start_cmp_ext {__le32 rx_tpa_start_cmp_flags2;#define RX_TPA_START_CMP_FLAGS2_IP_CS_CALC (0x1 << 0)
@@ -368,6 +440,8 @@ struct rx_tpa_start_cmp_ext {#define RX_TPA_START_CMP_FLAGS2_CSUM_CMPL_VALID (0x1 << 9)#define RX_TPA_START_CMP_FLAGS2_EXT_META_FORMAT (0x3 << 10)#define RX_TPA_START_CMP_FLAGS2_EXT_META_FORMAT_SHIFT 10 +#define RX_TPA_START_CMP_V3_FLAGS2_T_IP_TYPE (0x1 << 10) +#define RX_TPA_START_CMP_V3_FLAGS2_AGG_GRO (0x1 << 11)#define RX_TPA_START_CMP_FLAGS2_CSUM_CMPL (0xffff << 16)#define RX_TPA_START_CMP_FLAGS2_CSUM_CMPL_SHIFT 16
@@ -381,6 +455,9 @@ struct rx_tpa_start_cmp_ext {#define RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_FLUSH (0x5 << 1)#define RX_TPA_START_CMP_CFA_CODE (0xffff << 16)#define RX_TPA_START_CMPL_CFA_CODE_SHIFT 16 +#define RX_TPA_START_CMP_METADATA0_TCI_MASK (0xffff << 16) +#define RX_TPA_START_CMP_METADATA0_VID_MASK (0x0fff << 16) +#define RX_TPA_START_CMP_METADATA0_SFT 16__le32 rx_tpa_start_cmp_hdr_info; };
@@ -397,6 +474,11 @@ struct rx_tpa_start_cmp_ext { RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_MASK) >> \ RX_TPA_START_CMP_ERRORS_BUFFER_ERROR_SHIFT) +#define TPA_START_METADATA0_TCI (rx_tpa_start) \ + ((le32_to_cpu((rx_tpa_start)->rx_tpa_start_cmp_cfa_code_v2) & \ + RX_TPA_START_CMP_METADATA0_TCI_MASK) >> \ + RX_TPA_START_CMP_METADATA0_SFT) +struct rx_tpa_end_cmp {__le32 rx_tpa_end_cmp_len_flags_type;#define RX_TPA_END_CMP_TYPE (0x3f << 0)
@@ -2023,6 +2105,7 @@ struct bnxt {#define BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA BIT(0)#define BNXT_RSS_CAP_UDP_RSS_CAP BIT(1)#define BNXT_RSS_CAP_NEW_RSS_CAP BIT(2) +#define BNXT_RSS_CAP_RSS_TCAM BIT(3)u16 max_mtu;u8 max_tc;
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 8/15 bnxt_en: Refactor RX VLAN acceleration logic.
In reply to Michael ChanRefactor the logic in the RX path that checks for the accelerated VLAN tag by adding a new function. This will make it easier to support the new receive logic on P7 chips.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 44 ++++++++++++++++------- 1 file changed, 31 insertions(+), 13 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +31 -13
@@ -1783,6 +1783,34 @@ static void bnxt_deliver_skb(struct bnxt *bp, struct bnxt_napi *bnapi,napi_gro_receive (&bnapi->napi, skb); } +static struct sk_buff *bnxt_rx_vlan (struct sk_buff *skb,u8 cmp_type, +struct rx_cmp *rxcmp, +struct rx_cmp_ext *rxcmp1) +{ +__be16 vlan_proto; +u16 vtag; + +if (cmp_type ==CMP_TYPE_RX_L2_CMP ) { +__le32 flags2 = rxcmp1->rx_cmp_flags2; +u32 meta_data; + +if (!(flags2 &cpu_to_le32 (RX_CMP_FLAGS2_META_FORMAT_VLAN ))) +return skb; + + meta_data =le32_to_cpu (rxcmp1->rx_cmp_meta_data); + vtag = meta_data &RX_CMP_FLAGS2_METADATA_TCI_MASK ; + vlan_proto =htons (meta_data >>RX_CMP_FLAGS2_METADATA_TPID_SFT ); +if (eth_type_vlan (vlan_proto)) +__vlan_hwaccel_put_tag (skb, vlan_proto, vtag); +else + goto vlan_err; + } +return skb; +vlan_err: +dev_kfree_skb (skb); +return NULL ; +} +/* returns the following: * 1 - 1 packet successfully received * 0 - successful TPA_START, packet not completed yet
@@ -2001,20 +2029,10 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, cfa_code =RX_CMP_CFA_CODE (rxcmp1); skb->protocol =eth_type_trans (skb,bnxt_get_pkt_dev (bp, cfa_code)); -if ((rxcmp1->rx_cmp_flags2 & -cpu_to_le32 (RX_CMP_FLAGS2_META_FORMAT_VLAN )) && - (skb->dev->features &BNXT_HW_FEATURE_VLAN_ALL_RX )) { -u32 meta_data =le32_to_cpu (rxcmp1->rx_cmp_meta_data); -u16 vtag = meta_data &RX_CMP_FLAGS2_METADATA_TCI_MASK ; -__be16 vlan_proto =htons (meta_data >> -RX_CMP_FLAGS2_METADATA_TPID_SFT ); - -if (eth_type_vlan (vlan_proto)) { -__vlan_hwaccel_put_tag (skb, vlan_proto, vtag); - }else { -dev_kfree_skb (skb); +if (skb->dev->features &BNXT_HW_FEATURE_VLAN_ALL_RX ) { + skb =bnxt_rx_vlan (skb, cmp_type, rxcmp, rxcmp1); +if (!skb) goto next_rx; - } }skb_checksum_none_assert (skb);
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 9/15 bnxt_en: Refactor and refine bnxt_tpa_start() and bnxt_tpa_end().
In reply to Michael ChanRefactor bnxt_tpa_start() by adding bnxt_tpa_metadata() to gather the metadata from the TPA_START completion. This makes it easier to support the new P7 chip which has a modified TPA_START completion structure with different metadata formats. We also add vlan_valid and cfa_code_valid fields to the bnxt_tpa_info structure so that the VLAN and VF rep logic can be common for all chips. The VLAN metadata is now collected in bnxt_tpa_start() only when it is valid and the vlan_valid field will be set. bnxt_tpa_end() can now use common VLAN logic for all chips.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 35 ++++++++++++++++------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 ++ 2 files changed, 26 insertions(+), 11 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +24 -11
@@ -1315,8 +1315,22 @@ static u16 bnxt_lookup_agg_idx(struct bnxt_rx_ring_info *rxr, u16 agg_id)return map->agg_id_tbl[agg_id]; } +static void bnxt_tpa_metadata (struct bnxt_tpa_info *tpa_info, +struct rx_tpa_start_cmp *tpa_start, +struct rx_tpa_start_cmp_ext *tpa_start1) +{ + tpa_info->cfa_code_valid =1 ; + tpa_info->cfa_code =TPA_START_CFA_CODE (tpa_start1); + tpa_info->vlan_valid =0 ; +if (tpa_info->flags2 &RX_CMP_FLAGS2_META_FORMAT_VLAN ) { + tpa_info->vlan_valid =1 ; + tpa_info->metadata = +le32_to_cpu (tpa_start1->rx_tpa_start_cmp_metadata); + } +} +static void bnxt_tpa_start (struct bnxt *bp,struct bnxt_rx_ring_info *rxr, -struct rx_tpa_start_cmp *tpa_start, +u8 cmp_type,struct rx_tpa_start_cmp *tpa_start,struct rx_tpa_start_cmp_ext *tpa_start1) {struct bnxt_sw_rx_bd *cons_rx_buf, *prod_rx_buf;
@@ -1345,10 +1359,6 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,bnxt_sched_reset_rxr (bp, rxr);return ; } -/* Store cfa_code in tpa_info to use in tpa_end -* completion processing. -*/ - tpa_info->cfa_code =TPA_START_CFA_CODE (tpa_start1); prod_rx_buf->data = tpa_info->data; prod_rx_buf->data_ptr = tpa_info->data_ptr;
@@ -1383,8 +1393,8 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,netif_warn (bp, rx_err, bp->dev,"TPA packet without valid hash\n" ); } tpa_info->flags2 =le32_to_cpu (tpa_start1->rx_tpa_start_cmp_flags2); - tpa_info->metadata =le32_to_cpu (tpa_start1->rx_tpa_start_cmp_metadata); tpa_info->hdr_info =le32_to_cpu (tpa_start1->rx_tpa_start_cmp_hdr_info); +bnxt_tpa_metadata (tpa_info, tpa_start, tpa_start1); tpa_info->agg_count =0 ; rxr->rx_prod =NEXT_RX (prod);
@@ -1619,6 +1629,7 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp, {struct bnxt_napi *bnapi = cpr->bnapi;struct bnxt_rx_ring_info *rxr = bnapi->rx_ring; +struct net_device *dev = bp->dev;u8 *data_ptr, agg_bufs;unsigned int len;struct bnxt_tpa_info *tpa_info;
@@ -1725,14 +1736,15 @@ static inline struct sk_buff *bnxt_tpa_end(struct bnxt *bp, } } - skb->protocol = -eth_type_trans (skb,bnxt_get_pkt_dev (bp, tpa_info->cfa_code)); +if (tpa_info->cfa_code_valid) + dev =bnxt_get_pkt_dev (bp, tpa_info->cfa_code); + skb->protocol =eth_type_trans (skb, dev);if (tpa_info->hash_type !=PKT_HASH_TYPE_NONE )skb_set_hash (skb, tpa_info->rss_hash, tpa_info->hash_type); -if ((tpa_info->flags2 &RX_CMP_FLAGS2_META_FORMAT_VLAN ) && - (skb->dev->features &BNXT_HW_FEATURE_VLAN_ALL_RX )) { +if (tpa_info->vlan_valid && + (dev->features &BNXT_HW_FEATURE_VLAN_ALL_RX )) {__be16 vlan_proto =htons (tpa_info->metadata >>RX_CMP_FLAGS2_METADATA_TPID_SFT );u16 vtag = tpa_info->metadata &RX_CMP_FLAGS2_METADATA_TCI_MASK ;
@@ -1864,7 +1876,8 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, prod = rxr->rx_prod;if (cmp_type ==CMP_TYPE_RX_L2_TPA_START_CMP ) { -bnxt_tpa_start (bp, rxr, (struct rx_tpa_start_cmp *)rxcmp, +bnxt_tpa_start (bp, rxr, cmp_type, + (struct rx_tpa_start_cmp *)rxcmp, (struct rx_tpa_start_cmp_ext *)rxcmp1); *event |=BNXT_RX_EVENT ;
drivers/net/ethernet/broadcom/bnxt/bnxt.h +2 -0
@@ -1027,6 +1027,8 @@ struct bnxt_tpa_info {u16 cfa_code;/* cfa_code in TPA start compl */ u8 agg_count; + u8 vlan_valid:1; + u8 cfa_code_valid:1;struct rx_agg_cmp *agg_arr; };
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 10/15 bnxt_en: Add support for new RX and TPA_START completion types for P7
In reply to Michael ChanThese new completion types are supported on the new P7 chips. These new types have commonalities with the legacy types. After the refactoring, we mainly have to add new functions to handle the the new meta data formats and the RX hash information in the new types.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 109 ++++++++++++++---- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 3 +- 2 files changed, 89 insertions(+), 23 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +87 -22
@@ -1329,6 +1329,23 @@ static void bnxt_tpa_metadata(struct bnxt_tpa_info *tpa_info, } } +static void bnxt_tpa_metadata_v2 (struct bnxt_tpa_info *tpa_info, +struct rx_tpa_start_cmp *tpa_start, +struct rx_tpa_start_cmp_ext *tpa_start1) +{ + tpa_info->vlan_valid =0 ; +if (TPA_START_VLAN_VALID (tpa_start)) { +u32 tpid_sel =TPA_START_VLAN_TPID_SEL (tpa_start); +u32 vlan_proto =ETH_P_8021Q ; + + tpa_info->vlan_valid =1 ; +if (tpid_sel ==RX_TPA_START_METADATA1_TPID_8021AD ) + vlan_proto =ETH_P_8021AD ; + tpa_info->metadata = vlan_proto <<16 | +TPA_START_METADATA0_TCI (tpa_start1); + } +} +static void bnxt_tpa_start (struct bnxt *bp,struct bnxt_rx_ring_info *rxr,u8 cmp_type,struct rx_tpa_start_cmp *tpa_start,struct rx_tpa_start_cmp_ext *tpa_start1)
@@ -1378,12 +1395,13 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr,le32_to_cpu (tpa_start->rx_tpa_start_cmp_len_flags_type) >>RX_TPA_START_CMP_LEN_SHIFT ;if (likely (TPA_START_HASH_VALID (tpa_start))) { -u32 hash_type =TPA_START_HASH_TYPE (tpa_start); - tpa_info->hash_type =PKT_HASH_TYPE_L4 ; tpa_info->gso_type =SKB_GSO_TCPV4 ; +if (TPA_START_IS_IPV6 (tpa_start1)) + tpa_info->gso_type =SKB_GSO_TCPV6 ;/* RSS profiles 1 and 3 with extract code 0 for inner 4-tuple */ -if (hash_type ==3 ||TPA_START_IS_IPV6 (tpa_start1)) +else if (cmp_type ==CMP_TYPE_RX_L2_TPA_START_CMP && +TPA_START_HASH_TYPE (tpa_start) ==3 ) tpa_info->gso_type =SKB_GSO_TCPV6 ; tpa_info->rss_hash =le32_to_cpu (tpa_start->rx_tpa_start_cmp_rss_hash);
@@ -1394,7 +1412,10 @@ static void bnxt_tpa_start(struct bnxt *bp, struct bnxt_rx_ring_info *rxr, } tpa_info->flags2 =le32_to_cpu (tpa_start1->rx_tpa_start_cmp_flags2); tpa_info->hdr_info =le32_to_cpu (tpa_start1->rx_tpa_start_cmp_hdr_info); -bnxt_tpa_metadata (tpa_info, tpa_start, tpa_start1); +if (cmp_type ==CMP_TYPE_RX_L2_TPA_START_CMP ) +bnxt_tpa_metadata (tpa_info, tpa_start, tpa_start1); +else +bnxt_tpa_metadata_v2 (tpa_info, tpa_start, tpa_start1); tpa_info->agg_count =0 ; rxr->rx_prod =NEXT_RX (prod);
@@ -1816,6 +1837,19 @@ static struct sk_buff *bnxt_rx_vlan(struct sk_buff *skb, u8 cmp_type,__vlan_hwaccel_put_tag (skb, vlan_proto, vtag); else goto vlan_err; + }else if (cmp_type ==CMP_TYPE_RX_L2_V3_CMP ) { +if (RX_CMP_VLAN_VALID (rxcmp)) { +u32 tpid_sel =RX_CMP_VLAN_TPID_SEL (rxcmp); + +if (tpid_sel ==RX_CMP_METADATA1_TPID_8021Q ) + vlan_proto =htons (ETH_P_8021Q ); +else if (tpid_sel ==RX_CMP_METADATA1_TPID_8021AD ) + vlan_proto =htons (ETH_P_8021AD ); +else + goto vlan_err; + vtag =RX_CMP_METADATA0_TCI (rxcmp1); +__vlan_hwaccel_put_tag (skb, vlan_proto, vtag); + } }return skb; vlan_err:
@@ -1823,6 +1857,23 @@ static struct sk_buff *bnxt_rx_vlan(struct sk_buff *skb, u8 cmp_type,return NULL ; } +static enum pkt_hash_types bnxt_rss_ext_op (struct bnxt *bp, +struct rx_cmp *rxcmp) +{ +u8 ext_op; + + ext_op =RX_CMP_V3_HASH_TYPE (bp, rxcmp); +switch (ext_op) { +case EXT_OP_INNER_4 : +case EXT_OP_OUTER_4 : +case EXT_OP_INNFL_3 : +case EXT_OP_OUTFL_3 : +return PKT_HASH_TYPE_L4 ; +default : +return PKT_HASH_TYPE_L3 ; + } +} +/* returns the following: * 1 - 1 packet successfully received * 0 - successful TPA_START, packet not completed yet
@@ -1839,7 +1890,7 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,struct rx_cmp *rxcmp;struct rx_cmp_ext *rxcmp1;u32 tmp_raw_cons = *raw_cons; -u16 cfa_code, cons, prod, cp_cons =RING_CMP (tmp_raw_cons); +u16 cons, prod, cp_cons =RING_CMP (tmp_raw_cons);struct bnxt_sw_rx_bd *rx_buf;unsigned int len;u8 *data_ptr, agg_bufs, cmp_type;
@@ -1875,7 +1926,8 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,dma_rmb (); prod = rxr->rx_prod; -if (cmp_type ==CMP_TYPE_RX_L2_TPA_START_CMP ) { +if (cmp_type ==CMP_TYPE_RX_L2_TPA_START_CMP || + cmp_type ==CMP_TYPE_RX_L2_TPA_START_V3_CMP ) {bnxt_tpa_start (bp, rxr, cmp_type, (struct rx_tpa_start_cmp *)rxcmp, (struct rx_tpa_start_cmp_ext *)rxcmp1);
@@ -2030,17 +2082,27 @@ static int bnxt_rx_pkt(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, }if (RX_CMP_HASH_VALID (rxcmp)) { -u32 hash_type =RX_CMP_HASH_TYPE (rxcmp); -enum pkt_hash_types type =PKT_HASH_TYPE_L4 ; +enum pkt_hash_types type; -/* RSS profiles 1 and 3 with extract code 0 for inner 4-tuple */ -if (hash_type !=1 && hash_type !=3 ) - type =PKT_HASH_TYPE_L3 ; +if (cmp_type ==CMP_TYPE_RX_L2_V3_CMP ) { + type =bnxt_rss_ext_op (bp, rxcmp); + }else { +u32 hash_type =RX_CMP_HASH_TYPE (rxcmp); + +/* RSS profiles 1 and 3 with extract code 0 for inner +* 4-tuple +*/ +if (hash_type !=1 && hash_type !=3 ) + type =PKT_HASH_TYPE_L3 ; +else + type =PKT_HASH_TYPE_L4 ; + }skb_set_hash (skb,le32_to_cpu (rxcmp->rx_cmp_rss_hash), type); } - cfa_code =RX_CMP_CFA_CODE (rxcmp1); - skb->protocol =eth_type_trans (skb,bnxt_get_pkt_dev (bp, cfa_code)); +if (cmp_type ==CMP_TYPE_RX_L2_CMP ) + dev =bnxt_get_pkt_dev (bp,RX_CMP_CFA_CODE (rxcmp1)); + skb->protocol =eth_type_trans (skb, dev);if (skb->dev->features &BNXT_HW_FEATURE_VLAN_ALL_RX ) { skb =bnxt_rx_vlan (skb, cmp_type, rxcmp, rxcmp1);
@@ -2127,7 +2189,8 @@ static int bnxt_force_rx_discard(struct bnxt *bp,*/ dma_rmb (); cmp_type =RX_CMP_TYPE (rxcmp); -if (cmp_type ==CMP_TYPE_RX_L2_CMP ) { +if (cmp_type ==CMP_TYPE_RX_L2_CMP || + cmp_type ==CMP_TYPE_RX_L2_V3_CMP ) { rxcmp1->rx_cmp_cfa_code_errors_v2 |=cpu_to_le32 (RX_CMPL_ERRORS_CRC_ERROR ); }else if (cmp_type ==CMP_TYPE_RX_L2_TPA_END_CMP ) {
@@ -2651,6 +2714,7 @@ static int __bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, cpr->has_more_work =0 ; cpr->had_work_done =1 ;while (1 ) { +u8 cmp_type;int rc; cons =RING_CMP (raw_cons);
@@ -2663,7 +2727,8 @@ static int __bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,* reading any further. */ dma_rmb (); -if (TX_CMP_TYPE (txcmp) ==CMP_TYPE_TX_L2_CMP ) { + cmp_type =TX_CMP_TYPE (txcmp); +if (cmp_type ==CMP_TYPE_TX_L2_CMP ) {u32 opaque = txcmp->tx_cmp_opaque;struct bnxt_tx_ring_info *txr;u16 tx_freed;
@@ -2681,7 +2746,8 @@ static int __bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, cpr->has_more_work =1 ;break ; } - }else if ((TX_CMP_TYPE (txcmp) &0x30 ) ==0x10 ) { + }else if (cmp_type >=CMP_TYPE_RX_L2_CMP && + cmp_type <=CMP_TYPE_RX_L2_TPA_START_V3_CMP ) {if (likely (budget)) rc =bnxt_rx_pkt (bp, cpr, &raw_cons, &event);else
@@ -2698,12 +2764,9 @@ static int __bnxt_poll_work(struct bnxt *bp, struct bnxt_cp_ring_info *cpr, rx_pkts++; else if (rc == -EBUSY) /* partial completion */ break; - }else if (unlikely ((TX_CMP_TYPE (txcmp) == -CMPL_BASE_TYPE_HWRM_DONE ) || - (TX_CMP_TYPE (txcmp) == -CMPL_BASE_TYPE_HWRM_FWD_REQ ) || - (TX_CMP_TYPE (txcmp) == -CMPL_BASE_TYPE_HWRM_ASYNC_EVENT ))) { + }else if (unlikely (cmp_type ==CMPL_BASE_TYPE_HWRM_DONE || + cmp_type ==CMPL_BASE_TYPE_HWRM_FWD_REQ || + cmp_type ==CMPL_BASE_TYPE_HWRM_ASYNC_EVENT )) {bnxt_hwrm_handler (bp, txcmp); } raw_cons =NEXT_RAW_CMP (raw_cons);
@@ -5826,6 +5889,8 @@ static int bnxt_hwrm_vnic_qcaps(struct bnxt *bp) bp->fw_cap |=BNXT_FW_CAP_VLAN_RX_STRIP ;if (flags &VNIC_QCAPS_RESP_FLAGS_RSS_HASH_TYPE_DELTA_CAP ) bp->rss_cap |=BNXT_RSS_CAP_RSS_HASH_TYPE_DELTA ; +if (flags &VNIC_QCAPS_RESP_FLAGS_RSS_PROF_TCAM_MODE_ENABLED ) + bp->rss_cap |=BNXT_RSS_CAP_RSS_TCAM ; bp->max_tpa_v2 =le16_to_cpu (resp->max_aggs_supported);if (bp->max_tpa_v2) {if (BNXT_CHIP_P5 (bp))
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +2 -1
@@ -3919,7 +3919,8 @@ static int bnxt_poll_loopback(struct bnxt *bp, struct bnxt_cp_ring_info *cpr,* reading any further. */ dma_rmb (); -if (TX_CMP_TYPE (txcmp) ==CMP_TYPE_RX_L2_CMP ) { +if (TX_CMP_TYPE (txcmp) ==CMP_TYPE_RX_L2_CMP || +TX_CMP_TYPE (txcmp) ==CMP_TYPE_RX_L2_V3_CMP ) { rc =bnxt_rx_loopback (bp, cpr, raw_cons, pkt_size); raw_cons =NEXT_RAW_CMP (raw_cons); raw_cons =NEXT_RAW_CMP (raw_cons);
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 11/15 bnxt_en: Refactor ethtool speeds logic
In reply to Michael ChanAdd helper functions to refactor the logic that converts firmware speed masks to ethtool speeds. Pass the phy_flags to bnxt_get_ethtool_speeds() and the call chain. The refactoring and the phy_flags will be needed when adding support for the new speeds in the next patches.
--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 87 +++++++++++++------ 1 file changed, 61 insertions(+), 26 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +61 -26
@@ -1801,7 +1801,7 @@ static const u16 bnxt_pam4_speed_masks[] = { };static enum bnxt_link_speed_indices -bnxt_encoding_speed_idx (u8 sig_mode,u16 speed_msk) +bnxt_encoding_speed_idx (u8 sig_mode,u16 phy_flags,u16 speed_msk) {const u16 *speeds;int idx, len;
@@ -1831,14 +1831,14 @@ bnxt_encoding_speed_idx(u8 sig_mode, u16 speed_msk)static void __bnxt_get_ethtool_speeds (unsigned long fw_mask,enum bnxt_media_type media, -u8 sig_mode,unsigned long *et_mask) +u8 sig_mode,u16 phy_flags,unsigned long *et_mask) {enum ethtool_link_mode_bit_indices link_mode;enum bnxt_link_speed_indices speed;u8 bit;for_each_set_bit (bit, &fw_mask,BNXT_FW_SPEED_MSK_BITS ) { - speed =bnxt_encoding_speed_idx (sig_mode,1 << bit); + speed =bnxt_encoding_speed_idx (sig_mode, phy_flags,1 << bit);if (!speed)continue ;
@@ -1852,16 +1852,66 @@ __bnxt_get_ethtool_speeds(unsigned long fw_mask, enum bnxt_media_type media,static void bnxt_get_ethtool_speeds (unsigned long fw_mask,enum bnxt_media_type media, -u8 sig_mode,unsigned long *et_mask) +u8 sig_mode,u16 phy_flags,unsigned long *et_mask) {if (media) { -__bnxt_get_ethtool_speeds (fw_mask, media, sig_mode, et_mask); +__bnxt_get_ethtool_speeds (fw_mask, media, sig_mode, phy_flags, + et_mask);return ; }/* list speeds for all media if unknown */ for (media =1 ; media < __BNXT_MEDIA_END; media++) -__bnxt_get_ethtool_speeds (fw_mask, media, sig_mode, et_mask); +__bnxt_get_ethtool_speeds (fw_mask, media, sig_mode, phy_flags, + et_mask); +} + +static void +bnxt_get_all_ethtool_support_speeds (struct bnxt_link_info *link_info, +enum bnxt_media_type media, +struct ethtool_link_ksettings *lk_ksettings) +{ + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); +u16 phy_flags = bp->phy_flags; + +bnxt_get_ethtool_speeds (link_info->support_speeds, media, +BNXT_SIG_MODE_NRZ , phy_flags, + lk_ksettings->link_modes.supported); +bnxt_get_ethtool_speeds (link_info->support_pam4_speeds, media, +BNXT_SIG_MODE_PAM4 , phy_flags, + lk_ksettings->link_modes.supported); +} + +static void +bnxt_get_all_ethtool_adv_speeds (struct bnxt_link_info *link_info, +enum bnxt_media_type media, +struct ethtool_link_ksettings *lk_ksettings) +{ + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); +u16 phy_flags = bp->phy_flags; + +bnxt_get_ethtool_speeds (link_info->advertising, media, +BNXT_SIG_MODE_NRZ , phy_flags, + lk_ksettings->link_modes.advertising); +bnxt_get_ethtool_speeds (link_info->advertising_pam4, media, +BNXT_SIG_MODE_PAM4 , phy_flags, + lk_ksettings->link_modes.advertising); +} + +static void +bnxt_get_all_ethtool_lp_speeds (struct bnxt_link_info *link_info, +enum bnxt_media_type media, +struct ethtool_link_ksettings *lk_ksettings) +{ + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); +u16 phy_flags = bp->phy_flags; + +bnxt_get_ethtool_speeds (link_info->lp_auto_link_speeds, media, +BNXT_SIG_MODE_NRZ , phy_flags, + lk_ksettings->link_modes.lp_advertising); +bnxt_get_ethtool_speeds (link_info->lp_auto_pam4_link_speeds, media, +BNXT_SIG_MODE_PAM4 , phy_flags, + lk_ksettings->link_modes.lp_advertising); } static void bnxt_update_speed(u32 *delta, bool installed_media, u16 *speeds,
@@ -2017,12 +2067,7 @@ static int bnxt_get_link_ksettings(struct net_device *dev,mutex_lock (&bp->link_lock);bnxt_get_ethtool_modes (link_info, lk_ksettings); media =bnxt_get_media (link_info); -bnxt_get_ethtool_speeds (link_info->support_speeds, - media,BNXT_SIG_MODE_NRZ , - lk_ksettings->link_modes.supported); -bnxt_get_ethtool_speeds (link_info->support_pam4_speeds, - media,BNXT_SIG_MODE_PAM4 , - lk_ksettings->link_modes.supported); +bnxt_get_all_ethtool_support_speeds (link_info, media, lk_ksettings);bnxt_fw_to_ethtool_support_fec (link_info, lk_ksettings); link_mode =bnxt_get_link_mode (link_info);if (link_mode !=BNXT_LINK_MODE_UNKNOWN )
@@ -2035,20 +2080,10 @@ static int bnxt_get_link_ksettings(struct net_device *dev,linkmode_set_bit (ETHTOOL_LINK_MODE_Autoneg_BIT, lk_ksettings->link_modes.advertising); base->autoneg =AUTONEG_ENABLE ; -bnxt_get_ethtool_speeds (link_info->advertising, - media,BNXT_SIG_MODE_NRZ , - lk_ksettings->link_modes.advertising); -bnxt_get_ethtool_speeds (link_info->advertising_pam4, - media,BNXT_SIG_MODE_PAM4 , - lk_ksettings->link_modes.advertising); -if (link_info->phy_link_status ==BNXT_LINK_LINK ) { -bnxt_get_ethtool_speeds (link_info->lp_auto_link_speeds, - media,BNXT_SIG_MODE_NRZ , - lk_ksettings->link_modes.lp_advertising); -bnxt_get_ethtool_speeds (link_info->lp_auto_pam4_link_speeds, - media,BNXT_SIG_MODE_PAM4 , - lk_ksettings->link_modes.lp_advertising); - } +bnxt_get_all_ethtool_adv_speeds (link_info, media, lk_ksettings); +if (link_info->phy_link_status ==BNXT_LINK_LINK ) +bnxt_get_all_ethtool_lp_speeds (link_info, media, + lk_ksettings); }else { base->autoneg =AUTONEG_DISABLE ; }
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 12/15 bnxt_en: Support new firmware link parameters
In reply to Michael ChanNewer firmware supporting PAM4 112Gbps speeds use new parameters in firmware message structures. Detect the new firmware capability and add basic logic to report and store these new fields.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 93 +++++++++++++++++-- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 46 +++++++++ .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 10 ++ 3 files changed, 143 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +87 -6
@@ -2250,6 +2250,10 @@ static u16 bnxt_agg_ring_id_to_grp_idx(struct bnxt *bp, u16 ring_id)static u16 bnxt_get_force_speed (struct bnxt_link_info *link_info) { + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); + +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) +return link_info->force_link_speed2;if (link_info->req_signal_mode ==BNXT_SIG_MODE_PAM4 )return link_info->force_pam4_link_speed;return link_info->force_link_speed;
@@ -2257,6 +2261,28 @@ static u16 bnxt_get_force_speed(struct bnxt_link_info *link_info)static void bnxt_set_force_speed (struct bnxt_link_info *link_info) { + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); + +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) { + link_info->req_link_speed = link_info->force_link_speed2; + link_info->req_signal_mode =BNXT_SIG_MODE_NRZ ; +switch (link_info->req_link_speed) { +case BNXT_LINK_SPEED_50GB_PAM4 : +case BNXT_LINK_SPEED_100GB_PAM4 : +case BNXT_LINK_SPEED_200GB_PAM4 : +case BNXT_LINK_SPEED_400GB_PAM4 : + link_info->req_signal_mode =BNXT_SIG_MODE_PAM4 ; +break ; +case BNXT_LINK_SPEED_100GB_PAM4_112 : +case BNXT_LINK_SPEED_200GB_PAM4_112 : +case BNXT_LINK_SPEED_400GB_PAM4_112 : + link_info->req_signal_mode =BNXT_SIG_MODE_PAM4_112 ; +break ; +default : + link_info->req_signal_mode =BNXT_SIG_MODE_NRZ ; + } +return ; + } link_info->req_link_speed = link_info->force_link_speed; link_info->req_signal_mode =BNXT_SIG_MODE_NRZ ;if (link_info->force_pam4_link_speed) {
@@ -2267,12 +2293,25 @@ static void bnxt_set_force_speed(struct bnxt_link_info *link_info)static void bnxt_set_auto_speed (struct bnxt_link_info *link_info) { + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); + +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) { + link_info->advertising = link_info->auto_link_speeds2; +return ; + } link_info->advertising = link_info->auto_link_speeds; link_info->advertising_pam4 = link_info->auto_pam4_link_speeds; }static bool bnxt_force_speed_updated (struct bnxt_link_info *link_info) { + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); + +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) { +if (link_info->req_link_speed != link_info->force_link_speed2) +return true; +return false; + }if (link_info->req_signal_mode ==BNXT_SIG_MODE_NRZ && link_info->req_link_speed != link_info->force_link_speed)return true;
@@ -2284,6 +2323,13 @@ static bool bnxt_force_speed_updated(struct bnxt_link_info *link_info)static bool bnxt_auto_speed_updated (struct bnxt_link_info *link_info) { + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); + +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) { +if (link_info->advertising != link_info->auto_link_speeds2) +return true; +return false; + }if (link_info->advertising != link_info->auto_link_speeds || link_info->advertising_pam4 != link_info->auto_pam4_link_speeds)return true;
@@ -10082,7 +10128,10 @@ void bnxt_report_link(struct bnxt *bp) signal ="(NRZ) " ;break ;case PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4 : - signal ="(PAM4) " ; + signal ="(PAM4 56Gbps) " ; +break ; +case PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4_112 : + signal ="(PAM4 112Gbps) " ;break ;default :break ;
@@ -10110,7 +10159,9 @@ static bool bnxt_phy_qcaps_no_speed(struct hwrm_port_phy_qcaps_output *resp)if (!resp->supported_speeds_auto_mode && !resp->supported_speeds_force_mode && !resp->supported_pam4_speeds_auto_mode && - !resp->supported_pam4_speeds_force_mode) + !resp->supported_pam4_speeds_force_mode && + !resp->supported_speeds2_auto_mode && + !resp->supported_speeds2_force_mode)return true;return false; }
@@ -10156,6 +10207,7 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)/* Phy re-enabled, reprobe the speeds */ link_info->support_auto_speeds =0 ; link_info->support_pam4_auto_speeds =0 ; + link_info->support_auto_speeds2 =0 ; } }if (resp->supported_speeds_auto_mode)
@@ -10164,6 +10216,9 @@ static int bnxt_hwrm_phy_qcaps(struct bnxt *bp)if (resp->supported_pam4_speeds_auto_mode) link_info->support_pam4_auto_speeds =le16_to_cpu (resp->supported_pam4_speeds_auto_mode); +if (resp->supported_speeds2_auto_mode) + link_info->support_auto_speeds2 = +le16_to_cpu (resp->supported_speeds2_auto_mode); bp->port_count = resp->port_cnt;
@@ -10181,9 +10236,19 @@ static bool bnxt_support_dropped(u16 advertising, u16 supported)static bool bnxt_support_speed_dropped (struct bnxt_link_info *link_info) { + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); +/* Check if any advertised speeds are no longer supported. The caller * holds the link_lock mutex, so we can modify link_info settings. */ +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) { +if (bnxt_support_dropped (link_info->advertising, + link_info->support_auto_speeds2)) { + link_info->advertising = link_info->support_auto_speeds2; +return true; + } +return false; + }if (bnxt_support_dropped (link_info->advertising, link_info->support_auto_speeds)) { link_info->advertising = link_info->support_auto_speeds;
@@ -10232,18 +10297,25 @@ int bnxt_update_link(struct bnxt *bp, bool chng_link_state) link_info->lp_pause = resp->link_partner_adv_pause; link_info->force_pause_setting = resp->force_pause; link_info->duplex_setting = resp->duplex_cfg; -if (link_info->phy_link_status ==BNXT_LINK_LINK ) +if (link_info->phy_link_status ==BNXT_LINK_LINK ) { link_info->link_speed =le16_to_cpu (resp->link_speed); -else +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) + link_info->active_lanes = resp->active_lanes; + }else { link_info->link_speed =0 ; + link_info->active_lanes =0 ; + } link_info->force_link_speed =le16_to_cpu (resp->force_link_speed); link_info->force_pam4_link_speed =le16_to_cpu (resp->force_pam4_link_speed); + link_info->force_link_speed2 =le16_to_cpu (resp->force_link_speeds2); link_info->support_speeds =le16_to_cpu (resp->support_speeds); link_info->support_pam4_speeds =le16_to_cpu (resp->support_pam4_speeds); + link_info->support_speeds2 =le16_to_cpu (resp->support_speeds2); link_info->auto_link_speeds =le16_to_cpu (resp->auto_link_speed_mask); link_info->auto_pam4_link_speeds =le16_to_cpu (resp->auto_pam4_link_speed_mask); + link_info->auto_link_speeds2 =le16_to_cpu (resp->auto_link_speeds2); link_info->lp_auto_link_speeds =le16_to_cpu (resp->link_partner_adv_speeds); link_info->lp_auto_pam4_link_speeds =
@@ -10382,7 +10454,11 @@ static void bnxt_hwrm_set_link_common(struct bnxt *bp, struct hwrm_port_phy_cfg_ {if (bp->link_info.autoneg &BNXT_AUTONEG_SPEED ) { req->auto_mode |=PORT_PHY_CFG_REQ_AUTO_MODE_SPEED_MASK ; -if (bp->link_info.advertising) { +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) { + req->enables |= +cpu_to_le32 (PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEEDS2_MASK ); + req->auto_link_speeds2_mask =cpu_to_le16 (bp->link_info.advertising); + }else if (bp->link_info.advertising) { req->enables |=cpu_to_le32 (PORT_PHY_CFG_REQ_ENABLES_AUTO_LINK_SPEED_MASK ); req->auto_link_speed_mask =cpu_to_le16 (bp->link_info.advertising); }
@@ -10396,7 +10472,12 @@ static void bnxt_hwrm_set_link_common(struct bnxt *bp, struct hwrm_port_phy_cfg_ req->flags |=cpu_to_le32 (PORT_PHY_CFG_REQ_FLAGS_RESTART_AUTONEG ); }else { req->flags |=cpu_to_le32 (PORT_PHY_CFG_REQ_FLAGS_FORCE ); -if (bp->link_info.req_signal_mode ==BNXT_SIG_MODE_PAM4 ) { +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) { + req->force_link_speeds2 =cpu_to_le16 (bp->link_info.req_link_speed); + req->enables |=cpu_to_le32 (PORT_PHY_CFG_REQ_ENABLES_FORCE_LINK_SPEEDS2 ); +netif_info (bp, link, bp->dev,"Forcing FW speed2: %d\n" , + (u32 )bp->link_info.req_link_speed); + }else if (bp->link_info.req_signal_mode ==BNXT_SIG_MODE_PAM4 ) { req->force_pam4_link_speed =cpu_to_le16 (bp->link_info.req_link_speed); req->enables |=cpu_to_le32 (PORT_PHY_CFG_REQ_ENABLES_FORCE_PAM4_LINK_SPEED ); }else {
drivers/net/ethernet/broadcom/bnxt/bnxt.h +46 -0
84 lines not on this page · raw message
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +10 -0
@@ -2020,11 +2020,20 @@ u32 bnxt_fw_to_ethtool_speed(u16 fw_link_speed)case BNXT_LINK_SPEED_40GB :return SPEED_40000 ;case BNXT_LINK_SPEED_50GB : +case BNXT_LINK_SPEED_50GB_PAM4 :return SPEED_50000 ;case BNXT_LINK_SPEED_100GB : +case BNXT_LINK_SPEED_100GB_PAM4 : +case BNXT_LINK_SPEED_100GB_PAM4_112 :return SPEED_100000 ;case BNXT_LINK_SPEED_200GB : +case BNXT_LINK_SPEED_200GB_PAM4 : +case BNXT_LINK_SPEED_200GB_PAM4_112 :return SPEED_200000 ; +case BNXT_LINK_SPEED_400GB : +case BNXT_LINK_SPEED_400GB_PAM4 : +case BNXT_LINK_SPEED_400GB_PAM4_112 : +return SPEED_400000 ;default :return SPEED_UNKNOWN ; }
@@ -2040,6 +2049,7 @@ static void bnxt_get_default_speeds(struct ethtool_link_ksettings *lk_ksettings, base->duplex =DUPLEX_HALF ;if (link_info->duplex &BNXT_LINK_DUPLEX_FULL ) base->duplex =DUPLEX_FULL ; + lk_ksettings->lanes = link_info->active_lanes; }else if (!link_info->autoneg) { base->speed =bnxt_fw_to_ethtool_speed (link_info->req_link_speed); base->duplex =DUPLEX_HALF ;
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 13/15 bnxt_en: Support force speed using the new HWRM fields
In reply to Michael ChanModify bnxt_force_link_speed() to support the new speeds stored in link_info->support_speeds2, including the new 400G speed.
--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 52 ++++++++++++++++--- 1 file changed, 46 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +46 -6
@@ -2128,6 +2128,7 @@ bnxt_force_link_speed(struct net_device *dev, u32 ethtool_speed, u32 lanes)struct bnxt *bp =netdev_priv (dev);struct bnxt_link_info *link_info = &bp->link_info;u16 support_pam4_spds = link_info->support_pam4_speeds; +u16 support_spds2 = link_info->support_speeds2;u16 support_spds = link_info->support_speeds;u8 sig_mode =BNXT_SIG_MODE_NRZ ;u32 lanes_needed =1 ;
@@ -2139,7 +2140,8 @@ bnxt_force_link_speed(struct net_device *dev, u32 ethtool_speed, u32 lanes) fw_speed =PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_100MB ;break ;case SPEED_1000 : -if (support_spds &BNXT_LINK_SPEED_MSK_1GB ) +if ((support_spds &BNXT_LINK_SPEED_MSK_1GB ) || + (support_spds2 &BNXT_LINK_SPEEDS2_MSK_1GB )) fw_speed =PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_1GB ;break ;case SPEED_2500 :
@@ -2147,7 +2149,8 @@ bnxt_force_link_speed(struct net_device *dev, u32 ethtool_speed, u32 lanes) fw_speed =PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_2_5GB ;break ;case SPEED_10000 : -if (support_spds &BNXT_LINK_SPEED_MSK_10GB ) +if ((support_spds &BNXT_LINK_SPEED_MSK_10GB ) || + (support_spds2 &BNXT_LINK_SPEEDS2_MSK_10GB )) fw_speed =PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10GB ;break ;case SPEED_20000 :
@@ -2157,26 +2160,34 @@ bnxt_force_link_speed(struct net_device *dev, u32 ethtool_speed, u32 lanes) }break ;case SPEED_25000 : -if (support_spds &BNXT_LINK_SPEED_MSK_25GB ) +if ((support_spds &BNXT_LINK_SPEED_MSK_25GB ) || + (support_spds2 &BNXT_LINK_SPEEDS2_MSK_25GB )) fw_speed =PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_25GB ;break ;case SPEED_40000 : -if (support_spds &BNXT_LINK_SPEED_MSK_40GB ) { +if ((support_spds &BNXT_LINK_SPEED_MSK_40GB ) || + (support_spds2 &BNXT_LINK_SPEEDS2_MSK_40GB )) { fw_speed =PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_40GB ; lanes_needed =4 ; }break ;case SPEED_50000 : -if ((support_spds &BNXT_LINK_SPEED_MSK_50GB ) && lanes !=1 ) { +if (((support_spds &BNXT_LINK_SPEED_MSK_50GB ) || + (support_spds2 &BNXT_LINK_SPEEDS2_MSK_50GB )) && + lanes !=1 ) { fw_speed =PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_50GB ; lanes_needed =2 ; }else if (support_pam4_spds &BNXT_LINK_PAM4_SPEED_MSK_50GB ) { fw_speed =PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_50GB ; sig_mode =BNXT_SIG_MODE_PAM4 ; + }else if (support_spds2 &BNXT_LINK_SPEEDS2_MSK_50GB_PAM4 ) { + fw_speed =BNXT_LINK_SPEED_50GB_PAM4 ; + sig_mode =BNXT_SIG_MODE_PAM4 ; }break ;case SPEED_100000 : -if ((support_spds &BNXT_LINK_SPEED_MSK_100GB ) && +if (((support_spds &BNXT_LINK_SPEED_MSK_100GB ) || + (support_spds2 &BNXT_LINK_SPEEDS2_MSK_100GB )) && lanes !=2 && lanes !=1 ) { fw_speed =PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_100GB ; lanes_needed =4 ;
@@ -2184,6 +2195,14 @@ bnxt_force_link_speed(struct net_device *dev, u32 ethtool_speed, u32 lanes) fw_speed =PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_100GB ; sig_mode =BNXT_SIG_MODE_PAM4 ; lanes_needed =2 ; + }else if ((support_spds2 &BNXT_LINK_SPEEDS2_MSK_100GB_PAM4 ) && + lanes !=1 ) { + fw_speed =BNXT_LINK_SPEED_100GB_PAM4 ; + sig_mode =BNXT_SIG_MODE_PAM4 ; + lanes_needed =2 ; + }else if (support_spds2 &BNXT_LINK_SPEEDS2_MSK_100GB_PAM4_112 ) { + fw_speed =BNXT_LINK_SPEED_100GB_PAM4_112 ; + sig_mode =BNXT_SIG_MODE_PAM4_112 ; }break ;case SPEED_200000 :
@@ -2191,6 +2210,27 @@ bnxt_force_link_speed(struct net_device *dev, u32 ethtool_speed, u32 lanes) fw_speed =PORT_PHY_CFG_REQ_FORCE_PAM4_LINK_SPEED_200GB ; sig_mode =BNXT_SIG_MODE_PAM4 ; lanes_needed =4 ; + }else if ((support_spds2 &BNXT_LINK_SPEEDS2_MSK_200GB_PAM4 ) && + lanes !=2 ) { + fw_speed =BNXT_LINK_SPEED_200GB_PAM4 ; + sig_mode =BNXT_SIG_MODE_PAM4 ; + lanes_needed =4 ; + }else if (support_spds2 &BNXT_LINK_SPEEDS2_MSK_200GB_PAM4_112 ) { + fw_speed =BNXT_LINK_SPEED_200GB_PAM4_112 ; + sig_mode =BNXT_SIG_MODE_PAM4_112 ; + lanes_needed =2 ; + } +break ; +case SPEED_400000 : +if ((support_spds2 &BNXT_LINK_SPEEDS2_MSK_400GB_PAM4 ) && + lanes !=4 ) { + fw_speed =BNXT_LINK_SPEED_400GB_PAM4 ; + sig_mode =BNXT_SIG_MODE_PAM4 ; + lanes_needed =8 ; + }else if (support_spds2 &BNXT_LINK_SPEEDS2_MSK_400GB_PAM4_112 ) { + fw_speed =BNXT_LINK_SPEED_400GB_PAM4_112 ; + sig_mode =BNXT_SIG_MODE_PAM4_112 ; + lanes_needed =4 ; }break ; }
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 14/15 bnxt_en: Report the new ethtool link modes in the new firmware interface
In reply to Michael ChanAdd new look up entries to convert the new supported speeds, advertised speeds, etc to ethtool link modes.
--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 171 ++++++++++++++++-- 1 file changed, 151 insertions(+), 20 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +151 -20
@@ -1577,6 +1577,22 @@ static const enum bnxt_media_type bnxt_phy_types[] = { [PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR2] = BNXT_MEDIA_SR, [PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASELR2] = BNXT_MEDIA_LR_ER_FR, [PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASEER2] = BNXT_MEDIA_LR_ER_FR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASECR] = BNXT_MEDIA_CR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASESR] = BNXT_MEDIA_SR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASELR] = BNXT_MEDIA_LR_ER_FR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_100G_BASEER] = BNXT_MEDIA_LR_ER_FR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASECR2] = BNXT_MEDIA_CR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASESR2] = BNXT_MEDIA_SR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASELR2] = BNXT_MEDIA_LR_ER_FR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_200G_BASEER2] = BNXT_MEDIA_LR_ER_FR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASECR8] = BNXT_MEDIA_CR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASESR8] = BNXT_MEDIA_SR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASELR8] = BNXT_MEDIA_LR_ER_FR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASEER8] = BNXT_MEDIA_LR_ER_FR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASECR4] = BNXT_MEDIA_CR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASESR4] = BNXT_MEDIA_SR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASELR4] = BNXT_MEDIA_LR_ER_FR, + [PORT_PHY_QCFG_RESP_PHY_TYPE_400G_BASEER4] = BNXT_MEDIA_LR_ER_FR, }; static enum bnxt_media_type
@@ -1604,6 +1620,7 @@ enum bnxt_link_speed_indices {BNXT_LINK_SPEED_50GB_IDX ,BNXT_LINK_SPEED_100GB_IDX ,BNXT_LINK_SPEED_200GB_IDX , +BNXT_LINK_SPEED_400GB_IDX , __BNXT_LINK_SPEED_END };
@@ -1615,9 +1632,21 @@ static enum bnxt_link_speed_indices bnxt_fw_speed_idx(u16 speed)case BNXT_LINK_SPEED_10GB :return BNXT_LINK_SPEED_10GB_IDX ;case BNXT_LINK_SPEED_25GB :return BNXT_LINK_SPEED_25GB_IDX ;case BNXT_LINK_SPEED_40GB :return BNXT_LINK_SPEED_40GB_IDX ; -case BNXT_LINK_SPEED_50GB :return BNXT_LINK_SPEED_50GB_IDX ; -case BNXT_LINK_SPEED_100GB :return BNXT_LINK_SPEED_100GB_IDX ; -case BNXT_LINK_SPEED_200GB :return BNXT_LINK_SPEED_200GB_IDX ; +case BNXT_LINK_SPEED_50GB : +case BNXT_LINK_SPEED_50GB_PAM4 : +return BNXT_LINK_SPEED_50GB_IDX ; +case BNXT_LINK_SPEED_100GB : +case BNXT_LINK_SPEED_100GB_PAM4 : +case BNXT_LINK_SPEED_100GB_PAM4_112 : +return BNXT_LINK_SPEED_100GB_IDX ; +case BNXT_LINK_SPEED_200GB : +case BNXT_LINK_SPEED_200GB_PAM4 : +case BNXT_LINK_SPEED_200GB_PAM4_112 : +return BNXT_LINK_SPEED_200GB_IDX ; +case BNXT_LINK_SPEED_400GB : +case BNXT_LINK_SPEED_400GB_PAM4 : +case BNXT_LINK_SPEED_400GB_PAM4_112 : +return BNXT_LINK_SPEED_400GB_IDX ;default :return BNXT_LINK_SPEED_UNKNOWN ; } }
@@ -1690,6 +1719,12 @@ bnxt_link_modes[__BNXT_LINK_SPEED_END][BNXT_SIG_MODE_MAX][__BNXT_MEDIA_END] = { [BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_100000baseLR2_ER2_FR2_Full_BIT, [BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_100000baseKR2_Full_BIT, }, + [BNXT_SIG_MODE_PAM4_112] = { + [BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_100000baseCR_Full_BIT, + [BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_100000baseSR_Full_BIT, + [BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_100000baseKR_Full_BIT, + [BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_100000baseLR_ER_FR_Full_BIT, + }, }, [BNXT_LINK_SPEED_200GB_IDX] = { [BNXT_SIG_MODE_PAM4] = {
@@ -1698,6 +1733,26 @@ bnxt_link_modes[__BNXT_LINK_SPEED_END][BNXT_SIG_MODE_MAX][__BNXT_MEDIA_END] = { [BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_200000baseLR4_ER4_FR4_Full_BIT, [BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_200000baseKR4_Full_BIT, }, + [BNXT_SIG_MODE_PAM4_112] = { + [BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_200000baseCR2_Full_BIT, + [BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_200000baseKR2_Full_BIT, + [BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_200000baseSR2_Full_BIT, + [BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_200000baseLR2_ER2_FR2_Full_BIT, + }, + }, + [BNXT_LINK_SPEED_400GB_IDX] = { + [BNXT_SIG_MODE_PAM4] = { + [BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT, + [BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_400000baseKR8_Full_BIT, + [BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_400000baseSR8_Full_BIT, + [BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_400000baseLR8_ER8_FR8_Full_BIT, + }, + [BNXT_SIG_MODE_PAM4_112] = { + [BNXT_MEDIA_CR] = ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, + [BNXT_MEDIA_KR] = ETHTOOL_LINK_MODE_400000baseKR4_Full_BIT, + [BNXT_MEDIA_SR] = ETHTOOL_LINK_MODE_400000baseSR4_Full_BIT, + [BNXT_MEDIA_LR_ER_FR] = ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT, + }, }, };
@@ -1762,7 +1817,8 @@ static void bnxt_get_ethtool_modes(struct bnxt_link_info *link_info, lk_ksettings->link_modes.supported); } -if (link_info->support_auto_speeds || link_info->support_pam4_auto_speeds) +if (link_info->support_auto_speeds || link_info->support_auto_speeds2 || + link_info->support_pam4_auto_speeds)linkmode_set_bit (ETHTOOL_LINK_MODE_Autoneg_BIT, lk_ksettings->link_modes.supported);
@@ -1798,6 +1854,30 @@ static const u16 bnxt_pam4_speed_masks[] = { [BNXT_LINK_SPEED_50GB_IDX] = BNXT_LINK_PAM4_SPEED_MSK_50GB, [BNXT_LINK_SPEED_100GB_IDX] = BNXT_LINK_PAM4_SPEED_MSK_100GB, [BNXT_LINK_SPEED_200GB_IDX] = BNXT_LINK_PAM4_SPEED_MSK_200GB, + [__BNXT_LINK_SPEED_END -1 ] =0 /* make any legal speed a valid index */ +}; + +static const u16 bnxt_nrz_speeds2_masks[] = { + [BNXT_LINK_SPEED_1GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_1GB , + [BNXT_LINK_SPEED_10GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_10GB , + [BNXT_LINK_SPEED_25GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_25GB , + [BNXT_LINK_SPEED_40GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_40GB , + [BNXT_LINK_SPEED_50GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_50GB , + [BNXT_LINK_SPEED_100GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_100GB , + [__BNXT_LINK_SPEED_END -1 ] =0 /* make any legal speed a valid index */ +}; + +static const u16 bnxt_pam4_speeds2_masks[] = { + [BNXT_LINK_SPEED_50GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_50GB_PAM4 , + [BNXT_LINK_SPEED_100GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_100GB_PAM4 , + [BNXT_LINK_SPEED_200GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_200GB_PAM4 , + [BNXT_LINK_SPEED_400GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_400GB_PAM4 , +}; + +static const u16 bnxt_pam4_112_speeds2_masks[] = { + [BNXT_LINK_SPEED_100GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_100GB_PAM4_112 , + [BNXT_LINK_SPEED_200GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_200GB_PAM4_112 , + [BNXT_LINK_SPEED_400GB_IDX ] =BNXT_LINK_SPEEDS2_MSK_400GB_PAM4_112 , }; static enum bnxt_link_speed_indices
@@ -1808,12 +1888,26 @@ bnxt_encoding_speed_idx(u8 sig_mode, u16 phy_flags, u16 speed_msk)switch (sig_mode) {case BNXT_SIG_MODE_NRZ : - speeds = bnxt_nrz_speed_masks; - len =ARRAY_SIZE (bnxt_nrz_speed_masks); +if (phy_flags &BNXT_PHY_FL_SPEEDS2 ) { + speeds = bnxt_nrz_speeds2_masks; + len =ARRAY_SIZE (bnxt_nrz_speeds2_masks); + }else { + speeds = bnxt_nrz_speed_masks; + len =ARRAY_SIZE (bnxt_nrz_speed_masks); + }break ;case BNXT_SIG_MODE_PAM4 : - speeds = bnxt_pam4_speed_masks; - len =ARRAY_SIZE (bnxt_pam4_speed_masks); +if (phy_flags &BNXT_PHY_FL_SPEEDS2 ) { + speeds = bnxt_pam4_speeds2_masks; + len =ARRAY_SIZE (bnxt_pam4_speeds2_masks); + }else { + speeds = bnxt_pam4_speed_masks; + len =ARRAY_SIZE (bnxt_pam4_speed_masks); + } +break ; +case BNXT_SIG_MODE_PAM4_112 : + speeds = bnxt_pam4_112_speeds2_masks; + len =ARRAY_SIZE (bnxt_pam4_112_speeds2_masks);break ;default :return BNXT_LINK_SPEED_UNKNOWN ;
@@ -1872,14 +1966,23 @@ bnxt_get_all_ethtool_support_speeds(struct bnxt_link_info *link_info, struct ethtool_link_ksettings *lk_ksettings) { struct bnxt *bp = container_of(link_info, struct bnxt, link_info); +u16 sp_nrz, sp_pam4, sp_pam4_112 =0 ;u16 phy_flags = bp->phy_flags; -bnxt_get_ethtool_speeds (link_info->support_speeds, media, -BNXT_SIG_MODE_NRZ , phy_flags, +if (phy_flags &BNXT_PHY_FL_SPEEDS2 ) { + sp_nrz = link_info->support_speeds2; + sp_pam4 = link_info->support_speeds2; + sp_pam4_112 = link_info->support_speeds2; + }else { + sp_nrz = link_info->support_speeds; + sp_pam4 = link_info->support_pam4_speeds; + } +bnxt_get_ethtool_speeds (sp_nrz, media,BNXT_SIG_MODE_NRZ , phy_flags, lk_ksettings->link_modes.supported); -bnxt_get_ethtool_speeds (link_info->support_pam4_speeds, media, -BNXT_SIG_MODE_PAM4 , phy_flags, +bnxt_get_ethtool_speeds (sp_pam4, media,BNXT_SIG_MODE_PAM4 , phy_flags, lk_ksettings->link_modes.supported); +bnxt_get_ethtool_speeds (sp_pam4_112, media,BNXT_SIG_MODE_PAM4_112 , + phy_flags, lk_ksettings->link_modes.supported); } static void
@@ -1888,14 +1991,22 @@ bnxt_get_all_ethtool_adv_speeds(struct bnxt_link_info *link_info, struct ethtool_link_ksettings *lk_ksettings) { struct bnxt *bp = container_of(link_info, struct bnxt, link_info); +u16 sp_nrz, sp_pam4, sp_pam4_112 =0 ;u16 phy_flags = bp->phy_flags; -bnxt_get_ethtool_speeds (link_info->advertising, media, -BNXT_SIG_MODE_NRZ , phy_flags, + sp_nrz = link_info->advertising; +if (phy_flags &BNXT_PHY_FL_SPEEDS2 ) { + sp_pam4 = link_info->advertising; + sp_pam4_112 = link_info->advertising; + }else { + sp_pam4 = link_info->advertising_pam4; + } +bnxt_get_ethtool_speeds (sp_nrz, media,BNXT_SIG_MODE_NRZ , phy_flags, lk_ksettings->link_modes.advertising); -bnxt_get_ethtool_speeds (link_info->advertising_pam4, media, -BNXT_SIG_MODE_PAM4 , phy_flags, +bnxt_get_ethtool_speeds (sp_pam4, media,BNXT_SIG_MODE_PAM4 , phy_flags, lk_ksettings->link_modes.advertising); +bnxt_get_ethtool_speeds (sp_pam4_112, media,BNXT_SIG_MODE_PAM4_112 , + phy_flags, lk_ksettings->link_modes.advertising); } static void
@@ -1940,22 +2051,42 @@ static void bnxt_update_speed(u32 *delta, bool installed_media, u16 *speeds,static void bnxt_set_ethtool_speeds (struct bnxt_link_info *link_info,const unsigned long *et_mask) { + struct bnxt *bp = container_of(link_info, struct bnxt, link_info); +u16 const *sp_msks, *sp_pam4_msks, *sp_pam4_112_msks;enum bnxt_media_type media =bnxt_get_media (link_info); +u16 *adv, *adv_pam4, *adv_pam4_112 =NULL ; +u32 delta_pam4_112 =0 ;u32 delta_pam4 =0 ;u32 delta_nrz =0 ;int i, m; + adv = &link_info->advertising; +if (bp->phy_flags &BNXT_PHY_FL_SPEEDS2 ) { + adv_pam4 = &link_info->advertising; + adv_pam4_112 = &link_info->advertising; + sp_msks = bnxt_nrz_speeds2_masks; + sp_pam4_msks = bnxt_pam4_speeds2_masks; + sp_pam4_112_msks = bnxt_pam4_112_speeds2_masks; + }else { + adv_pam4 = &link_info->advertising_pam4; + sp_msks = bnxt_nrz_speed_masks; + sp_pam4_msks = bnxt_pam4_speed_masks; + }for (i =1 ; i < __BNXT_LINK_SPEED_END; i++) {/* accept any legal media from user */ for (m =1 ; m < __BNXT_MEDIA_END; m++) {bnxt_update_speed (&delta_nrz, m == media, - &link_info->advertising, - bnxt_nrz_speed_masks[i], et_mask, + adv, sp_msks[i], et_mask, bnxt_link_modes[i][BNXT_SIG_MODE_NRZ ][m]);bnxt_update_speed (&delta_pam4, m == media, - &link_info->advertising_pam4, - bnxt_pam4_speed_masks[i], et_mask, + adv_pam4, sp_pam4_msks[i], et_mask, bnxt_link_modes[i][BNXT_SIG_MODE_PAM4 ][m]); +if (!adv_pam4_112) +continue ; + +bnxt_update_speed (&delta_pam4_112, m == media, + adv_pam4_112, sp_pam4_112_msks[i], et_mask, + bnxt_link_modes[i][BNXT_SIG_MODE_PAM4_112 ][m]); } } }
Signature · 1 line
2.30.1
Michael Chan
maintainerPATCH 15/15 bnxt_en: Add 5760X (P7) PCI IDs
In reply to Michael ChanNow with basic support for the new chip family, add the PCI IDs of the new devices.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 ++++++++ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 ++++ 2 files changed, 12 insertions(+)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +8 -0
@@ -120,6 +120,10 @@ static const struct { [BCM57508] = { "Broadcom BCM57508 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet" }, [BCM57504] = { "Broadcom BCM57504 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet" }, [BCM57502] = { "Broadcom BCM57502 NetXtreme-E 10Gb/25Gb/50Gb Ethernet" }, + [BCM57608] = { "Broadcom BCM57608 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb/400Gb Ethernet" }, + [BCM57604] = { "Broadcom BCM57604 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb Ethernet" }, + [BCM57602] = { "Broadcom BCM57602 NetXtreme-E 10Gb/25Gb/50Gb/100Gb Ethernet" }, + [BCM57601] = { "Broadcom BCM57601 NetXtreme-E 10Gb/25Gb/50Gb/100Gb/200Gb/400Gb Ethernet" }, [BCM57508_NPAR] = { "Broadcom BCM57508 NetXtreme-E Ethernet Partition" }, [BCM57504_NPAR] = { "Broadcom BCM57504 NetXtreme-E Ethernet Partition" }, [BCM57502_NPAR] = { "Broadcom BCM57502 NetXtreme-E Ethernet Partition" },
@@ -174,6 +178,10 @@ static const struct pci_device_id bnxt_pci_tbl[] = { { PCI_VDEVICE(BROADCOM, 0x1750), .driver_data = BCM57508 }, { PCI_VDEVICE(BROADCOM, 0x1751), .driver_data = BCM57504 }, { PCI_VDEVICE(BROADCOM, 0x1752), .driver_data = BCM57502 }, + { PCI_VDEVICE(BROADCOM, 0x1760), .driver_data = BCM57608 }, + { PCI_VDEVICE(BROADCOM, 0x1761), .driver_data = BCM57604 }, + { PCI_VDEVICE(BROADCOM, 0x1762), .driver_data = BCM57602 }, + { PCI_VDEVICE(BROADCOM, 0x1763), .driver_data = BCM57601 }, { PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57502_NPAR }, { PCI_VDEVICE(BROADCOM, 0x1801), .driver_data = BCM57504_NPAR }, { PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57508_NPAR },
drivers/net/ethernet/broadcom/bnxt/bnxt.h +4 -0
@@ -1906,6 +1906,10 @@ enum board_idx {BCM57508_NPAR ,BCM57504_NPAR ,BCM57502_NPAR , +BCM57608 , +BCM57604 , +BCM57602 , +BCM57601 ,BCM58802 ,BCM58804 , BCM58808,
Signature · 1 line
2.30.1
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Fri, 1 Dec 2023 14:39:09 -0800 you wrote:
This series completes the basic support for the new 5760X P7 devices with new PCI IDs added in the last patch.
Thie first patch fixes a backing store issue introduced in the last patchset last week. The 2nd patch is the new firmware interface required to support the new chips. The next few patches are doorbell changes, refactoring, and new hardware interface structures. New changes to support packet reception including TPA are added in patch 10. The next 4 patches are ethernet link related changes to support the new chip.
Quoted 1 line
[...]
Here is the summary with links:
- [net-next,01/15] bnxt_en: Fix backing store V2 logic
https://git.kernel.org/netdev/net-next/c/08b386b132c6 - [net-next,02/15] bnxt_en: Update firmware interface to 1.10.3.15 https://git.kernel.org/netdev/net-next/c/397d44bf1721 - [net-next,03/15] bnxt_en: Define basic P7 macros https://git.kernel.org/netdev/net-next/c/a432a45bdba4 - [net-next,04/15] bnxt_en: Consolidate DB offset calculation https://git.kernel.org/netdev/net-next/c/d3c16475dc06 - [net-next,05/15] bnxt_en: Implement the new toggle bit doorbell mechanism on P7 chips https://git.kernel.org/netdev/net-next/c/d846992e6387 - [net-next,06/15] bnxt_en: Refactor RSS capability fields https://git.kernel.org/netdev/net-next/c/8243345bfaec - [net-next,07/15] bnxt_en: Add new P7 hardware interface definitions https://git.kernel.org/netdev/net-next/c/13d2d3d381ee - [net-next,08/15] bnxt_en: Refactor RX VLAN acceleration logic. https://git.kernel.org/netdev/net-next/c/c2f8063309da - [net-next,09/15] bnxt_en: Refactor and refine bnxt_tpa_start() and bnxt_tpa_end(). https://git.kernel.org/netdev/net-next/c/39b2e62be370 - [net-next,10/15] bnxt_en: Add support for new RX and TPA_START completion types for P7 https://git.kernel.org/netdev/net-next/c/a7445d69809f - [net-next,11/15] bnxt_en: Refactor ethtool speeds logic https://git.kernel.org/netdev/net-next/c/cf47fa5ca5bb - [net-next,12/15] bnxt_en: Support new firmware link parameters https://git.kernel.org/netdev/net-next/c/30c0bb63c2ea - [net-next,13/15] bnxt_en: Support force speed using the new HWRM fields https://git.kernel.org/netdev/net-next/c/7b60cf2b641a - [net-next,14/15] bnxt_en: Report the new ethtool link modes in the new firmware interface https://git.kernel.org/netdev/net-next/c/047a2d38e40c - [net-next,15/15] bnxt_en: Add 5760X (P7) PCI IDs https://git.kernel.org/netdev/net-next/c/2012a6abc876
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html