Skip to content

Commit 4b0a501

Browse files
committed
Merge tag 'v6.4-rc5' into v4l_for_linus
Linux 6.4-rc5 * tag 'v6.4-rc5': (303 commits) Linux 6.4-rc5 leds: qcom-lpg: Fix PWM period limits selftests/ftrace: Choose target function for filter test from samples KVM: selftests: Add test for race in kvm_recalculate_apic_map() KVM: x86: Bail from kvm_recalculate_phys_map() if x2APIC ID is out-of-bounds KVM: x86: Account fastpath-only VM-Exits in vCPU stats KVM: SVM: vNMI pending bit is V_NMI_PENDING_MASK not V_NMI_BLOCKING_MASK KVM: x86/mmu: Grab memslot for correct address space in NX recovery worker tpm, tpm_tis: correct tpm_tis_flags enumeration values Revert "ext4: remove ac->ac_found > sbi->s_mb_min_to_scan dead check in ext4_mb_check_limits" riscv: Implement missing huge_ptep_get riscv: Fix huge_ptep_set_wrprotect when PTE is a NAPOT module/decompress: Fix error checking on zstd decompression fork, vhost: Use CLONE_THREAD to fix freezer/ps regression dt-bindings: serial: 8250_omap: add rs485-rts-active-high selinux: don't use make's grouped targets feature yet riscv: perf: Fix callchain parse error with kernel tracepoint events mptcp: fix active subflow finalization mptcp: add annotations around sk->sk_shutdown accesses mptcp: fix data race around msk->first access ...
2 parents 899e373 + 9561de3 commit 4b0a501

324 files changed

Lines changed: 2907 additions & 1617 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.

Documentation/devicetree/bindings/fpga/lattice,sysconfig.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Lattice Slave SPI sysCONFIG FPGA manager
88

99
maintainers:
10-
- Ivan Bornyakov <i.bornyakov@metrotek.ru>
10+
- Vladimir Georgiev <v.georgiev@metrotek.ru>
1111

1212
description: |
1313
Lattice sysCONFIG port, which is used for FPGA configuration, among others,

Documentation/devicetree/bindings/fpga/microchip,mpf-spi-fpga-mgr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Microchip Polarfire FPGA manager.
88

99
maintainers:
10-
- Ivan Bornyakov <i.bornyakov@metrotek.ru>
10+
- Vladimir Georgiev <v.georgiev@metrotek.ru>
1111

1212
description:
1313
Device Tree Bindings for Microchip Polarfire FPGA Manager using slave SPI to

Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ properties:
3939
power-domains:
4040
maxItems: 1
4141

42+
vref-supply:
43+
description: |
44+
External ADC reference voltage supply on VREFH pad. If VERID[MVI] is
45+
set, there are additional, internal reference voltages selectable.
46+
VREFH1 is always from VREFH pad.
47+
4248
"#io-channel-cells":
4349
const: 1
4450

@@ -72,6 +78,7 @@ examples:
7278
assigned-clocks = <&clk IMX_SC_R_ADC_0>;
7379
assigned-clock-rates = <24000000>;
7480
power-domains = <&pd IMX_SC_R_ADC_0>;
81+
vref-supply = <&reg_1v8>;
7582
#io-channel-cells = <1>;
7683
};
7784
};

Documentation/devicetree/bindings/iio/adc/renesas,rcar-gyroadc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ patternProperties:
9090
of the MAX chips to the GyroADC, while MISO line of each Maxim
9191
ADC connects to a shared input pin of the GyroADC.
9292
enum:
93-
- adi,7476
93+
- adi,ad7476
9494
- fujitsu,mb88101a
9595
- maxim,max1162
9696
- maxim,max11100

Documentation/devicetree/bindings/serial/8250_omap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ properties:
7070
dsr-gpios: true
7171
rng-gpios: true
7272
dcd-gpios: true
73+
rs485-rts-active-high: true
7374
rts-gpio: true
7475
power-domains: true
7576
clock-frequency: true

