提交 · 34348875c0cacf6ea675f85b6f9d36b6ac697395 · openeuler / Kernel

12 1月, 2021 40 次提交

ASoC: amd: change clk_get() to devm_clk_get() and add missed checks · 34348875

由 Chuhong Yuan 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit 64ffbfb1d734001fd0b9a23ab635bd610eacbdd0
bugzilla: 46903

--------------------------------

[ Upstream commit 95d3befb ]

cz_da7219_init() does not check the return values of clk_get(),
while da7219_clk_enable() calls clk_set_rate() to dereference
the pointers.
Add checks to fix the problems.
Also, change clk_get() to devm_clk_get() to avoid data leak after
failures.

Fixes: bb24a31e ("ASoC: AMD: Configure wclk and bclk of master codec")
Signed-off-by: NChuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20201204063610.513556-1-hslester96@gmail.comSigned-off-by: NMark Brown <broonie@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

34348875

drm/mediatek: avoid dereferencing a null hdmi_phy on an error message · 15a501ba

由 Colin Ian King 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit e52398d49d8d20ea93e564ccfa55a814bb08f655
bugzilla: 46903

--------------------------------

[ Upstream commit b097efba ]

Currently there is a null pointer check for hdmi_phy that implies it
may be null, however a dev_err messages dereferences this potential null
pointer.  Avoid a null pointer dereference by only emitting the dev_err
message if hdmi_phy is non-null.  It is a moot point if the error message
needs to be printed at all, but since this is a relatively new piece of
code it may be useful to keep the message in for the moment in case there
are unforseen errors that need to be reported.

Fixes: be28b650 ("drm/mediatek: separate hdmi phy to different file")
Signed-off-by: NColin Ian King <colin.king@canonical.com>
Addresses-Coverity: ("Dereference after null check")
Link: https://lore.kernel.org/r/20201207150937.170435-1-colin.king@canonical.com
[vkoul: fix indent of return call]
Signed-off-by: NVinod Koul <vkoul@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

15a501ba

powerpc/powermac: Fix low_sleep_handler with CONFIG_VMAP_STACK · 582ae144

由 Christophe Leroy 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit 66d1918b2ddb2c45aeb63228e35537e4b5d18005
bugzilla: 46903

--------------------------------

[ Upstream commit db972a37 ]

low_sleep_handler() can't restore the context from standard
stack because the stack can hardly be accessed with MMU OFF.

Store everything in a global storage area instead of storing
a pointer to the stack in that global storage area.

To avoid a complete churn of the function, still use r1 as
the pointer to the storage area during restore.

Fixes: cd08f109 ("powerpc/32s: Enable CONFIG_VMAP_STACK")
Reported-by: NGiuseppe Sacco <giuseppe@sguazz.it>
Signed-off-by: NChristophe Leroy <christophe.leroy@csgroup.eu>
Tested-by: NGiuseppe Sacco <giuseppe@sguazz.it>
Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/e3e0d8042a3ba75cb4a9546c19c408b5b5b28994.1607404931.git.christophe.leroy@csgroup.euSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

582ae144

powerpc/pseries/hibernation: remove redundant cacheinfo update · 96f40687

由 Nathan Lynch 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit 904c6f64fda624e487ce41a4ce43daa74efbd5ba
bugzilla: 46903

--------------------------------

[ Upstream commit b8664594 ]

Partitions with cache nodes in the device tree can encounter the
following warning on resume:

CPU 0 already accounted in PowerPC,POWER9@0(Data)
WARNING: CPU: 0 PID: 3177 at arch/powerpc/kernel/cacheinfo.c:197 cacheinfo_cpu_online+0x640/0x820

