Update riscv configs

Found unset config items, please set them to an appropriate value
CONFIG_MMC_DW_EXYNOS=n
CONFIG_MMC_DW_HI3798CV200=n
CONFIG_MMC_DW_K3=n

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

0001-ACPI-APEI-arm64-Ignore-broken-HPE-moonshot-APEI-supp.patch

@@ -48,7 +48,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 8 insertions(+)
 
 diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
-index 953a2fae8b15..7ea07f7da582 100644
+index 6e980fe16772..37bc003e7a83 100644
 --- a/drivers/acpi/apei/hest.c
 +++ b/drivers/acpi/apei/hest.c
 @@ -88,6 +88,14 @@ int apei_hest_parse(apei_hest_func_t func, void *data)
@@ -67,5 +67,5 @@ index 953a2fae8b15..7ea07f7da582 100644
  	for (i = 0; i < hest_tab->error_source_count; i++) {
  		len = hest_esrc_len(hest_hdr);
 -- 
-2.26.2
+2.28.0
 

0001-ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m.patch

@@ -71,5 +71,5 @@ index e209081d644b..7484bcf59a1b 100644
  	return ctx.rc;
  }
 -- 
-2.26.2
+2.28.0
 

0001-ALSA-hda-via-Fix-runtime-PM-for-Clevo-W35xSS.patch

@@ -0,0 +1,86 @@
+From 4bfd6247fa9164c8e193a55ef9c0ea3ee22f82d8 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 4 Jan 2021 16:30:46 +0100
+Subject: [PATCH] ALSA: hda/via: Fix runtime PM for Clevo W35xSS
+
+Clevo W35xSS_370SS with VIA codec has had the runtime PM problem that
+looses the power state of some nodes after the runtime resume.  This
+was worked around by disabling the default runtime PM via a denylist
+entry.  Since 5.10.x made the runtime PM applied (casually) even
+though it's disabled in the denylist, this problem was revisited.  The
+result was that disabling power_save_node feature suffices for the
+runtime PM problem.
+
+This patch implements the disablement of power_save_node feature in
+VIA codec for the device.  It also drops the former denylist entry,
+too, as the runtime PM should work in the codec side properly now.
+
+Fixes: b529ef2464ad ("ALSA: hda: Add Clevo W35xSS_370SS to the power_save blacklist")
+Reported-by: Christian Labisch <clnetbox@gmail.com>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/20210104153046.19993-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ sound/pci/hda/hda_intel.c |  2 --
+ sound/pci/hda/patch_via.c | 13 +++++++++++++
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
+index 6852668f1bcb..770ad25f1907 100644
+--- a/sound/pci/hda/hda_intel.c
++++ b/sound/pci/hda/hda_intel.c
+@@ -2220,8 +2220,6 @@ static const struct snd_pci_quirk power_save_denylist[] = {
+ 	SND_PCI_QUIRK(0x1849, 0x7662, "Asrock H81M-HDS", 0),
+ 	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
+ 	SND_PCI_QUIRK(0x1043, 0x8733, "Asus Prime X370-Pro", 0),
+-	/* https://bugzilla.redhat.com/show_bug.cgi?id=1581607 */
+-	SND_PCI_QUIRK(0x1558, 0x3501, "Clevo W35xSS_370SS", 0),
+ 	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
+ 	SND_PCI_QUIRK(0x1558, 0x6504, "Clevo W65_67SB", 0),
+ 	/* https://bugzilla.redhat.com/show_bug.cgi?id=1525104 */
+diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
+index 7ef8f3105cdb..0ab40a8a68fb 100644
+--- a/sound/pci/hda/patch_via.c
++++ b/sound/pci/hda/patch_via.c
+@@ -1002,6 +1002,7 @@ static const struct hda_verb vt1802_init_verbs[] = {
+ enum {
+ 	VIA_FIXUP_INTMIC_BOOST,
+ 	VIA_FIXUP_ASUS_G75,
++	VIA_FIXUP_POWER_SAVE,
+ };
+
+ static void via_fixup_intmic_boost(struct hda_codec *codec,
+@@ -1011,6 +1012,13 @@ static void via_fixup_intmic_boost(struct hda_codec *codec,
+ 		override_mic_boost(codec, 0x30, 0, 2, 40);
+ }
+
++static void via_fixup_power_save(struct hda_codec *codec,
++				 const struct hda_fixup *fix, int action)
++{
++	if (action == HDA_FIXUP_ACT_PRE_PROBE)
++		codec->power_save_node = 0;
++}
++
+ static const struct hda_fixup via_fixups[] = {
+ 	[VIA_FIXUP_INTMIC_BOOST] = {
+ 		.type = HDA_FIXUP_FUNC,
+@@ -1025,11 +1033,16 @@ static const struct hda_fixup via_fixups[] = {
+ 			{ }
+ 		}
+ 	},
++	[VIA_FIXUP_POWER_SAVE] = {
++		.type = HDA_FIXUP_FUNC,
++		.v.func = via_fixup_power_save,
++	},
+ };
+
+ static const struct snd_pci_quirk vt2002p_fixups[] = {
+ 	SND_PCI_QUIRK(0x1043, 0x1487, "Asus G75", VIA_FIXUP_ASUS_G75),
+ 	SND_PCI_QUIRK(0x1043, 0x8532, "Asus X202E", VIA_FIXUP_INTMIC_BOOST),
++	SND_PCI_QUIRK(0x1558, 0x3501, "Clevo W35xSS_370SS", VIA_FIXUP_POWER_SAVE),
+ 	{}
+ };
+
+-- 
+2.29.2
+

0001-ARM-fix-__get_user_check-in-case-uaccess_-calls-are-.patch

@@ -51,10 +51,10 @@ Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
-index 98c6b91be4a8..60055827dddc 100644
+index b5fdd30252f8..d43ceaa78269 100644
 --- a/arch/arm/include/asm/uaccess.h
 +++ b/arch/arm/include/asm/uaccess.h
-@@ -191,11 +191,12 @@ extern int __get_user_64t_4(void *);
+@@ -195,11 +195,12 @@ extern int __get_user_64t_4(void *);
  #define __get_user_check(x, p)						\
  	({								\
  		unsigned long __limit = current_thread_info()->addr_limit - 1; \
@@ -68,7 +68,7 @@ index 98c6b91be4a8..60055827dddc 100644
  		switch (sizeof(*(__p))) {				\
  		case 1:							\
  			if (sizeof((x)) >= 8)				\
-@@ -223,9 +224,10 @@ extern int __get_user_64t_4(void *);
+@@ -227,9 +228,10 @@ extern int __get_user_64t_4(void *);
  			break;						\
  		default: __e = __get_user_bad(); break;			\
  		}							\
@@ -82,5 +82,5 @@ index 98c6b91be4a8..60055827dddc 100644
 
  #define get_user(x, p)							\
 -- 
-2.26.2
+2.28.0
 

0001-ARM-tegra-usb-no-reset.patch

@@ -10,7 +10,7 @@ Patch for disconnect issues with storage attached to a
  1 file changed, 7 insertions(+)
 
 diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
-index b1e14beaac5f..b28779779058 100644
+index 052d5accfe9b..fac58cf619da 100644
 --- a/drivers/usb/core/hub.c
 +++ b/drivers/usb/core/hub.c
 @@ -5517,6 +5517,13 @@ static void hub_event(struct work_struct *work)
@@ -28,5 +28,5 @@ index b1e14beaac5f..b28779779058 100644
  	 * disconnected while waiting for the lock to succeed. */
  	usb_lock_device(hdev);
 -- 
-2.26.2
+2.28.0
 

0001-Add-Red-Hat-tainting.patch

@@ -1,240 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Wed, 13 Nov 2019 14:44:31 -0500
-Subject: [PATCH] Add Red Hat tainting
-
-Message-id: <20191113144431.9403-5-labbott@redhat.com>
-Patchwork-id: 286078
-O-Subject: [ARK INTERNAL PATCHv2 4/4] [redhat] Add Red Hat tainting
-Bugzilla:
-RH-Acked-by: Don Zickus <dzickus@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-
-This is a combination of the following commits including support
-for adding CONFIG_RH_DEPRECATED support
-
-rh_taint: add support
-
-Message-id: <1524831536-47239-1-git-send-email-darcari@redhat.com>
-Patchwork-id: 211655
-O-Subject: [RHEL8.0 BZ 1565704 v2] rh_taint: add support
-Bugzilla: 1565704
-RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-
-Bugzilla: http://bugzilla.redhat.com/1565704
-Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=15910441
-Upstream: RHEL Only
-Test: Sanity boot of brew build.  Previous private build testing of functions.
-
-rh_taint.c adds the following functions which are utilized by Red Hat to
-indicate limited or no support for hardware and/or drivers.
-
-mark_hardware_unsupported
-mark_hardware_deprecated
-mark_tech_preview
-
-See code comments for usage.
-
-RHEL8 change: TAINT_AUX will be used in place of TAINT_TECH_PREVIEW as it
-limits the number RHEL only changes that must be made to the kernel.
-
-If at a later date it is determined that additional flags are required,
-the associated RHEL only infrastructure can be added at that time.
-
-Cc: David Arcari <darcari@redhat.com>
-Cc: Josh Poimboeuf <jpoimboe@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-rh_taint: add support for marking driver as unsupported
-
-Message-id: <f42d35b07bd02f34b14a6341a219c80b21a8aff9.1524523802.git.jtoppins@redhat.com>
-Patchwork-id: 211020
-O-Subject: [RHEL8.0] rh_taint: add support for marking driver as unsupported
-Bugzilla: 1565704
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-RH-Acked-by: David Arcari <darcari@redhat.com>
-
-In some cases a driver needs to be enabled by Red Hat to support internal
-testing but the driver is not intended to be supported on customer hardware.
-This adds a function "make_driver_unsupported()" to facilitate such
-situations. The function will print a kernel log message.
-
-Bugzilla: 1565704
-Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=15873552
-Tested: compile only
-
-Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-rh_taint: correct loaddable module support dependencies
-
-Message-id: <20181123111337.26898-5-prudo@redhat.com>
-Patchwork-id: 233658
-O-Subject: [ARK PATCH RESEND v2 4/8] [kernel] rh_taint: correct loaddable module support dependencies
-Bugzilla: 1652266
-RH-Acked-by: Jakub Racek <jracek@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
-
-Bugzilla: 1652266
-Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=19252944
-Upstream Status: RHEL_only
-
-The kernel configuration for the s390/zfcpdump kernel variant turns
-loaddable module support off.  The build breaks in rh_taint.c due to
-compiler errors caused by dereferencing struct module variables which
-is just a declaration if CONFIG_MODULES is not set.
-
-To solve this build break, access struct module members only if
-CONFIG_MODULES is enabled.
-
-Upstream Status: RHEL only
-Signed-off-by: Philipp Rudo <prudo@redhat.com>
----
- include/linux/kernel.h | 15 +++++++
- kernel/Makefile        |  2 +
- kernel/rh_taint.c      | 93 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 110 insertions(+)
- create mode 100644 kernel/rh_taint.c
-
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 82d91547d122..b82db0c0caec 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -1038,4 +1038,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
- 	 /* OTHER_WRITABLE?  Generally considered a bad idea. */		\
- 	 BUILD_BUG_ON_ZERO((perms) & 2) +					\
- 	 (perms))
-+
-+struct module;
-+
-+#ifdef CONFIG_RH_DISABLE_DEPRECATED
-+void mark_hardware_unsupported(const char *msg);
-+void mark_hardware_deprecated(const char *msg);
-+void mark_tech_preview(const char *msg, struct module *mod);
-+void mark_driver_unsupported(const char *name);
-+#else
-+static inline void mark_hardware_unsupported(const char *msg) { }
-+static inline void mark_hardware_deprecated(const char *msg) { }
-+static inline void mark_tech_preview(const char *msg, struct module *mod) { }
-+static inline void mark_driver_unsupported(const char *name) { }
-+#endif
-+
- #endif
-diff --git a/kernel/Makefile b/kernel/Makefile
-index f3218bc5ec69..c0a4904413b5 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -12,6 +12,8 @@ obj-y     = fork.o exec_domain.o panic.o \
- 	    notifier.o ksysfs.o cred.o reboot.o \
- 	    async.o range.o smpboot.o ucount.o
-
-+obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o
-+
- obj-$(CONFIG_MODULES) += kmod.o
- obj-$(CONFIG_MULTIUSER) += groups.o
-
-diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c
-new file mode 100644
-index 000000000000..8d1641710ed7
---- /dev/null
-+++ b/kernel/rh_taint.c
-@@ -0,0 +1,93 @@
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+/*
-+ * The following functions are used by Red Hat to indicate to users that
-+ * hardware and drivers are unsupported, or have limited support in RHEL major
-+ * and minor releases.  These functions output loud warning messages to the end
-+ * user and should be USED WITH CAUTION.
-+ *
-+ * Any use of these functions _MUST_ be documented in the RHEL Release Notes,
-+ * and have approval of management.
-+ */
-+
-+/**
-+ * mark_hardware_unsupported() - Mark hardware, class, or type as unsupported.
-+ * @msg: Hardware name, class, or type
-+ *
-+ * Called to mark a device, class of devices, or types of devices as not having
-+ * support in any RHEL minor release.  This does not TAINT the kernel.  Red Hat
-+ * will not fix bugs against this hardware in this minor release.  Red Hat may
-+ * declare support in a future major or minor update release.  This cannot be
-+ * used to mark drivers unsupported.
-+ */
-+void mark_hardware_unsupported(const char *msg)
-+{
-+	/* Print one single message */
-+	pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://hardware.redhat.com for certified hardware.\n", msg);
-+}
-+EXPORT_SYMBOL(mark_hardware_unsupported);
-+
-+/**
-+ * mark_hardware_deprecated() - Mark hardware, class, or type as deprecated.
-+ * @msg: Hardware name, class, or type
-+ *
-+ * Called to minimize the support status of a previously supported device in
-+ * a minor release.  This does not TAINT the kernel.  Marking hardware
-+ * deprecated is usually done in conjunction with the hardware vendor.  Future
-+ * RHEL major releases may not include this driver.  Driver updates and fixes
-+ * for this device will be limited to critical issues in future minor releases.
-+ */
-+void mark_hardware_deprecated(const char *msg)
-+{
-+	pr_crit("Warning: %s - this hardware is not recommended for new deployments. It continues to be supported in this RHEL release, but it is likely to be removed in the next major release. Driver updates and fixes for this device will be limited to critical issues. Please contact Red Hat Support or your device's hardware vendor for additional information.\n", msg);
-+}
-+EXPORT_SYMBOL(mark_hardware_deprecated);
-+
-+/**
-+ * mark_tech_preview() - Mark driver or kernel subsystem as 'Tech Preview'
-+ * @msg: Driver or kernel subsystem name
-+ *
-+ * Called to minimize the support status of a new driver.  This does TAINT the
-+ * kernel.  Calling this function indicates that the driver or subsystem has
-+ * had limited testing and is not marked for full support within this RHEL
-+ * minor release.  The next RHEL minor release may contain full support for
-+ * this driver.  Red Hat does not guarantee that bugs reported against this
-+ * driver or subsystem will be resolved.
-+ */
-+void mark_tech_preview(const char *msg, struct module *mod)
-+{
-+	const char *str = NULL;
-+
-+	if (msg)
-+		str = msg;
-+#ifdef CONFIG_MODULES
-+	else if (mod && mod->name)
-+		str = mod->name;
-+#endif
-+
-+	pr_warn("TECH PREVIEW: %s may not be fully supported.\n"
-+		"Please review provided documentation for limitations.\n",
-+		(str ? str : "kernel"));
-+	add_taint(TAINT_AUX, LOCKDEP_STILL_OK);
-+#ifdef CONFIG_MODULES
-+	if (mod)
-+		mod->taints |= (1U << TAINT_AUX);
-+#endif
-+}
-+EXPORT_SYMBOL(mark_tech_preview);
-+
-+/**
-+ * mark_driver_unsupported - drivers that we know we don't want to support
-+ * @name: the name of the driver
-+ *
-+ * In some cases Red Hat has chosen to build a driver for internal QE
-+ * use. Use this function to mark those drivers as unsupported for
-+ * customers.
-+ */
-+void mark_driver_unsupported(const char *name)
-+{
-+	pr_crit("Warning: %s - This driver has not undergone sufficient testing by Red Hat for this release and therefore cannot be used in production systems.\n",
-+	        name ? name : "kernel");
-+}
-+EXPORT_SYMBOL(mark_driver_unsupported);
--- 
-2.26.2
-

0001-Add-efi_status_to_str-and-rework-efi_status_to_err.patch

@@ -160,7 +160,7 @@ index fdd1db025dbf..8ef7d1df09dd 100644
 
  static DEFINE_SPINLOCK(efi_mem_reserve_persistent_lock);
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 05c47f857383..2e2f9f608f68 100644
+index 73db1ae04cef..92aa4697f558 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
 @@ -43,6 +43,8 @@
@@ -172,7 +172,7 @@ index 05c47f857383..2e2f9f608f68 100644
  typedef unsigned long efi_status_t;
  typedef u8 efi_bool_t;
  typedef u16 efi_char16_t;		/* UNICODE character */
-@@ -828,6 +830,7 @@ static inline bool efi_rt_services_supported(unsigned int mask)
+@@ -832,6 +834,7 @@ static inline bool efi_rt_services_supported(unsigned int mask)
  #endif
 
  extern int efi_status_to_err(efi_status_t status);
@@ -181,5 +181,5 @@ index 05c47f857383..2e2f9f608f68 100644
  /*
   * Variable Attributes
 -- 
-2.26.2
+2.28.0
 

0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch

@@ -16,7 +16,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 2e0700a451e5..77e7e749d7e5 100644
+index 74c5325108c0..5aa22996be8c 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -1133,6 +1133,7 @@ config XEN
@@ -28,5 +28,5 @@ index 2e0700a451e5..77e7e749d7e5 100644
  	default "11"
  	help
 -- 
-2.26.2
+2.28.0
 

0001-Add-support-for-deprecating-processors.patch

@@ -1,303 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Wed, 13 Nov 2019 14:44:30 -0500
-Subject: [PATCH] Add support for deprecating processors
-
-Message-id: <20191113144431.9403-4-labbott@redhat.com>
-Patchwork-id: 286081
-O-Subject: [ARK INTERNAL PATCHv2 3/4] [redhat] Add support for deprecating processors
-Bugzilla:
-RH-Acked-by: Don Zickus <dzickus@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-
-This is the squashed version of the following patches
-modifed to use the new CONFIG_RH_DISABLE_DEPRECATED option
-
-add rh_check_supported
-
-Message-id: <1525313397-75200-1-git-send-email-darcari@redhat.com>
-Patchwork-id: 212189
-O-Subject: [RHEL8.0 BZ 1565717 v2] x86: add rh_check_supported
-Bugzilla: 1565717
-RH-Acked-by: Steve Best <sbest@redhat.com>
-RH-Acked-by: Mikulas Patocka <mpatocka@redhat.com>
-
-Description:
-
-Add code to verify that the booted x86 processor is supported by
-Red Hat.  In cases where the processor is not supported a critical
-message is logged.
-
-Initially the supported set of processors for RHEL8 remains the same
-as RHEL7.
-
-Bugzilla: http://bugzilla.redhat.com/1565717
-Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=15966242
-
-Test: Booted brew build on supported (Haswell) and unsupported processor (CNL)
-      and achieved desired results.
-
-Upstream: RHEL Only
-
-Cc: David Arcari <darcari@redhat.com>
-Cc: Mikulas Patocka <mpatocka@redhat.com>
-Cc: Dave Young <dyoung@redhat.com>
-Cc: Josh Poimboeuf <jpoimboe@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-update rh_check_supported processor list
-
-Message-id: <1530618602-17477-1-git-send-email-darcari@redhat.com>
-Patchwork-id: 223452
-O-Subject: [RHEL8.0 BZ 1595918] x86: update rh_check_supported processor list
-Bugzilla: 1595918
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Steve Best <sbest@redhat.com>
-
-Bugzilla: http://bugzilla.redhat.com/1595918
-Upstream Status: RHEL_only
-Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16916208
-Tested: Verified on a varity of supported and unsupported Intel and AMD systems.
-	Results as expected.
-
-In RHEL8, we are marking some of the older processors as unsupported. No code
-is being removed; however, the older processors are not supported and as such
-are not candidates for certification.
-
-Cc: David Arcari <darcari@redhat.com>
-Cc: Prarit Bhargava <prarit@redhat.com>
-Cc: Steve Best <sbest@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-Signed-off-by: Jakub Racek <jracek@redhat.com>
-refresh: rename FAM6_ATOM again, see f2c4db1bd
-
-mark whiskey-lake processor supported
-
-Message-id: <1533125629-12870-1-git-send-email-darcari@redhat.com>
-Patchwork-id: 225809
-O-Subject: [ BZ 1609604] mark whiskey-lake processor supported
-Bugzilla: 1609604
-RH-Acked-by: Steve Best <sbest@redhat.com>
-RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-
-Bugzilla: http://bugzilla.redhat.com/1609604
-Build Info: https://brewweb.devel.redhat.com/taskinfo?taskID=17474338
-Upstream Status: RHEL Only
-Tested: Successful excecution of platform-test suite.
-
-Whiskey Lake is cpu model 142 with stepping 11.  Stepping > 11 for cpu model
-142 is not supported.
-
-For model 158, the highest supported stepping is 10.
-
-Cc: Prarit Bhargava <prarit@redhat.com>
-Cc: David Arcari <darcari@redhat.com>
-Cc: Dave Young <dyoung@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-mark intel knights landing and knights mill unsupported
-
-Message-id: <1533580277-126323-1-git-send-email-darcari@redhat.com>
-Patchwork-id: 226187
-O-Subject: [RHEL8.0 BZ 1610493] mark intel knights landing and knights mill unsupported
-Bugzilla: 1610493
-RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Steve Best <sbest@redhat.com>
-
-Bugzilla: http://bugzilla.redhat.com/1610493
-Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=17625348
-
-Tested: verified on KNL/KNM system
-Upstream Status: RHEL Only
-Depends: http://bugzilla.redhat.com/1609604
-
-We are marking KNL/KNM processors as unsupported. No code is being removed;
-however, the older processors are not supported and as such are not
-candidates for certification.
-
-Upstream Status: RHEL only
-Cc: Prarit Bhargava <prarit@redhat.com>
-Cc: David Arcari <darcari@redhat.com>
-Cc: Dave Young <dyoung@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- arch/x86/kernel/cpu/common.c |   1 +
- arch/x86/kernel/setup.c      | 132 ++++++++++++++++++++++++++++++++++-
- 2 files changed, 132 insertions(+), 1 deletion(-)
-
-diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 95c090a45b4b..bcc6d2df56c0 100644
---- a/arch/x86/kernel/cpu/common.c
-+++ b/arch/x86/kernel/cpu/common.c
-@@ -1236,6 +1236,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
- 		cpu_detect(c);
- 		get_cpu_vendor(c);
- 		get_cpu_cap(c);
-+		get_model_name(c); /* RHEL: get model name for unsupported check */
- 		get_cpu_address_sizes(c);
- 		setup_force_cpu_cap(X86_FEATURE_CPUID);
-
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index a3767e74c758..a1b8cb9a2579 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -44,6 +44,7 @@
- #include <asm/unwind.h>
- #include <asm/vsyscall.h>
- #include <linux/vmalloc.h>
-+#include <asm/intel-family.h>
-
- /*
-  * max_low_pfn_mapped: highest directly mapped pfn < 4 GB
-@@ -753,7 +754,132 @@ static void __init trim_low_memory_range(void)
- {
- 	memblock_reserve(0, ALIGN(reserve_low, PAGE_SIZE));
- }
--	
-+
-+static bool valid_amd_processor(__u8 family, const char *model_id)
-+{
-+	bool valid;
-+
-+	switch(family) {
-+	case 0x15:
-+		valid = true;
-+		break;
-+
-+	case 0x17:
-+		valid = strstr(model_id, "AMD EPYC 7");
-+		break;
-+
-+	default:
-+		valid = false;
-+		break;
-+	}
-+
-+	return valid;
-+}
-+
-+static bool valid_intel_processor(__u8 family, __u8 model, __u8 stepping)
-+{
-+	bool valid;
-+
-+	if (family != 6)
-+		return false;
-+
-+	switch(model) {
-+	case INTEL_FAM6_ATOM_GOLDMONT_D:
-+	case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
-+
-+	case INTEL_FAM6_BROADWELL:
-+	case INTEL_FAM6_BROADWELL_G:
-+	case INTEL_FAM6_BROADWELL_X:
-+	case INTEL_FAM6_BROADWELL_D:
-+
-+	case INTEL_FAM6_HASWELL:
-+	case INTEL_FAM6_HASWELL_G:
-+	case INTEL_FAM6_HASWELL_L:
-+	case INTEL_FAM6_HASWELL_X:
-+		valid = true;
-+		break;
-+
-+	case INTEL_FAM6_KABYLAKE:
-+		valid = (stepping <= 10);
-+		break;
-+
-+	case INTEL_FAM6_KABYLAKE_L:
-+		valid = (stepping <= 11);
-+		break;
-+
-+	case INTEL_FAM6_SKYLAKE_L:
-+	case INTEL_FAM6_SKYLAKE:
-+	case INTEL_FAM6_SKYLAKE_X:
-+		/* stepping > 4 is Cascade Lake and is not supported */
-+		valid = (stepping <= 4);
-+		break;
-+
-+	default:
-+		valid = false;
-+		break;
-+	}
-+
-+	return valid;
-+}
-+
-+static void rh_check_supported(void)
-+{
-+	bool guest;
-+
-+	guest = (x86_hyper_type != X86_HYPER_NATIVE || boot_cpu_has(X86_FEATURE_HYPERVISOR));
-+
-+	/* RHEL supports single cpu on guests only */
-+	if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
-+	    !guest && is_kdump_kernel()) {
-+		pr_crit("Detected single cpu native boot.\n");
-+		pr_crit("Important:  In this kernel, single threaded, single CPU 64-bit physical systems are unsupported.");
-+	}
-+
-+	/*
-+	 * If the RHEL kernel does not support this hardware, the kernel will
-+	 * attempt to boot, but no support is provided for this hardware
-+	 */
-+	switch (boot_cpu_data.x86_vendor) {
-+	case X86_VENDOR_AMD:
-+		if (!valid_amd_processor(boot_cpu_data.x86,
-+					 boot_cpu_data.x86_model_id)) {
-+			pr_crit("Detected CPU family %xh model %d\n",
-+				boot_cpu_data.x86,
-+				boot_cpu_data.x86_model);
-+			mark_hardware_unsupported("AMD Processor");
-+		}
-+		break;
-+
-+	case X86_VENDOR_INTEL:
-+		if (!valid_intel_processor(boot_cpu_data.x86,
-+					   boot_cpu_data.x86_model,
-+					   boot_cpu_data.x86_stepping)) {
-+			pr_crit("Detected CPU family %d model %d stepping %d\n",
-+				boot_cpu_data.x86,
-+				boot_cpu_data.x86_model,
-+				boot_cpu_data.x86_stepping);
-+			mark_hardware_unsupported("Intel Processor");
-+		}
-+		break;
-+
-+	default:
-+		pr_crit("Detected processor %s %s\n",
-+			boot_cpu_data.x86_vendor_id,
-+			boot_cpu_data.x86_model_id);
-+		mark_hardware_unsupported("Processor");
-+		break;
-+	}
-+
-+	/*
-+	 * Due to the complexity of x86 lapic & ioapic enumeration, and PCI IRQ
-+	 * routing, ACPI is required for x86.  acpi=off is a valid debug kernel
-+	 * parameter, so just print out a loud warning in case something
-+	 * goes wrong (which is most of the time).
-+	 */
-+	if (acpi_disabled && !guest)
-+		pr_crit("ACPI has been disabled or is not available on this hardware.  This may result in a single cpu boot, incorrect PCI IRQ routing, or boot failure.\n");
-+}
-+
- /*
-  * Dump out kernel offset information on panic.
-  */
-@@ -1250,6 +1376,10 @@ void __init setup_arch(char **cmdline_p)
- 		efi_apply_memmap_quirks();
- #endif
-
-+#ifdef CONFIG_RH_DISABLE_DEPRECATED
-+	rh_check_supported();
-+#endif
-+
- 	unwind_init();
- }
-
--- 
-2.26.2
-

0001-Drop-that-for-now.patch

@@ -4,22 +4,21 @@ Date: Wed, 23 Jan 2019 14:36:37 +0100
 Subject: [PATCH] Drop that for now
 
 ---
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Makefile | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index 37cfb39d77af..c65a263990ae 100644
+index b70997f7ddf9..680d906eee35 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -496,7 +496,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
- KBUILD_CFLAGS   := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \
+@@ -496,6 +496,7 @@ KBUILD_CFLAGS   := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \
  		   -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \
  		   -Werror=implicit-function-declaration -Werror=implicit-int \
--		   -Wno-format-security \
-+		   -Wno-format-security -Wno-address-of-packed-member \
+ 		   -Werror=return-type -Wno-format-security \
++		   -Wno-address-of-packed-member \
  		   -std=gnu89
  KBUILD_CPPFLAGS := -D__KERNEL__
  KBUILD_AFLAGS_KERNEL :=
 -- 
-2.26.2
+2.28.0
 

0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch

@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Fri, 10 Jul 2020 16:18:59 +0100
-Subject: [PATCH] Fixes "acpi: prefer booting with ACPI over DTS" to be RHEL
- only
-
-The ACPI prefernce is RHEL specific, in Fedora we use upstream defaults so
-it doesn't randomly change the expectations as to how certain hardware works
-that generally isn't classed as "enterprise". So wrap it in the special RHEL
-check as it should be for the ARK kernels.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
-CC: Mark Salter <msalter@redhat.com>
----
- arch/arm64/kernel/acpi.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
-index c2a7e30e2143..169b753903d1 100644
---- a/arch/arm64/kernel/acpi.c
-+++ b/arch/arm64/kernel/acpi.c
-@@ -40,7 +40,11 @@ int acpi_pci_disabled = 1;	/* skip ACPI PCI scan and IRQ initialization */
- EXPORT_SYMBOL(acpi_pci_disabled);
-
- static bool param_acpi_off __initdata;
-+#ifdef CONFIG_RHEL_DIFFERENCES
- static bool param_acpi_on __initdata = true;
-+#else
-+static bool param_acpi_on __initdata;
-+#endif
- static bool param_acpi_force __initdata;
-
- static int __init parse_acpi(char *arg)
--- 
-2.26.2
-

0001-IB-rxe-Mark-Soft-RoCE-Transport-driver-as-tech-previ.patch

