Skip to content

Commit 726eb70

Browse files
committed
Merge tag 'char-misc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here is the big set of char, misc, and other assorted driver subsystem patches for 5.10-rc1. There's a lot of different things in here, all over the drivers/ directory. Some summaries: - soundwire driver updates - habanalabs driver updates - extcon driver updates - nitro_enclaves new driver - fsl-mc driver and core updates - mhi core and bus updates - nvmem driver updates - eeprom driver updates - binder driver updates and fixes - vbox minor bugfixes - fsi driver updates - w1 driver updates - coresight driver updates - interconnect driver updates - misc driver updates - other minor driver updates All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (396 commits) binder: fix UAF when releasing todo list docs: w1: w1_therm: Fix broken xref, mistakes, clarify text misc: Kconfig: fix a HISI_HIKEY_USB dependency LSM: Fix type of id parameter in kernel_post_load_data prototype misc: Kconfig: add a new dependency for HISI_HIKEY_USB firmware_loader: fix a kernel-doc markup w1: w1_therm: make w1_poll_completion static binder: simplify the return expression of binder_mmap test_firmware: Test partial read support firmware: Add request_partial_firmware_into_buf() firmware: Store opt_flags in fw_priv fs/kernel_file_read: Add "offset" arg for partial reads IMA: Add support for file reads without contents LSM: Add "contents" flag to kernel_read_file hook module: Call security_kernel_post_load_data() firmware_loader: Use security_post_load_data() LSM: Introduce kernel_post_load_data() hook fs/kernel_read_file: Add file_size output argument fs/kernel_read_file: Switch buffer size arg to size_t fs/kernel_read_file: Remove redundant size argument ...
2 parents c6dbef7 + f3277cb commit 726eb70

File tree

297 files changed

+24461
-10014
lines changed

Some content is hidden

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

297 files changed

+24461
-10014
lines changed
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
What: /sys/bus/mhi/devices/.../serialnumber
2+
Date: Sept 2020
3+
KernelVersion: 5.10
4+
Contact: Bhaumik Bhatt <[email protected]>
5+
Description: The file holds the serial number of the client device obtained
6+
using a BHI (Boot Host Interface) register read after at least
7+
one attempt to power up the device has been done. If read
8+
without having the device power on at least once, the file will
9+
read all 0's.
10+
Users: Any userspace application or clients interested in device info.
11+
12+
What: /sys/bus/mhi/devices/.../oem_pk_hash
13+
Date: Sept 2020
14+
KernelVersion: 5.10
15+
Contact: Bhaumik Bhatt <[email protected]>
16+
Description: The file holds the OEM PK Hash value of the endpoint device
17+
obtained using a BHI (Boot Host Interface) register read after
18+
at least one attempt to power up the device has been done. If
19+
read without having the device power on at least once, the file
20+
will read all 0's.
21+
Users: Any userspace application or clients interested in device info.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/dfl/devices/dfl_dev.X/type
2+
Date: Aug 2020
3+
KernelVersion: 5.10
4+
Contact: Xu Yilun <[email protected]>
5+
Description: Read-only. It returns type of DFL FIU of the device. Now DFL
6+
supports 2 FIU types, 0 for FME, 1 for PORT.
7+
Format: 0x%x
8+
9+
What: /sys/bus/dfl/devices/dfl_dev.X/feature_id
10+
Date: Aug 2020
11+
KernelVersion: 5.10
12+
Contact: Xu Yilun <[email protected]>
13+
Description: Read-only. It returns feature identifier local to its DFL FIU
14+
type.
15+
Format: 0x%x

Documentation/ABI/testing/sysfs-bus-fsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,11 @@ Contact: [email protected]
3636
Description:
3737
Provides a means of reading/writing a 32 bit value from/to a
3838
specified FSI bus address.
39+
40+
What: /sys/bus/platform/devices/../cfam_reset
41+
Date: Sept 2020
42+
KernelVersion: 5.10
43+
44+
Description:
45+
Provides a means of resetting the cfam that is attached to the
46+
FSI device.

Documentation/ABI/testing/sysfs-bus-mei

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ Contact: Tomas Winkler <[email protected]>
4141
Description: Stores mei client fixed address, if any
4242
Format: %d
4343

