Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efe848cd authored by Claudiu Manoil's avatar Claudiu Manoil Committed by Scott Wood
Browse files

soc/qman: Change remaining contextB into context_b 



There are multiple occurences of both contextB and context_b
in different h/w descriptors, referring to the same descriptor
field known as "Context B". Stick with the "context_b" naming,
for obvious reasons including consistency (see also context_a).

Signed-off-by: default avatarClaudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
parent 5a42f1ec

drivers/soc/fsl/qbman/qman.c

+6 −6
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ static void qm_mr_process_task(struct work_struct *work) 
				break;

			case QM_MR_VERB_FQPN:

				/* Parked */

				fq = tag_to_fq(msg->fq.contextB);

				fq = tag_to_fq(msg->fq.context_b);

				fq_state_change(p, fq, msg, verb);

				if (fq->cb.fqs)

					fq->cb.fqs(p, fq, msg);
@@ -1494,7 +1494,7 @@ static inline unsigned int __poll_portal_fast(struct qman_portal *p, 


		if (dq->stat & QM_DQRR_STAT_UNSCHEDULED) {

			/*

			 * VDQCR: don't trust contextB as the FQ may have

			 * VDQCR: don't trust context_b as the FQ may have

			 * been configured for h/w consumption and we're

			 * draining it post-retirement.

			 */
@@ -1520,8 +1520,8 @@ static inline unsigned int __poll_portal_fast(struct qman_portal *p, 
			if (dq->stat & QM_DQRR_STAT_DQCR_EXPIRED)

				clear_vdqcr(p, fq);

		} else {

			/* SDQCR: contextB points to the FQ */

			fq = tag_to_fq(dq->contextB);

			/* SDQCR: context_b points to the FQ */

			fq = tag_to_fq(dq->context_b);

			/* Now let the callback do its stuff */

			res = fq->cb.dqrr(p, fq, dq);

			/*
@@ -1757,7 +1757,7 @@ int qman_init_fq(struct qman_fq *fq, u32 flags, struct qm_mcc_initfq *opts) 
	qm_fqid_set(&mcc->fq, fq->fqid);

	mcc->initfq.count = 0;

	/*

	 * If the FQ does *not* have the TO_DCPORTAL flag, contextB is set as a

	 * If the FQ does *not* have the TO_DCPORTAL flag, context_b is set as a

	 * demux pointer. Otherwise, the caller-provided value is allowed to

	 * stand, don't overwrite it.

	 */
@@ -1937,7 +1937,7 @@ int qman_retire_fq(struct qman_fq *fq, u32 *flags) 
			msg.verb = QM_MR_VERB_FQRNI;

			msg.fq.fqs = mcr->alterfq.fqs;

			qm_fqid_set(&msg.fq, fq->fqid);

			msg.fq.contextB = fq_to_tag(fq);

			msg.fq.context_b = fq_to_tag(fq);

			fq->cb.fqs(p, fq, &msg);

		}

	} else if (res == QM_MCR_RESULT_PENDING) {

include/soc/fsl/qman.h

+6 −6
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ struct qm_dqrr_entry { 
	u8 tok;

	u8 __reserved2[3];

	u32 fqid;	/* 24-bit */

	u32 contextB;

	u32 context_b;

	struct qm_fd fd;

	u8 __reserved4[32];

} __packed;
@@ -290,7 +290,7 @@ union qm_mr_entry { 
		u8 fqs;		/* Frame Queue Status */

		u8 __reserved1[6];

		u32 fqid;	/* 24-bit */

		u32 contextB;

		u32 context_b;

		u8 __reserved2[48];

	} __packed fq;		/* FQRN/FQRNI/FQRL/FQPN */

};
@@ -658,7 +658,7 @@ struct qman_cgr; 
/*

 * This enum, and the callback type that returns it, are used when handling

 * dequeued frames via DQRR. Note that for "null" callbacks registered with the

 * portal object (for handling dequeues that do not demux because contextB is

 * portal object (for handling dequeues that do not demux because context_b is

 * NULL), the return value *MUST* be qman_cb_dqrr_consume.

 */

enum qman_cb_dqrr_result {
@@ -863,11 +863,11 @@ void qman_p_static_dequeue_add(struct qman_portal *p, u32 pools); 
 * qman_fq" for more info). NO_MODIFY is only intended for enqueuing to

 * pre-existing frame-queues that aren't to be otherwise interfered with, it

 * prevents all other modifications to the frame queue. The TO_DCPORTAL flag

 * causes the driver to honour any contextB modifications requested in the

 * causes the driver to honour any context_b modifications requested in the

 * qm_init_fq() API, as this indicates the frame queue will be consumed by a

 * direct-connect portal (PME, CAAM, or Fman). When frame queues are consumed by

 * software portals, the contextB field is controlled by the driver and can't be

 * modified by the caller.

 * software portals, the context_b field is controlled by the driver and can't

 * be modified by the caller.

 */

int qman_create_fq(u32 fqid, u32 flags, struct qman_fq *fq);