Skip to content

Commit 284721e

Browse files
committed
tgupdate: merge t/DO-NOT-MERGE-mptcp-use-kmalloc-on-kasan-build base into t/DO-NOT-MERGE-mptcp-use-kmalloc-on-kasan-build
2 parents 289136d + 85001f8 commit 284721e

File tree

353 files changed

+12797
-4773
lines changed

Some content is hidden

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

353 files changed

+12797
-4773
lines changed

.mailmap

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@ Anirudh Ghayal <[email protected]> <[email protected]>
8383
8484
8585
86+
87+
88+
89+
90+
91+
92+
8693
8794
Archit Taneja <[email protected]>
8895
@@ -429,6 +436,8 @@ Marcin Nowakowski <[email protected]> <[email protected]>
429436
430437
431438
Marek Behún <[email protected]> Marek Behun <[email protected]>
439+
440+
432441
Mark Brown <[email protected]>
433442
434443
Markus Schneider-Pargmann <[email protected]> <[email protected]>
@@ -644,6 +653,11 @@ Simona Vetter <[email protected]> <[email protected]>
644653
645654
646655
Simon Kelley <[email protected]>
656+
657+
658+
659+
660+
647661
Sricharan Ramabadhran <[email protected]> <[email protected]>
648662
649663
@@ -664,6 +678,11 @@ Sudarshan Rajagopalan <[email protected]> <[email protected]>
664678
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
665679
Sumit Semwal <[email protected]>
666680
681+
682+
683+
684+
685+
667686
Takashi YOSHII <[email protected]>
668687
Tamizh Chelvam Raja <[email protected]> <[email protected]>
669688

Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,10 @@ properties:
101101
max-speed: true
102102

103103
firmware-name:
104-
description: specify the name of nvm firmware to load
104+
minItems: 1
105+
items:
106+
- description: specify the name of nvm firmware to load
107+
- description: specify the name of rampatch firmware to load
105108

106109
local-bd-address: true
107110

