[openwrt/openwrt] kernel: drop apu2 reboot patch

LEDE Commits lede-commits at lists.infradead.org
Wed Mar 24 11:52:07 GMT 2021


ldir pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/22d2c972c47466ba9e1a59aefeca8d9efa08b335

commit 22d2c972c47466ba9e1a59aefeca8d9efa08b335
Author: Kevin Darbyshire-Bryant <ldir at darbyshire-bryant.me.uk>
AuthorDate: Tue Jan 14 22:19:06 2020 +0000

    kernel: drop apu2 reboot patch
    
    This patch really annoys me, either it needs to go upstream or be
    dropped, so it's going to be dropped here.
    
    Checking drivers/platform/x86/pcengines-apuv2.c it also appears to be
    incomplete since it mentions different dmi board names depending on bios
    version.
    
    /* APU2 w/ legacy BIOS < 4.0.8 */ is 'APU2'
    /* APU2 w/ legacy BIOS >= 4.0.8 */ is 'apu2'
    /* APU2 w/ mainline BIOS */ is 'PC Engines apu2'
    
    So the patch, if applicable at all, only 'works' for legacy BIOS >=
    4.0.8
    
    My APU2 on mainline BIOS reboots fine without this patch.  So let's see
    if anyone screams and when they do question why legacy bios.  If patch
    DOES need to be re-introduced then it needs to go upstream first.
    
    Signed-off-by: Kevin Darbyshire-Bryant <ldir at darbyshire-bryant.me.uk>
---
 .../x86/patches-5.10/200-pcengines-apu2-reboot.patch  | 19 -------------------
 .../x86/patches-5.4/200-pcengines-apu2-reboot.patch   | 19 -------------------
 2 files changed, 38 deletions(-)

diff --git a/target/linux/x86/patches-5.10/200-pcengines-apu2-reboot.patch b/target/linux/x86/patches-5.10/200-pcengines-apu2-reboot.patch
deleted file mode 100644
index 742b6d6ad5..0000000000
--- a/target/linux/x86/patches-5.10/200-pcengines-apu2-reboot.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/arch/x86/kernel/reboot.c
-+++ b/arch/x86/kernel/reboot.c
-@@ -486,6 +486,16 @@ static const struct dmi_system_id reboot
- 		},
- 	},
- 
-+	/* PC Engines */
-+	{	/* Handle problems with rebooting on PC Engines apu2 */
-+		.callback = set_pci_reboot,
-+		.ident = "PC Engines apu2",
-+		.matches = {
-+			DMI_MATCH(DMI_BOARD_VENDOR, "PC Engines"),
-+			DMI_MATCH(DMI_BOARD_NAME, "apu2"),
-+		},
-+	},
-+
- 	/* Sony */
- 	{	/* Handle problems with rebooting on Sony VGN-Z540N */
- 		.callback = set_bios_reboot,
diff --git a/target/linux/x86/patches-5.4/200-pcengines-apu2-reboot.patch b/target/linux/x86/patches-5.4/200-pcengines-apu2-reboot.patch
deleted file mode 100644
index 742b6d6ad5..0000000000
--- a/target/linux/x86/patches-5.4/200-pcengines-apu2-reboot.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/arch/x86/kernel/reboot.c
-+++ b/arch/x86/kernel/reboot.c
-@@ -486,6 +486,16 @@ static const struct dmi_system_id reboot
- 		},
- 	},
- 
-+	/* PC Engines */
-+	{	/* Handle problems with rebooting on PC Engines apu2 */
-+		.callback = set_pci_reboot,
-+		.ident = "PC Engines apu2",
-+		.matches = {
-+			DMI_MATCH(DMI_BOARD_VENDOR, "PC Engines"),
-+			DMI_MATCH(DMI_BOARD_NAME, "apu2"),
-+		},
-+	},
-+
- 	/* Sony */
- 	{	/* Handle problems with rebooting on Sony VGN-Z540N */
- 		.callback = set_bios_reboot,



More information about the lede-commits mailing list