| Message ID | 20200221083637.13392-1-yuehaibing@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next] soc: fsl: dpio: remove set but not used variable 'addr_cena' | expand |
On Fri, Feb 21, 2020 at 2:38 AM YueHaibing <yuehaibing@huawei.com> wrote: > > commit 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array > mode with ring mode enqueue") introduced this, but not > used, so remove it. > > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: YueHaibing <yuehaibing@huawei.com> > --- > drivers/soc/fsl/dpio/qbman-portal.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/soc/fsl/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c > index 740ee0d..350de56 100644 > --- a/drivers/soc/fsl/dpio/qbman-portal.c > +++ b/drivers/soc/fsl/dpio/qbman-portal.c > @@ -658,7 +658,6 @@ int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s, > const uint32_t *cl = (uint32_t *)d; > uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask; > int i, num_enqueued = 0; > - uint64_t addr_cena; > > spin_lock(&s->access_spinlock); > half_mask = (s->eqcr.pi_ci_mask>>1); > @@ -711,7 +710,6 @@ int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s, > > /* Flush all the cacheline without load/store in between */ > eqcr_pi = s->eqcr.pi; > - addr_cena = (size_t)s->addr_cena; > for (i = 0; i < num_enqueued; i++) > eqcr_pi++; > s->eqcr.pi = eqcr_pi & full_mask; > @@ -822,7 +820,6 @@ int qbman_swp_enqueue_multiple_desc_direct(struct qbman_swp *s, > const uint32_t *cl; > uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask; > int i, num_enqueued = 0; > - uint64_t addr_cena; > > half_mask = (s->eqcr.pi_ci_mask>>1); > full_mask = s->eqcr.pi_ci_mask; > @@ -866,7 +863,6 @@ int qbman_swp_enqueue_multiple_desc_direct(struct qbman_swp *s, > > /* Flush all the cacheline without load/store in between */ > eqcr_pi = s->eqcr.pi; > - addr_cena = (uint64_t)s->addr_cena; Hi Youri, Looks like this problem exposed another issue that you removed the cacheline related code in the upstream version. Then the comment /* Flush all the cacheline without load/store in between */ is no longer true now, and probably the whole block can be replaced with a single line to increase s->eqcr.pi? The same for the block above. Can you provide a better fix for this issue? Regards, Leo > for (i = 0; i < num_enqueued; i++) > eqcr_pi++; > s->eqcr.pi = eqcr_pi & full_mask; > -- > 2.7.4 > >
diff --git a/drivers/soc/fsl/dpio/qbman-portal.c b/drivers/soc/fsl/dpio/qbman-portal.c index 740ee0d..350de56 100644 --- a/drivers/soc/fsl/dpio/qbman-portal.c +++ b/drivers/soc/fsl/dpio/qbman-portal.c @@ -658,7 +658,6 @@ int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s, const uint32_t *cl = (uint32_t *)d; uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask; int i, num_enqueued = 0; - uint64_t addr_cena; spin_lock(&s->access_spinlock); half_mask = (s->eqcr.pi_ci_mask>>1); @@ -711,7 +710,6 @@ int qbman_swp_enqueue_multiple_direct(struct qbman_swp *s, /* Flush all the cacheline without load/store in between */ eqcr_pi = s->eqcr.pi; - addr_cena = (size_t)s->addr_cena; for (i = 0; i < num_enqueued; i++) eqcr_pi++; s->eqcr.pi = eqcr_pi & full_mask; @@ -822,7 +820,6 @@ int qbman_swp_enqueue_multiple_desc_direct(struct qbman_swp *s, const uint32_t *cl; uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask; int i, num_enqueued = 0; - uint64_t addr_cena; half_mask = (s->eqcr.pi_ci_mask>>1); full_mask = s->eqcr.pi_ci_mask; @@ -866,7 +863,6 @@ int qbman_swp_enqueue_multiple_desc_direct(struct qbman_swp *s, /* Flush all the cacheline without load/store in between */ eqcr_pi = s->eqcr.pi; - addr_cena = (uint64_t)s->addr_cena; for (i = 0; i < num_enqueued; i++) eqcr_pi++; s->eqcr.pi = eqcr_pi & full_mask;
commit 3b2abda7d28c ("soc: fsl: dpio: Replace QMAN array mode with ring mode enqueue") introduced this, but not used, so remove it. Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: YueHaibing <yuehaibing@huawei.com> --- drivers/soc/fsl/dpio/qbman-portal.c | 4 ---- 1 file changed, 4 deletions(-)