@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Don Dutile <ddutile@redhat.com>
-Date: Tue, 24 Jul 2018 22:29:16 -0400
-Subject: [PATCH] IB/rxe: Mark Soft-RoCE Transport driver as tech-preview
-
-Message-id: <20180724222916.19362-1-ddutile@redhat.com>
-Patchwork-id: 225418
-O-Subject: [PATCH RHEL-8.0] IB/rxe: Mark Soft-RoCE Transport driver as tech-preview.
-Bugzilla: 1605216
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
-RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-RH-Acked-by: Honggang Li <honli@redhat.com>
-
-The Soft-RoCE driver implements the InfiniBand RDMA transport
-over the Linux network stack. It enables a system with a
-standard Ethernet adapter to interoperate with a RoCE
-adapter or with another system running the RXE driver.
-
-Unfortunately, a wide range of tests and/or use-cases have shown
-that the driver is not ready for enterprise use, and upstream bug
-fixing may not be complete for RHEL-8.0.
-Thus, recommendation from driver maintainer is to mark it as
-tech-preview.  It is expected that future bug fixes will enable it
-to be upgraded to fully supported.  In the mean time, it works
-in a number of use cases, and can be used to demonstrate upstream
-fixes on failing cases.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1605216
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=17344161
-
-Testing:
-Simple boot test, and loading of rxe driver to show tech-preview
-msg is generated in dmesg log.
-
-Upstream Status: RHEL only
-Signed-off-by: Donald Dutile <ddutile@redhat.com
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- drivers/infiniband/sw/rxe/rxe.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/infiniband/sw/rxe/rxe.c b/drivers/infiniband/sw/rxe/rxe.c
-index 5642eefb4ba1..01c8d750b9e0 100644
---- a/drivers/infiniband/sw/rxe/rxe.c
-+++ b/drivers/infiniband/sw/rxe/rxe.c
-@@ -336,6 +336,8 @@ static int __init rxe_module_init(void)
- {
- 	int err;
-
-+	mark_tech_preview("Soft-RoCE Transport Driver", THIS_MODULE);
-+
- 	/* initialize slab caches for managed objects */
- 	err = rxe_cache_init();
- 	if (err) {
--- 
-2.26.2
-

0001-Input-rmi4-remove-the-need-for-artificial-IRQ-in-cas.patch

@@ -113,7 +113,7 @@ index 8cffa84c9650..6c4e3675601a 100644
 -	}
 -
  	if (data->device_flags & RMI_DEVICE_HAS_PHYS_BUTTONS)
- 		rmi_hid_pdata.f30_data.disable = true;
+ 		rmi_hid_pdata.gpio_data.disable = true;
 
  	data->xport.dev = hdev->dev.parent;
  	data->xport.pdata = rmi_hid_pdata;
@@ -314,7 +314,7 @@ index 258d5fe3d395..f7298e3dc8f3 100644
  	if (data->f01_container->dev.driver) {
  		/* Driver already bound, so enable ATTN now. */
 diff --git a/include/linux/rmi.h b/include/linux/rmi.h
-index 7b22366d0065..307a651b2755 100644
+index 8ed37f93f3c8..d7ad35a15acb 100644
 --- a/include/linux/rmi.h
 +++ b/include/linux/rmi.h
 @@ -363,6 +363,7 @@ struct rmi_driver_data {
@@ -326,5 +326,5 @@ index 7b22366d0065..307a651b2755 100644
 
  int rmi_register_transport_device(struct rmi_transport_dev *xport);
 -- 
-2.26.2
+2.28.0
 

0001-Introduce-CONFIG_RH_DISABLE_DEPRECATED.patch

@@ -1,64 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Wed, 13 Nov 2019 14:44:28 -0500
-Subject: [PATCH] Introduce CONFIG_RH_DISABLE_DEPRECATED
-
-Message-id: <20191113144431.9403-2-labbott@redhat.com>
-Patchwork-id: 286080
-O-Subject: [ARK INTERNAL PATCHv2 1/4] [redhat] Introduce CONFIG_RH_DISABLE_DEPRECATED
-Bugzilla:
-RH-Acked-by: Don Zickus <dzickus@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-
-For many drivers that RHEL doesn't want to support, we've typically deleted
-PCI ids from the tree. This precludes those drivers from being used at all
-which is fine for RHEL but a problem if we want to use a similar source base
-for Fedora. Instead of just deleting IDs, introduce a config
-CONFIG_RH_DISABLE_DEPRECATED. This way RHEL can remove IDs while still allowing
-kernels to be built with the option off from the same source.
-
-Upstream Status: RHEL only
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- Kconfig        |  2 ++
- Kconfig.redhat | 17 +++++++++++++++++
- 2 files changed, 19 insertions(+)
- create mode 100644 Kconfig.redhat
-
-diff --git a/Kconfig b/Kconfig
-index 745bc773f567..f57ff40109d7 100644
---- a/Kconfig
-+++ b/Kconfig
-@@ -30,3 +30,5 @@ source "lib/Kconfig"
- source "lib/Kconfig.debug"
-
- source "Documentation/Kconfig"
-+
-+source "Kconfig.redhat"
-diff --git a/Kconfig.redhat b/Kconfig.redhat
-new file mode 100644
-index 000000000000..733a26bd887a
---- /dev/null
-+++ b/Kconfig.redhat
-@@ -0,0 +1,17 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+#
-+# Red Hat specific options
-+#
-+
-+menu "Red Hat options"
-+
-+config RH_DISABLE_DEPRECATED
-+	bool "Remove support for deprecated features"
-+	help
-+	  Red Hat may choose to deprecate certain features in its kernels.
-+	  Enable this option to remove support for hardware that is no
-+	  longer supported.
-+
-+	  Unless you want a restricted kernel, say N here.
-+
-+endmenu
--- 
-2.26.2
-

0001-KEYS-Make-use-of-platform-keyring-for-module-signatu.patch

@@ -40,5 +40,5 @@ index 9d9fc678c91d..84ad75a53c83 100644
 +	return ret;
  }
 -- 
-2.26.2
+2.28.0
 

0001-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch

@@ -36,5 +36,5 @@ index 253fb9a7fc98..8c95b68d86d4 100644
  	}
 
 -- 
-2.26.2
+2.28.0
 

0001-PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch

@@ -0,0 +1,241 @@
+From ec7b5bf1cc1444d9ad13bcef0f0f8d48ff9c0203 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sat, 19 Dec 2020 14:10:40 +0000
+Subject: [PATCH] PCI: Add MCFG quirks for Tegra194 host controllers
+
+The PCIe controller in Tegra194 SoC is not completely ECAM-compliant.
+With the current hardware design limitations in place, ECAM can be enabled
+only for one controller (C5 controller to be precise) with bus numbers
+starting from 160 instead of 0. A different approach is taken to avoid this
+abnormal way of enabling ECAM for just one controller but to enable
+configuration space access for all the other controllers. In this approach,
+ops are added through MCFG quirk mechanism which access the configuration
+spaces by dynamically programming iATU (internal AddressTranslation Unit)
+to generate respective configuration accesses just like the way it is
+done in DesignWare core sub-system.
+
+Signed-off-by: Vidya Sagar <vidyas@nvidia.com>
+Acked-by: Thierry Reding <treding@nvidia.com>
+[ Updated by jonathanh@nvidia.com only permit building the Tegra194
+  PCIe driver into the kernel and not as a module ]
+Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ drivers/acpi/pci_mcfg.c                    |   7 ++
+ drivers/pci/controller/dwc/Kconfig         |  10 +-
+ drivers/pci/controller/dwc/Makefile        |   2 +-
+ drivers/pci/controller/dwc/pcie-tegra194.c | 102 +++++++++++++++++++++
+ include/linux/pci-ecam.h                   |   1 +
+ 5 files changed, 117 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c
+index 95f23acd5b80..53cab975f612 100644
+--- a/drivers/acpi/pci_mcfg.c
++++ b/drivers/acpi/pci_mcfg.c
+@@ -116,6 +116,13 @@ static struct mcfg_fixup mcfg_quirks[] = {
+ 	THUNDER_ECAM_QUIRK(2, 12),
+ 	THUNDER_ECAM_QUIRK(2, 13),
+ 
++	{ "NVIDIA", "TEGRA194", 1, 0, MCFG_BUS_ANY, &tegra194_pcie_ops},
++	{ "NVIDIA", "TEGRA194", 1, 1, MCFG_BUS_ANY, &tegra194_pcie_ops},
++	{ "NVIDIA", "TEGRA194", 1, 2, MCFG_BUS_ANY, &tegra194_pcie_ops},
++	{ "NVIDIA", "TEGRA194", 1, 3, MCFG_BUS_ANY, &tegra194_pcie_ops},
++	{ "NVIDIA", "TEGRA194", 1, 4, MCFG_BUS_ANY, &tegra194_pcie_ops},
++	{ "NVIDIA", "TEGRA194", 1, 5, MCFG_BUS_ANY, &tegra194_pcie_ops},
++
+ #define XGENE_V1_ECAM_MCFG(rev, seg) \
+ 	{"APM   ", "XGENE   ", rev, seg, MCFG_BUS_ANY, \
+ 		&xgene_v1_pcie_ecam_ops }
+diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
+index bc049865f8e0..c5d40951a6ad 100644
+--- a/drivers/pci/controller/dwc/Kconfig
++++ b/drivers/pci/controller/dwc/Kconfig
+@@ -248,25 +248,27 @@ config PCI_MESON
+ 	  implement the driver.
+ 
+ config PCIE_TEGRA194
+-	tristate
++	bool
+ 
+ config PCIE_TEGRA194_HOST
+-	tristate "NVIDIA Tegra194 (and later) PCIe controller - Host Mode"
++	bool "NVIDIA Tegra194 (and later) PCIe controller - Host Mode"
+ 	depends on ARCH_TEGRA_194_SOC || COMPILE_TEST
+ 	depends on PCI_MSI_IRQ_DOMAIN
+ 	select PCIE_DW_HOST
+ 	select PHY_TEGRA194_P2U
+ 	select PCIE_TEGRA194
++	default y if ARCH_TEGRA_194_SOC
+ 	help
+ 	  Enables support for the PCIe controller in the NVIDIA Tegra194 SoC to
+ 	  work in host mode. There are two instances of PCIe controllers in
+ 	  Tegra194. This controller can work either as EP or RC. In order to
+ 	  enable host-specific features PCIE_TEGRA194_HOST must be selected and
+ 	  in order to enable device-specific features PCIE_TEGRA194_EP must be
+-	  selected. This uses the DesignWare core.
++	  selected. This uses the DesignWare core. ACPI platforms with Tegra194
++	  don't need to enable this.
+ 
+ config PCIE_TEGRA194_EP
+-	tristate "NVIDIA Tegra194 (and later) PCIe controller - Endpoint Mode"
++	bool "NVIDIA Tegra194 (and later) PCIe controller - Endpoint Mode"
+ 	depends on ARCH_TEGRA_194_SOC || COMPILE_TEST
+ 	depends on PCI_ENDPOINT
+ 	select PCIE_DW_EP
+diff --git a/drivers/pci/controller/dwc/Makefile b/drivers/pci/controller/dwc/Makefile
+index a751553fa0db..dbb981876556 100644
+--- a/drivers/pci/controller/dwc/Makefile
++++ b/drivers/pci/controller/dwc/Makefile
+@@ -17,7 +17,6 @@ obj-$(CONFIG_PCIE_INTEL_GW) += pcie-intel-gw.o
+ obj-$(CONFIG_PCIE_KIRIN) += pcie-kirin.o
+ obj-$(CONFIG_PCIE_HISI_STB) += pcie-histb.o
+ obj-$(CONFIG_PCI_MESON) += pci-meson.o
+-obj-$(CONFIG_PCIE_TEGRA194) += pcie-tegra194.o
+ obj-$(CONFIG_PCIE_UNIPHIER) += pcie-uniphier.o
+ obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.o
+ 
+@@ -34,4 +33,5 @@ obj-$(CONFIG_PCIE_UNIPHIER_EP) += pcie-uniphier-ep.o
+ ifdef CONFIG_PCI
+ obj-$(CONFIG_ARM64) += pcie-al.o
+ obj-$(CONFIG_ARM64) += pcie-hisi.o
++obj-$(CONFIG_ARM64) += pcie-tegra194.o
+ endif
+diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c
+index f920e7efe118..87c7929db727 100644
+--- a/drivers/pci/controller/dwc/pcie-tegra194.c
++++ b/drivers/pci/controller/dwc/pcie-tegra194.c
+@@ -22,6 +22,8 @@
+ #include <linux/of_irq.h>
+ #include <linux/of_pci.h>
+ #include <linux/pci.h>
++#include <linux/pci-acpi.h>
++#include <linux/pci-ecam.h>
+ #include <linux/phy/phy.h>
+ #include <linux/pinctrl/consumer.h>
+ #include <linux/platform_device.h>
+@@ -311,6 +313,103 @@ struct tegra_pcie_dw_of_data {
+ 	enum dw_pcie_device_mode mode;
+ };
+ 
++#if defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS)
++struct tegra194_pcie_acpi  {
++	void __iomem *config_base;
++	void __iomem *iatu_base;
++	void __iomem *dbi_base;
++};
++
++static int tegra194_acpi_init(struct pci_config_window *cfg)
++{
++	struct device *dev = cfg->parent;
++	struct tegra194_pcie_acpi *pcie;
++
++	pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
++	if (!pcie)
++		return -ENOMEM;
++
++	pcie->config_base = cfg->win;
++	pcie->iatu_base = cfg->win + SZ_256K;
++	pcie->dbi_base = cfg->win + SZ_512K;
++	cfg->priv = pcie;
++
++	return 0;
++}
++
++static inline void atu_reg_write(struct tegra194_pcie_acpi *pcie, int index,
++				 u32 val, u32 reg)
++{
++	u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
++
++	writel(val, pcie->iatu_base + offset + reg);
++}
++
++static void program_outbound_atu(struct tegra194_pcie_acpi *pcie, int index,
++				 int type, u64 cpu_addr, u64 pci_addr, u64 size)
++{
++	atu_reg_write(pcie, index, lower_32_bits(cpu_addr),
++		      PCIE_ATU_LOWER_BASE);
++	atu_reg_write(pcie, index, upper_32_bits(cpu_addr),
++		      PCIE_ATU_UPPER_BASE);
++	atu_reg_write(pcie, index, lower_32_bits(pci_addr),
++		      PCIE_ATU_LOWER_TARGET);
++	atu_reg_write(pcie, index, lower_32_bits(cpu_addr + size - 1),
++		      PCIE_ATU_LIMIT);
++	atu_reg_write(pcie, index, upper_32_bits(pci_addr),
++		      PCIE_ATU_UPPER_TARGET);
++	atu_reg_write(pcie, index, type, PCIE_ATU_CR1);
++	atu_reg_write(pcie, index, PCIE_ATU_ENABLE, PCIE_ATU_CR2);
++}
++
++static void __iomem *tegra194_map_bus(struct pci_bus *bus,
++				      unsigned int devfn, int where)
++{
++	struct pci_config_window *cfg = bus->sysdata;
++	struct tegra194_pcie_acpi *pcie = cfg->priv;
++	u32 busdev;
++	int type;
++
++	if (bus->number < cfg->busr.start || bus->number > cfg->busr.end)
++		return NULL;
++
++	if (bus->number == cfg->busr.start) {
++		if (PCI_SLOT(devfn) == 0)
++			return pcie->dbi_base + where;
++		else
++			return NULL;
++	}
++
++	busdev = PCIE_ATU_BUS(bus->number) | PCIE_ATU_DEV(PCI_SLOT(devfn)) |
++		 PCIE_ATU_FUNC(PCI_FUNC(devfn));
++
++	if (bus->parent->number == cfg->busr.start) {
++		if (PCI_SLOT(devfn) == 0)
++			type = PCIE_ATU_TYPE_CFG0;
++		else
++			return NULL;
++	} else {
++		type = PCIE_ATU_TYPE_CFG1;
++	}
++
++	program_outbound_atu(pcie, PCIE_ATU_REGION_INDEX0, type,
++			     cfg->res.start, busdev, SZ_256K);
++	return (void __iomem *)(pcie->config_base + where);
++}
++
++const struct pci_ecam_ops tegra194_pcie_ops = {
++	.bus_shift	= 20,
++	.init		= tegra194_acpi_init,
++	.pci_ops	= {
++		.map_bus	= tegra194_map_bus,
++		.read		= pci_generic_config_read,
++		.write		= pci_generic_config_write,
++	}
++};
++#endif /* defined(CONFIG_ACPI) && defined(CONFIG_PCI_QUIRKS) */
++
++#ifdef CONFIG_PCIE_TEGRA194
++
+ static inline struct tegra_pcie_dw *to_tegra_pcie(struct dw_pcie *pci)
+ {
+ 	return container_of(pci, struct tegra_pcie_dw, pci);
+@@ -2339,3 +2438,6 @@ MODULE_DEVICE_TABLE(of, tegra_pcie_dw_of_match);
+ MODULE_AUTHOR("Vidya Sagar <vidyas@nvidia.com>");
+ MODULE_DESCRIPTION("NVIDIA PCIe host controller driver");
+ MODULE_LICENSE("GPL v2");
++
++#endif /* CONFIG_PCIE_TEGRA194 */
++
+diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h
+index 033ce74f02e8..ccbf3c38c6e6 100644
+--- a/include/linux/pci-ecam.h
++++ b/include/linux/pci-ecam.h
+@@ -58,6 +58,7 @@ extern const struct pci_ecam_ops pci_thunder_ecam_ops; /* Cavium ThunderX 1.x */
+ extern const struct pci_ecam_ops xgene_v1_pcie_ecam_ops; /* APM X-Gene PCIe v1 */
+ extern const struct pci_ecam_ops xgene_v2_pcie_ecam_ops; /* APM X-Gene PCIe v2.x */
+ extern const struct pci_ecam_ops al_pcie_ops;	/* Amazon Annapurna Labs PCIe */
++extern const struct pci_ecam_ops tegra194_pcie_ops; /* Tegra194 PCIe */
+ #endif
+ 
+ #if IS_ENABLED(CONFIG_PCI_HOST_COMMON)
+-- 
+2.29.2
+

0001-PCI-tegra-Revert-raw_violation_fixup-for-tegra124.patch

@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Mon, 20 Apr 2020 18:43:04 +0200
-Subject: [PATCH] PCI: tegra: Revert raw_violation_fixup for tegra124
-
-As reported in https://bugzilla.kernel.org/206217 , raw_violation_fixup
-is causing more harm than good in some common use-cases.
-
-This patch as RFC is a partial revert of the 191cd6fb5 commit:
- "PCI: tegra: Add SW fixup for RAW violations"
-that was first introduced in 5.3 kernel.
-This fix the following regression since then.
-
-When using both the network NIC and I/O on MMC this can lead to the
-following message on jetson-tk1:
-
- NETDEV WATCHDOG: enp1s0 (r8169): transmit queue 0 timed out
-
-and
-
- pcieport 0000:00:02.0: AER: Uncorrected (Non-Fatal) error received: 0000:01:00.0
- r8169 0000:01:00.0: AER: PCIe Bus Error: severity=Uncorrected (Non-Fatal), type=Transaction Layer, (Requester ID)
- r8169 0000:01:00.0: AER:   device [10ec:8168] error status/mask=00004000/00400000
- r8169 0000:01:00.0: AER:    [14] CmpltTO                (First)
- r8169 0000:01:00.0: AER: can't recover (no error_detected callback)
- pcieport 0000:00:02.0: AER: device recovery failed
-
-After that, the ethernet NIC isn't functional anymore even after reloading
-the module.
-After a reboot, this is reproducible by copying a large file over the
-ethernet NIC to the MMC.
-For some reasons this cannot be reproduced when the same file is copied
-to a tmpfs.
-
-This patch is RFC because it requires more understanding from Nvidia.
- - Is the fixup (available in l4t downstrem) still needed for upstream ?
- - Is there a need to update the fixup values for upstream ?
- - If the fixup is reverted, does the hw bug can still be seen with
-   upstream ?
-
-Others can also provides more understanding:
- - Conditions to reproduce the bug (or not)...
-
-Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
-Reviewed-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
----
- drivers/pci/controller/pci-tegra.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
-index 235b456698fc..d5a4a167ffa1 100644
---- a/drivers/pci/controller/pci-tegra.c
-+++ b/drivers/pci/controller/pci-tegra.c
-@@ -2470,7 +2470,7 @@ static const struct tegra_pcie_soc tegra124_pcie = {
- 	.program_uphy = true,
- 	.update_clamp_threshold = true,
- 	.program_deskew_time = false,
--	.raw_violation_fixup = true,
-+	.raw_violation_fixup = false,
- 	.update_fc_timer = false,
- 	.has_cache_bars = false,
- 	.ectl.enable = false,
--- 
-2.26.2
-

0001-Pull-the-RHEL-version-defines-out-of-the-Makefile.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Cline <jcline@redhat.com>
-Date: Tue, 17 Sep 2019 17:11:03 +0000
-Subject: [PATCH] Pull the RHEL version defines out of the Makefile
-
-This is done via the kernel-put-RHEL-info-into-generated-headers.patch
-in the rhpatches branch.
-
-Signed-off-by: Jeremy Cline <jcline@redhat.com>
----
- Makefile | 9 ++-------
- 1 file changed, 2 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 48a7abae02d2..2d826a14824a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -16,6 +16,7 @@ PHONY := _all
- _all:
-
- # Set RHEL variables
-+# Use this spot to avoid future merge conflicts
- include Makefile.rhelver
-
- # We are using a recursive build, so we need to do a little thinking
-@@ -1172,13 +1173,7 @@ endef
- define filechk_version.h
- 	echo \#define LINUX_VERSION_CODE $(shell                         \
- 	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
--	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'; \
--	echo '#define RHEL_MAJOR $(RHEL_MAJOR)'; \
--	echo '#define RHEL_MINOR $(RHEL_MINOR)'; \
--	echo '#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))'; \
--	echo '#define RHEL_RELEASE_CODE \
--	$(shell expr $(RHEL_MAJOR) \* 256 + $(RHEL_MINOR))'; \
--	echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"'
-+	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'
- endef
-
- $(version_h): FORCE
--- 
-2.26.2
-

0001-Removing-Obsolete-hba-pci-ids-from-rhel8.patch

@@ -1,113 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Dick Kennedy <dkennedy@redhat.com>
-Date: Fri, 14 Feb 2020 15:09:41 -0500
-Subject: [PATCH] Removing Obsolete hba pci-ids from rhel8
-
-Message-id: <1525206184-20470-1-git-send-email-dkennedy@redhat.com>
-Patchwork-id: 212089
-O-Subject: [RHEL8 PATCH e-stor] Removing Obsolete hba pci-ids from rhel8.
-Bugzilla: 1572321
-RH-Acked-by: Chris Leech <cleech@redhat.com>
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-
-These adapters printed an Obsolete Unsupported message is rhel7. They
-are being removed for rhel8
-
-brew-id: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID^U948800
-bugzilla: 1572321
-tested on: rhel-storage-44 and on rhel-storage-07
-
-RHEL Specific
-
-Upstream Status: RHEL only
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Backport Notes: Simplify by filtering using pci_ids
--
----
- drivers/scsi/lpfc/lpfc_ids.h | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/drivers/scsi/lpfc/lpfc_ids.h b/drivers/scsi/lpfc/lpfc_ids.h
-index d48414e295a0..ba0e384412c9 100644
---- a/drivers/scsi/lpfc/lpfc_ids.h
-+++ b/drivers/scsi/lpfc/lpfc_ids.h
-@@ -24,6 +24,7 @@
- #include <linux/pci.h>
-
- const struct pci_device_id lpfc_id_table[] = {
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
-@@ -54,14 +55,19 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HORNET,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
-@@ -70,6 +76,7 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
-@@ -80,6 +87,7 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
-@@ -92,6 +100,7 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_VF,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PROTEUS_PF,
-@@ -102,18 +111,23 @@ const struct pci_device_id lpfc_id_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_SERVERENGINE, PCI_DEVICE_ID_TOMCAT,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FALCON,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BALIUS,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FC_VF,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_FCOE_VF,
- 		PCI_ANY_ID, PCI_ANY_ID, },
-+#endif
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G6_FC,
- 		PCI_ANY_ID, PCI_ANY_ID, },
- 	{PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LANCER_G7_FC,
--- 
-2.26.2
-

0001-Rename-RH_DISABLE_DEPRECATED-to-RHEL_DIFFERENCES.patch

@@ -1,81 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Don Zickus <dzickus@redhat.com>
-Date: Tue, 3 Mar 2020 09:35:28 -0500
-Subject: [PATCH] Rename RH_DISABLE_DEPRECATED to RHEL_DIFFERENCES
-
-The intent of RH_DISABLE_DEPRECATED was to provide Red Hat a
-simple way to disable drivers it did not want to support in RHEL.
-
-As the config option was applied to more drivers and infra, it became
-clear the option was being used for not only deprecating drivers (which
-implied limited support) to disabling drivers (implying no support).
-
-Using the word 'deprecated' seemed confusing in the second scenario.
-Rename the option to be more generic and useable across more parts
-of the kernel tree.
-
-The new wording is RHEL_DIFFERENCES.
-
-Upstream Status: RHEL only
----
- Kconfig.redhat          | 2 +-
- arch/x86/kernel/setup.c | 2 +-
- include/linux/kernel.h  | 2 +-
- kernel/Makefile         | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/Kconfig.redhat b/Kconfig.redhat
-index 733a26bd887a..effb81d04bfd 100644
---- a/Kconfig.redhat
-+++ b/Kconfig.redhat
-@@ -5,7 +5,7 @@
-
- menu "Red Hat options"
-
--config RH_DISABLE_DEPRECATED
-+config RHEL_DIFFERENCES
- 	bool "Remove support for deprecated features"
- 	help
- 	  Red Hat may choose to deprecate certain features in its kernels.
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 19d57bfc12f9..e677bb144835 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -1372,7 +1372,7 @@ void __init setup_arch(char **cmdline_p)
- 		efi_apply_memmap_quirks();
- #endif
-
--#ifdef CONFIG_RH_DISABLE_DEPRECATED
-+#ifdef CONFIG_RHEL_DIFFERENCES
- 	rh_check_supported();
- #endif
-
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 0a0081b10edb..cfaaa6a234d4 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -1058,7 +1058,7 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
-
- struct module;
-
--#ifdef CONFIG_RH_DISABLE_DEPRECATED
-+#ifdef CONFIG_RHEL_DIFFERENCES
- void mark_hardware_unsupported(const char *msg);
- void mark_hardware_deprecated(const char *msg);
- void mark_tech_preview(const char *msg, struct module *mod);
-diff --git a/kernel/Makefile b/kernel/Makefile
-index c0a4904413b5..1a0c362cddfb 100644
---- a/kernel/Makefile
-+++ b/kernel/Makefile
-@@ -12,7 +12,7 @@ obj-y     = fork.o exec_domain.o panic.o \
- 	    notifier.o ksysfs.o cred.o reboot.o \
- 	    async.o range.o smpboot.o ucount.o
-
--obj-$(CONFIG_RH_DISABLE_DEPRECATED) += rh_taint.o
-+obj-$(CONFIG_RHEL_DIFFERENCES) += rh_taint.o
-
- obj-$(CONFIG_MODULES) += kmod.o
- obj-$(CONFIG_MULTIUSER) += groups.o
--- 
-2.26.2
-

0001-Revert-arm64-allwinner-dts-a64-add-LCD-related-devic.patch

@@ -1,76 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Sun, 12 Jul 2020 13:42:14 +0100
-Subject: [PATCH] Revert "arm64: allwinner: dts: a64: add LCD-related device
- nodes for PinePhone"
-
-This reverts commit 6b9deda8c30064a254bc66e3f6763281c96db7db.
----
- .../dts/allwinner/sun50i-a64-pinephone.dtsi   | 37 -------------------
- 1 file changed, 37 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index 96d9150423e0..cefda145c3c9 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -16,15 +16,6 @@ aliases {
- 		serial0 = &uart0;
- 	};
-
--	backlight: backlight {
--		compatible = "pwm-backlight";
--		pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>;
--		brightness-levels = <0 16 18 20 22 24 26 29 32 35 38 42 46 51 56 62 68 75 83 91 100>;
--		default-brightness-level = <15>;
--		enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
--		power-supply = <&reg_ldo_io0>;
--	};
--
- 	chosen {
- 		stdout-path = "serial0:115200n8";
- 	};
-@@ -93,30 +84,6 @@ &dai {
- 	status = "okay";
- };
-
--&de {
--	status = "okay";
--};
--
--&dphy {
--	status = "okay";
--};
--
--&dsi {
--	vcc-dsi-supply = <&reg_dldo1>;
--	#address-cells = <1>;
--	#size-cells = <0>;
--	status = "okay";
--
--	panel@0 {
--		compatible = "xingbangda,xbd599";
--		reg = <0>;
--		reset-gpios = <&pio 3 23 GPIO_ACTIVE_LOW>; /* PD23 */
--		iovcc-supply = <&reg_dldo2>;
--		vcc-supply = <&reg_ldo_io0>;
--		backlight = <&backlight>;
--	};
--};
--
- &ehci0 {
- 	status = "okay";
- };
-@@ -221,10 +188,6 @@ &r_pio {
- 	 */
- };
-
--&r_pwm {
--	status = "okay";
--};
--
- &r_rsb {
- 	status = "okay";
-
--- 
-2.26.2
-

0001-Revert-drm-panel-add-Xingbangda-XBD599-panel.patch

@@ -1,418 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Sun, 12 Jul 2020 13:41:56 +0100
-Subject: [PATCH] Revert "drm: panel: add Xingbangda XBD599 panel"
-
-This reverts commit 5d53795bb19e39f048ac8028ec36ff04765e1237.
----
- drivers/gpu/drm/panel/Kconfig                 |   9 -
- drivers/gpu/drm/panel/Makefile                |   1 -
- .../gpu/drm/panel/panel-xingbangda-xbd599.c   | 366 ------------------
- 3 files changed, 376 deletions(-)
- delete mode 100644 drivers/gpu/drm/panel/panel-xingbangda-xbd599.c
-
-diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
-index 1f55a87bb657..39055c1f0e2f 100644
---- a/drivers/gpu/drm/panel/Kconfig
-+++ b/drivers/gpu/drm/panel/Kconfig
-@@ -462,15 +462,6 @@ config DRM_PANEL_VISIONOX_RM69299
- 	  Say Y here if you want to enable support for Visionox
- 	  RM69299  DSI Video Mode panel.
-
--config DRM_PANEL_XINGBANGDA_XBD599
--	tristate "Xingbangda XBD599 panel"
--	depends on OF
--	depends on DRM_MIPI_DSI
--	depends on BACKLIGHT_CLASS_DEVICE
--	help
--	  Say Y here if you want to enable support for the Xingbangda XBD599
--	  MIPI DSI Video Mode panel.
--
- config DRM_PANEL_XINPENG_XPP055C272
- 	tristate "Xinpeng XPP055C272 panel driver"
- 	depends on OF
-diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
-index 7b6b0c0397d6..de74f282c433 100644
---- a/drivers/gpu/drm/panel/Makefile
-+++ b/drivers/gpu/drm/panel/Makefile
-@@ -49,5 +49,4 @@ obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
- obj-$(CONFIG_DRM_PANEL_TPO_TPG110) += panel-tpo-tpg110.o
- obj-$(CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA) += panel-truly-nt35597.o
- obj-$(CONFIG_DRM_PANEL_VISIONOX_RM69299) += panel-visionox-rm69299.o
--obj-$(CONFIG_DRM_PANEL_XINGBANGDA_XBD599) += panel-xingbangda-xbd599.o
- obj-$(CONFIG_DRM_PANEL_XINPENG_XPP055C272) += panel-xinpeng-xpp055c272.o
-diff --git a/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c b/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c
-deleted file mode 100644
-index b483f96ee1db..000000000000
---- a/drivers/gpu/drm/panel/panel-xingbangda-xbd599.c
-+++ /dev/null
-@@ -1,366 +0,0 @@
--// SPDX-License-Identifier: GPL-2.0
--/*
-- * Xingbangda XBD599 MIPI-DSI panel driver
-- *
-- * Copyright (C) 2019-2020 Icenowy Zheng <icenowy@aosc.io>
-- *
-- * Based on panel-rocktech-jh057n00900.c, which is:
-- *   Copyright (C) Purism SPC 2019
-- */
--
--#include <linux/delay.h>
--#include <linux/gpio/consumer.h>
--#include <linux/mod_devicetable.h>
--#include <linux/module.h>
--#include <linux/of_device.h>
--#include <linux/regulator/consumer.h>
--
--#include <drm/drm_mipi_dsi.h>
--#include <drm/drm_modes.h>
--#include <drm/drm_panel.h>
--#include <drm/drm_print.h>
--
--/* Manufacturer specific Commands send via DSI */
--#define ST7703_CMD_ALL_PIXEL_OFF 0x22
--#define ST7703_CMD_ALL_PIXEL_ON	 0x23
--#define ST7703_CMD_SETDISP	 0xB2
--#define ST7703_CMD_SETRGBIF	 0xB3
--#define ST7703_CMD_SETCYC	 0xB4
--#define ST7703_CMD_SETBGP	 0xB5
--#define ST7703_CMD_SETVCOM	 0xB6
--#define ST7703_CMD_SETOTP	 0xB7
--#define ST7703_CMD_SETPOWER_EXT	 0xB8
--#define ST7703_CMD_SETEXTC	 0xB9
--#define ST7703_CMD_SETMIPI	 0xBA
--#define ST7703_CMD_SETVDC	 0xBC
--#define ST7703_CMD_SETSCR	 0xC0
--#define ST7703_CMD_SETPOWER	 0xC1
--#define ST7703_CMD_UNK_C6	 0xC6
--#define ST7703_CMD_SETPANEL	 0xCC
--#define ST7703_CMD_SETGAMMA	 0xE0
--#define ST7703_CMD_SETEQ	 0xE3
--#define ST7703_CMD_SETGIP1	 0xE9
--#define ST7703_CMD_SETGIP2	 0xEA
--
--static const char * const regulator_names[] = {
--	"iovcc",
--	"vcc",
--};
--
--struct xbd599 {
--	struct device *dev;
--	struct drm_panel panel;
--	struct gpio_desc *reset_gpio;
--	struct regulator_bulk_data supplies[ARRAY_SIZE(regulator_names)];
--	bool prepared;
--};
--
--static inline struct xbd599 *panel_to_xbd599(struct drm_panel *panel)
--{
--	return container_of(panel, struct xbd599, panel);
--}
--
--#define dsi_dcs_write_seq(dsi, cmd, seq...) do {			\
--		static const u8 d[] = { seq };				\
--		int ret;						\
--		ret = mipi_dsi_dcs_write(dsi, cmd, d, ARRAY_SIZE(d));	\
--		if (ret < 0)						\
--			return ret;					\
--	} while (0)
--
--static int xbd599_init_sequence(struct xbd599 *ctx)
--{
--	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
--	struct device *dev = ctx->dev;
--	int ret;
--
--	/*
--	 * Init sequence was supplied by the panel vendor.
--	 */
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETEXTC,
--			  0xF1, 0x12, 0x83);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETMIPI,
--			  0x33, 0x81, 0x05, 0xF9, 0x0E, 0x0E, 0x20, 0x00,
--			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x25,
--			  0x00, 0x91, 0x0a, 0x00, 0x00, 0x02, 0x4F, 0x11,
--			  0x00, 0x00, 0x37);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER_EXT,
--			  0x25, 0x22, 0x20, 0x03);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETRGBIF,
--			  0x10, 0x10, 0x05, 0x05, 0x03, 0xFF, 0x00, 0x00,
--			  0x00, 0x00);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETSCR,
--			  0x73, 0x73, 0x50, 0x50, 0x00, 0xC0, 0x08, 0x70,
--			  0x00);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETVDC, 0x4E);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETPANEL, 0x0B);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETCYC, 0x80);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETDISP, 0xF0, 0x12, 0xF0);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETEQ,
--			  0x00, 0x00, 0x0B, 0x0B, 0x10, 0x10, 0x00, 0x00,
--			  0x00, 0x00, 0xFF, 0x00, 0xC0, 0x10);
--	dsi_dcs_write_seq(dsi, 0xC6, 0x01, 0x00, 0xFF, 0xFF, 0x00);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER,
--			  0x74, 0x00, 0x32, 0x32, 0x77, 0xF1, 0xFF, 0xFF,
--			  0xCC, 0xCC, 0x77, 0x77);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETBGP, 0x07, 0x07);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETVCOM, 0x2C, 0x2C);
--	dsi_dcs_write_seq(dsi, 0xBF, 0x02, 0x11, 0x00);
--
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP1,
--			  0x82, 0x10, 0x06, 0x05, 0xA2, 0x0A, 0xA5, 0x12,
--			  0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38,
--			  0x0C, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x00,
--			  0x03, 0x00, 0x00, 0x00, 0x75, 0x75, 0x31, 0x88,
--			  0x88, 0x88, 0x88, 0x88, 0x88, 0x13, 0x88, 0x64,
--			  0x64, 0x20, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
--			  0x02, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP2,
--			  0x02, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--			  0x00, 0x00, 0x00, 0x00, 0x02, 0x46, 0x02, 0x88,
--			  0x88, 0x88, 0x88, 0x88, 0x88, 0x64, 0x88, 0x13,
--			  0x57, 0x13, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
--			  0x75, 0x88, 0x23, 0x14, 0x00, 0x00, 0x02, 0x00,
--			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0A,
--			  0xA5, 0x00, 0x00, 0x00, 0x00);
--	dsi_dcs_write_seq(dsi, ST7703_CMD_SETGAMMA,
--			  0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41, 0x35,
--			  0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12, 0x12,
--			  0x18, 0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41,
--			  0x35, 0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12,
--			  0x12, 0x18);
--	msleep(20);
--
--	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
--	if (ret < 0) {
--		DRM_DEV_ERROR(dev, "Failed to exit sleep mode\n");
--		return ret;
--	}
--	msleep(250);
--
--	ret = mipi_dsi_dcs_set_display_on(dsi);
--	if (ret)
--		return ret;
--	msleep(50);
--
--	DRM_DEV_DEBUG_DRIVER(dev, "Panel init sequence done\n");
--	return 0;
--}
--
--static int xbd599_prepare(struct drm_panel *panel)
--{
--	struct xbd599 *ctx = panel_to_xbd599(panel);
--	int ret;
--
--	if (ctx->prepared)
--		return 0;
--
--	ret = regulator_bulk_enable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
--	if (ret)
--		return ret;
--
--	DRM_DEV_DEBUG_DRIVER(ctx->dev, "Resetting the panel\n");
--	gpiod_set_value_cansleep(ctx->reset_gpio, 1);
--	usleep_range(20, 40);
--	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
--	msleep(20);
--
--	ctx->prepared = true;
--
--	return 0;
--}
--
--static int xbd599_enable(struct drm_panel *panel)
--{
--	struct xbd599 *ctx = panel_to_xbd599(panel);
--	int ret;
--
--	ret = xbd599_init_sequence(ctx);
--	if (ret < 0) {
--		DRM_DEV_ERROR(ctx->dev, "Panel init sequence failed: %d\n",
--			      ret);
--		return ret;
--	}
--
--	return 0;
--}
--
--static int xbd599_disable(struct drm_panel *panel)
--{
--	struct xbd599 *ctx = panel_to_xbd599(panel);
--	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
--
--	return mipi_dsi_dcs_set_display_off(dsi);
--}
--
--static int xbd599_unprepare(struct drm_panel *panel)
--{
--	struct xbd599 *ctx = panel_to_xbd599(panel);
--
--	if (!ctx->prepared)
--		return 0;
--
--	gpiod_set_value_cansleep(ctx->reset_gpio, 1);
--	regulator_bulk_disable(ARRAY_SIZE(ctx->supplies), ctx->supplies);
--	ctx->prepared = false;
--
--	return 0;
--}
--
--static const struct drm_display_mode xbd599_default_mode = {
--	.hdisplay    = 720,
--	.hsync_start = 720 + 40,
--	.hsync_end   = 720 + 40 + 40,
--	.htotal	     = 720 + 40 + 40 + 40,
--	.vdisplay    = 1440,
--	.vsync_start = 1440 + 18,
--	.vsync_end   = 1440 + 18 + 10,
--	.vtotal	     = 1440 + 18 + 10 + 17,
--	.vrefresh    = 60,
--	.clock	     = 69000,
--	.flags	     = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
--
--	.width_mm    = 68,
--	.height_mm   = 136,
--	.type        = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
--};
--
--static int xbd599_get_modes(struct drm_panel *panel,
--			    struct drm_connector *connector)
--{
--	struct xbd599 *ctx = panel_to_xbd599(panel);
--	struct drm_display_mode *mode;
--
--	mode = drm_mode_duplicate(connector->dev, &xbd599_default_mode);
--	if (!mode) {
--		DRM_DEV_ERROR(ctx->dev, "Failed to add mode\n");
--		return -ENOMEM;
--	}
--
--	drm_mode_set_name(mode);
--
--	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
--	connector->display_info.width_mm = mode->width_mm;
--	connector->display_info.height_mm = mode->height_mm;
--	drm_mode_probed_add(connector, mode);
--
--	return 1;
--}
--
--static const struct drm_panel_funcs xbd599_drm_funcs = {
--	.prepare   = xbd599_prepare,
--	.enable    = xbd599_enable,
--	.disable   = xbd599_disable,
--	.unprepare = xbd599_unprepare,
--	.get_modes = xbd599_get_modes,
--};
--
--static int xbd599_probe(struct mipi_dsi_device *dsi)
--{
--	struct device *dev = &dsi->dev;
--	struct xbd599 *ctx;
--	int i, ret;
--
--	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
--	if (!ctx)
--		return -ENOMEM;
--
--	for (i = 0; i < ARRAY_SIZE(ctx->supplies); i++)
--		ctx->supplies[i].supply = regulator_names[i];
--
--	ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(ctx->supplies),
--				      ctx->supplies);
--	if (ret < 0) {
--		DRM_DEV_ERROR(&dsi->dev, "cannot get regulators\n");
--		return ret;
--	}
--
--	ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
--	if (IS_ERR(ctx->reset_gpio)) {
--		DRM_DEV_ERROR(dev, "cannot get reset gpio\n");
--		return PTR_ERR(ctx->reset_gpio);
--	}
--
--	mipi_dsi_set_drvdata(dsi, ctx);
--
--	ctx->dev = dev;
--
--	dsi->lanes = 4;
--	dsi->format = MIPI_DSI_FMT_RGB888;
--	dsi->mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
--
--	drm_panel_init(&ctx->panel, &dsi->dev, &xbd599_drm_funcs,
--		       DRM_MODE_CONNECTOR_DSI);
--
--	ret = drm_panel_of_backlight(&ctx->panel);
--	if (ret)
--		return ret;
--
--	drm_panel_add(&ctx->panel);
--
--	ret = mipi_dsi_attach(dsi);
--	if (ret < 0) {
--		DRM_DEV_ERROR(dev, "mipi_dsi_attach failed. Is host ready?\n");
--		drm_panel_remove(&ctx->panel);
--		return ret;
--	}
--
--	DRM_DEV_INFO(dev, "%ux%u@%u %ubpp dsi %udl - ready\n",
--		     xbd599_default_mode.hdisplay,
--		     xbd599_default_mode.vdisplay,
--		     xbd599_default_mode.vrefresh,
--		     mipi_dsi_pixel_format_to_bpp(dsi->format), dsi->lanes);
--
--	return 0;
--}
--
--static void xbd599_shutdown(struct mipi_dsi_device *dsi)
--{
--	struct xbd599 *ctx = mipi_dsi_get_drvdata(dsi);
--	int ret;
--
--	ret = drm_panel_unprepare(&ctx->panel);
--	if (ret < 0)
--		DRM_DEV_ERROR(&dsi->dev, "Failed to unprepare panel: %d\n",
--			      ret);
--}
--
--static int xbd599_remove(struct mipi_dsi_device *dsi)
--{
--	struct xbd599 *ctx = mipi_dsi_get_drvdata(dsi);
--	int ret;
--
--	xbd599_shutdown(dsi);
--
--	ret = mipi_dsi_detach(dsi);
--	if (ret < 0)
--		DRM_DEV_ERROR(&dsi->dev, "Failed to detach from DSI host: %d\n",
--			      ret);
--
--	drm_panel_remove(&ctx->panel);
--
--	return 0;
--}
--
--static const struct of_device_id xbd599_of_match[] = {
--	{ .compatible = "xingbangda,xbd599", },
--	{ /* sentinel */ }
--};
--MODULE_DEVICE_TABLE(of, xbd599_of_match);
--
--static struct mipi_dsi_driver xbd599_driver = {
--	.probe	= xbd599_probe,
--	.remove = xbd599_remove,
--	.shutdown = xbd599_shutdown,
--	.driver = {
--		.name = "panel-xingbangda-xbd599",
--		.of_match_table = xbd599_of_match,
--	},
--};
--module_mipi_dsi_driver(xbd599_driver);
--
--MODULE_AUTHOR("Icenowy Zheng <icenowy@aosc.io>");
--MODULE_DESCRIPTION("DRM driver for Xingbangda XBD599 MIPI DSI panel");
--MODULE_LICENSE("GPL v2");
--- 
-2.26.2
-

