Skip to content

Commit 6d33cb7

Browse files
GtrCraftGtrCraft
committed
This is the 4.19.218 stable release
2 parents fa9a58e + 1f244a5 commit 6d33cb7

File tree

350 files changed

+2173
-1156
lines changed

Some content is hidden

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

350 files changed

+2173
-1156
lines changed

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

+7
Original file line numberDiff line numberDiff line change
@@ -5321,6 +5321,13 @@
53215321
with /sys/devices/system/xen_memory/xen_memory0/scrub_pages.
53225322
Default value controlled with CONFIG_XEN_SCRUB_PAGES_DEFAULT.
53235323

5324+
xen.balloon_boot_timeout= [XEN]
5325+
The time (in seconds) to wait before giving up to boot
5326+
in case initial ballooning fails to free enough memory.
5327+
Applies only when running as HVM or PVH guest and
5328+
started with less memory configured than allowed at
5329+
max. Default is 180.
5330+
53245331
xen.event_eoi_delay= [XEN]
53255332
How long to delay EOI handling in case of event
53265333
storms (jiffies). Default is 10.

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0
22
VERSION = 4
33
PATCHLEVEL = 19
4-
SUBLEVEL = 217
4+
SUBLEVEL = 218
55
EXTRAVERSION =
66
NAME = "People's Front"
77

‎arch/arm/Makefile

+11-11
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ KBUILD_CFLAGS += $(call cc-option,-fno-ipa-sra)
7474
# Note that GCC does not numerically define an architecture version
7575
# macro, but instead defines a whole series of macros which makes
7676
# testing for a specific architecture or later rather impossible.
77-
arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m
78-
arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
79-
arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
77+
arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m
78+
arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -march=armv7-a
79+
arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 -march=armv6
8080
# Only override the compiler option if ARMv6. The ARMv6K extensions are
8181
# always available in ARMv7
8282
ifeq ($(CONFIG_CPU_32v6),y)
83-
arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)
83+
arch-$(CONFIG_CPU_32v6K) =-D__LINUX_ARM_ARCH__=6 -march=armv6k
8484
endif
85-
arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t)
85+
arch-$(CONFIG_CPU_32v5) =-D__LINUX_ARM_ARCH__=5 -march=armv5te
8686
arch-$(CONFIG_CPU_32v4T) =-D__LINUX_ARM_ARCH__=4 -march=armv4t
8787
arch-$(CONFIG_CPU_32v4) =-D__LINUX_ARM_ARCH__=4 -march=armv4
8888
arch-$(CONFIG_CPU_32v3) =-D__LINUX_ARM_ARCH__=3 -march=armv3
@@ -96,19 +96,19 @@ tune-$(CONFIG_CPU_ARM720T) =-mtune=arm7tdmi
9696
tune-$(CONFIG_CPU_ARM740T) =-mtune=arm7tdmi
9797
tune-$(CONFIG_CPU_ARM9TDMI) =-mtune=arm9tdmi
9898
tune-$(CONFIG_CPU_ARM940T) =-mtune=arm9tdmi
99-
tune-$(CONFIG_CPU_ARM946E) =$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)
99+
tune-$(CONFIG_CPU_ARM946E) =-mtune=arm9e
100100
tune-$(CONFIG_CPU_ARM920T) =-mtune=arm9tdmi
101101
tune-$(CONFIG_CPU_ARM922T) =-mtune=arm9tdmi
102102
tune-$(CONFIG_CPU_ARM925T) =-mtune=arm9tdmi
103103
tune-$(CONFIG_CPU_ARM926T) =-mtune=arm9tdmi
104104
tune-$(CONFIG_CPU_FA526) =-mtune=arm9tdmi
105105
tune-$(CONFIG_CPU_SA110) =-mtune=strongarm110
106106
tune-$(CONFIG_CPU_SA1100) =-mtune=strongarm1100
107-
tune-$(CONFIG_CPU_XSCALE) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
108-
tune-$(CONFIG_CPU_XSC3) =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
109-
tune-$(CONFIG_CPU_FEROCEON) =$(call cc-option,-mtune=marvell-f,-mtune=xscale)
110-
tune-$(CONFIG_CPU_V6) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
111-
tune-$(CONFIG_CPU_V6K) =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
107+
tune-$(CONFIG_CPU_XSCALE) =-mtune=xscale
108+
tune-$(CONFIG_CPU_XSC3) =-mtune=xscale
109+
tune-$(CONFIG_CPU_FEROCEON) =-mtune=xscale
110+
tune-$(CONFIG_CPU_V6) =-mtune=arm1136j-s
111+
tune-$(CONFIG_CPU_V6K) =-mtune=arm1136j-s
112112

113113
# Evaluate tune cc-option calls now
114114
tune-y := $(tune-y)

‎arch/arm/boot/dts/at91-tse850-3.dts

+1-1
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@
269269
&macb1 {
270270
status = "okay";
271271

272-
phy-mode = "rgmii";
272+
phy-mode = "rmii";
273273

274274
#address-cells = <1>;
275275
#size-cells = <0>;

‎arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
compatible = "smsc,lan9221","smsc,lan9115";
3030
bank-width = <2>;
3131

32-
gpmc,mux-add-data;
32+
gpmc,mux-add-data = <0>;
3333
gpmc,cs-on-ns = <0>;
3434
gpmc,cs-rd-off-ns = <42>;
3535
gpmc,cs-wr-off-ns = <36>;

‎arch/arm/boot/dts/omap3-gta04.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@
364364
compatible = "bosch,bma180";
365365
reg = <0x41>;
366366
pinctrl-names = "default";
367-
pintcrl-0 = <&bma180_pins>;
367+
pinctrl-0 = <&bma180_pins>;
368368
interrupt-parent = <&gpio4>;
369369
interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_115 */
370370
};

‎arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
compatible = "smsc,lan9221","smsc,lan9115";
2626
bank-width = <2>;
2727

28-
gpmc,mux-add-data;
28+
gpmc,mux-add-data = <0>;
2929
gpmc,cs-on-ns = <0>;
3030
gpmc,cs-rd-off-ns = <42>;
3131
gpmc,cs-wr-off-ns = <36>;

‎arch/arm/kernel/stacktrace.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ int notrace unwind_frame(struct stackframe *frame)
5353

5454
frame->sp = frame->fp;
5555
frame->fp = *(unsigned long *)(fp);
56-
frame->pc = frame->lr;
57-
frame->lr = *(unsigned long *)(fp + 4);
56+
frame->pc = *(unsigned long *)(fp + 4);
5857
#else
5958
/* check current frame pointer is within bounds */
6059
if (fp < low + 12 || fp > high - 4)

‎arch/arm/mm/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -751,7 +751,7 @@ config CPU_BIG_ENDIAN
751751
config CPU_ENDIAN_BE8
752752
bool
753753
depends on CPU_BIG_ENDIAN
754-
default CPU_V6 || CPU_V6K || CPU_V7
754+
default CPU_V6 || CPU_V6K || CPU_V7 || CPU_V7M
755755
help
756756
Support for the BE-8 (big-endian) mode on ARMv6 and ARMv7 processors.
757757

‎arch/arm/mm/mmu.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,9 @@ void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot)
416416
FIXADDR_END);
417417
BUG_ON(idx >= __end_of_fixed_addresses);
418418

419-
/* we only support device mappings until pgprot_kernel has been set */
419+
/* We support only device mappings before pgprot_kernel is set. */
420420
if (WARN_ON(pgprot_val(prot) != pgprot_val(FIXMAP_PAGE_IO) &&
421-
pgprot_val(pgprot_kernel) == 0))
421+
pgprot_val(prot) && pgprot_val(pgprot_kernel) == 0))
422422
return;
423423

