Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit becba85f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.0-rc3 into tty-testing 



This resolves a merge issue in drivers/tty/serial/8250/8250_pci.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 9eccca08 3372ec28

arch/x86/Kconfig.debug

+0 −4
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ config EARLY_PRINTK 
	  with klogd/syslogd or the X server. You should normally N here,

	  unless you want to debug such a crash.



config EARLY_PRINTK_INTEL_MID

	bool "Early printk for Intel MID platform support"

	depends on EARLY_PRINTK && X86_INTEL_MID



config EARLY_PRINTK_DBGP

	bool "Early printk via EHCI debug port"

	depends on EARLY_PRINTK && PCI

arch/x86/include/asm/intel-mid.h

+0 −3
Original line number Diff line number Diff line
@@ -136,9 +136,6 @@ extern enum intel_mid_timer_options intel_mid_timer_options; 
#define SFI_MTMR_MAX_NUM 8

#define SFI_MRTC_MAX	8



extern struct console early_hsu_console;

extern void hsu_early_console_init(const char *);



extern void intel_scu_devices_create(void);

extern void intel_scu_devices_destroy(void);

arch/x86/kernel/early_printk.c

+0 −6
Original line number Diff line number Diff line
@@ -375,12 +375,6 @@ static int __init setup_early_printk(char *buf) 
		if (!strncmp(buf, "xen", 3))

			early_console_register(&xenboot_console, keep);

#endif

#ifdef CONFIG_EARLY_PRINTK_INTEL_MID

		if (!strncmp(buf, "hsu", 3)) {

			hsu_early_console_init(buf + 3);

			early_console_register(&early_hsu_console, keep);

		}

#endif

#ifdef CONFIG_EARLY_PRINTK_EFI

		if (!strncmp(buf, "efi", 3))

			early_console_register(&early_efi_console, keep);

arch/x86/platform/intel-mid/Makefile

+0 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_X86_INTEL_MID) += intel-mid.o intel_mid_vrtc.o mfld.o mrfl.o

obj-$(CONFIG_EARLY_PRINTK_INTEL_MID) += early_printk_intel_mid.o



# SFI specific code

ifdef CONFIG_X86_INTEL_MID

arch/x86/platform/intel-mid/early_printk_intel_mid.c

deleted100644 → 0
+0 −112
Original line number Diff line number Diff line 
/*

 * early_printk_intel_mid.c - early consoles for Intel MID platforms

 *

 * Copyright (c) 2008-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.

 */



/*

 * This file implements early console named hsu.

 * hsu is based on a High Speed UART device which only exists in the Medfield

 * platform

 */



#include <linux/serial_reg.h>

#include <linux/serial_mfd.h>

#include <linux/console.h>

#include <linux/kernel.h>

#include <linux/delay.h>

#include <linux/io.h>



#include <asm/fixmap.h>

#include <asm/pgtable.h>

#include <asm/intel-mid.h>



/*

 * Following is the early console based on Medfield HSU (High

 * Speed UART) device.

 */

#define HSU_PORT_BASE		0xffa28080



static void __iomem *phsu;



void hsu_early_console_init(const char *s)

{

	unsigned long paddr, port = 0;

	u8 lcr;



	/*

	 * Select the early HSU console port if specified by user in the

	 * kernel command line.

	 */

	if (*s && !kstrtoul(s, 10, &port))

		port = clamp_val(port, 0, 2);



	paddr = HSU_PORT_BASE + port * 0x80;

	phsu = (void __iomem *)set_fixmap_offset_nocache(FIX_EARLYCON_MEM_BASE, paddr);



	/* Disable FIFO */

	writeb(0x0, phsu + UART_FCR);



	/* Set to default 115200 bps, 8n1 */

	lcr = readb(phsu + UART_LCR);

	writeb((0x80 | lcr), phsu + UART_LCR);

	writeb(0x18, phsu + UART_DLL);

	writeb(lcr,  phsu + UART_LCR);

	writel(0x3600, phsu + UART_MUL*4);



	writeb(0x8, phsu + UART_MCR);

	writeb(0x7, phsu + UART_FCR);

	writeb(0x3, phsu + UART_LCR);



	/* Clear IRQ status */

	readb(phsu + UART_LSR);

	readb(phsu + UART_RX);

	readb(phsu + UART_IIR);

	readb(phsu + UART_MSR);



	/* Enable FIFO */

	writeb(0x7, phsu + UART_FCR);

}



#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)



static void early_hsu_putc(char ch)

{

	unsigned int timeout = 10000; /* 10ms */

	u8 status;



	while (--timeout) {

		status = readb(phsu + UART_LSR);

		if (status & BOTH_EMPTY)

			break;

		udelay(1);

	}



	/* Only write the char when there was no timeout */

	if (timeout)

		writeb(ch, phsu + UART_TX);

}



static void early_hsu_write(struct console *con, const char *str, unsigned n)

{

	int i;



	for (i = 0; i < n && *str; i++) {

		if (*str == '\n')

			early_hsu_putc('\r');

		early_hsu_putc(*str);

		str++;

	}

}



struct console early_hsu_console = {

	.name =		"earlyhsu",

	.write =	early_hsu_write,

	.flags =	CON_PRINTBUFFER,

	.index =	-1,

};