0001-Revert-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timin.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Sun, 12 Jul 2020 13:42:04 +0100
-Subject: [PATCH] Revert "drm/sun4i: sun6i_mipi_dsi: fix horizontal timing
- calculation"
-
-This reverts commit d20a2ac9c6ecf514e115f06b6744b584bbc7c1b8.
----
- drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-index 52e009dc632b..aa67cb037e9d 100644
---- a/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-+++ b/drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c
-@@ -556,7 +556,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
- 		 */
- #define HSA_PACKET_OVERHEAD	10
- 		hsa = max((unsigned int)HSA_PACKET_OVERHEAD,
--			  (mode->hsync_end - mode->hsync_start) * Bpp) - HSA_PACKET_OVERHEAD;
-+			  (mode->hsync_end - mode->hsync_start) * Bpp - HSA_PACKET_OVERHEAD);
-
- 		/*
- 		 * The backporch is set using a blanking packet (4
-@@ -565,7 +565,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
- 		 */
- #define HBP_PACKET_OVERHEAD	6
- 		hbp = max((unsigned int)HBP_PACKET_OVERHEAD,
--			  (mode->htotal - mode->hsync_end) * Bpp) - HBP_PACKET_OVERHEAD;
-+			  (mode->htotal - mode->hsync_end) * Bpp - HBP_PACKET_OVERHEAD);
-
- 		/*
- 		 * The frontporch is set using a sync event (4 bytes)
-@@ -575,7 +575,7 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
- 		 */
- #define HFP_PACKET_OVERHEAD	16
- 		hfp = max((unsigned int)HFP_PACKET_OVERHEAD,
--			  (mode->hsync_start - mode->hdisplay) * Bpp) - HFP_PACKET_OVERHEAD;
-+			  (mode->hsync_start - mode->hdisplay) * Bpp - HFP_PACKET_OVERHEAD);
-
- 		/*
- 		 * The blanking is set using a sync event (4 bytes)
-@@ -584,8 +584,8 @@ static void sun6i_dsi_setup_timings(struct sun6i_dsi *dsi,
- 		 */
- #define HBLK_PACKET_OVERHEAD	10
- 		hblk = max((unsigned int)HBLK_PACKET_OVERHEAD,
--			   (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp) -
--			   HBLK_PACKET_OVERHEAD;
-+			   (mode->htotal - (mode->hsync_end - mode->hsync_start)) * Bpp -
-+			   HBLK_PACKET_OVERHEAD);
-
- 		/*
- 		 * And I'm not entirely sure what vblk is about. The driver in
--- 
-2.26.2
-

0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Sun, 12 Jul 2020 13:39:32 +0100
-Subject: [PATCH] Revert "dt-bindings: Add doc for Pine64 Pinebook Pro"
-
-This reverts commit ec0f66d2bc5ffd2a06eaf254ad314153e557cb7c.
-
-This is already upstream and not sure why it still applies but we
-don't need it any more.
----
- Documentation/devicetree/bindings/arm/rockchip.yaml | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
-index ed808148b6a7..d4a4045092df 100644
---- a/Documentation/devicetree/bindings/arm/rockchip.yaml
-+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
-@@ -425,11 +425,6 @@ properties:
-           - const: pine64,rockpro64
-           - const: rockchip,rk3399
-
--      - description: Pine64 PinebookPro
--        items:
--          - const: pine64,pinebook-pro
--          - const: rockchip,rk3399
--
-       - description: Radxa Rock
-         items:
-           - const: radxa,rock
--- 
-2.26.2
-

0001-Revert-dt-bindings-panel-add-binding-for-Xingbangda-.patch

@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Sun, 12 Jul 2020 13:41:49 +0100
-Subject: [PATCH] Revert "dt-bindings: panel: add binding for Xingbangda XBD599
- panel"
-
-This reverts commit 8a717270db2000ff734d89e9448b32fbc038c49a.
----
- .../display/panel/xingbangda,xbd599.yaml      | 50 -------------------
- 1 file changed, 50 deletions(-)
- delete mode 100644 Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml
-
-diff --git a/Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml b/Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml
-deleted file mode 100644
-index b27bcf11198f..000000000000
---- a/Documentation/devicetree/bindings/display/panel/xingbangda,xbd599.yaml
-+++ /dev/null
-@@ -1,50 +0,0 @@
--# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
--%YAML 1.2
-----
--$id: http://devicetree.org/schemas/display/panel/xingbangda,xbd599.yaml#
--$schema: http://devicetree.org/meta-schemas/core.yaml#
--
--title: Xingbangda XBD599 5.99in MIPI-DSI LCD panel
--
--maintainers:
--  - Icenowy Zheng <icenowy@aosc.io>
--
--allOf:
--  - $ref: panel-common.yaml#
--
--properties:
--  compatible:
--    const: xingbangda,xbd599
--  reg: true
--  backlight: true
--  reset-gpios: true
--  vcc-supply:
--    description: regulator that supplies the VCC voltage
--  iovcc-supply:
--    description: regulator that supplies the IOVCC voltage
--
--required:
--  - compatible
--  - reg
--  - backlight
--  - vcc-supply
--  - iovcc-supply
--
--additionalProperties: false
--
--examples:
--  - |
--    dsi {
--        #address-cells = <1>;
--        #size-cells = <0>;
--
--        panel@0 {
--            compatible = "xingbangda,xbd599";
--            reg = <0>;
--            backlight = <&backlight>;
--            iovcc-supply = <&reg_dldo2>;
--            vcc-supply = <&reg_ldo_io0>;
--        };
--    };
--
--...
--- 
-2.26.2
-

0001-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-early-si.patch

@@ -36,7 +36,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 24 insertions(+)
 
 diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
-index 2ea61abd5830..abb314891f5b 100644
+index bdf9b52567e0..1e98e20b7cc2 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -4196,6 +4196,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000,
@@ -71,5 +71,5 @@ index 2ea61abd5830..abb314891f5b 100644
   * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
   * class code.  Fix it.
 -- 
-2.26.2
+2.28.0
 

0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch

@@ -1,4 +1,4 @@
-From 90750a5b1205a7dcc002224738585b861779cdae Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: "Justin M. Forbes" <jforbes@fedoraproject.org>
 Date: Thu, 30 Jul 2020 10:26:11 -0500
 Subject: [PATCH] Work around for gcc bug
@@ -25,5 +25,5 @@ index 2a660ac1bc3a..fa87ff6a2a71 100644
  	int i;
 
 -- 
-2.26.2
+2.28.0
 

0001-aacraid-Remove-depreciated-device-and-vendor-PCI-id-.patch

@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Raghava Aditya Renukunta <rrenukun@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:38 -0500
-Subject: [PATCH] aacraid: Remove depreciated device and vendor PCI id's
-
-Message-id: <20180315040041.9449.8525.stgit@dhcp187-32.khw.lab.eng.bos.redhat.com>
-Patchwork-id: 206793
-O-Subject: [RHEL8 e-stor PATCH] scsi: aacraid: Remove depreciated device and vendor PCI id's
-Bugzilla: 1495307
-RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-RH-Acked-by: Tomas Henzl <thenzl@redhat.com>
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id95307
-Brew Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID552286
-Upstream Status: N/A (RHEL 8 internal)
-Tested: Code Review
-
-Remove Vendor PCI ID and Device PCI ID of depreciated devices from
-aacraid pci table, preventing these device from attaching to the aacraid
-driver.
-
-Upstream Status: RHEL only
-Signed-off-by: Raghava Aditya Renukunta <rrenukun@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- drivers/scsi/aacraid/linit.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
-index a308e86a97f1..4d84f95a50ce 100644
---- a/drivers/scsi/aacraid/linit.c
-+++ b/drivers/scsi/aacraid/linit.c
-@@ -78,6 +78,7 @@ char aac_driver_version[] = AAC_DRIVER_FULL_VERSION;
-  * Note: The last field is used to index into aac_drivers below.
-  */
- static const struct pci_device_id aac_pci_tbl[] = {
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{ 0x1028, 0x0001, 0x1028, 0x0001, 0, 0, 0 }, /* PERC 2/Si (Iguana/PERC2Si) */
- 	{ 0x1028, 0x0002, 0x1028, 0x0002, 0, 0, 1 }, /* PERC 3/Di (Opal/PERC3Di) */
- 	{ 0x1028, 0x0003, 0x1028, 0x0003, 0, 0, 2 }, /* PERC 3/Si (SlimFast/PERC3Si */
-@@ -145,6 +146,7 @@ static const struct pci_device_id aac_pci_tbl[] = {
- 	{ 0x9005, 0x0285, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 59 }, /* Adaptec Catch All */
- 	{ 0x9005, 0x0286, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 60 }, /* Adaptec Rocket Catch All */
- 	{ 0x9005, 0x0288, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 61 }, /* Adaptec NEMER/ARK Catch All */
-+#endif
- 	{ 0x9005, 0x028b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 62 }, /* Adaptec PMC Series 6 (Tupelo) */
- 	{ 0x9005, 0x028c, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 63 }, /* Adaptec PMC Series 7 (Denali) */
- 	{ 0x9005, 0x028d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 64 }, /* Adaptec PMC Series 8 */
--- 
-2.26.2
-

0001-aarch64-acpi-scan-Fix-regression-related-to-X-Gene-U.patch

@@ -28,10 +28,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
-index 8777faced51a..2e60d792005f 100644
+index 2142f1554761..f5fdf6f3650c 100644
 --- a/drivers/acpi/scan.c
 +++ b/drivers/acpi/scan.c
-@@ -1572,6 +1572,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
+@@ -1574,6 +1574,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device)
  	if (!acpi_match_device_ids(device, i2c_multi_instantiate_ids))
  		return false;
 
@@ -48,5 +48,5 @@ index 8777faced51a..2e60d792005f 100644
  	acpi_dev_get_resources(device, &resource_list,
  			       acpi_check_serial_bus_slave,
 -- 
-2.26.2
+2.28.0
 

0001-acpi-prefer-booting-with-ACPI-over-DTS.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Mark Salter <msalter@redhat.com>
-Date: Fri, 11 May 2018 21:01:17 -0400
-Subject: [PATCH] acpi: prefer booting with ACPI over DTS
-
-Message-id: <20180511210117.10457-1-msalter@redhat.com>
-Patchwork-id: 214708
-O-Subject: [RHEL-8 BZ1576869] [RHEL only] acpi: prefer booting with ACPI over DTS
-Bugzilla: 1576869
-RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
-RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-RH-Acked-by: Bhupesh Sharma <bhsharma@redhat.com>
-RH-Acked-by: Dean Nelson <dnelson@redhat.com>
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1576869
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16208479
-Testing: Verified kernel defaults to ACPI on Mustang
-
-From: Jonathan Toppins <jtoppins@redhat.com>
-
-    This patch forces ACPI boot tables to be preferred over DTS.
-
-    Currently for ACPI to be used a user either has to set acpi=on on the
-    kernel command line or make sure any device tree passed to the kernel
-    is empty. If the dtb passed to the kernel is non-empty then device-tree
-    will be chosen as the boot method of choice.
-
-    RHEL does not wish to support this boot method so change table boot
-    preferences to use ACPI. In the event ACPI table checks fail the kernel
-    will fallback to using DTS to boot.
-
-    Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Mark Salter <msalter@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- arch/arm64/kernel/acpi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
-index a7586a4db142..c2a7e30e2143 100644
---- a/arch/arm64/kernel/acpi.c
-+++ b/arch/arm64/kernel/acpi.c
-@@ -40,7 +40,7 @@ int acpi_pci_disabled = 1;	/* skip ACPI PCI scan and IRQ initialization */
- EXPORT_SYMBOL(acpi_pci_disabled);
-
- static bool param_acpi_off __initdata;
--static bool param_acpi_on __initdata;
-+static bool param_acpi_on __initdata = true;
- static bool param_acpi_force __initdata;
-
- static int __init parse_acpi(char *arg)
--- 
-2.26.2
-

0001-add-Red-Hat-specific-taint-flags.patch

@@ -1,83 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eugene Syromiatnikov <esyr@redhat.com>
-Date: Thu, 14 Jun 2018 16:35:59 -0400
-Subject: [PATCH] add Red Hat-specific taint flags
-
-Message-id: <56f71e5f8cf63afd0cdb1c4550c625cc90d59a75.1528991395.git.esyr@redhat.com>
-Patchwork-id: 8249
-O-Subject: [kernel team] [RHEL8 PATCH v4 1/5] kernel: add Red Hat-specific taint flags
-Bugzilla: 1559877
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-RH-Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
-
-Based on RHEL 7 commit "Backport RH specific TAINT flags" by Prarit
-Bhargava.
-
-Upstream Status: RHEL only
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1559877
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16716594
-Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- include/linux/kernel.h | 19 ++++++++++++++++++-
- kernel/panic.c         | 14 ++++++++++++++
- 2 files changed, 32 insertions(+), 1 deletion(-)
-
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index b82db0c0caec..28be75396242 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -603,7 +603,24 @@ extern enum system_states {
- #define TAINT_LIVEPATCH			15
- #define TAINT_AUX			16
- #define TAINT_RANDSTRUCT		17
--#define TAINT_FLAGS_COUNT		18
-+/* Start of Red Hat-specific taint flags */
-+#define TAINT_18			18
-+#define TAINT_19			19
-+#define TAINT_20			20
-+#define TAINT_21			21
-+#define TAINT_22			22
-+#define TAINT_23			23
-+#define TAINT_24			24
-+#define TAINT_25			25
-+#define TAINT_26			26
-+#define TAINT_27			27
-+/* Bits 28 - 31 are reserved for Red Hat use only */
-+#define TAINT_RESERVED28		28
-+#define TAINT_RESERVED29		29
-+#define TAINT_RESERVED30		30
-+#define TAINT_RESERVED31		31
-+/* End of Red Hat-specific taint flags */
-+#define TAINT_FLAGS_COUNT		32
- #define TAINT_FLAGS_MAX			((1UL << TAINT_FLAGS_COUNT) - 1)
-
- struct taint_flag {
-diff --git a/kernel/panic.c b/kernel/panic.c
-index e2157ca387c8..534bc76e43da 100644
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -386,6 +386,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
- 	[ TAINT_LIVEPATCH ]		= { 'K', ' ', true },
- 	[ TAINT_AUX ]			= { 'X', ' ', true },
- 	[ TAINT_RANDSTRUCT ]		= { 'T', ' ', true },
-+	[ TAINT_18 ]			= { '?', '-', false },
-+	[ TAINT_19 ]			= { '?', '-', false },
-+	[ TAINT_20 ]			= { '?', '-', false },
-+	[ TAINT_21 ]			= { '?', '-', false },
-+	[ TAINT_22 ]			= { '?', '-', false },
-+	[ TAINT_23 ]			= { '?', '-', false },
-+	[ TAINT_24 ]			= { '?', '-', false },
-+	[ TAINT_25 ]			= { '?', '-', false },
-+	[ TAINT_26 ]			= { '?', '-', false },
-+	[ TAINT_27 ]			= { '?', '-', false },
-+	[ TAINT_RESERVED28 ]		= { '?', '-', false },
-+	[ TAINT_RESERVED29 ]		= { '?', '-', false },
-+	[ TAINT_RESERVED30 ]		= { '?', '-', false },
-+	[ TAINT_RESERVED31 ]		= { '?', '-', false },
- };
-
- /**
--- 
-2.26.2
-

0001-add-pci_hw_vendor_status.patch

@@ -1,96 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Maurizio Lombardi <mlombard@redhat.com>
-Date: Mon, 18 Jun 2018 12:51:25 -0400
-Subject: [PATCH] add pci_hw_vendor_status()
-
-Message-id: <1529326285-28560-1-git-send-email-mlombard@redhat.com>
-Patchwork-id: 222337
-O-Subject: [RHEL8 PATCH] pci: add pci_hw_vendor_status()
-Bugzilla: 1590829
-RH-Acked-by: Tomas Henzl <thenzl@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-
-This patch adds pci_hw_vendor_status() like in RHEL7 which should be called
-during the driver's probe to identify deprecated devices.
-
-BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1590829
-Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=16761315
-
-See RHEL7 commits e0dddd9a63403ec82077ed410074fc6485873d4b and
-3fcddde5ddf4b190c84ce9d83d56a75137513bd7
-
-RHEL_only.
-
-Upstream Status: RHEL only
-Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- drivers/pci/pci-driver.c | 29 +++++++++++++++++++++++++++++
- include/linux/pci.h      |  4 ++++
- 2 files changed, 33 insertions(+)
-
-diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
-index da6510af1221..2ec02cbfda72 100644
---- a/drivers/pci/pci-driver.c
-+++ b/drivers/pci/pci-driver.c
-@@ -18,6 +18,7 @@
- #include <linux/kexec.h>
- #include <linux/of_device.h>
- #include <linux/acpi.h>
-+#include <linux/kernel.h>
- #include "pci.h"
- #include "pcie/portdrv.h"
-
-@@ -278,6 +279,34 @@ static const struct pci_device_id *pci_match_device(struct pci_driver *drv,
- 	return found_id;
- }
-
-+/**
-+ * pci_hw_vendor_status - Tell if a PCI device is supported by the HW vendor
-+ * @ids: array of PCI device id structures to search in
-+ * @dev: the PCI device structure to match against
-+ *
-+ * Used by a driver to check whether this device is in its list of unsupported
-+ * devices.  Returns the matching pci_device_id structure or %NULL if there is
-+ * no match.
-+ *
-+ * Reserved for Internal Red Hat use only.
-+ */
-+const struct pci_device_id *pci_hw_vendor_status(
-+						const struct pci_device_id *ids,
-+						struct pci_dev *dev)
-+{
-+	char devinfo[64];
-+	const struct pci_device_id *ret = pci_match_id(ids, dev);
-+
-+	if (ret) {
-+		snprintf(devinfo, sizeof(devinfo), "%s %s",
-+			 dev_driver_string(&dev->dev), dev_name(&dev->dev));
-+		mark_hardware_deprecated(devinfo);
-+	}
-+
-+	return ret;
-+}
-+EXPORT_SYMBOL(pci_hw_vendor_status);
-+
- struct drv_dev_and_id {
- 	struct pci_driver *drv;
- 	struct pci_dev *dev;
-diff --git a/include/linux/pci.h b/include/linux/pci.h
-index 34c1c4f45288..6d9a405feea5 100644
---- a/include/linux/pci.h
-+++ b/include/linux/pci.h
-@@ -1406,6 +1406,10 @@ int pci_add_dynid(struct pci_driver *drv,
- 		  unsigned long driver_data);
- const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
- 					 struct pci_dev *dev);
-+/* Reserved for Internal Red Hat use only */
-+const struct pci_device_id *pci_hw_vendor_status(
-+						const struct pci_device_id *ids,
-+						struct pci_dev *dev);
- int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max,
- 		    int pass);
-
--- 
-2.26.2
-

0001-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch

@@ -85,5 +85,5 @@ index ea5bf5f4cbed..71c55cae27ac 100644
  	tmp = ata_wait_register(ap, port_mmio + PORT_CMD,
  				PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500);
 -- 
-2.26.2
+2.28.0
 

0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch

@@ -1,128 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Prarit Bhargava <prarit@redhat.com>
-Date: Thu, 11 Jun 2020 21:03:36 -0400
-Subject: [PATCH] arch/x86: Remove vendor specific CPU ID checks
-
-Upstream Status: RHEL only
-
-After discussions with Devel, QE, Support, and Certification we have
-decided to drop the CPU specific checks in rh_check_supported().
-Certification is adopting a new process in which CPU certifications will
-be tracked on https://catalog.redhat.com.
-
-Remove the vendor specific CPU ID checks from rh_check_supported().
-
-Signed-off-by: Prarit Bhargava <prarit@redhat.com>
-Cc: David Arcari <darcari@redhat.com>
----
- arch/x86/kernel/setup.c | 85 -----------------------------------------
- 1 file changed, 85 deletions(-)
-
-diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 6d31895c8e92..4e43f6957621 100644
---- a/arch/x86/kernel/setup.c
-+++ b/arch/x86/kernel/setup.c
-@@ -757,72 +757,6 @@ static void __init trim_low_memory_range(void)
- }
-
- #ifdef CONFIG_RHEL_DIFFERENCES
--static bool valid_amd_processor(__u8 family, const char *model_id)
--{
--	bool valid;
--
--	switch(family) {
--	case 0x15:
--		valid = true;
--		break;
--
--	case 0x17:
--		valid = strstr(model_id, "AMD EPYC 7");
--		break;
--
--	default:
--		valid = false;
--		break;
--	}
--
--	return valid;
--}
--
--static bool valid_intel_processor(__u8 family, __u8 model, __u8 stepping)
--{
--	bool valid;
--
--	if (family != 6)
--		return false;
--
--	switch(model) {
--	case INTEL_FAM6_ATOM_GOLDMONT_D:
--	case INTEL_FAM6_ATOM_GOLDMONT_PLUS:
--
--	case INTEL_FAM6_BROADWELL:
--	case INTEL_FAM6_BROADWELL_G:
--	case INTEL_FAM6_BROADWELL_X:
--	case INTEL_FAM6_BROADWELL_D:
--
--	case INTEL_FAM6_HASWELL:
--	case INTEL_FAM6_HASWELL_G:
--	case INTEL_FAM6_HASWELL_L:
--	case INTEL_FAM6_HASWELL_X:
--		valid = true;
--		break;
--
--	case INTEL_FAM6_KABYLAKE:
--		valid = (stepping <= 10);
--		break;
--
--	case INTEL_FAM6_KABYLAKE_L:
--		valid = (stepping <= 11);
--		break;
--
--	case INTEL_FAM6_SKYLAKE_L:
--	case INTEL_FAM6_SKYLAKE:
--	case INTEL_FAM6_SKYLAKE_X:
--		/* stepping > 4 is Cascade Lake and is not supported */
--		valid = (stepping <= 4);
--		break;
--
--	default:
--		valid = false;
--		break;
--	}
--
--	return valid;
--}
-
- static void rh_check_supported(void)
- {
-@@ -843,27 +777,8 @@ static void rh_check_supported(void)
- 	 */
- 	switch (boot_cpu_data.x86_vendor) {
- 	case X86_VENDOR_AMD:
--		if (!valid_amd_processor(boot_cpu_data.x86,
--					 boot_cpu_data.x86_model_id)) {
--			pr_crit("Detected CPU family %xh model %d\n",
--				boot_cpu_data.x86,
--				boot_cpu_data.x86_model);
--			mark_hardware_unsupported("AMD Processor");
--		}
--		break;
--
- 	case X86_VENDOR_INTEL:
--		if (!valid_intel_processor(boot_cpu_data.x86,
--					   boot_cpu_data.x86_model,
--					   boot_cpu_data.x86_stepping)) {
--			pr_crit("Detected CPU family %d model %d stepping %d\n",
--				boot_cpu_data.x86,
--				boot_cpu_data.x86_model,
--				boot_cpu_data.x86_stepping);
--			mark_hardware_unsupported("Intel Processor");
--		}
- 		break;
--
- 	default:
- 		pr_crit("Detected processor %s %s\n",
- 			boot_cpu_data.x86_vendor_id,
--- 
-2.26.2
-

0001-arm-aarch64-Drop-the-EXPERT-setting-from-ARM64_FORCE.patch

@@ -21,7 +21,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 66dc41fd49f2..2e0700a451e5 100644
+index e11b4ea06127..74c5325108c0 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -861,7 +861,7 @@ endchoice
@@ -34,5 +34,5 @@ index 66dc41fd49f2..2e0700a451e5 100644
  	  For systems with 52-bit userspace VAs enabled, the kernel will attempt
  	  to maintain compatibility with older software by providing 48-bit VAs
 -- 
-2.26.2
+2.28.0
 

0001-arm-make-CONFIG_HIGHPTE-optional-without-CONFIG_EXPE.patch

@@ -11,10 +11,10 @@ Signed-off-by: Jon Masters <jcm@redhat.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 2ac74904a3ce..f0094424f76a 100644
+index e00d94b16658..4db48405b23a 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -1549,9 +1549,9 @@ config HIGHMEM
+@@ -1514,9 +1514,9 @@ config HIGHMEM
  	  If unsure, say n.
 
  config HIGHPTE
@@ -27,5 +27,5 @@ index 2ac74904a3ce..f0094424f76a 100644
  	  The VM uses one page of physical memory for each page table.
  	  For systems with a lot of processes, this can use a lot of
 -- 
-2.26.2
+2.28.0
 

0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch

@@ -1,81 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.io>
-Date: Mon, 16 Mar 2020 21:35:03 +0800
-Subject: [PATCH] arm64: allwinner: dts: a64: add LCD-related device nodes for
- PinePhone
-
-PinePhone uses PWM backlight and a XBD599 LCD panel over DSI for
-display.
-
-Add its device nodes.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
----
- .../dts/allwinner/sun50i-a64-pinephone.dtsi   | 37 +++++++++++++++++++
- 1 file changed, 37 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index cefda145c3c9..96d9150423e0 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -16,6 +16,15 @@ aliases {
- 		serial0 = &uart0;
- 	};
-
-+	backlight: backlight {
-+		compatible = "pwm-backlight";
-+		pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>;
-+		brightness-levels = <0 16 18 20 22 24 26 29 32 35 38 42 46 51 56 62 68 75 83 91 100>;
-+		default-brightness-level = <15>;
-+		enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
-+		power-supply = <&reg_ldo_io0>;
-+	};
-+
- 	chosen {
- 		stdout-path = "serial0:115200n8";
- 	};
-@@ -84,6 +93,30 @@ &dai {
- 	status = "okay";
- };
-
-+&de {
-+	status = "okay";
-+};
-+
-+&dphy {
-+	status = "okay";
-+};
-+
-+&dsi {
-+	vcc-dsi-supply = <&reg_dldo1>;
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	status = "okay";
-+
-+	panel@0 {
-+		compatible = "xingbangda,xbd599";
-+		reg = <0>;
-+		reset-gpios = <&pio 3 23 GPIO_ACTIVE_LOW>; /* PD23 */
-+		iovcc-supply = <&reg_dldo2>;
-+		vcc-supply = <&reg_ldo_io0>;
-+		backlight = <&backlight>;
-+	};
-+};
-+
- &ehci0 {
- 	status = "okay";
- };
-@@ -188,6 +221,10 @@ &r_pio {
- 	 */
- };
-
-+&r_pwm {
-+	status = "okay";
-+};
-+
- &r_rsb {
- 	status = "okay";
-
--- 
-2.26.2
-

0001-arm64-dts-sun50i-a64-pinephone-Add-touchscreen-suppo.patch

@@ -1,46 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:56:01 +0200
-Subject: [PATCH] arm64: dts: sun50i-a64-pinephone: Add touchscreen support
-
-Pinephone has a Goodix GT917S capacitive touchscreen controller on
-I2C0 bus. Add support for it.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- .../dts/allwinner/sun50i-a64-pinephone.dtsi   | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index 85a7aa5efd32..2d5694446d17 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -123,6 +123,25 @@ &ehci1 {
- 	status = "okay";
- };
-
-+&i2c0 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&i2c0_pins>;
-+	status = "okay";
-+
-+	touchscreen@5d {
-+		compatible = "goodix,gt917s", "goodix,gt911";
-+		reg = <0x5d>;
-+		interrupt-parent = <&pio>;
-+		interrupts = <7 4 IRQ_TYPE_LEVEL_HIGH>; /* PH4 */
-+		irq-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
-+		reset-gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */
-+		AVDD28-supply = <&reg_ldo_io0>;
-+		VDDIO-supply = <&reg_ldo_io0>;
-+		touchscreen-size-x = <720>;
-+		touchscreen-size-y = <1440>;
-+	};
-+};
-+
- &i2c1 {
- 	status = "okay";
-
--- 
-2.26.2
-

0001-arm64-dts-sun50i-a64-pinephone-Enable-LCD-support-on.patch

@@ -1,112 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.io>
-Date: Fri, 26 Jun 2020 02:56:00 +0200
-Subject: [PATCH] arm64: dts: sun50i-a64-pinephone: Enable LCD support on
- PinePhone
-
-PinePhone uses PWM backlight and a XBD599 LCD panel over DSI for
-display.
-
-Backlight levels curve was optimized by Martijn Braam using a
-lux meter.
-
-Add its device nodes.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
-Signed-off-by: Martijn Braam <martijn@brixit.nl>
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- .../allwinner/sun50i-a64-pinephone-1.1.dts    | 19 ++++++++++
- .../dts/allwinner/sun50i-a64-pinephone.dtsi   | 35 +++++++++++++++++++
- 2 files changed, 54 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-index 06a775c41664..3e99a87e9ce5 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
-@@ -9,3 +9,22 @@ / {
- 	model = "Pine64 PinePhone Braveheart (1.1)";
- 	compatible = "pine64,pinephone-1.1", "allwinner,sun50i-a64";
- };
-+
-+&backlight {
-+	power-supply = <&reg_ldo_io0>;
-+	/*
-+	 * PWM backlight circuit on this PinePhone revision was changed since
-+	 * 1.0, and the lowest PWM duty cycle that doesn't lead to backlight
-+	 * being off is around 20%. Duty cycle for the lowest brightness level
-+	 * also varries quite a bit between individual boards, so the lowest
-+	 * value here was chosen as a safe default.
-+	 */
-+	brightness-levels = <
-+		774  793  814  842
-+		882  935  1003 1088
-+		1192 1316 1462 1633
-+		1830 2054 2309 2596
-+		2916 3271 3664 4096>;
-+	num-interpolated-steps = <50>;
-+	default-brightness-level = <400>;
-+};
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-index cefda145c3c9..85a7aa5efd32 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
-@@ -16,6 +16,13 @@ aliases {
- 		serial0 = &uart0;
- 	};
-
-+	backlight: backlight {
-+		compatible = "pwm-backlight";
-+		pwms = <&r_pwm 0 50000 PWM_POLARITY_INVERTED>;
-+		enable-gpios = <&pio 7 10 GPIO_ACTIVE_HIGH>; /* PH10 */
-+		/* Backlight configuration differs per PinePhone revision. */
-+	};
-+
- 	chosen {
- 		stdout-path = "serial0:115200n8";
- 	};
-@@ -84,6 +91,30 @@ &dai {
- 	status = "okay";
- };
-
-+&de {
-+	status = "okay";
-+};
-+
-+&dphy {
-+	status = "okay";
-+};
-+
-+&dsi {
-+	vcc-dsi-supply = <&reg_dldo1>;
-+	#address-cells = <1>;
-+	#size-cells = <0>;
-+	status = "okay";
-+
-+	panel@0 {
-+		compatible = "xingbangda,xbd599";
-+		reg = <0>;
-+		reset-gpios = <&pio 3 23 GPIO_ACTIVE_LOW>; /* PD23 */
-+		iovcc-supply = <&reg_dldo2>;
-+		vcc-supply = <&reg_ldo_io0>;
-+		backlight = <&backlight>;
-+	};
-+};
-+
- &ehci0 {
- 	status = "okay";
- };
-@@ -188,6 +219,10 @@ &r_pio {
- 	 */
- };
-
-+&r_pwm {
-+	status = "okay";
-+};
-+
- &r_rsb {
- 	status = "okay";
-
--- 
-2.26.2
-

0001-be2iscsi-remove-unsupported-device-IDs.patch

@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Chris Leech <cleech@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:43 -0500
-Subject: [PATCH] be2iscsi: remove unsupported device IDs
-
-Message-id: <20180503194032.1461134-1-cleech@redhat.com>
-Patchwork-id: 212454
-O-Subject: [RHEL8 PATCH e-stor] scsi: be2iscsi: remove unsupported device IDs
-Bugzilla: 1574502
-RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-RH-Acked-by: Tom Coughlan <coughlan@redhat.com>
-RH-Acked-by: Ewan Milne <emilne@redhat.com>
-
-Bugzilla: 1574502
-Upstream Status: RHEL Specific
-Build Info: brew 15975638
-
-BladeEngine 2 generation devices are deprecated in RHEL 7
-and not supported in RHEL 8
-
-Signed-off-by: Chris Leech <cleech@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-be2iscsi: remove BE3 family support
-
-Message-id: <1530890927-5792-1-git-send-email-mlombard@redhat.com>
-Patchwork-id: 223576
-O-Subject: [RHEL8 e-stor PATCH] be2iscsi: remove BE3 family support
-Bugzilla: 1598366
-RH-Acked-by: Tomas Henzl <thenzl@redhat.com>
-RH-Acked-by: Chris Leech <cleech@redhat.com>
-
-BZ: https://bugzilla.redhat.com/show_bug.cgi?id98366
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID996775
-Upstream: RHEL-only, they tried to mark BE3 as unsupported
-          in upstream kernel but the patch has been rejected.
-          See: https://marc.info/?l=linux-scsi&m2835991600881&w=2
-
-Broadcom doesn't want to provide support for the BE3 device family
-in RHEL8.
-
-This patch removes the BE3's PCI-IDs.
-
-Upstream Status: RHEL only
-Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- drivers/scsi/be2iscsi/be_main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c
-index 9b81cfbbc5c5..1ca08297939c 100644
---- a/drivers/scsi/be2iscsi/be_main.c
-+++ b/drivers/scsi/be2iscsi/be_main.c
-@@ -370,11 +370,13 @@ static int beiscsi_eh_device_reset(struct scsi_cmnd *sc)
-
- /*------------------- PCI Driver operations and data ----------------- */
- static const struct pci_device_id beiscsi_pci_id_table[] = {
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID1) },
- 	{ PCI_DEVICE(BE_VENDOR_ID, BE_DEVICE_ID2) },
- 	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID1) },
- 	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID2) },
- 	{ PCI_DEVICE(BE_VENDOR_ID, OC_DEVICE_ID3) },
-+#endif
- 	{ PCI_DEVICE(ELX_VENDOR_ID, OC_SKH_ID1) },
- 	{ 0 }
- };
--- 
-2.26.2
-

0001-bpf-Add-tech-preview-taint-for-syscall.patch

