kernel 6.0.7

1 files changed, 152 insertions, 14 deletions

diff --git a/SOURCES/patch-6.0-redhat.patch b/SOURCES/patch-6.0-redhat.patch
index b1ab036..d780947 100644
--- a/SOURCES/patch-6.0-redhat.patch
+++ b/SOURCES/patch-6.0-redhat.patch
@@ -15,7 +15,8 @@
  drivers/firmware/efi/efi.c                         | 124 +++++++++++++++------
  drivers/firmware/efi/secureboot.c                  |  38 +++++++
  drivers/firmware/sysfb.c                           |  18 ++-
- drivers/gpu/drm/vc4/vc4_hdmi.c                     |  46 +++++++-
+ drivers/gpu/drm/tiny/simpledrm.c                   |  65 +++++++++--
+ drivers/gpu/drm/vc4/vc4_hdmi.c                     |  39 ++++++-
  drivers/gpu/drm/vc4/vc4_hdmi.h                     |   1 +
  drivers/hid/hid-rmi.c                              |  64 -----------
  drivers/hwtracing/coresight/coresight-etm4x-core.c |  19 ++++
@@ -34,16 +35,17 @@
  init/Kconfig                                       |   2 +-
  kernel/module/signing.c                            |   9 +-
  net/ipv4/fib_semantics.c                           |   8 +-
+ scripts/pahole-flags.sh                            |   3 +
  scripts/tags.sh                                    |   2 +
  security/integrity/platform_certs/load_uefi.c      |   6 +-
  security/lockdown/Kconfig                          |  13 +++
  security/lockdown/lockdown.c                       |   1 +
  security/security.c                                |   6 +
  tools/testing/selftests/net/fib_nexthops.sh        |   5 +
- 42 files changed, 555 insertions(+), 192 deletions(-)
+ 44 files changed, 609 insertions(+), 199 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 62a7398c8d06..a4d699f4c09d 100644
+index c2144a4bb2ef..4e8ae58e2ec1 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -597,8 +599,110 @@ index 1f276f108cc9..7039ad9bdf7f 100644
  		pd = sysfb_create_simplefb(si, &mode);
  		if (!IS_ERR(pd))
  			goto unlock_mutex;
