Page MenuHomeFreeBSD

D58601.id183280.diff
No OneTemporary

D58601.id183280.diff

Index: sys/dev/bnxt/bnxt_en/bnxt_hwrm.c
===================================================================
--- sys/dev/bnxt/bnxt_en/bnxt_hwrm.c
+++ sys/dev/bnxt/bnxt_en/bnxt_hwrm.c
@@ -465,10 +465,8 @@
if (softc->hwrm_spec_code < 0x10902 || softc->ctx_mem)
return 0;
- if (BNXT_CHIP_P7(softc)) {
- if (softc->fw_cap & BNXT_FW_CAP_BACKING_STORE_V2)
- return bnxt_hwrm_func_backing_store_qcaps_v2(softc);
- }
+ if (softc->fw_cap & BNXT_FW_CAP_BACKING_STORE_V2)
+ return bnxt_hwrm_func_backing_store_qcaps_v2(softc);
if (BNXT_VF(softc))
return 0;
@@ -1265,7 +1263,8 @@
flags_ext & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_EXT_DBR_PACING_SUPPORTED)
softc->fw_cap |= BNXT_FW_CAP_DBR_PACING_SUPPORTED;
- if (flags_ext2 & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_EXT2_SW_MAX_RESOURCE_LIMITS_SUPPORTED)
+ if (BNXT_CHIP_P5_PLUS(softc) &&
+ flags_ext2 & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_EXT2_SW_MAX_RESOURCE_LIMITS_SUPPORTED)
softc->fw_cap |= BNXT_FW_CAP_SW_MAX_RESOURCE_LIMITS;
if (flags_ext2 & HWRM_FUNC_QCAPS_OUTPUT_FLAGS_EXT2_GENERIC_STATS_SUPPORTED)
Index: sys/dev/bnxt/bnxt_en/if_bnxt.c
===================================================================
--- sys/dev/bnxt/bnxt_en/if_bnxt.c
+++ sys/dev/bnxt/bnxt_en/if_bnxt.c
@@ -1480,12 +1480,10 @@
ena |= HWRM_FUNC_BACKING_STORE_CFG_INPUT_DFLT_ENABLES;
skip_legacy:
- if (BNXT_CHIP_P7(softc)) {
- if (softc->fw_cap & BNXT_FW_CAP_BACKING_STORE_V2)
- rc = bnxt_backing_store_cfg_v2(softc, ena);
- } else {
+ if (softc->fw_cap & BNXT_FW_CAP_BACKING_STORE_V2)
+ rc = bnxt_backing_store_cfg_v2(softc, ena);
+ else
rc = bnxt_hwrm_func_backing_store_cfg(softc, ena);
- }
if (rc) {
device_printf(softc->dev, "Failed configuring context mem, rc = %d.\n",
rc);

File Metadata

Mime Type
text/plain
Expires
Thu, Sep 10, 2:27 AM (51 m, 4 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
38626115
Default Alt Text
D58601.id183280.diff (1 KB)

Event Timeline