tag | 4cc62c1af597a341e22e8934b57f210ca1d1d3b6 | |
---|---|---|
tagger | Howard Chen <howardsoc@google.com> | Mon Jul 25 10:16:44 2022 +0800 |
object | dfb4e606e63ec3124ee426508ac72ea83c2502dc |
android13-5.10 June 2022 release 4 Artifacts kernel: https://ci.android.com/builds/submitted/8855136/kernel_aarch64/latest boot.img: https://ci.android.com/builds/submitted/8855590/gsi_arm64-user/latest
commit | dfb4e606e63ec3124ee426508ac72ea83c2502dc | [log] [tgz] |
---|---|---|
author | Quentin Perret <qperret@google.com> | Mon Jul 18 14:44:32 2022 +0000 |
committer | Robin Peng <robinpeng@google.com> | Thu Jul 21 08:18:04 2022 +0000 |
tree | 36b97b53f2a768cd7dbd676cdac2ebee735f0414 | |
parent | d8fbc0b9586a0e823255bf4884d9ba7c70420b4a [diff] |
ANDROID: KVM: arm64: Increase size of FF-A buffer As it turns out, the kernel's DMA code doesn't enforce the SG_MAX_SEGMENTS limit on the number of elements in an sglist, which can confuse the pKVM FF-A proxy which has a buffer sized to contain a descriptor of at most SG_MAX_SEGMENTS constituents. As the number of elements in an sglist doesn't seem to have an actual upper bound, let's paper over the issue for now by increasing the size of the pKVM buffer based on empirical 'measurements'. Longer term we might need to make this value configurable on the kernel's cmdline, or to rework the FF-A proxy to sanely handle large descriptors, although this is not clear how at the time of writing. Bug: 221256863 Signed-off-by: Quentin Perret <qperret@google.com> Change-Id: If252f01bec8ae71c0fe1f7007a3ca7b037924c84 (cherry picked from commit a6b9536c10ab7e20c3b2026ba353692fad5ef8fe)
BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.
EXPORT_SYMBOL_GPL()
require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.
script/checkpatch.pl
UPSTREAM:
, BACKPORT:
, FROMGIT:
, FROMLIST:
, or ANDROID:
.Change-Id:
tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)Bug:
tag.Signed-off-by:
tag by the author and the submitterAdditional requirements are listed below based on patch type
UPSTREAM:
, BACKPORT:
UPSTREAM:
.(cherry picked from commit ...)
lineimportant patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
UPSTREAM: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT:
instead of UPSTREAM:
.UPSTREAM:
(cherry picked from commit ...)
lineBACKPORT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1) [joe: Resolved minor conflict in drivers/foo/bar.c ] Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMGIT:
, FROMLIST:
,FROMGIT:
(cherry picked from commit <sha1> <repo> <branch>)
. This must be a stable maintainer branch (not rebased, so don't use linux-next
for example).BACKPORT: FROMGIT:
important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
FROMGIT: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch) Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMLIST:
Link:
tag with a link to the submittal on lore.kernel.orgBug:
tag with the Android bug (required for patches not accepted into a maintainer tree)BACKPORT: FROMLIST:
FROMLIST: important patch from upstream This is the detailed description of the important patch Signed-off-by: Fred Jones <fred.jones@foo.org> Bug: 135791357 Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/ Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
ANDROID:
Fixes:
tag that cites the patch with the bugANDROID: fix android-specific bug in foobar.c This is the detailed description of the important fix Fixes: 1234abcd2468 ("foobar: add cool feature") Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01 Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:
Bug:
tag with the Android bug (required for android-specific features)