Commit 07d783fd authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Greg Kroah-Hartman
Browse files

staging: goldfish: Fix pointer cast for 32 bits 



As the first argument of gf_write64() was of type unsigned long, and as
some calls to gf_write64() were casting the first argument from void *
to u64 the compiler and/or sparse were printing warnings for casts of
wrong sizes when compiling for i386.

This patch changes the type of the first argument of gf_write64() to
const void *, and update calls to the function. This change fixed the
warnings and allowed to remove casts from 3 calls to gf_write64().

In addition gf_write64() was renamed to gf_write_ptr() as the name was
misleading because it only writes 32 bits on 32 bit systems.

gf_write_dma_addr() was added to handle dma_addr_t values which is
used at drivers/staging/goldfish/goldfish_audio.c.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e97bc8b2

drivers/platform/goldfish/goldfish_pipe.c

+9 −9
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ static u32 goldfish_cmd_status(struct goldfish_pipe *pipe, u32 cmd) 
	struct goldfish_pipe_dev *dev = pipe->dev;



	spin_lock_irqsave(&dev->lock, flags);

	gf_write64((u64)(unsigned long)pipe, dev->base + PIPE_REG_CHANNEL,

	gf_write_ptr(pipe, dev->base + PIPE_REG_CHANNEL,

		     dev->base + PIPE_REG_CHANNEL_HIGH);

	writel(cmd, dev->base + PIPE_REG_COMMAND);

	status = readl(dev->base + PIPE_REG_STATUS);
@@ -172,7 +172,7 @@ static void goldfish_cmd(struct goldfish_pipe *pipe, u32 cmd) 
	struct goldfish_pipe_dev *dev = pipe->dev;



	spin_lock_irqsave(&dev->lock, flags);

	gf_write64((u64)(unsigned long)pipe, dev->base + PIPE_REG_CHANNEL,

	gf_write_ptr(pipe, dev->base + PIPE_REG_CHANNEL,

		     dev->base + PIPE_REG_CHANNEL_HIGH);

	writel(cmd, dev->base + PIPE_REG_COMMAND);

	spin_unlock_irqrestore(&dev->lock, flags);
@@ -327,11 +327,11 @@ static ssize_t goldfish_pipe_read_write(struct file *filp, char __user *buffer, 
		spin_lock_irqsave(&dev->lock, irq_flags);

		if (access_with_param(dev, CMD_WRITE_BUFFER + cmd_offset,

				address, avail, pipe, &status)) {

			gf_write64((u64)(unsigned long)pipe,

				   dev->base + PIPE_REG_CHANNEL,

			gf_write_ptr(pipe, dev->base + PIPE_REG_CHANNEL,

				     dev->base + PIPE_REG_CHANNEL_HIGH);

			writel(avail, dev->base + PIPE_REG_SIZE);

			gf_write64(address, dev->base + PIPE_REG_ADDRESS,

			gf_write_ptr((void *)address,

				     dev->base + PIPE_REG_ADDRESS,

				     dev->base + PIPE_REG_ADDRESS_HIGH);

			writel(CMD_WRITE_BUFFER + cmd_offset,

					dev->base + PIPE_REG_COMMAND);

drivers/staging/goldfish/goldfish_audio.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct goldfish_audio { 
#define AUDIO_READ(data, addr)		(readl(data->reg_base + addr))

#define AUDIO_WRITE(data, addr, x)	(writel(x, data->reg_base + addr))

#define AUDIO_WRITE64(data, addr, addr2, x)	\

	(gf_write64((u64)(x), data->reg_base + addr, data->reg_base+addr2))

	(gf_write_dma_addr((x), data->reg_base + addr, data->reg_base+addr2))



/*

 *  temporary variable used between goldfish_audio_probe() and

drivers/staging/goldfish/goldfish_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static u32 goldfish_nand_cmd(struct mtd_info *mtd, enum nand_cmd cmd, 
		writel((u32)(addr >> 32), base + NAND_ADDR_HIGH);

		writel((u32)addr, base + NAND_ADDR_LOW);

		writel(len, base + NAND_TRANSFER_SIZE);

		gf_write64((u64)ptr, base + NAND_DATA, base + NAND_DATA_HIGH);

		gf_write_ptr(ptr, base + NAND_DATA, base + NAND_DATA_HIGH);

		writel(cmd, base + NAND_COMMAND);

		rv = readl(base + NAND_RESULT);

	}

drivers/tty/goldfish.c

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static void goldfish_tty_do_write(int line, const char *buf, unsigned count) 
	struct goldfish_tty *qtty = &goldfish_ttys[line];

	void __iomem *base = qtty->base;

	spin_lock_irqsave(&qtty->lock, irq_flags);

	gf_write64((u64)buf, base + GOLDFISH_TTY_DATA_PTR,

	gf_write_ptr(buf, base + GOLDFISH_TTY_DATA_PTR,

				base + GOLDFISH_TTY_DATA_PTR_HIGH);

	writel(count, base + GOLDFISH_TTY_DATA_LEN);

	writel(GOLDFISH_TTY_CMD_WRITE_BUFFER, base + GOLDFISH_TTY_CMD);
@@ -81,7 +81,7 @@ static irqreturn_t goldfish_tty_interrupt(int irq, void *dev_id) 


	count = tty_prepare_flip_string(&qtty->port, &buf, count);

	spin_lock_irqsave(&qtty->lock, irq_flags);

	gf_write64((u64)buf, base + GOLDFISH_TTY_DATA_PTR,

	gf_write_ptr(buf, base + GOLDFISH_TTY_DATA_PTR,

				base + GOLDFISH_TTY_DATA_PTR_HIGH);

	writel(count, base + GOLDFISH_TTY_DATA_LEN);

	writel(GOLDFISH_TTY_CMD_READ_BUFFER, base + GOLDFISH_TTY_CMD);

include/linux/goldfish.h

+15 −4
Original line number Diff line number Diff line
@@ -3,13 +3,24 @@ 


/* Helpers for Goldfish virtual platform */



static inline void gf_write64(unsigned long data,

		void __iomem *portl, void __iomem *porth)

static inline void gf_write_ptr(const void *ptr, void __iomem *portl,

				void __iomem *porth)

{

	writel((u32)data, portl);

	writel((u32)(unsigned long)ptr, portl);

#ifdef CONFIG_64BIT

	writel(data>>32, porth);

	writel((unsigned long)ptr >> 32, porth);

#endif

}



static inline void gf_write_dma_addr(const dma_addr_t addr,

				     void __iomem *portl,

				     void __iomem *porth)

{

	writel((u32)addr, portl);

#ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT

	writel(addr >> 32, porth);

#endif

}





#endif /* __LINUX_GOLDFISH_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE