This patch links report_zone in dm-default-key, Android-only feature, in
order to support zoned devices [1].
[1] https://zonedstorage.io/docs/linux/overview
Bug: 228969778
Bug: 160885805
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I05163d471c1a06e12ff58cf73276ad0adc6d4978
This patch enables zoned devices for Android.
Bug: 228969778
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: I7cb14675b4991a80c61e799cade8666c78bb8031
This reverts the MODULE_SCMVERSION config addition as it causes lots of
merge problems with 5.19-rc1. It can be added back after 5.19-rc1 is
out if it is still needed.
Also, if it is still needed, perhaps it can be made a bit
less-intrusive to make it easier with future merges...
Bug: 180027765
Cc: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I42e4ccbc4d2291523fd8460d530528d0c19c3e70
When merging, the ufs_sysfs_add_nodes() function got merged incorrectly.
Pick the upstream version which fixes the build problems.
This moves the tracepoint out of the sysfs create function and puts it
where the call originated, as the hba structure is not known in the
sysfs create call.
Bug: 158050260
Cc: Jaegeuk Kim <jaegeuk@google.com>
Fixes: 0b0468f649 ("ANDROID: scsi: ufs: add a hook to add sysfs entries")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I875944bb95597f1df63f109684d053903b2282a0
In commit 1e0f66420b ("drm/display: Introduce a DRM display-helper
module") the generated module file names were changed. This patch
updates the BUILD.bazel db845c section to update it with the new
module names.
Additionally commit f5d0164492 ("drm/msm: select DRM_DP_AUX_BUS
for the AUX bus support") added a dependency on the drm_dp_aux_bus
module.
Fixes: 1a016dd7ce28 ("Merge 2518f226c6 ("Merge tag 'drm-next-2022-05-25' of git://anongit.freedesktop.org/drm/drm") into android-mainline")
Reported-by: Greg Kroah-Hartman <gregkh@google.com>
Signed-off-by: John Stultz <jstultz@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I5b0695c92e9627d3b5f3ac38b32ee7240a8a894b
During a reply, the target gets woken up and then the priority of the
replier is restored. The order is such to allow the target to process
the reply ASAP. Otherwise, we risk the sender getting scheduled out
before the wakeup happens. This strategy reduces transaction latency.
However, a subsequent transaction from the same target could be started
before the priority of the replier gets restored. At this point we save
the wrong priority and it gets reinstated at the end of the transaction.
This patch allows the incoming transaction to detect the race condition
and save the correct next priority. Additionally, the replier will abort
its pending priority restore which allows the new transaction to always
run at the desired priority.
Bug: 148101660
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: I6fec41ae1a1342023f78212ab1f984e26f068221
Refactor binder priority functions to take in 'struct binder_thread *'
instead of just 'struct task_struct *'. This allows access to other
thread fields used in subsequent patches. In any case, the same task
reference is still available under thread->task.
There is no functional impact from this patch.
Bug: 148101660
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: I67b599884580d957d776500e467827e5035c99f6
Avoid making unnecessary stack copies of struct binder_priority and pass
the argument by reference instead. Rename 'desired_prio' to 'desired' to
match the usage in other priority functions.
There is no functional impact from this patch.
Bug: 148101660
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: I66ff5305296e7b9dba56ed265236f2af518f66e0
The setup of node_prio is always the same, so just fold this logic into
binder_transaction_priority() to avoid duplication. Let's pass the node
reference instead, which also gives access to node->inherit_rt.
There is no functional impact from this patch.
Bug: 148101660
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Change-Id: Ib390204556e69c4bc8492cd9cd873773f9cdce42
db845c is not a mixed build yet, so need to add GKI
modules to it's module_outs for kleaf builds to
resolve hard failures in kleaf build for module copy.
Bug: 230519159
Test: tools/bazel run //common:db845c_dist
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: If3ce64a2b5f6b2f019a393f4674de30ac7437069
(cherry picked from commit eb38c6d799525c89bc3b1817dc22c34fa2281e09)
Enable zram and zsmalloc (dependency for zram) as
unprotected modules for aarch64. These are already
being used as modules by the vendor currently; so
needs to be unprotected.
Bug: 230519159
Test: TH
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I7c617c1a24f6e083301cbed67d0d323388cbd622
(cherry picked from commit 0fe423433bb3fa0b5003409bbd59a972e6c235e2)
The default value of this option changed recently in
4f612ed3f7 ("kfence: default to dynamic branch instead of static keys
mode"). As there was no functional change here and no concern posed
about configurations relevant to Android, re-enable this option.
Bug: 234805737
Signed-off-by: Steve Muckle <smuckle@google.com>
Change-Id: I5b20a67225cd247fc54547083b3cbcde0135f1fb
This is a "weak" conversion which converts straight back to using pages
to keep the build working properly.
A full conversion should be performed at some point, hopefully by
someone familiar with the filesystem.
Fixes: 7e0a126519 ("mm,fs: Remove aops->readpage")
CC: Paul Lawrence <paullawrence@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id34db2c71743731d6a69b7b566a1f3a0a12dffe1
Steps on the way to 5.19-rc1
Resolves merge conflict in:
security/selinux/nlmsgtab.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I34db04ef9b75d4c781d0f6a42fa8d728e01ac0f4
Steps on the way to 5.19-rc1
Resolves merge conflicts with:
fs/crypto/inline_crypt.c
fs/crypto/keyring.c
fs/crypto/keysetup.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I624976a8b8d180b35e2f4e4ef282b07a44246682
Steps on the way to 5.19-rc1
Resolves merge conflicts in:
kernel/fork.c
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie6468a4dcebacddea949d1ad5dfbaddea481e033
Steps on the way to 5.19-rc1
Resolves merge issues in:
include/linux/cpufreq.h
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I2f387e0728e85989b0f9853ec54bf196484e95d4
This reverts commit c6e5f9d7cf.
This causes merge problems with 5.19-rc1 and should no longer be needed
anymore.
If it is needed, please work to get the needed changes upstream first,
these should not be sticking around in the Android tree for no good
reason.
Bug: 169238689
Cc: Syed Rameez Mustafa <rameezmustafa@codeaurora.org>
Cc: Prasad Sodagudi <psodagud@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifb7cf847cf185fb81b79b4fe31f8e5b8ccee8eba
This reverts commit 9da1f37103.
It causes merge problems with 5.19-rc1 and should no longer be needed at
all.
Bug: 169238689
Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I27de2776905401b42c4e5cf2be784eae18f8816b
This reverts commit 1855071010.
This causes merge conflicts with 5.19-rc1 and should not be needed
anymore. Revert it for now and if it really is needed it can be added
back to a device-specific branch.
Bug: 178758017
Cc: Huang Yiwei <hyiwei@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id0bc0d42ae311f0af52a323fea5e58ed1b7e0bd7
There have been a lot of out-of-tree changes to the irq-gic-v3.c driver
that never got merged upstream. But other changes have been merged
upstream so resolving these merges has gotten way too complex.
So drop all out-of-tree changes for now to make merges easier. If the
out-of-tree changes really are needed, they can be added back later
(after they are at least submitted upstream first.)
Bug: 180471389
Bug: 190353898
Bug: 195914333
Bug: 168730134
Cc: Elliot Berman <eberman@codeaurora.org>
Cc: Maulik Shah <mkshah@codeaurora.org>
Cc: Neeraj Upadhyay <neeraju@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I97d8938fbe6c83911a4579695ff324ee4d83e7ef
