Skip to content

Commit 08b96f2

Browse files
6by96by9
authored
Merge branch 'rpi-6.6.y' into rpi-6.6.y-codecs
2 parents 7b71a43 + e0c78d5 commit 08b96f2

File tree

697 files changed

+8243
-4385
lines changed

Some content is hidden

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

697 files changed

+8243
-4385
lines changed

‎Documentation/admin-guide/hw-vuln/spectre.rst

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -439,12 +439,12 @@ The possible values in this file are:
439439
- System is protected by retpoline
440440
* - BHI: BHI_DIS_S
441441
- System is protected by BHI_DIS_S
442-
* - BHI: SW loop; KVM SW loop
442+
* - BHI: SW loop, KVM SW loop
443443
- System is protected by software clearing sequence
444-
* - BHI: Syscall hardening
445-
- Syscalls are hardened against BHI
446-
* - BHI: Syscall hardening; KVM: SW loop
447-
- System is protected from userspace attacks by syscall hardening; KVM is protected by software clearing sequence
444+
* - BHI: Vulnerable
445+
- System is vulnerable to BHI
446+
* - BHI: Vulnerable, KVM: SW loop
447+
- System is vulnerable; KVM is protected by software clearing sequence
448448

449449
Full mitigation might require a microcode update from the CPU
450450
vendor. When the necessary microcode is not available, the kernel will
@@ -661,18 +661,14 @@ kernel command line.
661661
spectre_bhi=
662662

663663
[X86] Control mitigation of Branch History Injection
664-
(BHI) vulnerability. Syscalls are hardened against BHI
665-
regardless of this setting. This setting affects the deployment
664+
(BHI) vulnerability. This setting affects the deployment
666665
of the HW BHI control and the SW BHB clearing sequence.
667666

668667
on
669-
unconditionally enable.
668+
(default) Enable the HW or SW mitigation as
669+
needed.
670670
off
671-
unconditionally disable.
672-
auto
673-
enable if hardware mitigation
674-
control(BHI_DIS_S) is available, otherwise
675-
enable alternate mitigation in KVM.
671+
Disable the mitigation.
676672

677673
For spectre_v2_user see Documentation/admin-guide/kernel-parameters.txt
678674

‎Documentation/admin-guide/kdump/vmcoreinfo.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ variables.
172172
Offset of the free_list's member. This value is used to compute the number
173173
of free pages.
174174

175-
Each zone has a free_area structure array called free_area[MAX_ORDER + 1].
175+
Each zone has a free_area structure array called free_area[NR_PAGE_ORDERS].
176176
The free_list represents a linked list of free page blocks.
177177

178178
(list_head, next|prev)
@@ -189,8 +189,8 @@ Offsets of the vmap_area's members. They carry vmalloc-specific
189189
information. Makedumpfile gets the start address of the vmalloc region
190190
from this.
191191

192-
(zone.free_area, MAX_ORDER + 1)
193-
-------------------------------
192+
(zone.free_area, NR_PAGE_ORDERS)
193+
--------------------------------
194194

195195
Free areas descriptor. User-space tools use this value to iterate the
196196
free_area ranges. MAX_ORDER is used by the zone buddy allocator.

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3343,6 +3343,7 @@
33433343
reg_file_data_sampling=off [X86]
33443344
retbleed=off [X86]
33453345
spec_store_bypass_disable=off [X86,PPC]
3346+
spectre_bhi=off [X86]
33463347
spectre_v2_user=off [X86]
33473348
srbds=off [X86,INTEL]
33483349
ssbd=force-off [ARM64]
@@ -5921,16 +5922,13 @@
59215922
See Documentation/admin-guide/laptops/sonypi.rst
59225923

59235924
spectre_bhi= [X86] Control mitigation of Branch History Injection
5924-
(BHI) vulnerability. Syscalls are hardened against BHI
5925-
reglardless of this setting. This setting affects the
5925+
(BHI) vulnerability. This setting affects the
59265926
deployment of the HW BHI control and the SW BHB
59275927
clearing sequence.
59285928