424424
if (pgprot_val(prot))

‎arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi

+8-8
Original file line numberDiff line numberDiff line change
@@ -584,56 +584,56 @@
584584
};
585585

586586
cluster1_core0_watchdog: wdt@c000000 {
587-
compatible = "arm,sp805-wdt", "arm,primecell";
587+
compatible = "arm,sp805", "arm,primecell";
588588
reg = <0x0 0xc000000 0x0 0x1000>;
589589
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
590590
clock-names = "apb_pclk", "wdog_clk";
591591
};
592592

593593
cluster1_core1_watchdog: wdt@c010000 {
594-
compatible = "arm,sp805-wdt", "arm,primecell";
594+
compatible = "arm,sp805", "arm,primecell";
595595
reg = <0x0 0xc010000 0x0 0x1000>;
596596
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
597597
clock-names = "apb_pclk", "wdog_clk";
598598
};
599599

600600
cluster1_core2_watchdog: wdt@c020000 {
601-
compatible = "arm,sp805-wdt", "arm,primecell";
601+
compatible = "arm,sp805", "arm,primecell";
602602
reg = <0x0 0xc020000 0x0 0x1000>;
603603
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
604604
clock-names = "apb_pclk", "wdog_clk";
605605
};
606606

607607
cluster1_core3_watchdog: wdt@c030000 {
608-
compatible = "arm,sp805-wdt", "arm,primecell";
608+
compatible = "arm,sp805", "arm,primecell";
609609
reg = <0x0 0xc030000 0x0 0x1000>;
610610
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
611611
clock-names = "apb_pclk", "wdog_clk";
612612
};
613613

614614
cluster2_core0_watchdog: wdt@c100000 {
615-
compatible = "arm,sp805-wdt", "arm,primecell";
615+
compatible = "arm,sp805", "arm,primecell";
616616
reg = <0x0 0xc100000 0x0 0x1000>;
617617
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
618618
clock-names = "apb_pclk", "wdog_clk";
619619
};
620620

621621
cluster2_core1_watchdog: wdt@c110000 {
622-
compatible = "arm,sp805-wdt", "arm,primecell";
622+
compatible = "arm,sp805", "arm,primecell";
623623
reg = <0x0 0xc110000 0x0 0x1000>;
624624
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
625625
clock-names = "apb_pclk", "wdog_clk";
626626
};
627627

628628
cluster2_core2_watchdog: wdt@c120000 {
629-
compatible = "arm,sp805-wdt", "arm,primecell";
629+
compatible = "arm,sp805", "arm,primecell";
630630
reg = <0x0 0xc120000 0x0 0x1000>;
631631
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
632632
clock-names = "apb_pclk", "wdog_clk";
633633
};
634634

635635
cluster2_core3_watchdog: wdt@c130000 {
636-
compatible = "arm,sp805-wdt", "arm,primecell";
636+
compatible = "arm,sp805", "arm,primecell";
637637
reg = <0x0 0xc130000 0x0 0x1000>;
638638
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
639639
clock-names = "apb_pclk", "wdog_clk";

‎arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi

+8-8
Original file line numberDiff line numberDiff line change
@@ -222,56 +222,56 @@
222222
};
223223

224224
cluster1_core0_watchdog: wdt@c000000 {
225-
compatible = "arm,sp805-wdt", "arm,primecell";
225+
compatible = "arm,sp805", "arm,primecell";
226226
reg = <0x0 0xc000000 0x0 0x1000>;
227227
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
228228
clock-names = "apb_pclk", "wdog_clk";
229229
};
230230

231231
cluster1_core1_watchdog: wdt@c010000 {
232-
compatible = "arm,sp805-wdt", "arm,primecell";
232+
compatible = "arm,sp805", "arm,primecell";
233233
reg = <0x0 0xc010000 0x0 0x1000>;
234234
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
235235
clock-names = "apb_pclk", "wdog_clk";
236236
};
237237

