On Thu, May 4, 2023 at 2:13 AM Shannon Nelson <shannon.nelson@xxxxxxx> wrote:
>
> These are the adminq commands that will be needed for
> setting up and using the vDPA device. There are a number
> of commands defined in the FW's API, but by making use of
> the FW's virtio BAR we only need a few of these commands
> for vDPA support.
>
> Signed-off-by: Shannon Nelson <shannon.nelson@xxxxxxx>
Acked-by: Jason Wang <jasowang@xxxxxxxxxx>
Thanks
> ---
> drivers/vdpa/pds/Makefile | 1 +
> drivers/vdpa/pds/cmds.c | 207 ++++++++++++++++++++++++++++++++++++
> drivers/vdpa/pds/cmds.h | 20 ++++
> drivers/vdpa/pds/vdpa_dev.h | 33 +++++-
> 4 files changed, 260 insertions(+), 1 deletion(-)
> create mode 100644 drivers/vdpa/pds/cmds.c
> create mode 100644 drivers/vdpa/pds/cmds.h
>
> diff --git a/drivers/vdpa/pds/Makefile b/drivers/vdpa/pds/Makefile
> index 13b50394ec64..2e22418e3ab3 100644
> --- a/drivers/vdpa/pds/Makefile
> +++ b/drivers/vdpa/pds/Makefile
> @@ -4,6 +4,7 @@
> obj-$(CONFIG_PDS_VDPA) := pds_vdpa.o
>
> pds_vdpa-y := aux_drv.o \
> + cmds.o \
> vdpa_dev.o
>
> pds_vdpa-$(CONFIG_DEBUG_FS) += debugfs.o
> diff --git a/drivers/vdpa/pds/cmds.c b/drivers/vdpa/pds/cmds.c
> new file mode 100644
> index 000000000000..405711a0a0f8
> --- /dev/null
> +++ b/drivers/vdpa/pds/cmds.c
> @@ -0,0 +1,207 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/* Copyright(c) 2023 Advanced Micro Devices, Inc */
> +
> +#include <linux/vdpa.h>
> +#include <linux/virtio_pci_modern.h>
> +
> +#include <linux/pds/pds_common.h>
> +#include <linux/pds/pds_core_if.h>
> +#include <linux/pds/pds_adminq.h>
> +#include <linux/pds/pds_auxbus.h>
> +
> +#include "vdpa_dev.h"
> +#include "aux_drv.h"
> +#include "cmds.h"
> +
> +int pds_vdpa_init_hw(struct pds_vdpa_device *pdsv)
> +{
> + struct pds_auxiliary_dev *padev = pdsv->vdpa_aux->padev;
> + struct device *dev = &padev->aux_dev.dev;
> + union pds_core_adminq_cmd cmd = {
> + .vdpa_init.opcode = PDS_VDPA_CMD_INIT,
> + .vdpa_init.vdpa_index = pdsv->vdpa_index,
> + .vdpa_init.vf_id = cpu_to_le16(pdsv->vdpa_aux->vf_id),
> + };
> + union pds_core_adminq_comp comp = {};
> + int err;
> +
> + /* Initialize the vdpa/virtio device */
> + err = pds_client_adminq_cmd(padev, &cmd, sizeof(cmd.vdpa_init),
> + &comp, 0);
> + if (err)
> + dev_dbg(dev, "Failed to init hw, status %d: %pe\n",
> + comp.status, ERR_PTR(err));
> +
> + return err;
> +}
> +
> +int pds_vdpa_cmd_reset(struct pds_vdpa_device *pdsv)
> +{
> + struct pds_auxiliary_dev *padev = pdsv->vdpa_aux->padev;
> + struct device *dev = &padev->aux_dev.dev;
> + union pds_core_adminq_cmd cmd = {
> + .vdpa.opcode = PDS_VDPA_CMD_RESET,
> + .vdpa.vdpa_index = pdsv->vdpa_index,
> + .vdpa.vf_id = cpu_to_le16(pdsv->vdpa_aux->vf_id),
> + };
> + union pds_core_adminq_comp comp = {};
> + int err;
> +
> + err = pds_client_adminq_cmd(padev, &cmd, sizeof(cmd.vdpa), &comp, 0);
> + if (err)
> + dev_dbg(dev, "Failed to reset hw, status %d: %pe\n",
> + comp.status, ERR_PTR(err));
> +
> + return err;
> +}
> +
> +int pds_vdpa_cmd_set_mac(struct pds_vdpa_device *pdsv, u8 *mac)
> +{
> + struct pds_auxiliary_dev *padev = pdsv->vdpa_aux->padev;
> + struct device *dev = &padev->aux_dev.dev;
> + union pds_core_adminq_cmd cmd = {
> + .vdpa_setattr.opcode = PDS_VDPA_CMD_SET_ATTR,
> + .vdpa_setattr.vdpa_index = pdsv->vdpa_index,
> + .vdpa_setattr.vf_id = cpu_to_le16(pdsv->vdpa_aux->vf_id),
> + .vdpa_setattr.attr = PDS_VDPA_ATTR_MAC,
> + };
> + union pds_core_adminq_comp comp = {};
> + int err;
> +
> + ether_addr_copy(cmd.vdpa_setattr.mac, mac);
> + err = pds_client_adminq_cmd(padev, &cmd, sizeof(cmd.vdpa_setattr),
> + &comp, 0);
> + if (err)
> + dev_dbg(dev, "Failed to set mac address %pM, status %d: %pe\n",
> + mac, comp.status, ERR_PTR(err));
> +
> + return err;
> +}
> +
> +int pds_vdpa_cmd_set_max_vq_pairs(struct pds_vdpa_device *pdsv, u16 max_vqp)
> +{
> + struct pds_auxiliary_dev *padev = pdsv->vdpa_aux->padev;
> + struct device *dev = &padev->aux_dev.dev;
> + union pds_core_adminq_cmd cmd = {
> + .vdpa_setattr.opcode = PDS_VDPA_CMD_SET_ATTR,
> + .vdpa_setattr.vdpa_index = pdsv->vdpa_index,
> + .vdpa_setattr.vf_id = cpu_to_le16(pdsv->vdpa_aux->vf_id),
> + .vdpa_setattr.attr = PDS_VDPA_ATTR_MAX_VQ_PAIRS,
> + .vdpa_setattr.max_vq_pairs = cpu_to_le16(max_vqp),
> + };
> + union pds_core_adminq_comp comp = {};
> + int err;
> +
> + err = pds_client_adminq_cmd(padev, &cmd, sizeof(cmd.vdpa_setattr),
> + &comp, 0);
> + if (err)
> + dev_dbg(dev, "Failed to set max vq pairs %u, status %d: %pe\n",
> + max_vqp, comp.status, ERR_PTR(err));
> +
> + return err;
> +}
> +
> +int pds_vdpa_cmd_init_vq(struct pds_vdpa_device *pdsv, u16 qid,
> + struct pds_vdpa_vq_info *vq_info)
> +{
> + struct pds_auxiliary_dev *padev = pdsv->vdpa_aux->padev;
> + struct device *dev = &padev->aux_dev.dev;
> + union pds_core_adminq_cmd cmd = {
> + .vdpa_vq_init.opcode = PDS_VDPA_CMD_VQ_INIT,
> + .vdpa_vq_init.vdpa_index = pdsv->vdpa_index,
> + .vdpa_vq_init.vf_id = cpu_to_le16(pdsv->vdpa_aux->vf_id),
> + .vdpa_vq_init.qid = cpu_to_le16(qid),
> + .vdpa_vq_init.len = cpu_to_le16(ilog2(vq_info->q_len)),
> + .vdpa_vq_init.desc_addr = cpu_to_le64(vq_info->desc_addr),
> + .vdpa_vq_init.avail_addr = cpu_to_le64(vq_info->avail_addr),
> + .vdpa_vq_init.used_addr = cpu_to_le64(vq_info->used_addr),
> + .vdpa_vq_init.intr_index = cpu_to_le16(qid),
> + };
> + union pds_core_adminq_comp comp = {};
> + int err;
> +
> + dev_dbg(dev, "%s: qid %d len %d desc_addr %#llx avail_addr %#llx used_addr %#llx\n",
> + __func__, qid, ilog2(vq_info->q_len),
> + vq_info->desc_addr, vq_info->avail_addr, vq_info->used_addr);
> +
> + err = pds_client_adminq_cmd(padev, &cmd, sizeof(cmd.vdpa_vq_init),
> + &comp, 0);
> + if (err)
> + dev_dbg(dev, "Failed to init vq %d, status %d: %pe\n",
> + qid, comp.status, ERR_PTR(err));
> +
> + return err;
> +}
> +
> +int pds_vdpa_cmd_reset_vq(struct pds_vdpa_device *pdsv, u16 qid)
> +{
> + struct pds_auxiliary_dev *padev = pdsv->vdpa_aux->padev;
> + struct device *dev = &padev->aux_dev.dev;
> + union pds_core_adminq_cmd cmd = {
> + .vdpa_vq_reset.opcode = PDS_VDPA_CMD_VQ_RESET,
> + .vdpa_vq_reset.vdpa_index = pdsv->vdpa_index,
> + .vdpa_vq_reset.vf_id = cpu_to_le16(pdsv->vdpa_aux->vf_id),
> + .vdpa_vq_reset.qid = cpu_to_le16(qid),
> + };
> + union pds_core_adminq_comp comp = {};
> + int err;
> +
> + err = pds_client_adminq_cmd(padev, &cmd, sizeof(cmd.vdpa_vq_reset),
> + &comp, 0);
> + if (err)
> + dev_dbg(dev, "Failed to reset vq %d, status %d: %pe\n",
> + qid, comp.status, ERR_PTR(err));
> +
> + return err;
> +}
> +
> +int pds_vdpa_cmd_set_vq_state(struct pds_vdpa_device *pdsv,
> + u16 qid, u16 avail, u16 used)
> +{ struct pds_auxiliary_dev *padev = pdsv->vdpa_aux->padev;
> + struct device *dev = &padev->aux_dev.dev;
> + union pds_core_adminq_cmd cmd = {
> + .vdpa_vq_set_state.opcode = PDS_VDPA_CMD_VQ_SET_STATE,
> + .vdpa_vq_set_state.vdpa_index = pdsv->vdpa_index,
> + .vdpa_vq_set_state.vf_id = cpu_to_le16(pdsv->vdpa_aux->vf_id),
> + .vdpa_vq_set_state.qid = cpu_to_le16(qid),
> + .vdpa_vq_set_state.avail = cpu_to_le16(avail),
> + .vdpa_vq_set_state.used = cpu_to_le16(used),
> + };
> + union pds_core_adminq_comp comp = {};
> + int err;
> +
> + err = pds_client_adminq_cmd(padev, &cmd, sizeof(cmd.vdpa_vq_set_state),
> + &comp, 0);
> + if (err)
> + dev_dbg(dev, "Failed to set state vq %d, status %d: %pe\n",
> + qid, comp.status, ERR_PTR(err));
> +
> + return err;
> +}
> +
> +int pds_vdpa_cmd_get_vq_state(struct pds_vdpa_device *pdsv,
> + u16 qid, u16 *avail, u16 *used)
> +{ struct pds_auxiliary_dev *padev = pdsv->vdpa_aux->padev;
> + struct device *dev = &padev->aux_dev.dev;
> + union pds_core_adminq_cmd cmd = {
> + .vdpa_vq_get_state.opcode = PDS_VDPA_CMD_VQ_SET_STATE,
> + .vdpa_vq_get_state.vdpa_index = pdsv->vdpa_index,
> + .vdpa_vq_get_state.vf_id = cpu_to_le16(pdsv->vdpa_aux->vf_id),
> + .vdpa_vq_get_state.qid = cpu_to_le16(qid),
> + };
> + union pds_core_adminq_comp comp = {};
> + int err;
> +
> + err = pds_client_adminq_cmd(padev, &cmd, sizeof(cmd.vdpa_vq_set_state),
> + &comp, 0);
> + if (err) {
> + dev_dbg(dev, "Failed to set state vq %d, status %d: %pe\n",
> + qid, comp.status, ERR_PTR(err));
> + return err;
> + }
> +
> + *avail = le16_to_cpu(comp.vdpa_vq_get_state.avail);
> + *used = le16_to_cpu(comp.vdpa_vq_get_state.used);
> +
> + return 0;
> +}
> diff --git a/drivers/vdpa/pds/cmds.h b/drivers/vdpa/pds/cmds.h
> new file mode 100644
> index 000000000000..cf4f8764e73c
> --- /dev/null
> +++ b/drivers/vdpa/pds/cmds.h
> @@ -0,0 +1,20 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +/* Copyright(c) 2023 Advanced Micro Devices, Inc */
> +
> +#ifndef _VDPA_CMDS_H_
> +#define _VDPA_CMDS_H_
> +
> +int pds_vdpa_init_hw(struct pds_vdpa_device *pdsv);
> +
> +int pds_vdpa_cmd_reset(struct pds_vdpa_device *pdsv);
> +int pds_vdpa_cmd_set_mac(struct pds_vdpa_device *pdsv, u8 *mac);
> +int pds_vdpa_cmd_set_max_vq_pairs(struct pds_vdpa_device *pdsv, u16 max_vqp);
> +int pds_vdpa_cmd_init_vq(struct pds_vdpa_device *pdsv, u16 qid,
> + struct pds_vdpa_vq_info *vq_info);
> +int pds_vdpa_cmd_reset_vq(struct pds_vdpa_device *pdsv, u16 qid);
> +int pds_vdpa_cmd_set_features(struct pds_vdpa_device *pdsv, u64 features);
> +int pds_vdpa_cmd_set_vq_state(struct pds_vdpa_device *pdsv,
> + u16 qid, u16 avail, u16 used);
> +int pds_vdpa_cmd_get_vq_state(struct pds_vdpa_device *pdsv,
> + u16 qid, u16 *avail, u16 *used);
> +#endif /* _VDPA_CMDS_H_ */
> diff --git a/drivers/vdpa/pds/vdpa_dev.h b/drivers/vdpa/pds/vdpa_dev.h
> index 97fab833a0aa..a21596f438c1 100644
> --- a/drivers/vdpa/pds/vdpa_dev.h
> +++ b/drivers/vdpa/pds/vdpa_dev.h
> @@ -4,11 +4,42 @@
> #ifndef _VDPA_DEV_H_
> #define _VDPA_DEV_H_
>
> -#define PDS_VDPA_MAX_QUEUES 65
> +#include <linux/pci.h>
> +#include <linux/vdpa.h>
> +
> +struct pds_vdpa_vq_info {
> + bool ready;
> + u64 desc_addr;
> + u64 avail_addr;
> + u64 used_addr;
> + u32 q_len;
> + u16 qid;
> + int irq;
> + char irq_name[32];
> +
> + void __iomem *notify;
> + dma_addr_t notify_pa;
> +
> + u64 doorbell;
> + u16 avail_idx;
> + u16 used_idx;
>
> + struct vdpa_callback event_cb;
> + struct pds_vdpa_device *pdsv;
> +};
> +
> +#define PDS_VDPA_MAX_QUEUES 65
> +#define PDS_VDPA_MAX_QLEN 32768
> struct pds_vdpa_device {
> struct vdpa_device vdpa_dev;
> struct pds_vdpa_aux *vdpa_aux;
> +
> + struct pds_vdpa_vq_info vqs[PDS_VDPA_MAX_QUEUES];
> + u64 req_features; /* features requested by vdpa */
> + u64 actual_features; /* features negotiated and in use */
> + u8 vdpa_index; /* rsvd for future subdevice use */
> + u8 num_vqs; /* num vqs in use */
> + struct vdpa_callback config_cb;
> };
>
> int pds_vdpa_get_mgmt_info(struct pds_vdpa_aux *vdpa_aux);
> --
> 2.17.1
>
_______________________________________________
Virtualization mailing list
Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
https://lists.linuxfoundation.org/mailman/listinfo/virtualization
