commit 99c2dfe47a9c6613e040f1721368c2c298383257
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Tue Sep 20 12:38:33 2022 +0200

    Linux 5.10.144
    
    Link: https://lore.kernel.org/r/20220916100445.354452396@linuxfoundation.org
    Tested-by: Pavel Machek (CIP) <pavel@denx.de>
    Tested-by: Guenter Roeck <linux@roeck-us.net>
    Tested-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
    Tested-by: Florian Fainelli <f.fainelli@gmail.com>
    Tested-by: Salvatore Bonaccorso <carnil@debian.org>
    Tested-by: Hulk Robot <hulkrobot@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 744f98f71dc6424324272bc66d982a43f72fe009
Author: Jarrah Gosbell <kernel@undef.tools>
Date:   Tue Aug 23 10:00:37 2022 -0700

    Input: goodix - add compatible string for GT1158
    
    commit 80b9ebd3e478cd41526cbf84f80c3e0eb885d1d3 upstream.
    
    Add compatible string for GT1158 missing from the previous patch.
    
    Fixes: 425fe4709c76 ("Input: goodix - add support for GT1158")
    Signed-off-by: Jarrah Gosbell <kernel@undef.tools>
    Link: https://lore.kernel.org/r/20220813043821.9981-1-kernel@undef.tools
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit c7f4c203d18ca29c437c405b2b1a8de5c2cac5d7
Author: Mathew McBride <matt@traverse.com.au>
Date:   Thu Sep 1 05:21:49 2022 +0000

    soc: fsl: select FSL_GUTS driver for DPIO
    
    commit 9a472613f5bccf1b36837423495ae592a9c5182f upstream.
    
    The soc/fsl/dpio driver will perform a soc_device_match()
    to determine the optimal cache settings for a given CPU core.
    
    If FSL_GUTS is not enabled, this search will fail and
    the driver will not configure cache stashing for the given
    DPIO, and a string of "unknown SoC" messages will appear:
    
    fsl_mc_dpio dpio.7: unknown SoC version
    fsl_mc_dpio dpio.6: unknown SoC version
    fsl_mc_dpio dpio.5: unknown SoC version
    
    Fixes: 51da14e96e9b ("soc: fsl: dpio: configure cache stashing destination")
    Signed-off-by: Mathew McBride <matt@traverse.com.au>
    Reviewed-by: Ioana Ciornei <ioana.ciornei@nxp.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20220901052149.23873-2-matt@traverse.com.au'
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 35371fd68807f41a4072c01c166de5425a2a47e5
Author: Peter Zijlstra <peterz@infradead.org>
Date:   Wed Sep 14 14:52:38 2022 +0300

    x86/ftrace: Use alternative RET encoding
    
    commit 1f001e9da6bbf482311e45e48f53c2bd2179e59c upstream.
    
    Use the return thunk in ftrace trampolines, if needed.
    
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    [cascardo: use memcpy(text_gen_insn) as there is no __text_gen_insn]
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
    Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 4586df06a02049f4315c25b947c6dde2627c0d18
Author: Peter Zijlstra <peterz@infradead.org>
Date:   Wed Sep 14 14:52:37 2022 +0300

    x86/ibt,ftrace: Make function-graph play nice
    
    commit e52fc2cf3f662828cc0d51c4b73bed73ad275fce upstream.
    
    Return trampoline must not use indirect branch to return; while this
    preserves the RSB, it is fundamentally incompatible with IBT. Instead
    use a retpoline like ROP gadget that defeats IBT while not unbalancing
    the RSB.
    
    And since ftrace_stub is no longer a plain RET, don't use it to copy
    from. Since RET is a trivial instruction, poke it directly.
    
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Link: https://lore.kernel.org/r/20220308154318.347296408@infradead.org
    [cascardo: remove ENDBR]
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
    [OP: adjusted context for 5.10-stable]
    Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 33015556a943d6cbb18c555925a54b8c0e46f521
