The code to try to shut up sparse warnings about questionable locking
didn't shut up sparse: it made the result not parse as valid C at all,
since the end result now has a label with no statement.
The proper fix is to just always lock the hardware, the same way Bart
did in commit 8ae178760b ("scsi: qla2xxx: Simplify the functions for
dumping firmware"). That avoids the whole problem with having locking
that is not statically obvious.
But in the meantime, just remove the incorrect attempt at trying to
avoid a sparse warning that just made things worse.
This was exposed by commit 3e6efab865 ("scsi: qla2xxx: Fix reset of
MPI firmware"), very similarly to how commit cbb01c2f2f ("scsi:
qla2xxx: Fix MPI failure AEN (8200) handling") exposed the same problem
in another place, and caused that commit 8ae178760b.
Please don't add code to just shut up sparse without actually fixing
what sparse complains about.
Bug: 171770067
Link: https://lore.kernel.org/r/20201027080745.GA31045@infradead.org
Reported-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Cc: Bart Van Assche <bvanassche@acm.org>
Cc: Arun Easi <aeasi@marvell.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I7243126a46da8cf144a71907781594ddd137d190
One of the assignments that was removed by commit 4a0c1de64b ("crypto:
x86/poly1305 - Remove assignments with no effect") is actually needed,
since it affects the return value.
This fixes the following crypto self-test failure:
alg: shash: poly1305-simd test failed (wrong result) on test vector 2, cfg="init+update+final aligned buffer"
Bug: 171770067
Link: https://lore.kernel.org/r/20201027080745.GA31045@infradead.org
Fixes: 4a0c1de64b ("crypto: x86/poly1305 - Remove assignments with no effect")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifd01e3694adb618091fa1c1646d677a93382152b
Commit c6e5f9d7cf ("ANDROID: cpu-hotplug: Always use real time
scheduling when hotplugging a CPU") tried to speed-up hotplug of
SCHED_NORMAL tasks by temporarily elevating them to SCHED_FIFO. But
while at it, it also prevented hotplug from SCHED_IDLE, SCHED_BATCH or
SCHED_DEADLINE for no apparent reason.
Since this is a userspace-visible change, and is unlikely to actually be
needed, change the patch logic to only optimize for SCHED_NORMAL tasks
and leave the others untouched.
Bug: 169238689
Fixes: c6e5f9d7cf ("ANDROID: cpu-hotplug: Always use real time
scheduling when hotplugging a CPU")
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: I4d9e88b15fee56e7d234826e2eaea306a69328bb
After enabling interconect scaling for display on the db845c board,
in certain configurations the board hangs, while the following errors
are observed on the console:
Error sending AMC RPMH requests (-110)
qcom_rpmh TCS Busy, retrying RPMH message send: addr=0x50000
qcom_rpmh TCS Busy, retrying RPMH message send: addr=0x50000
qcom_rpmh TCS Busy, retrying RPMH message send: addr=0x50000
...
In this specific case, the above is related to one of the sequencers
being stuck, while client drivers are returning from probe and trying
to disable the currently unused clock and interconnect resources.
Generally we want to keep the multimedia NoC enabled like the rest of
the NoCs, so let's set the keepalive flag on it too.
Fixes: aae57773fb ("interconnect: qcom: sdm845: Split qnodes into their respective NoCs")
Reported-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
Link: https://lore.kernel.org/lkml/20201012194034.26944-1-georgi.djakov@linaro.org/
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I0935e68947919c6a7d38bada810f9e8ed3f61604
We'll want to take the dts changes that landed upstream
in 5.10-rc1, so backout the current delta in android-mainline
and align it to match upstream as of commit 45fe605832
("Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc")
Fixes: f2ddade04b ("ANDROID: lt9611: Sync w/ Vinod's most recent lt9611 patches which enable HDMI audio")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: I93f76c6bbdf465bdfe40067445e47a8e3b3c23cd
Fix bad merge resolutions between Android-specific commit 8de80df7d7
("ANDROID: scsi: ufs: allow ufs variants to override sg entry size")
and the following upstream commits:
- commit 26f968d7de ("scsi: ufs: Introduce UFSHCD_QUIRK_PRDT_BYTE_GRAN quirk")
- commit cc770ce34a ("scsi: ufs: Make ufshcd_print_trs() consider UFSHCD_QUIRK_PRDT_BYTE_GRAN")
This should be folded into
ANDROID-scsi-ufs-allow-ufs-variants-to-override-sg-entry-size.patch.
Fixes: 2c136de302 ("Merge 86cfccb669 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline")
Fixes: 22a7eefbeb ("Merge 55e0500eb5 ("Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi") into android-mainline")
Bug: 162257402
Change-Id: I3a2f1f5b6df43028dde248b9a932f5595dd13e21
Signed-off-by: Eric Biggers <ebiggers@google.com>
With the support for memory hotplug and hotremove fully functional,
and having configs ARCH_ENABLE_MEMORY_HOTPLUG and
ARCH_ENABLE_MEMORY_HOTREMOVE enabled by default for x86 targets,
enable config MEMORY_HOTPLUG and MEMORY_HOTREMOVE.
Bug: 170202777
Change-Id: I09b8768a3116ba53144c9f9890b6471106bcfa22
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
With the support for memory hotplug and hotremove fully
functional, and having configs ARCH_ENABLE_MEMORY_HOTPLUG
and ARCH_ENABLE_MEMORY_HOTREMOVE enabled by default for
arm64 targets, enable config MEMORY_HOTREMOVE.
Bug: 170202777
Change-Id: I618dfeeb3f0f4f2c347e6f6424303725bf15e461
Signed-off-by: Sudarshan Rajagopalan <sudaraja@codeaurora.org>
This reverts commit bca4339bda.
It causes build breakage in the db845c_gki_defconfig
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I4c73e66f0a89cf3ed96fd67b49c9103f35db0e8a
Steps on the way to 5.10-rc1
Resolves conflicts with:
drivers/tty/serial/Kconfig
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I346cc0d7065f68a65fa5ba07911999aca0b01a15
Commit bca815d620 ("PM: AVS: smartreflex Move driver to soc specific
drivers") dropped the CONFIG_POWER_AVS configuration option, so it also
needs to be dropped from the arm64 gki_defconfig so that the build
continues to work.
Fixes: bca815d620 ("PM: AVS: smartreflex Move driver to soc specific drivers")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie437bf0dc6977dd58caffb1349186d16873798c9
Steps on the way to 5.10-rc1
Resolves conflicts in:
Documentation/admin-guide/sysctl/vm.rst
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic58f28718f28dae42948c935dfb0c62122fe86fc
Steps on the way to 5.10-rc1
Resolves conflicts in:
arch/arm64/kernel/vdso32/Makefile
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic9edce8127b3717469dc4fa96ca95166be419e9d
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/ext4/dir.c
fs/ext4/ext4.h
fs/ext4/namei.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id6e2b1b8af69519089493f32617f1b2b06dbf434
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/ext4/dir.c
fs/ext4/ext4.h
fs/ext4/namei.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I397787046920175eb183fa5342d2923f819bb2f4
kzfree() is about to go away, as it was attempted in 5.9-rc1, but will
really happen in 5.10-rc1. So move the dm-default-key.c file to use
kfree_sensitive() as it should be using.
Bug: 137270441
Bug: 147814592
Cc: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Idc1c004eabbda7e4854866f6c9cf71bd61f9b1df