5929-
on - unconditionally enable.
5930-
off - unconditionally disable.
5931-
auto - (default) enable hardware mitigation
5932-
(BHI_DIS_S) if available, otherwise enable
5933-
alternate mitigation in KVM.
5929+
on - (default) Enable the HW or SW mitigation
5930+
as needed.
5931+
off - Disable the mitigation.
59345932

59355933
spectre_v2= [X86] Control mitigation of Spectre variant 2
59365934
(indirect branch speculation) vulnerability.
@@ -6855,6 +6853,9 @@
68556853
pause after every control message);
68566854
o = USB_QUIRK_HUB_SLOW_RESET (Hub needs extra
68576855
delay after resetting its port);
6856+
p = USB_QUIRK_SHORT_SET_ADDRESS_REQ_TIMEOUT
6857+
(Reduce timeout of the SET_ADDRESS
6858+
request from 5000 ms to 500 ms);
68586859
Example: quirks=0781:5580:bk,0a5c:5834:gij
68596860

68606861
usbhid.mousepoll=

‎Documentation/admin-guide/sysctl/net.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,11 @@ Will increase power usage.
205205

206206
Default: 0 (off)
207207

208+
mem_pcpu_rsv
209+
------------
210+
211+
Per-cpu reserved forward alloc cache size in page units. Default 1MB per CPU.
212+
208213
rmem_default
209214
------------
210215

‎Documentation/networking/device_drivers/ethernet/amazon/ena.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ ena_common_defs.h Common definitions for ena_com layer.
5454
ena_regs_defs.h Definition of ENA PCI memory-mapped (MMIO) registers.
5555
ena_netdev.[ch] Main Linux kernel driver.
5656
ena_ethtool.c ethtool callbacks.
57+
ena_xdp.[ch] XDP files
5758
ena_pci_id_tbl.h Supported device IDs.
5859
================= ======================================================
5960

‎MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8181,7 +8181,7 @@ M: Geoffrey D. Bennett <[email protected]>
81818181
L: [email protected] (moderated for non-subscribers)
81828182
S: Maintained
81838183
T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
8184-
F: sound/usb/mixer_scarlett_gen2.c
8184+
F: sound/usb/mixer_scarlett2.c
81858185

81868186
FORCEDETH GIGABIT ETHERNET DRIVER
81878187
M: Rain River <[email protected]>

‎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 = 26
4+
SUBLEVEL = 30
55
EXTRAVERSION =
66
NAME = Hurr durr I'ma ninja sloth
77

‎arch/Kconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
#
1010
source "arch/$(SRCARCH)/Kconfig"
1111

12+
config ARCH_CONFIGURES_CPU_MITIGATIONS
13+
bool
14+
15+
if !ARCH_CONFIGURES_CPU_MITIGATIONS
16+
config CPU_MITIGATIONS
17+
def_bool y
18+
endif
19+
1220
menu "General architecture-dependent options"
1321

1422
config ARCH_HAS_SUBPAGE_FAULTS

‎arch/arc/boot/dts/hsdk.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,6 @@
205205
};
206206

207207
gmac: ethernet@8000 {
208-
#interrupt-cells = <1>;
209208
compatible = "snps,dwmac";
210209
reg = <0x8000 0x2000>;
211210
interrupts = <10>;

‎arch/arm/boot/dts/broadcom/bcm270x-rpi.dtsi

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,21 @@
9797
drm_fb0_vc4 = <&aliases>, "drm-fb0=",&vc4;
9898
drm_fb1_vc4 = <&aliases>, "drm-fb1=",&vc4;
9999
drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4;
100+
101+
cam1_sync = <&csi1>, "sync-gpios:0=", <&gpio>,
102+
<&csi1>, "sync-gpios:4",
103+
<&csi1>, "sync-gpios:8=0", <GPIO_ACTIVE_HIGH>;
104+
cam1_sync_inverted = <&csi1>, "sync-gpios:0=", <&gpio>,
105+
<&csi1>, "sync-gpios:4",
106+
<&csi1>, "sync-gpios:8=0", <GPIO_ACTIVE_LOW>;
107+
cam0_sync = <&csi0>, "sync-gpios:0=", <&gpio>,
108+
<&csi0>, "sync-gpios:4",
109+
<&csi0>, "sync-gpios:8=0", <GPIO_ACTIVE_HIGH>;
110+
cam0_sync_inverted = <&csi0>, "sync-gpios:0=", <&gpio>,
111+
<&csi0>, "sync-gpios:4",
112+
<&csi0>, "sync-gpios:8=0", <GPIO_ACTIVE_LOW>;
113+
114+
strict_gpiod = <&chosen>, "bootargs=pinctrl_bcm2835.persist_gpio_outputs=n";
100115
};
101116
};
102117