@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eugene Syromiatnikov <esyr@redhat.com>
-Date: Thu, 14 Jun 2018 16:36:08 -0400
-Subject: [PATCH] bpf: Add tech preview taint for syscall
-
-Message-id: <394af3a9985d1ad9ea6741cb95ff145312d106b9.1528991396.git.esyr@redhat.com>
-Patchwork-id: 8251
-O-Subject: [kernel team] [RHEL8 PATCH v4 3/5] [bpf] bpf: Add tech preview taint for syscall
-Bugzilla: 1559877
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-RH-Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
-
-Adding tech preview taint for using the eBPF syscall.
-
-Based on a RHEL 7 commit "bpf: Add tech preview taint for syscall" by
-Jiri Olsa.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1559877
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16716594
-
-Upstream Status: RHEL only
-Signed-off-by: Jiri Olsa <jolsa@redhat.com>
-Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- kernel/bpf/syscall.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 60f70f31060e..628d0ba68106 100644
---- a/kernel/bpf/syscall.c
-+++ b/kernel/bpf/syscall.c
-@@ -4094,11 +4094,17 @@ static int bpf_iter_create(union bpf_attr *attr)
- SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, size)
- {
- 	union bpf_attr attr;
-+	static int marked;
- 	int err;
-
- 	if (sysctl_unprivileged_bpf_disabled && !bpf_capable())
- 		return -EPERM;
-
-+	if (!marked) {
-+		mark_tech_preview("eBPF syscall", NULL);
-+		marked = true;
-+	}
-+
- 	err = bpf_check_uarg_tail_zero(uattr, sizeof(attr), size);
- 	if (err)
- 		return err;
--- 
-2.26.2
-

0001-bpf-set-unprivileged_bpf_disabled-to-1-by-default-ad.patch

@@ -1,122 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Eugene Syromiatnikov <esyr@redhat.com>
-Date: Thu, 14 Jun 2018 16:36:02 -0400
-Subject: [PATCH] bpf: set unprivileged_bpf_disabled to 1 by default, add a
- boot parameter
-
-Message-id: <133022c6c389ca16060bd20ef69199de0800200b.1528991396.git.esyr@redhat.com>
-Patchwork-id: 8250
-O-Subject: [kernel team] [RHEL8 PATCH v4 2/5] [bpf] bpf: set unprivileged_bpf_disabled to 1 by default, add a boot parameter
-Bugzilla: 1561171
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-RH-Acked-by: Jesper Dangaard Brouer <brouer@redhat.com>
-
-This patch sets kernel.unprivileged_bpf_disabled sysctl knob to 1
-by default, and provides an ability (in a form of a boot-time parameter)
-to reset it to 0, as it is impossible to do so in runtime.  Since
-unprivileged BPF is considered unsupported, it also taints the kernel.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1561171
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=16716594
-Upstream: RHEL only.  The patch (in a more generic form) has been
-          proposed upstream[1] and subsequently rejected.
-
-[1] https://lkml.org/lkml/2018/5/21/344
-
-Upstream Status: RHEL only
-Signed-off-by: Eugene Syromiatnikov <esyr@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- .../admin-guide/kernel-parameters.txt         |  8 +++++++
- include/linux/kernel.h                        |  2 +-
- kernel/bpf/syscall.c                          | 21 ++++++++++++++++++-
- kernel/panic.c                                |  2 +-
- 4 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index fb95fad81c79..a43287854f8a 100644
---- a/Documentation/admin-guide/kernel-parameters.txt
-+++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -5277,6 +5277,14 @@
- 	unknown_nmi_panic
- 			[X86] Cause panic on unknown NMI.
-
-+	unprivileged_bpf_disabled=
-+			Format: { "0" | "1" }
-+			Sets the initial value of
-+			kernel.unprivileged_bpf_disabled sysctl knob.
-+			0 - unprivileged bpf() syscall access is enabled.
-+			1 - unprivileged bpf() syscall access is disabled.
-+			Default value is 1.
-+
- 	usbcore.authorized_default=
- 			[USB] Default USB device authorization:
- 			(default -1 = authorized except for wireless USB,
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 28be75396242..0a0081b10edb 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -618,7 +618,7 @@ extern enum system_states {
- #define TAINT_RESERVED28		28
- #define TAINT_RESERVED29		29
- #define TAINT_RESERVED30		30
--#define TAINT_RESERVED31		31
-+#define TAINT_UNPRIVILEGED_BPF		31
- /* End of Red Hat-specific taint flags */
- #define TAINT_FLAGS_COUNT		32
- #define TAINT_FLAGS_MAX			((1UL << TAINT_FLAGS_COUNT) - 1)
-diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
-index 0fd80ac81f70..60f70f31060e 100644
---- a/kernel/bpf/syscall.c
-+++ b/kernel/bpf/syscall.c
-@@ -24,6 +24,7 @@
- #include <linux/ctype.h>
- #include <linux/nospec.h>
- #include <linux/audit.h>
-+#include <linux/init.h>
- #include <uapi/linux/btf.h>
- #include <linux/pgtable.h>
- #include <linux/bpf_lsm.h>
-@@ -48,7 +49,25 @@ static DEFINE_SPINLOCK(map_idr_lock);
- static DEFINE_IDR(link_idr);
- static DEFINE_SPINLOCK(link_idr_lock);
-
--int sysctl_unprivileged_bpf_disabled __read_mostly;
-+/* RHEL-only: default to 1 */
-+int sysctl_unprivileged_bpf_disabled __read_mostly = 1;
-+
-+static int __init unprivileged_bpf_setup(char *str)
-+{
-+	unsigned long disabled;
-+	if (!kstrtoul(str, 0, &disabled))
-+		sysctl_unprivileged_bpf_disabled = !!disabled;
-+
-+	if (!sysctl_unprivileged_bpf_disabled) {
-+		pr_warn("Unprivileged BPF has been enabled "
-+			"(unprivileged_bpf_disabled=0 has been supplied "
-+			"in boot parameters), tainting the kernel");
-+		add_taint(TAINT_UNPRIVILEGED_BPF, LOCKDEP_STILL_OK);
-+	}
-+
-+	return 1;
-+}
-+__setup("unprivileged_bpf_disabled=", unprivileged_bpf_setup);
-
- static const struct bpf_map_ops * const bpf_map_types[] = {
- #define BPF_PROG_TYPE(_id, _name, prog_ctx_type, kern_ctx_type)
-diff --git a/kernel/panic.c b/kernel/panic.c
-index 534bc76e43da..e3bae852d92f 100644
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -399,7 +399,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
- 	[ TAINT_RESERVED28 ]		= { '?', '-', false },
- 	[ TAINT_RESERVED29 ]		= { '?', '-', false },
- 	[ TAINT_RESERVED30 ]		= { '?', '-', false },
--	[ TAINT_RESERVED31 ]		= { '?', '-', false },
-+	[ TAINT_UNPRIVILEGED_BPF ]	= { 'u', ' ', false },
- };
-
- /**
--- 
-2.26.2
-

0001-drm-nouveau-kms-handle-mDP-connectors.patch

@@ -0,0 +1,54 @@
+From 54a080fdc2e65b38aea4dd59dde357d6c340fa25 Mon Sep 17 00:00:00 2001
+From: Karol Herbst <kherbst@redhat.com>
+Date: Thu, 26 Nov 2020 14:47:50 +0100
+Subject: [PATCH] drm/nouveau/kms: handle mDP connectors
+
+In some cases we have the handle those explicitly as the fallback
+connector type detection fails and marks those as eDP connectors.
+
+Attempting to use such a connector with mutter leads to a crash of mutter
+as it ends up with two eDP displays.
+
+Information is taken from the official DCB documentation.
+
+Upstream Nouveau commit: 95adf381b74e86a8a34b93c3fab73c15dd2f3f5c
+
+Cc: stable@vger.kernel.org
+Cc: dri-devel@lists.freedesktop.org
+Cc: Ben Skeggs <bskeggs@redhat.com>
+Reported-by: Mark Pearson <markpearson@lenovo.com>
+Tested-by: Mark Pearson <markpearson@lenovo.com>
+Signed-off-by: Karol Herbst <kherbst@redhat.com>
+Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
+---
+ drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_connector.c             | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
+index f5f59261ea81..d1beaad0c82b 100644
+--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
++++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/conn.h
+@@ -14,6 +14,7 @@ enum dcb_connector_type {
+ 	DCB_CONNECTOR_LVDS_SPWG = 0x41,
+ 	DCB_CONNECTOR_DP = 0x46,
+ 	DCB_CONNECTOR_eDP = 0x47,
++	DCB_CONNECTOR_mDP = 0x48,
+ 	DCB_CONNECTOR_HDMI_0 = 0x60,
+ 	DCB_CONNECTOR_HDMI_1 = 0x61,
+ 	DCB_CONNECTOR_HDMI_C = 0x63,
+diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
+index 8b4b3688c7ae..4c992fd5bd68 100644
+--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
++++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
+@@ -1210,6 +1210,7 @@ drm_conntype_from_dcb(enum dcb_connector_type dcb)
+ 	case DCB_CONNECTOR_DMS59_DP0:
+ 	case DCB_CONNECTOR_DMS59_DP1:
+ 	case DCB_CONNECTOR_DP       :
++	case DCB_CONNECTOR_mDP      :
+ 	case DCB_CONNECTOR_USB_C    : return DRM_MODE_CONNECTOR_DisplayPort;
+ 	case DCB_CONNECTOR_eDP      : return DRM_MODE_CONNECTOR_eDP;
+ 	case DCB_CONNECTOR_HDMI_0   :
+-- 
+2.29.2
+

0001-drm-panel-add-Xingbangda-XBD599-panel.patch

@@ -17,7 +17,7 @@ Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
  create mode 100644 drivers/gpu/drm/panel/panel-xingbangda-xbd599.c
 
 diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
-index 39055c1f0e2f..1f55a87bb657 100644
+index de2f2a452be5..3ce658de416b 100644
 --- a/drivers/gpu/drm/panel/Kconfig
 +++ b/drivers/gpu/drm/panel/Kconfig
 @@ -462,6 +462,15 @@ config DRM_PANEL_VISIONOX_RM69299
@@ -37,7 +37,7 @@ index 39055c1f0e2f..1f55a87bb657 100644
  	tristate "Xinpeng XPP055C272 panel driver"
  	depends on OF
 diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
-index de74f282c433..7b6b0c0397d6 100644
+index e45ceac6286f..bd10617430ec 100644
 --- a/drivers/gpu/drm/panel/Makefile
 +++ b/drivers/gpu/drm/panel/Makefile
 @@ -49,4 +49,5 @@ obj-$(CONFIG_DRM_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
@@ -419,5 +419,5 @@ index 000000000000..b483f96ee1db
 +MODULE_DESCRIPTION("DRM driver for Xingbangda XBD599 MIPI DSI panel");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.26.2
+2.28.0
 

0001-drm-panel-rocktech-jh057n00900-Rename-the-driver-to-.patch

@@ -1,948 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:52 +0200
-Subject: [PATCH] drm/panel: rocktech-jh057n00900: Rename the driver to st7703
-
-This rename is done so that the driver matches the name of the
-display controller and in preparation for adding support for more
-panels to the driver.
-
-This is just a basic file rename, with no code changes.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- drivers/gpu/drm/panel/Kconfig                 |  26 +-
- drivers/gpu/drm/panel/Makefile                |   2 +-
- .../drm/panel/panel-rocktech-jh057n00900.c    | 424 ------------------
- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 424 ++++++++++++++++++
- 4 files changed, 438 insertions(+), 438 deletions(-)
- delete mode 100644 drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
- create mode 100644 drivers/gpu/drm/panel/panel-sitronix-st7703.c
-
-diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
-index 39055c1f0e2f..de2f2a452be5 100644
---- a/drivers/gpu/drm/panel/Kconfig
-+++ b/drivers/gpu/drm/panel/Kconfig
-@@ -283,19 +283,6 @@ config DRM_PANEL_RAYDIUM_RM68200
- 	  Say Y here if you want to enable support for Raydium RM68200
- 	  720x1280 DSI video mode panel.
-
--config DRM_PANEL_ROCKTECH_JH057N00900
--	tristate "Rocktech JH057N00900 MIPI touchscreen panel"
--	depends on OF
--	depends on DRM_MIPI_DSI
--	depends on BACKLIGHT_CLASS_DEVICE
--	help
--	  Say Y here if you want to enable support for Rocktech JH057N00900
--	  MIPI DSI panel as e.g. used in the Librem 5 devkit. It has a
--	  resolution of 720x1440 pixels, a built in backlight and touch
--	  controller.
--	  Touch input support is provided by the goodix driver and needs to be
--	  selected separately.
--
- config DRM_PANEL_RONBO_RB070D30
- 	tristate "Ronbo Electronics RB070D30 panel"
- 	depends on OF
-@@ -395,6 +382,19 @@ config DRM_PANEL_SITRONIX_ST7701
- 	  ST7701 controller for 480X864 LCD panels with MIPI/RGB/SPI
- 	  system interfaces.
-
-+config DRM_PANEL_SITRONIX_ST7703
-+	tristate "Sitronix ST7703 based MIPI touchscreen panels"
-+	depends on OF
-+	depends on DRM_MIPI_DSI
-+	depends on BACKLIGHT_CLASS_DEVICE
-+	help
-+	  Say Y here if you want to enable support for Sitronix ST7703 based
-+	  panels, souch as Rocktech JH057N00900 MIPI DSI panel as e.g. used in
-+	  the Librem 5 devkit. It has a resolution of 720x1440 pixels, a built
-+	  in backlight and touch controller.
-+	  Touch input support is provided by the goodix driver and needs to be
-+	  selected separately.
-+
- config DRM_PANEL_SITRONIX_ST7789V
- 	tristate "Sitronix ST7789V panel"
- 	depends on OF && SPI
-diff --git a/drivers/gpu/drm/panel/Makefile b/drivers/gpu/drm/panel/Makefile
-index de74f282c433..e45ceac6286f 100644
---- a/drivers/gpu/drm/panel/Makefile
-+++ b/drivers/gpu/drm/panel/Makefile
-@@ -27,7 +27,6 @@ obj-$(CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00) += panel-panasonic-vvx10f034n00.o
- obj-$(CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN) += panel-raspberrypi-touchscreen.o
- obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM67191) += panel-raydium-rm67191.o
- obj-$(CONFIG_DRM_PANEL_RAYDIUM_RM68200) += panel-raydium-rm68200.o
--obj-$(CONFIG_DRM_PANEL_ROCKTECH_JH057N00900) += panel-rocktech-jh057n00900.o
- obj-$(CONFIG_DRM_PANEL_RONBO_RB070D30) += panel-ronbo-rb070d30.o
- obj-$(CONFIG_DRM_PANEL_SAMSUNG_LD9040) += panel-samsung-ld9040.o
- obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6D16D0) += panel-samsung-s6d16d0.o
-@@ -41,6 +40,7 @@ obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o
- obj-$(CONFIG_DRM_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
- obj-$(CONFIG_DRM_PANEL_SHARP_LS043T1LE01) += panel-sharp-ls043t1le01.o
- obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7701) += panel-sitronix-st7701.o
-+obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7703) += panel-sitronix-st7703.o
- obj-$(CONFIG_DRM_PANEL_SITRONIX_ST7789V) += panel-sitronix-st7789v.o
- obj-$(CONFIG_DRM_PANEL_SONY_ACX424AKP) += panel-sony-acx424akp.o
- obj-$(CONFIG_DRM_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
-diff --git a/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c b/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
-deleted file mode 100644
-index 38ff742bc120..000000000000
---- a/drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c
-+++ /dev/null
-@@ -1,424 +0,0 @@
--// SPDX-License-Identifier: GPL-2.0
--/*
-- * Rockteck jh057n00900 5.5" MIPI-DSI panel driver
-- *
-- * Copyright (C) Purism SPC 2019
-- */
--
--#include <linux/debugfs.h>
--#include <linux/delay.h>
--#include <linux/gpio/consumer.h>
--#include <linux/media-bus-format.h>
--#include <linux/mod_devicetable.h>
--#include <linux/module.h>
--#include <linux/regulator/consumer.h>
--
--#include <video/display_timing.h>
--#include <video/mipi_display.h>
--
--#include <drm/drm_mipi_dsi.h>
--#include <drm/drm_modes.h>
--#include <drm/drm_panel.h>
--#include <drm/drm_print.h>
--
--#define DRV_NAME "panel-rocktech-jh057n00900"
--
--/* Manufacturer specific Commands send via DSI */
--#define ST7703_CMD_ALL_PIXEL_OFF 0x22
--#define ST7703_CMD_ALL_PIXEL_ON	 0x23
--#define ST7703_CMD_SETDISP	 0xB2
--#define ST7703_CMD_SETRGBIF	 0xB3
--#define ST7703_CMD_SETCYC	 0xB4
--#define ST7703_CMD_SETBGP	 0xB5
--#define ST7703_CMD_SETVCOM	 0xB6
--#define ST7703_CMD_SETOTP	 0xB7
--#define ST7703_CMD_SETPOWER_EXT	 0xB8
--#define ST7703_CMD_SETEXTC	 0xB9
--#define ST7703_CMD_SETMIPI	 0xBA
--#define ST7703_CMD_SETVDC	 0xBC
--#define ST7703_CMD_UNKNOWN0	 0xBF
--#define ST7703_CMD_SETSCR	 0xC0
--#define ST7703_CMD_SETPOWER	 0xC1
--#define ST7703_CMD_SETPANEL	 0xCC
--#define ST7703_CMD_SETGAMMA	 0xE0
--#define ST7703_CMD_SETEQ	 0xE3
--#define ST7703_CMD_SETGIP1	 0xE9
--#define ST7703_CMD_SETGIP2	 0xEA
--
--struct jh057n {
--	struct device *dev;
--	struct drm_panel panel;
--	struct gpio_desc *reset_gpio;
--	struct regulator *vcc;
--	struct regulator *iovcc;
--	bool prepared;
--
--	struct dentry *debugfs;
--};
--
--static inline struct jh057n *panel_to_jh057n(struct drm_panel *panel)
--{
--	return container_of(panel, struct jh057n, panel);
--}
--
--#define dsi_generic_write_seq(dsi, seq...) do {				\
--		static const u8 d[] = { seq };				\
--		int ret;						\
--		ret = mipi_dsi_generic_write(dsi, d, ARRAY_SIZE(d));	\
--		if (ret < 0)						\
--			return ret;					\
--	} while (0)
--
--static int jh057n_init_sequence(struct jh057n *ctx)
--{
--	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
--	struct device *dev = ctx->dev;
--	int ret;
--
--	/*
--	 * Init sequence was supplied by the panel vendor. Most of the commands
--	 * resemble the ST7703 but the number of parameters often don't match
--	 * so it's likely a clone.
--	 */
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETEXTC,
--			      0xF1, 0x12, 0x83);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETRGBIF,
--			      0x10, 0x10, 0x05, 0x05, 0x03, 0xFF, 0x00, 0x00,
--			      0x00, 0x00);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETSCR,
--			      0x73, 0x73, 0x50, 0x50, 0x00, 0x00, 0x08, 0x70,
--			      0x00);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETVDC, 0x4E);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETPANEL, 0x0B);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETCYC, 0x80);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETDISP, 0xF0, 0x12, 0x30);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETEQ,
--			      0x07, 0x07, 0x0B, 0x0B, 0x03, 0x0B, 0x00, 0x00,
--			      0x00, 0x00, 0xFF, 0x00, 0xC0, 0x10);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETBGP, 0x08, 0x08);
--	msleep(20);
--
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETVCOM, 0x3F, 0x3F);
--	dsi_generic_write_seq(dsi, ST7703_CMD_UNKNOWN0, 0x02, 0x11, 0x00);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETGIP1,
--			      0x82, 0x10, 0x06, 0x05, 0x9E, 0x0A, 0xA5, 0x12,
--			      0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38,
--			      0x0C, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x00,
--			      0x03, 0x00, 0x00, 0x00, 0x75, 0x75, 0x31, 0x88,
--			      0x88, 0x88, 0x88, 0x88, 0x88, 0x13, 0x88, 0x64,
--			      0x64, 0x20, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
--			      0x02, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETGIP2,
--			      0x02, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--			      0x00, 0x00, 0x00, 0x00, 0x02, 0x46, 0x02, 0x88,
--			      0x88, 0x88, 0x88, 0x88, 0x88, 0x64, 0x88, 0x13,
--			      0x57, 0x13, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
--			      0x75, 0x88, 0x23, 0x14, 0x00, 0x00, 0x02, 0x00,
--			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
--			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0A,
--			      0xA5, 0x00, 0x00, 0x00, 0x00);
--	dsi_generic_write_seq(dsi, ST7703_CMD_SETGAMMA,
--			      0x00, 0x09, 0x0E, 0x29, 0x2D, 0x3C, 0x41, 0x37,
--			      0x07, 0x0B, 0x0D, 0x10, 0x11, 0x0F, 0x10, 0x11,
--			      0x18, 0x00, 0x09, 0x0E, 0x29, 0x2D, 0x3C, 0x41,
--			      0x37, 0x07, 0x0B, 0x0D, 0x10, 0x11, 0x0F, 0x10,
--			      0x11, 0x18);
--	msleep(20);
--
--	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
--	if (ret < 0) {
--		DRM_DEV_ERROR(dev, "Failed to exit sleep mode: %d\n", ret);
--		return ret;
--	}
--	/* Panel is operational 120 msec after reset */
--	msleep(60);
--	ret = mipi_dsi_dcs_set_display_on(dsi);
--	if (ret)
--		return ret;
--
--	DRM_DEV_DEBUG_DRIVER(dev, "Panel init sequence done\n");
--	return 0;
--}
--
--static int jh057n_enable(struct drm_panel *panel)
--{
--	struct jh057n *ctx = panel_to_jh057n(panel);
--	int ret;
--
--	ret = jh057n_init_sequence(ctx);
--	if (ret < 0) {
--		DRM_DEV_ERROR(ctx->dev, "Panel init sequence failed: %d\n",
--			      ret);
--		return ret;
--	}
--
--	return 0;
--}
--
--static int jh057n_disable(struct drm_panel *panel)
--{
--	struct jh057n *ctx = panel_to_jh057n(panel);
--	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
--
--	return mipi_dsi_dcs_set_display_off(dsi);
--}
--
--static int jh057n_unprepare(struct drm_panel *panel)
--{
--	struct jh057n *ctx = panel_to_jh057n(panel);
--
--	if (!ctx->prepared)
--		return 0;
--
--	regulator_disable(ctx->iovcc);
--	regulator_disable(ctx->vcc);
--	ctx->prepared = false;
--
--	return 0;
--}
--
--static int jh057n_prepare(struct drm_panel *panel)
--{
--	struct jh057n *ctx = panel_to_jh057n(panel);
--	int ret;
--
--	if (ctx->prepared)
--		return 0;
--
--	DRM_DEV_DEBUG_DRIVER(ctx->dev, "Resetting the panel\n");
--	ret = regulator_enable(ctx->vcc);
--	if (ret < 0) {
--		DRM_DEV_ERROR(ctx->dev,
--			      "Failed to enable vcc supply: %d\n", ret);
--		return ret;
--	}
--	ret = regulator_enable(ctx->iovcc);
--	if (ret < 0) {
--		DRM_DEV_ERROR(ctx->dev,
--			      "Failed to enable iovcc supply: %d\n", ret);
--		goto disable_vcc;
--	}
--
--	gpiod_set_value_cansleep(ctx->reset_gpio, 1);
--	usleep_range(20, 40);
--	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
--	msleep(20);
--
--	ctx->prepared = true;
--
--	return 0;
--
--disable_vcc:
--	regulator_disable(ctx->vcc);
--	return ret;
--}
--
--static const struct drm_display_mode default_mode = {
--	.hdisplay    = 720,
--	.hsync_start = 720 + 90,
--	.hsync_end   = 720 + 90 + 20,
--	.htotal	     = 720 + 90 + 20 + 20,
--	.vdisplay    = 1440,
--	.vsync_start = 1440 + 20,
--	.vsync_end   = 1440 + 20 + 4,
--	.vtotal	     = 1440 + 20 + 4 + 12,
--	.vrefresh    = 60,
--	.clock	     = 75276,
--	.flags	     = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
--	.width_mm    = 65,
--	.height_mm   = 130,
--};
--
--static int jh057n_get_modes(struct drm_panel *panel,
--			    struct drm_connector *connector)
--{
--	struct jh057n *ctx = panel_to_jh057n(panel);
--	struct drm_display_mode *mode;
--
--	mode = drm_mode_duplicate(connector->dev, &default_mode);
--	if (!mode) {
--		DRM_DEV_ERROR(ctx->dev, "Failed to add mode %ux%u@%u\n",
--			      default_mode.hdisplay, default_mode.vdisplay,
--			      default_mode.vrefresh);
--		return -ENOMEM;
--	}
--
--	drm_mode_set_name(mode);
--
--	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
--	connector->display_info.width_mm = mode->width_mm;
--	connector->display_info.height_mm = mode->height_mm;
--	drm_mode_probed_add(connector, mode);
--
--	return 1;
--}
--
--static const struct drm_panel_funcs jh057n_drm_funcs = {
--	.disable   = jh057n_disable,
--	.unprepare = jh057n_unprepare,
--	.prepare   = jh057n_prepare,
--	.enable	   = jh057n_enable,
--	.get_modes = jh057n_get_modes,
--};
--
--static int allpixelson_set(void *data, u64 val)
--{
--	struct jh057n *ctx = data;
--	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
--
--	DRM_DEV_DEBUG_DRIVER(ctx->dev, "Setting all pixels on\n");
--	dsi_generic_write_seq(dsi, ST7703_CMD_ALL_PIXEL_ON);
--	msleep(val * 1000);
--	/* Reset the panel to get video back */
--	drm_panel_disable(&ctx->panel);
--	drm_panel_unprepare(&ctx->panel);
--	drm_panel_prepare(&ctx->panel);
--	drm_panel_enable(&ctx->panel);
--
--	return 0;
--}
--
--DEFINE_SIMPLE_ATTRIBUTE(allpixelson_fops, NULL,
--			allpixelson_set, "%llu\n");
--
--static void jh057n_debugfs_init(struct jh057n *ctx)
--{
--	ctx->debugfs = debugfs_create_dir(DRV_NAME, NULL);
--
--	debugfs_create_file("allpixelson", 0600, ctx->debugfs, ctx,
--			    &allpixelson_fops);
--}
--
--static void jh057n_debugfs_remove(struct jh057n *ctx)
--{
--	debugfs_remove_recursive(ctx->debugfs);
--	ctx->debugfs = NULL;
--}
--
--static int jh057n_probe(struct mipi_dsi_device *dsi)
--{
--	struct device *dev = &dsi->dev;
--	struct jh057n *ctx;
--	int ret;
--
--	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
--	if (!ctx)
--		return -ENOMEM;
--
--	ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
--	if (IS_ERR(ctx->reset_gpio)) {
--		DRM_DEV_ERROR(dev, "cannot get reset gpio\n");
--		return PTR_ERR(ctx->reset_gpio);
--	}
--
--	mipi_dsi_set_drvdata(dsi, ctx);
--
--	ctx->dev = dev;
--
--	dsi->lanes = 4;
--	dsi->format = MIPI_DSI_FMT_RGB888;
--	dsi->mode_flags = MIPI_DSI_MODE_VIDEO |
--		MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
--
--	ctx->vcc = devm_regulator_get(dev, "vcc");
--	if (IS_ERR(ctx->vcc)) {
--		ret = PTR_ERR(ctx->vcc);
--		if (ret != -EPROBE_DEFER)
--			DRM_DEV_ERROR(dev,
--				      "Failed to request vcc regulator: %d\n",
--				      ret);
--		return ret;
--	}
--	ctx->iovcc = devm_regulator_get(dev, "iovcc");
--	if (IS_ERR(ctx->iovcc)) {
--		ret = PTR_ERR(ctx->iovcc);
--		if (ret != -EPROBE_DEFER)
--			DRM_DEV_ERROR(dev,
--				      "Failed to request iovcc regulator: %d\n",
--				      ret);
--		return ret;
--	}
--
--	drm_panel_init(&ctx->panel, dev, &jh057n_drm_funcs,
--		       DRM_MODE_CONNECTOR_DSI);
--
--	ret = drm_panel_of_backlight(&ctx->panel);
--	if (ret)
--		return ret;
--
--	drm_panel_add(&ctx->panel);
--
--	ret = mipi_dsi_attach(dsi);
--	if (ret < 0) {
--		DRM_DEV_ERROR(dev,
--			      "mipi_dsi_attach failed (%d). Is host ready?\n",
--			      ret);
--		drm_panel_remove(&ctx->panel);
--		return ret;
--	}
--
--	DRM_DEV_INFO(dev, "%ux%u@%u %ubpp dsi %udl - ready\n",
--		     default_mode.hdisplay, default_mode.vdisplay,
--		     default_mode.vrefresh,
--		     mipi_dsi_pixel_format_to_bpp(dsi->format), dsi->lanes);
--
--	jh057n_debugfs_init(ctx);
--	return 0;
--}
--
--static void jh057n_shutdown(struct mipi_dsi_device *dsi)
--{
--	struct jh057n *ctx = mipi_dsi_get_drvdata(dsi);
--	int ret;
--
--	ret = drm_panel_unprepare(&ctx->panel);
--	if (ret < 0)
--		DRM_DEV_ERROR(&dsi->dev, "Failed to unprepare panel: %d\n",
--			      ret);
--
--	ret = drm_panel_disable(&ctx->panel);
--	if (ret < 0)
--		DRM_DEV_ERROR(&dsi->dev, "Failed to disable panel: %d\n",
--			      ret);
--}
--
--static int jh057n_remove(struct mipi_dsi_device *dsi)
--{
--	struct jh057n *ctx = mipi_dsi_get_drvdata(dsi);
--	int ret;
--
--	jh057n_shutdown(dsi);
--
--	ret = mipi_dsi_detach(dsi);
--	if (ret < 0)
--		DRM_DEV_ERROR(&dsi->dev, "Failed to detach from DSI host: %d\n",
--			      ret);
--
--	drm_panel_remove(&ctx->panel);
--
--	jh057n_debugfs_remove(ctx);
--
--	return 0;
--}
--
--static const struct of_device_id jh057n_of_match[] = {
--	{ .compatible = "rocktech,jh057n00900" },
--	{ /* sentinel */ }
--};
--MODULE_DEVICE_TABLE(of, jh057n_of_match);
--
--static struct mipi_dsi_driver jh057n_driver = {
--	.probe	= jh057n_probe,
--	.remove = jh057n_remove,
--	.shutdown = jh057n_shutdown,
--	.driver = {
--		.name = DRV_NAME,
--		.of_match_table = jh057n_of_match,
--	},
--};
--module_mipi_dsi_driver(jh057n_driver);
--
--MODULE_AUTHOR("Guido Günther <agx@sigxcpu.org>");
--MODULE_DESCRIPTION("DRM driver for Rocktech JH057N00900 MIPI DSI panel");
--MODULE_LICENSE("GPL v2");
-diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-new file mode 100644
-index 000000000000..38ff742bc120
---- /dev/null
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-@@ -0,0 +1,424 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Rockteck jh057n00900 5.5" MIPI-DSI panel driver
-+ *
-+ * Copyright (C) Purism SPC 2019
-+ */
-+
-+#include <linux/debugfs.h>
-+#include <linux/delay.h>
-+#include <linux/gpio/consumer.h>
-+#include <linux/media-bus-format.h>
-+#include <linux/mod_devicetable.h>
-+#include <linux/module.h>
-+#include <linux/regulator/consumer.h>
-+
-+#include <video/display_timing.h>
-+#include <video/mipi_display.h>
-+
-+#include <drm/drm_mipi_dsi.h>
-+#include <drm/drm_modes.h>
-+#include <drm/drm_panel.h>
-+#include <drm/drm_print.h>
-+
-+#define DRV_NAME "panel-rocktech-jh057n00900"
-+
-+/* Manufacturer specific Commands send via DSI */
-+#define ST7703_CMD_ALL_PIXEL_OFF 0x22
-+#define ST7703_CMD_ALL_PIXEL_ON	 0x23
-+#define ST7703_CMD_SETDISP	 0xB2
-+#define ST7703_CMD_SETRGBIF	 0xB3
-+#define ST7703_CMD_SETCYC	 0xB4
-+#define ST7703_CMD_SETBGP	 0xB5
-+#define ST7703_CMD_SETVCOM	 0xB6
-+#define ST7703_CMD_SETOTP	 0xB7
-+#define ST7703_CMD_SETPOWER_EXT	 0xB8
-+#define ST7703_CMD_SETEXTC	 0xB9
-+#define ST7703_CMD_SETMIPI	 0xBA
-+#define ST7703_CMD_SETVDC	 0xBC
-+#define ST7703_CMD_UNKNOWN0	 0xBF
-+#define ST7703_CMD_SETSCR	 0xC0
-+#define ST7703_CMD_SETPOWER	 0xC1
-+#define ST7703_CMD_SETPANEL	 0xCC
-+#define ST7703_CMD_SETGAMMA	 0xE0
-+#define ST7703_CMD_SETEQ	 0xE3
-+#define ST7703_CMD_SETGIP1	 0xE9
-+#define ST7703_CMD_SETGIP2	 0xEA
-+
-+struct jh057n {
-+	struct device *dev;
-+	struct drm_panel panel;
-+	struct gpio_desc *reset_gpio;
-+	struct regulator *vcc;
-+	struct regulator *iovcc;
-+	bool prepared;
-+
-+	struct dentry *debugfs;
-+};
-+
-+static inline struct jh057n *panel_to_jh057n(struct drm_panel *panel)
-+{
-+	return container_of(panel, struct jh057n, panel);
-+}
-+
-+#define dsi_generic_write_seq(dsi, seq...) do {				\
-+		static const u8 d[] = { seq };				\
-+		int ret;						\
-+		ret = mipi_dsi_generic_write(dsi, d, ARRAY_SIZE(d));	\
-+		if (ret < 0)						\
-+			return ret;					\
-+	} while (0)
-+
-+static int jh057n_init_sequence(struct jh057n *ctx)
-+{
-+	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
-+	struct device *dev = ctx->dev;
-+	int ret;
-+
-+	/*
-+	 * Init sequence was supplied by the panel vendor. Most of the commands
-+	 * resemble the ST7703 but the number of parameters often don't match
-+	 * so it's likely a clone.
-+	 */
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETEXTC,
-+			      0xF1, 0x12, 0x83);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETRGBIF,
-+			      0x10, 0x10, 0x05, 0x05, 0x03, 0xFF, 0x00, 0x00,
-+			      0x00, 0x00);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETSCR,
-+			      0x73, 0x73, 0x50, 0x50, 0x00, 0x00, 0x08, 0x70,
-+			      0x00);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETVDC, 0x4E);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETPANEL, 0x0B);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETCYC, 0x80);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETDISP, 0xF0, 0x12, 0x30);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETEQ,
-+			      0x07, 0x07, 0x0B, 0x0B, 0x03, 0x0B, 0x00, 0x00,
-+			      0x00, 0x00, 0xFF, 0x00, 0xC0, 0x10);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETBGP, 0x08, 0x08);
-+	msleep(20);
-+
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETVCOM, 0x3F, 0x3F);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_UNKNOWN0, 0x02, 0x11, 0x00);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETGIP1,
-+			      0x82, 0x10, 0x06, 0x05, 0x9E, 0x0A, 0xA5, 0x12,
-+			      0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38,
-+			      0x0C, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x00,
-+			      0x03, 0x00, 0x00, 0x00, 0x75, 0x75, 0x31, 0x88,
-+			      0x88, 0x88, 0x88, 0x88, 0x88, 0x13, 0x88, 0x64,
-+			      0x64, 0x20, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
-+			      0x02, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETGIP2,
-+			      0x02, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			      0x00, 0x00, 0x00, 0x00, 0x02, 0x46, 0x02, 0x88,
-+			      0x88, 0x88, 0x88, 0x88, 0x88, 0x64, 0x88, 0x13,
-+			      0x57, 0x13, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
-+			      0x75, 0x88, 0x23, 0x14, 0x00, 0x00, 0x02, 0x00,
-+			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x0A,
-+			      0xA5, 0x00, 0x00, 0x00, 0x00);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_SETGAMMA,
-+			      0x00, 0x09, 0x0E, 0x29, 0x2D, 0x3C, 0x41, 0x37,
-+			      0x07, 0x0B, 0x0D, 0x10, 0x11, 0x0F, 0x10, 0x11,
-+			      0x18, 0x00, 0x09, 0x0E, 0x29, 0x2D, 0x3C, 0x41,
-+			      0x37, 0x07, 0x0B, 0x0D, 0x10, 0x11, 0x0F, 0x10,
-+			      0x11, 0x18);
-+	msleep(20);
-+
-+	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
-+	if (ret < 0) {
-+		DRM_DEV_ERROR(dev, "Failed to exit sleep mode: %d\n", ret);
-+		return ret;
-+	}
-+	/* Panel is operational 120 msec after reset */
-+	msleep(60);
-+	ret = mipi_dsi_dcs_set_display_on(dsi);
-+	if (ret)
-+		return ret;
-+
-+	DRM_DEV_DEBUG_DRIVER(dev, "Panel init sequence done\n");
-+	return 0;
-+}
-+
-+static int jh057n_enable(struct drm_panel *panel)
-+{
-+	struct jh057n *ctx = panel_to_jh057n(panel);
-+	int ret;
-+
-+	ret = jh057n_init_sequence(ctx);
-+	if (ret < 0) {
-+		DRM_DEV_ERROR(ctx->dev, "Panel init sequence failed: %d\n",
-+			      ret);
-+		return ret;
-+	}
-+
-+	return 0;
-+}
-+
-+static int jh057n_disable(struct drm_panel *panel)
-+{
-+	struct jh057n *ctx = panel_to_jh057n(panel);
-+	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
-+
-+	return mipi_dsi_dcs_set_display_off(dsi);
-+}
-+
-+static int jh057n_unprepare(struct drm_panel *panel)
-+{
-+	struct jh057n *ctx = panel_to_jh057n(panel);
-+
-+	if (!ctx->prepared)
-+		return 0;
-+
-+	regulator_disable(ctx->iovcc);
-+	regulator_disable(ctx->vcc);
-+	ctx->prepared = false;
-+
-+	return 0;
-+}
-+
-+static int jh057n_prepare(struct drm_panel *panel)
-+{
-+	struct jh057n *ctx = panel_to_jh057n(panel);
-+	int ret;
-+
-+	if (ctx->prepared)
-+		return 0;
-+
-+	DRM_DEV_DEBUG_DRIVER(ctx->dev, "Resetting the panel\n");
-+	ret = regulator_enable(ctx->vcc);
-+	if (ret < 0) {
-+		DRM_DEV_ERROR(ctx->dev,
-+			      "Failed to enable vcc supply: %d\n", ret);
-+		return ret;
-+	}
-+	ret = regulator_enable(ctx->iovcc);
-+	if (ret < 0) {
-+		DRM_DEV_ERROR(ctx->dev,
-+			      "Failed to enable iovcc supply: %d\n", ret);
-+		goto disable_vcc;
-+	}
-+
-+	gpiod_set_value_cansleep(ctx->reset_gpio, 1);
-+	usleep_range(20, 40);
-+	gpiod_set_value_cansleep(ctx->reset_gpio, 0);
-+	msleep(20);
-+
-+	ctx->prepared = true;
-+
-+	return 0;
-+
-+disable_vcc:
-+	regulator_disable(ctx->vcc);
-+	return ret;
-+}
-+
-+static const struct drm_display_mode default_mode = {
-+	.hdisplay    = 720,
-+	.hsync_start = 720 + 90,
-+	.hsync_end   = 720 + 90 + 20,
-+	.htotal	     = 720 + 90 + 20 + 20,
-+	.vdisplay    = 1440,
-+	.vsync_start = 1440 + 20,
-+	.vsync_end   = 1440 + 20 + 4,
-+	.vtotal	     = 1440 + 20 + 4 + 12,
-+	.vrefresh    = 60,
-+	.clock	     = 75276,
-+	.flags	     = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
-+	.width_mm    = 65,
-+	.height_mm   = 130,
-+};
-+
-+static int jh057n_get_modes(struct drm_panel *panel,
-+			    struct drm_connector *connector)
-+{
-+	struct jh057n *ctx = panel_to_jh057n(panel);
-+	struct drm_display_mode *mode;
-+
-+	mode = drm_mode_duplicate(connector->dev, &default_mode);
-+	if (!mode) {
-+		DRM_DEV_ERROR(ctx->dev, "Failed to add mode %ux%u@%u\n",
-+			      default_mode.hdisplay, default_mode.vdisplay,
-+			      default_mode.vrefresh);
-+		return -ENOMEM;
-+	}
-+
-+	drm_mode_set_name(mode);
-+
-+	mode->type = DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED;
-+	connector->display_info.width_mm = mode->width_mm;
-+	connector->display_info.height_mm = mode->height_mm;
-+	drm_mode_probed_add(connector, mode);
-+
-+	return 1;
-+}
-+
-+static const struct drm_panel_funcs jh057n_drm_funcs = {
-+	.disable   = jh057n_disable,
-+	.unprepare = jh057n_unprepare,
-+	.prepare   = jh057n_prepare,
-+	.enable	   = jh057n_enable,
-+	.get_modes = jh057n_get_modes,
-+};
-+
-+static int allpixelson_set(void *data, u64 val)
-+{
-+	struct jh057n *ctx = data;
-+	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
-+
-+	DRM_DEV_DEBUG_DRIVER(ctx->dev, "Setting all pixels on\n");
-+	dsi_generic_write_seq(dsi, ST7703_CMD_ALL_PIXEL_ON);
-+	msleep(val * 1000);
-+	/* Reset the panel to get video back */
-+	drm_panel_disable(&ctx->panel);
-+	drm_panel_unprepare(&ctx->panel);
-+	drm_panel_prepare(&ctx->panel);
-+	drm_panel_enable(&ctx->panel);
-+
-+	return 0;
-+}
-+
-+DEFINE_SIMPLE_ATTRIBUTE(allpixelson_fops, NULL,
-+			allpixelson_set, "%llu\n");
-+
-+static void jh057n_debugfs_init(struct jh057n *ctx)
-+{
-+	ctx->debugfs = debugfs_create_dir(DRV_NAME, NULL);
-+
-+	debugfs_create_file("allpixelson", 0600, ctx->debugfs, ctx,
-+			    &allpixelson_fops);
-+}
-+
-+static void jh057n_debugfs_remove(struct jh057n *ctx)
-+{
-+	debugfs_remove_recursive(ctx->debugfs);
-+	ctx->debugfs = NULL;
-+}
-+
-+static int jh057n_probe(struct mipi_dsi_device *dsi)
-+{
-+	struct device *dev = &dsi->dev;
-+	struct jh057n *ctx;
-+	int ret;
-+
-+	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
-+	if (!ctx)
-+		return -ENOMEM;
-+
-+	ctx->reset_gpio = devm_gpiod_get(dev, "reset", GPIOD_OUT_LOW);
-+	if (IS_ERR(ctx->reset_gpio)) {
-+		DRM_DEV_ERROR(dev, "cannot get reset gpio\n");
-+		return PTR_ERR(ctx->reset_gpio);
-+	}
-+
-+	mipi_dsi_set_drvdata(dsi, ctx);
-+
-+	ctx->dev = dev;
-+
-+	dsi->lanes = 4;
-+	dsi->format = MIPI_DSI_FMT_RGB888;
-+	dsi->mode_flags = MIPI_DSI_MODE_VIDEO |
-+		MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
-+
-+	ctx->vcc = devm_regulator_get(dev, "vcc");
-+	if (IS_ERR(ctx->vcc)) {
-+		ret = PTR_ERR(ctx->vcc);
-+		if (ret != -EPROBE_DEFER)
-+			DRM_DEV_ERROR(dev,
-+				      "Failed to request vcc regulator: %d\n",
-+				      ret);
-+		return ret;
-+	}
-+	ctx->iovcc = devm_regulator_get(dev, "iovcc");
-+	if (IS_ERR(ctx->iovcc)) {
-+		ret = PTR_ERR(ctx->iovcc);
-+		if (ret != -EPROBE_DEFER)
-+			DRM_DEV_ERROR(dev,
-+				      "Failed to request iovcc regulator: %d\n",
-+				      ret);
-+		return ret;
-+	}
-+
-+	drm_panel_init(&ctx->panel, dev, &jh057n_drm_funcs,
-+		       DRM_MODE_CONNECTOR_DSI);
-+
-+	ret = drm_panel_of_backlight(&ctx->panel);
-+	if (ret)
-+		return ret;
-+
-+	drm_panel_add(&ctx->panel);
-+
-+	ret = mipi_dsi_attach(dsi);
-+	if (ret < 0) {
-+		DRM_DEV_ERROR(dev,
-+			      "mipi_dsi_attach failed (%d). Is host ready?\n",
-+			      ret);
-+		drm_panel_remove(&ctx->panel);
-+		return ret;
-+	}
-+
-+	DRM_DEV_INFO(dev, "%ux%u@%u %ubpp dsi %udl - ready\n",
-+		     default_mode.hdisplay, default_mode.vdisplay,
-+		     default_mode.vrefresh,
-+		     mipi_dsi_pixel_format_to_bpp(dsi->format), dsi->lanes);
-+
-+	jh057n_debugfs_init(ctx);
-+	return 0;
-+}
-+
-+static void jh057n_shutdown(struct mipi_dsi_device *dsi)
-+{
-+	struct jh057n *ctx = mipi_dsi_get_drvdata(dsi);
-+	int ret;
-+
-+	ret = drm_panel_unprepare(&ctx->panel);
-+	if (ret < 0)
-+		DRM_DEV_ERROR(&dsi->dev, "Failed to unprepare panel: %d\n",
-+			      ret);
-+
-+	ret = drm_panel_disable(&ctx->panel);
-+	if (ret < 0)
-+		DRM_DEV_ERROR(&dsi->dev, "Failed to disable panel: %d\n",
-+			      ret);
-+}
-+
-+static int jh057n_remove(struct mipi_dsi_device *dsi)
-+{
-+	struct jh057n *ctx = mipi_dsi_get_drvdata(dsi);
-+	int ret;
-+
-+	jh057n_shutdown(dsi);
-+
-+	ret = mipi_dsi_detach(dsi);
-+	if (ret < 0)
-+		DRM_DEV_ERROR(&dsi->dev, "Failed to detach from DSI host: %d\n",
-+			      ret);
-+
-+	drm_panel_remove(&ctx->panel);
-+
-+	jh057n_debugfs_remove(ctx);
-+
-+	return 0;
-+}
-+
-+static const struct of_device_id jh057n_of_match[] = {
-+	{ .compatible = "rocktech,jh057n00900" },
-+	{ /* sentinel */ }
-+};
-+MODULE_DEVICE_TABLE(of, jh057n_of_match);
-+
-+static struct mipi_dsi_driver jh057n_driver = {
-+	.probe	= jh057n_probe,
-+	.remove = jh057n_remove,
-+	.shutdown = jh057n_shutdown,
-+	.driver = {
-+		.name = DRV_NAME,
-+		.of_match_table = jh057n_of_match,
-+	},
-+};
-+module_mipi_dsi_driver(jh057n_driver);
-+
-+MODULE_AUTHOR("Guido Günther <agx@sigxcpu.org>");
-+MODULE_DESCRIPTION("DRM driver for Rocktech JH057N00900 MIPI DSI panel");
-+MODULE_LICENSE("GPL v2");
--- 
-2.26.2
-