These calls to cacheinfo_cpu_offline/online have been redundant since
commit e610a466 ("powerpc/pseries/mobility: rebuild cacheinfo
hierarchy post-migration").

Fixes: e610a466 ("powerpc/pseries/mobility: rebuild cacheinfo hierarchy post-migration")
Signed-off-by: NNathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201207215200.1785968-25-nathanl@linux.ibm.comSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

96f40687

powerpc/pseries/hibernation: drop pseries_suspend_begin() from suspend ops · 4c925a45

由 Nathan Lynch 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit b155175979e165803b8ab8d2c476f6a005166e5f
bugzilla: 46903

--------------------------------

[ Upstream commit 52719fce ]

There are three ways pseries_suspend_begin() can be reached:

1. When "mem" is written to /sys/power/state:

kobj_attr_store()
-> state_store()
  -> pm_suspend()
    -> suspend_devices_and_enter()
      -> pseries_suspend_begin()

This never works because there is no way to supply a valid stream id
using this interface, and H_VASI_STATE is called with a stream id of
zero. So this call path is useless at best.

2. When a stream id is written to /sys/devices/system/power/hibernate.
pseries_suspend_begin() is polled directly from store_hibernate()
until the stream is in the "Suspending" state (i.e. the platform is
ready for the OS to suspend execution):

dev_attr_store()
-> store_hibernate()
  -> pseries_suspend_begin()

3. When a stream id is written to /sys/devices/system/power/hibernate
(continued). After #2, pseries_suspend_begin() is called once again
from the pm core:

dev_attr_store()
-> store_hibernate()
  -> pm_suspend()
    -> suspend_devices_and_enter()
      -> pseries_suspend_begin()

This is redundant because the VASI suspend state is already known to
be Suspending.

The begin() callback of platform_suspend_ops is optional, so we can
simply remove that assignment with no loss of function.

Fixes: 32d8ad4e ("powerpc/pseries: Partition hibernation support")
Signed-off-by: NNathan Lynch <nathanl@linux.ibm.com>
Signed-off-by: NMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201207215200.1785968-18-nathanl@linux.ibm.comSigned-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

4c925a45

ARM: 9030/1: entry: omit FP emulation for UND exceptions taken in kernel mode · 7e818fd0

由 Ard Biesheuvel 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit 40a281cbef6c6c5c59a486625867155058fe8806
bugzilla: 46903

--------------------------------

[ Upstream commit f77ac2e3 ]

There are a couple of problems with the exception entry code that deals
with FP exceptions (which are reported as UND exceptions) when building
the kernel in Thumb2 mode:
- the conditional branch to vfp_kmode_exception in vfp_support_entry()
  may be out of range for its target, depending on how the linker decides
  to arrange the sections;
- when the UND exception is taken in kernel mode, the emulation handling
  logic is entered via the 'call_fpe' label, which means we end up using
  the wrong value/mask pairs to match and detect the NEON opcodes.

Since UND exceptions in kernel mode are unlikely to occur on a hot path
(as opposed to the user mode version which is invoked for VFP support
code and lazy restore), we can use the existing undef hook machinery for
any kernel mode instruction emulation that is needed, including calling
the existing vfp_kmode_exception() routine for unexpected cases. So drop
the call to call_fpe, and instead, install an undef hook that will get
called for NEON and VFP instructions that trigger an UND exception in
kernel mode.

While at it, make sure that the PC correction is accurate for the
execution mode where the exception was taken, by checking the PSR
Thumb bit.

Cc: Dmitry Osipenko <digetx@gmail.com>
Cc: Kees Cook <keescook@chromium.org>
Fixes: eff8728f ("vmlinux.lds.h: Add PGO and AutoFDO input sections")
Signed-off-by: NArd Biesheuvel <ardb@kernel.org>
Reviewed-by: NLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: NNick Desaulniers <ndesaulniers@google.com>
Signed-off-by: NRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

7e818fd0

platform/x86: mlx-platform: Fix item counter assignment for MSN2700/ComEx system · 267de639

由 Vadim Pasternak 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit 00c54f28046d4f2d28b237db42e03140e6fd786c
bugzilla: 46903

--------------------------------

[ Upstream commit cf791774 ]

Fix array names to match assignments for data items and data items
counter in 'mlxplat_mlxcpld_comex_items' structure for:
	.data = mlxplat_mlxcpld_default_pwr_items_data,
	.count = ARRAY_SIZE(mlxplat_mlxcpld_pwr),
and
	.data = mlxplat_mlxcpld_default_fan_items_data,
	.count = ARRAY_SIZE(mlxplat_mlxcpld_fan),

Replace:
- 'mlxplat_mlxcpld_pwr' by 'mlxplat_mlxcpld_default_pwr_items_data' for
   ARRAY_SIZE() calculation.
- 'mlxplat_mlxcpld_fan' by 'mlxplat_mlxcpld_default_fan_items_data'
   for ARRAY_SIZE() calculation.

Fixes: bdd6e155 ("platform/x86: mlx-platform: Add support for new system type")
Signed-off-by: NVadim Pasternak <vadimp@nvidia.com>
Link: https://lore.kernel.org/r/20201207174745.22889-3-vadimp@nvidia.comSigned-off-by: NHans de Goede <hdegoede@redhat.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

267de639

platform/x86: mlx-platform: Fix item counter assignment for MSN2700, MSN24xx systems · e2cedcde

由 Vadim Pasternak 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit acf787ea279d9be94a23207e7d4ab0dd20257fb6
bugzilla: 46903

--------------------------------

[ Upstream commit ba4939f1 ]

Fix array names to match assignments for data items and data items
counter in 'mlxplat_mlxcpld_default_items' structure for:
	.data = mlxplat_mlxcpld_default_pwr_items_data,
	.count = ARRAY_SIZE(mlxplat_mlxcpld_pwr),
and
	.data = mlxplat_mlxcpld_default_fan_items_data,
	.count = ARRAY_SIZE(mlxplat_mlxcpld_fan),

Replace:
- 'mlxplat_mlxcpld_pwr' by 'mlxplat_mlxcpld_default_pwr_items_data' for
   ARRAY_SIZE() calculation.
- 'mlxplat_mlxcpld_fan' by 'mlxplat_mlxcpld_default_fan_items_data'
   for ARRAY_SIZE() calculation.

Fixes: c6acad68 ("platform/mellanox: mlxreg-hotplug: Modify to use a regmap interface")
Signed-off-by: NVadim Pasternak <vadimp@nvidia.com>
Link: https://lore.kernel.org/r/20201207174745.22889-2-vadimp@nvidia.comSigned-off-by: NHans de Goede <hdegoede@redhat.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

e2cedcde

scsi: fnic: Fix error return code in fnic_probe() · 54e1c1d3

由 Zhang Changzhong 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit b8c0a6e6574d545036a555f1e56bccdd9f4214cd
bugzilla: 46903

--------------------------------

[ Upstream commit d4fc94fe ]

Return a negative error code from the error handling case instead of 0 as
done elsewhere in this function.

Link: https://lore.kernel.org/r/1607068060-31203-1-git-send-email-zhangchangzhong@huawei.com
Fixes: 5df6d737 ("[SCSI] fnic: Add new Cisco PCI-Express FCoE HBA")
Reported-by: NHulk Robot <hulkci@huawei.com>
Reviewed-by: NKaran Tilak Kumar <kartilak@cisco.com>
Signed-off-by: NZhang Changzhong <zhangchangzhong@huawei.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

54e1c1d3

seq_buf: Avoid type mismatch for seq_buf_init · 47aabd9d

由 Arnd Bergmann 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit adbd2547e0c5ffe4e4b55a48e50a310557b73d25
bugzilla: 46903

--------------------------------

[ Upstream commit d9a9280a ]

Building with W=2 prints a number of warnings for one function that
has a pointer type mismatch:

linux/seq_buf.h: In function 'seq_buf_init':
linux/seq_buf.h:35:12: warning: pointer targets in assignment from 'unsigned char *' to 'char *' differ in signedness [-Wpointer-sign]

Change the type in the function prototype according to the type in
the structure.

Link: https://lkml.kernel.org/r/20201026161108.3707783-1-arnd@kernel.org

Fixes: 9a777793 ("tracing: Convert seq_buf fields to be like seq_file fields")
Reviewed-by: NCezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
Signed-off-by: NSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

47aabd9d

scsi: iscsi: Fix inappropriate use of put_device() · 46b53482

由 Qinglang Miao 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit dcda662622b17adaec14a1a6d82bf09e87b9ce11
bugzilla: 46903

--------------------------------

[ Upstream commit 6dc1c7ab ]

kfree(conn) is called inside put_device(&conn->dev) which could lead to
use-after-free. In addition, device_unregister() should be used here rather
than put_deviceO().

Link: https://lore.kernel.org/r/20201120074852.31658-1-miaoqinglang@huawei.com
Fixes: f3c893e3 ("scsi: iscsi: Fail session and connection on transport registration failure")
Reported-by: NHulk Robot <hulkci@huawei.com>
Reviewed-by: NMike Christie <michael.christie@oracle.com>
Signed-off-by: NQinglang Miao <miaoqinglang@huawei.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

46b53482

scsi: pm80xx: Fix error return in pm8001_pci_probe() · d8d8396a

由 Zhang Qilong 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit f6d844be9502ae6ea90a603f349be332ef9e5841
bugzilla: 46903

--------------------------------

[ Upstream commit 97031ccf ]

The driver did not return an error in the case where
pm8001_configure_phy_settings() failed.

Use rc to store the return value of pm8001_configure_phy_settings().

Link: https://lore.kernel.org/r/20201205115551.2079471-1-zhangqilong3@huawei.com
Fixes: 27909407 ("[SCSI] pm80xx: Phy settings support for motherboard controller.")
Acked-by: NJack Wang <jinpu.wang@cloud.ionos.com>
Signed-off-by: NZhang Qilong <zhangqilong3@huawei.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

d8d8396a

scsi: qedi: Fix missing destroy_workqueue() on error in __qedi_probe · 3d6bcd4a

由 Qinglang Miao 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit 2619d3cbf7747b3c07ee2486306edd48640bf78e
bugzilla: 46903

--------------------------------

[ Upstream commit 62eebd52 ]

Add the missing destroy_workqueue() before return from __qedi_probe in the
error handling case when fails to create workqueue qedi->offload_thread.

Link: https://lore.kernel.org/r/20201109091518.55941-1-miaoqinglang@huawei.com
Fixes: ace7f46b ("scsi: qedi: Add QLogic FastLinQ offload iSCSI driver framework.")
Reviewed-by: NMike Christie <michael.christie@oracle.com>
Signed-off-by: NQinglang Miao <miaoqinglang@huawei.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

3d6bcd4a

clk: fsl-sai: fix memory leak · bdfbd46c

由 Michael Walle 提交于 1月 07, 2021

stable inclusion
from stable-5.10.4
commit 45d670efcb0b3efbf5a356353b9cada31473acf8
bugzilla: 46903

--------------------------------

[ Upstream commit e81bed41 ]

If the device is removed we don't unregister the composite clock. Fix
that.

Fixes: 9cd10205 ("clk: fsl-sai: new driver")
Signed-off-by: NMichael Walle <michael@walle.cc>
Link: https://lore.kernel.org/r/20201105192746.19564-2-michael@walle.ccSigned-off-by: NStephen Boyd <sboyd@kernel.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NChen Jun <chenjun102@huawei.com>
Acked-by: NXie XiuQi <xiexiuqi@huawei.com>

bdfbd46c

arm64: dts: meson: g12b: w400: fix PHY deassert timing requirements · 0a13f164