238238
cluster2_core0_watchdog: wdt@c100000 {
239-
compatible = "arm,sp805-wdt", "arm,primecell";
239+
compatible = "arm,sp805", "arm,primecell";
240240
reg = <0x0 0xc100000 0x0 0x1000>;
241241
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
242242
clock-names = "apb_pclk", "wdog_clk";
243243
};
244244

245245
cluster2_core1_watchdog: wdt@c110000 {
246-
compatible = "arm,sp805-wdt", "arm,primecell";
246+
compatible = "arm,sp805", "arm,primecell";
247247
reg = <0x0 0xc110000 0x0 0x1000>;
248248
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
249249
clock-names = "apb_pclk", "wdog_clk";
250250
};
251251

252252
cluster3_core0_watchdog: wdt@c200000 {
253-
compatible = "arm,sp805-wdt", "arm,primecell";
253+
compatible = "arm,sp805", "arm,primecell";
254254
reg = <0x0 0xc200000 0x0 0x1000>;
255255
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
256256
clock-names = "apb_pclk", "wdog_clk";
257257
};
258258

259259
cluster3_core1_watchdog: wdt@c210000 {
260-
compatible = "arm,sp805-wdt", "arm,primecell";
260+
compatible = "arm,sp805", "arm,primecell";
261261
reg = <0x0 0xc210000 0x0 0x1000>;
262262
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
263263
clock-names = "apb_pclk", "wdog_clk";
264264
};
265265

266266
cluster4_core0_watchdog: wdt@c300000 {
267-
compatible = "arm,sp805-wdt", "arm,primecell";
267+
compatible = "arm,sp805", "arm,primecell";
268268
reg = <0x0 0xc300000 0x0 0x1000>;
269269
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
270270
clock-names = "apb_pclk", "wdog_clk";
271271
};
272272

273273
cluster4_core1_watchdog: wdt@c310000 {
274-
compatible = "arm,sp805-wdt", "arm,primecell";
274+
compatible = "arm,sp805", "arm,primecell";
275275
reg = <0x0 0xc310000 0x0 0x1000>;
276276
clocks = <&clockgen 4 3>, <&clockgen 4 3>;
277277
clock-names = "apb_pclk", "wdog_clk";

‎arch/arm64/boot/dts/hisilicon/hi3660.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -1062,15 +1062,15 @@
10621062
};
10631063

10641064
watchdog0: watchdog@e8a06000 {
1065-
compatible = "arm,sp805-wdt", "arm,primecell";
1065+
compatible = "arm,sp805", "arm,primecell";
10661066
reg = <0x0 0xe8a06000 0x0 0x1000>;
10671067
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
10681068
clocks = <&crg_ctrl HI3660_OSC32K>;
10691069
clock-names = "apb_pclk";
10701070
};
10711071

10721072
watchdog1: watchdog@e8a07000 {
1073-
compatible = "arm,sp805-wdt", "arm,primecell";
1073+
compatible = "arm,sp805", "arm,primecell";
10741074
reg = <0x0 0xe8a07000 0x0 0x1000>;
10751075
interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
10761076
clocks = <&crg_ctrl HI3660_OSC32K>;

‎arch/arm64/boot/dts/hisilicon/hi6220.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,7 @@
830830
};
831831

