|
@@ -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)pipe, dev->base + PIPE_REG_CHANNEL,
|
|
|
+ gf_write64((u64)(unsigned long)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)pipe, dev->base + PIPE_REG_CHANNEL,
|
|
|
+ gf_write64((u64)(unsigned long)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,8 +327,9 @@ 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)pipe, dev->base + PIPE_REG_CHANNEL,
|
|
|
- dev->base + PIPE_REG_CHANNEL_HIGH);
|
|
|
+ gf_write64((u64)(unsigned long)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,
|
|
|
dev->base + PIPE_REG_ADDRESS_HIGH);
|