Documentation/devicetree/bindings/usb/snps,dwc3.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ properties:
287287
description:
288288
High-Speed PHY interface selection between UTMI+ and ULPI when the
289289
DWC_USB3_HSPHY_INTERFACE has value 3.
290-
$ref: /schemas/types.yaml#/definitions/uint8
290+
$ref: /schemas/types.yaml#/definitions/string
291291
enum: [utmi, ulpi]
292292

293293
snps,quirk-frame-length-adjustment:

Documentation/mm/page_table_check.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,22 @@ Build kernel with:
5252

5353
Optionally, build kernel with PAGE_TABLE_CHECK_ENFORCED in order to have page
5454
table support without extra kernel parameter.
55+
56+
Implementation notes
57+
====================
58+
59+
We specifically decided not to use VMA information in order to avoid relying on
60+
MM states (except for limited "struct page" info). The page table check is a
61+
separate from Linux-MM state machine that verifies that the user accessible
62+
pages are not falsely shared.
63+
64+
PAGE_TABLE_CHECK depends on EXCLUSIVE_SYSTEM_RAM. The reason is that without
65+
EXCLUSIVE_SYSTEM_RAM, users are allowed to map arbitrary physical memory
66+
regions into the userspace via /dev/mem. At the same time, pages may change
67+
their properties (e.g., from anonymous pages to named pages) while they are
68+
still being mapped in the userspace, leading to "corruption" detected by the
69+
page table check.
70+
71+
Even with EXCLUSIVE_SYSTEM_RAM, I/O pages may be still allowed to be mapped via
72+
/dev/mem. However, these pages are always considered as named pages, so they
73+
won't break the logic used in the page table check.

Documentation/netlink/specs/ethtool.yaml

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,6 @@ attribute-sets:
6060
type: nest
6161
nested-attributes: bitset-bits
6262

63-
-
64-
name: u64-array
65-
attributes:
66-
-
67-
name: u64
68-
type: nest
69-
multi-attr: true
70-
nested-attributes: u64
71-
-
72-
name: s32-array
73-
attributes:
74-
-
75-
name: s32
76-
type: nest
77-
multi-attr: true
78-
nested-attributes: s32
7963
-
8064
name: string
8165
attributes:
@@ -705,16 +689,16 @@ attribute-sets:
705689
type: u8
706690
-
707691
name: corrected
708-
type: nest
709-
nested-attributes: u64-array
692+
type: binary
693+
sub-type: u64
710694
-
711695
name: uncorr
712-
type: nest
713-
nested-attributes: u64-array
696+
type: binary
697+
sub-type: u64
714698
-
715699
name: corr-bits
716-
type: nest
717-
nested-attributes: u64-array
700+
type: binary
701+
sub-type: u64
718702
-
719703
name: fec
720704
attributes:
@@ -827,8 +811,8 @@ attribute-sets:
827811
type: u32
828812
-
829813
name: index
830-
type: nest
831-
nested-attributes: s32-array
814+
type: binary
815+
sub-type: s32
832816
-
833817
name: module
834818
attributes:

Documentation/networking/device_drivers/ethernet/mellanox/mlx5/devlink.rst

Lines changed: 37 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ flow_steering_mode: Device flow steering mode
4040
---------------------------------------------
4141
The flow steering mode parameter controls the flow steering mode of the driver.
4242
Two modes are supported:
43+
4344
1. 'dmfs' - Device managed flow steering.
4445
2. 'smfs' - Software/Driver managed flow steering.
4546

@@ -99,6 +100,7 @@ between representors and stacked devices.
99100
By default metadata is enabled on the supported devices in E-switch.
100101
Metadata is applicable only for E-switch in switchdev mode and
101102
users may disable it when NONE of the below use cases will be in use:
103+
102104
1. HCA is in Dual/multi-port RoCE mode.
103105
2. VF/SF representor bonding (Usually used for Live migration)
104106
3. Stacked devices
@@ -180,7 +182,8 @@ User commands examples:
180182