0001-drm-panel-st7703-Add-support-for-Xingbangda-XBD599.patch

@@ -1,251 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:57 +0200
-Subject: [PATCH] drm/panel: st7703: Add support for Xingbangda XBD599
-
-Xingbangda XBD599 is a 5.99" 720x1440 MIPI-DSI LCD panel used in
-PinePhone. Add support for it.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 199 +++++++++++++++++-
- 1 file changed, 197 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-index cdbf7dfb4dd4..33611419059a 100644
---- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-@@ -39,10 +39,11 @@
- #define ST7703_CMD_SETEXTC	 0xB9
- #define ST7703_CMD_SETMIPI	 0xBA
- #define ST7703_CMD_SETVDC	 0xBC
--#define ST7703_CMD_UNKNOWN0	 0xBF
-+#define ST7703_CMD_UNKNOWN_BF	 0xBF
- #define ST7703_CMD_SETSCR	 0xC0
- #define ST7703_CMD_SETPOWER	 0xC1
- #define ST7703_CMD_SETPANEL	 0xCC
-+#define ST7703_CMD_UNKNOWN_C6	 0xC6
- #define ST7703_CMD_SETGAMMA	 0xE0
- #define ST7703_CMD_SETEQ	 0xE3
- #define ST7703_CMD_SETGIP1	 0xE9
-@@ -109,7 +110,7 @@ static int jh057n_init_sequence(struct st7703 *ctx)
- 	msleep(20);
-
- 	dsi_generic_write_seq(dsi, ST7703_CMD_SETVCOM, 0x3F, 0x3F);
--	dsi_generic_write_seq(dsi, ST7703_CMD_UNKNOWN0, 0x02, 0x11, 0x00);
-+	dsi_generic_write_seq(dsi, ST7703_CMD_UNKNOWN_BF, 0x02, 0x11, 0x00);
- 	dsi_generic_write_seq(dsi, ST7703_CMD_SETGIP1,
- 			      0x82, 0x10, 0x06, 0x05, 0x9E, 0x0A, 0xA5, 0x12,
- 			      0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38,
-@@ -163,6 +164,199 @@ struct st7703_panel_desc jh057n00900_panel_desc = {
- 	.init_sequence = jh057n_init_sequence,
- };
-
-+#define dsi_dcs_write_seq(dsi, cmd, seq...) do {			\
-+		static const u8 d[] = { seq };				\
-+		int ret;						\
-+		ret = mipi_dsi_dcs_write(dsi, cmd, d, ARRAY_SIZE(d));	\
-+		if (ret < 0)						\
-+			return ret;					\
-+	} while (0)
-+
-+
-+static int xbd599_init_sequence(struct st7703 *ctx)
-+{
-+	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
-+
-+	/*
-+	 * Init sequence was supplied by the panel vendor.
-+	 */
-+
-+	/* Magic sequence to unlock user commands below. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETEXTC, 0xF1, 0x12, 0x83);
-+
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETMIPI,
-+			  0x33, /* VC_main = 0, Lane_Number = 3 (4 lanes) */
-+			  0x81, /* DSI_LDO_SEL = 1.7V, RTERM = 90 Ohm */
-+			  0x05, /* IHSRX = x6 (Low High Speed driving ability) */
-+			  0xF9, /* TX_CLK_SEL = fDSICLK/16 */
-+			  0x0E, /* HFP_OSC (min. HFP number in DSI mode) */
-+			  0x0E, /* HBP_OSC (min. HBP number in DSI mode) */
-+			  /* The rest is undocumented in ST7703 datasheet */
-+			  0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			  0x44, 0x25, 0x00, 0x91, 0x0a, 0x00, 0x00, 0x02,
-+			  0x4F, 0x11, 0x00, 0x00, 0x37);
-+
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER_EXT,
-+			  0x25, /* PCCS = 2, ECP_DC_DIV = 1/4 HSYNC */
-+			  0x22, /* DT = 15ms XDK_ECP = x2 */
-+			  0x20, /* PFM_DC_DIV = /1 */
-+			  0x03  /* ECP_SYNC_EN = 1, VGX_SYNC_EN = 1 */);
-+
-+	/* RGB I/F porch timing */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETRGBIF,
-+			  0x10, /* VBP_RGB_GEN */
-+			  0x10, /* VFP_RGB_GEN */
-+			  0x05, /* DE_BP_RGB_GEN */
-+			  0x05, /* DE_FP_RGB_GEN */
-+			  /* The rest is undocumented in ST7703 datasheet */
-+			  0x03, 0xFF,
-+			  0x00, 0x00,
-+			  0x00, 0x00);
-+
-+	/* Source driving settings. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETSCR,
-+			  0x73, /* N_POPON */
-+			  0x73, /* N_NOPON */
-+			  0x50, /* I_POPON */
-+			  0x50, /* I_NOPON */
-+			  0x00, /* SCR[31,24] */
-+			  0xC0, /* SCR[23,16] */
-+			  0x08, /* SCR[15,8] */
-+			  0x70, /* SCR[7,0] */
-+			  0x00  /* Undocumented */);
-+
-+	/* NVDDD_SEL = -1.8V, VDDD_SEL = out of range (possibly 1.9V?) */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETVDC, 0x4E);
-+
-+	/*
-+	 * SS_PANEL = 1 (reverse scan), GS_PANEL = 0 (normal scan)
-+	 * REV_PANEL = 1 (normally black panel), BGR_PANEL = 1 (BGR)
-+	 */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETPANEL, 0x0B);
-+
-+	/* Zig-Zag Type C column inversion. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETCYC, 0x80);
-+
-+	/* Set display resolution. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETDISP,
-+			  0xF0, /* NL = 240 */
-+			  0x12, /* RES_V_LSB = 0, BLK_CON = VSSD,
-+				 * RESO_SEL = 720RGB
-+				 */
-+			  0xF0  /* WHITE_GND_EN = 1 (GND),
-+				 * WHITE_FRAME_SEL = 7 frames,
-+				 * ISC = 0 frames
-+				 */);
-+
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETEQ,
-+			  0x00, /* PNOEQ */
-+			  0x00, /* NNOEQ */
-+			  0x0B, /* PEQGND */
-+			  0x0B, /* NEQGND */
-+			  0x10, /* PEQVCI */
-+			  0x10, /* NEQVCI */
-+			  0x00, /* PEQVCI1 */
-+			  0x00, /* NEQVCI1 */
-+			  0x00, /* reserved */
-+			  0x00, /* reserved */
-+			  0xFF, /* reserved */
-+			  0x00, /* reserved */
-+			  0xC0, /* ESD_DET_DATA_WHITE = 1, ESD_WHITE_EN = 1 */
-+			  0x10  /* SLPIN_OPTION = 1 (no need vsync after sleep-in)
-+				 * VEDIO_NO_CHECK_EN = 0
-+				 * ESD_WHITE_GND_EN = 0
-+				 * ESD_DET_TIME_SEL = 0 frames
-+				 */);
-+
-+	/* Undocumented command. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_UNKNOWN_C6, 0x01, 0x00, 0xFF, 0xFF, 0x00);
-+
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETPOWER,
-+			  0x74, /* VBTHS, VBTLS: VGH = 17V, VBL = -11V */
-+			  0x00, /* FBOFF_VGH = 0, FBOFF_VGL = 0 */
-+			  0x32, /* VRP  */
-+			  0x32, /* VRN */
-+			  0x77, /* reserved */
-+			  0xF1, /* APS = 1 (small),
-+				 * VGL_DET_EN = 1, VGH_DET_EN = 1,
-+				 * VGL_TURBO = 1, VGH_TURBO = 1
-+				 */
-+			  0xFF, /* VGH1_L_DIV, VGL1_L_DIV (1.5MHz) */
-+			  0xFF, /* VGH1_R_DIV, VGL1_R_DIV (1.5MHz) */
-+			  0xCC, /* VGH2_L_DIV, VGL2_L_DIV (2.6MHz) */
-+			  0xCC, /* VGH2_R_DIV, VGL2_R_DIV (2.6MHz) */
-+			  0x77, /* VGH3_L_DIV, VGL3_L_DIV (4.5MHz) */
-+			  0x77  /* VGH3_R_DIV, VGL3_R_DIV (4.5MHz) */);
-+
-+	/* Reference voltage. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETBGP,
-+			  0x07, /* VREF_SEL = 4.2V */
-+			  0x07  /* NVREF_SEL = 4.2V */);
-+
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETVCOM,
-+			  0x2C, /* VCOMDC_F = -0.67V */
-+			  0x2C  /* VCOMDC_B = -0.67V */);
-+
-+	/* Undocumented command. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_UNKNOWN_BF, 0x02, 0x11, 0x00);
-+
-+	/* This command is to set forward GIP timing. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP1,
-+			  0x82, 0x10, 0x06, 0x05, 0xA2, 0x0A, 0xA5, 0x12,
-+			  0x31, 0x23, 0x37, 0x83, 0x04, 0xBC, 0x27, 0x38,
-+			  0x0C, 0x00, 0x03, 0x00, 0x00, 0x00, 0x0C, 0x00,
-+			  0x03, 0x00, 0x00, 0x00, 0x75, 0x75, 0x31, 0x88,
-+			  0x88, 0x88, 0x88, 0x88, 0x88, 0x13, 0x88, 0x64,
-+			  0x64, 0x20, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
-+			  0x02, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
-+
-+	/* This command is to set backward GIP timing. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETGIP2,
-+			  0x02, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			  0x00, 0x00, 0x00, 0x00, 0x02, 0x46, 0x02, 0x88,
-+			  0x88, 0x88, 0x88, 0x88, 0x88, 0x64, 0x88, 0x13,
-+			  0x57, 0x13, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88,
-+			  0x75, 0x88, 0x23, 0x14, 0x00, 0x00, 0x02, 0x00,
-+			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-+			  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0A,
-+			  0xA5, 0x00, 0x00, 0x00, 0x00);
-+
-+	/* Adjust the gamma characteristics of the panel. */
-+	dsi_dcs_write_seq(dsi, ST7703_CMD_SETGAMMA,
-+			  0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41, 0x35,
-+			  0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12, 0x12,
-+			  0x18, 0x00, 0x09, 0x0D, 0x23, 0x27, 0x3C, 0x41,
-+			  0x35, 0x07, 0x0D, 0x0E, 0x12, 0x13, 0x10, 0x12,
-+			  0x12, 0x18);
-+
-+	return 0;
-+}
-+
-+static const struct drm_display_mode xbd599_mode = {
-+	.hdisplay    = 720,
-+	.hsync_start = 720 + 40,
-+	.hsync_end   = 720 + 40 + 40,
-+	.htotal	     = 720 + 40 + 40 + 40,
-+	.vdisplay    = 1440,
-+	.vsync_start = 1440 + 18,
-+	.vsync_end   = 1440 + 18 + 10,
-+	.vtotal	     = 1440 + 18 + 10 + 17,
-+	.vrefresh    = 60,
-+	.clock	     = 69000,
-+	.flags	     = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
-+	.width_mm    = 68,
-+	.height_mm   = 136,
-+};
-+
-+static const struct st7703_panel_desc xbd599_desc = {
-+	.mode = &xbd599_mode,
-+	.lanes = 4,
-+	.mode_flags = MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_SYNC_PULSE,
-+	.format = MIPI_DSI_FMT_RGB888,
-+	.init_sequence = xbd599_init_sequence,
-+};
-+
- static int st7703_enable(struct drm_panel *panel)
- {
- 	struct st7703 *ctx = panel_to_st7703(panel);
-@@ -428,6 +622,7 @@ static int st7703_remove(struct mipi_dsi_device *dsi)
-
- static const struct of_device_id st7703_of_match[] = {
- 	{ .compatible = "rocktech,jh057n00900", .data = &jh057n00900_panel_desc },
-+	{ .compatible = "xingbangda,xbd599", .data = &xbd599_desc },
- 	{ /* sentinel */ }
- };
- MODULE_DEVICE_TABLE(of, st7703_of_match);
--- 
-2.26.2
-

0001-drm-panel-st7703-Assert-reset-prior-to-powering-down.patch

@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:59 +0200
-Subject: [PATCH] drm/panel: st7703: Assert reset prior to powering down the
- regulators
-
-The reset pin is inverted, so if we don't assert reset, the actual gpio
-will be high and may keep driving the IO port of the panel.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-index e771281eb547..92930e127559 100644
---- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-@@ -416,6 +416,7 @@ static int st7703_unprepare(struct drm_panel *panel)
- 	if (!ctx->prepared)
- 		return 0;
-
-+	gpiod_set_value_cansleep(ctx->reset_gpio, 1);
- 	regulator_disable(ctx->iovcc);
- 	regulator_disable(ctx->vcc);
- 	ctx->prepared = false;
--- 
-2.26.2
-

0001-drm-panel-st7703-Enter-sleep-after-display-off.patch

@@ -1,41 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:58 +0200
-Subject: [PATCH] drm/panel: st7703: Enter sleep after display off
-
-The datasheet suggests to issue sleep in after display off
-as a part of the panel's shutdown sequence.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-index 33611419059a..e771281eb547 100644
---- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-@@ -394,8 +394,19 @@ static int st7703_disable(struct drm_panel *panel)
- {
- 	struct st7703 *ctx = panel_to_st7703(panel);
- 	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
-+	int ret;
-+
-+	ret = mipi_dsi_dcs_set_display_off(dsi);
-+	if (ret < 0)
-+		DRM_DEV_ERROR(ctx->dev,
-+			      "Failed to turn off the display: %d\n", ret);
-
--	return mipi_dsi_dcs_set_display_off(dsi);
-+	ret = mipi_dsi_dcs_enter_sleep_mode(dsi);
-+	if (ret < 0)
-+		DRM_DEV_ERROR(ctx->dev,
-+			      "Failed to enter sleep mode: %d\n", ret);
-+
-+	return 0;
- }
-
- static int st7703_unprepare(struct drm_panel *panel)
--- 
-2.26.2
-

0001-drm-panel-st7703-Move-code-specific-to-jh057n-closer.patch

@@ -1,84 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:55 +0200
-Subject: [PATCH] drm/panel: st7703: Move code specific to jh057n closer
- together
-
-It's better than having it spread around the driver.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 50 +++++++++----------
- 1 file changed, 25 insertions(+), 25 deletions(-)
-
-diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-index 08cbc316266c..d03aab10cfef 100644
---- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-@@ -153,6 +153,31 @@ static int jh057n_init_sequence(struct st7703 *ctx)
- 	return 0;
- }
-
-+static const struct drm_display_mode jh057n00900_mode = {
-+	.hdisplay    = 720,
-+	.hsync_start = 720 + 90,
-+	.hsync_end   = 720 + 90 + 20,
-+	.htotal	     = 720 + 90 + 20 + 20,
-+	.vdisplay    = 1440,
-+	.vsync_start = 1440 + 20,
-+	.vsync_end   = 1440 + 20 + 4,
-+	.vtotal	     = 1440 + 20 + 4 + 12,
-+	.vrefresh    = 60,
-+	.clock	     = 75276,
-+	.flags	     = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
-+	.width_mm    = 65,
-+	.height_mm   = 130,
-+};
-+
-+struct st7703_panel_desc jh057n00900_panel_desc = {
-+	.mode = &jh057n00900_mode,
-+	.lanes = 4,
-+	.mode_flags = MIPI_DSI_MODE_VIDEO |
-+		MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE,
-+	.format = MIPI_DSI_FMT_RGB888,
-+	.init_sequence = jh057n_init_sequence,
-+};
-+
- static int st7703_enable(struct drm_panel *panel)
- {
- 	struct st7703 *ctx = panel_to_st7703(panel);
-@@ -226,31 +251,6 @@ static int st7703_prepare(struct drm_panel *panel)
- 	return ret;
- }
-
--static const struct drm_display_mode jh057n00900_mode = {
--	.hdisplay    = 720,
--	.hsync_start = 720 + 90,
--	.hsync_end   = 720 + 90 + 20,
--	.htotal	     = 720 + 90 + 20 + 20,
--	.vdisplay    = 1440,
--	.vsync_start = 1440 + 20,
--	.vsync_end   = 1440 + 20 + 4,
--	.vtotal	     = 1440 + 20 + 4 + 12,
--	.vrefresh    = 60,
--	.clock	     = 75276,
--	.flags	     = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC,
--	.width_mm    = 65,
--	.height_mm   = 130,
--};
--
--struct st7703_panel_desc jh057n00900_panel_desc = {
--	.mode = &jh057n00900_mode,
--	.lanes = 4,
--	.mode_flags = MIPI_DSI_MODE_VIDEO |
--		MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE,
--	.format = MIPI_DSI_FMT_RGB888,
--	.init_sequence = jh057n_init_sequence,
--};
--
- static int st7703_get_modes(struct drm_panel *panel,
- 			    struct drm_connector *connector)
- {
--- 
-2.26.2
-

0001-drm-panel-st7703-Move-generic-part-of-init-sequence-.patch

@@ -1,84 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:56 +0200
-Subject: [PATCH] drm/panel: st7703: Move generic part of init sequence to
- enable callback
-
-Calling sleep out and display on is a controller specific part
-of the initialization process. Move it out of the panel specific
-initialization function to the enable callback.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 33 ++++++++++---------
- 1 file changed, 18 insertions(+), 15 deletions(-)
-
-diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-index d03aab10cfef..cdbf7dfb4dd4 100644
---- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-@@ -84,8 +84,6 @@ static inline struct st7703 *panel_to_st7703(struct drm_panel *panel)
- static int jh057n_init_sequence(struct st7703 *ctx)
- {
- 	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
--	struct device *dev = ctx->dev;
--	int ret;
-
- 	/*
- 	 * Init sequence was supplied by the panel vendor. Most of the commands
-@@ -136,20 +134,7 @@ static int jh057n_init_sequence(struct st7703 *ctx)
- 			      0x18, 0x00, 0x09, 0x0E, 0x29, 0x2D, 0x3C, 0x41,
- 			      0x37, 0x07, 0x0B, 0x0D, 0x10, 0x11, 0x0F, 0x10,
- 			      0x11, 0x18);
--	msleep(20);
--
--	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
--	if (ret < 0) {
--		DRM_DEV_ERROR(dev, "Failed to exit sleep mode: %d\n", ret);
--		return ret;
--	}
--	/* Panel is operational 120 msec after reset */
--	msleep(60);
--	ret = mipi_dsi_dcs_set_display_on(dsi);
--	if (ret)
--		return ret;
-
--	DRM_DEV_DEBUG_DRIVER(dev, "Panel init sequence done\n");
- 	return 0;
- }
-
-@@ -181,6 +166,7 @@ struct st7703_panel_desc jh057n00900_panel_desc = {
- static int st7703_enable(struct drm_panel *panel)
- {
- 	struct st7703 *ctx = panel_to_st7703(panel);
-+	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
- 	int ret;
-
- 	ret = ctx->desc->init_sequence(ctx);
-@@ -190,6 +176,23 @@ static int st7703_enable(struct drm_panel *panel)
- 		return ret;
- 	}
-
-+	msleep(20);
-+
-+	ret = mipi_dsi_dcs_exit_sleep_mode(dsi);
-+	if (ret < 0) {
-+		DRM_DEV_ERROR(ctx->dev, "Failed to exit sleep mode: %d\n", ret);
-+		return ret;
-+	}
-+
-+	/* Panel is operational 120 msec after reset */
-+	msleep(60);
-+
-+	ret = mipi_dsi_dcs_set_display_on(dsi);
-+	if (ret)
-+		return ret;
-+
-+	DRM_DEV_DEBUG_DRIVER(ctx->dev, "Panel init sequence done\n");
-+
- 	return 0;
- }
-
--- 
-2.26.2
-

0001-drm-panel-st7703-Prepare-for-supporting-multiple-pan.patch

@@ -1,128 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:54 +0200
-Subject: [PATCH] drm/panel: st7703: Prepare for supporting multiple panels
-
-Parametrize the driver so that it can support more panels based
-on st7703 controller.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 43 +++++++++++++------
- 1 file changed, 31 insertions(+), 12 deletions(-)
-
-diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-index 511af659f273..08cbc316266c 100644
---- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-@@ -13,6 +13,7 @@
- #include <linux/media-bus-format.h>
- #include <linux/mod_devicetable.h>
- #include <linux/module.h>
-+#include <linux/of_device.h>
- #include <linux/regulator/consumer.h>
-
- #include <video/display_timing.h>
-@@ -56,6 +57,15 @@ struct st7703 {
- 	bool prepared;
-
- 	struct dentry *debugfs;
-+	const struct st7703_panel_desc *desc;
-+};
-+
-+struct st7703_panel_desc {
-+	const struct drm_display_mode *mode;
-+	unsigned int lanes;
-+	unsigned long mode_flags;
-+	enum mipi_dsi_pixel_format format;
-+	int (*init_sequence)(struct st7703 *ctx);
- };
-
- static inline struct st7703 *panel_to_st7703(struct drm_panel *panel)
-@@ -148,7 +158,7 @@ static int st7703_enable(struct drm_panel *panel)
- 	struct st7703 *ctx = panel_to_st7703(panel);
- 	int ret;
-
--	ret = jh057n_init_sequence(ctx);
-+	ret = ctx->desc->init_sequence(ctx);
- 	if (ret < 0) {
- 		DRM_DEV_ERROR(ctx->dev, "Panel init sequence failed: %d\n",
- 			      ret);
-@@ -216,7 +226,7 @@ static int st7703_prepare(struct drm_panel *panel)
- 	return ret;
- }
-
--static const struct drm_display_mode default_mode = {
-+static const struct drm_display_mode jh057n00900_mode = {
- 	.hdisplay    = 720,
- 	.hsync_start = 720 + 90,
- 	.hsync_end   = 720 + 90 + 20,
-@@ -232,17 +242,26 @@ static const struct drm_display_mode default_mode = {
- 	.height_mm   = 130,
- };
-
-+struct st7703_panel_desc jh057n00900_panel_desc = {
-+	.mode = &jh057n00900_mode,
-+	.lanes = 4,
-+	.mode_flags = MIPI_DSI_MODE_VIDEO |
-+		MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE,
-+	.format = MIPI_DSI_FMT_RGB888,
-+	.init_sequence = jh057n_init_sequence,
-+};
-+
- static int st7703_get_modes(struct drm_panel *panel,
- 			    struct drm_connector *connector)
- {
- 	struct st7703 *ctx = panel_to_st7703(panel);
- 	struct drm_display_mode *mode;
-
--	mode = drm_mode_duplicate(connector->dev, &default_mode);
-+	mode = drm_mode_duplicate(connector->dev, ctx->desc->mode);
- 	if (!mode) {
- 		DRM_DEV_ERROR(ctx->dev, "Failed to add mode %ux%u@%u\n",
--			      default_mode.hdisplay, default_mode.vdisplay,
--			      default_mode.vrefresh);
-+			      ctx->desc->mode->hdisplay, ctx->desc->mode->vdisplay,
-+			      ctx->desc->mode->vrefresh);
- 		return -ENOMEM;
- 	}
-
-@@ -317,11 +336,11 @@ static int st7703_probe(struct mipi_dsi_device *dsi)
- 	mipi_dsi_set_drvdata(dsi, ctx);
-
- 	ctx->dev = dev;
-+	ctx->desc = of_device_get_match_data(dev);
-
--	dsi->lanes = 4;
--	dsi->format = MIPI_DSI_FMT_RGB888;
--	dsi->mode_flags = MIPI_DSI_MODE_VIDEO |
--		MIPI_DSI_MODE_VIDEO_BURST | MIPI_DSI_MODE_VIDEO_SYNC_PULSE;
-+	dsi->mode_flags = ctx->desc->mode_flags;
-+	dsi->format = ctx->desc->format;
-+	dsi->lanes = ctx->desc->lanes;
-
- 	ctx->vcc = devm_regulator_get(dev, "vcc");
- 	if (IS_ERR(ctx->vcc)) {
-@@ -361,8 +380,8 @@ static int st7703_probe(struct mipi_dsi_device *dsi)
- 	}
-
- 	DRM_DEV_INFO(dev, "%ux%u@%u %ubpp dsi %udl - ready\n",
--		     default_mode.hdisplay, default_mode.vdisplay,
--		     default_mode.vrefresh,
-+		     ctx->desc->mode->hdisplay, ctx->desc->mode->vdisplay,
-+		     ctx->desc->mode->vrefresh,
- 		     mipi_dsi_pixel_format_to_bpp(dsi->format), dsi->lanes);
-
- 	st7703_debugfs_init(ctx);
-@@ -405,7 +424,7 @@ static int st7703_remove(struct mipi_dsi_device *dsi)
- }
-
- static const struct of_device_id st7703_of_match[] = {
--	{ .compatible = "rocktech,jh057n00900" },
-+	{ .compatible = "rocktech,jh057n00900", .data = &jh057n00900_panel_desc },
- 	{ /* sentinel */ }
- };
- MODULE_DEVICE_TABLE(of, st7703_of_match);
--- 
-2.26.2
-

0001-drm-panel-st7703-Rename-functions-from-jh057n-prefix.patch

@@ -1,265 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:53 +0200
-Subject: [PATCH] drm/panel: st7703: Rename functions from jh057n prefix to
- st7703
-
-This is done so that code that's not specific to a particular
-jh057n panel is named after the controller. Functions specific
-to the panel are kept named after the panel.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- drivers/gpu/drm/panel/panel-sitronix-st7703.c | 90 ++++++++++---------
- 1 file changed, 46 insertions(+), 44 deletions(-)
-
-diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7703.c b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-index 38ff742bc120..511af659f273 100644
---- a/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-+++ b/drivers/gpu/drm/panel/panel-sitronix-st7703.c
-@@ -1,6 +1,8 @@
- // SPDX-License-Identifier: GPL-2.0
- /*
-- * Rockteck jh057n00900 5.5" MIPI-DSI panel driver
-+ * Driver for panels based on Sitronix ST7703 controller, souch as:
-+ *
-+ * - Rocktech jh057n00900 5.5" MIPI-DSI panel
-  *
-  * Copyright (C) Purism SPC 2019
-  */
-@@ -21,7 +23,7 @@
- #include <drm/drm_panel.h>
- #include <drm/drm_print.h>
-
--#define DRV_NAME "panel-rocktech-jh057n00900"
-+#define DRV_NAME "panel-sitronix-st7703"
-
- /* Manufacturer specific Commands send via DSI */
- #define ST7703_CMD_ALL_PIXEL_OFF 0x22
-@@ -45,7 +47,7 @@
- #define ST7703_CMD_SETGIP1	 0xE9
- #define ST7703_CMD_SETGIP2	 0xEA
-
--struct jh057n {
-+struct st7703 {
- 	struct device *dev;
- 	struct drm_panel panel;
- 	struct gpio_desc *reset_gpio;
-@@ -56,9 +58,9 @@ struct jh057n {
- 	struct dentry *debugfs;
- };
-
--static inline struct jh057n *panel_to_jh057n(struct drm_panel *panel)
-+static inline struct st7703 *panel_to_st7703(struct drm_panel *panel)
- {
--	return container_of(panel, struct jh057n, panel);
-+	return container_of(panel, struct st7703, panel);
- }
-
- #define dsi_generic_write_seq(dsi, seq...) do {				\
-@@ -69,7 +71,7 @@ static inline struct jh057n *panel_to_jh057n(struct drm_panel *panel)
- 			return ret;					\
- 	} while (0)
-
--static int jh057n_init_sequence(struct jh057n *ctx)
-+static int jh057n_init_sequence(struct st7703 *ctx)
- {
- 	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
- 	struct device *dev = ctx->dev;
-@@ -141,9 +143,9 @@ static int jh057n_init_sequence(struct jh057n *ctx)
- 	return 0;
- }
-
--static int jh057n_enable(struct drm_panel *panel)
-+static int st7703_enable(struct drm_panel *panel)
- {
--	struct jh057n *ctx = panel_to_jh057n(panel);
-+	struct st7703 *ctx = panel_to_st7703(panel);
- 	int ret;
-
- 	ret = jh057n_init_sequence(ctx);
-@@ -156,17 +158,17 @@ static int jh057n_enable(struct drm_panel *panel)
- 	return 0;
- }
-
--static int jh057n_disable(struct drm_panel *panel)
-+static int st7703_disable(struct drm_panel *panel)
- {
--	struct jh057n *ctx = panel_to_jh057n(panel);
-+	struct st7703 *ctx = panel_to_st7703(panel);
- 	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
-
- 	return mipi_dsi_dcs_set_display_off(dsi);
- }
-
--static int jh057n_unprepare(struct drm_panel *panel)
-+static int st7703_unprepare(struct drm_panel *panel)
- {
--	struct jh057n *ctx = panel_to_jh057n(panel);
-+	struct st7703 *ctx = panel_to_st7703(panel);
-
- 	if (!ctx->prepared)
- 		return 0;
-@@ -178,9 +180,9 @@ static int jh057n_unprepare(struct drm_panel *panel)
- 	return 0;
- }
-
--static int jh057n_prepare(struct drm_panel *panel)
-+static int st7703_prepare(struct drm_panel *panel)
- {
--	struct jh057n *ctx = panel_to_jh057n(panel);
-+	struct st7703 *ctx = panel_to_st7703(panel);
- 	int ret;
-
- 	if (ctx->prepared)
-@@ -230,10 +232,10 @@ static const struct drm_display_mode default_mode = {
- 	.height_mm   = 130,
- };
-
--static int jh057n_get_modes(struct drm_panel *panel,
-+static int st7703_get_modes(struct drm_panel *panel,
- 			    struct drm_connector *connector)
- {
--	struct jh057n *ctx = panel_to_jh057n(panel);
-+	struct st7703 *ctx = panel_to_st7703(panel);
- 	struct drm_display_mode *mode;
-
- 	mode = drm_mode_duplicate(connector->dev, &default_mode);
-@@ -254,17 +256,17 @@ static int jh057n_get_modes(struct drm_panel *panel,
- 	return 1;
- }
-
--static const struct drm_panel_funcs jh057n_drm_funcs = {
--	.disable   = jh057n_disable,
--	.unprepare = jh057n_unprepare,
--	.prepare   = jh057n_prepare,
--	.enable	   = jh057n_enable,
--	.get_modes = jh057n_get_modes,
-+static const struct drm_panel_funcs st7703_drm_funcs = {
-+	.disable   = st7703_disable,
-+	.unprepare = st7703_unprepare,
-+	.prepare   = st7703_prepare,
-+	.enable	   = st7703_enable,
-+	.get_modes = st7703_get_modes,
- };
-
- static int allpixelson_set(void *data, u64 val)
- {
--	struct jh057n *ctx = data;
-+	struct st7703 *ctx = data;
- 	struct mipi_dsi_device *dsi = to_mipi_dsi_device(ctx->dev);
-
- 	DRM_DEV_DEBUG_DRIVER(ctx->dev, "Setting all pixels on\n");
-@@ -282,7 +284,7 @@ static int allpixelson_set(void *data, u64 val)
- DEFINE_SIMPLE_ATTRIBUTE(allpixelson_fops, NULL,
- 			allpixelson_set, "%llu\n");
-
--static void jh057n_debugfs_init(struct jh057n *ctx)
-+static void st7703_debugfs_init(struct st7703 *ctx)
- {
- 	ctx->debugfs = debugfs_create_dir(DRV_NAME, NULL);
-
-@@ -290,16 +292,16 @@ static void jh057n_debugfs_init(struct jh057n *ctx)
- 			    &allpixelson_fops);
- }
-
--static void jh057n_debugfs_remove(struct jh057n *ctx)
-+static void st7703_debugfs_remove(struct st7703 *ctx)
- {
- 	debugfs_remove_recursive(ctx->debugfs);
- 	ctx->debugfs = NULL;
- }
-
--static int jh057n_probe(struct mipi_dsi_device *dsi)
-+static int st7703_probe(struct mipi_dsi_device *dsi)
- {
- 	struct device *dev = &dsi->dev;
--	struct jh057n *ctx;
-+	struct st7703 *ctx;
- 	int ret;
-
- 	ctx = devm_kzalloc(dev, sizeof(*ctx), GFP_KERNEL);
-@@ -340,7 +342,7 @@ static int jh057n_probe(struct mipi_dsi_device *dsi)
- 		return ret;
- 	}
-
--	drm_panel_init(&ctx->panel, dev, &jh057n_drm_funcs,
-+	drm_panel_init(&ctx->panel, dev, &st7703_drm_funcs,
- 		       DRM_MODE_CONNECTOR_DSI);
-
- 	ret = drm_panel_of_backlight(&ctx->panel);
-@@ -363,13 +365,13 @@ static int jh057n_probe(struct mipi_dsi_device *dsi)
- 		     default_mode.vrefresh,
- 		     mipi_dsi_pixel_format_to_bpp(dsi->format), dsi->lanes);
-
--	jh057n_debugfs_init(ctx);
-+	st7703_debugfs_init(ctx);
- 	return 0;
- }
-
--static void jh057n_shutdown(struct mipi_dsi_device *dsi)
-+static void st7703_shutdown(struct mipi_dsi_device *dsi)
- {
--	struct jh057n *ctx = mipi_dsi_get_drvdata(dsi);
-+	struct st7703 *ctx = mipi_dsi_get_drvdata(dsi);
- 	int ret;
-
- 	ret = drm_panel_unprepare(&ctx->panel);
-@@ -383,12 +385,12 @@ static void jh057n_shutdown(struct mipi_dsi_device *dsi)
- 			      ret);
- }
-
--static int jh057n_remove(struct mipi_dsi_device *dsi)
-+static int st7703_remove(struct mipi_dsi_device *dsi)
- {
--	struct jh057n *ctx = mipi_dsi_get_drvdata(dsi);
-+	struct st7703 *ctx = mipi_dsi_get_drvdata(dsi);
- 	int ret;
-
--	jh057n_shutdown(dsi);
-+	st7703_shutdown(dsi);
-
- 	ret = mipi_dsi_detach(dsi);
- 	if (ret < 0)
-@@ -397,28 +399,28 @@ static int jh057n_remove(struct mipi_dsi_device *dsi)
-
- 	drm_panel_remove(&ctx->panel);
-
--	jh057n_debugfs_remove(ctx);
-+	st7703_debugfs_remove(ctx);
-
- 	return 0;
- }
-
--static const struct of_device_id jh057n_of_match[] = {
-+static const struct of_device_id st7703_of_match[] = {
- 	{ .compatible = "rocktech,jh057n00900" },
- 	{ /* sentinel */ }
- };
--MODULE_DEVICE_TABLE(of, jh057n_of_match);
-+MODULE_DEVICE_TABLE(of, st7703_of_match);
-
--static struct mipi_dsi_driver jh057n_driver = {
--	.probe	= jh057n_probe,
--	.remove = jh057n_remove,
--	.shutdown = jh057n_shutdown,
-+static struct mipi_dsi_driver st7703_driver = {
-+	.probe	= st7703_probe,
-+	.remove = st7703_remove,
-+	.shutdown = st7703_shutdown,
- 	.driver = {
- 		.name = DRV_NAME,
--		.of_match_table = jh057n_of_match,
-+		.of_match_table = st7703_of_match,
- 	},
- };
--module_mipi_dsi_driver(jh057n_driver);
-+module_mipi_dsi_driver(st7703_driver);
-
- MODULE_AUTHOR("Guido Günther <agx@sigxcpu.org>");
--MODULE_DESCRIPTION("DRM driver for Rocktech JH057N00900 MIPI DSI panel");
-+MODULE_DESCRIPTION("DRM driver for Sitronix ST7703 based MIPI DSI panels");
- MODULE_LICENSE("GPL v2");
--- 
-2.26.2
-

0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch

@@ -55,5 +55,5 @@ index aa67cb037e9d..52e009dc632b 100644
  		/*
  		 * And I'm not entirely sure what vblk is about. The driver in
 -- 
-2.26.2
+2.28.0
 

0001-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch

@@ -1,32 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Emmanuel Vadot <manu@freebsd.org>
-Date: Wed, 4 Mar 2020 22:30:22 +0100
-Subject: [PATCH] dt-bindings: Add doc for Pine64 Pinebook Pro
-
-Add a compatible for Pine64 Pinebook Pro
-
-Signed-off-by: Emmanuel Vadot <manu@freebsd.org>
-Reviewed-by: Rob Herring <robh@kernel.org>
----
- Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
-index d4a4045092df..ed808148b6a7 100644
---- a/Documentation/devicetree/bindings/arm/rockchip.yaml
-+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
-@@ -425,6 +425,11 @@ properties:
-           - const: pine64,rockpro64
-           - const: rockchip,rk3399
-
-+      - description: Pine64 PinebookPro
-+        items:
-+          - const: pine64,pinebook-pro
-+          - const: rockchip,rk3399
-+
-       - description: Radxa Rock
-         items:
-           - const: radxa,rock
--- 
-2.26.2
-

0001-dt-bindings-panel-Add-compatible-for-Xingbangda-XBD5.patch

@@ -1,37 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:51 +0200
-Subject: [PATCH] dt-bindings: panel: Add compatible for Xingbangda XBD599
- panel
-
-Xingbangda XBD599 is a 5.99" 720x1440 MIPI-DSI LCD panel. It is based on
-Sitronix ST7703 LCD controller just like rocktech,jh057n00900. It is
-used in PinePhone.
-
-Add a compatible for it.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- .../bindings/display/panel/rocktech,jh057n00900.yaml        | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
-index f97c48550741..4d43a1b36d7c 100644
---- a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
-+++ b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
-@@ -18,7 +18,11 @@ allOf:
-
- properties:
-   compatible:
--    const: rocktech,jh057n00900
-+    enum:
-+        # Rocktech JH057N00900 5.5" 720x1440 TFT LCD panel
-+      - rocktech,jh057n00900
-+        # Xingbangda XBD599 5.99" 720x1440 TFT LCD panel
-+      - xingbangda,xbd599
-
-   reg:
-     maxItems: 1
--- 
-2.26.2
-

0001-dt-bindings-panel-Convert-rocktech-jh057n00900-to-ya.patch

@@ -1,119 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Ondrej Jirman <megous@megous.com>
-Date: Fri, 26 Jun 2020 02:55:50 +0200
-Subject: [PATCH] dt-bindings: panel: Convert rocktech, jh057n00900 to yaml
-
-Convert Rocktech MIPI DSI panel driver from txt to yaml bindings.
-
-Signed-off-by: Ondrej Jirman <megous@megous.com>
----
- .../display/panel/rocktech,jh057n00900.txt    | 23 -------
- .../display/panel/rocktech,jh057n00900.yaml   | 66 +++++++++++++++++++
- 2 files changed, 66 insertions(+), 23 deletions(-)
- delete mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
- create mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
-
-diff --git a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
-deleted file mode 100644
-index a372c5d84695..000000000000
---- a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt
-+++ /dev/null
-@@ -1,23 +0,0 @@
--Rocktech jh057n00900 5.5" 720x1440 TFT LCD panel
--
--Required properties:
--- compatible: should be "rocktech,jh057n00900"
--- reg: DSI virtual channel of the peripheral
--- reset-gpios: panel reset gpio
--- backlight: phandle of the backlight device attached to the panel
--- vcc-supply: phandle of the regulator that provides the vcc supply voltage.
--- iovcc-supply: phandle of the regulator that provides the iovcc supply
--  voltage.
--
--Example:
--
--	&mipi_dsi {
--		panel@0 {
--			compatible = "rocktech,jh057n00900";
--			reg = <0>;
--			backlight = <&backlight>;
--			reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;
--			vcc-supply = <&reg_2v8_p>;
--			iovcc-supply = <&reg_1v8_p>;
--		};
--	};
-diff --git a/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
-new file mode 100644
-index 000000000000..f97c48550741
---- /dev/null
-+++ b/Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
-@@ -0,0 +1,66 @@
-+# SPDX-License-Identifier: (GPL-2.0-only or BSD-2-Clause)
-+%YAML 1.2
-+---
-+$id: http://devicetree.org/schemas/display/panel/rocktech,jh057n00900.yaml#
-+$schema: http://devicetree.org/meta-schemas/core.yaml#
-+
-+title: Rocktech JH057N00900 5.5" 720x1440 TFT LCD panel
-+
-+maintainers:
-+  - Ondrej Jirman <megi@xff.cz>
-+
-+description: |
-+             Rocktech JH057N00900 is a 720x1440 TFT LCD panel
-+             connected using a MIPI-DSI video interface.
-+
-+allOf:
-+  - $ref: panel-common.yaml#
-+
-+properties:
-+  compatible:
-+    const: rocktech,jh057n00900
-+
-+  reg:
-+    maxItems: 1
-+    description: DSI virtual channel
-+
-+  vcc-supply:
-+    description: Panel power supply
-+
-+  vccio-supply:
-+    description: I/O voltage supply
-+
-+  reset-gpios:
-+    description: GPIO used for the reset pin
-+    maxItems: 1
-+
-+  backlight:
-+    description: Backlight used by the panel
-+    $ref: "/schemas/types.yaml#/definitions/phandle"
-+
-+required:
-+  - compatible
-+  - reg
-+  - vcc-supply
-+  - vccio-supply
-+  - reset-gpios
-+
-+additionalProperties: false
-+
-+examples:
-+  - |
-+    #include <dt-bindings/gpio/gpio.h>
-+
-+    dsi {
-+      #address-cells = <1>;
-+      #size-cells = <0>;
-+      panel@0 {
-+	compatible = "rocktech,jh057n00900";
-+	reg = <0>;
-+	vcc-supply = <&reg_2v8_p>;
-+	iovcc-supply = <&reg_1v8_p>;
-+	reset-gpios = <&gpio3 13 GPIO_ACTIVE_LOW>;
-+	backlight = <&backlight>;
-+      };
-+    };
-+...
--- 
-2.26.2
-

0001-dt-bindings-panel-add-binding-for-Xingbangda-XBD599-.patch

@@ -70,5 +70,5 @@ index 000000000000..b27bcf11198f
 +
 +...
 -- 
-2.26.2
+2.28.0
 

0001-dt-bindings-vendor-prefixes-Add-Xingbangda.patch

@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Icenowy Zheng <icenowy@aosc.io>
-Date: Fri, 26 Jun 2020 02:55:49 +0200
-Subject: [PATCH] dt-bindings: vendor-prefixes: Add Xingbangda
-
-Shenzhen Xingbangda Display Technology Co., Ltd is a company which
-produces LCD modules. It supplies the LCD panels for the PinePhone.
-
-Add the vendor prefix of it.
-
-Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
-Signed-off-by: Ondrej Jirman <megous@megous.com>
-Acked-by: Rob Herring <robh@kernel.org>
----
- Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-index 9aeab66be85f..740b116b179f 100644
---- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
-+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
-@@ -1157,6 +1157,8 @@ patternProperties:
-     description: Xiaomi Technology Co., Ltd.
-   "^xillybus,.*":
-     description: Xillybus Ltd.
-+  "^xingbangda,.*":
-+    description: Shenzhen Xingbangda Display Technology Co., Ltd
-   "^xinpeng,.*":
-     description: Shenzhen Xinpeng Technology Co., Ltd
-   "^xlnx,.*":
--- 
-2.26.2
-

0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch

@@ -15,7 +15,7 @@ Signed-off-by: Aaron Ma <aaron.ma@canonical.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/ethernet/intel/e1000e/ich8lan.c b/drivers/net/ethernet/intel/e1000e/ich8lan.c
-index 489bb5b59475..26bb39b62956 100644
+index b2f2fcfdf732..a9e4c059d402 100644
 --- a/drivers/net/ethernet/intel/e1000e/ich8lan.c
 +++ b/drivers/net/ethernet/intel/e1000e/ich8lan.c
 @@ -1245,9 +1245,9 @@ static s32 e1000_disable_ulp_lpt_lp(struct e1000_hw *hw, bool force)
@@ -31,5 +31,5 @@ index 489bb5b59475..26bb39b62956 100644
  				goto out;
  			}
 -- 
-2.26.2
+2.28.0
 

0001-efi-Add-an-EFI_SECURE_BOOT-flag-to-indicate-secure-b.patch

@@ -26,10 +26,10 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  create mode 100644 drivers/firmware/efi/secureboot.c
 
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index a1b8cb9a2579..28d43754aeb6 100644
+index 112efbef3414..c9de4b36ca51 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
-@@ -1256,19 +1256,7 @@ void __init setup_arch(char **cmdline_p)
+@@ -1255,19 +1255,7 @@ void __init setup_arch(char **cmdline_p)
  	/* Allocate bigger log buffer */
  	setup_log_buf(1);
 
@@ -107,10 +107,10 @@ index 000000000000..de0a3714a5d4
 +	}
 +}
 diff --git a/include/linux/efi.h b/include/linux/efi.h
-index 2e2f9f608f68..6f5b3b019d3e 100644
+index 92aa4697f558..1cdc5d8b6ac3 100644
 --- a/include/linux/efi.h
 +++ b/include/linux/efi.h
-@@ -781,6 +781,14 @@ extern int __init efi_setup_pcdp_console(char *);
+@@ -785,6 +785,14 @@ extern int __init efi_setup_pcdp_console(char *);
  #define EFI_MEM_ATTR		10	/* Did firmware publish an EFI_MEMORY_ATTRIBUTES table? */
  #define EFI_MEM_NO_SOFT_RESERVE	11	/* Is the kernel configured to ignore soft reservations? */
  #define EFI_PRESERVE_BS_REGIONS	12	/* Are EFI boot-services memory segments available? */
@@ -125,7 +125,7 @@ index 2e2f9f608f68..6f5b3b019d3e 100644
 
  #ifdef CONFIG_EFI
  /*
-@@ -792,6 +800,8 @@ static inline bool efi_enabled(int feature)
+@@ -796,6 +804,8 @@ static inline bool efi_enabled(int feature)
  }
  extern void efi_reboot(enum reboot_mode reboot_mode, const char *__unused);
 
@@ -134,7 +134,7 @@ index 2e2f9f608f68..6f5b3b019d3e 100644
  bool __pure __efi_soft_reserve_enabled(void);
 
  static inline bool __pure efi_soft_reserve_enabled(void)
-@@ -818,6 +828,8 @@ efi_capsule_pending(int *reset_type)
+@@ -822,6 +832,8 @@ efi_capsule_pending(int *reset_type)
  	return false;
  }
 
@@ -143,7 +143,7 @@ index 2e2f9f608f68..6f5b3b019d3e 100644
  static inline bool efi_soft_reserve_enabled(void)
  {
  	return false;
-@@ -1090,12 +1102,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
+@@ -1094,12 +1106,6 @@ static inline bool efi_runtime_disabled(void) { return true; }
  extern void efi_call_virt_check_flags(unsigned long flags, const char *call);
  extern unsigned long efi_call_virt_save_flags(void);
 
@@ -157,5 +157,5 @@ index 2e2f9f608f68..6f5b3b019d3e 100644
 
  #ifdef CONFIG_RESET_ATTACK_MITIGATION
 -- 
-2.26.2
+2.28.0
 

0001-efi-Lock-down-the-kernel-if-booted-in-secure-boot-mo.patch

@@ -18,7 +18,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  2 files changed, 21 insertions(+)
 
 diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
-index 28d43754aeb6..19d57bfc12f9 100644
+index c9de4b36ca51..a1a012702915 100644
 --- a/arch/x86/kernel/setup.c
 +++ b/arch/x86/kernel/setup.c
 @@ -18,6 +18,7 @@
@@ -27,9 +27,9 @@ index 28d43754aeb6..19d57bfc12f9 100644
  #include <linux/tboot.h>
 +#include <linux/security.h>
  #include <linux/usb/xhci-dbgp.h>
-
- #include <uapi/linux/mount.h>
-@@ -1105,6 +1106,13 @@ void __init setup_arch(char **cmdline_p)
+ #include <linux/static_call.h>
+ #include <linux/swiotlb.h>
+@@ -1104,6 +1105,13 @@ void __init setup_arch(char **cmdline_p)
  	if (efi_enabled(EFI_BOOT))
  		efi_init();
 
@@ -68,5 +68,5 @@ index e84ddf484010..d0501353a4b9 100644
  	prompt "Kernel default lockdown mode"
  	default LOCK_DOWN_KERNEL_FORCE_NONE
 -- 
-2.26.2
+2.28.0
 

0001-hpsa-remove-old-cciss-based-smartarray-pci-ids.patch

@@ -1,55 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Joseph Szczypek <jszczype@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:40 -0500
-Subject: [PATCH] hpsa: remove old cciss-based smartarray pci ids
-
-Message-id: <1524750809-43700-2-git-send-email-jszczype@redhat.com>
-Patchwork-id: 211573
-O-Subject: [RHEL8 e-stor PATCH 1/2] hpsa: remove old cciss-based smartarray pci ids
-Bugzilla: 1471185
-RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-RH-Acked-by: Tomas Henzl <thenzl@redhat.com>
-
-Per discussion with Microsemi, the old PCI IDs for smartarrays
-originally used with the old cciss driver are not being
-supported with RHEL8. They are also not supported with RHEL7.
-Therefore the PCI IDs and the catch-all are being removed.
-
-    Acked-by: Don Brace <don.brace@microsemi.com>
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
----
- drivers/scsi/hpsa.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
-index 81d0414e2117..a3c5be79a9cc 100644
---- a/drivers/scsi/hpsa.c
-+++ b/drivers/scsi/hpsa.c
-@@ -82,7 +82,9 @@ MODULE_DESCRIPTION("Driver for HP Smart Array Controller version " \
- MODULE_SUPPORTED_DEVICE("HP Smart Array Controllers");
- MODULE_VERSION(HPSA_DRIVER_VERSION);
- MODULE_LICENSE("GPL");
-+#ifndef CONFIG_RHEL_DIFFERENCES
- MODULE_ALIAS("cciss");
-+#endif
-
- static int hpsa_simple_mode;
- module_param(hpsa_simple_mode, int, S_IRUGO|S_IWUSR);
-@@ -144,10 +146,12 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
- 	{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x007D},
- 	{PCI_VENDOR_ID_HP_3PAR, 0x0075, 0x1590, 0x0088},
- 	{PCI_VENDOR_ID_HP, 0x333f, 0x103c, 0x333f},
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_VENDOR_ID_HP,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
- 		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
- 	{PCI_VENDOR_ID_COMPAQ,     PCI_ANY_ID,	PCI_ANY_ID, PCI_ANY_ID,
- 		PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
-+#endif
- 	{0,}
- };
-
--- 
-2.26.2
-

0001-ice-mark-driver-as-tech-preview.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jonathan Toppins <jtoppins@redhat.com>
-Date: Tue, 24 Jul 2018 19:17:40 -0400
-Subject: [PATCH] ice: mark driver as tech-preview
-
-Message-id: <f087de8dbe4e8eac9f0992cc34def0a07aba206d.1532459145.git.jtoppins@redhat.com>
-Patchwork-id: 8526
-O-Subject: [kernel team] [PATCH RHEL8 1/3] [redhat] ice: mark driver as tech-preview
-Bugzilla: 1495347
-RH-Acked-by: Steve Best <sbest@redhat.com>
-RH-Acked-by: Don Dutile <ddutile@redhat.com>
-RH-Acked-by: David S. Miller <davem@redhat.com>
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-RH-Acked-by: Neil Horman <nhorman@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-
-Upstream Status: RHEL-only
-Bugzilla: 1495347
-Build Info: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=17334539
-Tested: booted and verified taint flags were set when the driver was loaded.
-
-Upstream Status: RHEL only
-Signed-off-by: Jonathan Toppins <jtoppins@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- drivers/net/ethernet/intel/ice/ice_main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
-index 4cbd49c87568..aa9baa923fd9 100644
---- a/drivers/net/ethernet/intel/ice/ice_main.c
-+++ b/drivers/net/ethernet/intel/ice/ice_main.c
-@@ -3771,6 +3771,7 @@ static int __init ice_module_init(void)
-
- 	pr_info("%s - version %s\n", ice_driver_string, ice_drv_ver);
- 	pr_info("%s\n", ice_copyright);
-+	mark_tech_preview(DRV_SUMMARY, THIS_MODULE);
-
- 	ice_wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, KBUILD_MODNAME);
- 	if (!ice_wq) {
--- 
-2.26.2
-

0001-initial-commit-Add-Red-Hat-variables-in-the-top-leve.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Tue, 23 Jul 2019 11:39:36 -0400
-Subject: [PATCH] [initial commit] Add Red Hat variables in the top level
- makefile
-
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- Makefile | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 3e4868a6498b..502f9a9a2806 100644
---- a/Makefile
-+++ b/Makefile
-@@ -15,6 +15,9 @@ NAME = Bobtail Squid
- PHONY := __all
- __all:
-
-+# Set RHEL variables
-+include Makefile.rhelver
-+
- # We are using a recursive build, so we need to do a little thinking
- # to get the ordering right.
- #
-@@ -1160,7 +1163,13 @@ endef
- define filechk_version.h
- 	echo \#define LINUX_VERSION_CODE $(shell                         \
- 	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
--	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'
-+	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'; \
-+	echo '#define RHEL_MAJOR $(RHEL_MAJOR)'; \
-+	echo '#define RHEL_MINOR $(RHEL_MINOR)'; \
-+	echo '#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))'; \
-+	echo '#define RHEL_RELEASE_CODE \
-+	$(shell expr $(RHEL_MAJOR) \* 256 + $(RHEL_MINOR))'; \
-+	echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"'
- endef
-
- $(version_h): FORCE
--- 
-2.26.2
-

0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch

@@ -57,7 +57,7 @@ Signed-off-by: Laura Abbott <labbott@redhat.com>
  1 file changed, 22 insertions(+)
 
 diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
-index b6858adc4f17..4c2da9f17514 100644
+index 609bd25bf154..c701912b13ab 100644
 --- a/drivers/iommu/iommu.c
 +++ b/drivers/iommu/iommu.c
 @@ -7,6 +7,7 @@
@@ -68,7 +68,7 @@ index b6858adc4f17..4c2da9f17514 100644
  #include <linux/kernel.h>
  #include <linux/bug.h>
  #include <linux/types.h>
-@@ -2838,3 +2839,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle)
+@@ -2849,3 +2850,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle)
  	return ops->sva_get_pasid(handle);
  }
  EXPORT_SYMBOL_GPL(iommu_sva_get_pasid);
@@ -94,5 +94,5 @@ index b6858adc4f17..4c2da9f17514 100644
 +arch_initcall(iommu_quirks);
 +#endif
 -- 
-2.26.2
+2.28.0
 

0001-ipmi-do-not-configure-ipmi-for-HPE-m400.patch

@@ -84,18 +84,18 @@ index bbf7029e224b..cf7faa970dd6 100644
  		dmi_decode_ipmi((const struct dmi_header *) dev->device_data);
 
 diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
-index e1b22fe0916c..894eda427214 100644
+index 737c0b6b24ea..7901e780323b 100644
 --- a/drivers/char/ipmi/ipmi_msghandler.c
 +++ b/drivers/char/ipmi/ipmi_msghandler.c
 @@ -34,6 +34,7 @@
- #include <linux/uuid.h>
  #include <linux/nospec.h>
  #include <linux/vmalloc.h>
+ #include <linux/delay.h>
 +#include <linux/dmi.h>
 
  #define IPMI_DRIVER_VERSION "39.2"
 
-@@ -5155,8 +5156,21 @@ static int __init ipmi_init_msghandler_mod(void)
+@@ -5153,8 +5154,21 @@ static int __init ipmi_init_msghandler_mod(void)
  {
  	int rv;
 
@@ -119,5 +119,5 @@ index e1b22fe0916c..894eda427214 100644
  	rv = ipmi_register_driver();
  	mutex_unlock(&ipmi_interfaces_mutex);
 -- 
-2.26.2
+2.28.0
 

0001-kABI-Add-generic-kABI-macros-to-use-for-kABI-workaro.patch

@@ -1,214 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Myron Stowe <myron.stowe@redhat.com>
-Date: Fri, 29 Jun 2018 20:05:41 -0400
-Subject: [PATCH] kABI: Add generic kABI macros to use for kABI workarounds
-
-Message-id: <20180629200436.151355.18581.stgit@tak.stowe>
-Patchwork-id: 223206
-O-Subject: [RHEL8.0 PATCH v3] kABI: Add generic kABI macros to use for kABI workarounds
-Bugzilla: 1546831
-RH-Acked-by: Larry Woodman <lwoodman@redhat.com>
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-
-Some kernel subsystem maintainers have asked about kABI for RHEL8.0
-- getting kABI related "extension" structures and such into place.  The
-consensus was to wait until the 4.17 re-base.  Now that that's occurred,
-lets get this first step, kABI macros, into RHEL8.0 so developers will
-notice, and use, them in subsequent kABI related efforts.
-
-Content taken from RHEL 7.  No functional change intended.
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1546831
-Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=16694565
-Upstream Status: N/A (RHEL only)
-Testing: Passed through brew build.
-
-Upstream Status: RHEL only
-Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- include/linux/rh_kabi.h | 172 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 172 insertions(+)
- create mode 100644 include/linux/rh_kabi.h
-
-diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
-new file mode 100644
-index 000000000000..e0d3353802bb
---- /dev/null
-+++ b/include/linux/rh_kabi.h
-@@ -0,0 +1,172 @@
-+/*
-+ * rh_kabi.h - Red Hat kABI abstraction header
-+ *
-+ * Copyright (c) 2014 Don Zickus
-+ * Copyright (c) 2015-2017 Jiri Benc
-+ * Copyright (c) 2015 Sabrina Dubroca, Hannes Frederic Sowa
-+ * Copyright (c) 2016-2018 Prarit Bhargava
-+ * Copyright (c) 2017 Paolo Abeni, Larry Woodman
-+ *
-+ * This file is released under the GPLv2.
-+ * See the file COPYING for more details.
-+ *
-+ * These kabi macros hide the changes from the kabi checker and from the
-+ * process that computes the exported symbols' checksums.
-+ * They have 2 variants: one (defined under __GENKSYMS__) used when
-+ * generating the checksums, and the other used when building the kernel's
-+ * binaries.
-+ *
-+ * The use of these macros does not guarantee that the usage and modification
-+ * of code is correct.  As with all Red Hat only changes, an engineer must
-+ * explain why the use of the macro is valid in the patch containing the
-+ * changes.
-+ *
-+ */
-+
-+#ifndef _LINUX_RH_KABI_H
-+#define _LINUX_RH_KABI_H
-+
-+#include <linux/compiler.h>
-+#include <linux/stringify.h>
-+
-+/*
-+ * RH_KABI_CONST
-+ *   Adds a new const modifier to a function parameter preserving the old
-+ *   checksum.
-+ *
-+ * RH_KABI_DEPRECATE
-+ *   Mark the element as deprecated and make it unusable by modules while
-+ *   preserving kABI checksums.
-+ *
-+ * RH_KABI_DEPRECATE_FN
-+ *   Mark the function pointer as deprecated and make it unusable by modules
-+ *   while preserving kABI checksums.
-+ *
-+ * RH_KABI_EXTEND
-+ *   Simple macro for adding a new element to a struct.
-+ *
-+ *   Warning: only use if a hole exists for _all_ arches.  Use pahole to verify.
-+ *
-+ * RH_KABI_FILL_HOLE
-+ *   Simple macro for filling a hole in a struct.
-+ *
-+ * RH_KABI_RENAME
-+ *   Simple macro for renaming an element without changing its type.  This
-+ *   macro can be used in bitfields, for example.
-+ *
-+ *   NOTE: does not include the final ';'
-+ *
-+ * RH_KABI_REPLACE
-+ *   Simple replacement of _orig with a union of _orig and _new.
-+ *
-+ *   The RH_KABI_REPLACE* macros attempt to add the ability to use the '_new'
-+ *   element while preserving size alignment with the '_orig' element.
-+ *
-+ *   The #ifdef __GENKSYMS__ preserves the kABI agreement, while the anonymous
-+ *   union structure preserves the size alignment (assuming the '_new' element
-+ *   is not bigger than the '_orig' element).
-+ *
-+ * RH_KABI_REPLACE_UNSAFE
-+ *   Unsafe version of RH_KABI_REPLACE.  Only use for typedefs.
-+ *
-+ * RH_KABI_FORCE_CHANGE
-+ *   Force change of the symbol checksum.  The argument of the macro is a
-+ *   version for cases we need to do this more than once.
-+ *
-+ *   This macro does the opposite: it changes the symbol checksum without
-+ *   actually changing anything about the exported symbol.  It is useful for
-+ *   symbols that are not whitelisted, we're changing them in an
-+ *   incompatible way and want to prevent 3rd party modules to silently
-+ *   corrupt memory.  Instead, by changing the symbol checksum, such modules
-+ *   won't be loaded by the kernel.  This macro should only be used as a
-+ *   last resort when all other KABI workarounds have failed.
-+ *
-+ * NOTE
-+ *   Don't use ';' after these macros as it messes up the kABI checker by
-+ *   changing what the resulting token string looks like.  Instead let this
-+ *   macro add the ';' so it can be properly hidden from the kABI checker
-+ *   (mainly for RH_KABI_EXTEND, but applied to all macros for uniformity).
-+ *
-+ */
-+#ifdef __GENKSYMS__
-+
-+# define RH_KABI_CONST
-+# define RH_KABI_EXTEND(_new)
-+# define RH_KABI_FILL_HOLE(_new)
-+# define RH_KABI_FORCE_CHANGE(ver)		__attribute__((rh_kabi_change ## ver))
-+# define RH_KABI_RENAME(_orig, _new)		_orig
-+
-+# define _RH_KABI_DEPRECATE(_type, _orig)	_type _orig
-+# define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...)	_type (*_orig)(_args)
-+# define _RH_KABI_REPLACE(_orig, _new)		_orig
-+# define _RH_KABI_REPLACE_UNSAFE(_orig, _new)	_orig
-+
-+#else
-+
-+# define RH_KABI_ALIGN_WARNING ".  Disable CONFIG_RH_KABI_SIZE_ALIGN_CHECKS if debugging."
-+
-+# define RH_KABI_CONST				const
-+# define RH_KABI_EXTEND(_new)			_new;
-+# define RH_KABI_FILL_HOLE(_new)		_new;
-+# define RH_KABI_FORCE_CHANGE(ver)
-+# define RH_KABI_RENAME(_orig, _new)		_new
-+
-+
-+#if IS_BUILTIN(CONFIG_RH_KABI_SIZE_ALIGN_CHECKS)
-+# define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new)			\
-+	union {								\
-+		_Static_assert(sizeof(struct{_new;}) <= sizeof(struct{_orig;}), \
-+			       __FILE__ ":" __stringify(__LINE__) ": "  __stringify(_new) " is larger than " __stringify(_orig) RH_KABI_ALIGN_WARNING); \
-+		_Static_assert(__alignof__(struct{_new;}) <= __alignof__(struct{_orig;}), \
-+			       __FILE__ ":" __stringify(__LINE__) ": "  __stringify(_orig) " is not aligned the same as " __stringify(_new) RH_KABI_ALIGN_WARNING); \
-+	}
-+#else
-+# define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new)
-+#endif
-+
-+# define _RH_KABI_DEPRECATE(_type, _orig)	_type rh_reserved_##_orig
-+# define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...)  \
-+	_type (* rh_reserved_##_orig)(_args)
-+# define _RH_KABI_REPLACE(_orig, _new)			  \
-+	union {						  \
-+		_new;					  \
-+		struct {				  \
-+			_orig;				  \
-+		} __UNIQUE_ID(rh_kabi_hide);		  \
-+		__RH_KABI_CHECK_SIZE_ALIGN(_orig, _new);  \
-+	}
-+# define _RH_KABI_REPLACE_UNSAFE(_orig, _new)	_new
-+
-+#endif /* __GENKSYMS__ */
-+
-+/* semicolon added wrappers for the RH_KABI_REPLACE macros */
-+# define RH_KABI_DEPRECATE(_type, _orig)	_RH_KABI_DEPRECATE(_type, _orig);
-+# define RH_KABI_DEPRECATE_FN(_type, _orig, _args...)  \
-+	_RH_KABI_DEPRECATE_FN(_type, _orig, _args);
-+# define RH_KABI_REPLACE(_orig, _new)		_RH_KABI_REPLACE(_orig, _new);
-+# define RH_KABI_REPLACE_UNSAFE(_orig, _new)	_RH_KABI_REPLACE_UNSAFE(_orig, _new);
-+/*
-+ * Macro for breaking up a random element into two smaller chunks using an
-+ * anonymous struct inside an anonymous union.
-+ */
-+# define RH_KABI_REPLACE2(orig, _new1, _new2)	RH_KABI_REPLACE(orig, struct{ _new1; _new2;})
-+
-+# define RH_KABI_RESERVE(n)		_RH_KABI_RESERVE(n);
-+/*
-+ * Simple wrappers to replace standard Red Hat reserved elements.
-+ */
-+# define RH_KABI_USE(n, _new)		RH_KABI_REPLACE(_RH_KABI_RESERVE(n), _new)
-+/*
-+ * Macros for breaking up a reserved element into two smaller chunks using
-+ * an anonymous struct inside an anonymous union.
-+ */
-+# define RH_KABI_USE2(n, _new1, _new2)	RH_KABI_REPLACE(_RH_KABI_RESERVE(n), struct{ _new1; _new2; })
-+
-+/*
-+ * We tried to standardize on Red Hat reserved names.  These wrappers
-+ * leverage those common names making it easier to read and find in the
-+ * code.
-+ */
-+# define _RH_KABI_RESERVE(n)		unsigned long rh_reserved##n
-+
-+#endif /* _LINUX_RH_KABI_H */
--- 
-2.26.2
-

0001-kdump-add-support-for-crashkernel-auto.patch

@@ -160,7 +160,7 @@ index 2da65fef2a1c..d53a524f80f0 100644
 
  Boot into System Kernel
 diff --git a/kernel/crash_core.c b/kernel/crash_core.c
-index d631d22089ba..c252221b2f4b 100644
+index e4dfe2a05a31..8c6f59932247 100644
 --- a/kernel/crash_core.c
 +++ b/kernel/crash_core.c
 @@ -258,6 +258,20 @@ static int __init __parse_crashkernel(char *cmdline,
@@ -185,5 +185,5 @@ index d631d22089ba..c252221b2f4b 100644
  	 * if the commandline contains a ':', then that's the extended
  	 * syntax -- if not, it must be the classic syntax
 -- 
-2.26.2
+2.28.0
 

0001-kdump-fix-a-grammar-issue-in-a-kernel-message.patch

@@ -26,7 +26,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/kernel/crash_core.c b/kernel/crash_core.c
-index c252221b2f4b..df551fc9034c 100644
+index 8c6f59932247..598d8324f51a 100644
 --- a/kernel/crash_core.c
 +++ b/kernel/crash_core.c
 @@ -269,7 +269,7 @@ static int __init __parse_crashkernel(char *cmdline,
@@ -39,5 +39,5 @@ index c252221b2f4b..df551fc9034c 100644
 
  	/*
 -- 
-2.26.2
+2.28.0
 

0001-kdump-round-up-the-total-memory-size-to-128M-for-cra.patch

@@ -45,7 +45,7 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 12 insertions(+), 2 deletions(-)
 
 diff --git a/kernel/crash_core.c b/kernel/crash_core.c
-index 9f1557b98468..d631d22089ba 100644
+index 18175687133a..e4dfe2a05a31 100644
 --- a/kernel/crash_core.c
 +++ b/kernel/crash_core.c
 @@ -7,6 +7,7 @@
@@ -89,5 +89,5 @@ index 9f1557b98468..d631d22089ba 100644
  			break;
  		}
 -- 
-2.26.2
+2.28.0
 

0001-kernel-add-SUPPORT_REMOVED-kernel-taint.patch

@@ -1,53 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tomas Henzl <thenzl@redhat.com>
-Date: Thu, 9 Aug 2018 13:44:15 -0400
-Subject: [PATCH] kernel: add SUPPORT_REMOVED kernel taint
-
-Message-id: <e9a9812a-6a4c-a205-e66a-1d47de58306a@redhat.com>
-Patchwork-id: 226423
-O-Subject: [RHEL-8.0 V4 01/10] kernel: add SUPPORT_REMOVED kernel taint
-Bugzilla: 1602033
-RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-RH-Acked-by: Rob Evers <revers@redhat.com>
-
-Upstream Status: RHEL only
-
-rh_taint, pci : add information about removed hardware
-
-Upstream Status: RHEL only
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- include/linux/kernel.h | 2 +-
- kernel/panic.c         | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index cfaaa6a234d4..dab7302a3606 100644
---- a/include/linux/kernel.h
-+++ b/include/linux/kernel.h
-@@ -613,7 +613,7 @@ extern enum system_states {
- #define TAINT_24			24
- #define TAINT_25			25
- #define TAINT_26			26
--#define TAINT_27			27
-+#define TAINT_SUPPORT_REMOVED		27
- /* Bits 28 - 31 are reserved for Red Hat use only */
- #define TAINT_RESERVED28		28
- #define TAINT_RESERVED29		29
-diff --git a/kernel/panic.c b/kernel/panic.c
-index e3bae852d92f..8ab004b0f846 100644
---- a/kernel/panic.c
-+++ b/kernel/panic.c
-@@ -395,7 +395,7 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
- 	[ TAINT_24 ]			= { '?', '-', false },
- 	[ TAINT_25 ]			= { '?', '-', false },
- 	[ TAINT_26 ]			= { '?', '-', false },
--	[ TAINT_27 ]			= { '?', '-', false },
-+	[ TAINT_SUPPORT_REMOVED ]	= { 'h', ' ', false },
- 	[ TAINT_RESERVED28 ]		= { '?', '-', false },
- 	[ TAINT_RESERVED29 ]		= { '?', '-', false },
- 	[ TAINT_RESERVED30 ]		= { '?', '-', false },
--- 
-2.26.2
-

0001-megaraid_sas-remove-deprecated-pci-ids.patch

@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tomas Henzl <thenzl@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:37 -0500
-Subject: [PATCH] megaraid_sas: remove deprecated pci-ids
-
-Message-id: <20180403143030.4971-2-thenzl@redhat.com>
-Patchwork-id: 7432
-O-Subject: [kernel team] [RHEL8 e-stor PATCH] megaraid_sas: remove deprecated pci-ids
-Bugzilla: 1509329
-RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-RH-Acked-by: Chris Leech <cleech@redhat.com>
-
-bz#1509329
-brew - task_15594743
-
-RH specific - remove EOL devices from the pci-id table
-(devices to remove were selected by Broadcom)
-
-Upstream Status: RHEL only
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- drivers/scsi/megaraid/megaraid_sas_base.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
-index 00668335c2af..219f95ab56f8 100644
---- a/drivers/scsi/megaraid/megaraid_sas_base.c
-+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
-@@ -133,6 +133,7 @@ static void megasas_get_pd_info(struct megasas_instance *instance,
-  */
- static struct pci_device_id megasas_pci_table[] = {
-
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1064R)},
- 	/* xscale IOP */
- 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_SAS1078R)},
-@@ -151,6 +152,7 @@ static struct pci_device_id megasas_pci_table[] = {
- 	/* xscale IOP, vega */
- 	{PCI_DEVICE(PCI_VENDOR_ID_DELL, PCI_DEVICE_ID_DELL_PERC5)},
- 	/* xscale IOP */
-+#endif
- 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_FUSION)},
- 	/* Fusion */
- 	{PCI_DEVICE(PCI_VENDOR_ID_LSI_LOGIC, PCI_DEVICE_ID_LSI_PLASMA)},
--- 
-2.26.2
-

0001-mm-kmemleak-skip-late_init-if-not-skip-disable.patch

@@ -67,5 +67,5 @@ index e362dc3d2028..0c3dfb8eef67 100644
 
  	debugfs_create_file("kmemleak", 0644, NULL, NULL, &kmemleak_fops);
 -- 
-2.26.2
+2.28.0
 

0001-modules-add-rhelversion-MODULE_INFO-tag.patch

@@ -1,151 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Mon, 7 Jan 2019 21:03:10 +0000
-Subject: [PATCH] modules: add rhelversion MODULE_INFO tag
-
-There were several changes in the 5.0-rc1 kernel that required
-this patch to be rebased with some context diff.
-
-    Patchwork-id: 7379
-    O-Subject: [kernel team] [RHEL8.0 BZ 1544999 1/2] modules: add rhelversion MODULE_INFO tag
-    Bugzilla: 1544999
-    RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-    RH-Acked-by: Oleg Nesterov <oleg@redhat.com>
-    RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-
-    Bugzilla: http://bugzilla.redhat.com/1544999
-
-    kernel-alt commit 9816b4b6ca5d4c0504d8806ce99442c90afbc8e6
-    Author: Prarit Bhargava <prarit@redhat.com>
-    Date:   Fri Feb 9 18:09:26 2018 -0500
-
-        [kernel] modules: add rhelversion MODULE_INFO tag
-
-        Message-id: <20180209180926.5955-3-prarit@redhat.com>
-        Patchwork-id: 205587
-        O-Subject: [RHEL-ALT-7.5 BZ 1542796 2/2] modules: add rhelversion MODULE_INFO tag
-        Bugzilla: 1542796
-        RH-Acked-by: David Arcari <darcari@redhat.com>
-        RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-        RH-Acked-by: Steve Best <sbest@redhat.com>
-
-        Bugzilla: http://bugzilla.redhat.com/1542796
-
-        rhel7 commit 9af8c3992ce5fff253c49abc0dedb3ec77badba4
-        Author: Kyle McMartin <kmcmarti@redhat.com>
-        Date:   Fri Sep 12 17:46:12 2014 -0400
-
-            [kernel] modules: add rhelversion MODULE_INFO tag
-
-            Message-id: <20140912174612.GS29420@redacted.bos.redhat.com>
-            Patchwork-id: 94052
-            O-Subject: [RHEL7.1 PATCH 2/6 v4] modules: add rhelversion MODULE_INFO tag
-            Bugzilla: 1110315
-            RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-            RH-Acked-by: Johannes Weiner <jweiner@redhat.com>
-            RH-Acked-by: Don Zickus <dzickus@redhat.com>
-
-            From: Kyle McMartin <kmcmarti@redhat.com>
-
-            Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1110315
-
-            >From kylem's RHEL8 post:
-
-            Let's not lose this ability in RHEL8. Sadly can't be applied to RHEL7
-            because it breaks KABI due to the struct module change.
-
-            Inspired by bits of a147e4729d9920ccae2c717ca65c811cc0f93a1d in RHEL6,
-            which got lost for RHEL7.0. :/
-
-            Kyle is correct and doing this would break RHEL7's KABI.  I'm taking this
-            patch in as a base and the next patch will resolve the KABI issues.
-
-            [v2]: dzickus, cleanup add_rhelversion()
-            [v4]: resubmitted along with 16k stacks change
-
-            Signed-off-by: Jarod Wilson <jarod@redhat.com>
-
-        Cc: Richard Guy Briggs <rgb@redhat.com>
-        Cc: Peter Rajnoha <prajnoha@redhat.com>
-        Cc: Laura Abbott <labbott@redhat.com>
-        Cc: Josh Poimboeuf <jpoimboe@redhat.com>
-        Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-Acked-by: Don Zickus <dzickus@redhat.com>
-Acked-by: Prarit Bhargava <prarit@redhat.com>
----
- include/linux/module.h | 1 +
- kernel/module.c        | 2 ++
- scripts/mod/modpost.c  | 8 ++++++++
- 3 files changed, 11 insertions(+)
-
-diff --git a/include/linux/module.h b/include/linux/module.h
-index 2e6670860d27..8c35a5db7d7e 100644
---- a/include/linux/module.h
-+++ b/include/linux/module.h
-@@ -371,6 +371,7 @@ struct module {
- 	struct module_attribute *modinfo_attrs;
- 	const char *version;
- 	const char *srcversion;
-+	const char *rhelversion;
- 	struct kobject *holders_dir;
-
- 	/* Exported symbols */
-diff --git a/kernel/module.c b/kernel/module.c
-index aa183c9ac0a2..dc323b3f5838 100644
---- a/kernel/module.c
-+++ b/kernel/module.c
-@@ -802,6 +802,7 @@ static struct module_attribute modinfo_##field = {                    \
-
- MODINFO_ATTR(version);
- MODINFO_ATTR(srcversion);
-+MODINFO_ATTR(rhelversion);
-
- static char last_unloaded_module[MODULE_NAME_LEN+1];
-
-@@ -1266,6 +1267,7 @@ static struct module_attribute *modinfo_attrs[] = {
- 	&module_uevent,
- 	&modinfo_version,
- 	&modinfo_srcversion,
-+	&modinfo_rhelversion,
- 	&modinfo_initstate,
- 	&modinfo_coresize,
- 	&modinfo_initsize,
-diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
-index 69341b36f271..dbc63328187c 100644
---- a/scripts/mod/modpost.c
-+++ b/scripts/mod/modpost.c
-@@ -21,6 +21,7 @@
- #include <errno.h>
- #include "modpost.h"
- #include "../../include/linux/license.h"
-+#include "../../include/generated/uapi/linux/version.h"
-
- /* Are we using CONFIG_MODVERSIONS? */
- static int modversions = 0;
-@@ -2393,6 +2394,12 @@ static void write_buf(struct buffer *b, const char *fname)
- 	}
- }
-
-+static void add_rhelversion(struct buffer *b, struct module *mod)
-+{
-+	buf_printf(b, "MODULE_INFO(rhelversion, \"%d.%d\");\n", RHEL_MAJOR,
-+		   RHEL_MINOR);
-+}
-+
- static void write_if_changed(struct buffer *b, const char *fname)
- {
- 	char *tmp;
-@@ -2645,6 +2652,7 @@ int main(int argc, char **argv)
- 		add_depends(&buf, mod);
- 		add_moddevtable(&buf, mod);
- 		add_srcversion(&buf, mod);
-+		add_rhelversion(&buf, mod);
-
- 		sprintf(fname, "%s.mod.c", mod->name);
- 		write_if_changed(&buf, fname);
--- 
-2.26.2
-

0001-mpt-remove-certain-deprecated-pci-ids.patch

@@ -1,71 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Cline <jcline@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:36 -0500
-Subject: [PATCH] mpt*: remove certain deprecated pci-ids
-
-Message-id: <20190708192032.20922-1-jcline@redhat.com>
-Patchwork-id: 266421
-O-Subject: [ARK INTERNAL PATCH] mpt*: remove certain deprecated pci-ids
-Bugzilla:
-RH-Acked-by: Don Zickus <dzickus@redhat.com>
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-
-Commit 8f8384503e40 ("scsi: mpt3sas: Add support for NVMe Switch
-Adapter") introduced a new PCI device ID which broke the patch context.
-
-    Message-id: <20180403143030.4971-1-thenzl@redhat.com>
-    Patchwork-id: 7431
-    O-Subject: [kernel team] [RHEL8 e-stor PATCH] mpt*: remove certain deprecated pci-ids
-    Bugzilla: 1511953
-    RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-    RH-Acked-by: Chris Leech <cleech@redhat.com>
-
-    bz#1511953
-    brew - task_15594743
-
-    RH specific - remove EOL devices from the pci-id table
-    (devices to remove were selected by Broadcom)
-
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Jeremy Cline <jcline@redhat.com>
----
- drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
-index 08fc4b381056..1305a2b72536 100644
---- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
-+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
-@@ -11033,6 +11033,7 @@ bool scsih_ncq_prio_supp(struct scsi_device *sdev)
-  * The pci device ids are defined in mpi/mpi2_cnfg.h.
-  */
- static const struct pci_device_id mpt3sas_pci_table[] = {
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	/* Spitfire ~ 2004 */
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2004,
- 		PCI_ANY_ID, PCI_ANY_ID },
-@@ -11051,6 +11052,7 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID },
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2116_2,
- 		PCI_ANY_ID, PCI_ANY_ID },
-+#endif
- 	/* Thunderbolt ~ 2208 */
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SAS2208_1,
- 		PCI_ANY_ID, PCI_ANY_ID },
-@@ -11075,9 +11077,11 @@ static const struct pci_device_id mpt3sas_pci_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID },
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SWITCH_MPI_EP_1,
- 		PCI_ANY_ID, PCI_ANY_ID },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	/* SSS6200 */
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI2_MFGPAGE_DEVID_SSS6200,
- 		PCI_ANY_ID, PCI_ANY_ID },
-+#endif
- 	/* Fury ~ 3004 and 3008 */
- 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004,
- 		PCI_ANY_ID, PCI_ANY_ID },
--- 
-2.26.2
-