44+
What: /sys/bus/mei/devices/.../vtag
45+
Date: Nov 2020
46+
KernelVersion: 5.9
47+
Contact: Tomas Winkler <[email protected]>
48+
Description: Stores mei client vtag support status
49+
Format: %d
50+
4451
What: /sys/bus/mei/devices/.../max_len
4552
Date: Nov 2019
4653
KernelVersion: 5.5

Documentation/ABI/testing/sysfs-bus-soundwire-slave

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
What: /sys/bus/soundwire/devices/sdw:.../status
2+
/sys/bus/soundwire/devices/sdw:.../device_number
3+
4+
Date: September 2020
5+
6+
Contact: Pierre-Louis Bossart <[email protected]>
7+
Bard Liao <[email protected]>
8+
Vinod Koul <[email protected]>
9+
10+
Description: SoundWire Slave status
11+
12+
These properties report the Slave status, e.g. if it
13+
is UNATTACHED or not, and in the latter case show the
14+
device_number. This status information is useful to
15+
detect devices exposed by platform firmware but not
16+
physically present on the bus, and conversely devices
17+
not exposed in platform firmware but enumerated.
18+
119
What: /sys/bus/soundwire/devices/sdw:.../dev-properties/mipi_revision
220
/sys/bus/soundwire/devices/sdw:.../dev-properties/wake_capable
321
/sys/bus/soundwire/devices/sdw:.../dev-properties/test_mode_capable

Documentation/ABI/testing/sysfs-driver-habanalabs

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ What: /sys/class/habanalabs/hl<n>/armcp_kernel_ver
22
Date: Jan 2019
33
KernelVersion: 5.1
44
5-
Description: Version of the Linux kernel running on the device's CPU
5+
Description: Version of the Linux kernel running on the device's CPU.
6+
Will be DEPRECATED in Linux kernel version 5.10, and be
7+
replaced with cpucp_kernel_ver
68

79
What: /sys/class/habanalabs/hl<n>/armcp_ver
810
Date: Jan 2019
911
KernelVersion: 5.1
1012
1113
Description: Version of the application running on the device's CPU
14+
Will be DEPRECATED in Linux kernel version 5.10, and be
15+
replaced with cpucp_ver
1216

1317
What: /sys/class/habanalabs/hl<n>/clk_max_freq_mhz
1418
Date: Jun 2019
@@ -33,6 +37,18 @@ KernelVersion: 5.1
3337
3438
Description: Version of the Device's CPLD F/W
3539

40+
What: /sys/class/habanalabs/hl<n>/cpucp_kernel_ver
41+
Date: Oct 2020
42+
KernelVersion: 5.10
43+
44+
Description: Version of the Linux kernel running on the device's CPU
45+
46+
What: /sys/class/habanalabs/hl<n>/cpucp_ver
47+
Date: Oct 2020
48+
KernelVersion: 5.10
49+
50+
Description: Version of the application running on the device's CPU
51+
3652
What: /sys/class/habanalabs/hl<n>/device_type
3753
Date: Jan 2019
3854
KernelVersion: 5.1

Documentation/ABI/testing/sysfs-driver-w1_therm

Lines changed: 49 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,13 @@ Description:
4949
will be changed only in device RAM, so it will be cleared when
5050
power is lost. Trigger a 'save' to EEPROM command to keep
5151
values after power-on. Read or write are :
52-
* '9..12': device resolution in bit
52+
* '9..14': device resolution in bit
5353
or resolution to set in bit
5454
* '-xx': xx is kernel error when reading the resolution
5555
* Anything else: do nothing
56+
Some DS18B20 clones are fixed in 12-bit resolution, so the
57+
actual resolution is read back from the chip and verified. Error
58+
is reported if the results differ.
5659
Users: any user space application which wants to communicate with
5760
w1_term device
5861

