mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-08-04 08:17:46 +00:00
a906fdaacc
Up to now we force enable the local apic in the devicetree setup uncoditionally and set smp_found_config unconditionally to 1 when a devicetree blob is available. This breaks, when local apic is disabled in the Kconfig. Make it consistent by initializing device tree explicitely before smp_get_config() so a non lapic configuration could be used as well. To be functional that would require to implement PIT as an interrupt host, but the only user of this code until now is ce4100 which requires apics to be available. So we leave this up to those who need it. Tested-by: Sebastian Siewior <bigeasy@linutronix.de> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
144 lines
3.8 KiB
C
144 lines
3.8 KiB
C
/*
|
|
* Intel CE4100 platform specific setup code
|
|
*
|
|
* (C) Copyright 2010 Intel Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; version 2
|
|
* of the License.
|
|
*/
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/module.h>
|
|
#include <linux/serial_reg.h>
|
|
#include <linux/serial_8250.h>
|
|
|
|
#include <asm/prom.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/i8259.h>
|
|
#include <asm/io.h>
|
|
#include <asm/io_apic.h>
|
|
|
|
static int ce4100_i8042_detect(void)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_SERIAL_8250
|
|
|
|
static unsigned int mem_serial_in(struct uart_port *p, int offset)
|
|
{
|
|
offset = offset << p->regshift;
|
|
return readl(p->membase + offset);
|
|
}
|
|
|
|
/*
|
|
* The UART Tx interrupts are not set under some conditions and therefore serial
|
|
* transmission hangs. This is a silicon issue and has not been root caused. The
|
|
* workaround for this silicon issue checks UART_LSR_THRE bit and UART_LSR_TEMT
|
|
* bit of LSR register in interrupt handler to see whether at least one of these
|
|
* two bits is set, if so then process the transmit request. If this workaround
|
|
* is not applied, then the serial transmission may hang. This workaround is for
|
|
* errata number 9 in Errata - B step.
|
|
*/
|
|
|
|
static unsigned int ce4100_mem_serial_in(struct uart_port *p, int offset)
|
|
{
|
|
unsigned int ret, ier, lsr;
|
|
|
|
if (offset == UART_IIR) {
|
|
offset = offset << p->regshift;
|
|
ret = readl(p->membase + offset);
|
|
if (ret & UART_IIR_NO_INT) {
|
|
/* see if the TX interrupt should have really set */
|
|
ier = mem_serial_in(p, UART_IER);
|
|
/* see if the UART's XMIT interrupt is enabled */
|
|
if (ier & UART_IER_THRI) {
|
|
lsr = mem_serial_in(p, UART_LSR);
|
|
/* now check to see if the UART should be
|
|
generating an interrupt (but isn't) */
|
|
if (lsr & (UART_LSR_THRE | UART_LSR_TEMT))
|
|
ret &= ~UART_IIR_NO_INT;
|
|
}
|
|
}
|
|
} else
|
|
ret = mem_serial_in(p, offset);
|
|
return ret;
|
|
}
|
|
|
|
static void ce4100_mem_serial_out(struct uart_port *p, int offset, int value)
|
|
{
|
|
offset = offset << p->regshift;
|
|
writel(value, p->membase + offset);
|
|
}
|
|
|
|
static void ce4100_serial_fixup(int port, struct uart_port *up,
|
|
unsigned short *capabilites)
|
|
{
|
|
#ifdef CONFIG_EARLY_PRINTK
|
|
/*
|
|
* Over ride the legacy port configuration that comes from
|
|
* asm/serial.h. Using the ioport driver then switching to the
|
|
* PCI memmaped driver hangs the IOAPIC
|
|
*/
|
|
if (up->iotype != UPIO_MEM32) {
|
|
up->uartclk = 14745600;
|
|
up->mapbase = 0xdffe0200;
|
|
set_fixmap_nocache(FIX_EARLYCON_MEM_BASE,
|
|
up->mapbase & PAGE_MASK);
|
|
up->membase =
|
|
(void __iomem *)__fix_to_virt(FIX_EARLYCON_MEM_BASE);
|
|
up->membase += up->mapbase & ~PAGE_MASK;
|
|
up->iotype = UPIO_MEM32;
|
|
up->regshift = 2;
|
|
}
|
|
#endif
|
|
up->iobase = 0;
|
|
up->serial_in = ce4100_mem_serial_in;
|
|
up->serial_out = ce4100_mem_serial_out;
|
|
|
|
*capabilites |= (1 << 12);
|
|
}
|
|
|
|
static __init void sdv_serial_fixup(void)
|
|
{
|
|
serial8250_set_isa_configurator(ce4100_serial_fixup);
|
|
}
|
|
|
|
#else
|
|
static inline void sdv_serial_fixup(void);
|
|
#endif
|
|
|
|
static void __init sdv_arch_setup(void)
|
|
{
|
|
sdv_serial_fixup();
|
|
}
|
|
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
static void __cpuinit sdv_pci_init(void)
|
|
{
|
|
x86_of_pci_init();
|
|
/* We can't set this earlier, because we need to calibrate the timer */
|
|
legacy_pic = &null_legacy_pic;
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* CE4100 specific x86_init function overrides and early setup
|
|
* calls.
|
|
*/
|
|
void __init x86_ce4100_early_setup(void)
|
|
{
|
|
x86_init.oem.arch_setup = sdv_arch_setup;
|
|
x86_platform.i8042_detect = ce4100_i8042_detect;
|
|
x86_init.resources.probe_roms = x86_init_noop;
|
|
x86_init.mpparse.get_smp_config = x86_init_uint_noop;
|
|
x86_init.mpparse.find_smp_config = x86_init_noop;
|
|
|
|
#ifdef CONFIG_X86_IO_APIC
|
|
x86_init.pci.init_irq = sdv_pci_init;
|
|
x86_init.mpparse.setup_ioapic_ids = setup_ioapic_ids_from_mpc_nocheck;
|
|
#endif
|
|
}
|