0001-mptsas-Taint-kernel-if-mptsas-is-loaded.patch

@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:46 -0500
-Subject: [PATCH] mptsas: Taint kernel if mptsas is loaded
-
-Author: Tomas Henzl <thenzl@redhat.com>
-Date:   Thu Jan 31 16:54:50 2019 -0500
-
-    [message] mptsas: Taint kernel if mptsas is loaded
-
-    Message-id: <20190131165452.7562-2-thenzl@redhat.com>
-    Patchwork-id: 239764
-    O-Subject: [RHEL8 e-stor 1/3] mptsas: Taint kernel if mptsas is loaded
-    Bugzilla: 1666730
-    RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-    RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-    RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-
-    RHEL-only
-
-    We are only keeping it to ease developer transitions, we're not
-    supporting it, so mark it as unsupported by tainting the kernel and
-    issuing an impossible to misunderstand message to the log
-
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- drivers/message/fusion/mptsas.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
-index 6a79cd0ebe2b..c17614cd6ed8 100644
---- a/drivers/message/fusion/mptsas.c
-+++ b/drivers/message/fusion/mptsas.c
-@@ -5290,6 +5290,11 @@ mptsas_probe(struct pci_dev *pdev, const struct pci_device_id *id)
- 		    ioc, MPI_SAS_OP_CLEAR_ALL_PERSISTENT);
- 	}
-
-+#ifdef CONFIG_RHEL_DIFFERENCES
-+	add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
-+	pr_warn("MPTSAS MODULE IS NOT SUPPORTED\n");
-+#endif
-+
- 	error = scsi_add_host(sh, &ioc->pcidev->dev);
- 	if (error) {
- 		dprintk(ioc, printk(MYIOC_s_ERR_FMT
--- 
-2.26.2
-

0001-mptsas-pci-id-table-changes.patch

@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:47 -0500
-Subject: [PATCH] mptsas: pci-id table changes
-
-Author: Tomas Henzl <thenzl@redhat.com>
-Date:   Thu Jan 31 16:54:51 2019 -0500
-
-    [message] mptsas: pci-id table changes
-
-    Message-id: <20190131165452.7562-3-thenzl@redhat.com>
-    Patchwork-id: 239765
-    O-Subject: [RHEL8 e-stor 2/3] mptsas: pci-id table changes
-    Bugzilla: 1666730
-    RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-    RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-    RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-
-    RHEL-only
-
-    We want to provide this driver only for the virtualisation use case,
-    so we remove all other entries from the pci-id table and add only the
-    single entry needed for virtualisation.
-
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- drivers/message/fusion/mptsas.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
-index c17614cd6ed8..ca44a35ec411 100644
---- a/drivers/message/fusion/mptsas.c
-+++ b/drivers/message/fusion/mptsas.c
-@@ -5358,6 +5358,10 @@ static void mptsas_remove(struct pci_dev *pdev)
- }
-
- static struct pci_device_id mptsas_pci_table[] = {
-+#ifdef CONFIG_RHEL_DIFFERENCES
-+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
-+		PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
-+#else
- 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1064,
- 		PCI_ANY_ID, PCI_ANY_ID },
- 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068,
-@@ -5370,6 +5374,7 @@ static struct pci_device_id mptsas_pci_table[] = {
- 		PCI_ANY_ID, PCI_ANY_ID },
- 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_SAS1068_820XELP,
- 		PCI_ANY_ID, PCI_ANY_ID },
-+#endif
- 	{0}	/* Terminating entry */
- };
- MODULE_DEVICE_TABLE(pci, mptsas_pci_table);
--- 
-2.26.2
-

