RPi kernel: update kernel version to openEuler 4.19.90-2111.5.0

This commit is contained in:
yafen 2021-11-23 22:44:53 +08:00
parent 33e1f7ffd2
commit bf708eb0c2
2 changed files with 26 additions and 16 deletions

View File

@ -1,6 +1,6 @@
From fad8784f265fd500f3f3c12732406876756bada2 Mon Sep 17 00:00:00 2001 From 8fca0b93918620d2198056abc8b2f4816ac8dc47 Mon Sep 17 00:00:00 2001
From: yafen <yafen@iscas.ac.cn> From: yafen <yafen@iscas.ac.cn>
Date: Tue, 17 Aug 2021 17:24:52 +0800 Date: Wed, 17 Nov 2021 03:56:20 +0800
Subject: [PATCH] 4.19.90 raspberrypi patch Subject: [PATCH] 4.19.90 raspberrypi patch
--- ---
@ -671,7 +671,7 @@ Subject: [PATCH] 4.19.90 raspberrypi patch
drivers/pci/controller/pcie-brcmstb-bounce.h | 37 + drivers/pci/controller/pcie-brcmstb-bounce.h | 37 +
.../pci/controller/pcie-brcmstb-bounce64.c | 576 + .../pci/controller/pcie-brcmstb-bounce64.c | 576 +
drivers/pci/controller/pcie-brcmstb.c | 1874 +++ drivers/pci/controller/pcie-brcmstb.c | 1874 +++
drivers/perf/Kconfig | 7 + drivers/perf/Kconfig | 8 +
drivers/perf/Makefile | 1 + drivers/perf/Makefile | 1 +
drivers/perf/raspberrypi_axi_monitor.c | 637 + drivers/perf/raspberrypi_axi_monitor.c | 637 +
drivers/pinctrl/bcm/pinctrl-bcm2835.c | 151 +- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 151 +-
@ -924,7 +924,7 @@ Subject: [PATCH] 4.19.90 raspberrypi patch
sound/soc/codecs/tlv320aic32x4.h | 14 + sound/soc/codecs/tlv320aic32x4.h | 14 +
sound/soc/soc-core.c | 15 +- sound/soc/soc-core.c | 15 +-
sound/usb/quirks.c | 2 +- sound/usb/quirks.c | 2 +-
920 files changed, 331292 insertions(+), 5593 deletions(-) 920 files changed, 331293 insertions(+), 5593 deletions(-)
create mode 100644 Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt create mode 100644 Documentation/devicetree/bindings/hwmon/rpi-poe-fan.txt
create mode 100644 Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt create mode 100644 Documentation/devicetree/bindings/input/ilitek,ili2xxx.txt
create mode 100644 Documentation/devicetree/bindings/media/bcm2835-unicam.txt create mode 100644 Documentation/devicetree/bindings/media/bcm2835-unicam.txt
@ -2408,7 +2408,7 @@ index 316f52c8a310..e62a15782790 100644
Return Value Return Value
============ ============
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index c2bbf0fdc886..ea78cd38ec7c 100644 index 15609985b6cc..d43c1d7a57b1 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2871,6 +2871,13 @@ S: Maintained @@ -2871,6 +2871,13 @@ S: Maintained
@ -43727,7 +43727,7 @@ index f4d5765940a3..05772b9e904d 100644
{ {
if (swiotlb) if (swiotlb)
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 5449ae2d26be..8cfb4fd32403 100644 index 8cdf92626c2c..5bb91a9cc527 100644
--- a/arch/arm64/mm/init.c --- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c
@@ -340,7 +340,7 @@ static void __init reserve_elfcorehdr(void) @@ -340,7 +340,7 @@ static void __init reserve_elfcorehdr(void)
@ -175730,7 +175730,7 @@ index 000000000000..3a4137b9ae19
+ +
diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c diff --git a/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c
new file mode 100644 new file mode 100644
index 000000000000..ff894732ba90 index 000000000000..7563c5ea3066
--- /dev/null --- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c +++ b/drivers/net/wireless/realtek/rtl8192cu/hal/rtl8192c/usb/usb_halinit.c
@@ -0,0 +1,6261 @@ @@ -0,0 +1,6261 @@
@ -203265,7 +203265,7 @@ index 000000000000..ab5e5f79597d
+#endif //__HAL8190PCIDM_H__ +#endif //__HAL8190PCIDM_H__
diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h diff --git a/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h
new file mode 100644 new file mode 100644
index 000000000000..1ab5f9825915 index 000000000000..212c6e2fa794
--- /dev/null --- /dev/null
+++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h +++ b/drivers/net/wireless/realtek/rtl8192cu/include/rtl8192d_hal.h
@@ -0,0 +1,1126 @@ @@ -0,0 +1,1126 @@
@ -253597,10 +253597,10 @@ index 000000000000..e3b9fa64ed54
+MODULE_DESCRIPTION("Broadcom STB PCIe RC driver"); +MODULE_DESCRIPTION("Broadcom STB PCIe RC driver");
+MODULE_AUTHOR("Broadcom"); +MODULE_AUTHOR("Broadcom");
diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig diff --git a/drivers/perf/Kconfig b/drivers/perf/Kconfig
index 92be6a36a128..6f9d75ffe1e8 100644 index d87337d3be52..c9fc8c3b8520 100644
--- a/drivers/perf/Kconfig --- a/drivers/perf/Kconfig
+++ b/drivers/perf/Kconfig +++ b/drivers/perf/Kconfig
@@ -111,4 +111,11 @@ config ARM_SPE_PMU @@ -104,6 +104,14 @@ config ARM_SPE_PMU
Extension, which provides periodic sampling of operations in Extension, which provides periodic sampling of operations in
the CPU pipeline and reports this via the perf AUX interface. the CPU pipeline and reports this via the perf AUX interface.
@ -253611,6 +253611,9 @@ index 92be6a36a128..6f9d75ffe1e8 100644
+ help + help
+ Say y if you want to use Raspberry Pi AXI performance monitors, m if + Say y if you want to use Raspberry Pi AXI performance monitors, m if
+ you want to build it as a module. + you want to build it as a module.
+
source "drivers/perf/hisilicon/Kconfig"
endmenu endmenu
diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile diff --git a/drivers/perf/Makefile b/drivers/perf/Makefile
index f10a932b0d79..c7719727d311 100644 index f10a932b0d79..c7719727d311 100644
@ -330872,7 +330875,7 @@ index a6101f095db8..445f4f2d995b 100644
"// Write ERST size = %i to ir_set 0 (some bits preserved)", "// Write ERST size = %i to ir_set 0 (some bits preserved)",
val); val);
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 164f4d6350fe..ecf34222797d 100644 index 238a32cc311c..878eaac19653 100644
--- a/drivers/usb/host/xhci-pci.c --- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c
@@ -232,6 +232,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) @@ -232,6 +232,11 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
@ -338134,7 +338137,7 @@ index 1aae2e4b8f10..beded53c6039 100644
/* /*
diff --git a/kernel/resource.c b/kernel/resource.c diff --git a/kernel/resource.c b/kernel/resource.c
index 7dd11c78c738..540b43ac0c08 100644 index 55a3c6010682..eb095505fa4b 100644
--- a/kernel/resource.c --- a/kernel/resource.c
+++ b/kernel/resource.c +++ b/kernel/resource.c
@@ -213,6 +213,12 @@ static int __release_resource(struct resource *old, bool release_child) @@ -213,6 +213,12 @@ static int __release_resource(struct resource *old, bool release_child)
@ -338151,10 +338154,10 @@ index 7dd11c78c738..540b43ac0c08 100644
for (;;) { for (;;) {
tmp = *p; tmp = *p;
diff --git a/mm/page_alloc.c b/mm/page_alloc.c diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5543c1fb4901..9523843a1ab7 100644 index 935435e03cdd..8bf376a023c0 100644
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -8149,8 +8149,6 @@ int alloc_contig_range(unsigned long start, unsigned long end, @@ -8226,8 +8226,6 @@ int alloc_contig_range(unsigned long start, unsigned long end,
/* Make sure the range is really isolated. */ /* Make sure the range is really isolated. */
if (test_pages_isolated(outer_start, end, false)) { if (test_pages_isolated(outer_start, end, false)) {

View File

@ -2,13 +2,13 @@
%global KernelVer %{version}-%{release}.raspi.%{_target_cpu} %global KernelVer %{version}-%{release}.raspi.%{_target_cpu}
%global hulkrelease 2109.7.0 %global hulkrelease 2111.5.0
%global debug_package %{nil} %global debug_package %{nil}
Name: raspberrypi-kernel Name: raspberrypi-kernel
Version: 4.19.90 Version: 4.19.90
Release: %{hulkrelease}.0031 Release: %{hulkrelease}.0033
Summary: Linux Kernel Summary: Linux Kernel
License: GPL-1.0 and GPL+ and GPLv2 and GPLv2+ and LGPLv2 and LGPLv2+ and LGPLv2.1 and LGPLv2.1+ and ISC and BSD and Apache-2.0 and MIT License: GPL-1.0 and GPL+ and GPLv2 and GPLv2+ and LGPLv2 and LGPLv2+ and LGPLv2.1 and LGPLv2.1+ and ISC and BSD and Apache-2.0 and MIT
URL: http://www.kernel.org/ URL: http://www.kernel.org/
@ -174,6 +174,13 @@ install -m 644 /boot/dtb-%{KernelVer}/overlays/README /boot/overlays/
/lib/modules/%{KernelVer} /lib/modules/%{KernelVer}
%changelog %changelog
* Tue Nov 23 2021 Yafen Fang <yafen@iscas.ac.cn> - 4.19.90-2111.5.0.0033
- update kernel version to openEuler 4.19.90-2111.5.0
* Tue Nov 23 2021 Yafen Fang <yafen@iscas.ac.cn> - 4.19.90-2111.4.0.0032
- fix conflict patching RPi on openEuler 4.19.90-2111.4.0
- update kernel version to openEuler 4.19.90-2111.4.0
* Wed Sep 22 2021 Yafen Fang <yafen@iscas.ac.cn> - 4.19.90-2109.7.0.0031 * Wed Sep 22 2021 Yafen Fang <yafen@iscas.ac.cn> - 4.19.90-2109.7.0.0031
- memcg: enable accounting for ldt_struct objects - memcg: enable accounting for ldt_struct objects
- memcg: enable accounting for posix_timers_cache slab - memcg: enable accounting for posix_timers_cache slab