Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 1bdac13

Browse files
gregkhgregkh
committed
Merge branch 'android15-6.6' into android15-6.6-lts
Catch the -lts branch up with recent changes and abi updates done in the non-lts branch. Changes in here include the following: * 14bff9b ANDROID: Update symbol list for virtual device * 1b41f35 ANDROID: Add snd-aloop.ko symbols to abi_gki_aarch64_virtual_device * 05869b8 ANDROID: ABI: update symbol list for honor * c605889 ANDROID: GKI: net: add vendor hook to check if out of order occurs * 7c12a8c ANDROID: ABI: Update pixel symbol list * cf57490 ANDROID: GKI: enable CONFIG_USB_XHCI_SIDEBAND * b0e595d UPSTREAM: USB: media: uvcvideo: Skip parsing frames of type UVC_VS_UNDEFINED in uvc_parse_format * d792950 ANDROID: KVM: arm64: Protect the hypervisor memcaches with the allocator lock on refill * 7bfa715 FROMGIT: block: add partition uuid into uevent as "PARTUUID" * a8b3b5d FROMLIST: input: fix generic desktop D-Pad controls * 931594b Reapply "input: Add support for "Do Not Disturb"" * eb18258 ANDROID: USB: add symbols for new vendor hook * 1586d3c ANDROID: USB: add vendor hook functions for USB * 5dc8209 FROMGIT: wifi: cfg80211: Do not create BSS entries for unsupported channels * 5c5911f ANDROID: Fix platforms config_setting values. * 0951c31 ANDROID: Move protected modules list to modules.bzl * 18798d6 ANDROID: Protect Kunit & virtio modules * da9c5d8 ANDROID: abi_gki_aarch64_qcom: Add xa_erase * 329bde2 ANDROID: GKI: update symbol list file for xiaomi * 44abc10 ANDROID: vendor_hooks: Add hook for futex * 4e7ab1b BACKPORT: FROMGIT: usb: typec: tcpm: Add support for parsing time dt properties * c99834d BACKPORT: FROMGIT: dt-bindings: connector: Add properties to define time values * 54b58c8 FROMGIT: pinmux: Use sequential access to access desc->pinmux data * caa5d15 ANDROID: GKI: update symbol list for xiaomi * c1e0294 ANDROID: module: Add vendor hooks * 7959dfa ANDROID: ABI: add android_debug_symbol to whitelist * d082e31 ANDROID: use INDIVIDUAL_LEAVES for kunit parser resolution * 9dad832 ANDROID: use INDIVIDUAL_LEAVES for kunit parser resolution * 17f2c50 ANDROID: use INDIVIDUAL_LEAVES for kselftests parser resolution * 825f019 BACKPORT: mseal: replace can_modify_mm_madv with a vma variant * d0653d6 UPSTREAM: mm/mprotect: replace can_modify_mm with can_modify_vma * 4b1c79a BACKPORT: mm: move can_modify_vma to mm/vma.h * 3117021 ANDROID: Update virtual_device symbol list * 9cfc946 ANDROID: KVM: arm64: Pre-alloctate mtree nodes in pkvm_mem_abort() * d53a549 ANDROID: KVM: arm64: Report size correctly from pkvm_mem_abort() * ed14b49 ANDROID: KVM: arm64: Fix accounting of pinned THPs with pKVM * 7a3007d FROMGIT: BACKPORT: iommu/io-pgtable-arm: Fix stage-2 map/unmap for concatenated tables * a2c66ca UPSTREAM: scsi: ufs: ufs-sysfs: Expose UFS power info * ace77dc BACKPORT: FROMLIST: firmware: arm_scmi: set mailbox timeout value from device tree * 4996d55 FROMGIT: f2fs: introduce device aliasing file * bd8c55b ANDROID: ABI: virtual_device update ABI and symbol list * 116264b BACKPORT: FROMGIT: binder: add delivered_freeze to debugfs output * 9a5ffd1 BACKPORT: FROMGIT: binder: fix memleak of proc->delivered_freeze * b892621 FROMGIT: binder: allow freeze notification for dead nodes * ddc0270 FROMGIT: binder: fix BINDER_WORK_CLEAR_FREEZE_NOTIFICATION debug logs * 92a4038 FROMGIT: binder: fix BINDER_WORK_FROZEN_BINDER debug logs * ddc1a92 BACKPORT: FROMGIT: binder: fix freeze UAF in binder_release_work() * 5381260 FROMGIT: binder: fix OOB in binder_add_freeze_work() * f66b6ef FROMGIT: binder: fix node UAF in binder_add_freeze_work() * 0061c68 FROMGIT: thermal: gov_power_allocator: Granted power set to max when nobody request power * 4254247 BACKPORT: FROMGIT: cpufreq: add virtual-cpufreq driver * 843ca40 FROMGIT: dt-bindings: cpufreq: add virtual cpufreq device * c1eaaff ANDROID: Check arch before running kunit * 3a0f412 ANDROID: GKI: Update symbol list for honor * b910ce6 ANDROID: vendor_hooks: add hooks for f2fs issue checkpoint * 08deb99 ANDROID: GKI: Update symbol list for mtk * 02b19dc ANDROID: ABI: Update pixel symbol list * 7fd90d6 ANDROID: clean up CREATE_TRACE_POINTS in mm/compaction.c * 9c5b1f1 UPSTREAM: exit: Sleep at TASK_IDLE when waiting for application core dump * f924644 ANDROID: drivers/arm-smmu-v3-kvm: Re-use CD table when possible * 85731f8 ANDROID: drivers/arm-smmu-v3-kvm: Fix pgsize alignment for IDMAP * ec55e52 ANDROID: KVM: iommu: Fix hyp share check in __pkvm_host_use_dma_page * 04469eb ANDROID: drivers/arm-smmu-v3-kvm: Free io_pgtable struct on domain free * a9beab0 ANDROID: drivers/arm-smmu-v3-kvm: Detach devices on release * cec79a8 ANDROID: GKI: update symbol list file for xiaomi * 6661bca ANDROID: mm: export sum_mthp_stat * 968c817 ANDROID: abi_gki_aarch64_qcom: Update abi symbol list * 97d818d Merge tag 'android15-6.6.56_r00' into android15-6.6 Signed-off-by: Greg Kroah-Hartman <[email protected]> Change-Id: I528d780115b51fe0251fb78982b4defe7318c4ac
2 parents 5606e91 + 14bff9b commit 1bdac13

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+3064
-588
lines changed

