Skip to content

Commit 217e5d8

Browse files
frank-wfrank-w
committed
Merge tag 'v6.6.80' into 6.6-main
This is the 6.6.80 stable release # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmfAV+kACgkQONu9yGCS # aT6Zmg/8CttkpI/jr/fq7mVbxHBmz06uZndOgjCt4Qocoy06hIYrV/zKCLXqEHSo # yPzPu6p57fQsJXKZbC6K3H4ZCjkArxT9xXy08jxxYmV091OhZi7fo+otAWgNu2ht # A8cjRkO4MjQ7WfWlPYL8FBuRgv2aPplhCxAtnQy+Lzos3Mk9PyIcgKKGeDQJ/XcE # ecIUxR8ftzAb6X0KDYcM0PhXtKTKZwAo1MiHa18TaXz3cIHmvYfTEOk7om7rtPC/ # n7WxJSM9i0NC0AcIpddlX9e6HqOgjk3sKOlj+aHPin2sl9cWgEKixIsb/PJmWVvi # zNPgfX2MFjX0287K0+TmTPy2rM07bnpv9e0iJDkbc411fEYb2XPxjvp4wPjf5Io3 # 6qOj9OrgRPfTama54j6Tis4cxAtk2gppOA8rxC16okMG39CwEEAbaiZvUezqK4ym # m8fiKccYMCgYxPXVgn0vLSnbzb+zXv0SB9rKuImZstOiiKbVz+xxBTh+0GFezhto # TFzmjEBdh2LYbtQRi/TWn+e6nEjE+LJZgmiq886NRSr9wNAGheYLKSRC1mzwyRKJ # yiA+ue7d1wB+clE+cAcbdVF5YSosV5TggH09Wq64O/pEemC9F2bNWL+oJXODf3NG # JYkjr7FzD1Ka/oCwDJeloDQqwUc4q5cyS+Fb3fK/zrAJZJ2YGTM= # =2PCM # -----END PGP SIGNATURE----- # gpg: Signature made Thu Feb 27 13:17:45 2025 CET # gpg: using RSA key 647F28654894E3BD457199BE38DBBDC86092693E # gpg: Can't check signature: No public key
2 parents 8debbcd + 568e253 commit 217e5d8

File tree

140 files changed

+1935
-1233
lines changed

Some content is hidden

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

140 files changed

+1935
-1233
lines changed

‎Documentation/networking/strparser.rst‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ Functions
112112
Callbacks
113113
=========
114114

115-
There are six callbacks:
115+
There are seven callbacks:
116116

117117
::
118118

@@ -182,6 +182,13 @@ There are six callbacks:
182182
the length of the message. skb->len - offset may be greater
183183
then full_len since strparser does not trim the skb.
184184

185+
::
186+
187+
int (*read_sock)(struct strparser *strp, read_descriptor_t *desc,
188+
sk_read_actor_t recv_actor);
189+
190+
The read_sock callback is used by strparser instead of
191+
sock->ops->read_sock, if provided.
185192
::
186193

187194
int (*read_sock_done)(struct strparser *strp, int err);

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 6
33
PATCHLEVEL = 6
4-
SUBLEVEL = 79
4+
SUBLEVEL = 80
55
EXTRAVERSION =
66
NAME = Pinguïn Aangedreven
77

‎arch/arm64/boot/dts/mediatek/mt8183.dtsi‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,6 +1828,7 @@
18281828
resets = <&mmsys MT8183_MMSYS_SW0_RST_B_DISP_DSI0>;
18291829
phys = <&mipi_tx0>;
18301830
phy-names = "dphy";
1831+
status = "disabled";
18311832
};
18321833

18331834
mutex: mutex@14016000 {

‎arch/arm64/boot/dts/qcom/sm8450.dtsi‎

Lines changed: 108 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,6 +2135,7 @@
21352135
compatible = "qcom,fastrpc";
21362136
qcom,glink-channels = "fastrpcglink-apps-dsp";
21372137
label = "sdsp";
2138+
qcom,non-secure-domain;
21382139
#address-cells = <1>;
21392140
#size-cells = <0>;
21402141

@@ -2160,6 +2161,112 @@
21602161
};
21612162
};
21622163