832832
watchdog0: watchdog@f8005000 {
833-
compatible = "arm,sp805-wdt", "arm,primecell";
833+
compatible = "arm,sp805", "arm,primecell";
834834
reg = <0x0 0xf8005000 0x0 0x1000>;
835835
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
836836
clocks = <&ao_ctrl HI6220_WDT0_PCLK>;

‎arch/arm64/boot/dts/rockchip/rk3328.dtsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@
536536

537537
gpu: gpu@ff300000 {
538538
compatible = "rockchip,rk3328-mali", "arm,mali-450";
539-
reg = <0x0 0xff300000 0x0 0x40000>;
539+
reg = <0x0 0xff300000 0x0 0x30000>;
540540
interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>,
541541
<GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>,
542542
<GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm64/boot/dts/vendor/bindings/regulator/samsung,s5m8767.txt

+9-14
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ common regulator binding documented in:
1313

1414

1515
Required properties of the main device node (the parent!):
16+
- s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used
17+
for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines.
18+
19+
[1] If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional
20+
property is specified, then all the eight voltage values for the
21+
's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified.
22+
23+
Optional properties of the main device node (the parent!):
1624
- s5m8767,pmic-buck2-dvs-voltage: A set of 8 voltage values in micro-volt (uV)
1725
units for buck2 when changing voltage using gpio dvs. Refer to [1] below
1826
for additional information.
@@ -25,26 +33,13 @@ Required properties of the main device node (the parent!):
2533
units for buck4 when changing voltage using gpio dvs. Refer to [1] below
2634
for additional information.
2735

28-
- s5m8767,pmic-buck-ds-gpios: GPIO specifiers for three host gpio's used
29-
for selecting GPIO DVS lines. It is one-to-one mapped to dvs gpio lines.
30-
31-
[1] If none of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional
32-
property is specified, the 's5m8767,pmic-buck[2/3/4]-dvs-voltage'
33-
property should specify atleast one voltage level (which would be a
34-
safe operating voltage).
35-
36-
If either of the 's5m8767,pmic-buck[2/3/4]-uses-gpio-dvs' optional
37-
property is specified, then all the eight voltage values for the
38-
's5m8767,pmic-buck[2/3/4]-dvs-voltage' should be specified.
39-
40-
Optional properties of the main device node (the parent!):
4136
- s5m8767,pmic-buck2-uses-gpio-dvs: 'buck2' can be controlled by gpio dvs.
4237
- s5m8767,pmic-buck3-uses-gpio-dvs: 'buck3' can be controlled by gpio dvs.
4338
- s5m8767,pmic-buck4-uses-gpio-dvs: 'buck4' can be controlled by gpio dvs.
4439

4540
Additional properties required if either of the optional properties are used:
4641

47-
- s5m8767,pmic-buck234-default-dvs-idx: Default voltage setting selected from
42+
- s5m8767,pmic-buck-default-dvs-idx: Default voltage setting selected from
4843
the possible 8 options selectable by the dvs gpios. The value of this
4944
property should be between 0 and 7. If not specified or if out of range, the
5045
default value of this property is set to 0.

‎arch/arm64/boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts

+2-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
reg = <0>;
131131

132132
partition@0 {
133-
label = "data";
133+
label = "spi0-data";
134134
reg = <0x0 0x100000>;
135135
};
136136
};
@@ -148,7 +148,7 @@
148148
reg = <0>;
149149

150150
partition@0 {
151-
label = "data";
151+
label = "spi1-data";
152152
reg = <0x0 0x84000>;
153153
};
154154
};

‎arch/arm64/boot/dts/xilinx/zynqmp.dtsi

+2-2
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@
574574
};
575575

576576
uart0: serial@ff000000 {
577-
compatible = "cdns,uart-r1p12", "xlnx,xuartps";
577+
compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12";
578578
status = "disabled";
579579
interrupt-parent = <&gic>;
580580
interrupts = <0 21 4>;
@@ -583,7 +583,7 @@
583583
};
584584

585585
uart1: serial@ff010000 {
586-
compatible = "cdns,uart-r1p12", "xlnx,xuartps";
586+
compatible = "xlnx,zynqmp-uart", "cdns,uart-r1p12";
587587
status = "disabled";
588588
interrupt-parent = <&gic>;
589589
interrupts = <0 22 4>;

0 commit comments

Comments
 (0)