bus/fslmc: rename cinh read functions used for ls1088
This patch changes the qbman I/O function names as they are only reading from cinh register, but writing to cena registers. This gives way to add functions which purely work in cinh mode Signed-off-by: Nipun Gupta <nipun.gupta@nxp.com> Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
This commit is contained in:
Nipun Gupta
Ferruh Yigit
parent
b3bd7a50d1
commit
79e5b5ed8e
@ -78,7 +78,7 @@ qbman_swp_enqueue_ring_mode_direct(struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd);
|
||||
static int
|
||||
qbman_swp_enqueue_ring_mode_cinh_direct(struct qbman_swp *s,
|
||||
qbman_swp_enqueue_ring_mode_cinh_read_direct(struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd);
|
||||
static int
|
||||
@ -97,7 +97,7 @@ qbman_swp_enqueue_multiple_direct(struct qbman_swp *s,
|
||||
uint32_t *flags,
|
||||
int num_frames);
|
||||
static int
|
||||
qbman_swp_enqueue_multiple_cinh_direct(struct qbman_swp *s,
|
||||
qbman_swp_enqueue_multiple_cinh_read_direct(struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd,
|
||||
uint32_t *flags,
|
||||
@ -122,7 +122,7 @@ qbman_swp_enqueue_multiple_fd_direct(struct qbman_swp *s,
|
||||
uint32_t *flags,
|
||||
int num_frames);
|
||||
static int
|
||||
qbman_swp_enqueue_multiple_fd_cinh_direct(struct qbman_swp *s,
|
||||
qbman_swp_enqueue_multiple_fd_cinh_read_direct(struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
struct qbman_fd **fd,
|
||||
uint32_t *flags,
|
||||
@ -146,7 +146,7 @@ qbman_swp_enqueue_multiple_desc_direct(struct qbman_swp *s,
|
||||
const struct qbman_fd *fd,
|
||||
int num_frames);
|
||||
static int
|
||||
qbman_swp_enqueue_multiple_desc_cinh_direct(struct qbman_swp *s,
|
||||
qbman_swp_enqueue_multiple_desc_cinh_read_direct(struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd,
|
||||
int num_frames);
|
||||
@ -309,15 +309,15 @@ struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d)
|
||||
&& (d->cena_access_mode == qman_cena_fastest_access)) {
|
||||
p->eqcr.pi_ring_size = 32;
|
||||
qbman_swp_enqueue_array_mode_ptr =
|
||||
qbman_swp_enqueue_array_mode_mem_back;
|
||||
qbman_swp_enqueue_array_mode_mem_back;
|
||||
qbman_swp_enqueue_ring_mode_ptr =
|
||||
qbman_swp_enqueue_ring_mode_mem_back;
|
||||
qbman_swp_enqueue_ring_mode_mem_back;
|
||||
qbman_swp_enqueue_multiple_ptr =
|
||||
qbman_swp_enqueue_multiple_mem_back;
|
||||
qbman_swp_enqueue_multiple_mem_back;
|
||||
qbman_swp_enqueue_multiple_fd_ptr =
|
||||
qbman_swp_enqueue_multiple_fd_mem_back;
|
||||
qbman_swp_enqueue_multiple_fd_mem_back;
|
||||
qbman_swp_enqueue_multiple_desc_ptr =
|
||||
qbman_swp_enqueue_multiple_desc_mem_back;
|
||||
qbman_swp_enqueue_multiple_desc_mem_back;
|
||||
qbman_swp_pull_ptr = qbman_swp_pull_mem_back;
|
||||
qbman_swp_dqrr_next_ptr = qbman_swp_dqrr_next_mem_back;
|
||||
qbman_swp_release_ptr = qbman_swp_release_mem_back;
|
||||
@ -325,13 +325,13 @@ struct qbman_swp *qbman_swp_init(const struct qbman_swp_desc *d)
|
||||
|
||||
if (dpaa2_svr_family == SVR_LS1080A) {
|
||||
qbman_swp_enqueue_ring_mode_ptr =
|
||||
qbman_swp_enqueue_ring_mode_cinh_direct;
|
||||
qbman_swp_enqueue_ring_mode_cinh_read_direct;
|
||||
qbman_swp_enqueue_multiple_ptr =
|
||||
qbman_swp_enqueue_multiple_cinh_direct;
|
||||
qbman_swp_enqueue_multiple_cinh_read_direct;
|
||||
qbman_swp_enqueue_multiple_fd_ptr =
|
||||
qbman_swp_enqueue_multiple_fd_cinh_direct;
|
||||
qbman_swp_enqueue_multiple_fd_cinh_read_direct;
|
||||
qbman_swp_enqueue_multiple_desc_ptr =
|
||||
qbman_swp_enqueue_multiple_desc_cinh_direct;
|
||||
qbman_swp_enqueue_multiple_desc_cinh_read_direct;
|
||||
}
|
||||
|
||||
for (mask_size = p->eqcr.pi_ring_size; mask_size > 0; mask_size >>= 1)
|
||||
@ -835,7 +835,7 @@ static int qbman_swp_enqueue_ring_mode_direct(struct qbman_swp *s,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_ring_mode_cinh_direct(
|
||||
static int qbman_swp_enqueue_ring_mode_cinh_read_direct(
|
||||
struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd)
|
||||
@ -873,6 +873,44 @@ static int qbman_swp_enqueue_ring_mode_cinh_direct(
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_ring_mode_cinh_direct(
|
||||
struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd)
|
||||
{
|
||||
uint32_t *p;
|
||||
const uint32_t *cl = qb_cl(d);
|
||||
uint32_t eqcr_ci, full_mask, half_mask;
|
||||
|
||||
half_mask = (s->eqcr.pi_ci_mask>>1);
|
||||
full_mask = s->eqcr.pi_ci_mask;
|
||||
if (!s->eqcr.available) {
|
||||
eqcr_ci = s->eqcr.ci;
|
||||
s->eqcr.ci = qbman_cinh_read(&s->sys,
|
||||
QBMAN_CINH_SWP_EQCR_CI) & full_mask;
|
||||
s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
|
||||
eqcr_ci, s->eqcr.ci);
|
||||
if (!s->eqcr.available)
|
||||
return -EBUSY;
|
||||
}
|
||||
|
||||
p = qbman_cinh_write_start_wo_shadow(&s->sys,
|
||||
QBMAN_CENA_SWP_EQCR(s->eqcr.pi & half_mask));
|
||||
memcpy_byte_by_byte(&p[1], &cl[1], 28);
|
||||
memcpy_byte_by_byte(&p[8], fd, sizeof(*fd));
|
||||
lwsync();
|
||||
|
||||
/* Set the verb byte, have to substitute in the valid-bit */
|
||||
p[0] = cl[0] | s->eqcr.pi_vb;
|
||||
s->eqcr.pi++;
|
||||
s->eqcr.pi &= full_mask;
|
||||
s->eqcr.available--;
|
||||
if (!(s->eqcr.pi & half_mask))
|
||||
s->eqcr.pi_vb ^= QB_VALID_BIT;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_ring_mode_mem_back(struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd)
|
||||
@ -999,7 +1037,7 @@ static int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s,
|
||||
return num_enqueued;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_multiple_cinh_direct(
|
||||
static int qbman_swp_enqueue_multiple_cinh_read_direct(
|
||||
struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd,
|
||||
@ -1069,6 +1107,67 @@ static int qbman_swp_enqueue_multiple_cinh_direct(
|
||||
return num_enqueued;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_multiple_cinh_direct(
|
||||
struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd,
|
||||
uint32_t *flags,
|
||||
int num_frames)
|
||||
{
|
||||
uint32_t *p = NULL;
|
||||
const uint32_t *cl = qb_cl(d);
|
||||
uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask;
|
||||
int i, num_enqueued = 0;
|
||||
|
||||
half_mask = (s->eqcr.pi_ci_mask>>1);
|
||||
full_mask = s->eqcr.pi_ci_mask;
|
||||
if (!s->eqcr.available) {
|
||||
eqcr_ci = s->eqcr.ci;
|
||||
s->eqcr.ci = qbman_cinh_read(&s->sys,
|
||||
QBMAN_CINH_SWP_EQCR_CI) & full_mask;
|
||||
s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
|
||||
eqcr_ci, s->eqcr.ci);
|
||||
if (!s->eqcr.available)
|
||||
return 0;
|
||||
}
|
||||
|
||||
eqcr_pi = s->eqcr.pi;
|
||||
num_enqueued = (s->eqcr.available < num_frames) ?
|
||||
s->eqcr.available : num_frames;
|
||||
s->eqcr.available -= num_enqueued;
|
||||
/* Fill in the EQCR ring */
|
||||
for (i = 0; i < num_enqueued; i++) {
|
||||
p = qbman_cinh_write_start_wo_shadow(&s->sys,
|
||||
QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));
|
||||
memcpy_byte_by_byte(&p[1], &cl[1], 28);
|
||||
memcpy_byte_by_byte(&p[8], &fd[i], sizeof(*fd));
|
||||
eqcr_pi++;
|
||||
}
|
||||
|
||||
lwsync();
|
||||
|
||||
/* Set the verb byte, have to substitute in the valid-bit */
|
||||
eqcr_pi = s->eqcr.pi;
|
||||
for (i = 0; i < num_enqueued; i++) {
|
||||
p = qbman_cinh_write_start_wo_shadow(&s->sys,
|
||||
QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));
|
||||
p[0] = cl[0] | s->eqcr.pi_vb;
|
||||
if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) {
|
||||
struct qbman_eq_desc *d = (struct qbman_eq_desc *)p;
|
||||
|
||||
d->eq.dca = (1 << QB_ENQUEUE_CMD_DCA_EN_SHIFT) |
|
||||
((flags[i]) & QBMAN_EQCR_DCA_IDXMASK);
|
||||
}
|
||||
eqcr_pi++;
|
||||
if (!(eqcr_pi & half_mask))
|
||||
s->eqcr.pi_vb ^= QB_VALID_BIT;
|
||||
}
|
||||
|
||||
s->eqcr.pi = eqcr_pi & full_mask;
|
||||
|
||||
return num_enqueued;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_multiple_mem_back(struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd,
|
||||
@ -1205,7 +1304,7 @@ static int qbman_swp_enqueue_multiple_fd_direct(struct qbman_swp *s,
|
||||
return num_enqueued;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_multiple_fd_cinh_direct(
|
||||
static int qbman_swp_enqueue_multiple_fd_cinh_read_direct(
|
||||
struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
struct qbman_fd **fd,
|
||||
@ -1275,6 +1374,67 @@ static int qbman_swp_enqueue_multiple_fd_cinh_direct(
|
||||
return num_enqueued;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_multiple_fd_cinh_direct(
|
||||
struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
struct qbman_fd **fd,
|
||||
uint32_t *flags,
|
||||
int num_frames)
|
||||
{
|
||||
uint32_t *p = NULL;
|
||||
const uint32_t *cl = qb_cl(d);
|
||||
uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask;
|
||||
int i, num_enqueued = 0;
|
||||
|
||||
half_mask = (s->eqcr.pi_ci_mask>>1);
|
||||
full_mask = s->eqcr.pi_ci_mask;
|
||||
if (!s->eqcr.available) {
|
||||
eqcr_ci = s->eqcr.ci;
|
||||
s->eqcr.ci = qbman_cinh_read(&s->sys,
|
||||
QBMAN_CINH_SWP_EQCR_CI) & full_mask;
|
||||
s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
|
||||
eqcr_ci, s->eqcr.ci);
|
||||
if (!s->eqcr.available)
|
||||
return 0;
|
||||
}
|
||||
|
||||
eqcr_pi = s->eqcr.pi;
|
||||
num_enqueued = (s->eqcr.available < num_frames) ?
|
||||
s->eqcr.available : num_frames;
|
||||
s->eqcr.available -= num_enqueued;
|
||||
/* Fill in the EQCR ring */
|
||||
for (i = 0; i < num_enqueued; i++) {
|
||||
p = qbman_cinh_write_start_wo_shadow(&s->sys,
|
||||
QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));
|
||||
memcpy_byte_by_byte(&p[1], &cl[1], 28);
|
||||
memcpy_byte_by_byte(&p[8], fd[i], sizeof(struct qbman_fd));
|
||||
eqcr_pi++;
|
||||
}
|
||||
|
||||
lwsync();
|
||||
|
||||
/* Set the verb byte, have to substitute in the valid-bit */
|
||||
eqcr_pi = s->eqcr.pi;
|
||||
for (i = 0; i < num_enqueued; i++) {
|
||||
p = qbman_cinh_write_start_wo_shadow(&s->sys,
|
||||
QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));
|
||||
p[0] = cl[0] | s->eqcr.pi_vb;
|
||||
if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) {
|
||||
struct qbman_eq_desc *d = (struct qbman_eq_desc *)p;
|
||||
|
||||
d->eq.dca = (1 << QB_ENQUEUE_CMD_DCA_EN_SHIFT) |
|
||||
((flags[i]) & QBMAN_EQCR_DCA_IDXMASK);
|
||||
}
|
||||
eqcr_pi++;
|
||||
if (!(eqcr_pi & half_mask))
|
||||
s->eqcr.pi_vb ^= QB_VALID_BIT;
|
||||
}
|
||||
|
||||
s->eqcr.pi = eqcr_pi & full_mask;
|
||||
|
||||
return num_enqueued;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_multiple_fd_mem_back(struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
struct qbman_fd **fd,
|
||||
@ -1413,7 +1573,7 @@ static int qbman_swp_enqueue_multiple_desc_direct(struct qbman_swp *s,
|
||||
return num_enqueued;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_multiple_desc_cinh_direct(
|
||||
static int qbman_swp_enqueue_multiple_desc_cinh_read_direct(
|
||||
struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd,
|
||||
@ -1478,6 +1638,62 @@ static int qbman_swp_enqueue_multiple_desc_cinh_direct(
|
||||
return num_enqueued;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_multiple_desc_cinh_direct(
|
||||
struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd,
|
||||
int num_frames)
|
||||
{
|
||||
uint32_t *p;
|
||||
const uint32_t *cl;
|
||||
uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask;
|
||||
int i, num_enqueued = 0;
|
||||
|
||||
half_mask = (s->eqcr.pi_ci_mask>>1);
|
||||
full_mask = s->eqcr.pi_ci_mask;
|
||||
if (!s->eqcr.available) {
|
||||
eqcr_ci = s->eqcr.ci;
|
||||
s->eqcr.ci = qbman_cinh_read(&s->sys,
|
||||
QBMAN_CINH_SWP_EQCR_CI) & full_mask;
|
||||
s->eqcr.available = qm_cyc_diff(s->eqcr.pi_ring_size,
|
||||
eqcr_ci, s->eqcr.ci);
|
||||
if (!s->eqcr.available)
|
||||
return 0;
|
||||
}
|
||||
|
||||
eqcr_pi = s->eqcr.pi;
|
||||
num_enqueued = (s->eqcr.available < num_frames) ?
|
||||
s->eqcr.available : num_frames;
|
||||
s->eqcr.available -= num_enqueued;
|
||||
/* Fill in the EQCR ring */
|
||||
for (i = 0; i < num_enqueued; i++) {
|
||||
p = qbman_cinh_write_start_wo_shadow(&s->sys,
|
||||
QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));
|
||||
cl = qb_cl(&d[i]);
|
||||
memcpy_byte_by_byte(&p[1], &cl[1], 28);
|
||||
memcpy_byte_by_byte(&p[8], &fd[i], sizeof(*fd));
|
||||
eqcr_pi++;
|
||||
}
|
||||
|
||||
lwsync();
|
||||
|
||||
/* Set the verb byte, have to substitute in the valid-bit */
|
||||
eqcr_pi = s->eqcr.pi;
|
||||
for (i = 0; i < num_enqueued; i++) {
|
||||
p = qbman_cinh_write_start_wo_shadow(&s->sys,
|
||||
QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask));
|
||||
cl = qb_cl(&d[i]);
|
||||
p[0] = cl[0] | s->eqcr.pi_vb;
|
||||
eqcr_pi++;
|
||||
if (!(eqcr_pi & half_mask))
|
||||
s->eqcr.pi_vb ^= QB_VALID_BIT;
|
||||
}
|
||||
|
||||
s->eqcr.pi = eqcr_pi & full_mask;
|
||||
|
||||
return num_enqueued;
|
||||
}
|
||||
|
||||
static int qbman_swp_enqueue_multiple_desc_mem_back(struct qbman_swp *s,
|
||||
const struct qbman_eq_desc *d,
|
||||
const struct qbman_fd *fd,
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user