Author: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Date:   Wed Sep 14 14:52:36 2022 +0300

    Revert "x86/ftrace: Use alternative RET encoding"
    
    This reverts commit 00b136bb6254e0abf6aaafe62c4da5f6c4fea4cb.
    
    This temporarily reverts the backport of upstream commit
    1f001e9da6bbf482311e45e48f53c2bd2179e59c. It was not correct to copy the
    ftrace stub as it would contain a relative jump to the return thunk which
    would not apply to the context where it was being copied to, leading to
    ftrace support to be broken.
    
    Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
    Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit 891f03f688de8418f44b32b88f6b4faed5b2aa81
Author: Jann Horn <jannh@google.com>
Date:   Thu Sep 15 16:25:19 2022 +0200

    mm: Fix TLB flush for not-first PFNMAP mappings in unmap_region()
    
    This is a stable-specific patch.
    I botched the stable-specific rewrite of
    commit b67fbebd4cf98 ("mmu_gather: Force tlb-flush VM_PFNMAP vmas"):
    As Hugh pointed out, unmap_region() actually operates on a list of VMAs,
    and the variable "vma" merely points to the first VMA in that list.
    So if we want to check whether any of the VMAs we're operating on is
    PFNMAP or MIXEDMAP, we have to iterate through the list and check each VMA.
    
    Signed-off-by: Jann Horn <jannh@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

commit dd3aa77d5d72f4c660ae803f515f310251089e94
Author: Hu Xiaoying <huxiaoying@kylinos.cn>
Date:   Thu Sep 1 12:57:37 2022 +0800

    usb: storage: Add ASUS <0x0b05:0x1932> to IGNORE_UAS
    
    [ Upstream commit c61feaee68b9735be06f162bc046c7f1959efb0c ]
    
    USB external storage device(0x0b05:1932), use gnome-disk-utility tools
    to test usb write  < 30MB/s.
    if does not to load module of uas for this device, can increase the
    write speed from 20MB/s to >40MB/s.
    
    Suggested-by: Matthias Kaehlcke <mka@chromium.org>
    Acked-by: Alan Stern <stern@rowland.harvard.edu>
    Signed-off-by: Hu Xiaoying <huxiaoying@kylinos.cn>
    Link: https://lore.kernel.org/r/20220901045737.3438046-1-huxiaoying@kylinos.cn
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 5ce017619c30ced0701dde095c87350ef39a09e9
Author: Hans de Goede <hdegoede@redhat.com>
Date:   Mon Aug 29 18:35:44 2022 +0200

    platform/x86: acer-wmi: Acer Aspire One AOD270/Packard Bell Dot keymap fixes
    
    [ Upstream commit c3b82d26bc85f5fc2fef5ec8cce17c89633a55a8 ]
    
    2 keymap fixes for the Acer Aspire One AOD270 and the same hardware
    rebranded as Packard Bell Dot SC:
    
    1. The F2 key is marked with a big '?' symbol on the Packard Bell Dot SC,
    this sends WMID_HOTKEY_EVENTs with a scancode of 0x27 add a mapping
    for this.
    
    2. Scancode 0x61 is KEY_SWITCHVIDEOMODE. Usually this is a duplicate
    input event with the "Video Bus" input device events. But on these devices
    the "Video Bus" does not send events for this key. Map 0x61 to KEY_UNKNOWN
    instead of using KE_IGNORE so that udev/hwdb can override it on these devs.
    
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Link: https://lore.kernel.org/r/20220829163544.5288-1-hdegoede@redhat.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit fc2c14c2cde931d2fb8fc24a2c5dc3c22504eb19
Author: Yu Zhe <yuzhe@nfschina.com>
Date:   Thu Aug 25 09:18:44 2022 +0800

    perf/arm_pmu_platform: fix tests for platform_get_irq() failure
    
    [ Upstream commit 6bb0d64c100091e131cd16710b62fda3319cd0af ]
    
    The platform_get_irq() returns negative error codes.  It can't actually
    return zero.
    
    Signed-off-by: Yu Zhe <yuzhe@nfschina.com>
    Link: https://lore.kernel.org/r/20220825011844.8536-1-yuzhe@nfschina.com
    Signed-off-by: Will Deacon <will@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 187908079d94673b01fbd63d7251bfab4341e7cb
