Commit b8658bc8 authored by Jun Tian's avatar Jun Tian Committed by Greg Kroah-Hartman
Browse files

goldfish: enable 64-bit tty driver 



Signed-off-by: default avatarJun Tian <jun.j.tian@intel.com>
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec5e34c0

drivers/tty/goldfish.c

+9 −0
Original line number Diff line number Diff line
@@ -29,6 +29,9 @@ enum { 


	GOLDFISH_TTY_DATA_PTR       = 0x10,

	GOLDFISH_TTY_DATA_LEN       = 0x14,

#ifdef CONFIG_64BIT

	GOLDFISH_TTY_DATA_PTR_HIGH  = 0x18,

#endif



	GOLDFISH_TTY_CMD_INT_DISABLE    = 0,

	GOLDFISH_TTY_CMD_INT_ENABLE     = 1,
@@ -58,6 +61,9 @@ static void goldfish_tty_do_write(int line, const char *buf, unsigned count) 
	void __iomem *base = qtty->base;

	spin_lock_irqsave(&qtty->lock, irq_flags);

	writel((u32)buf, base + GOLDFISH_TTY_DATA_PTR);

#ifdef CONFIG_64BIT

	writel((u32)((u64)buf >> 32), base + GOLDFISH_TTY_DATA_PTR_HIGH);

#endif

	writel(count, base + GOLDFISH_TTY_DATA_LEN);

	writel(GOLDFISH_TTY_CMD_WRITE_BUFFER, base + GOLDFISH_TTY_CMD);

	spin_unlock_irqrestore(&qtty->lock, irq_flags);
@@ -79,6 +85,9 @@ 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);

	writel((u32)buf, base + GOLDFISH_TTY_DATA_PTR);

#ifdef CONFIG_64BIT

	writel((u32)((u64)buf >> 32), base + GOLDFISH_TTY_DATA_PTR_HIGH);

#endif

	writel(count, base + GOLDFISH_TTY_DATA_LEN);

	writel(GOLDFISH_TTY_CMD_READ_BUFFER, base + GOLDFISH_TTY_CMD);

	spin_unlock_irqrestore(&qtty->lock, irq_flags);