‎BUILD.bazel

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ load(
2727
"merged_kernel_uapi_headers",
2828
)
2929
load(":abi.bzl", "cc_binary_with_abi")
30-
load(":modules.bzl", "get_gki_modules_list", "get_kunit_modules_list")
30+
load(
31+
":modules.bzl",
32+
"get_gki_modules_list",
33+
"get_gki_protected_modules_list",
34+
"get_kunit_modules_list",
35+
)
3136

3237
package(
3338
default_visibility = [
@@ -93,6 +98,14 @@ write_file(
9398
],
9499
)
95100

101+
write_file(
102+
name = "gki_aarch64_protected_modules",
103+
out = "android/gki_aarch64_protected_modules",
104+
content = get_gki_protected_modules_list("arm64") + [
105+
"", # Ensure new line at the end.
106+
],
107+
)
108+
96109
filegroup(
97110
name = "aarch64_additional_kmi_symbol_lists",
98111
srcs = [
@@ -135,7 +148,7 @@ define_common_kernels(target_configs = {
135148
"additional_kmi_symbol_lists": [":aarch64_additional_kmi_symbol_lists"],
136149
"trim_nonlisted_kmi": True,
137150
"protected_exports_list": "android/abi_gki_protected_exports_aarch64",
138-
"protected_modules_list": "android/gki_aarch64_protected_modules",
151+
"protected_modules_list": ":gki_aarch64_protected_modules",
139152
"module_implicit_outs": get_gki_modules_list("arm64") + get_kunit_modules_list("arm64"),
140153
"make_goals": _GKI_AARCH64_MAKE_GOALS,
141154
"ddk_headers_archive": ":kernel_aarch64_ddk_headers_archive",
@@ -150,7 +163,7 @@ define_common_kernels(target_configs = {
150163
"additional_kmi_symbol_lists": [":aarch64_additional_kmi_symbol_lists"],
151164
"trim_nonlisted_kmi": True,
152165
"protected_exports_list": "android/abi_gki_protected_exports_aarch64",
153-
"protected_modules_list": "android/gki_aarch64_protected_modules",
166+
"protected_modules_list": ":gki_aarch64_protected_modules",
154167
"module_implicit_outs": get_gki_modules_list("arm64") + get_kunit_modules_list("arm64"),
155168
"make_goals": _GKI_AARCH64_MAKE_GOALS,
156169
"ddk_headers_archive": ":kernel_aarch64_ddk_headers_archive",

‎Documentation/ABI/testing/sysfs-driver-ufs

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,6 +1225,55 @@ Description: This file shows the total latency (in micro seconds) of write
12251225

12261226
The file is read only.
12271227

1228+
What: /sys/bus/platform/drivers/ufshcd/*/power_info/lane
1229+
What: /sys/bus/platform/devices/*.ufs/power_info/lane
1230+
Date: September 2023
1231+
Contact: Can Guo <[email protected]>
1232+
Description: This file shows how many lanes are enabled on the UFS link,
1233+
i.e., an output 2 means UFS link is operating with 2 lanes.
1234+
1235+
The file is read only.
1236+
1237+
What: /sys/bus/platform/drivers/ufshcd/*/power_info/mode
1238+
What: /sys/bus/platform/devices/*.ufs/power_info/mode
1239+
Date: September 2023
1240+
Contact: Can Guo <[email protected]>
1241+
Description: This file shows the PA power mode of UFS.
1242+
1243+
The file is read only.
1244+
1245+
What: /sys/bus/platform/drivers/ufshcd/*/power_info/rate
1246+
What: /sys/bus/platform/devices/*.ufs/power_info/rate
1247+
Date: September 2023
1248+
Contact: Can Guo <[email protected]>
1249+
Description: This file shows the speed rate of UFS link.
1250+
1251+
The file is read only.
1252+
1253+
What: /sys/bus/platform/drivers/ufshcd/*/power_info/gear
1254+
What: /sys/bus/platform/devices/*.ufs/power_info/gear
1255+
Date: September 2023
1256+
Contact: Can Guo <[email protected]>
1257+
Description: This file shows the gear of UFS link.
1258+
1259+
The file is read only.
1260+
1261+
What: /sys/bus/platform/drivers/ufshcd/*/power_info/dev_pm
1262+
What: /sys/bus/platform/devices/*.ufs/power_info/dev_pm
1263+
Date: September 2023
1264+
Contact: Can Guo <[email protected]>
1265+
Description: This file shows the UFS device power mode.
1266+
1267+
The file is read only.
1268+
1269+
What: /sys/bus/platform/drivers/ufshcd/*/power_info/link_state
1270+
What: /sys/bus/platform/devices/*.ufs/power_info/link_state
1271+
Date: September 2023
1272+
Contact: Can Guo <[email protected]>
1273+
Description: This file shows the state of UFS link.
1274+
1275+
The file is read only.
1276+
12281277
What: /sys/bus/platform/drivers/ufshcd/*/device_descriptor/wb_presv_us_en
12291278
What: /sys/bus/platform/devices/*.ufs/device_descriptor/wb_presv_us_en
12301279
Date: June 2020

‎Documentation/devicetree/bindings/connector/usb-connector.yaml

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,36 @@ properties:
231231
SNK_READY for non-pd link.
232232
type: boolean
233233

234+
sink-wait-cap-time-ms:
235+
description: Represents the max time in ms that USB Type-C port (in sink
236+
role) should wait for the port partner (source role) to send source caps.
237+
SinkWaitCap timer starts when port in sink role attaches to the source.
238+
This timer will stop when sink receives PD source cap advertisement before
239+
timeout in which case it'll move to capability negotiation stage. A
240+
timeout leads to a hard reset message by the port.
241+
minimum: 310
242+
maximum: 620
243+
default: 310
244+
245+
ps-source-off-time-ms:
246+
description: Represents the max time in ms that a DRP in source role should
247+
take to turn off power after the PsSourceOff timer starts. PsSourceOff
248+
timer starts when a sink's PHY layer receives EOP of the GoodCRC message
249+
(corresponding to an Accept message sent in response to a PR_Swap or a
250+
FR_Swap request). This timer stops when last bit of GoodCRC EOP
251+
corresponding to the received PS_RDY message is transmitted by the PHY
252+
layer. A timeout shall lead to error recovery in the type-c port.
253+
minimum: 750
254+
maximum: 920
255+
default: 920
256+
257+
cc-debounce-time-ms:
258+
description: Represents the max time in ms that a port shall wait to
259+
determine if it's attached to a partner.
260+
minimum: 100
261+
maximum: 200
262+
default: 200
263+
234264
dependencies:
235265
sink-vdos-v1: [ sink-vdos ]
236266
sink-vdos: [ sink-vdos-v1 ]
@@ -316,7 +346,7 @@ examples:
316346
};
317347
318348
# USB-C connector attached to a typec port controller(ptn5110), which has
319-
# power delivery support and enables drp.
349+
# power delivery support, explicitly defines time properties and enables drp.
320350
- |
321351
#include <dt-bindings/usb/pd.h>
322352
typec: ptn5110 {
@@ -329,6 +359,9 @@ examples:
329359
sink-pdos = <PDO_FIXED(5000, 2000, PDO_FIXED_USB_COMM)
330360
PDO_VAR(5000, 12000, 2000)>;
331361
op-sink-microwatt = <10000000>;
362+
sink-wait-cap-time-ms = <465>;
363+
ps-source-off-time-ms = <835>;
364+
cc-debounce-time-ms = <101>;
332365
};
333366
};
334367

‎Documentation/devicetree/bindings/cpufreq/qemu,virtual-cpufreq.yaml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/cpufreq/qemu,virtual-cpufreq.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Virtual CPUFreq
8+
9+
maintainers:
10+
- David Dai <[email protected]>
11+
- Saravana Kannan <[email protected]>
12+
13+
description:
14+
Virtual CPUFreq is a virtualized driver in guest kernels that sends performance
15+
selection of its vCPUs as a hint to the host through MMIO regions. Each vCPU
16+
is associated with a performance domain which can be shared with other vCPUs.
17+
Each performance domain has its own set of registers for performance controls.
18+
19+
properties:
20+
compatible:
21+
const: qemu,virtual-cpufreq
22+
23+
reg:
24+
maxItems: 1
25+
description:
26+
Address and size of region containing performance controls for each of the
27+
performance domains. Regions for each performance domain is placed
28+
contiguously and contain registers for controlling DVFS(Dynamic Frequency
29+
and Voltage) characteristics. The size of the region is proportional to
30+
total number of performance domains.
31+
32+
required:
33+
- compatible
34+
- reg
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
soc {
41+
#address-cells = <1>;
42+
#size-cells = <1>;
43+
44+
cpufreq@1040000 {
45+
compatible = "qemu,virtual-cpufreq";
46+
reg = <0x1040000 0x2000>;
47+
};
48+
};

‎Documentation/filesystems/f2fs.rst

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -943,3 +943,47 @@ NVMe Zoned Namespace devices
943943
can start before the zone-capacity and span across zone-capacity boundary.
944944
Such spanning segments are also considered as usable segments. All blocks
945945
past the zone-capacity are considered unusable in these segments.
946+
947+
Device aliasing feature
948+
-----------------------
949+
950+
f2fs can utilize a special file called a "device aliasing file." This file allows
951+
the entire storage device to be mapped with a single, large extent, not using
952+
the usual f2fs node structures. This mapped area is pinned and primarily intended
953+
for holding the space.
954+
955+
Essentially, this mechanism allows a portion of the f2fs area to be temporarily
956+
reserved and used by another filesystem or for different purposes. Once that
957+
external usage is complete, the device aliasing file can be deleted, releasing
958+
the reserved space back to F2FS for its own use.
959+
960+
<use-case>
961+
962+
# ls /dev/vd*
963+
/dev/vdb (32GB) /dev/vdc (32GB)
964+
# mkfs.ext4 /dev/vdc
965+
# mkfs.f2fs -c /dev/[email protected] /dev/vdb
966+
# mount /dev/vdb /mnt/f2fs
967+
# ls -l /mnt/f2fs
968+
vdc.file
969+
# df -h
970+
/dev/vdb 64G 33G 32G 52% /mnt/f2fs
971+
972+
# mount -o loop /dev/vdc /mnt/ext4
973+
# df -h
974+
/dev/vdb 64G 33G 32G 52% /mnt/f2fs
975+
/dev/loop7 32G 24K 30G 1% /mnt/ext4
976+
# umount /mnt/ext4
977+
978+
# f2fs_io getflags /mnt/f2fs/vdc.file
979+
get a flag on /mnt/f2fs/vdc.file ret=0, flags=nocow(pinned),immutable
980+
# f2fs_io setflags noimmutable /mnt/f2fs/vdc.file
981+
get a flag on noimmutable ret=0, flags=800010
982+
set a flag on /mnt/f2fs/vdc.file ret=0, flags=noimmutable
983+
# rm /mnt/f2fs/vdc.file
984+
# df -h
985+
/dev/vdb 64G 753M 64G 2% /mnt/f2fs
986+
987+
So, the key idea is, user can do any file operations on /dev/vdc, and
988+
reclaim the space after the use, while the space is counted as /data.
989+
That doesn't require modifying partition size and filesystem format.

0 commit comments

Comments
 (0)