Author: Chengming Gui <Jack.Gui@amd.com>
Date:   Tue Aug 30 16:33:01 2022 +0800

    drm/amd/amdgpu: skip ucode loading if ucode_size == 0
    
    [ Upstream commit 39c84b8e929dbd4f63be7e04bf1a2bcd92b44177 ]
    
    Restrict the ucode loading check to avoid frontdoor loading error.
    
    Signed-off-by: Chengming Gui <Jack.Gui@amd.com>
    Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
    Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit c598e2704c3b315078c07d97cec02573bfe1fa7e
Author: Maurizio Lombardi <mlombard@redhat.com>
Date:   Mon Aug 29 14:40:30 2022 +0200

    nvmet-tcp: fix unhandled tcp states in nvmet_tcp_state_change()
    
    [ Upstream commit 478814a5584197fa1fb18377653626e3416e7cd6 ]
    
    TCP_FIN_WAIT2 and TCP_LAST_ACK were not handled, the connection is closing
    so we can ignore them and avoid printing the "unhandled state"
    warning message.
    
    [ 1298.852386] nvmet_tcp: queue 2 unhandled state 5
    [ 1298.879112] nvmet_tcp: queue 7 unhandled state 5
    [ 1298.884253] nvmet_tcp: queue 8 unhandled state 5
    [ 1298.889475] nvmet_tcp: queue 9 unhandled state 5
    
    v2: Do not call nvmet_tcp_schedule_release_queue(), just ignore
    the fin_wait2 and last_ack states.
    
    Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
    Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
    Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 1cae6f8e17657c06e55f9c80dcc739b5dc959f68
Author: Greg Tulli <greg.iforce@gmail.com>
Date:   Mon Aug 29 11:21:03 2022 -0700

    Input: iforce - add support for Boeder Force Feedback Wheel
    
    [ Upstream commit 9c9c71168f7979f3798b61c65b4530fbfbcf19d1 ]
    
    Add a new iforce_device entry to support the Boeder Force Feedback Wheel
    device.
    
    Signed-off-by: Greg Tulli <greg.iforce@gmail.com>
    Link: https://lore.kernel.org/r/3256420-c8ac-31b-8499-3c488a9880fd@gmail.com
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit de2aa495230bee743ebdabfe02a376ce24713886
Author: Li Qiong <liqiong@nfschina.com>
Date:   Mon Aug 29 15:12:59 2022 +0800

    ieee802154: cc2520: add rc code in cc2520_tx()
    
    [ Upstream commit ffd7bdddaab193c38416fd5dd416d065517d266e ]
    
    The rc code is 0 at the error path "status & CC2520_STATUS_TX_UNDERFLOW".
    Assign rc code with '-EINVAL' at this error path to fix it.
    
    Signed-off-by: Li Qiong <liqiong@nfschina.com>
    Link: https://lore.kernel.org/r/20220829071259.18330-1-liqiong@nfschina.com
    Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 3815e66c2183f3430490e450ba16779cf5214ec6
Author: Wei Yongjun <weiyongjun1@huawei.com>
Date:   Mon Aug 22 04:10:25 2022 +0000

    gpio: mockup: remove gpio debugfs when remove device
    
    [ Upstream commit 303e6da99429510b1e4edf833afe90ac8542e747 ]
    
    GPIO mockup debugfs is created in gpio_mockup_probe() but
    forgot to remove when remove device. This patch add a devm
    managed callback for removing them.
    
    Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
    Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 1b8b5384e83a0ae0bcbcca7c8bbfcbed1bd97406