+diff --git a/drivers/gpu/drm/tiny/simpledrm.c b/drivers/gpu/drm/tiny/simpledrm.c
+index 5422363690e7..a5b500811892 100644
+--- a/drivers/gpu/drm/tiny/simpledrm.c
++++ b/drivers/gpu/drm/tiny/simpledrm.c
+@@ -569,20 +569,44 @@ static int simpledrm_device_init_mm(struct simpledrm_device *sdev)
+  */
+
+ /*
+- * Support all formats of simplefb and maybe more; in order
+- * of preference. The display's update function will do any
++ * Support the subset of formats that we have conversion helpers for,
++ * in order of preference. The display's update function will do any
+  * conversion necessary.
+  *
+  * TODO: Add blit helpers for remaining formats and uncomment
+  *       constants.
+  */
+-static const uint32_t simpledrm_default_formats[] = {
++
++/*
++ * Supported conversions to RGB565 and RGB888:
++ *   from [AX]RGB8888
++ */
++static const uint32_t simpledrm_primary_plane_formats_base[] = {
++	DRM_FORMAT_XRGB8888,
++	DRM_FORMAT_ARGB8888,
++};
++
++/*
++ * Supported conversions to [AX]RGB8888:
++ *   A/X variants (no-op)
++ *   from RGB565
++ *   from RGB888
++ */
++static const uint32_t simpledrm_primary_plane_formats_xrgb8888[] = {
+ 	DRM_FORMAT_XRGB8888,
+ 	DRM_FORMAT_ARGB8888,
++	DRM_FORMAT_RGB888,
+ 	DRM_FORMAT_RGB565,
+ 	//DRM_FORMAT_XRGB1555,
+ 	//DRM_FORMAT_ARGB1555,
+-	DRM_FORMAT_RGB888,
++};
++
++/*
++ * Supported conversions to [AX]RGB2101010:
++ *   A/X variants (no-op)
++ *   from [AX]RGB8888
++ */
++static const uint32_t simpledrm_primary_plane_formats_xrgb2101010[] = {
+ 	DRM_FORMAT_XRGB2101010,
+ 	DRM_FORMAT_ARGB2101010,
+ };
+@@ -744,7 +768,8 @@ static const uint32_t *simpledrm_device_formats(struct simpledrm_device *sdev,
+ 						size_t *nformats_out)
+ {
+ 	struct drm_device *dev = &sdev->dev;
+-	size_t i;
++	const uint32_t *conv_formats;
++	size_t i, conv_nformats;
+
+ 	if (sdev->nformats)
+ 		goto out; /* don't rebuild list on recurring calls */
+@@ -753,11 +778,35 @@ static const uint32_t *simpledrm_device_formats(struct simpledrm_device *sdev,
+ 	sdev->formats[0] = sdev->format->format;
+ 	sdev->nformats = 1;
+
++	switch (sdev->format->format) {
++	case DRM_FORMAT_RGB565:
++	case DRM_FORMAT_RGB888:
++		conv_formats = simpledrm_primary_plane_formats_base;
++		conv_nformats = ARRAY_SIZE(simpledrm_primary_plane_formats_base);
++		break;
++	case DRM_FORMAT_XRGB8888:
++	case DRM_FORMAT_ARGB8888:
++		conv_formats = simpledrm_primary_plane_formats_xrgb8888;
++		conv_nformats = ARRAY_SIZE(simpledrm_primary_plane_formats_xrgb8888);
++		break;
++	case DRM_FORMAT_XRGB2101010:
++	case DRM_FORMAT_ARGB2101010:
++		conv_formats = simpledrm_primary_plane_formats_xrgb2101010;
++		conv_nformats = ARRAY_SIZE(simpledrm_primary_plane_formats_xrgb2101010);
++		break;
++	default:
++		conv_formats = NULL;
++		conv_nformats = 0;
++		drm_warn(dev, "Format conversion helpers required to add extra formats.\n");
++		break;
++	}
++
++
+ 	/* default formats go second */
+-	for (i = 0; i < ARRAY_SIZE(simpledrm_default_formats); ++i) {
+-		if (simpledrm_default_formats[i] == sdev->format->format)
++	for (i = 0; i < conv_nformats; ++i) {
++		if (conv_formats[i] == sdev->format->format)
+ 			continue; /* native format already went first */
+-		sdev->formats[sdev->nformats] = simpledrm_default_formats[i];
++		sdev->formats[sdev->nformats] = conv_formats[i];
+ 		sdev->nformats++;
+ 	}
+
 diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
-index 1e5f68704d7d..4e5bba0822a5 100644
+index 780a19a75c3f..281f01e8cbca 100644
 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
 @@ -2712,9 +2712,16 @@ static int vc4_hdmi_init_resources(struct vc4_hdmi *vc4_hdmi)
@@ -640,20 +744,15 @@ index 1e5f68704d7d..4e5bba0822a5 100644
 
  	return 0;
  }
-@@ -2869,12 +2882,37 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
+@@ -2869,6 +2882,7 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
  	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
  	unsigned long __maybe_unused flags;
  	u32 __maybe_unused value;
 +	unsigned long rate;
  	int ret;
 
--	ret = clk_prepare_enable(vc4_hdmi->hsm_clock);
-+	/*
-+	 * The HSM clock is in the HDMI power domain, so we need to set
-+	 * its frequency while the power domain is active so that it
-+	 * keeps its rate.
-+	 */
-+	ret = clk_set_min_rate(vc4_hdmi->hsm_rpm_clock, HSM_MIN_CLOCK_FREQ);
+ 	/*
+@@ -2884,6 +2898,25 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
  	if (ret)
  		return ret;
 
@@ -679,7 +778,7 @@ index 1e5f68704d7d..4e5bba0822a5 100644
  	if (vc4_hdmi->variant->reset)
  		vc4_hdmi->variant->reset(vc4_hdmi);
 
-@@ -2896,6 +2934,10 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
+@@ -2905,6 +2938,10 @@ static int vc4_hdmi_runtime_resume(struct device *dev)
  #endif
 
  	return 0;
@@ -1086,7 +1185,7 @@ index 3a808146b50f..c1a3f3057921 100644
   * Changes the default domain of an iommu group that has *only* one device
   *
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 59e4b188fc71..9c6bfc02e6a1 100644
+index ed47c256dbd2..2af613f7353f 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
 @@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1465,6 +1564,18 @@ index 2dc97583d279..e9a7f70a54df 100644
  		nh = fib_info_nh(fi, 0);
  		if (cfg->fc_encap) {
  			if (fib_encap_match(net, cfg->fc_encap_type,
+diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
+index 0d99ef17e4a5..81c8e082ec57 100755
+--- a/scripts/pahole-flags.sh
++++ b/scripts/pahole-flags.sh
+@@ -20,4 +20,7 @@ if [ "${pahole_ver}" -ge "122" ]; then
+ 	extra_paholeopt="${extra_paholeopt} -j"
+ fi
+
++# temporary workaround to disable enum64
++extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
++
+ echo ${extra_paholeopt}
 diff --git a/scripts/tags.sh b/scripts/tags.sh
 index e137cf15aae9..2ed2341f7967 100755
 --- a/scripts/tags.sh
@@ -1571,3 +1682,30 @@ index d5a0dd548989..ee5e98204d3d 100755
  }
 
  ipv4_grp_fcnal()
+From 90c4bd0059367922f88768784bfb7c5ec1bc846c Mon Sep 17 00:00:00 2001
+From: "Justin M. Forbes" <jforbes@fedoraproject.org>
+Date: Thu, 3 Nov 2022 11:34:03 -0500
+Subject: [PATCH] Revert "disable enum64 BTF in fedora rawhide"
+
+This option is not supported by older pahole versions.
+
+This reverts commit 7ab8e0d8b46b7f768e37f8ff39ccae2ecc897396.
+---
+ scripts/pahole-flags.sh | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
+index 81c8e082ec57..0d99ef17e4a5 100755
+--- a/scripts/pahole-flags.sh
++++ b/scripts/pahole-flags.sh
+@@ -20,7 +20,4 @@ if [ "${pahole_ver}" -ge "122" ]; then
+ 	extra_paholeopt="${extra_paholeopt} -j"
+ fi
+
+-# temporary workaround to disable enum64
+-extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
+-
+ echo ${extra_paholeopt}
+-- 
+2.37.3
+