181183
$ devlink health diagnose pci/0000:82:00.0 reporter tx
182184

183-
NOTE: This command has valid output only when interface is up, otherwise the command has empty output.
185+
.. note::
186+
This command has valid output only when interface is up, otherwise the command has empty output.
184187

185188
- Show number of tx errors indicated, number of recover flows ended successfully,
186189
is autorecover enabled and graceful period from last recover::
@@ -232,8 +235,9 @@ User commands examples:
232235

233236
$ devlink health dump show pci/0000:82:00.0 reporter fw
234237

235-
NOTE: This command can run only on the PF which has fw tracer ownership,
236-
running it on other PF or any VF will return "Operation not permitted".
238+
.. note::
239+
This command can run only on the PF which has fw tracer ownership,
240+
running it on other PF or any VF will return "Operation not permitted".
237241

238242
fw fatal reporter
239243
-----------------
@@ -256,7 +260,8 @@ User commands examples:
256260

257261
$ devlink health dump show pci/0000:82:00.1 reporter fw_fatal
258262

259-
NOTE: This command can run only on PF.
263+
.. note::
264+
This command can run only on PF.
260265

261266
vnic reporter
262267
-------------
@@ -265,28 +270,37 @@ It is responsible for querying the vnic diagnostic counters from fw and displayi
265270
them in realtime.
266271

267272
Description of the vnic counters:
268-
total_q_under_processor_handle: number of queues in an error state due to
269-
an async error or errored command.
270-
send_queue_priority_update_flow: number of QP/SQ priority/SL update
271-
events.
272-
cq_overrun: number of times CQ entered an error state due to an
273-
overflow.
274-
async_eq_overrun: number of times an EQ mapped to async events was
275-
overrun.
276-
comp_eq_overrun: number of times an EQ mapped to completion events was
277-
overrun.
278-
quota_exceeded_command: number of commands issued and failed due to quota
279-
exceeded.
280-
invalid_command: number of commands issued and failed dues to any reason
281-
other than quota exceeded.
282-
nic_receive_steering_discard: number of packets that completed RX flow
283-
steering but were discarded due to a mismatch in flow table.
273+
274+
- total_q_under_processor_handle
275+
number of queues in an error state due to
276+
an async error or errored command.
277+
- send_queue_priority_update_flow
278+
number of QP/SQ priority/SL update events.
279+
- cq_overrun
280+
number of times CQ entered an error state due to an overflow.
281+
- async_eq_overrun
282+
number of times an EQ mapped to async events was overrun.
283+
comp_eq_overrun number of times an EQ mapped to completion events was
284+
overrun.
285+
- quota_exceeded_command
286+
number of commands issued and failed due to quota exceeded.
287+
- invalid_command
288+
number of commands issued and failed dues to any reason other than quota
289+
exceeded.
290+
- nic_receive_steering_discard
291+
number of packets that completed RX flow
292+
steering but were discarded due to a mismatch in flow table.
284293

285294
User commands examples:
286-
- Diagnose PF/VF vnic counters
295+
296+
- Diagnose PF/VF vnic counters::
297+
287298
$ devlink health diagnose pci/0000:82:00.1 reporter vnic
299+
288300
- Diagnose representor vnic counters (performed by supplying devlink port of the
289-
representor, which can be obtained via devlink port command)
301+
representor, which can be obtained via devlink port command)::
302+
290303
$ devlink health diagnose pci/0000:82:00.1/65537 reporter vnic
291304

292-
NOTE: This command can run over all interfaces such as PF/VF and representor ports.
305+
.. note::
306+
This command can run over all interfaces such as PF/VF and representor ports.

0 commit comments

Comments
 (0)