‎arch/arm/boot/dts/broadcom/bcm2712-rpi-5-b.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_gpio2 { };
426426

427427
/ {
428428
chosen: chosen {
429-
bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
429+
bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe";
430430
stdout-path = "serial10:115200n8";
431431
};
432432

‎arch/arm/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_gpio2 { };
344344

345345
/* SDIO1 is used to drive the eMMC/SD card */
346346
&sdio1 {
347-
pinctrl-0 = <&emmc_cmddat_pulls>, <&emmc_ds_pull>, <&emmc_aon_cd_pins>;
347+
pinctrl-0 = <&emmc_cmddat_pulls>, <&emmc_ds_pull>;
348348
pinctrl-names = "default";
349349
vqmmc-supply = <&sd_io_1v8_reg>;
350350
vmmc-supply = <&sd_vcc_reg>;
@@ -359,10 +359,9 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_gpio2 { };
359359
};
360360

361361
&pinctrl_aon {
362-
emmc_aon_cd_pins: emmc_aon_cd_pins {
363-
function = "sd_card_g";
364-
pins = "aon_gpio5";
365-
bias-pull-up;
362+
ant_pins: ant_pins {
363+
function = "gpio";
364+
pins = "aon_gpio5", "aon_gpio6";
366365
};
367366

368367
/* Slight hack - only one PWM pin (status LED) is usable */
@@ -426,7 +425,7 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_gpio2 { };
426425

427426
/ {
428427
chosen: chosen {
429-
bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe snd_bcm2835.enable_compat_alsa=0 snd_bcm2835.enable_hdmi=1";
428+
bootargs = "reboot=w coherent_pool=1M 8250.nr_uarts=1 pci=pcie_bus_safe";
430429
stdout-path = "serial10:115200n8";
431430
};
432431

@@ -465,7 +464,7 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_gpio2 { };
465464

466465
/* SDIO2 drives the WLAN interface */
467466
&sdio2 {
468-
pinctrl-0 = <&sdio2_30_pins>;
467+
pinctrl-0 = <&sdio2_30_pins>, <&ant_pins>;
469468
pinctrl-names = "default";
470469
bus-width = <4>;
471470
vmmc-supply = <&wl_on_reg>;
@@ -674,6 +673,22 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
674673
output-high;
675674
line-name = "RP1 RUN pin";
676675
};
676+
677+
ant1: ant1-hog {
678+
gpio-hog;
679+
gpios = <5 GPIO_ACTIVE_HIGH>;
680+
/* internal antenna enabled */
681+
output-high;
682+
line-name = "ant1";
683+
};
684+
685+
ant2: ant2-hog {
686+
gpio-hog;
687+
gpios = <6 GPIO_ACTIVE_HIGH>;
688+
/* external antenna disabled */
689+
output-low;
690+
line-name = "ant2";
691+
};
677692
};
678693

679694
&rp1_gpio {
@@ -844,6 +859,19 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
844859
drm_fb2_rp1_dpi = <&aliases>, "drm-fb2=",&dpi;
845860
drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4;
846861

862+
ant1 = <&ant1>,"output-high?=on",
863+
<&ant1>, "output-low?=off",
864+
<&ant2>, "output-high?=off",
865+
<&ant2>, "output-low?=on";
866+
ant2 = <&ant1>,"output-high?=off",
867+
<&ant1>, "output-low?=on",
868+
<&ant2>, "output-high?=on",
869+
<&ant2>, "output-low?=off";
870+
noant = <&ant1>,"output-high?=off",
871+
<&ant1>, "output-low?=on",
872+
<&ant2>, "output-high?=off",
873+
<&ant2>, "output-low?=on";
874+
847875
fan_temp0 = <&cpu_tepid>,"temperature:0";
848876
fan_temp1 = <&cpu_warm>,"temperature:0";
849877
fan_temp2 = <&cpu_hot>,"temperature:0";

‎arch/arm/boot/dts/broadcom/bcm2712-rpi.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
nvmem_cust_rw = <&nvmem_cust>,"rw?";
100100
nvmem_priv_rw = <&nvmem_priv>,"rw?";
101101
nvmem_mac_rw = <&nvmem_mac>,"rw?";
102+
strict_gpiod = <&chosen>, "bootargs=pinctrl_rp1.persist_gpio_outputs=n";
102103
};
103104
};
104105

‎arch/arm/boot/dts/broadcom/bcm283x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@
363363
#size-cells = <0>;
364364
#clock-cells = <1>;
365365

366-
clocks = <&clocks BCM2835_PLLA_DSI0>,
366+
clocks = <&clocks BCM2835_PLLD_DSI0>,
367367
<&clocks BCM2835_CLOCK_DSI0E>,
368368
<&clocks BCM2835_CLOCK_DSI0P>;
369369
clock-names = "phy", "escape", "pixel";

‎arch/arm/boot/dts/broadcom/rp1.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,7 @@
465465
#gpio-cells = <2>;
466466
interrupt-controller;
467467
#interrupt-cells = <2>;
468+
gpio-ranges = <&rp1_gpio 0 0 54>;
468469

469470
rp1_uart0_14_15: rp1_uart0_14_15 {
470471
pin_txd {

‎arch/arm/boot/dts/microchip/at91-sama7g5ek.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293

294294
regulator-state-standby {
295295
regulator-on-in-suspend;
296-
regulator-suspend-voltage = <1150000>;
296+
regulator-suspend-microvolt = <1150000>;
297297
regulator-mode = <4>;
298298
};
299299

@@ -314,7 +314,7 @@
314314

315315
regulator-state-standby {
316316
regulator-on-in-suspend;
317-
regulator-suspend-voltage = <1050000>;
317+
regulator-suspend-microvolt = <1050000>;
318318
regulator-mode = <4>;
319319
};
320320

@@ -331,7 +331,7 @@
331331
regulator-always-on;
332332

333333
regulator-state-standby {
334-
regulator-suspend-voltage = <1800000>;
334+
regulator-suspend-microvolt = <1800000>;
335335
regulator-on-in-suspend;
336336
};
337337

@@ -346,7 +346,7 @@
346346
regulator-max-microvolt = <3700000>;
347347

348348
regulator-state-standby {
349-
regulator-suspend-voltage = <1800000>;
349+
regulator-suspend-microvolt = <1800000>;
350350
regulator-on-in-suspend;
351351
};
352352

‎arch/arm/boot/dts/nxp/imx/imx6ull-tarragon-common.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -805,6 +805,7 @@
805805
&pinctrl_usb_pwr>;
806806
dr_mode = "host";
807807
power-active-high;
808+
over-current-active-low;
808809
disable-over-current;
809810
status = "okay";
810811
};

‎arch/arm/boot/dts/nxp/imx/imx7s-warp.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@
210210
remote-endpoint = <&mipi_from_sensor>;
211211
clock-lanes = <0>;
212212
data-lanes = <1>;
213+
link-frequencies = /bits/ 64 <330000000>;
213214
};
214215
};
215216
};

‎arch/arm/boot/dts/overlays/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
196196
pifi-dac-zero.dtbo \
197197
pifi-mini-210.dtbo \
198198
piglow.dtbo \
199+
pineboards-hat-ai.dtbo \
199200
piscreen.dtbo \
200201
piscreen2r.dtbo \
201202
pisound.dtbo \
@@ -229,6 +230,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
229230
rra-digidac1-wm8741-audio.dtbo \
230231
sainsmart18.dtbo \
231232
sc16is750-i2c.dtbo \
233+
sc16is750-spi0.dtbo \
232234
sc16is752-i2c.dtbo \
233235
sc16is752-spi0.dtbo \
234236
sc16is752-spi1.dtbo \

0 commit comments

Comments
 (0)