add boot args for smmu and video

add-boot-args-for-smmu-and-video.patch

@@ -0,0 +1,31 @@
+From 99970253a5600555118a64046259b7ef638655df Mon Sep 17 00:00:00 2001
+From: t_feng <fengtao40@huawei.com>
+Date: Fri, 11 Sep 2020 11:26:41 +0800
+Subject: [PATCH] add boot args for smmu and video
+
+---
+ pyanaconda/modules/storage/bootloader/grub2.py | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/pyanaconda/modules/storage/bootloader/grub2.py b/pyanaconda/modules/storage/bootloader/grub2.py
+index 17e46e5..a70ba7a 100644
+--- a/pyanaconda/modules/storage/bootloader/grub2.py
++++ b/pyanaconda/modules/storage/bootloader/grub2.py
+@@ -271,6 +271,14 @@ class GRUB2(BootLoader):
+         if blivet.arch.is_aarch64():
+             log.info("check boot args:%s", arg_str)
+             arg_str += " crashkernel=1024M,high"
++            if "smmu.bypassdev=0x1000:0x17" not in arg_str:
++                arg_str += " smmu.bypassdev=0x1000:0x17"
++            if "smmu.bypassdev=0x1000:0x15" not in arg_str:
++                arg_str += " smmu.bypassdev=0x1000:0x15"
++            if "video=efifb:off" not in arg_str:
++                arg_str += " video=efifb:off"
++            if "video=VGA-1:640x480-32@60me" not in arg_str:
++                arg_str += " video=VGA-1:640x480-32@60me"
+         else:
+             arg_str += " crashkernel=512M"
+ 
+-- 
+2.23.0
+

add-boot-options-for-smmu-and-crashkernel.patch

@@ -1,25 +0,0 @@
-From c5a47d3285678f9d9ebbbab3d18946d858513732 Mon Sep 17 00:00:00 2001
-From: t_feng <fengtao40@huawei.com>
-Date: Fri, 19 Jun 2020 11:04:30 +0800
-Subject: [PATCH] add boot options for smmu and crashkernel
-
----
- data/anaconda.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/anaconda.conf b/data/anaconda.conf
-index 89731f4..e75354d 100644
---- a/data/anaconda.conf
-+++ b/data/anaconda.conf
-@@ -124,7 +124,7 @@ preserved_arguments =
-      speakup_synth apic noapic apm ide noht acpi video
-      pci nodmraid nompath nomodeset noiswmd fips selinux
-      biosdevname ipv6.disable net.ifnames net.ifnames.prefix
--     nosmt
-+     nosmt smmu.bypassdev crashkernel
- 
- 
- [Storage]
--- 
-2.23.0
-

anaconda.spec

@@ -1,7 +1,7 @@
 %define _empty_manifest_terminate_build 0
 Name:    anaconda
 Version: 33.19
-Release: 6
+Release: 7
 Summary: Graphical system installer
 License: GPLv2+ and MIT
 URL:     http://fedoraproject.org/wiki/Anaconda
@@ -20,13 +20,13 @@ Patch9006:    hide-help-button.patch
 Patch9007:    modify-interface-is-extended-in-Chinese-mode.patch
 Patch9008:    remove-vender-issue-in-netdev.patch
 Patch9009:    modify-arguments-parsing.patch
-Patch9010:    add-boot-options-for-smmu-and-crashkernel.patch
 Patch9011:    disable-product-name-in-welcome-is-uppercase.patch
 Patch9012:    modify-default-timezone.patch
 Patch9013:    modify-network-hostname-dot-illegal.patch
 Patch9014:    disable-ssh-login-checkbox.patch
 Patch9015:    bugfix-add-kdump-parameter-into-kernel-cmdline.patch
 Patch9016:    bugfix-fix-password-policy.patch
+Patch9017:    add-boot-args-for-smmu-and-video.patch
 
 Patch6001:    anaconda-Fix-stage2-as-default-sources.patch
 Patch6002:    anaconda-Allow-to-detect-devices-with-the-iso9660-file-system.patch
@@ -241,6 +241,12 @@ update-desktop-database &> /dev/null || :
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Sep 11 2020 fengtao <fengtao40@huawei.com> - 33.19-7
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:add boot args for smmu and video
+
 * Thu Sep 10 2020 zhangqiumiao <zhangqiumiao1@huawei.com> - 33.19-6
 - Type:bugfix
 - ID:NA