@@ -154,16 +157,11 @@ allOf:
154157
- qcom,wcn6750-bt
155158
then:
156159
required:
157-
- enable-gpios
158-
- swctrl-gpios
159-
- vddio-supply
160160
- vddaon-supply
161-
- vddbtcxmx-supply
162161
- vddrfacmn-supply
163162
- vddrfa0p8-supply
164163
- vddrfa1p7-supply
165164
- vddrfa1p2-supply
166-
- vddasd-supply
167165
- if:
168166
properties:
169167
compatible:
Lines changed: 204 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,204 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
# Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/net/wireless/qcom,ath12k-wsi.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Qualcomm Technologies ath12k wireless devices (PCIe) with WSI interface
9+
10+
maintainers:
11+
- Jeff Johnson <[email protected]>
12+
- Kalle Valo <[email protected]>
13+
14+
description: |
15+
Qualcomm Technologies IEEE 802.11be PCIe devices with WSI interface.
16+
17+
The ath12k devices (QCN9274) feature WSI support. WSI stands for
18+
WLAN Serial Interface. It is used for the exchange of specific
19+
control information across radios based on the doorbell mechanism.
20+
This WSI connection is essential to exchange control information
21+
among these devices.
22+
23+
The WSI interface includes TX and RX ports, which are used to connect
24+
multiple WSI-supported devices together, forming a WSI group.
25+
26+
Diagram to represent one WSI connection (one WSI group) among
27+
three devices.
28+
29+
+-------+ +-------+ +-------+
30+
| pcie1 | | pcie2 | | pcie3 |
31+
| | | | | |
32+
+----->| wsi |------->| wsi |------->| wsi |-----+
33+
| | grp 0 | | grp 0 | | grp 0 | |
34+
| +-------+ +-------+ +-------+ |
35+
+------------------------------------------------------+
36+
37+
Diagram to represent two WSI connections (two separate WSI groups)
38+
among four devices.
39+
40+
+-------+ +-------+ +-------+ +-------+
41+
| pcie0 | | pcie1 | | pcie2 | | pcie3 |
42+
| | | | | | | |
43+
+-->| wsi |--->| wsi |--+ +-->| wsi |--->| wsi |--+
44+
| | grp 0 | | grp 0 | | | | grp 1 | | grp 1 | |
45+
| +-------+ +-------+ | | +-------+ +-------+ |
46+
+---------------------------+ +---------------------------+
47+
48+
properties:
49+
compatible:
50+
enum:
51+
- pci17cb,1109 # QCN9274
52+
53+
reg:
54+
maxItems: 1
55+
56+
qcom,ath12k-calibration-variant:
57+
$ref: /schemas/types.yaml#/definitions/string
58+
description:
59+
String to uniquely identify variant of the calibration data for designs
60+
with colliding bus and device ids
61+
62+
qcom,wsi-controller:
63+
$ref: /schemas/types.yaml#/definitions/flag
64+
description:
65+
The WSI controller device in the WSI group aids (is capable) to
66+
synchronize the Timing Synchronization Function (TSF) clock across
67+
all devices in the WSI group.
68+
69+
ports:
70+
$ref: /schemas/graph.yaml#/properties/ports
71+
properties:
72+
port@0:
73+
$ref: /schemas/graph.yaml#/properties/port
74+
description:
75+
This is the TX port of WSI interface. It is attached to the RX
76+
port of the next device in the WSI connection.
77+
78+
port@1:
79+
$ref: /schemas/graph.yaml#/properties/port
80+
description:
81+
This is the RX port of WSI interface. It is attached to the TX
82+
port of the previous device in the WSI connection.
83+
84+
required:
85+
- compatible
86+
- reg
87+
88+
additionalProperties: false
89+
90+
examples:
91+
- |
92+
pcie {
93+
#address-cells = <3>;
94+
#size-cells = <2>;
95+
96+
pcie@0 {
97+
device_type = "pci";
98+
reg = <0x0 0x0 0x0 0x0 0x0>;
99+
#address-cells = <3>;
100+
#size-cells = <2>;
101+
ranges;
102+
103+
wifi@0 {
104+
compatible = "pci17cb,1109";
105+
reg = <0x0 0x0 0x0 0x0 0x0>;
106+
107+
qcom,ath12k-calibration-variant = "RDP433_1";
108+
109+
ports {
110+
#address-cells = <1>;
111+
#size-cells = <0>;
112+
113+
port@0 {
114+
reg = <0>;
115+
116+
wifi1_wsi_tx: endpoint {
117+
remote-endpoint = <&wifi2_wsi_rx>;
118+
};
119+
};
120+
121+
port@1 {
122+
reg = <1>;
123+
124+
wifi1_wsi_rx: endpoint {
125+
remote-endpoint = <&wifi3_wsi_tx>;
126+
};
127+
};
128+
};
129+
};
130+
};
131+
132+
pcie@1 {
133+
device_type = "pci";
134+
reg = <0x0 0x0 0x1 0x0 0x0>;
135+
#address-cells = <3>;
136+
#size-cells = <2>;
137+
ranges;
138+
139+
wifi@0 {
140+
compatible = "pci17cb,1109";
141+
reg = <0x0 0x0 0x0 0x0 0x0>;
142+
143+
qcom,ath12k-calibration-variant = "RDP433_2";
144+
qcom,wsi-controller;
145+
146+
ports {
147+
#address-cells = <1>;
148+
#size-cells = <0>;
149+
150+
port@0 {
151+
reg = <0>;
152+
153+
wifi2_wsi_tx: endpoint {
154+
remote-endpoint = <&wifi3_wsi_rx>;
155+
};
156+
};
157+
158+
port@1 {
159+
reg = <1>;
160+
161+
wifi2_wsi_rx: endpoint {
162+
remote-endpoint = <&wifi1_wsi_tx>;
163+
};
164+
};
165+
};
166+
};
167+
};
168+
169+
pcie@2 {
170+
device_type = "pci";
171+
reg = <0x0 0x0 0x2 0x0 0x0>;
172+
#address-cells = <3>;
173+
#size-cells = <2>;
174+
ranges;
175+
176+
wifi@0 {
177+
compatible = "pci17cb,1109";
178+
reg = <0x0 0x0 0x0 0x0 0x0>;
179+
180+
qcom,ath12k-calibration-variant = "RDP433_3";
181+
182+
ports {
183+
#address-cells = <1>;
184+
#size-cells = <0>;
185+
186+
port@0 {
187+
reg = <0>;
188+
189+
wifi3_wsi_tx: endpoint {
190+
remote-endpoint = <&wifi1_wsi_rx>;
191+
};
192+
};
193+
194+
port@1 {
195+
reg = <1>;
196+
197+
wifi3_wsi_rx: endpoint {
198+
remote-endpoint = <&wifi2_wsi_tx>;
199+
};
200+
};
201+
};
202+
};
203+
};
204+
};

Documentation/netlink/specs/ethtool.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -842,6 +842,9 @@ attribute-sets:
842842
-
843843
name: tx-err
844844
type: uint
845+
-
846+
name: tx-onestep-pkts-unconfirmed
847+
type: uint
845848
-
846849
name: ts-hwtstamp-provider
847850
attr-cnt-name: __ethtool-a-ts-hwtstamp-provider-cnt

Documentation/networking/batman-adv.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,5 +164,5 @@ Mailing-list:
164164

165165
You can also contact the Authors:
166166

167-
* Marek Lindner <[email protected]>
167+
* Marek Lindner <[email protected]>
168168
* Simon Wunderlich <[email protected]>

Documentation/networking/ethtool-netlink.rst

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,11 +1281,17 @@ would be empty (no bit set).
12811281

