Skip to content

Commit cfeafd9

Browse files
committed
Merge tag 'driver-core-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core / kernfs updates from Greg KH: "Here is the set of driver core and kernfs changes for 6.0-rc1. The "biggest" thing in here is some scalability improvements for kernfs for large systems. Other than that, included in here are: - arch topology and cache info changes that have been reviewed and discussed a lot. - potential error path cleanup fixes - deferred driver probe cleanups - firmware loader cleanups and tweaks - documentation updates - other small things All of these have been in the linux-next tree for a while with no reported problems" * tag 'driver-core-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (63 commits) docs: embargoed-hardware-issues: fix invalid AMD contact email firmware_loader: Replace kmap() with kmap_local_page() sysfs docs: ABI: Fix typo in comment kobject: fix Kconfig.debug "its" grammar kernfs: Fix typo 'the the' in comment docs: driver-api: firmware: add driver firmware guidelines. (v3) arch_topology: Fix cache attributes detection in the CPU hotplug path ACPI: PPTT: Leave the table mapped for the runtime usage cacheinfo: Use atomic allocation for percpu cache attributes drivers/base: fix userspace break from using bin_attributes for cpumap and cpulist MAINTAINERS: Change mentions of mpm to olivia docs: ABI: sysfs-devices-soc: Update Lee Jones' email address docs: ABI: sysfs-class-pwm: Update Lee Jones' email address Documentation/process: Add embargoed HW contact for LLVM Revert "kernfs: Change kernfs_notify_list to llist." ACPI: Remove the unused find_acpi_cpu_cache_topology() arch_topology: Warn that topology for nested clusters is not supported arch_topology: Add support for parsing sockets in /cpu-map arch_topology: Set cluster identifier in each core/thread from /cpu-map arch_topology: Limit span of cpu_clustergroup_mask() ...
2 parents 228dfe9 + 273aaa2 commit cfeafd9

47 files changed

Lines changed: 718 additions & 374 deletions

Some content is hidden

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

Documentation/ABI/stable/sysfs-module

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ What: /sys/module/<MODULENAME>/srcversion
3838
Date: Jun 2005
3939
Description:
4040
If the module source has MODULE_VERSION, this file will contain
41-
the checksum of the the source code.
41+
the checksum of the source code.
4242

4343
What: /sys/module/<MODULENAME>/version
4444
Date: Jun 2005

Documentation/ABI/testing/sysfs-class-pwm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Description:
8181
What: /sys/class/pwm/pwmchip<N>/pwmX/capture
8282
Date: June 2016
8383
KernelVersion: 4.8
84-
Contact: Lee Jones <lee.jones@linaro.org>
84+
Contact: Lee Jones <lee@kernel.org>
8585
Description:
8686
Capture information about a PWM signal. The output format is a
8787
pair unsigned integers (period and duty cycle), separated by a

Documentation/ABI/testing/sysfs-class-rtrs-client

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ What: /sys/class/rtrs-client/<session-name>/paths/<src@dst>/hca_name
7878
Date: Feb 2020
7979
KernelVersion: 5.7
8080
Contact: Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>
81-
Description: RO, Contains the the name of HCA the connection established on.
81+
Description: RO, Contains the name of HCA the connection established on.
8282

8383
What: /sys/class/rtrs-client/<session-name>/paths/<src@dst>/hca_port
8484
Date: Feb 2020

Documentation/ABI/testing/sysfs-class-rtrs-server

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ What: /sys/class/rtrs-server/<session-name>/paths/<src@dst>/hca_name
2424
Date: Feb 2020
2525
KernelVersion: 5.7
2626
Contact: Jack Wang <jinpu.wang@cloud.ionos.com> Danil Kipnis <danil.kipnis@cloud.ionos.com>
27-
Description: RO, Contains the the name of HCA the connection established on.
27+
Description: RO, Contains the name of HCA the connection established on.
2828

2929
What: /sys/class/rtrs-server/<session-name>/paths/<src@dst>/hca_port
3030
Date: Feb 2020

Documentation/ABI/testing/sysfs-devices-platform-ACPI-TAD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Description:
7474

7575
Reads also cause the AC alarm timer status to be reset.
7676

77-
Another way to reset the the status of the AC alarm timer is to
77+
Another way to reset the status of the AC alarm timer is to
7878
write (the number) 0 to this file.
7979

8080
If the status return value indicates that the timer has expired,

Documentation/ABI/testing/sysfs-devices-power

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,5 +303,5 @@ Date: Apr 2010
303303
Contact: Dominik Brodowski <linux@dominikbrodowski.net>
304304
Description:
305305
Reports the runtime PM children usage count of a device, or
306-
0 if the the children will be ignored.
306+
0 if the children will be ignored.
307307

Documentation/ABI/testing/sysfs-devices-soc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/devices/socX
22
Date: January 2012
3-
contact: Lee Jones <lee.jones@linaro.org>
3+
contact: Lee Jones <lee@kernel.org>
44
Description:
55
The /sys/devices/ directory contains a sub-directory for each
66
System-on-Chip (SoC) device on a running platform. Information
@@ -14,14 +14,14 @@ Description:
1414

1515
What: /sys/devices/socX/machine
1616
Date: January 2012
17-
contact: Lee Jones <lee.jones@linaro.org>
17+
contact: Lee Jones <lee@kernel.org>
1818
Description:
1919
Read-only attribute common to all SoCs. Contains the SoC machine
2020
name (e.g. Ux500).
2121