@@ -86,7 +89,7 @@ Description:
8689
*write* :
8790
* '0' : save the 2 or 3 bytes to the device EEPROM
8891
(i.e. TH, TL and config register)
89-
* '9..12' : set the device resolution in RAM
92+
* '9..14' : set the device resolution in RAM
9093
(if supported)
9194
* Anything else: do nothing
9295
refer to Documentation/w1/slaves/w1_therm.rst for detailed
@@ -114,3 +117,47 @@ Description:
114117
of the bulk read command (not the current temperature).
115118
Users: any user space application which wants to communicate with
116119
w1_term device
120+
121+
122+
What: /sys/bus/w1/devices/.../conv_time
123+
Date: July 2020
124+
Contact: Ivan Zaentsev <[email protected]>
125+
Description:
126+
(RW) Get, set, or measure a temperature conversion time. The
127+
setting remains active until a resolution change. Then it is
128+
reset to default (datasheet) conversion time for a new
129+
resolution.
130+
131+
*read*: Actual conversion time in milliseconds. *write*:
132+
'0': Set the default conversion time from the datasheet.
133+
'1': Measure and set the conversion time. Make a single
134+
temperature conversion, measure an actual value.
135+
Increase it by 20% for temperature range. A new
136+
conversion time can be obtained by reading this
137+
same attribute.
138+
other positive value:
139+
Set the conversion time in milliseconds.
140+
141+
Users: An application using the w1_term device
142+
143+
144+
What: /sys/bus/w1/devices/.../features
145+
Date: July 2020
146+
Contact: Ivan Zaentsev <[email protected]>
147+
Description:
148+
(RW) Control optional driver settings.
149+
Bit masks to read/write (bitwise OR):
150+
151+
1: Enable check for conversion success. If byte 6 of
152+
scratchpad memory is 0xC after conversion, and
153+
temperature reads 85.00 (powerup value) or 127.94
154+
(insufficient power) - return a conversion error.
155+
156+
2: Enable poll for conversion completion. Generate read cycles
157+
after the conversion start and wait for 1's. In parasite
158+
power mode this feature is not available.
159+
160+
*read*: Currently selected features.
161+
*write*: Select features.
162+
163+
Users: An application using the w1_term device

Documentation/devicetree/bindings/extcon/extcon-ptn5150.txt

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/extcon/extcon-ptn5150.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: PTN5150 CC (Configuration Channel) Logic device
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <[email protected]>
11+
12+
description: |
13+
PTN5150 is a small thin low power CC logic chip supporting the USB Type-C
14+
connector application with CC control logic detection and indication
15+
functions. It is interfaced to the host controller using an I2C interface.
16+
17+
properties:
18+
compatible:
19+
const: nxp,ptn5150
20+
21+
int-gpios:
22+
deprecated: true
23+
description:
24+
GPIO pin (input) connected to the PTN5150's INTB pin.
25+
Use "interrupts" instead.
26+
27+
interrupts:
28+
maxItems: 1
29+
30+
reg:
31+
maxItems: 1
32+
33+
vbus-gpios:
34+
description:
35+
GPIO pin (output) used to control VBUS. If skipped, no such control
36+
takes place.
37+
38+
required:
39+
- compatible
40+
- interrupts
41+
- reg
42+
43+
additionalProperties: false
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/gpio/gpio.h>
48+
#include <dt-bindings/interrupt-controller/irq.h>
49+
i2c {
50+
#address-cells = <1>;
51+
#size-cells = <0>;
52+
53+
ptn5150@1d {
54+
compatible = "nxp,ptn5150";
55+
reg = <0x1d>;
56+
interrupt-parent = <&msmgpio>;
57+
interrupts = <78 IRQ_TYPE_LEVEL_HIGH>;
58+
vbus-gpios = <&msmgpio 148 GPIO_ACTIVE_HIGH>;
59+
};
60+
};

Documentation/devicetree/bindings/fsi/fsi-master-aspeed.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ Required properties:
1212
- pinctrl-0: phandle to pinctrl node
1313
- pinctrl-names: pinctrl state
1414

15+
Optional properties:
16+
- cfam-reset-gpios: GPIO for CFAM reset
17+
18+
- fsi-routing-gpios: GPIO for setting the FSI mux (internal or cabled)
19+
- fsi-mux-gpios: GPIO for detecting the desired FSI mux state
20+
21+
1522
Examples:
1623

1724
fsi-master {
@@ -21,4 +28,9 @@ Examples:
2128
pinctrl-names = "default";
2229
pinctrl-0 = <&pinctrl_fsi1_default>;
2330
clocks = <&syscon ASPEED_CLK_GATE_FSICLK>;
31+
32+
fsi-routing-gpios = <&gpio0 ASPEED_GPIO(Q, 7) GPIO_ACTIVE_HIGH>;
33+
fsi-mux-gpios = <&gpio0 ASPEED_GPIO(B, 0) GPIO_ACTIVE_HIGH>;
34+
35+
cfam-reset-gpios = <&gpio0 ASPEED_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
2436
};

0 commit comments

Comments
 (0)