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

Commit 41d5e08e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty 

Pull tty/serial updates from Greg KH:
 "Here's the big tty/serial driver update for 4.1-rc1.

  It was delayed for a bit due to some questions surrounding some of the
  console command line parsing changes that are in here.  There's still
  one tiny regression for people who were previously putting multiple
  console command lines and expecting them all to be ignored for some
  odd reason, but Peter is working on fixing that.  If not, I'll send a
  revert for the offending patch, but I have faith that Peter can
  address it.

  Other than the console work here, there's the usual serial driver
  updates and changes, and a buch of 8250 reworks to try to make that
  driver easier to maintain over time, and have it support more devices
  in the future.

  All of these have been in linux-next for a while"

* tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (119 commits)
  n_gsm: Drop unneeded cast on netdev_priv
  sc16is7xx: expose RTS inversion in RS-485 mode
  serial: 8250_pci: port failed after wakeup from S3
  earlycon: 8250: Document kernel command line options
  earlycon: 8250: Fix command line regression
  earlycon: Fix __earlycon_table stride
  tty: clean up the tty time logic a bit
  serial: 8250_dw: only get the clock rate in one place
  serial: 8250_dw: remove useless ACPI ID check
  dmaengine: hsu: move memory allocation to GFP_NOWAIT
  dmaengine: hsu: remove redundant pieces of code
  serial: 8250_pci: add Intel Tangier support
  dmaengine: hsu: add Intel Tangier PCI ID
  serial: 8250_pci: replace switch-case by formula for Intel MID
  serial: 8250_pci: replace switch-case by formula
  tty: cpm_uart: replace CONFIG_8xx by CONFIG_CPM1
  serial: jsm: some off by one bugs
  serial: xuartps: Fix check in console_setup().
  serial: xuartps: Get rid of register access macros.
  serial: xuartps: Fix iobase use.
  ...
parents 8d582b94 5dbc32a8

Documentation/kernel-parameters.txt

+15 −3
Original line number Diff line number Diff line
@@ -713,10 +713,18 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio32,<addr>[,options]

		uart[8250],0x<addr>[,options]

			Start an early, polled-mode console on the 8250/16550

			UART at the specified I/O port or MMIO address,

			switching to the matching ttyS device later.  The

			options are the same as for ttyS, above.

			switching to the matching ttyS device later.

			MMIO inter-register address stride is either 8-bit

			(mmio) or 32-bit (mmio32).

			If none of [io|mmio|mmio32], <addr> is assumed to be

			equivalent to 'mmio'. 'options' are specified in the

			same format described for ttyS above; if unspecified,

			the h/w is not re-initialized.



		hvc<n>	Use the hypervisor console device <n>. This is for

			both Xen and PowerPC hypervisors.
@@ -950,11 +958,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
		uart[8250],io,<addr>[,options]

		uart[8250],mmio,<addr>[,options]

		uart[8250],mmio32,<addr>[,options]

		uart[8250],0x<addr>[,options]

			Start an early, polled-mode console on the 8250/16550

			UART at the specified I/O port or MMIO address.

			MMIO inter-register address stride is either 8-bit

			(mmio) or 32-bit (mmio32).

			The options are the same as for ttyS, above.

			If none of [io|mmio|mmio32], <addr> is assumed to be

			equivalent to 'mmio'. 'options' are specified in the

			same format described for "console=ttyS<n>"; if

			unspecified, the h/w is not initialized.



		pl011,<addr>

			Start an early, polled-mode console on a pl011 serial

arch/mips/mti-malta/malta-init.c

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/init.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/serial_8250.h>

#include <linux/serial_core.h>



#include <asm/cacheflush.h>

#include <asm/smp-ops.h>
@@ -75,7 +75,7 @@ static void __init console_config(void) 
	if ((strstr(fw_getcmdline(), "earlycon=")) == NULL) {

		sprintf(console_string, "uart8250,io,0x3f8,%d%c%c", baud,

			parity, bits);

		setup_early_serial8250_console(console_string);

		setup_earlycon(console_string);

	}



	if ((strstr(fw_getcmdline(), "console=")) == NULL) {

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/include/asm/serial.h

+4 −4
Original line number Diff line number Diff line
@@ -12,11 +12,11 @@ 


/* Standard COM flags (except for COM4, because of the 8514 problem) */

#ifdef CONFIG_SERIAL_DETECT_IRQ

# define STD_COMX_FLAGS	(ASYNC_BOOT_AUTOCONF |	ASYNC_SKIP_TEST	| ASYNC_AUTO_IRQ)

# define STD_COM4_FLAGS	(ASYNC_BOOT_AUTOCONF |	0		| ASYNC_AUTO_IRQ)

# define STD_COMX_FLAGS	(UPF_BOOT_AUTOCONF |	UPF_SKIP_TEST	| UPF_AUTO_IRQ)

# define STD_COM4_FLAGS	(UPF_BOOT_AUTOCONF |	0		| UPF_AUTO_IRQ)

#else

# define STD_COMX_FLAGS	(ASYNC_BOOT_AUTOCONF |	ASYNC_SKIP_TEST	| 0		)

# define STD_COM4_FLAGS	(ASYNC_BOOT_AUTOCONF |	0		| 0		)

# define STD_COMX_FLAGS	(UPF_BOOT_AUTOCONF |	UPF_SKIP_TEST	| 0		)

# define STD_COM4_FLAGS	(UPF_BOOT_AUTOCONF |	0		| 0		)

#endif



#define SERIAL_PORT_DFNS								\