@@ -5,6 +5,7 @@ obj-$(CONFIG_PDS_CORE) := pds_core.o
pds_core-y := main.o \
devlink.o \
+ auxbus.o \
dev.o \
adminq.o \
core.o \
new file mode 100644
@@ -0,0 +1,142 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright(c) 2023 Advanced Micro Devices, Inc */
+
+#include <linux/pci.h>
+
+#include "core.h"
+#include <linux/pds/pds_auxbus.h>
+
+static void pdsc_auxbus_dev_release(struct device *dev)
+{
+ struct pds_auxiliary_dev *padev =
+ container_of(dev, struct pds_auxiliary_dev, aux_dev.dev);
+
+ kfree(padev);
+}
+
+static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *vf,
+ struct pdsc *pf,
+ char *name)
+{
+ struct auxiliary_device *aux_dev;
+ struct pds_auxiliary_dev *padev;
+ int err;
+
+ padev = kzalloc(sizeof(*padev), GFP_KERNEL);
+ if (!padev)
+ return ERR_PTR(-ENOMEM);
+
+ padev->vf_pdev = vf->pdev;
+ padev->pf_pdev = pf->pdev;
+
+ aux_dev = &padev->aux_dev;
+ aux_dev->name = name;
+ aux_dev->id = vf->id;
+ aux_dev->dev.parent = vf->dev;
+ aux_dev->dev.release = pdsc_auxbus_dev_release;
+
+ err = auxiliary_device_init(aux_dev);
+ if (err < 0) {
+ dev_warn(vf->dev, "auxiliary_device_init of %s id %d failed: %pe\n",
+ name, vf->id, ERR_PTR(err));
+ goto err_out;
+ }
+
+ err = auxiliary_device_add(aux_dev);
+ if (err) {
+ dev_warn(vf->dev, "auxiliary_device_add of %s id %d failed: %pe\n",
+ name, vf->id, ERR_PTR(err));
+ auxiliary_device_uninit(aux_dev);
+ goto err_out;
+ }
+
+ return padev;
+
+err_out:
+ kfree(padev);
+ return ERR_PTR(err);
+}
+
+int pdsc_auxbus_dev_del_vf(struct pdsc *vf, struct pdsc *pf)
+{
+ struct pds_auxiliary_dev *padev;
+ int err = 0;
+
+ mutex_lock(&pf->config_lock);
+ if (pf->state) {
+ dev_warn(vf->dev, "%s: PF in a transition state (%lu)\n",
+ __func__, pf->state);
+ err = -EBUSY;
+ } else if (vf->vf_id >= pf->num_vfs) {
+ dev_warn(vf->dev, "%s: vfid %d out of range\n",
+ __func__, vf->vf_id);
+ err = -ERANGE;
+ }
+ if (err)
+ goto out_unlock;
+
+ padev = pf->vfs[vf->vf_id].padev;
+ if (padev) {
+ auxiliary_device_delete(&padev->aux_dev);
+ auxiliary_device_uninit(&padev->aux_dev);
+ }
+ pf->vfs[vf->vf_id].padev = NULL;
+
+out_unlock:
+ mutex_unlock(&pf->config_lock);
+ return err;
+}
+
+int pdsc_auxbus_dev_add_vf(struct pdsc *vf, struct pdsc *pf)
+{
+ struct pds_auxiliary_dev *padev;
+ enum pds_core_vif_types vt;
+ int err = 0;
+
+ mutex_lock(&pf->config_lock);
+ if (pf->state) {
+ dev_warn(vf->dev, "%s: PF in a transition state (%lu)\n",
+ __func__, pf->state);
+ err = -EBUSY;
+ } else if (!pf->vfs) {
+ dev_warn(vf->dev, "%s: PF vfs array not ready\n",
+ __func__);
+ err = -ENOTTY;
+ } else if (vf->vf_id >= pf->num_vfs) {
+ dev_warn(vf->dev, "%s: vfid %d out of range\n",
+ __func__, vf->vf_id);
+ err = -ERANGE;
+ } else if (pf->vfs[vf->vf_id].padev) {
+ dev_warn(vf->dev, "%s: vfid %d already running\n",
+ __func__, vf->vf_id);
+ err = -ENODEV;
+ }
+ if (err)
+ goto out_unlock;
+
+ for (vt = 0; vt < PDS_DEV_TYPE_MAX; vt++) {
+ u16 vt_support;
+
+ /* Verify that the type is supported and enabled */
+ vt_support = !!le16_to_cpu(pf->dev_ident.vif_types[vt]);
+ if (!(vt_support &&
+ pf->viftype_status[vt].supported &&
+ pf->viftype_status[vt].enabled))
+ continue;
+
+ padev = pdsc_auxbus_dev_register(vf, pf,
+ pf->viftype_status[vt].name);
+ if (IS_ERR(padev)) {
+ err = PTR_ERR(padev);
+ goto out_unlock;
+ }
+ pf->vfs[vf->vf_id].padev = padev;
+
+ /* We only support a single type per VF, so jump out here */
+ break;
+ }
+
+out_unlock:
+ mutex_unlock(&pf->config_lock);
+ return err;
+}
@@ -30,8 +30,11 @@ struct pdsc_dev_bar {
int res_index;
};
+struct pdsc;
+
struct pdsc_vf {
struct pds_auxiliary_dev *padev;
+ struct pdsc *vf;
u16 index;
__le16 vif_types[PDS_DEV_TYPE_MAX];
};
@@ -301,6 +304,9 @@ int pdsc_start(struct pdsc *pdsc);
void pdsc_stop(struct pdsc *pdsc);
void pdsc_health_thread(struct work_struct *work);
+int pdsc_auxbus_dev_add_vf(struct pdsc *vf, struct pdsc *pf);
+int pdsc_auxbus_dev_del_vf(struct pdsc *vf, struct pdsc *pf);
+
void pdsc_process_adminq(struct pdsc_qcq *qcq);
void pdsc_work_thread(struct work_struct *work);
irqreturn_t pdsc_adminq_isr(int irq, void *data);
@@ -201,6 +201,12 @@ static int pdsc_sriov_configure(struct pci_dev *pdev, int num_vfs)
static int pdsc_init_vf(struct pdsc *vf)
{
struct devlink *dl;
+ struct pdsc *pf;
+ int err;
+
+ pf = pdsc_get_pf_struct(vf->pdev);
+ if (IS_ERR_OR_NULL(pf))
+ return PTR_ERR(pf) ?: -1;
vf->vf_id = pci_iov_vf_id(vf->pdev);
@@ -209,7 +215,15 @@ static int pdsc_init_vf(struct pdsc *vf)
devl_register(dl);
devl_unlock(dl);
- return 0;
+ pf->vfs[vf->vf_id].vf = vf;
+ err = pdsc_auxbus_dev_add_vf(vf, pf);
+ if (err) {
+ devl_lock(dl);
+ devl_unregister(dl);
+ devl_unlock(dl);
+ }
+
+ return err;
}
static const struct devlink_health_reporter_ops pdsc_fw_reporter_ops = {
@@ -400,7 +414,19 @@ static void pdsc_remove(struct pci_dev *pdev)
}
devl_unlock(dl);
- if (!pdev->is_virtfn) {
+ if (pdev->is_virtfn) {
+ struct pdsc *pf;
+
+ pf = pdsc_get_pf_struct(pdsc->pdev);
+ if (!IS_ERR(pf)) {
+ pdsc_auxbus_dev_del_vf(pdsc, pf);
+ pf->vfs[pdsc->vf_id].vf = NULL;
+ }
+ } else {
+ /* Remove the VFs and their aux_bus connections before other
+ * cleanup so that the clients can use the AdminQ to cleanly
+ * shut themselves down.
+ */
pdsc_sriov_configure(pdev, 0);
del_timer_sync(&pdsc->wdtimer);
@@ -440,6 +466,12 @@ static struct pci_driver pdsc_driver = {
.sriov_configure = pdsc_sriov_configure,
};
+void *pdsc_get_pf_struct(struct pci_dev *vf_pdev)
+{
+ return pci_iov_get_pf_drvdata(vf_pdev, &pdsc_driver);
+}
+EXPORT_SYMBOL_GPL(pdsc_get_pf_struct);
+
static int __init pdsc_init_module(void)
{
pdsc_debugfs_create();
new file mode 100644
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright(c) 2023 Advanced Micro Devices, Inc */
+
+#ifndef _PDSC_AUXBUS_H_
+#define _PDSC_AUXBUS_H_
+
+#include <linux/auxiliary_bus.h>
+
+struct pds_auxiliary_dev {
+ struct auxiliary_device aux_dev;
+ struct pci_dev *vf_pdev;
+ struct pci_dev *pf_pdev;
+ u16 client_id;
+ void *priv;
+};
+#endif /* _PDSC_AUXBUS_H_ */
@@ -91,4 +91,5 @@ enum pds_core_logical_qtype {
PDS_CORE_QTYPE_MAX = 16 /* don't change - used in struct size */
};
+void *pdsc_get_pf_struct(struct pci_dev *vf_pdev);
#endif /* _PDS_COMMON_H_ */
An auxiliary_bus device is created for each vDPA type VF at VF probe and destroyed at VF remove. The VFs are always removed on PF remove, so there should be no issues with VFs trying to access missing PF structures. Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> --- drivers/net/ethernet/amd/pds_core/Makefile | 1 + drivers/net/ethernet/amd/pds_core/auxbus.c | 142 +++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/core.h | 6 + drivers/net/ethernet/amd/pds_core/main.c | 36 +++++- include/linux/pds/pds_auxbus.h | 16 +++ include/linux/pds/pds_common.h | 1 + 6 files changed, 200 insertions(+), 2 deletions(-) create mode 100644 drivers/net/ethernet/amd/pds_core/auxbus.c create mode 100644 include/linux/pds/pds_auxbus.h