Commit 4fe09ff1 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'pds_core-updates-and-fixes' 

Shannon Nelson says:

====================
pds_core: updates and fixes

This patchset has fixes for issues seen in recent internal testing
of error conditions and stress handling.

Note that the first patch in this series is a leftover from an
earlier patchset that was abandoned:
Link: https://lore.kernel.org/netdev/20250129004337.36898-2-shannon.nelson@amd.com/
====================

Link: https://patch.msgid.link/20250421174606.3892-1-shannon.nelson@amd.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 497041d7 3f77c3df

drivers/net/ethernet/amd/pds_core/adminq.c

+14 −22
Original line number Diff line number Diff line
@@ -5,11 +5,6 @@ 


#include "core.h"



struct pdsc_wait_context {

	struct pdsc_qcq *qcq;

	struct completion wait_completion;

};



static int pdsc_process_notifyq(struct pdsc_qcq *qcq)

{

	union pds_core_notifyq_comp *comp;
@@ -109,10 +104,10 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq) 
		q_info = &q->info[q->tail_idx];

		q->tail_idx = (q->tail_idx + 1) & (q->num_descs - 1);



		/* Copy out the completion data */

		if (!completion_done(&q_info->completion)) {

			memcpy(q_info->dest, comp, sizeof(*comp));



		complete_all(&q_info->wc->wait_completion);

			complete(&q_info->completion);

		}



		if (cq->tail_idx == cq->num_descs - 1)

			cq->done_color = !cq->done_color;
@@ -162,8 +157,7 @@ irqreturn_t pdsc_adminq_isr(int irq, void *data) 
static int __pdsc_adminq_post(struct pdsc *pdsc,

			      struct pdsc_qcq *qcq,

			      union pds_core_adminq_cmd *cmd,

			      union pds_core_adminq_comp *comp,

			      struct pdsc_wait_context *wc)

			      union pds_core_adminq_comp *comp)

{

	struct pdsc_queue *q = &qcq->q;