0001-mptspi-Taint-kernel-if-mptspi-is-loaded.patch

@@ -1,51 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:48 -0500
-Subject: [PATCH] mptspi: Taint kernel if mptspi is loaded
-
-Author: Tomas Henzl <thenzl@redhat.com>
-Date:   Thu Jan 10 16:11:43 2019 -0500
-
-    [message] mptspi: Taint kernel if mptspi is loaded
-
-    Message-id: <20190110161145.5117-2-thenzl@redhat.com>
-    Patchwork-id: 237188
-    O-Subject: [RHEL-8.0 e-stor 1/3] mptspi: Taint kernel if mptspi is loaded
-    Bugzilla: 1651803
-    RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-    RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-    RH-Acked-by: Chris Leech <cleech@redhat.com>
-
-    RHEL-only
-    We are only keeping it to ease developer transitions, we're not
-    supporting it, so mark it as unsupported by tainting the kernel and
-    issuing an impossible to misunderstand message to the log
-
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- drivers/message/fusion/mptspi.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
-index eabc4de5816c..c028f5944694 100644
---- a/drivers/message/fusion/mptspi.c
-+++ b/drivers/message/fusion/mptspi.c
-@@ -1534,6 +1534,12 @@ mptspi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
- 		    0, 0, 0, 0, 5);
-
- 	scsi_scan_host(sh);
-+
-+#ifdef CONFIG_RHEL_DIFFERENCES
-+	add_taint(TAINT_SUPPORT_REMOVED, LOCKDEP_STILL_OK);
-+	pr_warn("MPTSPI MODULE IS NOT SUPPORTED\n");
-+#endif
-+
- 	return 0;
-
- out_mptspi_probe:
--- 
-2.26.2
-

0001-mptspi-pci-id-table-changes.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:45 -0500
-Subject: [PATCH] mptspi: pci-id table changes
-
-Author: Tomas Henzl <thenzl@redhat.com>
-Date:   Thu Jan 10 16:11:44 2019 -0500
-
-    [message] mptspi: pci-id table changes
-
-    Message-id: <20190110161145.5117-3-thenzl@redhat.com>
-    Patchwork-id: 237190
-    O-Subject: [RHEL-8.0 e-stor 2/3] mptspi: pci-id table changes
-    Bugzilla: 1651803
-    RH-Acked-by: Maurizio Lombardi <mlombard@redhat.com>
-    RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-    RH-Acked-by: Chris Leech <cleech@redhat.com>
-
-    RHEL-only
-    We want to provide this driver only for the virtualisation use case,
-    so we remove all other entries from the pci-id table and add only the
-    single entry needed for virtualisation.
-
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Laura Abbott <labbott@redhat.com>
----
- drivers/message/fusion/mptspi.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
-index c028f5944694..1f458e35effb 100644
---- a/drivers/message/fusion/mptspi.c
-+++ b/drivers/message/fusion/mptspi.c
-@@ -1238,12 +1238,17 @@ static struct spi_function_template mptspi_transport_functions = {
-  */
-
- static struct pci_device_id mptspi_pci_table[] = {
-+#ifdef CONFIG_RHEL_DIFFERENCES
-+	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
-+	PCI_VENDOR_ID_VMWARE, PCI_ANY_ID },
-+#else
- 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1030,
- 		PCI_ANY_ID, PCI_ANY_ID },
- 	{ PCI_VENDOR_ID_ATTO, MPI_MANUFACTPAGE_DEVID_53C1030,
- 		PCI_ANY_ID, PCI_ANY_ID },
- 	{ PCI_VENDOR_ID_LSI_LOGIC, MPI_MANUFACTPAGE_DEVID_53C1035,
- 		PCI_ANY_ID, PCI_ANY_ID },
-+#endif
- 	{0}	/* Terminating entry */
- };
- MODULE_DEVICE_TABLE(pci, mptspi_pci_table);
--- 
-2.26.2
-

0001-put-RHEL-info-into-generated-headers.patch

@@ -1,82 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Laura Abbott <labbott@redhat.com>
-Date: Mon, 7 Jan 2019 20:55:21 +0000
-Subject: [PATCH] put RHEL info into generated headers
-
-Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1663728
-
-Commit 43fee2b23895 ("kbuild: do not redirect the first prerequisite for
-filechk") upstream introduced some context diff. This just fixes that up.
-
-    Bugzilla: http://bugzilla.redhat.com/1544999
-
-    kernel-alt commit b3bbf3db12b8a48491eb4175eae25eb907f092ac
-    Author: Prarit Bhargava <prarit@redhat.com>
-    Date:   Fri Feb 9 18:09:25 2018 -0500
-
-        [kernel] put RHEL info into generated headers
-
-         Message-id: <20180209180926.5955-2-prarit@redhat.com>
-         Patchwork-id: 205585
-         O-Subject: [RHEL-ALT-7.5 BZ 1542796 1/2] put RHEL info into generated headers
-        Bugzilla: 1542796
-        RH-Acked-by: David Arcari <darcari@redhat.com>
-        RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-        RH-Acked-by: Steve Best <sbest@redhat.com>
-
-        Bugzilla: http://bugzilla.redhat.com/1542796
-
-        rhel7 commit 6199c642a685fba61a298901190659dbedb7c3c3
-        Author: Jarod Wilson <jarod@redhat.com>
-        Date:   Thu Oct 10 20:14:33 2013 -0400
-
-             [redhat] put RHEL info into generated headers
-
-             Message-id: <1381436073-8850-1-git-send-email-jarod@redhat.com>
-             Patchwork-id: 69475
-             O-Subject: [RHEL7 PATCH] [redhat] put RHEL info into generated headers
-            Bugzilla:
-            RH-Acked-by: Neil Horman <nhorman@redhat.com>
-            RH-Acked-by: Rafael Aquini <aquini@redhat.com>
-            RH-Acked-by: Kyle McMartin <kmcmarti@redhat.com>
-
-            While glancing at the differences between RHEL6 and RHEL7's modifications to the
-            top-level Makefile, some discrepancies popped up... This brings RHEL7 in line
-            with all of the customizations we make in RHEL6 to get distro info propagated.
-
-            Signed-off-by: Jarod Wilson <jarod@redhat.com>
-
-        Cc: Herton R. Krzesinski <herton@redhat.com>
-        Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Acked-by: Don Zickus <dzickus@redhat.com>
-Acked-by: Prarit Bhargava <prarit@redhat.com>
----
- Makefile | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 24a4c1b97bb0..37cfb39d77af 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1217,7 +1217,13 @@ endef
- define filechk_version.h
- 	echo \#define LINUX_VERSION_CODE $(shell                         \
- 	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
--	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'
-+	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'; \
-+	echo '#define RHEL_MAJOR $(RHEL_MAJOR)'; \
-+	echo '#define RHEL_MINOR $(RHEL_MINOR)'; \
-+	echo '#define RHEL_RELEASE_VERSION(a,b) (((a) << 8) + (b))'; \
-+	echo '#define RHEL_RELEASE_CODE \
-+		$(shell expr $(RHEL_MAJOR) \* 256 + $(RHEL_MINOR))'; \
-+	echo '#define RHEL_RELEASE "$(RHEL_RELEASE)"'
- endef
-
- $(version_h): FORCE
--- 
-2.26.2
-

0001-qla2xxx-Remove-PCI-IDs-of-deprecated-adapter.patch

@@ -1,79 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Cline <jcline@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:44 -0500
-Subject: [PATCH] qla2xxx: Remove PCI IDs of deprecated adapter
-
-Message-id: <20190708192223.21890-1-jcline@redhat.com>
-Patchwork-id: 266422
-O-Subject: [ARK INTERNAL PATCH] qla2xxx: Remove PCI IDs of deprecated adapter
-Bugzilla:
-RH-Acked-by: Don Zickus <dzickus@redhat.com>
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-
-Commit ecc89f25e225 ("scsi: qla2xxx: Add Device ID for ISP28XX")
-introduced addition device IDs which broke the patch context.
-
-    Message-id: <20180503234750.33648-1-hmadhani@redhat.com>
-    Patchwork-id: 212501
-    O-Subject: [RHEL 8 e-stor PATCH v2] qla2xxx: Remove PCI IDs of deprecated adapter
-    Bugzilla: 1572233
-    RH-Acked-by: Tomas Henzl <thenzl@redhat.com>
-    RH-Acked-by: Chris Leech <cleech@redhat.com>
-    RH-Acked-by: Tom Coughlan <coughlan@redhat.com>
-
-    Bugzilla:
-    ========    https://bugzilla.redhat.com/show_bug.cgi?id72233
-
-    commit none
-
-    Brewbuild:
-    ==========    https://brewweb.engineering.redhat.com/brew/taskinfo?taskID977226
-
-    Tetsing:
-    =======    N/A. PCI IDs are removed as part of this patch
-
-    Signed-off-by: Himanshu Madhani <hmadhani@redhat.com>
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Jeremy Cline <jcline@redhat.com>
-
-Note: Simplified backport to just pci-ids
----
- drivers/scsi/qla2xxx/qla_os.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
-index e92fad99338c..8dae589e7e50 100644
---- a/drivers/scsi/qla2xxx/qla_os.c
-+++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -7766,6 +7766,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
- };
-
- static struct pci_device_id qla2xxx_pci_tbl[] = {
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },
-@@ -7778,13 +7779,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) },
-+#endif
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2532) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2031) },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8001) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8021) },
-+#endif
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8031) },
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISPF001) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8044) },
-+#endif
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2071) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2271) },
- 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2261) },
--- 
-2.26.2
-

0001-qla4xxx-Remove-deprecated-PCI-IDs-from-RHEL-8.patch

@@ -1,56 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Chad Dupuis <cdupuis@redhat.com>
-Date: Thu, 2 Jan 2020 14:24:39 -0500
-Subject: [PATCH] qla4xxx: Remove deprecated PCI IDs from RHEL 8
-
-Message-id: <1524063895-23086-1-git-send-email-cdupuis@redhat.com>
-Patchwork-id: 209742
-O-Subject: [RHEL 8 e-stor PATCH] qla4xxx: Remove depricated PCI IDs from RHEL 8.
-Bugzilla: 1518874
-RH-Acked-by: Tomas Henzl <thenzl@redhat.com>
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-
-Bugzilla: 1518874
-
-RHEL 8 specific
-
-Brew build: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID822250
-
-Three PCI device IDs are marked as deprecated in RHEL 7:
-
-PCI_DEVICE_ID_QLOGIC_ISP8022
-PCI_DEVICE_ID_QLOGIC_ISP8324
-PCI_DEVICE_ID_QLOGIC_ISP8042
-
-This patch removes them from the PCI table in RHEL 8 so the
-qla4xxx driver will not bind to the hardware.
-
-Upstream Status: RHEL only
-Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
----
- drivers/scsi/qla4xxx/ql4_os.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
-index 5dc697ce8b5d..15f4bedc3a78 100644
---- a/drivers/scsi/qla4xxx/ql4_os.c
-+++ b/drivers/scsi/qla4xxx/ql4_os.c
-@@ -9842,6 +9842,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
- 		.subvendor	= PCI_ANY_ID,
- 		.subdevice	= PCI_ANY_ID,
- 	},
-+#ifndef CONFIG_RHEL_DIFFERENCES
- 	{
- 		.vendor         = PCI_VENDOR_ID_QLOGIC,
- 		.device         = PCI_DEVICE_ID_QLOGIC_ISP8022,
-@@ -9860,6 +9861,7 @@ static struct pci_device_id qla4xxx_pci_tbl[] = {
- 		.subvendor	= PCI_ANY_ID,
- 		.subdevice	= PCI_ANY_ID,
- 	},
-+#endif
- 	{0, 0},
- };
- MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl);
--- 
-2.26.2
-

0001-redhat-Replace-hardware.redhat.com-link-in-Unsupport.patch

@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Prarit Bhargava <prarit@redhat.com>
-Date: Mon, 13 Apr 2020 10:00:48 -0400
-Subject: [PATCH] redhat: Replace hardware.redhat.com link in Unsupported
- message
-
-Resending ... did not get any reviews.
-
-P.
-
----8<---
-
-Bugzilla: http://bugzilla.redhat.com/1810301
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=27902812
-Local Tree: git://git.engineering.redhat.com/users/prarit/rhel8 1810301
-
-Upstream Status: RHEL only
-
-For almost a decade, RHEL kernels have output the message
-
-"this hardware has not undergone testing by Red Hat and might not be
-certified. Please consult https://hardware.redhat.com for certified
-hardware."
-
-for unsupported hardware.  This link should be now be updated to the
-new catalog.redhat.com location.  The old hardware.redhat.com is now
-redirecting to catalog.redhat.com for older releases.
-
-Signed-off-by: Prarit Bhargava <prarit@redhat.com>
-Cc: David Arcari <darcari@redhat.com>
----
- kernel/rh_taint.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c
-index 8d1641710ed7..4050b6dead75 100644
---- a/kernel/rh_taint.c
-+++ b/kernel/rh_taint.c
-@@ -24,7 +24,7 @@
- void mark_hardware_unsupported(const char *msg)
- {
- 	/* Print one single message */
--	pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://hardware.redhat.com for certified hardware.\n", msg);
-+	pr_crit("Warning: %s - this hardware has not undergone testing by Red Hat and might not be certified. Please consult https://catalog.redhat.com for certified hardware.\n", msg);
- }
- EXPORT_SYMBOL(mark_hardware_unsupported);
-
--- 
-2.26.2
-

0001-redhat-rh_kabi-Add-macros-to-size-and-extend-structs.patch

@@ -1,201 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Prarit Bhargava <prarit@redhat.com>
-Date: Wed, 19 Feb 2020 11:52:16 +0100
-Subject: [PATCH] redhat: rh_kabi: Add macros to size and extend structs
-
-RH-Acked-by: Ivan Vecera <ivecera@redhat.com>
-RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-
-Upstream: RHEL-only
-
-As noted in the reviews, there are some areas of future work:
-
-1) A further restriction on the access of the extended struct fields
-would be to require the addition of an accessor function.
-2) Additional macros to use RH_KABI_EXTEND fields.
-3) Additional macros to mark extended struts' field for internal kernel
-versus module use.
-
-The RHEL7 code contains macros to extend kernel structs.  For example, the
-RH_KABI_EXTEND() can be used to extend a struct when used appropriately.
-This macro (and others similar to it) has a significant shortcoming as it
-cannot be used in the case where a struct is known to allocate the struct
-within a 3rd party module.  For example, in RHELX.0, suppose there exists
-a struct,
-
-struct in_kernel {
-	int foo0;
-};
-
-and an exported function,
-
-void in_kernel_set_foo(struct in_kernel *ink)
-{
-	...
-	ink->foo0 = 0xBA5EBA11;
-	...
-}
-
-Let's also suppose a struct in_kernel is statically defined within a 3rd
-party module, or dynamically allocated as
-
-	struct in_kernel *3rd_party_ink;
-	...
-	ink = kmalloc(sizeof(*3rd_party_ink), GFP_KERNEL);
-	...
-
-In RHELX.1, suppose the struct is expanded by
-
-struct in_kernel {
-	int foo0;
-	RH_KABI_EXTEND(foo1)
-};
-
-and the exported function is modified as
-
-void in_kernel_set_foo(struct in_kernel *ink)
-{
-	...
-	ink->foo0 = 0xBA5EBA11;
-	ink->foo1 = 0xBA5EBA11;
-	...
-}
-
-The 3rd party module, compiled against RHELX.0, will not have allocated
-memory for foo1, and in_kernel_set_foo() will reference garbage in memory.
-
-To fix this problem, Jiri Benc came up with an great solution that should
-be unified for all future RHELX.0 expansions of structs.  RHEL7 commit
-e33a3c136b56 ("[net] introduce net_device_ops_extended") adds a size
-parameter to net_device_ops that can be queried to validate memory
-accesses.  In the patch, net_device_ops is expanded by embedding a
-net_device_ops_extended struct and addig a size parameter.  The size
-parameter is used to compare the offset of a parameter in the
-net_device_ops_extended struct to the size of the struct at compile time,
-and if valid, the memory access can be programmatically allowed to occur.
-
-I have taken his idea and created several new standard macros that allow
-structs to be expanded by embedding a new struct or by adding a pointer
-to a new struct.
-
-There are, however, some rules that must be followed when using these
-new macros:
-
-1.  The default name of the extended struct is ##name##_rh.  For example,
-pci_dev_rh, device_rh, net_device_ops_rh, etc.
-2.  _rh structs cannot be shrunk in size as such changes would break the
-size & offset comparison.
-3.  The size field _must_ be set at the spot of allocation for use.  Use of the
-_rh fields without setting the size field via RH_KABI_SET_SIZE|_PTR() is
-invalid in the kernel or in a 3rd party module.
-4.  These new macros do not preclude expansions like
-
-struct in_kernel_rh {
-};
-
-struct in_kernel {
-	...
-	RH_KABI_EXTEND(void *ptr1)
-	RH_KABI_EXTEND(void *ptr2)
-	RH_KABI_EXTEND(void *ptr3)
-	RH_KABI_EXTEND(void *ptr4)
-	RH_KABI_SIZE_AND_EXTEND_PTR(in_kernel)
-};
-
-These macros are generally intended for pre-KABI freeze use, however,
-there may be cases where these macros can be used post-KABI freeze.
-Due to the design of RH_KABI_EXTEND() which embeds __GENKSYMS__ care must
-be taken when using RH_KABI_SIZE_AND_EXTEND|_PTR() post-KABI freeze to
-ensure that structs are not embedded within another struct, verifying
-offsets, etc.
-
-Add RH_KABI_SIZE_AND_EXTEND(), RH_KABI_SIZE_AND_EXTEND_PTR(), and
-other macros that allow for safe expansion of structs.
-
-v2: Cleanup comments.
-v3: Cleanup comments.
-
-Upstream Status: RHEL only
-Signed-off-by: Prarit Bhargava <prarit@redhat.com>
-Signed-off-by: Jiri Benc <jbenc@redhat.com>
----
- include/linux/rh_kabi.h | 64 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 64 insertions(+)
-
-diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
-index 87f2bd530df7..d551df994583 100644
---- a/include/linux/rh_kabi.h
-+++ b/include/linux/rh_kabi.h
-@@ -186,4 +186,68 @@
-
- #define RH_KABI_EXCLUDE(_elem)		_RH_KABI_EXCLUDE(_elem);
-
-+/*
-+ * RHEL macros to extend structs.
-+ *
-+ * base struct: The struct being extended.  For example, pci_dev.
-+ * extended struct: The Red Hat struct being added to the base struct.
-+ *		    For example, pci_dev_rh.
-+ *
-+ * These macros should be used to extend structs before KABI freeze.
-+ * They can be used post-KABI freeze in the limited case of the base
-+ * struct not being embedded in another struct.
-+ *
-+ * Extended structs cannot be shrunk in size as changes will break
-+ * the size & offset comparison.
-+ *
-+ * Extended struct elements are not guaranteed for access by modules unless
-+ * explicitly commented as such in the declaration of the extended struct or
-+ * the element in the extended struct.
-+ */
-+
-+/*
-+ * RH_KABI_SIZE_AND_EXTEND|_PTR() extends a struct by embedding or adding
-+ * a pointer in a base struct.  The name of the new struct is the name
-+ * of the base struct appended with _rh.
-+ */
-+#define RH_KABI_SIZE_AND_EXTEND_PTR(_struct)				\
-+	size_t _struct##_size_rh;					\
-+	RH_KABI_EXCLUDE(struct _struct##_rh *_struct##_rh)
-+
-+#define RH_KABI_SIZE_AND_EXTEND(_struct)				\
-+	size_t _struct##_size_rh;					\
-+	RH_KABI_EXCLUDE(struct _struct##_rh _struct##_rh)
-+
-+/*
-+ * RH_KABI_SET_SIZE calculates and sets the size of the extended struct and
-+ * stores it in the size_rh field for structs that are dynamically allocated.
-+ * This macro MUST be called when expanding a base struct with
-+ * RH_KABI_SIZE_AND_EXTEND, and it MUST be called from the allocation site
-+ * regardless of being allocated in the kernel or a module.
-+ */
-+#define RH_KABI_SET_SIZE(_name, _struct) ({				\
-+	_name._struct##_size_rh = sizeof(struct _struct##_rh);		\
-+})
-+
-+/*
-+ * RH_KABI_INIT_SIZE calculates and sets the size of the extended struct and
-+ * stores it in the size_rh field for structs that are statically allocated.
-+ * This macro MUST be called when expanding a base struct with
-+ * RH_KABI_SIZE_AND_EXTEND, and it MUST be called from the declaration site
-+ * regardless of being allocated in the kernel or a module.
-+ */
-+#define RH_KABI_INIT_SIZE(_struct)					\
-+	._struct##_size_rh = sizeof(struct _struct##_rh),
-+
-+/*
-+ * RH_KABI_CHECK_EXT verifies allocated memory exists.  This MUST be called to
-+ * verify that memory in the _rh struct is valid, and can be called
-+ * regardless if RH_KABI_SIZE_AND_EXTEND or RH_KABI_SIZE_AND_EXTEND_PTR is
-+ * used.
-+ */
-+#define RH_KABI_CHECK_EXT(_ptr, _struct, _field) ({			\
-+	size_t __off = offsetof(struct _struct##_rh, _field);		\
-+	_ptr->_struct##_size_rh > __off ? true : false;			\
-+})
-+
- #endif /* _LINUX_RH_KABI_H */
--- 
-2.26.2
-

0001-redhat-rh_kabi-Fix-RH_KABI_SET_SIZE-to-use-dereferen.patch

@@ -1,47 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Tony Camuso <tcamuso@redhat.com>
-Date: Wed, 19 Feb 2020 11:52:17 +0100
-Subject: [PATCH] redhat: rh_kabi: Fix RH_KABI_SET_SIZE to use dereference
- operator
-
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-
-Upstream Status: RHEL only
-
-Since this macro is intended to record the sizeof extension structs that
-are dynamically allocated, using the structure dereference operator '->'
-is a better choice, else the macro would have to be invoked with the
-_name argument dereferenced as (*_name).
-
-Also added a short note explaining that, unlike the other RH_KABI
-macros that are invoked from within structs, this macro is invoked
-outside a struct and therefore needs a semicolon termination.
-
-Upstream Status: RHEL only
-Signed-off-by: Tony Camuso <tcamuso@redhat.com>
-Signed-off-by: Jiri Benc <jbenc@redhat.com>
----
- include/linux/rh_kabi.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
-index d551df994583..9a4fea93ad99 100644
---- a/include/linux/rh_kabi.h
-+++ b/include/linux/rh_kabi.h
-@@ -224,9 +224,11 @@
-  * This macro MUST be called when expanding a base struct with
-  * RH_KABI_SIZE_AND_EXTEND, and it MUST be called from the allocation site
-  * regardless of being allocated in the kernel or a module.
-+ * Note: since this macro is intended to be invoked outside of a struct,
-+ * a semicolon is necessary at the end of the line where it is invoked.
-  */
- #define RH_KABI_SET_SIZE(_name, _struct) ({				\
--	_name._struct##_size_rh = sizeof(struct _struct##_rh);		\
-+	_name->_struct##_size_rh = sizeof(struct _struct##_rh);		\
- })
-
- /*
--- 
-2.26.2
-

0001-redhat-rh_kabi-Indirect-EXTEND-macros-so-nesting-of-.patch

@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Don Dutile <ddutile@redhat.com>
-Date: Wed, 19 Feb 2020 11:52:18 +0100
-Subject: [PATCH] redhat: rh_kabi: Indirect EXTEND macros so nesting of other
- macros will resolve.
-
-RH-Acked-by: Neil Horman <nhorman@redhat.com>
-RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-
-Upstream status: RHEL only
-
-rh_kabi: Indirect EXTEND macros so nesting of other macros will resolve.
-
-Upstream Status: RHEL only
-Suggested-by: Jiri Benc <jbenc@redhat.com>
-Signed-off-by: Donald Dutile <ddutile@redhat.com>
-Signed-off-by: Jiri Benc <jbenc@redhat.com>
----
- include/linux/rh_kabi.h | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
-index 9a4fea93ad99..cdc636d3013d 100644
---- a/include/linux/rh_kabi.h
-+++ b/include/linux/rh_kabi.h
-@@ -210,13 +210,17 @@
-  * a pointer in a base struct.  The name of the new struct is the name
-  * of the base struct appended with _rh.
-  */
--#define RH_KABI_SIZE_AND_EXTEND_PTR(_struct)				\
-+#define _RH_KABI_SIZE_AND_EXTEND_PTR(_struct)				\
- 	size_t _struct##_size_rh;					\
- 	RH_KABI_EXCLUDE(struct _struct##_rh *_struct##_rh)
-+#define RH_KABI_SIZE_AND_EXTEND_PTR(_struct)				\
-+	_RH_KABI_SIZE_AND_EXTEND_PTR(_struct)
-
--#define RH_KABI_SIZE_AND_EXTEND(_struct)				\
-+#define _RH_KABI_SIZE_AND_EXTEND(_struct)				\
- 	size_t _struct##_size_rh;					\
- 	RH_KABI_EXCLUDE(struct _struct##_rh _struct##_rh)
-+#define RH_KABI_SIZE_AND_EXTEND(_struct)				\
-+	_RH_KABI_SIZE_AND_EXTEND(_struct)
-
- /*
-  * RH_KABI_SET_SIZE calculates and sets the size of the extended struct and
--- 
-2.26.2
-

0001-redhat-rh_kabi-add-a-comment-with-warning-about-RH_K.patch

@@ -1,67 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jiri Benc <jbenc@redhat.com>
-Date: Wed, 19 Feb 2020 11:52:20 +0100
-Subject: [PATCH] redhat: rh_kabi add a comment with warning about
- RH_KABI_EXCLUDE usage
-
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Don Zickus <dzickus@redhat.com>
-
-Upstream status: RHEL only
-
-We've seen attempts of incorrect RH_KABI_EXCLUDE usage. The macro is
-dangerous and any structure marked by it becomes fragile. It completely
-mutes the kABI checker and a future attempt to whitelist anything using
-a structure annotated by RH_KABI_EXCLUDE will generate easily broken, error
-prone code. Also, it bypasses module loading checks for the structure and
-can lead to kernel crashes triggered by 3rd party modules unless carefully
-prevented by RH_KABI_FORCE_CHANGE.
-
-As such, it should not be used routinely. The only valid usage is a code
-heavily in flux upstream that is going to be refactored and turned upside
-down, which is indirectly whitelisted and which we expect to need
-backported.
-
-Any usage of this macro requires deep understanding of how kABI works.
-
-Add a big fat warning to stop the misuse.
-
-Upstream Status: RHEL only
-Signed-off-by: Jiri Benc <jbenc@redhat.com>
----
- include/linux/rh_kabi.h | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
-index 4debb7aaad48..b90601e8a657 100644
---- a/include/linux/rh_kabi.h
-+++ b/include/linux/rh_kabi.h
-@@ -2,7 +2,7 @@
-  * rh_kabi.h - Red Hat kABI abstraction header
-  *
-  * Copyright (c) 2014 Don Zickus
-- * Copyright (c) 2015-2017 Jiri Benc
-+ * Copyright (c) 2015-2018 Jiri Benc
-  * Copyright (c) 2015 Sabrina Dubroca, Hannes Frederic Sowa
-  * Copyright (c) 2016-2018 Prarit Bhargava
-  * Copyright (c) 2017 Paolo Abeni, Larry Woodman
-@@ -93,7 +93,16 @@
-  *   corrupt memory.  Instead, by changing the symbol checksum, such modules
-  *   won't be loaded by the kernel.  This macro should only be used as a
-  *   last resort when all other KABI workarounds have failed.
-+ *
-  * RH_KABI_EXCLUDE
-+ *   !!! WARNING: DANGEROUS, DO NOT USE unless you are aware of all the !!!
-+ *   !!! implications. This should be used ONLY EXCEPTIONALLY and only  !!!
-+ *   !!! under specific circumstances. Very likely, this macro does not !!!
-+ *   !!! do what you expect it to do. Note that any usage of this macro !!!
-+ *   !!! MUST be paired with a RH_KABI_FORCE_CHANGE annotation of       !!!
-+ *   !!! a suitable symbol (or an equivalent safeguard) and the commit  !!!
-+ *   !!! log MUST explain why the chosen solution is appropriate.       !!!
-+ *
-  *   Exclude the element from checksum generation.  Any such element is
-  *   considered not to be part of the kABI whitelist and may be changed at
-  *   will.  Note however that it's the responsibility of the developer
--- 
-2.26.2
-

0001-redhat-rh_kabi-deduplication-friendly-structs.patch

@@ -1,65 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jiri Benc <jbenc@redhat.com>
-Date: Wed, 19 Feb 2020 11:52:21 +0100
-Subject: [PATCH] redhat: rh_kabi: deduplication friendly structs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Acked-by: Bruno Meneguele <bmeneg@redhat.com>
-RH-Acked-by: Jesper Brouer <brouer@redhat.com>
-RH-Acked-by: Prarit Bhargava <prarit@redhat.com>
-RH-Acked-by: Jiri Olsa <jolsa@redhat.com>
-RH-Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
-
-Upstream status: RHEL only
-
-We don't really need the field names to be globally unique, it is enough
-when they are unique in the given struct. Since structs do not generally
-span mutliple files, using the line number is enough to ensure an unique
-identifier. It means that we can't use two RH_KABI_RENAME macros on the same
-line but that's not happening anyway.
-
-This allows pahole to deduplicate the type info of structs using kABI
-macros, lowering the size of vmlinuz from 26M to 8.5M.
-
-Upstream Status: RHEL only
-Signed-off-by: Jiri Benc <jbenc@redhat.com>
----
- include/linux/rh_kabi.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
-index b90601e8a657..ea9c136bf884 100644
---- a/include/linux/rh_kabi.h
-+++ b/include/linux/rh_kabi.h
-@@ -163,6 +163,8 @@
- # define __RH_KABI_CHECK_SIZE(_item, _size)
- #endif
-
-+#define RH_KABI_UNIQUE_ID	__PASTE(rh_kabi_hidden_, __LINE__)
-+
- # define _RH_KABI_DEPRECATE(_type, _orig)	_type rh_reserved_##_orig
- # define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...)  \
- 	_type (* rh_reserved_##_orig)(_args)
-@@ -171,7 +173,7 @@
- 		_new;					  \
- 		struct {				  \
- 			_orig;				  \
--		} __UNIQUE_ID(rh_kabi_hide);		  \
-+		} RH_KABI_UNIQUE_ID;			  \
- 		__RH_KABI_CHECK_SIZE_ALIGN(_orig, _new);  \
- 	}
- # define _RH_KABI_REPLACE_UNSAFE(_orig, _new)	_new
-@@ -218,7 +220,7 @@
- #define RH_KABI_EXTEND_WITH_SIZE(_new, _size)				\
- 	RH_KABI_EXTEND(union {						\
- 		_new;							\
--		unsigned long __UNIQUE_ID(rh_kabi_reserved)[_size];	\
-+		unsigned long RH_KABI_UNIQUE_ID[_size];			\
- 		__RH_KABI_CHECK_SIZE(_new, 8 * (_size));		\
- 	})
-
--- 
-2.26.2
-

0001-redhat-rh_kabi-introduce-RH_KABI_EXTEND_WITH_SIZE.patch

@@ -1,101 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jiri Benc <jbenc@redhat.com>
-Date: Wed, 19 Feb 2020 11:52:19 +0100
-Subject: [PATCH] redhat: rh_kabi: introduce RH_KABI_EXTEND_WITH_SIZE
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-RH-Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
-RH-Acked-by: Hangbin Liu <haliu@redhat.com>
-
-Upstream status: RHEL only
-
-This allows addition of a struct into struct while reserving extra space.
-See the documentation in rh_kabi.h for details.
-
-The check for size is automatically disabled in -debug kernels that have
-many fields larger than the production kernels (mutexes etc.) and that are
-not under kABI guarantee.
-
-I'm also moving a misplaced comment for RH_KABI_FILL_HOLE.
-
-(Pointed out by Sabrina:) We need to force align the added field to 8 byte
-offset. Otherwise, if the required alignment of the added field changed
-later (e.g. it was a structure with only a single field that was changed
-from int to char) and the previous field was smaller than long, it could
-lead to the whole union shifting position and offsets of the following
-fields could change. It's also safer to align the size, too.
-
-Let the 'size' parameter specify number of longs to be added and not number
-of bytes. Note we assume a 64 bit architecture, which is the case for RHEL.
-
-Upstream Status: RHEL only
-Signed-off-by: Jiri Benc <jbenc@redhat.com>
----
- include/linux/rh_kabi.h | 29 ++++++++++++++++++++++++++++-
- 1 file changed, 28 insertions(+), 1 deletion(-)
-
-diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
-index cdc636d3013d..4debb7aaad48 100644
---- a/include/linux/rh_kabi.h
-+++ b/include/linux/rh_kabi.h
-@@ -45,11 +45,24 @@
-  * RH_KABI_EXTEND
-  *   Simple macro for adding a new element to a struct.
-  *
-- *   Warning: only use if a hole exists for _all_ arches.  Use pahole to verify.
-+ * RH_KABI_EXTEND_WITH_SIZE
-+ *   Adds a new element (usually a struct) to a struct and reserves extra
-+ *   space for the new element.  The provided 'size' is the total space to
-+ *   be added in longs (i.e. it's 8 * 'size' bytes), including the size of
-+ *   the added element.  It is automatically checked that the new element
-+ *   does not overflow the reserved space, now nor in the future. However,
-+ *   no attempt is done to check the content of the added element (struct)
-+ *   for kABI conformance - kABI checking inside the added element is
-+ *   effectively switched off.
-+ *   For any struct being added by RH_KABI_EXTEND_WITH_SIZE, it is
-+ *   recommended its content to be documented as not covered by kABI
-+ *   guarantee.
-  *
-  * RH_KABI_FILL_HOLE
-  *   Simple macro for filling a hole in a struct.
-  *
-+ *   Warning: only use if a hole exists for _all_ arches.  Use pahole to verify.
-+ *
-  * RH_KABI_RENAME
-  *   Simple macro for renaming an element without changing its type.  This
-  *   macro can be used in bitfields, for example.
-@@ -133,8 +146,12 @@
- 		_Static_assert(__alignof__(struct{_new;}) <= __alignof__(struct{_orig;}), \
- 			       __FILE__ ":" __stringify(__LINE__) ": "  __stringify(_orig) " is not aligned the same as " __stringify(_new) RH_KABI_ALIGN_WARNING); \
- 	}
-+# define __RH_KABI_CHECK_SIZE(_item, _size)				\
-+	_Static_assert(sizeof(struct{_item;}) <= _size,			\
-+		       __FILE__ ":" __stringify(__LINE__) ": " __stringify(_item) " is larger than the reserved size (" __stringify(_size) " bytes)" RH_KABI_ALIGN_WARNING)
- #else
- # define __RH_KABI_CHECK_SIZE_ALIGN(_orig, _new)
-+# define __RH_KABI_CHECK_SIZE(_item, _size)
- #endif
-
- # define _RH_KABI_DEPRECATE(_type, _orig)	_type rh_reserved_##_orig
-@@ -186,6 +203,16 @@
-
- #define RH_KABI_EXCLUDE(_elem)		_RH_KABI_EXCLUDE(_elem);
-
-+/*
-+ * Extending a struct while reserving extra space.
-+ */
-+#define RH_KABI_EXTEND_WITH_SIZE(_new, _size)				\
-+	RH_KABI_EXTEND(union {						\
-+		_new;							\
-+		unsigned long __UNIQUE_ID(rh_kabi_reserved)[_size];	\
-+		__RH_KABI_CHECK_SIZE(_new, 8 * (_size));		\
-+	})
-+
- /*
-  * RHEL macros to extend structs.
-  *
--- 
-2.26.2
-

0001-rh_kabi-introduce-RH_KABI_EXCLUDE.patch

@@ -1,104 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jakub Racek <jracek@redhat.com>
-Date: Thu, 22 Nov 2018 12:59:45 +0100
-Subject: [PATCH] rh_kabi: introduce RH_KABI_EXCLUDE
-
-Message-id: <1542891606-8048-24-git-send-email-jracek@redhat.com>
-Patchwork-id: 233503
-O-Subject: [ARK PATCH 23/44] [kernel] rh_kabi: introduce RH_KABI_EXCLUDE
-Bugzilla: 1652256
-RH-Acked-by: Don Zickus <dzickus@redhat.com>
-RH-Acked-by: Jiri Benc <jbenc@redhat.com>
-
-From: Jiri Benc <jbenc@redhat.com>
-
-Bugzilla: 1652256
-Brew: https://brewweb.engineering.redhat.com/brew/taskinfo?taskID=19244562
-
-rhel8 commit 1c588b1bbe6ea3e9e1701ccf10e22f73f687ad02
-Author: Jiri Benc <jbenc@redhat.com>
-Date:   Wed Nov 21 17:15:39 2018 +0100
-
-    [kernel] rh_kabi: introduce RH_KABI_EXCLUDE
-
-    Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1568551
-
-    Add a way to exclude certain fields of a structure that would be otherwise
-    kABI whitelisted. The new RH_KABI_EXCLUDE macro serves two purposes:
-
-    1. Not adding the excluded fields to symbol checksums, making their later
-       changes easier.
-
-    2. Document that the given fields are not considered to be kABI whitelisted
-       by Red Hat.
-
-    Note that:
-
-    - This needs to be done _before_ the actual structure gets whitelisted.
-
-    - It still allows later conversion of the excluded fields to whitelist
-      covered fields by simply changing RH_KABI_EXCLUDE to RH_KABI_EXTEND.
-
-    - The excluded fields can be modified at will but extra care needs to be
-      taken to not cause problems with 3rd party drivers using the fields. See
-      the comment inside the patch for details.
-
-    Signed-off-by: Jiri Benc <jbenc@redhat.com>
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Jakub Racek <jracek@redhat.com>
----
- include/linux/rh_kabi.h | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/include/linux/rh_kabi.h b/include/linux/rh_kabi.h
-index e0d3353802bb..87f2bd530df7 100644
---- a/include/linux/rh_kabi.h
-+++ b/include/linux/rh_kabi.h
-@@ -80,6 +80,18 @@
-  *   corrupt memory.  Instead, by changing the symbol checksum, such modules
-  *   won't be loaded by the kernel.  This macro should only be used as a
-  *   last resort when all other KABI workarounds have failed.
-+ * RH_KABI_EXCLUDE
-+ *   Exclude the element from checksum generation.  Any such element is
-+ *   considered not to be part of the kABI whitelist and may be changed at
-+ *   will.  Note however that it's the responsibility of the developer
-+ *   changing the element to ensure 3rd party drivers using this element
-+ *   won't panic, for example by not allowing them to be loaded.  That can
-+ *   be achieved by changing another, non-whitelisted symbol they use,
-+ *   either by nature of the change or by using RH_KABI_FORCE_CHANGE.
-+ *
-+ *   Also note that any change to the element must preserve its size. Change
-+ *   of the size is not allowed and would constitute a silent kABI breakage.
-+ *   Beware that the RH_KABI_EXCLUDE macro does not do any size checks.
-  *
-  * NOTE
-  *   Don't use ';' after these macros as it messes up the kABI checker by
-@@ -100,6 +112,7 @@
- # define _RH_KABI_DEPRECATE_FN(_type, _orig, _args...)	_type (*_orig)(_args)
- # define _RH_KABI_REPLACE(_orig, _new)		_orig
- # define _RH_KABI_REPLACE_UNSAFE(_orig, _new)	_orig
-+# define _RH_KABI_EXCLUDE(_elem)
-
- #else
-
-@@ -137,6 +150,8 @@
- 	}
- # define _RH_KABI_REPLACE_UNSAFE(_orig, _new)	_new
-
-+# define _RH_KABI_EXCLUDE(_elem)		_elem
-+
- #endif /* __GENKSYMS__ */
-
- /* semicolon added wrappers for the RH_KABI_REPLACE macros */
-@@ -169,4 +184,6 @@
-  */
- # define _RH_KABI_RESERVE(n)		unsigned long rh_reserved##n
-
-+#define RH_KABI_EXCLUDE(_elem)		_RH_KABI_EXCLUDE(_elem);
-+
- #endif /* _LINUX_RH_KABI_H */
--- 
-2.26.2
-

0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch

@@ -41,7 +41,7 @@ index 90a2a17239b0..be3b72c53656 100644
 +	return !!ipl_secure_flag;
 +}
 diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index 07aa15ba43b3..307abb2d82d7 100644
+index e600f6953d7c..4264e01824b3 100644
 --- a/arch/s390/kernel/setup.c
 +++ b/arch/s390/kernel/setup.c
 @@ -49,6 +49,7 @@
@@ -52,7 +52,7 @@ index 07aa15ba43b3..307abb2d82d7 100644
 
  #include <asm/boot_data.h>
  #include <asm/ipl.h>
-@@ -1086,6 +1087,9 @@ void __init setup_arch(char **cmdline_p)
+@@ -1085,6 +1086,9 @@ void __init setup_arch(char **cmdline_p)
 
  	log_component_list();
 
@@ -63,5 +63,5 @@ index 07aa15ba43b3..307abb2d82d7 100644
  	/* boot_command_line has been already set up in early.c */
  	*cmdline_p = boot_command_line;
 -- 
-2.26.2
+2.28.0
 

0001-scsi-smartpqi-add-inspur-advantech-ids.patch

@@ -32,10 +32,10 @@ Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
  1 file changed, 16 insertions(+)
 
 diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c
-index cd157f11eb22..c5dc6cf57a71 100644
+index bd38c8cea56e..477eb841d4e5 100644
 --- a/drivers/scsi/smartpqi/smartpqi_init.c
 +++ b/drivers/scsi/smartpqi/smartpqi_init.c
-@@ -8247,6 +8247,18 @@ static const struct pci_device_id pqi_pci_id_table[] = {
+@@ -8251,6 +8251,18 @@ static const struct pci_device_id pqi_pci_id_table[] = {
  		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
  			       0x19e5, 0xd22c)
  	},
@@ -54,7 +54,7 @@ index cd157f11eb22..c5dc6cf57a71 100644
  	{
  		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
  			       PCI_VENDOR_ID_ADAPTEC2, 0x0110)
-@@ -8383,6 +8395,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {
+@@ -8387,6 +8399,10 @@ static const struct pci_device_id pqi_pci_id_table[] = {
  		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
  			       PCI_VENDOR_ID_ADVANTECH, 0x8312)
  	},
@@ -66,5 +66,5 @@ index cd157f11eb22..c5dc6cf57a71 100644
  		PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f,
  			       PCI_VENDOR_ID_DELL, 0x1fe0)
 -- 
