Wed, Jul 29, 2020 at 01:38:40PM CEST, irussk...@marvell.com wrote:
>Here we return existing fw & mfw versions, we also fetch device's
>serial number.
>
>The base device specific structure (qed_dev_info) was not directly
>available to the base driver before.
>Thus, here we create and store a private copy of this structure
>in qed_dev root object.
>
>Signed-off-by: Igor Russkikh <irussk...@marvell.com>
>Signed-off-by: Alexander Lobakin <aloba...@marvell.com>
>Signed-off-by: Michal Kalderon <michal.kalde...@marvell.com>
>---
> drivers/net/ethernet/qlogic/qed/qed.h | 1 +
> drivers/net/ethernet/qlogic/qed/qed_dev.c | 10 ++++
> drivers/net/ethernet/qlogic/qed/qed_devlink.c | 52 ++++++++++++++++++-
> drivers/net/ethernet/qlogic/qed/qed_main.c | 1 +
> 4 files changed, 63 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/net/ethernet/qlogic/qed/qed.h
>b/drivers/net/ethernet/qlogic/qed/qed.h
>index b6ce1488abcc..ccd789eeda3e 100644
>--- a/drivers/net/ethernet/qlogic/qed/qed.h
>+++ b/drivers/net/ethernet/qlogic/qed/qed.h
>@@ -807,6 +807,7 @@ struct qed_dev {
> struct qed_llh_info *p_llh_info;
>
> /* Linux specific here */
>+ struct qed_dev_info common_dev_info;
> struct qede_dev *edev;
> struct pci_dev *pdev;
> u32 flags;
>diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c
>b/drivers/net/ethernet/qlogic/qed/qed_dev.c
>index b3c9ebaf2280..377950ce8ea2 100644
>--- a/drivers/net/ethernet/qlogic/qed/qed_dev.c
>+++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
>@@ -4290,6 +4290,16 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn,
>struct qed_ptt *p_ptt)
> __set_bit(QED_DEV_CAP_ROCE,
> &p_hwfn->hw_info.device_capabilities);
>
>+ /* Read device serial number information from shmem */
>+ addr = MCP_REG_SCRATCH + nvm_cfg1_offset +
>+ offsetof(struct nvm_cfg1, glob) +
>+ offsetof(struct nvm_cfg1_glob, serial_number);
>+
>+ p_hwfn->hw_info.part_num[0] = qed_rd(p_hwfn, p_ptt, addr);
>+ p_hwfn->hw_info.part_num[1] = qed_rd(p_hwfn, p_ptt, addr + 4);
>+ p_hwfn->hw_info.part_num[2] = qed_rd(p_hwfn, p_ptt, addr + 8);
>+ p_hwfn->hw_info.part_num[3] = qed_rd(p_hwfn, p_ptt, addr + 12);
for() ?
>+
> return qed_mcp_fill_shmem_func_info(p_hwfn, p_ptt);
> }
>
>diff --git a/drivers/net/ethernet/qlogic/qed/qed_devlink.c
>b/drivers/net/ethernet/qlogic/qed/qed_devlink.c
>index 4e3316c6beb6..5bd5528dc409 100644
>--- a/drivers/net/ethernet/qlogic/qed/qed_devlink.c
>+++ b/drivers/net/ethernet/qlogic/qed/qed_devlink.c
>@@ -45,7 +45,57 @@ static const struct devlink_param qed_devlink_params[] = {
> qed_dl_param_get, qed_dl_param_set, NULL),
> };
>
>-static const struct devlink_ops qed_dl_ops;
>+static int qed_devlink_info_get(struct devlink *devlink,
>+ struct devlink_info_req *req,
>+ struct netlink_ext_ack *extack)
>+{
>+ struct qed_devlink *qed_dl = devlink_priv(devlink);
>+ struct qed_dev *cdev = qed_dl->cdev;
>+ struct qed_dev_info *dev_info;
>+ char buf[100];
>+ int err;
>+
>+ dev_info = &cdev->common_dev_info;
>+
>+ err = devlink_info_driver_name_put(req, KBUILD_MODNAME);
>+ if (err)
>+ return err;
>+
>+ memcpy(buf, cdev->hwfns[0].hw_info.part_num,
>sizeof(cdev->hwfns[0].hw_info.part_num));
>+ buf[sizeof(cdev->hwfns[0].hw_info.part_num)] = 0;
>+
>+ if (buf[0]) {
>+ err = devlink_info_serial_number_put(req, buf);
>+ if (err)
>+ return err;
>+ }
>+
>+ snprintf(buf, sizeof(buf), "%d.%d.%d.%d",
>+ GET_MFW_FIELD(dev_info->mfw_rev, QED_MFW_VERSION_3),
>+ GET_MFW_FIELD(dev_info->mfw_rev, QED_MFW_VERSION_2),
>+ GET_MFW_FIELD(dev_info->mfw_rev, QED_MFW_VERSION_1),
>+ GET_MFW_FIELD(dev_info->mfw_rev, QED_MFW_VERSION_0));
>+
>+ err = devlink_info_version_stored_put(req,
>+
>DEVLINK_INFO_VERSION_GENERIC_FW_MGMT, buf);
>+ if (err)
>+ return err;
>+
>+ snprintf(buf, sizeof(buf), "%d.%d.%d.%d",
>+ dev_info->fw_major,
>+ dev_info->fw_minor,
>+ dev_info->fw_rev,
>+ dev_info->fw_eng);
>+
>+ err = devlink_info_version_running_put(req,
>+ DEVLINK_INFO_VERSION_GENERIC_FW,
>buf);
return = devlink...
>+
>+ return err;
>+}
>+
>+static const struct devlink_ops qed_dl_ops = {
>+ .info_get = qed_devlink_info_get,
>+};
>
> struct devlink *qed_devlink_register(struct qed_dev *cdev)
> {
>diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c
>b/drivers/net/ethernet/qlogic/qed/qed_main.c
>index d6f76421379b..d1a559ccf516 100644
>--- a/drivers/net/ethernet/qlogic/qed/qed_main.c
>+++ b/drivers/net/ethernet/qlogic/qed/qed_main.c
>@@ -479,6 +479,7 @@ int qed_fill_dev_info(struct qed_dev *cdev,
> }
>
> dev_info->mtu = hw_info->mtu;
>+ cdev->common_dev_info = *dev_info;
>
> return 0;
> }
>--
>2.17.1
>
