Skip to content

Commit

Permalink
Merge tag 'v6.6.64' into 6.6-main
Browse files Browse the repository at this point in the history
This is the 6.6.64 stable release

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmdWutwACgkQONu9yGCS
# aT7y9Q//RSqaYiLcxjTCR0Dv9+T/9W6PdgWZez/uMesx8otljG0JknVgd4HVrQZ8
# eb5r5mQ8iBYS2iDQZq3CbeNwoU8rVlCQmkMAm+81RAAeT9G6xHqikSz7BtLifGP1
# BpMPTr4Dy7n8H9Dkon/T8S/4Cg3wwCfJTE929LecsDy3ZaFZ8jmGh7cvnMFYaqo3
# gQRWd59h9p4kNlWtFEC4gOczr2zrCiG4vEKwINWQvRBhlpPb0ZtF1KABa525/330
# wV4MkeZea6q4cMH9QwwoxxIQQJ19GUx9doYD9uJ6tD0yaGnAPWsm7prKTW0wVJWa
# QxL+jyFZUUGN56CicI2W/ukJILgJTuTxHATXTjJzxtiiEzcBD5hdB+YZyrxNvy6d
# yCTozue8n0ulrRprlgSPcuyq+gvKlh7zadWNGKd85a3adaHPrho9HVPmphN6VzAt
# UmQvgy44hKOPNd8sOtSat8Y1giQKz4NaZ/2MT8wwCqhUjRHzVNNAz+AcHMSQDRzP
# CTcxEiInuHQyx6SLzaGrJ1sXYMxTtmWs0VbpJvSuF3oDuPudko86NcgLe6FRwYLC
# piegmHgped8MFVQ4fAAA/qXoAqgsZPyCzLsxDU3N64G2YdN7xrk4Lpc67s5UmA08
# SezsKl+hCQ+nTcZBJUpyXpdJN63Juie7idkWCYBKpi0e/vZAP4M=
# =dU5R
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon Dec  9 10:39:40 2024 CET
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key
  • Loading branch information
frank-w committed Dec 26, 2024
2 parents 4e6db84 + 22a054e commit cb69e9e
Show file tree
Hide file tree
Showing 767 changed files with 7,251 additions and 3,502 deletions.
7 changes: 5 additions & 2 deletions Documentation/ABI/testing/sysfs-fs-f2fs
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,13 @@ Description: Do background GC aggressively when set. Set to 0 by default.
GC approach and turns SSR mode on.
gc urgent low(2): lowers the bar of checking I/O idling in
order to process outstanding discard commands and GC a
little bit aggressively. uses cost benefit GC approach.
little bit aggressively. always uses cost benefit GC approach,
and will override age-threshold GC approach if ATGC is enabled
at the same time.
gc urgent mid(3): does GC forcibly in a period of given
gc_urgent_sleep_time and executes a mid level of I/O idling check.
uses cost benefit GC approach.
always uses cost benefit GC approach, and will override
age-threshold GC approach if ATGC is enabled at the same time.

What: /sys/fs/f2fs/<disk>/gc_urgent_sleep_time
Date: August 2017
Expand Down
2 changes: 1 addition & 1 deletion Documentation/RCU/stallwarn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ ticks this GP)" indicates that this CPU has not taken any scheduling-clock
interrupts during the current stalled grace period.

The "idle=" portion of the message prints the dyntick-idle state.
The hex number before the first "/" is the low-order 12 bits of the
The hex number before the first "/" is the low-order 16 bits of the
dynticks counter, which will have an even-numbered value if the CPU
is in dyntick-idle mode and an odd-numbered value otherwise. The hex
number between the two "/"s is the value of the nesting, which will be
Expand Down
22 changes: 18 additions & 4 deletions Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,21 @@ properties:
description:
Specifies the reference clock(s) from which the output frequency is
derived. This must either reference one clock if only the first clock
input is connected or two if both clock inputs are connected.
minItems: 1
maxItems: 2
input is connected or two if both clock inputs are connected. The last
clock is the AXI bus clock that needs to be enabled so we can access the
core registers.
minItems: 2
maxItems: 3

clock-names:
oneOf:
- items:
- const: clkin1
- const: s_axi_aclk
- items:
- const: clkin1
- const: clkin2
- const: s_axi_aclk

'#clock-cells':
const: 0
Expand All @@ -40,6 +52,7 @@ required:
- compatible
- reg
- clocks
- clock-names
- '#clock-cells'

