initial commit
imported from https://salsa.debian.org/kernel-team/linux.git commit 9d5cc9d9d6501d7f1dd7e194d4b245bd0b6c6a22 version 6.11.4-1
This commit is contained in:
46
debian/patches/bugfix/powerpc/fbdev-offb-Update-expected-device-name.patch
vendored
Normal file
46
debian/patches/bugfix/powerpc/fbdev-offb-Update-expected-device-name.patch
vendored
Normal file
@@ -0,0 +1,46 @@
|
||||
From: Cyril Brulebois <cyril@debamax.com>
|
||||
Date: Wed, 12 Apr 2023 11:55:08 +0200
|
||||
Subject: fbdev/offb: Update expected device name
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git/commit?id=27c74ea74be805ccba1bc1a0a03cc79c51dca6ea
|
||||
|
||||
Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"),
|
||||
as spotted by Frédéric Bonnard, the historical "of-display" device is
|
||||
gone: the updated logic creates "of-display.0" instead, then as many
|
||||
"of-display.N" as required.
|
||||
|
||||
This means that offb no longer finds the expected device, which prevents
|
||||
the Debian Installer from setting up its interface, at least on ppc64el.
|
||||
|
||||
It might be better to iterate on all possible nodes, but updating the
|
||||
hardcoded device from "of-display" to "of-display.0" is confirmed to fix
|
||||
the Debian Installer at the very least.
|
||||
|
||||
Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328
|
||||
Link: https://bugs.debian.org/1033058
|
||||
Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique")
|
||||
Cc: stable@vger.kernel.org
|
||||
Signed-off-by: Cyril Brulebois <cyril@debamax.com>
|
||||
Signed-off-by: Helge Deller <deller@gmx.de>
|
||||
---
|
||||
drivers/video/fbdev/offb.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c
|
||||
index 0065a77b6dbc8..b5fdef2b74359 100644
|
||||
--- a/drivers/video/fbdev/offb.c
|
||||
+++ b/drivers/video/fbdev/offb.c
|
||||
@@ -696,7 +696,7 @@ MODULE_DEVICE_TABLE(of, offb_of_match_display);
|
||||
|
||||
static struct platform_driver offb_driver_display = {
|
||||
.driver = {
|
||||
- .name = "of-display",
|
||||
+ .name = "of-display.0",
|
||||
.of_match_table = offb_of_match_display,
|
||||
},
|
||||
.probe = offb_probe_display,
|
||||
--
|
||||
2.30.2
|
||||
|
@@ -0,0 +1,39 @@
|
||||
From: Krzysztof Kozlowski <krzk@kernel.org>
|
||||
Date: Wed, 29 Aug 2018 09:32:23 +0200
|
||||
Subject: powerpc/boot: Fix missing crc32poly.h when building with KERNEL_XZ
|
||||
Origin: https://patchwork.ozlabs.org/patch/963258/
|
||||
|
||||
After commit faa16bc404d7 ("lib: Use existing define with
|
||||
polynomial") the lib/xz/xz_crc32.c includes a header from include/linux
|
||||
directory thus any other user of this code should define proper include
|
||||
path.
|
||||
|
||||
This fixes the build error on powerpc with CONFIG_KERNEL_XZ:
|
||||
|
||||
In file included from ../arch/powerpc/boot/../../../lib/decompress_unxz.c:233:0,
|
||||
from ../arch/powerpc/boot/decompress.c:42:
|
||||
../arch/powerpc/boot/../../../lib/xz/xz_crc32.c:18:29: fatal error: linux/crc32poly.h: No such file or directory
|
||||
|
||||
Reported-by: Michal Kubecek <mkubecek@suse.cz>
|
||||
Fixes: faa16bc404d7 ("lib: Use existing define with polynomial")
|
||||
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
|
||||
Reported-by: kbuild test robot <lkp@intel.com>
|
||||
Reported-by: Meelis Roos <mroos@linux.ee>
|
||||
Tested-by: Michal Kubecek <mkubecek@suse.cz>
|
||||
---
|
||||
arch/powerpc/boot/Makefile | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: linux/arch/powerpc/boot/Makefile
|
||||
===================================================================
|
||||
--- linux.orig/arch/powerpc/boot/Makefile
|
||||
+++ linux/arch/powerpc/boot/Makefile
|
||||
@@ -70,7 +70,7 @@ BOOTCFLAGS += -fno-stack-protector
|
||||
endif
|
||||
|
||||
BOOTCFLAGS += -include $(srctree)/include/linux/compiler_attributes.h
|
||||
-BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj)
|
||||
+BOOTCFLAGS += -I$(objtree)/$(obj) -I$(srctree)/$(obj) -I$(srctree)/include
|
||||
|
||||
DTC_FLAGS ?= -p 1024
|
||||
|
Reference in New Issue
Block a user