~ilasc/ubuntu/+source/linux/+git/xenial:master-next-backlog

Last commit made on 2018-03-02
Get this branch:
git clone -b master-next-backlog https://git.launchpad.net/~ilasc/ubuntu/+source/linux/+git/xenial
Only Ioana Lasc can upload to this branch. If you are Ioana Lasc please log in for upload directions.

Branch merges

Branch information

Name:
master-next-backlog
Repository:
lp:~ilasc/ubuntu/+source/linux/+git/xenial

Recent commits

91f4dab... by Ursula Braun <email address hidden>

qeth: check not more than 16 SBALEs on the completion queue

BugLink: http://bugs.launchpad.net/bugs/1750568

af_iucv socket programs with HiperSockets as transport make use of the qdio
completion queue. Running such an af_iucv socket program may result in a
crash:

[90341.677709] Oops: 0038 ilc:2 [#1] SMP
[90341.677743] CPU: 1 PID: 0 Comm: swapper/1 Not tainted 4.6.0-20160720.0.0e86ec7.5e62689.fc23.s390xperformance #1
[90341.677744] Hardware name: IBM 2964 N96 703 (LPAR)
[90341.677746] task: 00000000edb79f00 ti: 00000000edb84000 task.ti: 00000000edb84000
[90341.677748] Krnl PSW : 0704d00180000000 000000000075bc50 (qeth_qdio_input_handler+0x258/0x4e0)
[90341.677756] R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:3 CC:1 PM:0 RI:0 EA:3
Krnl GPRS: 000003d10391e900 0000000000000001 00000000e61e6000 0000000000000005
[90341.677759] 0000000000a9e6ec 5420040001a77400 0000000000000001 000000000000006f
[90341.677761] 00000000e0d83f00 0000000000000003 0000000000000010 5420040001a77400
[90341.677784] 000000007ba8b000 0000000000943fd0 000000000075bc4e 00000000ed3b3c10
[90341.677793] Krnl Code: 000000000075bc42: e320cc180004 lg %r2,3096(%r12)
           000000000075bc48: c0e5ffffc5cc brasl %r14,7547e0
          #000000000075bc4e: 1816 lr %r1,%r6
          >000000000075bc50: ba19b008 cs %r1,%r9,8(%r11)
           000000000075bc54: ec180041017e cij %r1,1,8,75bcd6
           000000000075bc5a: 5810b008 l %r1,8(%r11)
           000000000075bc5e: ec16005c027e cij %r1,2,6,75bd16
           000000000075bc64: 5090b008 st %r9,8(%r11)
[90341.677807] Call Trace:
[90341.677810] ([<000000000075bbc0>] qeth_qdio_input_handler+0x1c8/0x4e0)
[90341.677812] ([<000000000070efbc>] qdio_kick_handler+0x124/0x2a8)
[90341.677814] ([<0000000000713570>] __tiqdio_inbound_processing+0xf0/0xcd0)
[90341.677818] ([<0000000000143312>] tasklet_action+0x92/0x120)
[90341.677823] ([<00000000008b6e72>] __do_softirq+0x112/0x308)
[90341.677824] ([<0000000000142bce>] irq_exit+0xd6/0xf8)
[90341.677829] ([<000000000010b1d2>] do_IRQ+0x6a/0x88)
[90341.677830] ([<00000000008b6322>] io_int_handler+0x112/0x220)
[90341.677832] ([<0000000000102b2e>] enabled_wait+0x56/0xa8)
[90341.677833] ([<0000000000000000>] (null))
[90341.677835] ([<0000000000102e32>] arch_cpu_idle+0x32/0x48)
[90341.677838] ([<000000000018a126>] cpu_startup_entry+0x266/0x2b0)
[90341.677841] ([<0000000000113b38>] smp_start_secondary+0x100/0x110)
[90341.677843] ([<00000000008b68a6>] restart_int_handler+0x62/0x78)
[90341.677845] ([<00000000008b6588>] psw_idle+0x3c/0x40)
[90341.677846] Last Breaking-Event-Address:
[90341.677848] [<00000000007547ec>] qeth_dbf_longtext+0xc/0xc0
[90341.677849]
[90341.677850] Kernel panic - not syncing: Fatal exception in interrupt

qeth_qdio_cq_handler() analyzes SBALs on this completion queue, but does
not observe the limit of 16 SBAL elements per SBAL. This patch adds the
additional check to process not more than 16 SBAL elements.

Signed-off-by: Ursula Braun <email address hidden>
Signed-off-by: David S. Miller <email address hidden>
(cherry picked from commit 903e48531e8b5d414c8f1960eacac24c31f60344)
Signed-off-by: Joseph Salisbury <email address hidden>
Acked-by: Khalid Elmously <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

6d401d4... by Julian Wiedmann <email address hidden>

s390/qeth: fix L3 next-hop in xmit qeth hdr

BugLink: http://bugs.launchpad.net/bugs/1750813

On L3, the qeth_hdr struct needs to be filled with the next-hop
IP address.
The current code accesses rtable->rt_gateway without checking that
rtable is a valid address. The accidental access to a lowcore area
results in a random next-hop address in the qeth_hdr.
rtable (or more precisely, skb_dst(skb)) can be NULL in rare cases
(for instance together with AF_PACKET sockets).
This patch adds the missing NULL-ptr checks.

Signed-off-by: Julian Wiedmann <email address hidden>
Signed-off-by: Ursula Braun <email address hidden>
Fixes: 87e7597b5a3 qeth: Move away from using neighbour entries in qeth_l3_fill_header()
Signed-off-by: David S. Miller <email address hidden>
(cherry picked from commit ec2c6726322f0d270bab477e4904bf9496f70ee5)
Signed-off-by: Joseph Salisbury <email address hidden>
Acked-by: Khalid Elmously <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

37debb1... by Aleksey Makarov <email address hidden>

serial: pl011: add console matching function

BugLink: https://bugs.launchpad.net/bugs/1744754

This patch adds function pl011_console_match() that implements
method match of struct console. It allows to match consoles against
data specified in a string, for example taken from command line or
compiled by ACPI SPCR table handler.

This patch was merged to tty-next but then reverted because of
conflict with

commit 46e36683f433 ("serial: earlycon: Extend earlycon command line option to support 64-bit addresses")

Now it is fixed.

Signed-off-by: Aleksey Makarov <email address hidden>
Reviewed-by: Peter Hurley <email address hidden>
Acked-by: Russell King <email address hidden>
Tested-by: Christopher Covington <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
(backported from commit 10879ae5f12e9cab3c4e8e9504c1aaa8a033bde7)
[ dannf: undo resource_size_t conversion that didn't occur upstream until
  46e36683f433 ("serial: earlycon: Extend earlycon command line option to support 64-bit addresses") ]
Signed-off-by: dann frazier <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

c1e2e22... by Aleksey Makarov <email address hidden>

ARM64: ACPI: enable ACPI_SPCR_TABLE

BugLink: https://bugs.launchpad.net/bugs/1744754

SBBR mentions SPCR as a mandatory ACPI table. So enable it for ARM64

Earlycon should be set up as early as possible. ACPI boot tables are
mapped in arch/arm64/kernel/acpi.c:acpi_boot_table_init() that
is called from setup_arch() and that's where we parse SPCR.
So it has to be opted-in per-arch.

When ACPI_SPCR_TABLE is defined initialization of DT earlycon is
deferred until the DT/ACPI decision is done. Initialize DT earlycon
if ACPI is disabled.

Acked-by: Will Deacon <email address hidden>
Acked-by: Hanjun Guo <email address hidden>
Signed-off-by: Aleksey Makarov <email address hidden>
Tested-by: Kefeng Wang <email address hidden>
Tested-by: Christopher Covington <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
(backported from commit 888125a712986fd0fab99d09f42b307de32d740c)
[ dannf: resolved conflict caused by v4.4 not yet having acpi=on support;
  trivial offset fix in Kconfig ]
Signed-off-by: dann frazier <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

6deb20b... by dann frazier

UBUNTU: [Config] CONFIG_ACPI_SPCR_TABLE=y

BugLink: https://bugs.launchpad.net/bugs/1744754

Signed-off-by: dann frazier <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

f7a8cb9... by Aleksey Makarov <email address hidden>

ACPI: parse SPCR and enable matching console

BugLink: https://bugs.launchpad.net/bugs/1744754

'ARM Server Base Boot Requiremets' [1] mentions SPCR (Serial Port
Console Redirection Table) [2] as a mandatory ACPI table that
specifies the configuration of serial console.

Defer initialization of DT earlycon until ACPI/DT decision is made.

Parse the ACPI SPCR table, setup earlycon if required,
enable specified console.

Thanks to Peter Hurley for explaining how this should work.

[1] http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.den0044a/index.html
[2] https://msdn.microsoft.com/en-us/library/windows/hardware/dn639132(v=vs.85).aspx

Signed-off-by: Aleksey Makarov <email address hidden>
Acked-by: Rafael J. Wysocki <email address hidden>
Reviewed-by: Peter Hurley <email address hidden>
Tested-by: Kefeng Wang <email address hidden>
Tested-by: Christopher Covington <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
(backported from commit ad1696f6f09daacfdf2bf04bc83cd8f48d80e34a)
[ dannf: offset adjustments ]
Signed-off-by: dann frazier <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

a3d3951... by Leif Lindholm

of/serial: move earlycon early_param handling to serial

BugLink: https://bugs.launchpad.net/bugs/1744754

We have multiple "earlycon" early_param handlers - merge the DT one into
the main earlycon one. It's a cleanup that also will be useful
to defer setting up DT console until ACPI/DT decision is made.

Rename the exported function to avoid clashing with the function from
arch/microblaze/kernel/prom.c

Signed-off-by: Leif Lindholm <email address hidden>
Signed-off-by: Aleksey Makarov <email address hidden>
Acked-by: Rob Herring <email address hidden>
Acked-by: Greg Kroah-Hartman <email address hidden>
Reviewed-by: Peter Hurley <email address hidden>
Tested-by: Kefeng Wang <email address hidden>
Tested-by: Christopher Covington <email address hidden>
Signed-off-by: Greg Kroah-Hartman <email address hidden>
(cherry picked from commit d503187b6cc4e41c21c02e695e0e7b5acdd066de)
[ dannf: Add missing #include <linux/of_fdt.h> ]
Signed-off-by: dann frazier <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

c47ee4f... by Aleksey Makarov <email address hidden>

ACPICA: Headers: Add new constants for the DBG2 ACPI table

BugLink: https://bugs.launchpad.net/bugs/1744754

ACPICA commit 1607b69238df9c1b2940262a17aa94ec49033278

Link: https://github.com/acpica/acpica/commit/1607b692
Signed-off-by: Aleksey Makarov <email address hidden>.
Signed-off-by: Bob Moore <email address hidden>
Signed-off-by: Lv Zheng <email address hidden>
Signed-off-by: Rafael J. Wysocki <email address hidden>
(cherry picked from commit c7200ffe432c6544b373f08fab33dc8e9b92516c)
Signed-off-by: dann frazier <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

2c80a6a... by Tomasz Nowicki <email address hidden>

irqchip/gic-v3-its: Mark its_init() and its children as __init

BugLink: https://bugs.launchpad.net/bugs/1744754

gicv3_init_bases() is the only caller for its_init(),
also it is a __init function, so mark its_init() as __init too,
then recursively mark the functions called as __init.

This will help to introduce ITS initialization using ACPI tables as
we will use acpi_table_parse_entries family functions there which
belong to __init section as well.

Acked-by: Marc Zyngier <email address hidden>
Signed-off-by: Hanjun Guo <email address hidden>
Signed-off-by: Tomasz Nowicki <email address hidden>
Signed-off-by: Marc Zyngier <email address hidden>
(cherry picked from commit 04a0e4dee85642138dc7bd78f50ebee397e057a8)
Signed-off-by: dann frazier <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>

2136511... by hanjun.guo

irqchip/gic-v3: Remove gic_root_node variable from the ITS code

BugLink: https://bugs.launchpad.net/bugs/1744754

The gic_root_node variable defined in ITS driver is not actually
used, so just remove it.

Acked-by: Marc Zyngier <email address hidden>
Signed-off-by: Hanjun Guo <email address hidden>
Signed-off-by: Marc Zyngier <email address hidden>
(cherry picked from commit f6ae5085d37b2eaf6cac30ccf4d425e95c7d4b63)
Signed-off-by: dann frazier <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Kleber Sacilotto de Souza <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>