additionalProperties: false
Expand All @@ -50,5 +63,6 @@ examples:
compatible = "adi,axi-clkgen-2.00.a";
#clock-cells = <0>;
reg = <0xff000000 0x1000>;
clocks = <&osc 1>;
clocks = <&osc 1>, <&clkc 15>;
clock-names = "clkin1", "s_axi_aclk";
};
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ properties:
maxItems: 1

spi-max-frequency:
maximum: 30000000
maximum: 66000000

reset-gpios:
maxItems: 1
Expand Down
19 changes: 9 additions & 10 deletions Documentation/devicetree/bindings/serial/rs485.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@ properties:
description: prop-encoded-array <a b>
$ref: /schemas/types.yaml#/definitions/uint32-array
items:
items:
- description: Delay between rts signal and beginning of data sent in
milliseconds. It corresponds to the delay before sending data.
default: 0
maximum: 100
- description: Delay between end of data sent and rts signal in milliseconds.
It corresponds to the delay after sending data and actual release
of the line.
default: 0
maximum: 100
- description: Delay between rts signal and beginning of data sent in
milliseconds. It corresponds to the delay before sending data.
default: 0
maximum: 100
- description: Delay between end of data sent and rts signal in milliseconds.
It corresponds to the delay after sending data and actual release
of the line.
default: 0
maximum: 100

rs485-rts-active-high:
description: drive RTS high when sending (this is the default).
Expand Down
10 changes: 5 additions & 5 deletions Documentation/devicetree/bindings/sound/mt6359.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ properties:
Indicates how many data pins are used to transmit two channels of PDM
signal. 0 means two wires, 1 means one wire. Default value is 0.
enum:
- 0 # one wire
- 1 # two wires
- 0 # two wires
- 1 # one wire

mediatek,mic-type-0:
$ref: /schemas/types.yaml#/definitions/uint32
Expand Down Expand Up @@ -53,9 +53,9 @@ additionalProperties: false

examples:
- |
mt6359codec: mt6359codec {
mediatek,dmic-mode = <0>;
mediatek,mic-type-0 = <2>;
mt6359codec: audio-codec {
mediatek,dmic-mode = <0>;
mediatek,mic-type-0 = <2>;
};
...
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/vendor-prefixes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,8 @@ patternProperties:
description: National Semiconductor
"^nec,.*":
description: NEC LCD Technologies, Ltd.
"^neofidelity,.*":
description: Neofidelity Inc.
"^neonode,.*":
description: Neonode Inc.
"^netgear,.*":
Expand Down
3 changes: 2 additions & 1 deletion Documentation/filesystems/mount_api.rst
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,8 @@ process the parameters it is given.

* ::

bool fs_validate_description(const struct fs_parameter_description *desc);
bool fs_validate_description(const char *name,
const struct fs_parameter_description *desc);

This performs some validation checks on a parameter description. It
returns true if the description is good and false if it is not. It will
Expand Down
2 changes: 1 addition & 1 deletion Documentation/locking/seqlock.rst
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Use seqcount_latch_t when the write side sections cannot be protected
from interruption by readers. This is typically the case when the read
side can be invoked from NMI handlers.

Check `raw_write_seqcount_latch()` for more information.
Check `write_seqcount_latch()` for more information.


.. _seqlock_t:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/networking/j1939.rst
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ format, the Group Extension is set in the PS-field.

On the other hand, when using PDU1 format, the PS-field contains a so-called
Destination Address, which is _not_ part of the PGN. When communicating a PGN
from user space to kernel (or vice versa) and PDU2 format is used, the PS-field
from user space to kernel (or vice versa) and PDU1 format is used, the PS-field
of the PGN shall be set to zero. The Destination Address shall be set
elsewhere.

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 6
PATCHLEVEL = 6
SUBLEVEL = 63
SUBLEVEL = 64
EXTRAVERSION =
NAME = Pinguïn Aangedreven

Expand Down
2 changes: 1 addition & 1 deletion arch/arc/kernel/devtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const struct machine_desc * __init setup_machine_fdt(void *dt)
const struct machine_desc *mdesc;
unsigned long dt_root;

if (!early_init_dt_scan(dt))
if (!early_init_dt_scan(dt, __pa(dt)))
return NULL;

mdesc = of_flat_dt_match_machine(NULL, arch_get_next_mach);
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/boot/dts/allwinner/sun9i-a80-cubieboard4.dts
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,8 @@

reg_dcdc5: dcdc5 {
regulator-always-on;
regulator-min-microvolt = <1425000>;
regulator-max-microvolt = <1575000>;
regulator-min-microvolt = <1450000>;
regulator-max-microvolt = <1550000>;
regulator-name = "vcc-dram";
};

Expand Down
12 changes: 12 additions & 0 deletions arch/arm/boot/dts/microchip/sam9x60.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 13>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -384,6 +385,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 32>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -433,6 +435,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 33>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -590,6 +593,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 9>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -639,6 +643,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 10>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -688,6 +693,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 11>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -737,6 +743,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 5>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -805,6 +812,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 6>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -873,6 +881,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 7>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -941,6 +950,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 8>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -1064,6 +1074,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 15>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down Expand Up @@ -1113,6 +1124,7 @@
dma-names = "tx", "rx";
clocks = <&pmc PMC_TYPE_PERIPHERAL 16>;
clock-names = "usart";
atmel,usart-mode = <AT91_USART_MODE_SERIAL>;
atmel,use-dma-rx;
atmel,use-dma-tx;
atmel,fifo-size = <16>;
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/ti/omap/omap36xx.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<1375000 1375000 1375000>;
/* only on am/dm37x with speed-binned bit set */
opp-supported-hw = <0xffffffff 2>;
turbo-mode;
};
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/kernel/devtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ const struct machine_desc * __init setup_machine_fdt(void *dt_virt)

