Skip to content

Commit 11c8393

Browse files
committed
Merge branch 'for-6.8/cxl-cdat' into for-6.8/cxl
Pick up the CDAT parsing and QOS class infrastructure for v6.8.
2 parents 58f1e9d + 185c1a4 commit 11c8393

662 files changed

Lines changed: 7889 additions & 3819 deletions

File tree

Some content is hidden

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

.mailmap

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>
117117
Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
118118
Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
119119
Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
120+
Chester Lin <chester62515@gmail.com> <clin@suse.com>
120121
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
121122
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
122123
Chris Lew <quic_clew@quicinc.com> <clew@codeaurora.org>
@@ -265,6 +266,9 @@ Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
265266
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
266267
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
267268
Jilai Wang <quic_jilaiw@quicinc.com> <jilaiw@codeaurora.org>
269+
Jiri Kosina <jikos@kernel.org> <jikos@jikos.cz>
270+
Jiri Kosina <jikos@kernel.org> <jkosina@suse.cz>
271+
Jiri Kosina <jikos@kernel.org> <jkosina@suse.com>
268272
Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
269273
Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
270274
Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>

CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2944,6 +2944,14 @@ D: IPX development and support
29442944
N: Venkatesh Pallipadi (Venki)
29452945
D: x86/HPET
29462946

2947+
N: Antti Palosaari
2948+
E: crope@iki.fi
2949+
D: Various DVB drivers
2950+
W: https://palosaari.fi/linux/
2951+
S: Yliopistokatu 1 D 513
2952+
S: FI-90570 Oulu
2953+
S: FINLAND
2954+
29472955
N: Kyungmin Park
29482956
E: kyungmin.park@samsung.com
29492957
D: Samsung S5Pv210 and Exynos4210 mobile platforms

Documentation/ABI/testing/sysfs-bus-cxl

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,23 @@ Description:
2828
Payload in the CXL-2.0 specification.
2929

3030

31+
What: /sys/bus/cxl/devices/memX/ram/qos_class
32+
Date: May, 2023
33+
KernelVersion: v6.8
34+
Contact: linux-cxl@vger.kernel.org
35+
Description:
36+
(RO) For CXL host platforms that support "QoS Telemmetry"
37+
this attribute conveys a comma delimited list of platform
38+
specific cookies that identifies a QoS performance class
39+
for the volatile partition of the CXL mem device. These
40+
class-ids can be compared against a similar "qos_class"
41+
published for a root decoder. While it is not required
42+
that the endpoints map their local memory-class to a
43+
matching platform class, mismatches are not recommended
44+
and there are platform specific performance related
45+
side-effects that may result. First class-id is displayed.
46+
47+
3148
What: /sys/bus/cxl/devices/memX/pmem/size
3249
Date: December, 2020
3350
KernelVersion: v5.12
@@ -38,6 +55,23 @@ Description:
3855
Payload in the CXL-2.0 specification.
3956

4057

58+
What: /sys/bus/cxl/devices/memX/pmem/qos_class
59+
Date: May, 2023
60+
KernelVersion: v6.8
61+
Contact: linux-cxl@vger.kernel.org
62+
Description:
63+
(RO) For CXL host platforms that support "QoS Telemmetry"
64+
this attribute conveys a comma delimited list of platform
65+
specific cookies that identifies a QoS performance class
66+
for the persistent partition of the CXL mem device. These
67+
class-ids can be compared against a similar "qos_class"
68+
published for a root decoder. While it is not required
69+
that the endpoints map their local memory-class to a
70+
matching platform class, mismatches are not recommended
71+
and there are platform specific performance related
72+
side-effects that may result. First class-id is displayed.
73+
74+
4175
What: /sys/bus/cxl/devices/memX/serial
4276
Date: January, 2022
4377
KernelVersion: v5.18

