Merge branch 'bnxt_en-devlink-param-updates'
Vasundhara Volam says: ==================== bnxt_en: devlink param updates This patchset adds support for 3 generic and 1 driver-specific devlink parameters. Add documentation for these configuration parameters. Also, this patchset adds support to return proper error code if HWRM_NVM_GET/SET_VARIABLE commands return error code HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED. v3->v4: -Remove extra definition of NVM_OFF_HW_TC_OFFLOAD from bnxt_devlink.h -Remove type information for generic parameters from devlink-params-bnxt.txt v2->v3: -Remove description of generic parameters from devlink-params-bnxt.txt v1->v2: -Remove hw_tc_offload parameter. -Update all patches with Cc of MAINTAINERS. -Add more description in commit message for device specific parameter. -Add a new Documentation/networking/devlink-params.txt with some generic devlink parameters information. -Add a new Documentation/networking/devlink-params-bnxt.txt with devlink parameters information that are supported by bnxt_en driver. ==================== Acked-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>hifive-unleashed-5.1
David S. Miller
commit
34f8c58f47
|
|
@ -0,0 +1,18 @@
|
|||
enable_sriov [DEVICE, GENERIC]
|
||||
Configuration mode: Permanent
|
||||
|
||||
ignore_ari [DEVICE, GENERIC]
|
||||
Configuration mode: Permanent
|
||||
|
||||
msix_vec_per_pf_max [DEVICE, GENERIC]
|
||||
Configuration mode: Permanent
|
||||
|
||||
msix_vec_per_pf_min [DEVICE, GENERIC]
|
||||
Configuration mode: Permanent
|
||||
|
||||
gre_ver_check [DEVICE, DRIVER-SPECIFIC]
|
||||
Generic Routing Encapsulation (GRE) version check will
|
||||
be enabled in the device. If disabled, device skips
|
||||
version checking for incoming packets.
|
||||
Type: Boolean
|
||||
Configuration mode: Permanent
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
Devlink configuration parameters
|
||||
================================
|
||||
Following is the list of configuration parameters via devlink interface.
|
||||
Each parameter can be generic or driver specific and are device level
|
||||
parameters.
|
||||
|
||||
Note that the driver-specific files should contain the generic params
|
||||
they support to, with supported config modes.
|
||||
|
||||
Each parameter can be set in different configuration modes:
|
||||
runtime - set while driver is running, no reset required.
|
||||
driverinit - applied while driver initializes, requires restart
|
||||
driver by devlink reload command.
|
||||
permanent - written to device's non-volatile memory, hard reset
|
||||
required.
|
||||
|
||||
Following is the list of parameters:
|
||||
====================================
|
||||
enable_sriov [DEVICE, GENERIC]
|
||||
Enable Single Root I/O Virtualisation (SRIOV) in
|
||||
the device.
|
||||
Type: Boolean
|
||||
|
||||
ignore_ari [DEVICE, GENERIC]
|
||||
Ignore Alternative Routing-ID Interpretation (ARI)
|
||||
capability. If enabled, adapter will ignore ARI
|
||||
capability even when platforms has the support
|
||||
enabled and creates same number of partitions when
|
||||
platform does not support ARI.
|
||||
Type: Boolean
|
||||
|
||||
msix_vec_per_pf_max [DEVICE, GENERIC]
|
||||
Provides the maximum number of MSIX interrupts that
|
||||
a device can create. Value is same across all
|
||||
physical functions (PFs) in the device.
|
||||
Type: u32
|
||||
|
||||
msix_vec_per_pf_min [DEVICE, GENERIC]
|
||||
Provides the minimum number of MSIX interrupts required
|
||||
for the device initialization. Value is same across all
|
||||
physical functions (PFs) in the device.
|
||||
Type: u32
|
||||
|
|
@ -21,9 +21,22 @@ static const struct devlink_ops bnxt_dl_ops = {
|
|||
#endif /* CONFIG_BNXT_SRIOV */
|
||||
};
|
||||
|
||||
enum bnxt_dl_param_id {
|
||||
BNXT_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,
|
||||
BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK,
|
||||
};
|
||||
|
||||
static const struct bnxt_dl_nvm_param nvm_params[] = {
|
||||
{DEVLINK_PARAM_GENERIC_ID_ENABLE_SRIOV, NVM_OFF_ENABLE_SRIOV,
|
||||
BNXT_NVM_SHARED_CFG, 1},
|
||||
{DEVLINK_PARAM_GENERIC_ID_IGNORE_ARI, NVM_OFF_IGNORE_ARI,
|
||||
BNXT_NVM_SHARED_CFG, 1},
|
||||
{DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX,
|
||||
NVM_OFF_MSIX_VEC_PER_PF_MAX, BNXT_NVM_SHARED_CFG, 10},
|
||||
{DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,
|
||||
NVM_OFF_MSIX_VEC_PER_PF_MIN, BNXT_NVM_SHARED_CFG, 7},
|
||||
{BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK, NVM_OFF_DIS_GRE_VER_CHECK,
|
||||
BNXT_NVM_SHARED_CFG, 1},
|
||||
};
|
||||
|
||||
static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
|
||||
|
|
@ -55,8 +68,22 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
|
|||
idx = bp->pf.fw_fid - BNXT_FIRST_PF_FID;
|
||||
|
||||
bytesize = roundup(nvm_param.num_bits, BITS_PER_BYTE) / BITS_PER_BYTE;
|
||||
if (nvm_param.num_bits == 1)
|
||||
buf = &val->vbool;
|
||||
switch (bytesize) {
|
||||
case 1:
|
||||
if (nvm_param.num_bits == 1)
|
||||
buf = &val->vbool;
|
||||
else
|
||||
buf = &val->vu8;
|
||||
break;
|
||||
case 2:
|
||||
buf = &val->vu16;
|
||||
break;
|
||||
case 4:
|
||||
buf = &val->vu32;
|
||||
break;
|
||||
default:
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
data_addr = dma_zalloc_coherent(&bp->pdev->dev, bytesize,
|
||||
&data_dma_addr, GFP_KERNEL);
|
||||
|
|
@ -78,8 +105,12 @@ static int bnxt_hwrm_nvm_req(struct bnxt *bp, u32 param_id, void *msg,
|
|||
memcpy(buf, data_addr, bytesize);
|
||||
|
||||
dma_free_coherent(&bp->pdev->dev, bytesize, data_addr, data_dma_addr);
|
||||
if (rc)
|
||||
if (rc == HWRM_ERR_CODE_RESOURCE_ACCESS_DENIED) {
|
||||
netdev_err(bp->dev, "PF does not have admin privileges to modify NVM config\n");
|
||||
return -EACCES;
|
||||
} else if (rc) {
|
||||
return -EIO;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -88,9 +119,15 @@ static int bnxt_dl_nvm_param_get(struct devlink *dl, u32 id,
|
|||
{
|
||||
struct hwrm_nvm_get_variable_input req = {0};
|
||||
struct bnxt *bp = bnxt_get_bp_from_dl(dl);
|
||||
int rc;
|
||||
|
||||
bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_NVM_GET_VARIABLE, -1, -1);
|
||||
return bnxt_hwrm_nvm_req(bp, id, &req, sizeof(req), &ctx->val);
|
||||
rc = bnxt_hwrm_nvm_req(bp, id, &req, sizeof(req), &ctx->val);
|
||||
if (!rc)
|
||||
if (id == BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK)
|
||||
ctx->val.vbool = !ctx->val.vbool;
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int bnxt_dl_nvm_param_set(struct devlink *dl, u32 id,
|
||||
|
|
@ -100,14 +137,55 @@ static int bnxt_dl_nvm_param_set(struct devlink *dl, u32 id,
|
|||
struct bnxt *bp = bnxt_get_bp_from_dl(dl);
|
||||
|
||||
bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_NVM_SET_VARIABLE, -1, -1);
|
||||
|
||||
if (id == BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK)
|
||||
ctx->val.vbool = !ctx->val.vbool;
|
||||
|
||||
return bnxt_hwrm_nvm_req(bp, id, &req, sizeof(req), &ctx->val);
|
||||
}
|
||||
|
||||
static int bnxt_dl_msix_validate(struct devlink *dl, u32 id,
|
||||
union devlink_param_value val,
|
||||
struct netlink_ext_ack *extack)
|
||||
{
|
||||
int max_val;
|
||||
|
||||
if (id == DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX)
|
||||
max_val = BNXT_MSIX_VEC_MAX;
|
||||
|
||||
if (id == DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN)
|
||||
max_val = BNXT_MSIX_VEC_MIN_MAX;
|
||||
|
||||
if (val.vu32 < 0 || val.vu32 > max_val) {
|
||||
NL_SET_ERR_MSG_MOD(extack, "MSIX value is exceeding the range");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct devlink_param bnxt_dl_params[] = {
|
||||
DEVLINK_PARAM_GENERIC(ENABLE_SRIOV,
|
||||
BIT(DEVLINK_PARAM_CMODE_PERMANENT),
|
||||
bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,
|
||||
NULL),
|
||||
DEVLINK_PARAM_GENERIC(IGNORE_ARI,
|
||||
BIT(DEVLINK_PARAM_CMODE_PERMANENT),
|
||||
bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,
|
||||
NULL),
|
||||
DEVLINK_PARAM_GENERIC(MSIX_VEC_PER_PF_MAX,
|
||||
BIT(DEVLINK_PARAM_CMODE_PERMANENT),
|
||||
bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,
|
||||
bnxt_dl_msix_validate),
|
||||
DEVLINK_PARAM_GENERIC(MSIX_VEC_PER_PF_MIN,
|
||||
BIT(DEVLINK_PARAM_CMODE_PERMANENT),
|
||||
bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,
|
||||
bnxt_dl_msix_validate),
|
||||
DEVLINK_PARAM_DRIVER(BNXT_DEVLINK_PARAM_ID_GRE_VER_CHECK,
|
||||
"gre_ver_check", DEVLINK_PARAM_TYPE_BOOL,
|
||||
BIT(DEVLINK_PARAM_CMODE_PERMANENT),
|
||||
bnxt_dl_nvm_param_get, bnxt_dl_nvm_param_set,
|
||||
NULL),
|
||||
};
|
||||
|
||||
int bnxt_dl_register(struct bnxt *bp)
|
||||
|
|
|
|||
|
|
@ -33,8 +33,15 @@ static inline void bnxt_link_bp_to_dl(struct bnxt *bp, struct devlink *dl)
|
|||
}
|
||||
}
|
||||
|
||||
#define NVM_OFF_MSIX_VEC_PER_PF_MAX 108
|
||||
#define NVM_OFF_MSIX_VEC_PER_PF_MIN 114
|
||||
#define NVM_OFF_IGNORE_ARI 164
|
||||
#define NVM_OFF_DIS_GRE_VER_CHECK 171
|
||||
#define NVM_OFF_ENABLE_SRIOV 401
|
||||
|
||||
#define BNXT_MSIX_VEC_MAX 1280
|
||||
#define BNXT_MSIX_VEC_MIN_MAX 128
|
||||
|
||||
enum bnxt_nvm_dir_type {
|
||||
BNXT_NVM_SHARED_CFG = 40,
|
||||
BNXT_NVM_PORT_CFG,
|
||||
|
|
|
|||
|
|
@ -362,6 +362,9 @@ enum devlink_param_generic_id {
|
|||
DEVLINK_PARAM_GENERIC_ID_MAX_MACS,
|
||||
DEVLINK_PARAM_GENERIC_ID_ENABLE_SRIOV,
|
||||
DEVLINK_PARAM_GENERIC_ID_REGION_SNAPSHOT,
|
||||
DEVLINK_PARAM_GENERIC_ID_IGNORE_ARI,
|
||||
DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX,
|
||||
DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,
|
||||
|
||||
/* add new param generic ids above here*/
|
||||
__DEVLINK_PARAM_GENERIC_ID_MAX,
|
||||
|
|
@ -380,6 +383,15 @@ enum devlink_param_generic_id {
|
|||
#define DEVLINK_PARAM_GENERIC_REGION_SNAPSHOT_NAME "region_snapshot_enable"
|
||||
#define DEVLINK_PARAM_GENERIC_REGION_SNAPSHOT_TYPE DEVLINK_PARAM_TYPE_BOOL
|
||||
|
||||
#define DEVLINK_PARAM_GENERIC_IGNORE_ARI_NAME "ignore_ari"
|
||||
#define DEVLINK_PARAM_GENERIC_IGNORE_ARI_TYPE DEVLINK_PARAM_TYPE_BOOL
|
||||
|
||||
#define DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MAX_NAME "msix_vec_per_pf_max"
|
||||
#define DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MAX_TYPE DEVLINK_PARAM_TYPE_U32
|
||||
|
||||
#define DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_NAME "msix_vec_per_pf_min"
|
||||
#define DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_TYPE DEVLINK_PARAM_TYPE_U32
|
||||
|
||||
#define DEVLINK_PARAM_GENERIC(_id, _cmodes, _get, _set, _validate) \
|
||||
{ \
|
||||
.id = DEVLINK_PARAM_GENERIC_ID_##_id, \
|
||||
|
|
|
|||
|
|
@ -2677,6 +2677,21 @@ static const struct devlink_param devlink_param_generic[] = {
|
|||
.name = DEVLINK_PARAM_GENERIC_REGION_SNAPSHOT_NAME,
|
||||
.type = DEVLINK_PARAM_GENERIC_REGION_SNAPSHOT_TYPE,
|
||||
},
|
||||
{
|
||||
.id = DEVLINK_PARAM_GENERIC_ID_IGNORE_ARI,
|
||||
.name = DEVLINK_PARAM_GENERIC_IGNORE_ARI_NAME,
|
||||
.type = DEVLINK_PARAM_GENERIC_IGNORE_ARI_TYPE,
|
||||
},
|
||||
{
|
||||
.id = DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MAX,
|
||||
.name = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MAX_NAME,
|
||||
.type = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MAX_TYPE,
|
||||
},
|
||||
{
|
||||
.id = DEVLINK_PARAM_GENERIC_ID_MSIX_VEC_PER_PF_MIN,
|
||||
.name = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_NAME,
|
||||
.type = DEVLINK_PARAM_GENERIC_MSIX_VEC_PER_PF_MIN_TYPE,
|
||||
},
|
||||
};
|
||||
|
||||
static int devlink_param_generic_verify(const struct devlink_param *param)
|
||||
|
|
|
|||
Loading…
Reference in New Issue