2222
What: /sys/devices/socX/family
2323
Date: January 2012
24-
contact: Lee Jones <lee.jones@linaro.org>
24+
contact: Lee Jones <lee@kernel.org>
2525
Description:
2626
Read-only attribute common to all SoCs. Contains SoC family name
2727
(e.g. DB8500).
@@ -59,7 +59,7 @@ Description:
5959

6060
What: /sys/devices/socX/soc_id
6161
Date: January 2012
62-
contact: Lee Jones <lee.jones@linaro.org>
62+
contact: Lee Jones <lee@kernel.org>
6363
Description:
6464
Read-only attribute supported by most SoCs. In the case of
6565
ST-Ericsson's chips this contains the SoC serial number.
@@ -72,21 +72,21 @@ Description:
7272

7373
What: /sys/devices/socX/revision
7474
Date: January 2012
75-
contact: Lee Jones <lee.jones@linaro.org>
75+
contact: Lee Jones <lee@kernel.org>
7676
Description:
7777
Read-only attribute supported by most SoCs. Contains the SoC's
7878
manufacturing revision number.
7979

8080
What: /sys/devices/socX/process
8181
Date: January 2012
82-
contact: Lee Jones <lee.jones@linaro.org>
82+
contact: Lee Jones <lee@kernel.org>
8383
Description:
8484
Read-only attribute supported ST-Ericsson's silicon. Contains the
8585
the process by which the silicon chip was manufactured.
8686

8787
What: /sys/bus/soc
8888
Date: January 2012
89-
contact: Lee Jones <lee.jones@linaro.org>
89+
contact: Lee Jones <lee@kernel.org>
9090
Description:
9191
The /sys/bus/soc/ directory contains the usual sub-folders
9292
expected under most buses. /sys/bus/soc/devices is of particular

Documentation/ABI/testing/sysfs-devices-system-cpu

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ Description: Discover NUMA node a CPU belongs to
6767
/sys/devices/system/cpu/cpu42/node2 -> ../../node/node2
6868

6969

70-
What: /sys/devices/system/cpu/cpuX/topology/core_id
71-
/sys/devices/system/cpu/cpuX/topology/core_siblings
70+
What: /sys/devices/system/cpu/cpuX/topology/core_siblings
7271
/sys/devices/system/cpu/cpuX/topology/core_siblings_list
7372
/sys/devices/system/cpu/cpuX/topology/physical_package_id
7473
/sys/devices/system/cpu/cpuX/topology/thread_siblings
@@ -84,10 +83,6 @@ Description: CPU topology files that describe a logical CPU's relationship
8483

8584
Briefly, the files above are:
8685

87-
core_id: the CPU core ID of cpuX. Typically it is the
88-
hardware platform's identifier (rather than the kernel's).
89-
The actual value is architecture and platform dependent.
90-
9186
core_siblings: internal kernel map of cpuX's hardware threads
9287
within the same physical_package_id.
9388

Documentation/driver-api/firmware/core.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ documents these features.
1313
direct-fs-lookup
1414
fallback-mechanisms
1515
lookup-order
16+
firmware-usage-guidelines
1617

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
===================
2+
Firmware Guidelines
3+
===================
4+
5+
Users switching to a newer kernel should *not* have to install newer
6+
firmware files to keep their hardware working. At the same time updated
7+
firmware files must not cause any regressions for users of older kernel
8+
releases.
9+
10+
Drivers that use firmware from linux-firmware should follow the rules in
11+
this guide. (Where there is limited control of the firmware,
12+
i.e. company doesn't support Linux, firmwares sourced from misc places,
13+
then of course these rules will not apply strictly.)
14+
15+
* Firmware files shall be designed in a way that it allows checking for
16+
firmware ABI version changes. It is recommended that firmware files be
17+
versioned with at least a major/minor version. It is suggested that
18+
the firmware files in linux-firmware be named with some device
19+
specific name, and just the major version. The firmware version should
20+
be stored in the firmware header, or as an exception, as part of the
21+
firmware file name, in order to let the driver detact any non-ABI
22+
fixes/changes. The firmware files in linux-firmware should be
23+
overwritten with the newest compatible major version. Newer major
24+
version firmware shall remain compatible with all kernels that load
25+
that major number.
26+
27+
* If the kernel support for the hardware is normally inactive, or the
28+
hardware isn't available for public consumption, this can
29+
be ignored, until the first kernel release that enables that hardware.
30+
This means no major version bumps without the kernel retaining
31+
backwards compatibility for the older major versions. Minor version
32+
bumps should not introduce new features that newer kernels depend on
33+
non-optionally.
34+
35+
* If a security fix needs lockstep firmware and kernel fixes in order to
36+
be successful, then all supported major versions in the linux-firmware
37+
repo that are required by currently supported stable/LTS kernels,
38+
should be updated with the security fix. The kernel patches should
39+
detect if the firmware is new enough to declare if the security issue
40+
is fixed. All communications around security fixes should point at
41+
both the firmware and kernel fixes. If a security fix requires
42+
deprecating old major versions, then this should only be done as a
43+
last option, and be stated clearly in all communications.
44+

0 commit comments

Comments
 (0)