| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230217225558.19837-13-shannon.nelson@amd.com>
Date: Fri, 17 Feb 2023 14:55:56 -0800
From: Shannon Nelson <shannon.nelson@....com>
To: <netdev@...r.kernel.org>, <davem@...emloft.net>, <kuba@...nel.org>
CC: <drivers@...sando.io>, <brett.creeley@....com>,
Shannon Nelson <shannon.nelson@....com>
Subject: [PATCH v3 net-next 12/14] pds_core: add the aux client API
Add the client API operations for registering, unregistering,
and running adminq commands. We expect to add additional
operations for other clients, including requesting additional
private adminqs and IRQs, but don't have the need yet,
Signed-off-by: Shannon Nelson <shannon.nelson@....com>
---
drivers/net/ethernet/amd/pds_core/auxbus.c | 144 ++++++++++++++++++++-
include/linux/pds/pds_auxbus.h | 50 +++++++
2 files changed, 192 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/amd/pds_core/auxbus.c b/drivers/net/ethernet/amd/pds_core/auxbus.c
index dc36fc98de52..6d5e7e1d176c 100644
--- a/drivers/net/ethernet/amd/pds_core/auxbus.c
+++ b/drivers/net/ethernet/amd/pds_core/auxbus.c
@@ -11,6 +11,144 @@
#include <linux/pds/pds_adminq.h>
#include <linux/pds/pds_auxbus.h>
+/**
+ * pds_client_register - Register the client with the device
+ * @padev: ptr to the client device info
+ * @padrv: ptr to the client driver info
+ *
+ * Register the client with the core and with the DSC. The core
+ * will fill in the client padev->client_id for use in calls
+ * to the DSC AdminQ
+ */
+static int pds_client_register(struct pds_auxiliary_dev *padev,
+ struct pds_auxiliary_drv *padrv)
+{
+ union pds_core_adminq_comp comp = { 0 };
+ union pds_core_adminq_cmd cmd = { 0 };
+ struct device *dev;
+ struct pdsc *pdsc;
+ int err;
+ u16 ci;
+
+ pdsc = (struct pdsc *)dev_get_drvdata(padev->aux_dev.dev.parent);
+ dev = pdsc->dev;
+
+ if (pdsc->state)
+ return -ENXIO;
+
+ cmd.client_reg.opcode = PDS_AQ_CMD_CLIENT_REG;
+ strscpy(cmd.client_reg.devname, dev_name(&padev->aux_dev.dev),
+ sizeof(cmd.client_reg.devname));
+
+ err = pdsc_adminq_post(pdsc, &pdsc->adminqcq, &cmd, &comp, false);
+ if (err) {
+ dev_info(dev, "register dev_name %s with DSC failed, status %d: %pe\n",
+ dev_name(&padev->aux_dev.dev), comp.status, ERR_PTR(err));
+ return err;
+ }
+
+ ci = le16_to_cpu(comp.client_reg.client_id);
+ if (!ci) {
+ dev_err(dev, "%s: device returned null client_id\n", __func__);
+ return -EIO;
+ }
+
+ padev->client_id = ci;
+ padev->event_handler = padrv->event_handler;
+
+ return 0;
+}
+
+/**
+ * pds_client_unregister - Disconnect the client from the device
+ * @padev: ptr to the client device info
+ *
+ * Disconnect the client from the core and with the DSC.
+ */
+static int pds_client_unregister(struct pds_auxiliary_dev *padev)
+{
+ union pds_core_adminq_comp comp = { 0 };
+ union pds_core_adminq_cmd cmd = { 0 };
+ struct device *dev;
+ struct pdsc *pdsc;
+ int err;
+
+ pdsc = (struct pdsc *)dev_get_drvdata(padev->aux_dev.dev.parent);
+ dev = pdsc->dev;
+
+ if (pdsc->state)
+ return -ENXIO;
+
+ cmd.client_unreg.opcode = PDS_AQ_CMD_CLIENT_UNREG;
+ cmd.client_unreg.client_id = cpu_to_le16(padev->client_id);
+
+ err = pdsc_adminq_post(pdsc, &pdsc->adminqcq, &cmd, &comp, false);
+ if (err)
+ dev_info(dev, "unregister dev_name %s failed, status %d: %pe\n",
+ dev_name(&padev->aux_dev.dev), comp.status, ERR_PTR(err));
+
+ padev->client_id = 0;
+
+ return err;
+}
+
+/**
+ * pds_client_adminq_cmd - Process an adminq request for the client
+ * @padev: ptr to the client device
+ * @req: ptr to buffer with request
+ * @req_len: length of actual struct used for request
+ * @resp: ptr to buffer where answer is to be copied
+ * @flags: optional flags from pds_core_adminq_flags
+ *
+ * Return: 0 on success, or
+ * negative for error
+ *
+ * Client sends pointers to request and response buffers
+ * Core copies request data into pds_core_client_request_cmd
+ * Core sets other fields as needed
+ * Core posts to AdminQ
+ * Core copies completion data into response buffer
+ */
+static int pds_client_adminq_cmd(struct pds_auxiliary_dev *padev,
+ union pds_core_adminq_cmd *req,
+ size_t req_len,
+ union pds_core_adminq_comp *resp,
+ u64 flags)
+{
+ union pds_core_adminq_cmd cmd = { 0 };
+ struct device *dev;
+ struct pdsc *pdsc;
+ size_t cp_len;
+ int err;
+
+ pdsc = (struct pdsc *)dev_get_drvdata(padev->aux_dev.dev.parent);
+ dev = pdsc->dev;
+
+ dev_dbg(dev, "%s: %s opcode %d\n",
+ __func__, dev_name(&padev->aux_dev.dev), req->opcode);
+
+ if (pdsc->state)
+ return -ENXIO;
+
+ /* Wrap the client's request */
+ cmd.client_request.opcode = PDS_AQ_CMD_CLIENT_CMD;
+ cmd.client_request.client_id = cpu_to_le16(padev->client_id);
+ cp_len = min_t(size_t, req_len, sizeof(cmd.client_request.client_cmd));
+ memcpy(cmd.client_request.client_cmd, req, cp_len);
+
+ err = pdsc_adminq_post(pdsc, &pdsc->adminqcq, &cmd, resp, !!(flags & PDS_AQ_FLAG_FASTPOLL));
+ if (err && err != -EAGAIN)
+ dev_info(dev, "client admin cmd failed: %pe\n", ERR_PTR(err));
+
+ return err;
+}
+
+static struct pds_core_ops pds_core_ops = {
+ .register_client = pds_client_register,
+ .unregister_client = pds_client_unregister,
+ .adminq_cmd = pds_client_adminq_cmd,
+};
+
static void pdsc_auxbus_dev_release(struct device *dev)
{
struct pds_auxiliary_dev *padev =
@@ -21,7 +159,8 @@ static void pdsc_auxbus_dev_release(struct device *dev)
static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *pdsc,
char *name, u32 id,
- struct pci_dev *client_dev)
+ struct pci_dev *client_dev,
+ struct pds_core_ops *ops)
{
struct auxiliary_device *aux_dev;
struct pds_auxiliary_dev *padev;
@@ -31,6 +170,7 @@ static struct pds_auxiliary_dev *pdsc_auxbus_dev_register(struct pdsc *pdsc,
if (!padev)
return NULL;
+ padev->ops = ops;
padev->pcidev = client_dev;
aux_dev = &padev->aux_dev;
@@ -96,7 +236,7 @@ int pdsc_auxbus_dev_add_vf(struct pdsc *pdsc, int vf_id)
id = PCI_DEVID(pdsc->pdev->bus->number,
pci_iov_virtfn_devfn(pdsc->pdev, vf_id));
padev = pdsc_auxbus_dev_register(pdsc, pdsc->viftype_status[vt].name, id,
- pdsc->pdev);
+ pdsc->pdev, &pds_core_ops);
pdsc->vfs[vf_id].padev = padev;
/* We only support a single type per VF, so jump out here */
diff --git a/include/linux/pds/pds_auxbus.h b/include/linux/pds/pds_auxbus.h
index 737fd4dbbf5a..9d71ef523c35 100644
--- a/include/linux/pds/pds_auxbus.h
+++ b/include/linux/pds/pds_auxbus.h
@@ -25,6 +25,7 @@ struct pds_auxiliary_drv {
struct pds_auxiliary_dev {
struct auxiliary_device aux_dev;
+ struct pds_core_ops *ops;
struct pci_dev *pcidev;
u32 id;
u16 client_id;
@@ -32,4 +33,53 @@ struct pds_auxiliary_dev {
union pds_core_notifyq_comp *event);
void *priv;
};
+
+struct pds_fw_state {
+ unsigned long last_fw_time;
+ u32 fw_heartbeat;
+ u8 fw_status;
+};
+
+/*
+ * ptrs to functions to be used by the client for core services
+ */
+struct pds_core_ops {
+ /* .register() - register the client with the device
+ * padev: ptr to the client device info
+ * padrv: ptr to the client driver info
+ * Register the client with the core and with the DSC. The core
+ * will fill in the client padrv->client_id for use in calls
+ * to the DSC AdminQ
+ */
+ int (*register_client)(struct pds_auxiliary_dev *padev,
+ struct pds_auxiliary_drv *padrv);
+
+ /* .unregister() - disconnect the client from the device
+ * padev: ptr to the client device info
+ * Disconnect the client from the core and with the DSC.
+ */
+ int (*unregister_client)(struct pds_auxiliary_dev *padev);
+
+ /* .adminq_cmd() - process an adminq request for the client
+ * padev: ptr to the client device
+ * req: ptr to buffer with request
+ * req_len: length of actual struct used for request
+ * resp: ptr to buffer where answer is to be copied
+ * flags: optional flags defined by enum pds_core_adminq_flags
+ * and used for more flexible adminq behvior
+ *
+ * returns 0 on success, or
+ * negative for error
+ * Client sends pointers to request and response buffers
+ * Core copies request data into pds_core_client_request_cmd
+ * Core sets other fields as needed
+ * Core posts to AdminQ
+ * Core copies completion data into response buffer
+ */
+ int (*adminq_cmd)(struct pds_auxiliary_dev *padev,
+ union pds_core_adminq_cmd *req,
+ size_t req_len,
+ union pds_core_adminq_comp *resp,
+ u64 flags);
+};
#endif /* _PDSC_AUXBUS_H_ */
--
2.17.1
Powered by blists - more mailing lists