Commit 461c3ac0 authored by Li Yang's avatar Li Yang
Browse files

soc: fsl: qe: fix sparse warnings for ucc_slow.c 



Fixes the following sparse warnings, some of these endian issues are
real issues that need to be fixed.

drivers/soc/fsl/qe/ucc_slow.c:78:17: warning: incorrect type in assignment (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:78:17:    expected struct ucc_slow *us_regs
drivers/soc/fsl/qe/ucc_slow.c:78:17:    got struct ucc_slow [noderef] <asn:2> *us_regs
drivers/soc/fsl/qe/ucc_slow.c:81:18: warning: incorrect type in argument 1 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:81:18:    expected void const volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:81:18:    got restricted __be32 *
drivers/soc/fsl/qe/ucc_slow.c:90:9: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:90:9:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:90:9:    got restricted __be32 *
drivers/soc/fsl/qe/ucc_slow.c:99:17: warning: incorrect type in assignment (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:99:17:    expected struct ucc_slow *us_regs
drivers/soc/fsl/qe/ucc_slow.c:99:17:    got struct ucc_slow [noderef] <asn:2> *us_regs
drivers/soc/fsl/qe/ucc_slow.c:102:18: warning: incorrect type in argument 1 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:102:18:    expected void const volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:102:18:    got restricted __be32 *
drivers/soc/fsl/qe/ucc_slow.c:111:9: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:111:9:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:111:9:    got restricted __be32 *
drivers/soc/fsl/qe/ucc_slow.c:172:28: warning: Using plain integer as NULL pointer
drivers/soc/fsl/qe/ucc_slow.c:174:25: warning: cast removes address space '<asn:2>' of expression
drivers/soc/fsl/qe/ucc_slow.c:175:25: warning: cast removes address space '<asn:2>' of expression
drivers/soc/fsl/qe/ucc_slow.c:194:23: warning: incorrect type in assignment (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:194:23:    expected struct ucc_slow_pram *us_pram
drivers/soc/fsl/qe/ucc_slow.c:194:23:    got void [noderef] <asn:2> *
drivers/soc/fsl/qe/ucc_slow.c:204:9: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:204:9:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:204:9:    got restricted __be16 *
drivers/soc/fsl/qe/ucc_slow.c:229:41: warning: incorrect type in assignment (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:229:41:    expected struct qe_bd *tx_bd
drivers/soc/fsl/qe/ucc_slow.c:229:41:    got void [noderef] <asn:2> *
drivers/soc/fsl/qe/ucc_slow.c:232:17: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:232:17:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:232:17:    got restricted __be32 *
drivers/soc/fsl/qe/ucc_slow.c:234:17: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:234:17:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:234:17:    got unsigned int [usertype] *
drivers/soc/fsl/qe/ucc_slow.c:238:9: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:238:9:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:238:9:    got restricted __be32 *
drivers/soc/fsl/qe/ucc_slow.c:239:9: warning: cast from restricted __be32
drivers/soc/fsl/qe/ucc_slow.c:239:9: warning: incorrect type in argument 1 (different base types)
drivers/soc/fsl/qe/ucc_slow.c:239:9:    expected unsigned int [usertype] val
drivers/soc/fsl/qe/ucc_slow.c:239:9:    got restricted __be32 [usertype]
drivers/soc/fsl/qe/ucc_slow.c:239:9: warning: cast from restricted __be32
drivers/soc/fsl/qe/ucc_slow.c:239:9: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:239:9:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:239:9:    got unsigned int [usertype] *
drivers/soc/fsl/qe/ucc_slow.c:242:26: warning: incorrect type in assignment (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:242:26:    expected struct qe_bd *rx_bd
drivers/soc/fsl/qe/ucc_slow.c:242:26:    got void [noderef] <asn:2> *
drivers/soc/fsl/qe/ucc_slow.c:245:17: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:245:17:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:245:17:    got unsigned int [usertype] *
drivers/soc/fsl/qe/ucc_slow.c:247:17: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:247:17:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:247:17:    got restricted __be32 *
drivers/soc/fsl/qe/ucc_slow.c:251:9: warning: cast from restricted __be32
drivers/soc/fsl/qe/ucc_slow.c:251:9: warning: incorrect type in argument 1 (different base types)
drivers/soc/fsl/qe/ucc_slow.c:251:9:    expected unsigned int [usertype] val
drivers/soc/fsl/qe/ucc_slow.c:251:9:    got restricted __be32 [usertype]
drivers/soc/fsl/qe/ucc_slow.c:251:9: warning: cast from restricted __be32
drivers/soc/fsl/qe/ucc_slow.c:251:9: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:251:9:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:251:9:    got unsigned int [usertype] *
drivers/soc/fsl/qe/ucc_slow.c:252:9: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:252:9:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:252:9:    got restricted __be32 *
drivers/soc/fsl/qe/ucc_slow.c:276:39: warning: mixing different enum types:
drivers/soc/fsl/qe/ucc_slow.c:276:39:    unsigned int enum ucc_slow_tx_oversampling_rate
drivers/soc/fsl/qe/ucc_slow.c:276:39:    unsigned int enum ucc_slow_rx_oversampling_rate
drivers/soc/fsl/qe/ucc_slow.c:296:9: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:296:9:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:296:9:    got restricted __be16 *
drivers/soc/fsl/qe/ucc_slow.c:297:9: warning: incorrect type in argument 2 (different address spaces)
drivers/soc/fsl/qe/ucc_slow.c:297:9:    expected void volatile [noderef] <asn:2> *addr
drivers/soc/fsl/qe/ucc_slow.c:297:9:    got restricted __be16 *

Signed-off-by: default avatarLi Yang <leoyang.li@nxp.com>
parent ae1f6865

drivers/soc/fsl/qe/ucc_slow.c

+13 −13
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ EXPORT_SYMBOL(ucc_slow_restart_tx); 


void ucc_slow_enable(struct ucc_slow_private * uccs, enum comm_dir mode)

{

	struct ucc_slow *us_regs;

	struct ucc_slow __iomem *us_regs;

	u32 gumr_l;



	us_regs = uccs->us_regs;
@@ -93,7 +93,7 @@ EXPORT_SYMBOL(ucc_slow_enable); 


void ucc_slow_disable(struct ucc_slow_private * uccs, enum comm_dir mode)

{

	struct ucc_slow *us_regs;

	struct ucc_slow __iomem *us_regs;

	u32 gumr_l;



	us_regs = uccs->us_regs;
@@ -122,7 +122,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc 
	u32 i;

	struct ucc_slow __iomem *us_regs;

	u32 gumr;

	struct qe_bd *bd;

	struct qe_bd __iomem *bd;

	u32 id;

	u32 command;

	int ret = 0;
@@ -169,8 +169,8 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc 
	}



	us_regs = uccs->us_regs;

	uccs->p_ucce = (u16 *) & (us_regs->ucce);

	uccs->p_uccm = (u16 *) & (us_regs->uccm);

	uccs->p_ucce = &us_regs->ucce;

	uccs->p_uccm = &us_regs->uccm;



	/* Get PRAM base */

	uccs->us_pram_offset =
@@ -224,24 +224,24 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc 
		/* clear bd buffer */

		qe_iowrite32be(0, &bd->buf);

		/* set bd status and length */

		qe_iowrite32be(0, (u32 *)bd);

		qe_iowrite32be(0, (u32 __iomem *)bd);

		bd++;

	}

	/* for last BD set Wrap bit */

	qe_iowrite32be(0, &bd->buf);

	qe_iowrite32be(cpu_to_be32(T_W), (u32 *)bd);

	qe_iowrite32be(T_W, (u32 __iomem *)bd);



	/* Init Rx bds */

	bd = uccs->rx_bd = qe_muram_addr(uccs->rx_base_offset);

	for (i = 0; i < us_info->rx_bd_ring_len - 1; i++) {

		/* set bd status and length */

		qe_iowrite32be(0, (u32 *)bd);

		qe_iowrite32be(0, (u32 __iomem *)bd);

		/* clear bd buffer */

		qe_iowrite32be(0, &bd->buf);

		bd++;

	}

	/* for last BD set Wrap bit */

	qe_iowrite32be(cpu_to_be32(R_W), (u32 *)bd);

	qe_iowrite32be(R_W, (u32 __iomem *)bd);

	qe_iowrite32be(0, &bd->buf);



	/* Set GUMR (For more details see the hardware spec.). */
@@ -266,8 +266,8 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc 
	qe_iowrite32be(gumr, &us_regs->gumr_h);



	/* gumr_l */

	gumr = us_info->tdcr | us_info->rdcr | us_info->tenc | us_info->renc |

		us_info->diag | us_info->mode;

	gumr = (u32)us_info->tdcr | (u32)us_info->rdcr | (u32)us_info->tenc |

	       (u32)us_info->renc | (u32)us_info->diag | (u32)us_info->mode;

	if (us_info->tci)

		gumr |= UCC_SLOW_GUMR_L_TCI;

	if (us_info->rinv)
@@ -282,8 +282,8 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc 


	/* if the data is in cachable memory, the 'global' */

	/* in the function code should be set. */

	uccs->us_pram->tbmr = UCC_BMR_BO_BE;

	uccs->us_pram->rbmr = UCC_BMR_BO_BE;

	qe_iowrite8(UCC_BMR_BO_BE, &uccs->us_pram->tbmr);

	qe_iowrite8(UCC_BMR_BO_BE, &uccs->us_pram->rbmr);



	/* rbase, tbase are offsets from MURAM base */

	qe_iowrite16be(uccs->rx_base_offset, &uccs->us_pram->rbase);

include/soc/fsl/qe/ucc_slow.h

+6 −7
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ struct ucc_slow_info { 
struct ucc_slow_private {

	struct ucc_slow_info *us_info;

	struct ucc_slow __iomem *us_regs; /* Ptr to memory map of UCC regs */

	struct ucc_slow_pram *us_pram;	/* a pointer to the parameter RAM */

	struct ucc_slow_pram __iomem *us_pram;	/* a pointer to the parameter RAM */

	s32 us_pram_offset;

	int enabled_tx;		/* Whether channel is enabled for Tx (ENT) */

	int enabled_rx;		/* Whether channel is enabled for Rx (ENR) */
@@ -196,13 +196,12 @@ struct ucc_slow_private { 
				   and length for first BD in a frame */

	s32 tx_base_offset;	/* first BD in Tx BD table offset (In MURAM) */

	s32 rx_base_offset;	/* first BD in Rx BD table offset (In MURAM) */

	struct qe_bd *confBd;	/* next BD for confirm after Tx */

	struct qe_bd *tx_bd;	/* next BD for new Tx request */

	struct qe_bd *rx_bd;	/* next BD to collect after Rx */

	struct qe_bd __iomem *confBd;	/* next BD for confirm after Tx */

	struct qe_bd __iomem *tx_bd;	/* next BD for new Tx request */

	struct qe_bd __iomem *rx_bd;	/* next BD to collect after Rx */

	void *p_rx_frame;	/* accumulating receive frame */

	u16 *p_ucce;		/* a pointer to the event register in memory.

				 */

	u16 *p_uccm;		/* a pointer to the mask register in memory */

	__be16 __iomem *p_ucce;	/* a pointer to the event register in memory */

	__be16 __iomem *p_uccm;	/* a pointer to the mask register in memory */

	u16 saved_uccm;		/* a saved mask for the RX Interrupt bits */

#ifdef STATISTICS

	u32 tx_frames;		/* Transmitted frames counters */

CRA Git | Maintained and supported by SUSTech CRA and CCSE