Skip to content

Commit 296455a

Browse files
torvaldstorvalds
committed
Merge tag 'char-misc-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc and other driver updates from Greg KH: "Here is the big set of char/misc and other driver subsystem changes for 6.8-rc1. Other than lots of binder driver changes (as you can see by the merge conflicts) included in here are: - lots of iio driver updates and additions - spmi driver updates - eeprom driver updates - firmware driver updates - ocxl driver updates - mhi driver updates - w1 driver updates - nvmem driver updates - coresight driver updates - platform driver remove callback api changes - tags.sh script updates - bus_type constant marking cleanups - lots of other small driver updates All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (341 commits) android: removed duplicate linux/errno uio: Fix use-after-free in uio_open drivers: soc: xilinx: add check for platform firmware: xilinx: Export function to use in other module scripts/tags.sh: remove find_sources scripts/tags.sh: use -n to test archinclude scripts/tags.sh: add local annotation scripts/tags.sh: use more portable -path instead of -wholename scripts/tags.sh: Update comment (addition of gtags) firmware: zynqmp: Convert to platform remove callback returning void firmware: turris-mox-rwtm: Convert to platform remove callback returning void firmware: stratix10-svc: Convert to platform remove callback returning void firmware: stratix10-rsu: Convert to platform remove callback returning void firmware: raspberrypi: Convert to platform remove callback returning void firmware: qemu_fw_cfg: Convert to platform remove callback returning void firmware: mtk-adsp-ipc: Convert to platform remove callback returning void firmware: imx-dsp: Convert to platform remove callback returning void firmware: coreboot_table: Convert to platform remove callback returning void firmware: arm_scpi: Convert to platform remove callback returning void firmware: arm_scmi: Convert to platform remove callback returning void ...
2 parents e1aa9df + 5850edc commit 296455a

File tree

303 files changed

+24179
-2656
lines changed

Some content is hidden

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

303 files changed

+24179
-2656
lines changed

‎.mailmap

+4-3
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,10 @@ Matthias Fuchs <[email protected]> <[email protected]>
390390
Matthieu Baerts <[email protected]> <[email protected]>
391391
Matthieu CASTET <[email protected]>
392392
Matti Vaittinen <[email protected]> <[email protected]>
393-
Matt Ranostay <[email protected]> <[email protected]>
394-
Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
395-
Matt Ranostay <[email protected]> <[email protected]>
393+
Matt Ranostay <[email protected]> <[email protected]>
394+
Matt Ranostay <[email protected]> <[email protected]>
395+
Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
396+
Matt Ranostay <[email protected]> <[email protected]>
396397
Matt Redfearn <[email protected]> <[email protected]>
397398
Maulik Shah <[email protected]> <[email protected]>
398399
Mauro Carvalho Chehab <[email protected]> <[email protected]>

‎Documentation/ABI/testing/sysfs-bus-cdx

+7
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,13 @@ Description:
9898

9999
# echo 1 > /sys/bus/cdx/devices/.../remove
100100

101+
What: /sys/bus/cdx/devices/.../resource<N>
102+
Date: July 2023
103+
Contact: [email protected]
104+
Description:
105+
The resource binary file contains the content of the memory
106+
regions. These files can be m'maped from userspace.
107+
101108
What: /sys/bus/cdx/devices/.../modalias
102109
Date: July 2023
103110
Contact: [email protected]

‎Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc

+16
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,19 @@ Contact: Mathieu Poirier <[email protected]>
9191
Description: (RW) Size of the trace buffer for TMC-ETR when used in SYSFS
9292
mode. Writable only for TMC-ETR configurations. The value
9393
should be aligned to the kernel pagesize.
94+
95+
What: /sys/bus/coresight/devices/<memory_map>.tmc/buf_modes_available
96+
Date: August 2023
97+
KernelVersion: 6.7
98+
Contact: Anshuman Khandual <[email protected]>
99+
Description: (Read) Shows all supported Coresight TMC-ETR buffer modes available
100+
for the users to configure explicitly. This file is avaialble only
101+
for TMC ETR devices.
102+
103+
What: /sys/bus/coresight/devices/<memory_map>.tmc/buf_mode_preferred
104+
Date: August 2023
105+
KernelVersion: 6.7
106+
Contact: Anshuman Khandual <[email protected]>
107+
Description: (RW) Current Coresight TMC-ETR buffer mode selected. But user could
108+
only provide a mode which is supported for a given ETR device. This
109+
file is available only for TMC ETR devices.

‎Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm

+159
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,162 @@ Description:
1111
Accepts only one of the 2 values - 1 or 2.
1212
1 : Generate 64 bits data
1313
2 : Generate 32 bits data
14+
15+
What: /sys/bus/coresight/devices/<tpdm-name>/reset_dataset
16+
Date: March 2023
17+
KernelVersion 6.7
18+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
19+
Description:
20+
(Write) Reset the dataset of the tpdm.
21+
22+
Accepts only one value - 1.
23+
1 : Reset the dataset of the tpdm
24+
25+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_trig_type
26+
Date: March 2023
27+
KernelVersion 6.7
28+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
29+
Description:
30+
(RW) Set/Get the trigger type of the DSB for tpdm.
31+
32+
Accepts only one of the 2 values - 0 or 1.
33+
0 : Set the DSB trigger type to false
34+
1 : Set the DSB trigger type to true
35+
36+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_trig_ts
37+
Date: March 2023
38+
KernelVersion 6.7
39+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
40+
Description:
41+
(RW) Set/Get the trigger timestamp of the DSB for tpdm.
42+
43+
Accepts only one of the 2 values - 0 or 1.
44+
0 : Set the DSB trigger type to false
45+
1 : Set the DSB trigger type to true
46+
47+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_mode
48+
Date: March 2023
49+
KernelVersion 6.7
50+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
51+
Description:
52+
(RW) Set/Get the programming mode of the DSB for tpdm.
53+
54+
Accepts the value needs to be greater than 0. What data
55+
bits do is listed below.
56+
Bit[0:1] : Test mode control bit for choosing the inputs.
57+
Bit[3] : Set to 0 for low performance mode. Set to 1 for high
58+
performance mode.
59+
Bit[4:8] : Select byte lane for high performance mode.
60+
61+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_edge/ctrl_idx
62+
Date: March 2023
63+
KernelVersion 6.7
64+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
65+
Description:
66+
(RW) Set/Get the index number of the edge detection for the DSB
67+
subunit TPDM. Since there are at most 256 edge detections, this
68+
value ranges from 0 to 255.
69+
70+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_edge/ctrl_val
71+
Date: March 2023
72+
KernelVersion 6.7
73+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
74+
Description:
75+
Write a data to control the edge detection corresponding to
76+
the index number. Before writing data to this sysfs file,
77+
"ctrl_idx" should be written first to configure the index
78+
number of the edge detection which needs to be controlled.
79+
80+
Accepts only one of the following values.
81+
0 - Rising edge detection
82+
1 - Falling edge detection
83+
2 - Rising and falling edge detection (toggle detection)
84+
85+
86+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_edge/ctrl_mask
87+
Date: March 2023
88+
KernelVersion 6.7
89+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
90+
Description:
91+
Write a data to mask the edge detection corresponding to the index
92+
number. Before writing data to this sysfs file, "ctrl_idx" should
93+
be written first to configure the index number of the edge detection
94+
which needs to be masked.
95+
96+
Accepts only one of the 2 values - 0 or 1.
97+
98+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_edge/edcr[0:15]
99+
Date: March 2023
100+
KernelVersion 6.7
101+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
102+
Description:
103+
Read a set of the edge control value of the DSB in TPDM.
104+
105+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_edge/edcmr[0:7]
106+
Date: March 2023
107+
KernelVersion 6.7
108+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
109+
Description:
110+
Read a set of the edge control mask of the DSB in TPDM.
111+
112+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_trig_patt/xpr[0:7]
113+
Date: March 2023
114+
KernelVersion 6.7
115+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
116+
Description:
117+
(RW) Set/Get the value of the trigger pattern for the DSB
118+
subunit TPDM.
119+
120+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_trig_patt/xpmr[0:7]
121+
Date: March 2023
122+
KernelVersion 6.7
123+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
124+
Description:
125+
(RW) Set/Get the mask of the trigger pattern for the DSB
126+
subunit TPDM.
127+
128+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpr[0:7]
129+
Date: March 2023
130+
KernelVersion 6.7
131+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
132+
Description:
133+
(RW) Set/Get the value of the pattern for the DSB subunit TPDM.
134+
135+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpmr[0:7]
136+
Date: March 2023
137+
KernelVersion 6.7
138+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
139+
Description:
140+
(RW) Set/Get the mask of the pattern for the DSB subunit TPDM.
141+
142+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/enable_ts
143+
Date: March 2023
144+
KernelVersion 6.7
145+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
146+
Description:
147+
(Write) Set the pattern timestamp of DSB tpdm. Read
148+
the pattern timestamp of DSB tpdm.
149+
150+
Accepts only one of the 2 values - 0 or 1.
151+
0 : Disable DSB pattern timestamp.
152+
1 : Enable DSB pattern timestamp.
153+
154+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/set_type
155+
Date: March 2023
156+
KernelVersion 6.7
157+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
158+
Description:
159+
(Write) Set the pattern type of DSB tpdm. Read
160+
the pattern type of DSB tpdm.
161+
162+
Accepts only one of the 2 values - 0 or 1.
163+
0 : Set the DSB pattern type to value.
164+
1 : Set the DSB pattern type to toggle.
165+
166+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_msr/msr[0:31]
167+
Date: March 2023
168+
KernelVersion 6.7
169+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
170+
Description:
171+
(RW) Set/Get the MSR(mux select register) for the DSB subunit
172+
TPDM.