Author: Kai-Heng Feng <kai.heng.feng@canonical.com>
Date:   Fri Aug 26 08:25:30 2022 +0800

    tg3: Disable tg3 device on system reboot to avoid triggering AER
    
    [ Upstream commit 2ca1c94ce0b65a2ce7512b718f3d8a0fe6224bca ]
    
    Commit d60cd06331a3 ("PM: ACPI: reboot: Use S5 for reboot") caused a
    reboot hang on one Dell servers so the commit was reverted.
    
    Someone managed to collect the AER log and it's caused by MSI:
    [ 148.762067] ACPI: Preparing to enter system sleep state S5
    [ 148.794638] {1}[Hardware Error]: Hardware error from APEI Generic Hardware Error Source: 5
    [ 148.803731] {1}[Hardware Error]: event severity: recoverable
    [ 148.810191] {1}[Hardware Error]: Error 0, type: fatal
    [ 148.816088] {1}[Hardware Error]: section_type: PCIe error
    [ 148.822391] {1}[Hardware Error]: port_type: 0, PCIe end point
    [ 148.829026] {1}[Hardware Error]: version: 3.0
    [ 148.834266] {1}[Hardware Error]: command: 0x0006, status: 0x0010
    [ 148.841140] {1}[Hardware Error]: device_id: 0000:04:00.0
    [ 148.847309] {1}[Hardware Error]: slot: 0
    [ 148.852077] {1}[Hardware Error]: secondary_bus: 0x00
    [ 148.857876] {1}[Hardware Error]: vendor_id: 0x14e4, device_id: 0x165f
    [ 148.865145] {1}[Hardware Error]: class_code: 020000
    [ 148.870845] {1}[Hardware Error]: aer_uncor_status: 0x00100000, aer_uncor_mask: 0x00010000
    [ 148.879842] {1}[Hardware Error]: aer_uncor_severity: 0x000ef030
    [ 148.886575] {1}[Hardware Error]: TLP Header: 40000001 0000030f 90028090 00000000
    [ 148.894823] tg3 0000:04:00.0: AER: aer_status: 0x00100000, aer_mask: 0x00010000
    [ 148.902795] tg3 0000:04:00.0: AER: [20] UnsupReq (First)
    [ 148.910234] tg3 0000:04:00.0: AER: aer_layer=Transaction Layer, aer_agent=Requester ID
    [ 148.918806] tg3 0000:04:00.0: AER: aer_uncor_severity: 0x000ef030
    [ 148.925558] tg3 0000:04:00.0: AER: TLP Header: 40000001 0000030f 90028090 00000000
    
    The MSI is probably raised by incoming packets, so power down the device
    and disable bus mastering to stop the traffic, as user confirmed this
    approach works.
    
    In addition to that, be extra safe and cancel reset task if it's running.
    
    Cc: Josef Bacik <josef@toxicpanda.com>
    Link: https://lore.kernel.org/all/b8db79e6857c41dab4ef08bdf826ea7c47e3bafc.1615947283.git.josef@toxicpanda.com/
    BugLink: https://bugs.launchpad.net/bugs/1917471
    Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
    Reviewed-by: Michael Chan <michael.chan@broadcom.com>
    Link: https://lore.kernel.org/r/20220826002530.1153296-1-kai.heng.feng@canonical.com
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 704d1f2ac6dce37e8ae305edc3d9813d32a92e9d
Author: Even Xu <even.xu@intel.com>
Date:   Thu Aug 4 08:59:19 2022 +0800

    hid: intel-ish-hid: ishtp: Fix ishtp client sending disordered message
    
    [ Upstream commit e1fa076706209cc447d7a2abd0843a18277e5ef7 ]
    
    There is a timing issue captured during ishtp client sending stress tests.
    It was observed during stress tests that ISH firmware is getting out of
    ordered messages. This is a rare scenario as the current set of ISH client
    drivers don't send much data to firmware. But this may not be the case
    going forward.
    
    When message size is bigger than IPC MTU, ishtp splits the message into
    fragments and uses serialized async method to send message fragments.
    The call stack:
    ishtp_cl_send_msg_ipc->ipc_tx_callback(first fregment)->
    ishtp_send_msg(with callback)->write_ipc_to_queue->
    write_ipc_from_queue->callback->ipc_tx_callback(next fregment)......
    
    When an ipc write complete interrupt is received, driver also calls
    write_ipc_from_queue->ipc_tx_callback in ISR to start sending of next fragment.
    
    Through ipc_tx_callback uses spin_lock to protect message splitting, as the
    serialized sending method will call back to ipc_tx_callback again, so it doesn't
    put sending under spin_lock, it causes driver cannot guarantee all fragments
    be sent in order.
    
    Considering this scenario:
    ipc_tx_callback just finished a fragment splitting, and not call ishtp_send_msg
    yet, there is a write complete interrupt happens, then ISR->write_ipc_from_queue
    ->ipc_tx_callback->ishtp_send_msg->write_ipc_to_queue......
    
    Because ISR has higher exec priority than normal thread, this causes the new
    fragment be sent out before previous fragment. This disordered message causes
    invalid message to firmware.
    
    The solution is, to send fragments synchronously:
    Use ishtp_write_message writing fragments into tx queue directly one by one,
    instead of ishtp_send_msg only writing one fragment with completion callback.
    As no completion callback be used, so change ipc_tx_callback to ipc_tx_send.
    
    Signed-off-by: Even Xu <even.xu@intel.com>
    Acked-by: Srinivas Pandruvada <srinivas.pandruvada@intel.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit ef033e619e4d219b627adb7f1138530300a0d5c6