mdesc_best = &__mach_desc_GENERIC_DT;

if (!dt_virt || !early_init_dt_verify(dt_virt))
if (!dt_virt || !early_init_dt_verify(dt_virt, __pa(dt_virt)))
return NULL;

mdesc = of_flat_dt_match_machine(mdesc_best, arch_get_next_mach);
Expand Down
8 changes: 8 additions & 0 deletions arch/arm/kernel/entry-armv.S
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <asm/tls.h>
#include <asm/system_info.h>
#include <asm/uaccess-asm.h>
#include <asm/kasan_def.h>

#include "entry-header.S"
#include <asm/probes.h>
Expand Down Expand Up @@ -555,6 +556,13 @@ ENTRY(__switch_to)
@ entries covering the vmalloc region.
@
ldr r2, [ip]
#ifdef CONFIG_KASAN_VMALLOC
@ Also dummy read from the KASAN shadow memory for the new stack if we
@ are using KASAN
mov_l r2, KASAN_SHADOW_OFFSET
add r2, r2, ip, lsr #KASAN_SHADOW_SCALE_SHIFT
ldr r2, [r2]
#endif
#endif

@ When CONFIG_THREAD_INFO_IN_TASK=n, the update of SP itself is what
Expand Down
4 changes: 4 additions & 0 deletions arch/arm/kernel/head.S
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,11 @@ ENTRY(secondary_startup)
/*
* Use the page tables supplied from __cpu_up.
*/
#ifdef CONFIG_XIP_KERNEL
ldr r3, =(secondary_data + PLAT_PHYS_OFFSET - PAGE_OFFSET)
#else
adr_l r3, secondary_data
#endif
mov_l r12, __secondary_switched
ldrd r4, r5, [r3, #0] @ get secondary_data.pgdir
ARM_BE8(eor r4, r4, r5) @ Swap r5 and r4 in BE:
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/kernel/psci_smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,15 @@ extern void secondary_startup(void);
static int psci_boot_secondary(unsigned int cpu, struct task_struct *idle)
{
if (psci_ops.cpu_on)
#ifdef CONFIG_XIP_KERNEL
return psci_ops.cpu_on(cpu_logical_map(cpu),
((phys_addr_t)(&secondary_startup)
- XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)
+ CONFIG_XIP_PHYS_ADDR));
#else
return psci_ops.cpu_on(cpu_logical_map(cpu),
virt_to_idmap(&secondary_startup));
#endif
return -ENODEV;
}

Expand Down
7 changes: 7 additions & 0 deletions arch/arm/mm/idmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,15 @@ static void identity_mapping_add(pgd_t *pgd, const char *text_start,
unsigned long addr, end;
unsigned long next;

#ifdef CONFIG_XIP_KERNEL
addr = (phys_addr_t)(text_start) - XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)
+ CONFIG_XIP_PHYS_ADDR;
end = (phys_addr_t)(text_end) - XIP_VIRT_ADDR(CONFIG_XIP_PHYS_ADDR)
+ CONFIG_XIP_PHYS_ADDR;
#else
addr = virt_to_idmap(text_start);
end = virt_to_idmap(text_end);
#endif
pr_info("Setting up static identity map for 0x%lx - 0x%lx\n", addr, end);

prot |= PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AF;
Expand Down
Loading

0 comments on commit cb69e9e

Please sign in to comment.