‎Documentation/ABI/testing/sysfs-bus-iio

+38-4
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,21 @@ Description:
362362
What: /sys/bus/iio/devices/iio:deviceX/in_accel_x_peak_raw
363363
What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_peak_raw
364364
What: /sys/bus/iio/devices/iio:deviceX/in_accel_z_peak_raw
365+
What: /sys/bus/iio/devices/iio:deviceX/in_humidityrelative_peak_raw
366+
What: /sys/bus/iio/devices/iio:deviceX/in_temp_peak_raw
365367
KernelVersion: 2.6.36
366368
Contact: [email protected]
367369
Description:
368-
Highest value since some reset condition. These
370+
Highest value since some reset condition. These
371+
attributes allow access to this and are otherwise
372+
the direct equivalent of the <type>Y[_name]_raw attributes.
373+
374+
What: /sys/bus/iio/devices/iio:deviceX/in_humidityrelative_trough_raw
375+
What: /sys/bus/iio/devices/iio:deviceX/in_temp_trough_raw
376+
KernelVersion: 6.7
377+
Contact: [email protected]
378+
Description:
379+
Lowest value since some reset condition. These
369380
attributes allow access to this and are otherwise
370381
the direct equivalent of the <type>Y[_name]_raw attributes.
371382

@@ -618,7 +629,9 @@ KernelVersion: 2.6.35
618629
Contact: [email protected]
619630
Description:
620631
If a discrete set of scale values is available, they
621-
are listed in this attribute.
632+
are listed in this attribute. Unlike illumination,
633+
multiplying intensity by intensity_scale does not
634+
yield value with any standardized unit.
622635

623636
What: /sys/bus/iio/devices/iio:deviceX/out_voltageY_hardwaregain
624637
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_hardwaregain
@@ -1574,6 +1587,8 @@ What: /sys/.../iio:deviceX/in_intensityY_raw
15741587
What: /sys/.../iio:deviceX/in_intensityY_ir_raw
15751588
What: /sys/.../iio:deviceX/in_intensityY_both_raw
15761589
What: /sys/.../iio:deviceX/in_intensityY_uv_raw
1590+
What: /sys/.../iio:deviceX/in_intensityY_uva_raw
1591+
What: /sys/.../iio:deviceX/in_intensityY_uvb_raw
15771592
What: /sys/.../iio:deviceX/in_intensityY_duv_raw
15781593
KernelVersion: 3.4
15791594
Contact: [email protected]
@@ -1582,8 +1597,9 @@ Description:
15821597
that measurements contain visible and infrared light
15831598
components or just infrared light, respectively. Modifier
15841599
uv indicates that measurements contain ultraviolet light
1585-
components. Modifier duv indicates that measurements
1586-
contain deep ultraviolet light components.
1600+
components. Modifiers uva, uvb and duv indicate that
1601+
measurements contain A, B or deep (C) ultraviolet light
1602+
components respectively.
15871603

15881604
What: /sys/.../iio:deviceX/in_uvindex_input
15891605
KernelVersion: 4.6
@@ -2254,3 +2270,21 @@ Description:
22542270
If a label is defined for this event add that to the event
22552271
specific attributes. This is useful for userspace to be able to
22562272
better identify an individual event.
2273+
2274+
What: /sys/.../events/in_accel_gesture_tap_wait_timeout
2275+
KernelVersion: 6.7
2276+
Contact: [email protected]
2277+
Description:
2278+
Enable tap gesture confirmation with timeout.
2279+
2280+
What: /sys/.../events/in_accel_gesture_tap_wait_dur
2281+
KernelVersion: 6.7
2282+
Contact: [email protected]
2283+
Description:
2284+
Timeout value in seconds for tap gesture confirmation.
2285+
2286+
What: /sys/.../events/in_accel_gesture_tap_wait_dur_available
2287+
KernelVersion: 6.7
2288+
Contact: [email protected]
2289+
Description:
2290+
List of available timeout value for tap gesture confirmation.

