forked from Minki/linux
8e6d3fe1af
The inline assembly differences for v6 vs. v7 in the hvc_dcc driver are purely optimizations. On a v7 processor, an mrc with the pc sets the condition codes to the 28-31 bits of the register being read. It just so happens that the TX/RX full bits the DCC driver is testing for are high enough in the register to be put into the condition codes. On a v6 processor, this "feature" isn't implemented and thus we have to do the usual read, mask, test operations to check for TX/RX full. Since we already test the RX/TX full bits before calling __dcc_getchar() and __dcc_putchar() we don't actually need to do anything special for v7 over v6. The only difference is in hvc_dcc_get_chars(). We would test RX full, poll RX full, and then read a character from the buffer, whereas now we will test RX full, read a character from the buffer, and then test RX full again for the second iteration of the loop. It doesn't seem possible for the buffer to go from full to empty between testing the RX full and reading a character. Therefore, replace the v7 versions with the v6 versions and everything works the same. Acked-by: Tony Lindgren <tony@atomide.com> Cc: Arnd Bergmann <arnd@arndb.de> Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org> Cc: Daniel Walker <dwalker@codeaurora.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
105 lines
2.3 KiB
C
105 lines
2.3 KiB
C
/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 and
|
|
* only version 2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301, USA.
|
|
*/
|
|
|
|
#include <linux/console.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/err.h>
|
|
#include <linux/init.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/types.h>
|
|
|
|
#include <asm/processor.h>
|
|
|
|
#include "hvc_console.h"
|
|
|
|
/* DCC Status Bits */
|
|
#define DCC_STATUS_RX (1 << 30)
|
|
#define DCC_STATUS_TX (1 << 29)
|
|
|
|
static inline u32 __dcc_getstatus(void)
|
|
{
|
|
u32 __ret;
|
|
asm volatile("mrc p14, 0, %0, c0, c1, 0 @ read comms ctrl reg"
|
|
: "=r" (__ret) : : "cc");
|
|
|
|
return __ret;
|
|
}
|
|
|
|
|
|
static inline char __dcc_getchar(void)
|
|
{
|
|
char __c;
|
|
|
|
asm volatile("mrc p14, 0, %0, c0, c5, 0 @ read comms data reg"
|
|
: "=r" (__c));
|
|
|
|
return __c;
|
|
}
|
|
|
|
static inline void __dcc_putchar(char c)
|
|
{
|
|
asm volatile("mcr p14, 0, %0, c0, c5, 0 @ write a char"
|
|
: /* no output register */
|
|
: "r" (c));
|
|
}
|
|
|
|
static int hvc_dcc_put_chars(uint32_t vt, const char *buf, int count)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < count; i++) {
|
|
while (__dcc_getstatus() & DCC_STATUS_TX)
|
|
cpu_relax();
|
|
|
|
__dcc_putchar(buf[i]);
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
static int hvc_dcc_get_chars(uint32_t vt, char *buf, int count)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < count; ++i)
|
|
if (__dcc_getstatus() & DCC_STATUS_RX)
|
|
buf[i] = __dcc_getchar();
|
|
else
|
|
break;
|
|
|
|
return i;
|
|
}
|
|
|
|
static const struct hv_ops hvc_dcc_get_put_ops = {
|
|
.get_chars = hvc_dcc_get_chars,
|
|
.put_chars = hvc_dcc_put_chars,
|
|
};
|
|
|
|
static int __init hvc_dcc_console_init(void)
|
|
{
|
|
hvc_instantiate(0, 0, &hvc_dcc_get_put_ops);
|
|
return 0;
|
|
}
|
|
console_initcall(hvc_dcc_console_init);
|
|
|
|
static int __init hvc_dcc_init(void)
|
|
{
|
|
hvc_alloc(0, 0, &hvc_dcc_get_put_ops, 128);
|
|
return 0;
|
|
}
|
|
device_initcall(hvc_dcc_init);
|