-2.26.2
+2.28.0
 

0001-security-lockdown-expose-a-hook-to-lock-the-kernel-d.patch

@@ -17,7 +17,7 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com>
  5 files changed, 20 insertions(+)
 
 diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h
-index af998f93d256..3c33f00cd4d6 100644
+index 2a8c74d99015..0d3129588b78 100644
 --- a/include/linux/lsm_hook_defs.h
 +++ b/include/linux/lsm_hook_defs.h
 @@ -383,6 +383,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux)
@@ -30,7 +30,7 @@ index af998f93d256..3c33f00cd4d6 100644
  #ifdef CONFIG_PERF_EVENTS
  LSM_HOOK(int, 0, perf_event_open, struct perf_event_attr *attr, int type)
 diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
-index 95b7c1d32062..dbacbb1fc129 100644
+index 9e2e3e63719d..317660f68b4f 100644
 --- a/include/linux/lsm_hooks.h
 +++ b/include/linux/lsm_hooks.h
 @@ -1507,6 +1507,12 @@
@@ -99,5 +99,5 @@ index 70a7ad357bc6..23e16e773bc2 100644
  int security_perf_event_open(struct perf_event_attr *attr, int type)
  {
 -- 
-2.26.2
+2.28.0
 

0001-selinux-allow-reading-labels-before-policy-is-loaded.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jonathan Lebon <jlebon@redhat.com>
-Date: Thu, 28 May 2020 10:39:40 -0400
-Subject: [PATCH] selinux: allow reading labels before policy is loaded
-
-This patch does for `getxattr` what commit 3e3e24b42043 ("selinux: allow
-labeling before policy is loaded") did for `setxattr`; it allows
-querying the current SELinux label on disk before the policy is loaded.
-
-One of the motivations described in that commit message also drives this
-patch: for Fedora CoreOS (and eventually RHEL CoreOS), we want to be
-able to move the root filesystem for example, from xfs to ext4 on RAID,
-on first boot, at initrd time.[1]
-
-Because such an operation works at the filesystem level, we need to be
-able to read the SELinux labels first from the original root, and apply
-them to the files of the new root. The previous commit enabled the
-second part of this process; this commit enables the first part.
-
-[1] https://github.com/coreos/fedora-coreos-tracker/issues/94
-
-Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>
-Signed-off-by: Jonathan Lebon <jlebon@redhat.com>
-Signed-off-by: Paul Moore <paul@paul-moore.com>
----
- security/selinux/hooks.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
-index efa6108b1ce9..ca901025802a 100644
---- a/security/selinux/hooks.c
-+++ b/security/selinux/hooks.c
-@@ -3332,7 +3332,12 @@ static int selinux_inode_getsecurity(struct inode *inode, const char *name, void
- 	char *context = NULL;
- 	struct inode_security_struct *isec;
-
--	if (strcmp(name, XATTR_SELINUX_SUFFIX))
-+	/*
-+	 * If we're not initialized yet, then we can't validate contexts, so
-+	 * just let vfs_getxattr fall back to using the on-disk xattr.
-+	 */
-+	if (!selinux_initialized(&selinux_state) ||
-+	    strcmp(name, XATTR_SELINUX_SUFFIX))
- 		return -EOPNOTSUPP;
-
- 	/*
--- 
-2.26.2
-

0001-tags.sh-Ignore-redhat-rpm.patch

@@ -1,54 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jeremy Cline <jcline@redhat.com>
-Date: Tue, 23 Jul 2019 15:26:09 +0000
-Subject: [PATCH] tags.sh: Ignore redhat/rpm
-
-Rebased for v5.3-rc1. Commit 95fd3f87bfbe ("kbuild: add a flag to force
-absolute path for srctree") changed the context.
-
-    Message-id: <20180529180112.28376-1-prarit@redhat.com>
-    Patchwork-id: 8101
-    O-Subject: [kernel team] [RHEL8.0 BZ 1582586] scripts/tags.sh: Ignore redhat/rpm
-    Bugzilla: 1582586
-    RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
-    RH-Acked-by: Jarod Wilson <jarod@redhat.com>
-    RH-Acked-by: Neil Horman <nhorman@redhat.com>
-
-    Bugzilla: http://bugzilla.redhat.com/1582586
-    Brew: https://brewweb.devel.redhat.com/taskinfo?taskID=16502319
-
-    RHEL_only.
-
-    If 'make cscope' is run on a tree which has had 'make rh-rpm',
-    'make rh-cross-*', etc., on it, the tags information contains entries
-    from the redhat/rpm/ directories.
-
-    Ignore the tags search in redhat/rpm.
-
-    Backport of RHEL7 464ad7779507 ("[scripts] tags.sh: ignore redhat/rpm").
-
-    Signed-off-by: Prarit Bhargava <prarit@redhat.com>
-    Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
-
-Upstream Status: RHEL only
-Signed-off-by: Jeremy Cline <jcline@redhat.com>
----
- scripts/tags.sh | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/scripts/tags.sh b/scripts/tags.sh
-index 4e18ae5282a6..805341c0aaf3 100755
---- a/scripts/tags.sh
-+++ b/scripts/tags.sh
-@@ -16,6 +16,8 @@ fi
- ignore="$(echo "$RCS_FIND_IGNORE" | sed 's|\\||g' )"
- # tags and cscope files should also ignore MODVERSION *.mod.c files
- ignore="$ignore ( -name *.mod.c ) -prune -o"
-+# RHEL tags and cscope should also ignore redhat/rpm
-+ignore="$ignore ( -path redhat/rpm ) -prune -o"
-
- # Use make KBUILD_ABS_SRCTREE=1 {tags|cscope}
- # to force full paths for a non-O= build
--- 
-2.26.2
-

0001-update-phy-on-pine64-a64-devices.patch

@@ -0,0 +1,26 @@
+From bb421e23b49e39c117a31f7c07df83cddd0d96dc Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Mon, 26 Oct 2020 17:01:57 +0000
+Subject: [PATCH 1/2] update phy on pine64 a64 devices
+
+---
+ arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts           | 2 +-
+ arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+index 2165f238af13..9741fb5caa6f 100644
+--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+@@ -81,7 +81,7 @@ &ehci1 {
+ &emac {
+ 	pinctrl-names = "default";
+ 	pinctrl-0 = <&rmii_pins>;
+-	phy-mode = "rmii";
++	phy-mode = "rmii-txid";
+ 	phy-handle = <&ext_rmii_phy1>;
+ 	phy-supply = <&reg_dc1sw>;
+ 	status = "okay";
+-- 
+2.28.0
+

0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch

@@ -1,58 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 19 May 2020 11:05:40 +0200
-Subject: [PATCH] virt: vbox: Add a few new vmmdev request types to the
- userspace whitelist
-
-Upstream VirtualBox has defined and is using a few new request types for
-vmmdev requests passed through /dev/vboxguest to the hypervisor.
-
-Add the defines for these to vbox_vmmdev_types.h and add add them to the
-whitelists of vmmdev requests which userspace is allowed to make.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1789545
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Upstream Status: https://lore.kernel.org/lkml/20200520195440.38759-1-hdegoede@redhat.com/
----
- drivers/virt/vboxguest/vboxguest_core.c | 2 ++
- include/uapi/linux/vbox_vmmdev_types.h  | 3 +++
- 2 files changed, 5 insertions(+)
-
-diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c
-index 4f1addaa3f6f..ffd76b949276 100644
---- a/drivers/virt/vboxguest/vboxguest_core.c
-+++ b/drivers/virt/vboxguest/vboxguest_core.c
-@@ -1299,7 +1299,9 @@ static int vbg_req_allowed(struct vbg_dev *gdev, struct vbg_session *session,
- 	case VMMDEVREQ_VIDEO_ACCEL_ENABLE:
- 	case VMMDEVREQ_VIDEO_ACCEL_FLUSH:
- 	case VMMDEVREQ_VIDEO_SET_VISIBLE_REGION:
-+	case VMMDEVREQ_VIDEO_UPDATE_MONITOR_POSITIONS:
- 	case VMMDEVREQ_GET_DISPLAY_CHANGE_REQEX:
-+	case VMMDEVREQ_GET_DISPLAY_CHANGE_REQ_MULTI:
- 	case VMMDEVREQ_GET_SEAMLESS_CHANGE_REQ:
- 	case VMMDEVREQ_GET_VRDPCHANGE_REQ:
- 	case VMMDEVREQ_LOG_STRING:
-diff --git a/include/uapi/linux/vbox_vmmdev_types.h b/include/uapi/linux/vbox_vmmdev_types.h
-index c27289fd619a..f8a8d6b3c521 100644
---- a/include/uapi/linux/vbox_vmmdev_types.h
-+++ b/include/uapi/linux/vbox_vmmdev_types.h
-@@ -63,6 +63,7 @@ enum vmmdev_request_type {
- 	VMMDEVREQ_SET_GUEST_CAPABILITIES       = 56,
- 	VMMDEVREQ_VIDEMODE_SUPPORTED2          = 57, /* since version 3.2.0 */
- 	VMMDEVREQ_GET_DISPLAY_CHANGE_REQEX     = 80, /* since version 4.2.4 */
-+	VMMDEVREQ_GET_DISPLAY_CHANGE_REQ_MULTI = 81,
- 	VMMDEVREQ_HGCM_CONNECT                 = 60,
- 	VMMDEVREQ_HGCM_DISCONNECT              = 61,
- 	VMMDEVREQ_HGCM_CALL32                  = 62,
-@@ -92,6 +93,8 @@ enum vmmdev_request_type {
- 	VMMDEVREQ_WRITE_COREDUMP               = 218,
- 	VMMDEVREQ_GUEST_HEARTBEAT              = 219,
- 	VMMDEVREQ_HEARTBEAT_CONFIGURE          = 220,
-+	VMMDEVREQ_NT_BUG_CHECK                 = 221,
-+	VMMDEVREQ_VIDEO_UPDATE_MONITOR_POSITIONS = 222,
- 	/* Ensure the enum is a 32 bit data-type */
- 	VMMDEVREQ_SIZEHACK                     = 0x7fffffff
- };
--- 
-2.26.2
-

0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch

@@ -1,320 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 19 May 2020 18:04:30 +0200
-Subject: [PATCH] virt: vbox: Add support for the new
- VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES ioctl
-
-Add support for the new VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES ioctl, this
-is necessary for automatic resizing of the guest resolution to match the
-VM-window size to work with the new VMSVGA virtual GPU which is now the
-new default in VirtualBox.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1789545
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Upstream Status: https://lore.kernel.org/lkml/20200520195440.38759-1-hdegoede@redhat.com/
----
- drivers/virt/vboxguest/vboxguest_core.c | 163 +++++++++++++++++++++++-
- drivers/virt/vboxguest/vboxguest_core.h |  14 ++
- include/uapi/linux/vboxguest.h          |  24 ++++
- 3 files changed, 200 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c
-index 15b3cb618c6e..4f1addaa3f6f 100644
---- a/drivers/virt/vboxguest/vboxguest_core.c
-+++ b/drivers/virt/vboxguest/vboxguest_core.c
-@@ -679,7 +679,7 @@ static int vbg_set_host_capabilities(struct vbg_dev *gdev,
-
- 	WARN_ON(!mutex_is_locked(&gdev->session_mutex));
-
--	caps = gdev->set_guest_caps_tracker.mask;
-+	caps = gdev->acquired_guest_caps | gdev->set_guest_caps_tracker.mask;
-
- 	if (gdev->guest_caps_host == caps)
- 		return 0;
-@@ -703,6 +703,113 @@ static int vbg_set_host_capabilities(struct vbg_dev *gdev,
- 	return vbg_status_code_to_errno(rc);
- }
-
-+/**
-+ * Acquire (get exclusive access) guest capabilities for a session.
-+ * Takes the session mutex.
-+ * Return: 0 or negative errno value.
-+ * @gdev:			The Guest extension device.
-+ * @session:			The session.
-+ * @flags:			Flags (VBGL_IOC_AGC_FLAGS_XXX).
-+ * @or_mask:			The capabilities to add.
-+ * @not_mask:			The capabilities to remove.
-+ * @session_termination:	Set if we're called by the session cleanup code.
-+ *				This tweaks the error handling so we perform
-+ *				proper session cleanup even if the host
-+ *				misbehaves.
-+ */
-+static int vbg_acquire_session_capabilities(struct vbg_dev *gdev,
-+					    struct vbg_session *session,
-+					    u32 or_mask, u32 not_mask,
-+					    u32 flags, bool session_termination)
-+{
-+	unsigned long irqflags;
-+	bool wakeup = false;
-+	int ret = 0;
-+
-+	mutex_lock(&gdev->session_mutex);
-+
-+	if (gdev->set_guest_caps_tracker.mask & or_mask) {
-+		vbg_err("%s error: cannot acquire caps which are currently set\n",
-+			__func__);
-+		ret = -EINVAL;
-+		goto out;
-+	}
-+
-+	/*
-+	 * Mark any caps in the or_mask as now being in acquire-mode. Note
-+	 * once caps are in acquire_mode they always stay in this mode.
-+	 * This impacts event handling, so we take the event-lock.
-+	 */
-+	spin_lock_irqsave(&gdev->event_spinlock, irqflags);
-+	gdev->acquire_mode_guest_caps |= or_mask;
-+	spin_unlock_irqrestore(&gdev->event_spinlock, irqflags);
-+
-+	/* If we only have to switch the caps to acquire mode, we're done. */
-+	if (flags & VBGL_IOC_AGC_FLAGS_CONFIG_ACQUIRE_MODE)
-+		goto out;
-+
-+	not_mask &= ~or_mask; /* or_mask takes priority over not_mask */
-+	not_mask &= session->acquired_guest_caps;
-+	or_mask &= ~session->acquired_guest_caps;
-+
-+	if (or_mask == 0 && not_mask == 0)
-+		goto out;
-+
-+	if (gdev->acquired_guest_caps & or_mask) {
-+		ret = -EBUSY;
-+		goto out;
-+	}
-+
-+	gdev->acquired_guest_caps |= or_mask;
-+	gdev->acquired_guest_caps &= ~not_mask;
-+	/* session->acquired_guest_caps impacts event handling, take the lock */
-+	spin_lock_irqsave(&gdev->event_spinlock, irqflags);
-+	session->acquired_guest_caps |= or_mask;
-+	session->acquired_guest_caps &= ~not_mask;
-+	spin_unlock_irqrestore(&gdev->event_spinlock, irqflags);
-+
-+	ret = vbg_set_host_capabilities(gdev, session, session_termination);
-+	/* Roll back on failure, unless it's session termination time. */
-+	if (ret < 0 && !session_termination) {
-+		gdev->acquired_guest_caps &= ~or_mask;
-+		gdev->acquired_guest_caps |= not_mask;
-+		spin_lock_irqsave(&gdev->event_spinlock, irqflags);
-+		session->acquired_guest_caps &= ~or_mask;
-+		session->acquired_guest_caps |= not_mask;
-+		spin_unlock_irqrestore(&gdev->event_spinlock, irqflags);
-+	}
-+
-+	/*
-+	 * If we added a capability, check if that means some other thread in
-+	 * our session should be unblocked because there are events pending
-+	 * (the result of vbg_get_allowed_event_mask_for_session() may change).
-+	 *
-+	 * HACK ALERT! When the seamless support capability is added we generate
-+	 *	a seamless change event so that the ring-3 client can sync with
-+	 *	the seamless state.
-+	 */
-+	if (ret == 0 && or_mask != 0) {
-+		spin_lock_irqsave(&gdev->event_spinlock, irqflags);
-+
-+		if (or_mask & VMMDEV_GUEST_SUPPORTS_SEAMLESS)
-+			gdev->pending_events |=
-+				VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
-+
-+		if (gdev->pending_events)
-+			wakeup = true;
-+
-+		spin_unlock_irqrestore(&gdev->event_spinlock, irqflags);
-+
-+		if (wakeup)
-+			wake_up(&gdev->event_wq);
-+	}
-+
-+out:
-+	mutex_unlock(&gdev->session_mutex);
-+
-+	return ret;
-+}
-+
- /**
-  * Sets the guest capabilities for a session. Takes the session spinlock.
-  * Return: 0 or negative errno value.
-@@ -725,6 +832,13 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev,
-
- 	mutex_lock(&gdev->session_mutex);
-
-+	if (gdev->acquire_mode_guest_caps & or_mask) {
-+		vbg_err("%s error: cannot set caps which are in acquire_mode\n",
-+			__func__);
-+		ret = -EBUSY;
-+		goto out;
-+	}
-+
- 	/* Apply the changes to the session mask. */
- 	previous = session->set_guest_caps;
- 	session->set_guest_caps |= or_mask;
-@@ -962,6 +1076,7 @@ void vbg_core_close_session(struct vbg_session *session)
- 	struct vbg_dev *gdev = session->gdev;
- 	int i, rc;
-
-+	vbg_acquire_session_capabilities(gdev, session, 0, U32_MAX, 0, true);
- 	vbg_set_session_capabilities(gdev, session, 0, U32_MAX, true);
- 	vbg_set_session_event_filter(gdev, session, 0, U32_MAX, true);
-
-@@ -1019,6 +1134,25 @@ static int vbg_ioctl_driver_version_info(
- 	return 0;
- }
-
-+/* Must be called with the event_lock held */
-+static u32 vbg_get_allowed_event_mask_for_session(struct vbg_dev *gdev,
-+						  struct vbg_session *session)
-+{
-+	u32 acquire_mode_caps = gdev->acquire_mode_guest_caps;
-+	u32 session_acquired_caps = session->acquired_guest_caps;
-+	u32 allowed_events = VMMDEV_EVENT_VALID_EVENT_MASK;
-+
-+	if ((acquire_mode_caps & VMMDEV_GUEST_SUPPORTS_GRAPHICS) &&
-+	    !(session_acquired_caps & VMMDEV_GUEST_SUPPORTS_GRAPHICS))
-+		allowed_events &= ~VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST;
-+
-+	if ((acquire_mode_caps & VMMDEV_GUEST_SUPPORTS_SEAMLESS) &&
-+	    !(session_acquired_caps & VMMDEV_GUEST_SUPPORTS_SEAMLESS))
-+		allowed_events &= ~VMMDEV_EVENT_SEAMLESS_MODE_CHANGE_REQUEST;
-+
-+	return allowed_events;
-+}
-+
- static bool vbg_wait_event_cond(struct vbg_dev *gdev,
- 				struct vbg_session *session,
- 				u32 event_mask)
-@@ -1030,6 +1164,7 @@ static bool vbg_wait_event_cond(struct vbg_dev *gdev,
- 	spin_lock_irqsave(&gdev->event_spinlock, flags);
-
- 	events = gdev->pending_events & event_mask;
-+	events &= vbg_get_allowed_event_mask_for_session(gdev, session);
- 	wakeup = events || session->cancel_waiters;
-
- 	spin_unlock_irqrestore(&gdev->event_spinlock, flags);
-@@ -1044,6 +1179,7 @@ static u32 vbg_consume_events_locked(struct vbg_dev *gdev,
- {
- 	u32 events = gdev->pending_events & event_mask;
-
-+	events &= vbg_get_allowed_event_mask_for_session(gdev, session);
- 	gdev->pending_events &= ~events;
- 	return events;
- }
-@@ -1445,6 +1581,29 @@ static int vbg_ioctl_change_filter_mask(struct vbg_dev *gdev,
- 					    false);
- }
-
-+static int vbg_ioctl_acquire_guest_capabilities(struct vbg_dev *gdev,
-+	     struct vbg_session *session,
-+	     struct vbg_ioctl_acquire_guest_caps *caps)
-+{
-+	u32 flags, or_mask, not_mask;
-+
-+	if (vbg_ioctl_chk(&caps->hdr, sizeof(caps->u.in), 0))
-+		return -EINVAL;
-+
-+	flags = caps->u.in.flags;
-+	or_mask = caps->u.in.or_mask;
-+	not_mask = caps->u.in.not_mask;
-+
-+	if (flags & ~VBGL_IOC_AGC_FLAGS_VALID_MASK)
-+		return -EINVAL;
-+
-+	if ((or_mask | not_mask) & ~VMMDEV_GUEST_CAPABILITIES_MASK)
-+		return -EINVAL;
-+
-+	return vbg_acquire_session_capabilities(gdev, session, or_mask,
-+						not_mask, flags, false);
-+}
-+
- static int vbg_ioctl_change_guest_capabilities(struct vbg_dev *gdev,
- 	     struct vbg_session *session, struct vbg_ioctl_set_guest_caps *caps)
- {
-@@ -1554,6 +1713,8 @@ int vbg_core_ioctl(struct vbg_session *session, unsigned int req, void *data)
- 		return vbg_ioctl_interrupt_all_wait_events(gdev, session, data);
- 	case VBG_IOCTL_CHANGE_FILTER_MASK:
- 		return vbg_ioctl_change_filter_mask(gdev, session, data);
-+	case VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES:
-+		return vbg_ioctl_acquire_guest_capabilities(gdev, session, data);
- 	case VBG_IOCTL_CHANGE_GUEST_CAPABILITIES:
- 		return vbg_ioctl_change_guest_capabilities(gdev, session, data);
- 	case VBG_IOCTL_CHECK_BALLOON:
-diff --git a/drivers/virt/vboxguest/vboxguest_core.h b/drivers/virt/vboxguest/vboxguest_core.h
-index dc745a033164..ab4bf64e2cec 100644
---- a/drivers/virt/vboxguest/vboxguest_core.h
-+++ b/drivers/virt/vboxguest/vboxguest_core.h
-@@ -117,6 +117,15 @@ struct vbg_dev {
- 	 */
- 	u32 event_filter_host;
-
-+	/**
-+	 * Guest capabilities which have been switched to acquire_mode.
-+	 */
-+	u32 acquire_mode_guest_caps;
-+	/**
-+	 * Guest capabilities acquired by vbg_acquire_session_capabilities().
-+	 * Only one session can acquire a capability at a time.
-+	 */
-+	u32 acquired_guest_caps;
- 	/**
- 	 * Usage counters for guest capabilities requested through
- 	 * vbg_set_session_capabilities(). Indexed by capability bit
-@@ -164,6 +173,11 @@ struct vbg_session {
- 	 * host filter. Protected by vbg_gdev.session_mutex.
- 	 */
- 	u32 event_filter;
-+	/**
-+	 * Guest capabilities acquired by vbg_acquire_session_capabilities().
-+	 * Only one session can acquire a capability at a time.
-+	 */
-+	u32 acquired_guest_caps;
- 	/**
- 	 * Guest capabilities set through vbg_set_session_capabilities().
- 	 * A capability claimed by any guest session will be reported to the
-diff --git a/include/uapi/linux/vboxguest.h b/include/uapi/linux/vboxguest.h
-index f79d7abe27db..15125f6ec60d 100644
---- a/include/uapi/linux/vboxguest.h
-+++ b/include/uapi/linux/vboxguest.h
-@@ -257,6 +257,30 @@ VMMDEV_ASSERT_SIZE(vbg_ioctl_change_filter, 24 + 8);
- 	_IOWR('V', 12, struct vbg_ioctl_change_filter)
-
-
-+/** VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES data structure. */
-+struct vbg_ioctl_acquire_guest_caps {
-+	/** The header. */
-+	struct vbg_ioctl_hdr hdr;
-+	union {
-+		struct {
-+			/** Flags (VBGL_IOC_AGC_FLAGS_XXX). */
-+			__u32 flags;
-+			/** Capabilities to set (VMMDEV_GUEST_SUPPORTS_XXX). */
-+			__u32 or_mask;
-+			/** Capabilities to drop (VMMDEV_GUEST_SUPPORTS_XXX). */
-+			__u32 not_mask;
-+		} in;
-+	} u;
-+};
-+VMMDEV_ASSERT_SIZE(vbg_ioctl_acquire_guest_caps, 24 + 12);
-+
-+#define VBGL_IOC_AGC_FLAGS_CONFIG_ACQUIRE_MODE		0x00000001
-+#define VBGL_IOC_AGC_FLAGS_VALID_MASK			0x00000001
-+
-+#define VBG_IOCTL_ACQUIRE_GUEST_CAPABILITIES \
-+	_IOWR('V', 13, struct vbg_ioctl_acquire_guest_caps)
-+
-+
- /** VBG_IOCTL_CHANGE_GUEST_CAPABILITIES data structure. */
- struct vbg_ioctl_set_guest_caps {
- 	/** The header. */
--- 
-2.26.2
-

0001-virt-vbox-Add-vbg_set_host_capabilities-helper-funct.patch

@@ -1,130 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Tue, 19 May 2020 15:30:29 +0200
-Subject: [PATCH] virt: vbox: Add vbg_set_host_capabilities() helper function
-
-Add vbg_set_host_capabilities() helper function,  this is a preparation
-patch for adding support for the VBGL_IOCTL_GUEST_CAPS_ACQUIRE ioctl.
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Upstream Status: https://lore.kernel.org/lkml/20200520195440.38759-1-hdegoede@redhat.com/
----
- drivers/virt/vboxguest/vboxguest_core.c | 79 ++++++++++++++-----------
- 1 file changed, 46 insertions(+), 33 deletions(-)
-
-diff --git a/drivers/virt/vboxguest/vboxguest_core.c b/drivers/virt/vboxguest/vboxguest_core.c
-index aee5eff229f2..15b3cb618c6e 100644
---- a/drivers/virt/vboxguest/vboxguest_core.c
-+++ b/drivers/virt/vboxguest/vboxguest_core.c
-@@ -661,6 +661,48 @@ static int vbg_reset_host_capabilities(struct vbg_dev *gdev)
- 	return vbg_status_code_to_errno(rc);
- }
-
-+/**
-+ * Set guest capabilities on the host.
-+ * Must be called with gdev->session_mutex hold.
-+ * Return: 0 or negative errno value.
-+ * @gdev:			The Guest extension device.
-+ * @session:			The session.
-+ * @session_termination:	Set if we're called by the session cleanup code.
-+ */
-+static int vbg_set_host_capabilities(struct vbg_dev *gdev,
-+				     struct vbg_session *session,
-+				     bool session_termination)
-+{
-+	struct vmmdev_mask *req;
-+	u32 caps;
-+	int rc;
-+
-+	WARN_ON(!mutex_is_locked(&gdev->session_mutex));
-+
-+	caps = gdev->set_guest_caps_tracker.mask;
-+
-+	if (gdev->guest_caps_host == caps)
-+		return 0;
-+
-+	/* On termination the requestor is the kernel, as we're cleaning up. */
-+	req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES,
-+			    session_termination ? VBG_KERNEL_REQUEST :
-+						  session->requestor);
-+	if (!req) {
-+		gdev->guest_caps_host = U32_MAX;
-+		return -ENOMEM;
-+	}
-+
-+	req->or_mask = caps;
-+	req->not_mask = ~caps;
-+	rc = vbg_req_perform(gdev, req);
-+	vbg_req_free(req, sizeof(*req));
-+
-+	gdev->guest_caps_host = (rc >= 0) ? caps : U32_MAX;
-+
-+	return vbg_status_code_to_errno(rc);
-+}
-+
- /**
-  * Sets the guest capabilities for a session. Takes the session spinlock.
-  * Return: 0 or negative errno value.
-@@ -678,23 +720,8 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev,
- 					u32 or_mask, u32 not_mask,
- 					bool session_termination)
- {
--	struct vmmdev_mask *req;
- 	u32 changed, previous;
--	int rc, ret = 0;
--
--	/*
--	 * Allocate a request buffer before taking the spinlock, when
--	 * the session is being terminated the requestor is the kernel,
--	 * as we're cleaning up.
--	 */
--	req = vbg_req_alloc(sizeof(*req), VMMDEVREQ_SET_GUEST_CAPABILITIES,
--			    session_termination ? VBG_KERNEL_REQUEST :
--						  session->requestor);
--	if (!req) {
--		if (!session_termination)
--			return -ENOMEM;
--		/* Ignore allocation failure, we must do session cleanup. */
--	}
-+	int ret = 0;
-
- 	mutex_lock(&gdev->session_mutex);
-
-@@ -709,23 +736,10 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev,
- 		goto out;
-
- 	vbg_track_bit_usage(&gdev->set_guest_caps_tracker, changed, previous);
--	or_mask = gdev->set_guest_caps_tracker.mask;
--
--	if (gdev->guest_caps_host == or_mask || !req)
--		goto out;
--
--	gdev->guest_caps_host = or_mask;
--	req->or_mask = or_mask;
--	req->not_mask = ~or_mask;
--	rc = vbg_req_perform(gdev, req);
--	if (rc < 0) {
--		ret = vbg_status_code_to_errno(rc);
--
--		/* Failed, roll back (unless it's session termination time). */
--		gdev->guest_caps_host = U32_MAX;
--		if (session_termination)
--			goto out;
-
-+	ret = vbg_set_host_capabilities(gdev, session, session_termination);
-+	/* Roll back on failure, unless it's session termination time. */
-+	if (ret < 0 && !session_termination) {
- 		vbg_track_bit_usage(&gdev->set_guest_caps_tracker, changed,
- 				    session->set_guest_caps);
- 		session->set_guest_caps = previous;
-@@ -733,7 +747,6 @@ static int vbg_set_session_capabilities(struct vbg_dev *gdev,
-
- out:
- 	mutex_unlock(&gdev->session_mutex);
--	vbg_req_free(req, sizeof(*req));
-
- 	return ret;
- }
--- 
-2.26.2
-