‎Documentation/ABI/testing/sysfs-nvmem-cells

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/bus/nvmem/devices/.../cells/<cell-name>
2+
Date: May 2023
3+
KernelVersion: 6.5
4+
Contact: Miquel Raynal <[email protected]>
5+
Description:
6+
The "cells" folder contains one file per cell exposed by the
7+
NVMEM device. The name of the file is: <name>@<where>, with
8+
<name> being the cell name and <where> its location in the NVMEM
9+
device, in hexadecimal (without the '0x' prefix, to mimic device
10+
tree node names). The length of the file is the size of the cell
11+
(when known). The content of the file is the binary content of
12+
the cell (may sometimes be ASCII, likely without trailing
13+
character).
14+
Note: This file is only present if CONFIG_NVMEM_SYSFS
15+
is enabled.
16+
17+
Example::
18+
19+
hexdump -C /sys/bus/nvmem/devices/1-00563/cells/product-name@d
20+
00000000 54 4e 34 38 4d 2d 50 2d 44 4e |TN48M-P-DN|
21+
0000000a

‎Documentation/arch/arm64/silicon-errata.rst

+10
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ stable kernels.
117117
+----------------+-----------------+-----------------+-----------------------------+
118118
| ARM | Cortex-A76 | #1463225 | ARM64_ERRATUM_1463225 |
119119
+----------------+-----------------+-----------------+-----------------------------+
120+
| ARM | Cortex-A76 | #1490853 | N/A |
121+
+----------------+-----------------+-----------------+-----------------------------+
122+
| ARM | Cortex-A77 | #1491015 | N/A |
123+
+----------------+-----------------+-----------------+-----------------------------+
120124
| ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 |
121125
+----------------+-----------------+-----------------+-----------------------------+
122126
| ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 |
@@ -127,6 +131,8 @@ stable kernels.
127131
+----------------+-----------------+-----------------+-----------------------------+
128132
| ARM | Cortex-A715 | #2645198 | ARM64_ERRATUM_2645198 |
129133
+----------------+-----------------+-----------------+-----------------------------+
134+
| ARM | Cortex-X1 | #1502854 | N/A |
135+
+----------------+-----------------+-----------------+-----------------------------+
130136
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
131137
+----------------+-----------------+-----------------+-----------------------------+
132138
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |
@@ -135,6 +141,8 @@ stable kernels.
135141
+----------------+-----------------+-----------------+-----------------------------+
136142
| ARM | Neoverse-N1 | #1349291 | N/A |
137143
+----------------+-----------------+-----------------+-----------------------------+
144+
| ARM | Neoverse-N1 | #1490853 | N/A |
145+
+----------------+-----------------+-----------------+-----------------------------+
138146
| ARM | Neoverse-N1 | #1542419 | ARM64_ERRATUM_1542419 |
139147
+----------------+-----------------+-----------------+-----------------------------+
140148
| ARM | Neoverse-N2 | #2139208 | ARM64_ERRATUM_2139208 |
@@ -143,6 +151,8 @@ stable kernels.
143151
+----------------+-----------------+-----------------+-----------------------------+
144152
| ARM | Neoverse-N2 | #2253138 | ARM64_ERRATUM_2253138 |
145153
+----------------+-----------------+-----------------+-----------------------------+
154+
| ARM | Neoverse-V1 | #1619801 | N/A |
155+
+----------------+-----------------+-----------------+-----------------------------+
146156
| ARM | MMU-500 | #841119,826419 | N/A |
147157
+----------------+-----------------+-----------------+-----------------------------+
148158
| ARM | MMU-600 | #1076982,1209401| N/A |

‎Documentation/devicetree/bindings/arm/qcom,coresight-tpdm.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,23 @@ properties:
4444
minItems: 1
4545
maxItems: 2
4646

47+
qcom,dsb-element-size:
48+
description:
49+
Specifies the DSB(Discrete Single Bit) element size supported by
50+
the monitor. The associated aggregator will read this size before it
51+
is enabled. DSB element size currently only supports 32-bit and 64-bit.
52+
$ref: /schemas/types.yaml#/definitions/uint8
53+
enum: [32, 64]
54+
55+
qcom,dsb-msrs-num:
56+
description:
57+
Specifies the number of DSB(Discrete Single Bit) MSR(mux select register)
58+
registers supported by the monitor. If this property is not configured
59+
or set to 0, it means this DSB TPDM doesn't support MSR.
60+
$ref: /schemas/types.yaml#/definitions/uint32
61+
minimum: 0
62+
maximum: 32
63+
4764
clocks:
4865
maxItems: 1
4966

@@ -77,6 +94,9 @@ examples:
7794
compatible = "qcom,coresight-tpdm", "arm,primecell";
7895
reg = <0x0684c000 0x1000>;
7996
97+
qcom,dsb-element-size = /bits/ 8 <32>;
98+
qcom,dsb-msrs-num = <16>;
99+
80100
clocks = <&aoss_qmp>;
81101
clock-names = "apb_pclk";
82102

0 commit comments

Comments
 (0)