02 Nov, 2020
1 commit
-
This reverts commit 836219141ff7a77e7fab0bd749edd746fd36fef2.
Bug: 171539436
Signed-off-by: Greg Kroah-Hartman
Change-Id: Ia401cbfe62bf5d9e03afab9f9fc6086bd5b34bbf
31 Oct, 2020
1 commit
-
Commit 88adaf726ee3 ("Revert "ANDROID: drivers: gpu: drm: fix bugs
encountered while fuzzing"") introduced an out-of-tree difference that
this patch compensates.Fixes: 88adaf726ee3 ("Revert "ANDROID: drivers: gpu: drm: fix bugs encountered while fuzzing"")
Signed-off-by: Matthias Maennich
Change-Id: Ie6d125567365fea8db735e9ad9d8af4262d958fc
30 Oct, 2020
3 commits
-
The below call stack prevents clk_gating at every IO completion.
We can remove the condition, ufshcd_any_tag_in_use(), since clkgating_work
will check it again.ufshcd_complete_requests(struct ufs_hba *hba)
ufshcd_transfer_req_compl()
__ufshcd_transfer_req_compl()
__ufshcd_release(hba)
if (ufshcd_any_tag_in_use() == 1)
return;
ufshcd_tmc_handler(hba);
blk_mq_tagset_busy_iter();Note that, this still requires a work to deal with a potential racy condition
when user sets clkgating.delay_ms to very small value. That can cause preventing
clkgating by the check of ufshcd_any_tag_in_use() in gate_work.Link: https://lore.kernel.org/linux-scsi/20201028194352.GA3060274@google.com/T/#m3485ba8df14e4ad5cf0aa5b314ffe1cb90d90105
Fixes: 7252a3603015 ("scsi: ufs: Avoid busy-waiting by eliminating tag conflicts")
Signed-off-by: Jaegeuk Kim
Reviewed-by: Asutosh Das
Change-Id: I9b56725b26e1be8b1da55ae1db7322ab00fc5298 -
When giving a stress test which enables/disables clkgating, we hit device
timeout sometimes. This patch avoids subtle racy condition to address it.Note that, this requires a patch to address the device stuck by REQ_CLKS_OFF in
__ufshcd_release().The fix is "scsi: ufs: avoid to call REQ_CLKS_OFF to CLKS_OFF".
Link: https://lore.kernel.org/linux-scsi/20201028194352.GA3060274@google.com/T/#m979bdb55500f3f63fa4e975524f8559c80697862
Signed-off-by: Jaegeuk Kim
Change-Id: Ice47cbd199850aadd15166ac414fd97db3a79aad -
Once UFS was gated with CLKS_OFF, it should not call REQ_CLKS_OFF again, which
caused hibern8_enter failure.Link: https://lore.kernel.org/linux-scsi/20201028194352.GA3060274@google.com/T/#m3485ba8df14e4ad5cf0aa5b314ffe1cb90d90105
Signed-off-by: Jaegeuk Kim
Change-Id: Ia5cad145189c266b1bfba34ad3875f8ccf8ec322
29 Oct, 2020
3 commits
-
DYNAMIC_MINORS value has been set to 64.
Due to this reason, we are facing a module loading fail problem of
device driver like below.[ 45.712771] pdic_misc_init - return error : -16
We need to increase this value for registering more misc devices.
Signed-off-by: Sangmoon Kim
Bug: 171370390
Link: https://lore.kernel.org/lkml/20201029070552.GA3062343@kroah.com/
Change-Id: I04ab486ce7674dde3118506c3d783f0e4e211bac
Signed-off-by: Sangmoon Kim -
Linux 5.10-rc1
Signed-off-by: Greg Kroah-Hartman
Change-Id: Iace3fc84a00d3023c75caa086a266de17dc1847c -
…/linux/kernel/git/wsa/linux") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Iec426c6de4a59a517e5fa575a9424b883d958f08
28 Oct, 2020
4 commits
-
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 8ae178760b23 ("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 3e6efab865ac ("scsi: qla2xxx: Fix reset of
MPI firmware"), very similarly to how commit cbb01c2f2f63 ("scsi:
qla2xxx: Fix MPI failure AEN (8200) handling") exposed the same problem
in another place, and caused that commit 8ae178760b23.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
Cc: Bart Van Assche
Cc: Arun Easi
Signed-off-by: Linus Torvalds
Signed-off-by: Greg Kroah-Hartman
Change-Id: I7243126a46da8cf144a71907781594ddd137d190 -
This reverts commit 86ca9b3172ccc162a7dada27781cbe7c148c6550.
Bug: 171770067
Signed-off-by: Greg Kroah-Hartman
Change-Id: Id0d37898ed807f1f3419333f8f5906a01f602fc4 -
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: aae57773fbe0 ("interconnect: qcom: sdm845: Split qnodes into their respective NoCs")
Reported-by: Amit Pundir
Signed-off-by: Georgi Djakov
Link: https://lore.kernel.org/lkml/20201012194034.26944-1-georgi.djakov@linaro.org/
Signed-off-by: John Stultz
Change-Id: I0935e68947919c6a7d38bada810f9e8ed3f61604 -
Fix bad merge resolutions between Android-specific commit 8de80df7d7e4
("ANDROID: scsi: ufs: allow ufs variants to override sg entry size")
and the following upstream commits:- commit 26f968d7de82 ("scsi: ufs: Introduce UFSHCD_QUIRK_PRDT_BYTE_GRAN quirk")
- commit cc770ce34aee ("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: 2c136de3024f ("Merge 86cfccb66937 ("Merge tag 'dlm-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm") into android-mainline")
Fixes: 22a7eefbebcf ("Merge 55e0500eb5c0 ("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
27 Oct, 2020
7 commits
-
…m/linux/kernel/git/soc/soc") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Icb74220e749f8da18b6fa8cb4e626e43e2d69931 -
…x/kernel/git/soc/soc") into android-mainline
Steps on the way to 5.10-rc1
Resolves conflicts with:
drivers/tty/serial/KconfigSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I346cc0d7065f68a65fa5ba07911999aca0b01a15 -
…nux/kernel/git/soc/soc") into android-mainline
Steps on the way to 5.10-rc1
Resolves conflicts in:
Documentation/admin-guide/sysctl/vm.rstSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ic58f28718f28dae42948c935dfb0c62122fe86fc -
…cm/linux/kernel/git/jeyu/linux") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I01ffb419ee26d1c02046a0d22f960f29a3c47e7c -
…cm/linux/kernel/git/helgaas/pci") into android-mainline
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/ext4/dir.c
fs/ext4/ext4.h
fs/ext4/namei.cSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id6e2b1b8af69519089493f32617f1b2b06dbf434 -
This reverts commit c6f7c753f71cccb21d1a7f0c1127ce7804374c5e.
Bug: 171770067
Signed-off-by: Greg Kroah-Hartman
Change-Id: I396f806c50e112dfe8f5f539258bc36aee98fea0 -
…linux/kernel/git/viro/vfs") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie419e3d94c75a9549195518b8a0a003e4e1755a1
26 Oct, 2020
21 commits
-
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
Signed-off-by: Greg Kroah-Hartman
Change-Id: Idc1c004eabbda7e4854866f6c9cf71bd61f9b1df -
…") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I6357a7a9490cf8092ef9769d04906290cb878ce6 -
…") into android-mainline
Steps on the way to 5.10-rc1
Resolves conflicts in:
drivers/net/virtio_net.cSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I72bb00e45bb7b6154b56f31a2e9040c4e8fe899a -
…kernel/git/abelloni/linux") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8fb3e354b078fcccac88a148c84e9ee4c39118f8 -
…/kernel/git/sre/linux-power-supply") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie67a4cdc4b30c466c302c46bd1348b3e94ea8f91 -
…m/linux/kernel/git/mszeredi/fuse") into android-mainline
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/fuse/fuse_i.hSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifa200ce8fae0e3b38c86351006824c62328c00f7 -
…/linux/kernel/git/dlemoal/zonefs") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I520719ae5e0d992c3756e393cb299d77d650622e -
…rnel.org/pub/scm/linux/kernel/git/acme/linux") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I970720ab22b9fba22718c9c50580a96dbf356247 -
…nux/kernel/git/mchehab/linux-media") into android-mainline
Steps on the way to 5.10-rc1
Resolves conflicts in:
fs/userfaultfd.cSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie3fe3c818f1f6565cfd4fa551de72d2b72ef60af -
…inux/kernel/git/netdev/net-next") into android-mainline
Steps on the way to 5.10-rc1
Resolves merge issues in:
drivers/net/virtio_net.c
net/xfrm/xfrm_state.c
net/xfrm/xfrm_user.cSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I3132e7802f25cb775eb02d0b3a03068da39a6fe2 -
…scm/linux/kernel/git/hyperv/linux") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I1a4319d3921c77e672ffa5a0efec4882736a74f7 -
Commit 9f4df96b8781 ("dma-mapping: merge into
") moved the header file, so do the same thing for
our out-of-tree ION code as well, to fix the build issues.Fixes: 9f4df96b8781 ("dma-mapping: merge into ")
Fixes: b2117ae840bd ("ANDROID: ion: flush cache before exporting non-cached buffers")
Cc: Vincent Donnefort
Signed-off-by: Greg Kroah-Hartman
Change-Id: I20e2f47598bee9dcf311cd62b49541ebcb061fca -
…rs/hch/dma-mapping") into android-mainline
Resolves conflicts in:
kernel/dma/mapping.cSteps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I61292201a3ac4b92c39f330585692652cf985550 -
…scm/linux/kernel/git/vkoul/dmaengine") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I9e4e2fd72b461a7e67292d2db05adc7c1c3a0552 -
…linux/kernel/git/tiwai/sound") into android-mainline
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2833b58dbd8d715935ac010349f6e28657078bd0 -
…p.org/drm/drm") into android-mainline
Steps on the way to 5.10-rc1
Fixes merge conflicts in:
drivers/gpu/drm/bridge/lontium-lt9611.c
drivers/gpu/drm/virtio/virtgpu_display.cSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I65d9d4c69ea7c79854d275462c9aca0a37d42654 -
…scm/linux/kernel/git/gregkh/char-misc") into android-mainline
Steps on the way to 5.10-rc1
Resolves conflicts in:
drivers/hwtracing/stm/ftrace.c
drivers/misc/MakefileSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I8ac53000bf0c61973970f47b383904a2067bd353 -
…nux/kernel/git/gregkh/usb") into android-mainline
Steps on the way to 5.10-rc1
Fixes merges in:
drivers/usb/typec/tcpm/tcpm.c
include/linux/usb/tcpm.hSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie6de88b6cdc3415679c2f931fc03147a7609d333 -
…m/linux/kernel/git/gregkh/staging") into android-mainline
Steps on the way to 5.10-rc1
Resolves conflicts in:
drivers/staging/android/ion/ion.cSigned-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I77e65fccc386a64a46a394fba2ea312d82d84d36 -
…inux/kernel/git/gregkh/spdx") into android-mailine
Steps on the way to 5.10-rc1
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifd6acb7037073d3b8411647e2087aa0df71c8830 -
Use a more generic form for __section that requires quotes to avoid
complications with clang and gcc differences.Remove the quote operator # from compiler_attributes.h __section macro.
Convert all unquoted __section(foo) uses to quoted __section("foo").
Also convert __attribute__((section("foo"))) uses to __section("foo")
even if the __attribute__ has multiple list entry forms.Conversion done using the script at:
https://lore.kernel.org/lkml/75393e5ddc272dc7403de74d645e6c6e0f4e70eb.camel@perches.com/2-convert_section.pl
Signed-off-by: Joe Perches
Reviewed-by: Nick Desaulniers
Reviewed-by: Miguel Ojeda
Signed-off-by: Linus Torvalds