~timg-tpi/ubuntu/+source/linux/+git/focal:focal-azure-mlx5-boot-message-sf00340353

Last commit made on 2022-07-12
Get this branch:
git clone -b focal-azure-mlx5-boot-message-sf00340353 https://git.launchpad.net/~timg-tpi/ubuntu/+source/linux/+git/focal
Only Tim Gardner can upload to this branch. If you are Tim Gardner please log in for upload directions.

Branch merges

Branch information

Name:
focal-azure-mlx5-boot-message-sf00340353
Repository:
lp:~timg-tpi/ubuntu/+source/linux/+git/focal

Recent commits

fbd2fdf... by Tim Gardner

5.4.0-1087.92~sf00340353.1

Signed-off-by: Tim Gardner <email address hidden>

6d9d872... by Tim Gardner

UBUNTU: Ubuntu-azure-5.4.0-1087.92

Signed-off-by: Tim Gardner <email address hidden>

a77cfcf... by Tim Gardner

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <email address hidden>

2cc801f... by Parav Pandit <email address hidden>

net/mlx5: Drain wq first during PCI device removal

mlx5_unload_one() is done with cleanup = true only once.

So instead of doing health wq drain inside the if(), directly do
during PCI device removal.

Signed-off-by: Parav Pandit <email address hidden>
Reviewed-by: Moshe Shemesh <email address hidden>
Signed-off-by: Saeed Mahameed <email address hidden>
(backported from commit 41798df9bfca5aae080a66252ae1709867e28757)
[rtg - context adjustment]
Signed-off-by: Tim Gardner <email address hidden>

824d93c... by Tim Gardner

UBUNTU: Ubuntu-azure-5.4.0-1086.91

Signed-off-by: Tim Gardner <email address hidden>

6482f1b... by Tim Gardner

UBUNTU: [Config] azure: updateconfigs for NVM, NVM_PBLK

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

    Signed-off-by: Kamal Mostafa <email address hidden>
    Signed-off-by: Stefan Bader <email address hidden>

Copied from master

Signed-off-by: Tim Gardner <email address hidden>

85af03e... by Tim Gardner

UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1979462
Properties: no-test-build
Signed-off-by: Tim Gardner <email address hidden>

e6013b3... by Tim Gardner

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Tim Gardner <email address hidden>

5038e6c... by Benjamin Herrenschmidt

printk: Fix preferred console selection with multiple matches

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

In the following circumstances, the rule of selecting the console
corresponding to the last "console=" entry on the command line as
the preferred console (CON_CONSDEV, ie, /dev/console) fails. This
is a specific example, but it could happen with different consoles
that have a similar name aliasing mechanism.

  - The kernel command line has both console=tty0 and console=ttyS0
    in that order (the latter with speed etc... arguments).
    This is common with some cloud setups such as Amazon Linux.

  - add_preferred_console is called early to register "uart0". In
    our case that happens from acpi_parse_spcr() on arm64 since the
    "enable_console" argument is true on that architecture. This causes
    "uart0" to become entry 0 of the console_cmdline array.

Now, because of the above, what happens is:

  - add_preferred_console is called by the cmdline parsing for tty0
    and ttyS0 respectively, thus occupying entries 1 and 2 of the
    console_cmdline array (since this happens after ACPI SPCR parsing).
    At that point preferred_console is set to 2 as expected.

  - When the tty layer kicks in, it will call register_console for tty0.
    This will match entry 1 in console_cmdline array. It isn't our
    preferred console but because it's our only console at this point,
    it will end up "first" in the consoles list.

  - When 8250 probes the actual serial port later on, it calls
    register_console for ttyS0. At that point the loop in register_console
    tries to match it with the entries in the console_cmdline array.
    Ideally this should match ttyS0 in entry 2, which is preferred, causing
    it to be inserted first and to replace tty0 as CONSDEV. However, 8250
    provides a "match" hook in its struct console, and that hook will match
    "uart" as an alias to "ttyS". So we match uart0 at entry 0 in the array
    which is not the preferred console and will not match entry 2 which is
    since we break out of the loop on the first match. As a result,
    we don't set CONSDEV and don't insert it first, but second in
    the console list.

    As a result, we end up with tty0 remaining first in the array, and thus
    /dev/console going there instead of the last user specified one which
    is ttyS0.

This tentative fix register_console() to scan first for consoles
specified on the command line, and only if none is found, to then
scan for consoles specified by the architecture.

Link: https://<email address hidden>
Signed-off-by: Benjamin Herrenschmidt <email address hidden>
Reviewed-by: Petr Mladek <email address hidden>
Reviewed-by: Sergey Senozhatsky <email address hidden>
Signed-off-by: Petr Mladek <email address hidden>
(backported from commit e369d8227fd211be36242fc44a9dc2209e246b9a)
[rtg - updated a call to __add_preferred_console() from stable commit
3cffa06aeef7ece30f6b5ac0ea51f264e8fea4d0 upstream ]
Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Joseph Salisbury <email address hidden>
Acked-by: Thadeu Lima de Souza Cascardo <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>

7d9fcfb... by Benjamin Herrenschmidt

printk: Move console matching logic into a separate function

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

This moves the loop that tries to match a newly registered console
with the command line or add_preferred_console list into a separate
helper, in order to be able to call it multiple times in subsequent
patches.

Link: https://<email address hidden>
Signed-off-by: Benjamin Herrenschmidt <email address hidden>
Reviewed-by: Sergey Senozhatsky <email address hidden>
Reviewed-by: Petr Mladek <email address hidden>
Signed-off-by: Petr Mladek <email address hidden>
(cherry picked from commit ad8cd1db80cc33337bdbee63c453ef6d5132474b)
Signed-off-by: Tim Gardner <email address hidden>
Acked-by: Joseph Salisbury <email address hidden>
Acked-by: Thadeu Lima de Souza Cascardo <email address hidden>
Signed-off-by: Tim Gardner <email address hidden>