2164+
remoteproc_adsp: remoteproc@3000000 {
2165+
compatible = "qcom,sm8450-adsp-pas";
2166+
reg = <0x0 0x03000000 0x0 0x10000>;
2167+
2168+
interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
2169+
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
2170+
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
2171+
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
2172+
<&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>;
2173+
interrupt-names = "wdog", "fatal", "ready",
2174+
"handover", "stop-ack";
2175+
2176+
clocks = <&rpmhcc RPMH_CXO_CLK>;
2177+
clock-names = "xo";
2178+
2179+
power-domains = <&rpmhpd RPMHPD_LCX>,
2180+
<&rpmhpd RPMHPD_LMX>;
2181+
power-domain-names = "lcx", "lmx";
2182+
2183+
memory-region = <&adsp_mem>;
2184+
2185+
qcom,qmp = <&aoss_qmp>;
2186+
2187+
qcom,smem-states = <&smp2p_adsp_out 0>;
2188+
qcom,smem-state-names = "stop";
2189+
2190+
status = "disabled";
2191+
2192+
remoteproc_adsp_glink: glink-edge {
2193+
interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
2194+
IPCC_MPROC_SIGNAL_GLINK_QMP
2195+
IRQ_TYPE_EDGE_RISING>;
2196+
mboxes = <&ipcc IPCC_CLIENT_LPASS
2197+
IPCC_MPROC_SIGNAL_GLINK_QMP>;
2198+
2199+
label = "lpass";
2200+
qcom,remote-pid = <2>;
2201+
2202+
gpr {
2203+
compatible = "qcom,gpr";
2204+
qcom,glink-channels = "adsp_apps";
2205+
qcom,domain = <GPR_DOMAIN_ID_ADSP>;
2206+
qcom,intents = <512 20>;
2207+
#address-cells = <1>;
2208+
#size-cells = <0>;
2209+
2210+
q6apm: service@1 {
2211+
compatible = "qcom,q6apm";
2212+
reg = <GPR_APM_MODULE_IID>;
2213+
#sound-dai-cells = <0>;
2214+
qcom,protection-domain = "avs/audio",
2215+
"msm/adsp/audio_pd";
2216+
2217+
q6apmdai: dais {
2218+
compatible = "qcom,q6apm-dais";
2219+
iommus = <&apps_smmu 0x1801 0x0>;
2220+
};
2221+
2222+
q6apmbedai: bedais {
2223+
compatible = "qcom,q6apm-lpass-dais";
2224+
#sound-dai-cells = <1>;
2225+
};
2226+
};
2227+
2228+
q6prm: service@2 {
2229+
compatible = "qcom,q6prm";
2230+
reg = <GPR_PRM_MODULE_IID>;
2231+
qcom,protection-domain = "avs/audio",
2232+
"msm/adsp/audio_pd";
2233+
2234+
q6prmcc: clock-controller {
2235+
compatible = "qcom,q6prm-lpass-clocks";
2236+
#clock-cells = <2>;
2237+
};
2238+
};
2239+
};
2240+
2241+
fastrpc {
2242+
compatible = "qcom,fastrpc";
2243+
qcom,glink-channels = "fastrpcglink-apps-dsp";
2244+
label = "adsp";
2245+
qcom,non-secure-domain;
2246+
#address-cells = <1>;
2247+
#size-cells = <0>;
2248+
2249+
compute-cb@3 {
2250+
compatible = "qcom,fastrpc-compute-cb";
2251+
reg = <3>;
2252+
iommus = <&apps_smmu 0x1803 0x0>;
2253+
};
2254+
2255+
compute-cb@4 {
2256+
compatible = "qcom,fastrpc-compute-cb";
2257+
reg = <4>;
2258+
iommus = <&apps_smmu 0x1804 0x0>;
2259+
};
2260+
2261+
compute-cb@5 {
2262+
compatible = "qcom,fastrpc-compute-cb";
2263+
reg = <5>;
2264+
iommus = <&apps_smmu 0x1805 0x0>;
2265+
};
2266+
};
2267+
};
2268+
};
2269+
21632270
wsa2macro: codec@31e0000 {
21642271
compatible = "qcom,sm8450-lpass-wsa-macro";
21652272
reg = <0 0x031e0000 0 0x1000>;
@@ -2368,111 +2475,6 @@
23682475
status = "disabled";
23692476
};
23702477