Documentation/ABI/testing/sysfs-bus-optee-devices

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@ Description:
66
OP-TEE bus provides reference to registered drivers under this directory. The <uuid>
77
matches Trusted Application (TA) driver and corresponding TA in secure OS. Drivers
88
are free to create needed API under optee-ta-<uuid> directory.
9+
10+
What: /sys/bus/tee/devices/optee-ta-<uuid>/need_supplicant
11+
Date: November 2023
12+
KernelVersion: 6.7
13+
Contact: op-tee@lists.trustedfirmware.org
14+
Description:
15+
Allows to distinguish whether an OP-TEE based TA/device requires user-space
16+
tee-supplicant to function properly or not. This attribute will be present for
17+
devices which depend on tee-supplicant to be running.

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Analog Devices ADV7533/35 HDMI Encoders
99
maintainers:
1010
- Laurent Pinchart <laurent.pinchart@ideasonboard.com>
1111

12+
allOf:
13+
- $ref: /schemas/sound/dai-common.yaml#
14+
1215
description: |
1316
The ADV7533 and ADV7535 are HDMI audio and video transmitters
1417
compatible with HDMI 1.4 and DVI 1.0. They support color space
@@ -89,6 +92,9 @@ properties:
8992
$ref: /schemas/types.yaml#/definitions/uint32
9093
enum: [ 1, 2, 3, 4 ]
9194

95+
"#sound-dai-cells":
96+
const: 0
97+
9298
ports:
9399
description:
94100
The ADV7533/35 has two video ports and one audio port.

Documentation/devicetree/bindings/display/fsl,lcdif.yaml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,10 @@ properties:
5151
minItems: 1
5252

5353
interrupts:
54-
maxItems: 1
54+
items:
55+
- description: LCDIF DMA interrupt
56+
- description: LCDIF Error interrupt
57+
minItems: 1
5558

5659
power-domains:
5760
maxItems: 1
@@ -131,6 +134,21 @@ allOf:
131134
then:
132135
required:
133136
- power-domains
137+
- if:
138+
properties:
139+
compatible:
140+
contains:
141+
enum:
142+
- fsl,imx23-lcdif
143+
then:
144+
properties:
145+
interrupts:
146+
minItems: 2
147+
maxItems: 2
148+
else:
149+
properties:
150+
interrupts:
151+
maxItems: 1
134152

135153
examples:
136154
- |

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ maintainers:
1010
- Chun-Kuang Hu <chunkuang.hu@kernel.org>
1111
- Philipp Zabel <p.zabel@pengutronix.de>
1212
- Jitao Shi <jitao.shi@mediatek.com>
13-
- Xinlei Lee <xinlei.lee@mediatek.com>
1413

1514
description: |
1615
The MediaTek DSI function block is a sink of the display subsystem and can

Documentation/devicetree/bindings/display/panel/panel-simple-dsi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ properties:
4242
- lg,acx467akm-7
4343
# LG Corporation 7" WXGA TFT LCD panel
4444
- lg,ld070wx3-sl01
45+
# LG Corporation 5" HD TFT LCD panel
46+
- lg,lh500wx1-sd03
4547
# One Stop Displays OSD101T2587-53TS 10.1" 1920x1200 panel
4648
- osddisplays,osd101t2587-53ts
4749
# Panasonic 10" WUXGA TFT LCD panel

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,6 @@ properties:
208208
- lemaker,bl035-rgb-002
209209
# LG 7" (800x480 pixels) TFT LCD panel
210210
- lg,lb070wv8
211-
# LG Corporation 5" HD TFT LCD panel
212-
- lg,lh500wx1-sd03
213211
# LG LP079QX1-SP0V 7.9" (1536x2048 pixels) TFT LCD panel
214212
- lg,lp079qx1-sp0v
215213
# LG 9.7" (2048x1536 pixels) TFT LCD panel

Documentation/devicetree/bindings/interrupt-controller/qcom,mpm.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ properties:
6262
- description: MPM pin number
6363
- description: GIC SPI number for the MPM pin
6464

65+
'#power-domain-cells':
66+
const: 0
67+
6568
required:
6669
- compatible
6770
- reg
@@ -93,4 +96,5 @@ examples:
9396
<86 183>,
9497
<90 260>,
9598
<91 260>;
99+
#power-domain-cells = <0>;
96100
};

0 commit comments

Comments
 (0)