From: Sudarsana Reddy Kalluru <skalluru@marvell.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <mkalderon@marvell.com>, <aelior@marvell.com>
Subject: [PATCH net-next 4/4] qed: Add devlink support for configuration attributes.
Date: Mon, 17 Jun 2019 04:45:28 -0700 [thread overview]
Message-ID: <20190617114528.17086-5-skalluru@marvell.com> (raw)
In-Reply-To: <20190617114528.17086-1-skalluru@marvell.com>
This patch adds implementation for devlink callbacks for reading/
configuring the device attributes.
Signed-off-by: Sudarsana Reddy Kalluru <skalluru@marvell.com>
Signed-off-by: Ariel Elior <aelior@marvell.com>
---
drivers/net/ethernet/qlogic/qed/qed.h | 1 +
drivers/net/ethernet/qlogic/qed/qed_devlink.c | 184 ++++++++++++++++++++++++++
drivers/net/ethernet/qlogic/qed/qed_devlink.h | 23 ++++
drivers/net/ethernet/qlogic/qed/qed_hsi.h | 11 ++
4 files changed, 219 insertions(+)
diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h
index 89fe091..2afd5c7 100644
--- a/drivers/net/ethernet/qlogic/qed/qed.h
+++ b/drivers/net/ethernet/qlogic/qed/qed.h
@@ -866,6 +866,7 @@ struct qed_dev {
struct devlink *dl;
bool iwarp_cmt;
+ u8 cfg_entity_id;
};
#define NUM_OF_VFS(dev) (QED_IS_BB(dev) ? MAX_NUM_VFS_BB \
diff --git a/drivers/net/ethernet/qlogic/qed/qed_devlink.c b/drivers/net/ethernet/qlogic/qed/qed_devlink.c
index acb6c87..232a8c4 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_devlink.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_devlink.c
@@ -4,6 +4,30 @@
#include "qed_devlink.h"
#include "qed_mcp.h"
+static const struct qed_devlink_cfg_param cfg_params[] = {
+ {DEVLINK_PARAM_GENERIC_ID_ENABLE_SRIOV, NVM_CFG_ID_ENABLE_SRIOV,
+ DEVLINK_PARAM_TYPE_BOOL},
+ {QED_DEVLINK_ENTITY_ID, 0, DEVLINK_PARAM_TYPE_U8},
+ {QED_DEVLINK_DEVICE_CAPABILITIES, NVM_CFG_ID_DEVICE_CAPABILITIES,
+ DEVLINK_PARAM_TYPE_U8},
+ {QED_DEVLINK_MF_MODE, NVM_CFG_ID_MF_MODE, DEVLINK_PARAM_TYPE_U8},
+ {QED_DEVLINK_DCBX_MODE, NVM_CFG_ID_DCBX_MODE, DEVLINK_PARAM_TYPE_U8},
+ {QED_DEVLINK_PREBOOT_OPROM, NVM_CFG_ID_PREBOOT_OPROM,
+ DEVLINK_PARAM_TYPE_BOOL},
+ {QED_DEVLINK_PREBOOT_BOOT_PROTOCOL, NVM_CFG_ID_PREBOOT_BOOT_PROTOCOL,
+ DEVLINK_PARAM_TYPE_U8},
+ {QED_DEVLINK_PREBOOT_VLAN, NVM_CFG_ID_PREBOOT_VLAN,
+ DEVLINK_PARAM_TYPE_U16},
+ {QED_DEVLINK_PREBOOT_VLAN_VALUE, NVM_CFG_ID_PREBOOT_VLAN_VALUE,
+ DEVLINK_PARAM_TYPE_U16},
+ {QED_DEVLINK_MBA_DELAY_TIME, NVM_CFG_ID_MBA_DELAY_TIME,
+ DEVLINK_PARAM_TYPE_U8},
+ {QED_DEVLINK_MBA_SETUP_HOT_KEY, NVM_CFG_ID_MBA_SETUP_HOT_KEY,
+ DEVLINK_PARAM_TYPE_U8},
+ {QED_DEVLINK_MBA_HIDE_SETUP_PROMPT, NVM_CFG_ID_MBA_HIDE_SETUP_PROMPT,
+ DEVLINK_PARAM_TYPE_BOOL},
+};
+
static int qed_dl_param_get(struct devlink *dl, u32 id,
struct devlink_param_gset_ctx *ctx)
{
@@ -30,11 +54,171 @@ static int qed_dl_param_set(struct devlink *dl, u32 id,
return 0;
}
+static int qed_dl_get_perm_cfg(struct devlink *dl, u32 id,
+ struct devlink_param_gset_ctx *ctx)
+{
+ u8 buf[QED_DL_PARAM_BUF_LEN];
+ struct qed_devlink *qed_dl;
+ int rc, cfg_idx, len = 0;
+ struct qed_hwfn *hwfn;
+ struct qed_dev *cdev;
+ struct qed_ptt *ptt;
+ u32 flags;
+
+ qed_dl = devlink_priv(dl);
+ cdev = qed_dl->cdev;
+ hwfn = QED_LEADING_HWFN(cdev);
+
+ if (id == QED_DEVLINK_ENTITY_ID) {
+ ctx->val.vu8 = cdev->cfg_entity_id;
+ return 0;
+ }
+
+ for (cfg_idx = 0; cfg_idx < ARRAY_SIZE(cfg_params); cfg_idx++)
+ if (cfg_params[cfg_idx].id == id)
+ break;
+
+ if (cfg_idx == ARRAY_SIZE(cfg_params)) {
+ DP_ERR(cdev, "Invalid command id %d\n", id);
+ return -EINVAL;
+ }
+
+ ptt = qed_ptt_acquire(hwfn);
+ if (!ptt)
+ return -EAGAIN;
+
+ memset(buf, 0, QED_DL_PARAM_BUF_LEN);
+ flags = cdev->cfg_entity_id ? QED_DL_PARAM_PF_GET_FLAGS :
+ QED_DL_PARAM_GET_FLAGS;
+ rc = qed_mcp_nvm_get_cfg(hwfn, ptt, cfg_params[cfg_idx].cmd,
+ cdev->cfg_entity_id, flags, buf, &len);
+ if (rc)
+ DP_ERR(cdev, "Error = %d\n", rc);
+ else
+ memcpy(&ctx->val, buf, len);
+
+ qed_ptt_release(hwfn, ptt);
+
+ return rc;
+}
+
+static int qed_dl_set_perm_cfg(struct devlink *dl, u32 id,
+ struct devlink_param_gset_ctx *ctx)
+{
+ u8 buf[QED_DL_PARAM_BUF_LEN];
+ struct qed_devlink *qed_dl;
+ int rc, cfg_idx, len = 0;
+ struct qed_hwfn *hwfn;
+ struct qed_dev *cdev;
+ struct qed_ptt *ptt;
+ u32 flags;
+
+ qed_dl = devlink_priv(dl);
+ cdev = qed_dl->cdev;
+ hwfn = QED_LEADING_HWFN(cdev);
+
+ if (id == QED_DEVLINK_ENTITY_ID) {
+ cdev->cfg_entity_id = ctx->val.vu8;
+ return 0;
+ }
+
+ for (cfg_idx = 0; cfg_idx < ARRAY_SIZE(cfg_params); cfg_idx++)
+ if (cfg_params[cfg_idx].id == id)
+ break;
+
+ if (cfg_idx == ARRAY_SIZE(cfg_params)) {
+ DP_ERR(cdev, "Invalid command id %d\n", id);
+ return -EINVAL;
+ }
+
+ memset(buf, 0, QED_DL_PARAM_BUF_LEN);
+ switch (cfg_params[cfg_idx].type) {
+ case DEVLINK_PARAM_TYPE_BOOL:
+ len = 1;
+ break;
+ case DEVLINK_PARAM_TYPE_U8:
+ len = 1;
+ break;
+ case DEVLINK_PARAM_TYPE_U16:
+ len = 2;
+ break;
+ case DEVLINK_PARAM_TYPE_U32:
+ len = 4;
+ break;
+ case DEVLINK_PARAM_TYPE_STRING:
+ len = strlen(ctx->val.vstr);
+ break;
+ }
+
+ memcpy(buf, &ctx->val, len);
+ flags = cdev->cfg_entity_id ? QED_DL_PARAM_PF_SET_FLAGS :
+ QED_DL_PARAM_SET_FLAGS;
+
+ ptt = qed_ptt_acquire(hwfn);
+ if (!ptt)
+ return -EAGAIN;
+
+ rc = qed_mcp_nvm_set_cfg(hwfn, ptt, cfg_params[cfg_idx].cmd,
+ cdev->cfg_entity_id, flags, buf, len);
+ if (rc)
+ DP_ERR(cdev, "Error = %d\n", rc);
+
+ qed_ptt_release(hwfn, ptt);
+
+ return rc;
+}
+
static const struct devlink_param qed_devlink_params[] = {
+ DEVLINK_PARAM_GENERIC(ENABLE_SRIOV, BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
DEVLINK_PARAM_DRIVER(QED_DEVLINK_PARAM_ID_IWARP_CMT,
"iwarp_cmt", DEVLINK_PARAM_TYPE_BOOL,
BIT(DEVLINK_PARAM_CMODE_RUNTIME),
qed_dl_param_get, qed_dl_param_set, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_ENTITY_ID,
+ "entity_id", DEVLINK_PARAM_TYPE_U8,
+ BIT(DEVLINK_PARAM_CMODE_RUNTIME),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_DEVICE_CAPABILITIES,
+ "device_capabilities", DEVLINK_PARAM_TYPE_U8,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_MF_MODE,
+ "mf_mode", DEVLINK_PARAM_TYPE_U8,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_DCBX_MODE,
+ "dcbx_mode", DEVLINK_PARAM_TYPE_U8,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_PREBOOT_OPROM,
+ "preboot_oprom", DEVLINK_PARAM_TYPE_BOOL,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_PREBOOT_BOOT_PROTOCOL,
+ "preboot_boot_protocol", DEVLINK_PARAM_TYPE_U8,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_PREBOOT_VLAN,
+ "preboot_vlan", DEVLINK_PARAM_TYPE_U16,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_PREBOOT_VLAN_VALUE,
+ "preboot_vlan_value", DEVLINK_PARAM_TYPE_U16,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_MBA_DELAY_TIME,
+ "mba_delay_time", DEVLINK_PARAM_TYPE_U8,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_MBA_SETUP_HOT_KEY,
+ "mba_setup_hot_key", DEVLINK_PARAM_TYPE_U8,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
+ DEVLINK_PARAM_DRIVER(QED_DEVLINK_MBA_HIDE_SETUP_PROMPT,
+ "mba_hide_setup_prompt", DEVLINK_PARAM_TYPE_BOOL,
+ BIT(DEVLINK_PARAM_CMODE_PERMANENT),
+ qed_dl_get_perm_cfg, qed_dl_set_perm_cfg, NULL),
};
static const struct devlink_ops qed_dl_ops;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_devlink.h b/drivers/net/ethernet/qlogic/qed/qed_devlink.h
index 86e1caa..ca52a3f 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_devlink.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_devlink.h
@@ -3,6 +3,12 @@
#define _QED_DEVLINK_H
#include "qed.h"
+#define QED_DL_PARAM_GET_FLAGS 0xA
+#define QED_DL_PARAM_SET_FLAGS 0xE
+#define QED_DL_PARAM_PF_GET_FLAGS 0x1A
+#define QED_DL_PARAM_PF_SET_FLAGS 0x1E
+#define QED_DL_PARAM_BUF_LEN 32
+
struct qed_devlink {
struct qed_dev *cdev;
};
@@ -10,6 +16,23 @@ struct qed_devlink {
enum qed_devlink_param_id {
QED_DEVLINK_PARAM_ID_BASE = DEVLINK_PARAM_GENERIC_ID_MAX,
QED_DEVLINK_PARAM_ID_IWARP_CMT,
+ QED_DEVLINK_ENTITY_ID,
+ QED_DEVLINK_DEVICE_CAPABILITIES,
+ QED_DEVLINK_MF_MODE,
+ QED_DEVLINK_DCBX_MODE,
+ QED_DEVLINK_PREBOOT_OPROM,
+ QED_DEVLINK_PREBOOT_BOOT_PROTOCOL,
+ QED_DEVLINK_PREBOOT_VLAN,
+ QED_DEVLINK_PREBOOT_VLAN_VALUE,
+ QED_DEVLINK_MBA_DELAY_TIME,
+ QED_DEVLINK_MBA_SETUP_HOT_KEY,
+ QED_DEVLINK_MBA_HIDE_SETUP_PROMPT,
+};
+
+struct qed_devlink_cfg_param {
+ u16 id;
+ u16 cmd;
+ enum devlink_param_type type;
};
int qed_devlink_register(struct qed_dev *cdev);
diff --git a/drivers/net/ethernet/qlogic/qed/qed_hsi.h b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
index 5091f5b1..49b6a6e 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_hsi.h
+++ b/drivers/net/ethernet/qlogic/qed/qed_hsi.h
@@ -13338,6 +13338,17 @@ enum spad_sections {
#define NVM_CFG_ID_MAC_ADDRESS 1
#define NVM_CFG_ID_MF_MODE 9
+#define NVM_CFG_ID_DCBX_MODE 26
+#define NVM_CFG_ID_PREBOOT_OPROM 59
+#define NVM_CFG_ID_MBA_DELAY_TIME 61
+#define NVM_CFG_ID_MBA_SETUP_HOT_KEY 62
+#define NVM_CFG_ID_MBA_HIDE_SETUP_PROMPT 63
+#define NVM_CFG_ID_PREBOOT_BOOT_PROTOCOL 69
+#define NVM_CFG_ID_ENABLE_SRIOV 70
+#define NVM_CFG_ID_DEVICE_CAPABILITIES 117
+#define NVM_CFG_ID_PREBOOT_VLAN 133
+#define NVM_CFG_ID_PREBOOT_VLAN_VALUE 132
+
#define MCP_TRACE_SIZE 2048 /* 2kb */
--
1.8.3.1
next prev parent reply other threads:[~2019-06-17 11:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 11:45 [PATCH net-next 0/4] qed: Devlink support for config attributes management Sudarsana Reddy Kalluru
2019-06-17 11:45 ` [PATCH net-next 1/4] qed: Add APIs for device attributes configuration Sudarsana Reddy Kalluru
2019-06-17 11:45 ` [PATCH net-next 2/4] qed: Perform devlink registration after the hardware init Sudarsana Reddy Kalluru
2019-06-17 11:45 ` [PATCH net-next 3/4] qed: Add new file for devlink implementation Sudarsana Reddy Kalluru
2019-06-17 11:45 ` Sudarsana Reddy Kalluru [this message]
2019-06-17 22:54 ` [PATCH net-next 4/4] qed: Add devlink support for configuration attributes Jakub Kicinski
2019-06-20 12:09 ` [EXT] " Sudarsana Reddy Kalluru
2019-06-20 13:37 ` Jiri Pirko
2019-06-26 6:46 ` Sudarsana Reddy Kalluru
2019-07-03 12:56 ` Sudarsana Reddy Kalluru
2019-07-03 17:42 ` Jakub Kicinski
2019-07-04 5:49 ` Sudarsana Reddy Kalluru
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190617114528.17086-5-skalluru@marvell.com \
--to=skalluru@marvell.com \
--cc=aelior@marvell.com \
--cc=davem@davemloft.net \
--cc=mkalderon@marvell.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.