2371-
remoteproc_adsp: remoteproc@30000000 {
2372-
compatible = "qcom,sm8450-adsp-pas";
2373-
reg = <0 0x30000000 0 0x100>;
2374-
2375-
interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
2376-
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
2377-
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
2378-
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
2379-
<&smp2p_adsp_in 3 IRQ_TYPE_EDGE_RISING>;
2380-
interrupt-names = "wdog", "fatal", "ready",
2381-
"handover", "stop-ack";
2382-
2383-
clocks = <&rpmhcc RPMH_CXO_CLK>;
2384-
clock-names = "xo";
2385-
2386-
power-domains = <&rpmhpd RPMHPD_LCX>,
2387-
<&rpmhpd RPMHPD_LMX>;
2388-
power-domain-names = "lcx", "lmx";
2389-
2390-
memory-region = <&adsp_mem>;
2391-
2392-
qcom,qmp = <&aoss_qmp>;
2393-
2394-
qcom,smem-states = <&smp2p_adsp_out 0>;
2395-
qcom,smem-state-names = "stop";
2396-
2397-
status = "disabled";
2398-
2399-
remoteproc_adsp_glink: glink-edge {
2400-
interrupts-extended = <&ipcc IPCC_CLIENT_LPASS
2401-
IPCC_MPROC_SIGNAL_GLINK_QMP
2402-
IRQ_TYPE_EDGE_RISING>;
2403-
mboxes = <&ipcc IPCC_CLIENT_LPASS
2404-
IPCC_MPROC_SIGNAL_GLINK_QMP>;
2405-
2406-
label = "lpass";
2407-
qcom,remote-pid = <2>;
2408-
2409-
gpr {
2410-
compatible = "qcom,gpr";
2411-
qcom,glink-channels = "adsp_apps";
2412-
qcom,domain = <GPR_DOMAIN_ID_ADSP>;
2413-
qcom,intents = <512 20>;
2414-
#address-cells = <1>;
2415-
#size-cells = <0>;
2416-
2417-
q6apm: service@1 {
2418-
compatible = "qcom,q6apm";
2419-
reg = <GPR_APM_MODULE_IID>;
2420-
#sound-dai-cells = <0>;
2421-
qcom,protection-domain = "avs/audio",
2422-
"msm/adsp/audio_pd";
2423-
2424-
q6apmdai: dais {
2425-
compatible = "qcom,q6apm-dais";
2426-
iommus = <&apps_smmu 0x1801 0x0>;
2427-
};
2428-
2429-
q6apmbedai: bedais {
2430-
compatible = "qcom,q6apm-lpass-dais";
2431-
#sound-dai-cells = <1>;
2432-
};
2433-
};
2434-
2435-
q6prm: service@2 {
2436-
compatible = "qcom,q6prm";
2437-
reg = <GPR_PRM_MODULE_IID>;
2438-
qcom,protection-domain = "avs/audio",
2439-
"msm/adsp/audio_pd";
2440-
2441-
q6prmcc: clock-controller {
2442-
compatible = "qcom,q6prm-lpass-clocks";
2443-
#clock-cells = <2>;
2444-
};
2445-
};
2446-
};
2447-
2448-
fastrpc {
2449-
compatible = "qcom,fastrpc";
2450-
qcom,glink-channels = "fastrpcglink-apps-dsp";
2451-
label = "adsp";
2452-
#address-cells = <1>;
2453-
#size-cells = <0>;
2454-
2455-
compute-cb@3 {
2456-
compatible = "qcom,fastrpc-compute-cb";
2457-
reg = <3>;
2458-
iommus = <&apps_smmu 0x1803 0x0>;
2459-
};
2460-
2461-
compute-cb@4 {
2462-
compatible = "qcom,fastrpc-compute-cb";
2463-
reg = <4>;
2464-
iommus = <&apps_smmu 0x1804 0x0>;
2465-
};
2466-
2467-
compute-cb@5 {
2468-
compatible = "qcom,fastrpc-compute-cb";
2469-
reg = <5>;
2470-
iommus = <&apps_smmu 0x1805 0x0>;
2471-
};
2472-
};
2473-
};
2474-
};
2475-
24762478
remoteproc_cdsp: remoteproc@32300000 {
24772479
compatible = "qcom,sm8450-cdsp-pas";
24782480
reg = <0 0x32300000 0 0x10000>;
@@ -2515,6 +2517,7 @@
25152517
compatible = "qcom,fastrpc";
25162518
qcom,glink-channels = "fastrpcglink-apps-dsp";
25172519
label = "cdsp";
2520+
qcom,non-secure-domain;
25182521
#address-cells = <1>;
25192522
#size-cells = <0>;
25202523

0 commit comments

Comments
 (0)