Commit c78c6e18 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'soc-fsl-next-v5.10' of... 

Merge tag 'soc-fsl-next-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into arm/drivers

NXP/FSL SoC driver updates for v5.10

Fix various compile warnings and static analysis warnings for:
- QBMan driver
- DPIO driver
- QE driver

* tag 'soc-fsl-next-v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
  soc: fsl: qe: Remove unnessesary check in ucc_set_tdm_rxtx_clk
  soc: fsl: qman: convert to use be32_add_cpu()
  soc: fsl: dpio: remove set but not used 'addr_cena'
  soc: fsl: qbman: Fix return value on success
  soc: fsl: qman: fix -Wpacked-not-aligned warnings

Link: https://lore.kernel.org/r/20200923224416.25788-1-leoyang.li@nxp.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents a39c258c d97b957e

drivers/soc/fsl/dpio/qbman-portal.c

+0 −2
Original line number Diff line number Diff line
@@ -647,7 +647,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);
@@ -701,7 +700,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;

drivers/soc/fsl/qbman/bman.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ int bm_shutdown_pool(u32 bpid) 
	}

done:

	put_affine_portal();

	return 0;

	return err;

}



struct gen_pool *bm_bpalloc;

drivers/soc/fsl/qbman/qman_test_api.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void fd_inc(struct qm_fd *fd) 
	len--;

	qm_fd_set_param(fd, fmt, off, len);



	fd->cmd = cpu_to_be32(be32_to_cpu(fd->cmd) + 1);

	be32_add_cpu(&fd->cmd, 1);

}



/* The only part of the 'fd' we can't memcmp() is the ppid */

drivers/soc/fsl/qe/ucc.c

+1 −1
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ int ucc_set_tdm_rxtx_clk(u32 tdm_num, enum qe_clock clock, 


	qe_mux_reg = &qe_immr->qmx;



	if (tdm_num > 7 || tdm_num < 0)

	if (tdm_num > 7)

		return -EINVAL;



	/* The communications direction must be RX or TX */

include/soc/fsl/qman.h

+2 −2
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ struct qm_dqrr_entry { 
	__be32 context_b;

	struct qm_fd fd;

	u8 __reserved4[32];

} __packed;

} __packed __aligned(64);

#define QM_DQRR_VERB_VBIT		0x80

#define QM_DQRR_VERB_MASK		0x7f	/* where the verb contains; */

#define QM_DQRR_VERB_FRAME_DEQUEUE	0x60	/* "this format" */
@@ -289,7 +289,7 @@ union qm_mr_entry { 
		__be32 tag;

		struct qm_fd fd;

		u8 __reserved1[32];

	} __packed ern;

	} __packed __aligned(64) ern;

	struct {

		u8 verb;

		u8 fqs;		/* Frame Queue Status */

CRA Git | Maintained and supported by SUSTech CRA and CCSE