12821282
Additional hardware timestamping statistics response contents:
12831283

1284-
===================================== ====== ===================================
1285-
``ETHTOOL_A_TS_STAT_TX_PKTS`` uint Packets with Tx HW timestamps
1286-
``ETHTOOL_A_TS_STAT_TX_LOST`` uint Tx HW timestamp not arrived count
1287-
``ETHTOOL_A_TS_STAT_TX_ERR`` uint HW error request Tx timestamp count
1288-
===================================== ====== ===================================
1284+
================================================== ====== =====================
1285+
``ETHTOOL_A_TS_STAT_TX_PKTS`` uint Packets with Tx
1286+
HW timestamps
1287+
``ETHTOOL_A_TS_STAT_TX_LOST`` uint Tx HW timestamp
1288+
not arrived count
1289+
``ETHTOOL_A_TS_STAT_TX_ERR`` uint HW error request
1290+
Tx timestamp count
1291+
``ETHTOOL_A_TS_STAT_TX_ONESTEP_PKTS_UNCONFIRMED`` uint Packets with one-step
1292+
HW TX timestamps with
1293+
unconfirmed delivery
1294+
================================================== ====== =====================
12891295

12901296
CABLE_TEST
12911297
==========

MAINTAINERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3874,9 +3874,9 @@ S: Maintained
38743874
F: drivers/platform/x86/barco-p50-gpio.c
38753875

38763876
BATMAN ADVANCED
3877-
M: Marek Lindner <[email protected]>
3877+
M: Marek Lindner <[email protected]>
38783878
M: Simon Wunderlich <[email protected]>
3879-
M: Antonio Quartulli <[email protected]>
3879+
M: Antonio Quartulli <[email protected]>
38803880
M: Sven Eckelmann <[email protected]>
38813881
L: [email protected] (moderated for non-subscribers)
38823882
S: Maintained

drivers/bluetooth/btbcm.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,9 @@ static const char *btbcm_get_board_name(struct device *dev)
553553

554554
/* get rid of any '/' in the compatible string */
555555
board_type = devm_kstrdup(dev, tmp, GFP_KERNEL);
556+
if (!board_type)
557+
return NULL;
558+
556559
strreplace(board_type, '/', '-');
557560

558561
return board_type;

drivers/bluetooth/btintel.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/module.h>
1010
#include <linux/firmware.h>
1111
#include <linux/regmap.h>
12+
#include <linux/string_choices.h>
1213
#include <linux/acpi.h>
1314
#include <acpi/acpi_bus.h>
1415
#include <linux/unaligned.h>
@@ -506,13 +507,13 @@ int btintel_version_info_tlv(struct hci_dev *hdev,
506507

507508
bt_dev_info(hdev, "Device revision is %u", version->dev_rev_id);
508509
bt_dev_info(hdev, "Secure boot is %s",
509-
version->secure_boot ? "enabled" : "disabled");
510+
str_enabled_disabled(version->secure_boot));
510511
bt_dev_info(hdev, "OTP lock is %s",
511-
version->otp_lock ? "enabled" : "disabled");
512+
str_enabled_disabled(version->otp_lock));
512513
bt_dev_info(hdev, "API lock is %s",
513-
version->api_lock ? "enabled" : "disabled");
514+
str_enabled_disabled(version->api_lock));
514515
bt_dev_info(hdev, "Debug lock is %s",
515-
version->debug_lock ? "enabled" : "disabled");
516+
str_enabled_disabled(version->debug_lock));
516517
bt_dev_info(hdev, "Minimum firmware build %u week %u %u",
517518
version->min_fw_build_nn, version->min_fw_build_cw,
518519
2000 + version->min_fw_build_yy);
@@ -927,16 +928,16 @@ int btintel_read_boot_params(struct hci_dev *hdev,
927928
le16_to_cpu(params->dev_revid));
928929

929930
bt_dev_info(hdev, "Secure boot is %s",
930-
params->secure_boot ? "enabled" : "disabled");
931+
str_enabled_disabled(params->secure_boot));
931932

932933
bt_dev_info(hdev, "OTP lock is %s",
933-
params->otp_lock ? "enabled" : "disabled");
934+
str_enabled_disabled(params->otp_lock));
934935

935936
bt_dev_info(hdev, "API lock is %s",
936-
params->api_lock ? "enabled" : "disabled");
937+
str_enabled_disabled(params->api_lock));
937938

938939
bt_dev_info(hdev, "Debug lock is %s",
939-
params->debug_lock ? "enabled" : "disabled");
940+
str_enabled_disabled(params->debug_lock));
940941

941942
bt_dev_info(hdev, "Minimum firmware build %u week %u %u",
942943
params->min_fw_build_nn, params->min_fw_build_cw,

0 commit comments

Comments
 (0)