	struct pdsc_q_info *q_info;
@@ -205,9 +199,9 @@ static int __pdsc_adminq_post(struct pdsc *pdsc, 
	/* Post the request */

	index = q->head_idx;

	q_info = &q->info[index];

	q_info->wc = wc;

	q_info->dest = comp;

	memcpy(q_info->desc, cmd, sizeof(*cmd));

	reinit_completion(&q_info->completion);



	dev_dbg(pdsc->dev, "head_idx %d tail_idx %d\n",

		q->head_idx, q->tail_idx);
@@ -231,16 +225,13 @@ int pdsc_adminq_post(struct pdsc *pdsc, 
		     union pds_core_adminq_comp *comp,

		     bool fast_poll)

{

	struct pdsc_wait_context wc = {

		.wait_completion =

			COMPLETION_INITIALIZER_ONSTACK(wc.wait_completion),

	};

	unsigned long poll_interval = 1;

	unsigned long poll_jiffies;

	unsigned long time_limit;

	unsigned long time_start;

	unsigned long time_done;

	unsigned long remaining;

	struct completion *wc;

	int err = 0;

	int index;
@@ -250,20 +241,19 @@ int pdsc_adminq_post(struct pdsc *pdsc, 
		return -ENXIO;

	}



	wc.qcq = &pdsc->adminqcq;

	index = __pdsc_adminq_post(pdsc, &pdsc->adminqcq, cmd, comp, &wc);

	index = __pdsc_adminq_post(pdsc, &pdsc->adminqcq, cmd, comp);

	if (index < 0) {

		err = index;

		goto err_out;

	}



	wc = &pdsc->adminqcq.q.info[index].completion;

	time_start = jiffies;

	time_limit = time_start + HZ * pdsc->devcmd_timeout;

	do {

		/* Timeslice the actual wait to catch IO errors etc early */

		poll_jiffies = msecs_to_jiffies(poll_interval);

		remaining = wait_for_completion_timeout(&wc.wait_completion,

							poll_jiffies);

		remaining = wait_for_completion_timeout(wc, poll_jiffies);

		if (remaining)

			break;
@@ -292,9 +282,11 @@ int pdsc_adminq_post(struct pdsc *pdsc, 
	dev_dbg(pdsc->dev, "%s: elapsed %d msecs\n",

		__func__, jiffies_to_msecs(time_done - time_start));



	/* Check the results */

	if (time_after_eq(time_done, time_limit))

	/* Check the results and clear an un-completed timeout */

	if (time_after_eq(time_done, time_limit) && !completion_done(wc)) {

		err = -ETIMEDOUT;

		complete(wc);

	}



	dev_dbg(pdsc->dev, "read admin queue completion idx %d:\n", index);

	dynamic_hex_dump("comp ", DUMP_PREFIX_OFFSET, 16, 1,

drivers/net/ethernet/amd/pds_core/auxbus.c

+0 −3
Original line number Diff line number Diff line
@@ -107,9 +107,6 @@ int pds_client_adminq_cmd(struct pds_auxiliary_dev *padev, 
	dev_dbg(pf->dev, "%s: %s opcode %d\n",

		__func__, dev_name(&padev->aux_dev.dev), req->opcode);



	if (pf->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);

drivers/net/ethernet/amd/pds_core/core.c

+4 −5
Original line number Diff line number Diff line
@@ -167,8 +167,10 @@ static void pdsc_q_map(struct pdsc_queue *q, void *base, dma_addr_t base_pa) 
	q->base = base;

	q->base_pa = base_pa;



	for (i = 0, cur = q->info; i < q->num_descs; i++, cur++)

	for (i = 0, cur = q->info; i < q->num_descs; i++, cur++) {

		cur->desc = base + (i * q->desc_size);

		init_completion(&cur->completion);

	}

}



static void pdsc_cq_map(struct pdsc_cq *cq, void *base, dma_addr_t base_pa)
@@ -325,10 +327,7 @@ static int pdsc_core_init(struct pdsc *pdsc) 
	size_t sz;

	int err;



	/* Scale the descriptor ring length based on number of CPUs and VFs */

	numdescs = max_t(int, PDSC_ADMINQ_MIN_LENGTH, num_online_cpus());

	numdescs += 2 * pci_sriov_get_totalvfs(pdsc->pdev);

	numdescs = roundup_pow_of_two(numdescs);

	numdescs = PDSC_ADMINQ_MAX_LENGTH;

	err = pdsc_qcq_alloc(pdsc, PDS_CORE_QTYPE_ADMINQ, 0, "adminq",

			     PDS_CORE_QCQ_F_CORE | PDS_CORE_QCQ_F_INTR,

			     numdescs,

drivers/net/ethernet/amd/pds_core/core.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#define PDSC_WATCHDOG_SECS	5

#define PDSC_QUEUE_NAME_MAX_SZ  16

#define PDSC_ADMINQ_MIN_LENGTH	16	/* must be a power of two */

#define PDSC_ADMINQ_MAX_LENGTH	16	/* must be a power of two */

#define PDSC_NOTIFYQ_LENGTH	64	/* must be a power of two */

#define PDSC_TEARDOWN_RECOVERY	false

#define PDSC_TEARDOWN_REMOVING	true
@@ -96,7 +96,7 @@ struct pdsc_q_info { 
	unsigned int bytes;

	unsigned int nbufs;

	struct pdsc_buf_info bufs[PDS_CORE_MAX_FRAGS];

	struct pdsc_wait_context *wc;

	struct completion completion;

	void *dest;

};

drivers/net/ethernet/amd/pds_core/devlink.c

+1 −3
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
		.fw_control.opcode = PDS_CORE_CMD_FW_CONTROL,

		.fw_control.oper = PDS_CORE_FW_GET_LIST,

	};

	struct pds_core_fw_list_info fw_list;

	struct pds_core_fw_list_info fw_list = {};

	struct pdsc *pdsc = devlink_priv(dl);

	union pds_core_dev_comp comp;

	char buf[32];
@@ -118,8 +118,6 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, 
	if (!err)

		memcpy_fromio(&fw_list, pdsc->cmd_regs->data, sizeof(fw_list));

	mutex_unlock(&pdsc->devcmd_lock);

	if (err && err != -EIO)

		return err;



	listlen = min(fw_list.num_fw_slots, ARRAY_SIZE(fw_list.fw_names));

	for (i = 0; i < listlen; i++) {