Author: Jason Wang <wangborong@cdjrlc.com>
Date:   Thu Aug 4 08:58:14 2022 +0800

    HID: ishtp-hid-clientHID: ishtp-hid-client: Fix comment typo
    
    [ Upstream commit 94553f8a218540d676efbf3f7827ed493d1057cf ]
    
    The double `like' is duplicated in the comment, remove one.
    
    Signed-off-by: Jason Wang <wangborong@cdjrlc.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit cff2b3a50c69c0c72593f87190c88d0235df6503
Author: Rob Clark <robdclark@chromium.org>
Date:   Sun Aug 7 09:09:01 2022 -0700

    drm/msm/rd: Fix FIFO-full deadlock
    
    [ Upstream commit 174974d8463b77c2b4065e98513adb204e64de7d ]
    
    If the previous thing cat'ing $debugfs/rd left the FIFO full, then
    subsequent open could deadlock in rd_write() (because open is blocked,
    not giving a chance for read() to consume any data in the FIFO).  Also
    it is generally a good idea to clear out old data from the FIFO.
    
    Signed-off-by: Rob Clark <robdclark@chromium.org>
    Patchwork: https://patchwork.freedesktop.org/patch/496706/
    Link: https://lore.kernel.org/r/20220807160901.2353471-2-robdclark@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit fac2c299efc69afc10cd231a5e52f1a7bd788fa5
Author: Ondrej Jirman <megi@xff.cz>
Date:   Thu Aug 11 16:16:54 2022 -0700

    Input: goodix - add support for GT1158
    
    [ Upstream commit 425fe4709c76e35f93f4c0e50240f0b61b2a2e54 ]
    
    This controller is used by PinePhone and PinePhone Pro. Support for
    the PinePhone Pro will be added in a later patch set.
    
    Signed-off-by: Ondrej Jirman <megi@xff.cz>
    Signed-off-by: Jarrah Gosbell <kernel@undef.tools>
    Reviewed-by: Hans de Goede <hdegoede@redhat.com>
    Link: https://lore.kernel.org/r/20220809091200.290492-1-kernel@undef.tools
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 218b71e32f9ab343755deb64e4fdf51544dd12fd
Author: Brian Norris <briannorris@chromium.org>
Date:   Fri Aug 26 17:44:17 2022 -0700

    tracefs: Only clobber mode/uid/gid on remount if asked
    
    [ Upstream commit 47311db8e8f33011d90dee76b39c8886120cdda4 ]
    
    Users may have explicitly configured their tracefs permissions; we
    shouldn't overwrite those just because a second mount appeared.
    
    Only clobber if the options were provided at mount time.
    
    Note: the previous behavior was especially surprising in the presence of
    automounted /sys/kernel/debug/tracing/.
    
    Existing behavior:
    
      ## Pre-existing status: tracefs is 0755.
      # stat -c '%A' /sys/kernel/tracing/
      drwxr-xr-x
    
      ## (Re)trigger the automount.
      # umount /sys/kernel/debug/tracing
      # stat -c '%A' /sys/kernel/debug/tracing/.
      drwx------
    
      ## Unexpected: the automount changed mode for other mount instances.
      # stat -c '%A' /sys/kernel/tracing/
      drwx------
    
    New behavior (after this change):
    
      ## Pre-existing status: tracefs is 0755.
      # stat -c '%A' /sys/kernel/tracing/
      drwxr-xr-x
    
      ## (Re)trigger the automount.
      # umount /sys/kernel/debug/tracing
      # stat -c '%A' /sys/kernel/debug/tracing/.
      drwxr-xr-x
    
      ## Expected: the automount does not change other mount instances.
      # stat -c '%A' /sys/kernel/tracing/
      drwxr-xr-x
    
    Link: https://lkml.kernel.org/r/20220826174353.2.Iab6e5ea57963d6deca5311b27fb7226790d44406@changeid
    
    Cc: stable@vger.kernel.org
    Fixes: 4282d60689d4f ("tracefs: Add new tracefs file system")
    Signed-off-by: Brian Norris <briannorris@chromium.org>
    Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 0a81ddfc20cce49606c1aadc8c6171cb1d4fe273
Author: Lu Baolu <baolu.lu@linux.intel.com>
Date:   Tue Aug 23 14:15:55 2022 +0800

    iommu/vt-d: Correctly calculate sagaw value of IOMMU
    
    [ Upstream commit 53fc7ad6edf210b497230ce74b61b322a202470c ]
    
    The Intel IOMMU driver possibly selects between the first-level and the
    second-level translation tables for DMA address translation. However,
    the levels of page-table walks for the 4KB base page size are calculated
    from the SAGAW field of the capability register, which is only valid for
    the second-level page table. This causes the IOMMU driver to stop working
    if the hardware (or the emulated IOMMU) advertises only first-level
    translation capability and reports the SAGAW field as 0.
    
    This solves the above problem by considering both the first level and the
    second level when calculating the supported page table levels.
    
    Fixes: b802d070a52a1 ("iommu/vt-d: Use iova over first level")
    Cc: stable@vger.kernel.org
    Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
    Link: https://lore.kernel.org/r/20220817023558.3253263-1-baolu.lu@linux.intel.com
    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit 5ce1b0a0c27cd38ee908e5ac581ead717943632b
Author: Marco Felsch <m.felsch@pengutronix.de>
Date:   Tue Jul 26 15:05:22 2022 +0200

    ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible
    
    [ Upstream commit af7d78c957017f8b3a0986769f6f18e57f9362ea ]
    
    Drop the "winbond,w25q16dw" compatible since it causes to set the
    MODALIAS to w25q16dw which is not specified within spi-nor id table.
    Fix this by use the common "jedec,spi-nor" compatible.
    
    Fixes: 2125212785c9 ("ARM: dts: imx6qdl-kontron-samx6i: add Kontron SMARC SoM Support")
    Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>

commit a381cac2ab080944893b096570dd4b324be87e26
Author: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Date:   Thu Apr 7 16:31:54 2022 +0200

    ARM: dts: imx: align SPI NOR node name with dtschema
    
    [ Upstream commit ba9fe460dc2cfe90dc115b22af14dd3f13cffa0f ]
    
    The node names should be generic and SPI NOR dtschema expects "flash".
    
    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Stable-dep-of: af7d78c95701 ("ARM: dts: imx6qdl-kontron-samx6i: fix spi-flash compatible")
    Signed-off-by: Sasha Levin <sashal@kernel.org>