Skip to content

Commit

Permalink
Merge tag 'v5.18-rc4' into next
Browse files Browse the repository at this point in the history
Merge master into next, to bring in commit 5f24d5a ("mm, hugetlb:
allow for "high" userspace addresses"), which is needed as a
prerequisite for the series converting powerpc to the generic mmap
logic.
  • Loading branch information
mpe committed May 5, 2022
2 parents f06351f + af2d861 commit d0a31ac
Show file tree
Hide file tree
Showing 701 changed files with 5,140 additions and 3,708 deletions.
48 changes: 26 additions & 22 deletions Documentation/ABI/testing/sysfs-class-firmware-attributes
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Description:
<value>[ForceIf:<attribute>=<value>]
<value>[ForceIfNot:<attribute>=<value>]

For example:
For example::

LegacyOrom/dell_value_modifier has value:
Disabled[ForceIf:SecureBoot=Enabled]
Expand Down Expand Up @@ -212,7 +212,7 @@ Description:
the next boot.

Lenovo specific class extensions
------------------------------
--------------------------------

On Lenovo systems the following additional settings are available:

Expand Down Expand Up @@ -246,9 +246,7 @@ Description:
that is being referenced (e.g hdd0, hdd1 etc)
This attribute defaults to device 0.

certificate:
signature:
save_signature:
certificate, signature, save_signature:
These attributes are used for certificate based authentication. This is
used in conjunction with a signing server as an alternative to password
based authentication.
Expand All @@ -257,22 +255,27 @@ Description:
The attributes can be displayed to check the stored value.

Some usage examples:
Installing a certificate to enable feature:
echo <supervisor password > authentication/Admin/current_password
echo <signed certificate> > authentication/Admin/certificate

Updating the installed certificate:
echo <signature> > authentication/Admin/signature
echo <signed certificate> > authentication/Admin/certificate
Installing a certificate to enable feature::

echo "supervisor password" > authentication/Admin/current_password
echo "signed certificate" > authentication/Admin/certificate

Updating the installed certificate::

echo "signature" > authentication/Admin/signature
echo "signed certificate" > authentication/Admin/certificate

Removing the installed certificate:
echo <signature> > authentication/Admin/signature
echo '' > authentication/Admin/certificate
Removing the installed certificate::

Changing a BIOS setting:
echo <signature> > authentication/Admin/signature
echo <save signature> > authentication/Admin/save_signature
echo Enable > attribute/PasswordBeep/current_value
echo "signature" > authentication/Admin/signature
echo "" > authentication/Admin/certificate

Changing a BIOS setting::

echo "signature" > authentication/Admin/signature
echo "save signature" > authentication/Admin/save_signature
echo Enable > attribute/PasswordBeep/current_value

You cannot enable certificate authentication if a supervisor password
has not been set.
Expand All @@ -288,9 +291,10 @@ Description:
certificate_to_password:
Write only attribute used to switch from certificate based authentication
back to password based.
Usage:
echo <signature> > authentication/Admin/signature
echo <password> > authentication/Admin/certificate_to_password
Usage::

echo "signature" > authentication/Admin/signature
echo "password" > authentication/Admin/certificate_to_password


What: /sys/class/firmware-attributes/*/attributes/pending_reboot
Expand Down Expand Up @@ -345,7 +349,7 @@ Description:

# echo "factory" > /sys/class/firmware-attributes/*/device/attributes/reset_bios
# cat /sys/class/firmware-attributes/*/device/attributes/reset_bios
# builtinsafe lastknowngood [factory] custom
builtinsafe lastknowngood [factory] custom

Note that any changes to this attribute requires a reboot
for changes to take effect.
Expand Down
18 changes: 10 additions & 8 deletions Documentation/ABI/testing/sysfs-driver-intel_sdsi
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,19 @@ Description:
Should the operation fail, one of the following error codes
may be returned:

========== =====
Error Code Cause
---------- -----
EIO General mailbox failure. Log may indicate cause.
EBUSY Mailbox is owned by another agent.
EPERM SDSI capability is not enabled in hardware.
EPROTO Failure in mailbox protocol detected by driver.
========== =====
EIO General mailbox failure. Log may indicate cause.
EBUSY Mailbox is owned by another agent.
EPERM SDSI capability is not enabled in hardware.
EPROTO Failure in mailbox protocol detected by driver.
See log for details.
EOVERFLOW For provision commands, the size of the data
EOVERFLOW For provision commands, the size of the data
exceeds what may be written.
ESPIPE Seeking is not allowed.
ETIMEDOUT Failure to complete mailbox transaction in time.
ESPIPE Seeking is not allowed.
ETIMEDOUT Failure to complete mailbox transaction in time.
========== =====

What: /sys/bus/auxiliary/devices/intel_vsec.sdsi.X/guid
Date: Feb 2022
Expand Down
5 changes: 3 additions & 2 deletions Documentation/ABI/testing/sysfs-fs-erofs
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@ Description: Shows all enabled kernel features.
What: /sys/fs/erofs/<disk>/sync_decompress
Date: November 2021
Contact: "Huang Jianan" <[email protected]>
Description: Control strategy of sync decompression
Description: Control strategy of sync decompression:

- 0 (default, auto): enable for readpage, and enable for
readahead on atomic contexts only,
readahead on atomic contexts only.
- 1 (force on): enable for readpage and readahead.
- 2 (force off): disable for all situations.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ maintainers:
properties:
compatible:
enum:
- nvidia,tegra20-pmc
- nvidia,tegra20-pmc
- nvidia,tegra30-pmc
- nvidia,tegra114-pmc
Expand Down
1 change: 0 additions & 1 deletion Documentation/devicetree/bindings/bus/ti-sysc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ properties:
oneOf:
- items:
- enum:
- ti,sysc-omap2
- ti,sysc-omap2
- ti,sysc-omap4
- ti,sysc-omap4-simple
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung Exynos SoC Audio SubSystem clock controller

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung Exynos SoC clock controller

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung SoC external/osc/XXTI/XusbXTI clock

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung Exynos4412 SoC ISP clock controller

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung Exynos5260 SoC clock controller

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung Exynos5410 SoC clock controller

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung Exynos5433 SoC clock controller

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung Exynos7 SoC clock controller

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ title: Samsung Exynos7885 SoC clock controller
maintainers:
- Dávid Virág <[email protected]>
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ title: Samsung Exynos850 SoC clock controller
maintainers:
- Sam Protsenko <[email protected]>
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Samsung S2M and S5M family clock generator block

maintainers:
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>

description: |
This is a part of device tree bindings for S2M and S5M family of Power
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung S5Pv210 SoC Audio SubSystem clock controller

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung S5P6442/S5PC110/S5PV210 SoC clock controller

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Sylwester Nawrocki <[email protected]>
- Tomasz Figa <[email protected]>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung Exynos NoC (Network on Chip) Probe

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>

description: |
The Samsung Exynos542x SoC has a NoC (Network on Chip) Probe for NoC bus.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ title: Samsung Exynos SoC PPMU (Platform Performance Monitoring Unit)

maintainers:
- Chanwoo Choi <[email protected]>
- Krzysztof Kozlowski <[email protected]>
- Krzysztof Kozlowski <[email protected]>

description: |
The Samsung Exynos SoC has PPMU (Platform Performance Monitoring Unit) for
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ examples:
mdss: mdss@5e00000 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "qcom,qcm2290-mdss", "qcom,mdss";
compatible = "qcom,qcm2290-mdss";
reg = <0x05e00000 0x1000>;
reg-names = "mdss";
power-domains = <&dispcc MDSS_GDSC>;
Expand All @@ -180,7 +180,7 @@ examples:
<&apps_smmu 0x421 0x0>;
ranges;
mdss_mdp: mdp@5e01000 {
mdss_mdp: display-controller@5e01000 {
compatible = "qcom,qcm2290-dpu";
reg = <0x05e01000 0x8f000>,
<0x05eb0000 0x2008>;
Expand Down
42 changes: 18 additions & 24 deletions Documentation/devicetree/bindings/display/panel/panel-timing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,78 +71,72 @@ properties:

hfront-porch:
description: Horizontal front porch panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of pixels
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of pixels

hback-porch:
description: Horizontal back porch timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of pixels
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of pixels

hsync-len:
description: Horizontal sync length panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of pixels
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of pixels

vfront-porch:
description: Vertical front porch panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of lines
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of lines

vback-porch:
description: Vertical back porch panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of lines
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of lines

vsync-len:
description: Vertical sync length panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of lines
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of lines
Expand Down
Loading

0 comments on commit d0a31ac

Please sign in to comment.