From 0ec2c70c362a52aa5b9081e3a1ae47b4a6d82731 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Thu, 11 Apr 2024 21:09:51 +0200 Subject: kernel 6.8.5 --- SOURCES/0001-amd-hdr.patch | 287 ----------------------------- SOURCES/Patchlist.changelog | 4 +- SOURCES/asus-linux.patch | 52 ------ SOURCES/kernel-x86_64-debug-fedora.config | 5 +- SOURCES/kernel-x86_64-debug-rhel.config | 5 +- SOURCES/kernel-x86_64-fedora.config | 5 +- SOURCES/kernel-x86_64-rhel.config | 5 +- SOURCES/kernel-x86_64-rt-debug-rhel.config | 5 +- SOURCES/kernel-x86_64-rt-rhel.config | 5 +- SOURCES/kernel.changelog | 8 + SOURCES/patch-6.8-redhat.patch | 66 +------ SOURCES/t2linux.patch | 10 +- SPECS/kernel.spec | 29 +-- 13 files changed, 64 insertions(+), 422 deletions(-) diff --git a/SOURCES/0001-amd-hdr.patch b/SOURCES/0001-amd-hdr.patch index 0980a25..4334aed 100644 --- a/SOURCES/0001-amd-hdr.patch +++ b/SOURCES/0001-amd-hdr.patch @@ -1,290 +1,3 @@ -From dd5929402cebad821285fb6f112f48f8e63a393d Mon Sep 17 00:00:00 2001 -From: Joshua Ashton -Date: Tue, 19 Sep 2023 10:29:31 -0100 -Subject: [PATCH] HACK: Prefix new color mgmt properties with VALVE1_ - -Plane color mgmt properties, predefined transfer functions and CRTC -shaper/3D LUT aren't upstream properties yet, add a prefix to indicate -they are downstream props. - -Signed-off-by: Joshua Ashton -Signed-off-by: Melissa Wen ---- - .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 26 +++++++++---------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c -index c87b64e464ed5..0a7df5984d0b8 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c -@@ -226,7 +226,7 @@ amdgpu_dm_create_color_properties(struct amdgpu_device *adev) - - prop = drm_property_create(adev_to_drm(adev), - DRM_MODE_PROP_BLOB, -- "AMD_PLANE_DEGAMMA_LUT", 0); -+ "VALVE1_PLANE_DEGAMMA_LUT", 0); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_degamma_lut_property = prop; -@@ -240,41 +240,41 @@ amdgpu_dm_create_color_properties(struct amdgpu_device *adev) - adev->mode_info.plane_degamma_lut_size_property = prop; - - prop = amdgpu_create_tf_property(adev_to_drm(adev), -- "AMD_PLANE_DEGAMMA_TF", -+ "VALVE1_PLANE_DEGAMMA_TF", - amdgpu_eotf); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_degamma_tf_property = prop; - - prop = drm_property_create_range(adev_to_drm(adev), -- 0, "AMD_PLANE_HDR_MULT", 0, U64_MAX); -+ 0, "VALVE1_PLANE_HDR_MULT", 0, U64_MAX); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_hdr_mult_property = prop; - - prop = drm_property_create(adev_to_drm(adev), - DRM_MODE_PROP_BLOB, -- "AMD_PLANE_CTM", 0); -+ "VALVE1_PLANE_CTM", 0); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_ctm_property = prop; - - prop = drm_property_create(adev_to_drm(adev), - DRM_MODE_PROP_BLOB, -- "AMD_PLANE_SHAPER_LUT", 0); -+ "VALVE1_PLANE_SHAPER_LUT", 0); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_shaper_lut_property = prop; - - prop = drm_property_create_range(adev_to_drm(adev), - DRM_MODE_PROP_IMMUTABLE, -- "AMD_PLANE_SHAPER_LUT_SIZE", 0, UINT_MAX); -+ "VALVE1_PLANE_SHAPER_LUT_SIZE", 0, UINT_MAX); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_shaper_lut_size_property = prop; - - prop = amdgpu_create_tf_property(adev_to_drm(adev), -- "AMD_PLANE_SHAPER_TF", -+ "VALVE1_PLANE_SHAPER_TF", - amdgpu_inv_eotf); - if (!prop) - return -ENOMEM; -@@ -282,41 +282,41 @@ amdgpu_dm_create_color_properties(struct amdgpu_device *adev) - - prop = drm_property_create(adev_to_drm(adev), - DRM_MODE_PROP_BLOB, -- "AMD_PLANE_LUT3D", 0); -+ "VALVE1_PLANE_LUT3D", 0); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_lut3d_property = prop; - - prop = drm_property_create_range(adev_to_drm(adev), - DRM_MODE_PROP_IMMUTABLE, -- "AMD_PLANE_LUT3D_SIZE", 0, UINT_MAX); -+ "VALVE1_PLANE_LUT3D_SIZE", 0, UINT_MAX); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_lut3d_size_property = prop; - - prop = drm_property_create(adev_to_drm(adev), - DRM_MODE_PROP_BLOB, -- "AMD_PLANE_BLEND_LUT", 0); -+ "VALVE1_PLANE_BLEND_LUT", 0); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_blend_lut_property = prop; - - prop = drm_property_create_range(adev_to_drm(adev), - DRM_MODE_PROP_IMMUTABLE, -- "AMD_PLANE_BLEND_LUT_SIZE", 0, UINT_MAX); -+ "VALVE1_PLANE_BLEND_LUT_SIZE", 0, UINT_MAX); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_blend_lut_size_property = prop; - - prop = amdgpu_create_tf_property(adev_to_drm(adev), -- "AMD_PLANE_BLEND_TF", -+ "VALVE1_PLANE_BLEND_TF", - amdgpu_eotf); - if (!prop) - return -ENOMEM; - adev->mode_info.plane_blend_tf_property = prop; - - prop = amdgpu_create_tf_property(adev_to_drm(adev), -- "AMD_CRTC_REGAMMA_TF", -+ "VALVE1_CRTC_REGAMMA_TF", - amdgpu_inv_eotf); - if (!prop) - return -ENOMEM; --- -GitLab - - -From a5ae6b501aed085d27541c284893e431776fe259 Mon Sep 17 00:00:00 2001 -From: Melissa Wen -Date: Mon, 25 Sep 2023 16:25:27 -0100 -Subject: [PATCH] HACK: change TF API to fit current gamescope - -upstream requested to identify if the type of transfer function a -property is capable to handle (basically EOTF or inv_EOTF). gamescope -understand it is implictly identified by the block/property position in -the pipeline and doesn't handle this difference yet. change the upstream -API to fit the current gamescope implementation. - -Signed-off-by: Melissa Wen ---- - .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 21 +++--- - .../amd/display/amdgpu_dm/amdgpu_dm_color.c | 69 ++++++++----------- - 2 files changed, 38 insertions(+), 52 deletions(-) - -diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h -index 9c1871b866cc9..feaa82f74a68f 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h -@@ -734,19 +734,14 @@ extern const struct amdgpu_ip_block_version dm_ip_block; - */ - enum amdgpu_transfer_function { - AMDGPU_TRANSFER_FUNCTION_DEFAULT, -- AMDGPU_TRANSFER_FUNCTION_SRGB_EOTF, -- AMDGPU_TRANSFER_FUNCTION_BT709_INV_OETF, -- AMDGPU_TRANSFER_FUNCTION_PQ_EOTF, -- AMDGPU_TRANSFER_FUNCTION_IDENTITY, -- AMDGPU_TRANSFER_FUNCTION_GAMMA22_EOTF, -- AMDGPU_TRANSFER_FUNCTION_GAMMA24_EOTF, -- AMDGPU_TRANSFER_FUNCTION_GAMMA26_EOTF, -- AMDGPU_TRANSFER_FUNCTION_SRGB_INV_EOTF, -- AMDGPU_TRANSFER_FUNCTION_BT709_OETF, -- AMDGPU_TRANSFER_FUNCTION_PQ_INV_EOTF, -- AMDGPU_TRANSFER_FUNCTION_GAMMA22_INV_EOTF, -- AMDGPU_TRANSFER_FUNCTION_GAMMA24_INV_EOTF, -- AMDGPU_TRANSFER_FUNCTION_GAMMA26_INV_EOTF, -+ AMDGPU_TRANSFER_FUNCTION_SRGB, -+ AMDGPU_TRANSFER_FUNCTION_BT709, -+ AMDGPU_TRANSFER_FUNCTION_PQ, -+ AMDGPU_TRANSFER_FUNCTION_LINEAR, -+ AMDGPU_TRANSFER_FUNCTION_UNITY, -+ AMDGPU_TRANSFER_FUNCTION_GAMMA22, -+ AMDGPU_TRANSFER_FUNCTION_GAMMA24, -+ AMDGPU_TRANSFER_FUNCTION_GAMMA26, - AMDGPU_TRANSFER_FUNCTION_COUNT - }; - -diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c -index 0a7df5984d0b8..21e0efc42a34c 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_color.c -@@ -163,36 +163,31 @@ static inline struct fixed31_32 amdgpu_dm_fixpt_from_s3132(__u64 x) - static const char * const - amdgpu_transfer_function_names[] = { - [AMDGPU_TRANSFER_FUNCTION_DEFAULT] = "Default", -- [AMDGPU_TRANSFER_FUNCTION_IDENTITY] = "Identity", -- [AMDGPU_TRANSFER_FUNCTION_SRGB_EOTF] = "sRGB EOTF", -- [AMDGPU_TRANSFER_FUNCTION_BT709_INV_OETF] = "BT.709 inv_OETF", -- [AMDGPU_TRANSFER_FUNCTION_PQ_EOTF] = "PQ EOTF", -- [AMDGPU_TRANSFER_FUNCTION_GAMMA22_EOTF] = "Gamma 2.2 EOTF", -- [AMDGPU_TRANSFER_FUNCTION_GAMMA24_EOTF] = "Gamma 2.4 EOTF", -- [AMDGPU_TRANSFER_FUNCTION_GAMMA26_EOTF] = "Gamma 2.6 EOTF", -- [AMDGPU_TRANSFER_FUNCTION_SRGB_INV_EOTF] = "sRGB inv_EOTF", -- [AMDGPU_TRANSFER_FUNCTION_BT709_OETF] = "BT.709 OETF", -- [AMDGPU_TRANSFER_FUNCTION_PQ_INV_EOTF] = "PQ inv_EOTF", -- [AMDGPU_TRANSFER_FUNCTION_GAMMA22_INV_EOTF] = "Gamma 2.2 inv_EOTF", -- [AMDGPU_TRANSFER_FUNCTION_GAMMA24_INV_EOTF] = "Gamma 2.4 inv_EOTF", -- [AMDGPU_TRANSFER_FUNCTION_GAMMA26_INV_EOTF] = "Gamma 2.6 inv_EOTF", -+ [AMDGPU_TRANSFER_FUNCTION_LINEAR] = "Linear", -+ [AMDGPU_TRANSFER_FUNCTION_UNITY] = "Unity", -+ [AMDGPU_TRANSFER_FUNCTION_SRGB] = "sRGB", -+ [AMDGPU_TRANSFER_FUNCTION_BT709] = "BT.709", -+ [AMDGPU_TRANSFER_FUNCTION_PQ] = "PQ (Perceptual Quantizer)", -+ [AMDGPU_TRANSFER_FUNCTION_GAMMA22] = "Gamma 2.2", -+ [AMDGPU_TRANSFER_FUNCTION_GAMMA24] = "Gamma 2.4", -+ [AMDGPU_TRANSFER_FUNCTION_GAMMA26] = "Gamma 2.6", - }; - - static const u32 amdgpu_eotf = -- BIT(AMDGPU_TRANSFER_FUNCTION_SRGB_EOTF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_BT709_INV_OETF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_PQ_EOTF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA22_EOTF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA24_EOTF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA26_EOTF); -+ BIT(AMDGPU_TRANSFER_FUNCTION_SRGB) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_BT709) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_PQ) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA22) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA24) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA26); - - static const u32 amdgpu_inv_eotf = -- BIT(AMDGPU_TRANSFER_FUNCTION_SRGB_INV_EOTF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_BT709_OETF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_PQ_INV_EOTF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA22_INV_EOTF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA24_INV_EOTF) | -- BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA26_INV_EOTF); -+ BIT(AMDGPU_TRANSFER_FUNCTION_SRGB) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_BT709) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_PQ) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA22) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA24) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_GAMMA26); - - static struct drm_property * - amdgpu_create_tf_property(struct drm_device *dev, -@@ -201,7 +196,8 @@ amdgpu_create_tf_property(struct drm_device *dev, - { - u32 transfer_functions = supported_tf | - BIT(AMDGPU_TRANSFER_FUNCTION_DEFAULT) | -- BIT(AMDGPU_TRANSFER_FUNCTION_IDENTITY); -+ BIT(AMDGPU_TRANSFER_FUNCTION_LINEAR) | -+ BIT(AMDGPU_TRANSFER_FUNCTION_UNITY); - struct drm_prop_enum_list enum_list[AMDGPU_TRANSFER_FUNCTION_COUNT]; - int i, len; - -@@ -645,25 +641,20 @@ amdgpu_tf_to_dc_tf(enum amdgpu_transfer_function tf) - switch (tf) { - default: - case AMDGPU_TRANSFER_FUNCTION_DEFAULT: -- case AMDGPU_TRANSFER_FUNCTION_IDENTITY: -+ case AMDGPU_TRANSFER_FUNCTION_LINEAR: -+ case AMDGPU_TRANSFER_FUNCTION_UNITY: - return TRANSFER_FUNCTION_LINEAR; -- case AMDGPU_TRANSFER_FUNCTION_SRGB_EOTF: -- case AMDGPU_TRANSFER_FUNCTION_SRGB_INV_EOTF: -+ case AMDGPU_TRANSFER_FUNCTION_SRGB: - return TRANSFER_FUNCTION_SRGB; -- case AMDGPU_TRANSFER_FUNCTION_BT709_OETF: -- case AMDGPU_TRANSFER_FUNCTION_BT709_INV_OETF: -+ case AMDGPU_TRANSFER_FUNCTION_BT709: - return TRANSFER_FUNCTION_BT709; -- case AMDGPU_TRANSFER_FUNCTION_PQ_EOTF: -- case AMDGPU_TRANSFER_FUNCTION_PQ_INV_EOTF: -+ case AMDGPU_TRANSFER_FUNCTION_PQ: - return TRANSFER_FUNCTION_PQ; -- case AMDGPU_TRANSFER_FUNCTION_GAMMA22_EOTF: -- case AMDGPU_TRANSFER_FUNCTION_GAMMA22_INV_EOTF: -+ case AMDGPU_TRANSFER_FUNCTION_GAMMA22: - return TRANSFER_FUNCTION_GAMMA22; -- case AMDGPU_TRANSFER_FUNCTION_GAMMA24_EOTF: -- case AMDGPU_TRANSFER_FUNCTION_GAMMA24_INV_EOTF: -+ case AMDGPU_TRANSFER_FUNCTION_GAMMA24: - return TRANSFER_FUNCTION_GAMMA24; -- case AMDGPU_TRANSFER_FUNCTION_GAMMA26_EOTF: -- case AMDGPU_TRANSFER_FUNCTION_GAMMA26_INV_EOTF: -+ case AMDGPU_TRANSFER_FUNCTION_GAMMA26: - return TRANSFER_FUNCTION_GAMMA26; - } - } --- -GitLab - - - From 2f33df4d9d3e86546d7c67453ae799306d55b7f5 Mon Sep 17 00:00:00 2001 From: Melissa Wen Date: Sat, 22 Apr 2023 14:08:47 -0100 diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index 0f61300..1712cfc 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/83dae02150c829b67e0f34ac7b2988030be53b0c - 83dae02150c829b67e0f34ac7b2988030be53b0c Revert "cpupower: Bump soname version" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/17c279233795edf80d29431dc144c7ac0bdbabf3 + 17c279233795edf80d29431dc144c7ac0bdbabf3 Revert "cpupower: Bump soname version" "https://gitlab.com/cki-project/kernel-ark/-/commit"/9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" diff --git a/SOURCES/asus-linux.patch b/SOURCES/asus-linux.patch index e548379..eb6c51c 100644 --- a/SOURCES/asus-linux.patch +++ b/SOURCES/asus-linux.patch @@ -1166,58 +1166,6 @@ index a6b648457908..7163cce7079c 100644 -- 2.44.0 -From 2a0f3df9ff354ba441aeeb31560a8e0152d7533f Mon Sep 17 00:00:00 2001 -From: "Luke D. Jones" -Date: Tue, 2 Apr 2024 14:46:42 +1300 -Subject: [PATCH] ALSA: hda/realtek: cs35l41: Support ASUS ROG G634JYR - -Fixes the realtek quirk to initialise the Cirrus amp correctly and adds -related quirk for missing DSD properties. This model laptop has slightly -updated internals compared to the previous version with Realtek Codec -ID of 0x1caf. - -Signed-off-by: Luke D. Jones ---- - sound/pci/hda/cs35l41_hda_property.c | 2 ++ - sound/pci/hda/patch_realtek.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/sound/pci/hda/cs35l41_hda_property.c b/sound/pci/hda/cs35l41_hda_property.c -index 72ec872afb8d..25c117db3317 100644 ---- a/sound/pci/hda/cs35l41_hda_property.c -+++ b/sound/pci/hda/cs35l41_hda_property.c -@@ -108,6 +108,7 @@ static const struct cs35l41_config cs35l41_config_table[] = { - { "10431F12", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 1, -1, 1000, 4500, 24 }, - { "10431F1F", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, -1, 0, 0, 0, 0 }, - { "10431F62", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 0, 0, 0 }, -+ { "10433A60", 2, INTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 1, 2, 0, 1000, 4500, 24 }, - { "17AA386F", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, -1, -1, 0, 0, 0 }, - { "17AA38A9", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 2, -1, 0, 0, 0 }, - { "17AA38AB", 2, EXTERNAL, { CS35L41_LEFT, CS35L41_RIGHT, 0, 0 }, 0, 2, -1, 0, 0, 0 }, -@@ -496,6 +497,7 @@ static const struct cs35l41_prop_model cs35l41_prop_model_table[] = { - { "CSC3551", "10431F12", generic_dsd_config }, - { "CSC3551", "10431F1F", generic_dsd_config }, - { "CSC3551", "10431F62", generic_dsd_config }, -+ { "CSC3551", "10433A60", generic_dsd_config }, - { "CSC3551", "17AA386F", generic_dsd_config }, - { "CSC3551", "17AA38A9", generic_dsd_config }, - { "CSC3551", "17AA38AB", generic_dsd_config }, -diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index a17c36a36aa5..8da2827bb3c3 100644 ---- a/sound/pci/hda/patch_realtek.c -+++ b/sound/pci/hda/patch_realtek.c -@@ -10133,7 +10133,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { - SND_PCI_QUIRK(0x1043, 0x3a30, "ASUS G814JVR/JIR", ALC245_FIXUP_CS35L41_SPI_2), - SND_PCI_QUIRK(0x1043, 0x3a40, "ASUS G814JZR", ALC245_FIXUP_CS35L41_SPI_2), - SND_PCI_QUIRK(0x1043, 0x3a50, "ASUS G834JYR/JZR", ALC245_FIXUP_CS35L41_SPI_2), -- SND_PCI_QUIRK(0x1043, 0x3a60, "ASUS G634JYR/JZR", ALC245_FIXUP_CS35L41_SPI_2), -+ SND_PCI_QUIRK(0x1043, 0x3a60, "ASUS G634JYR/JZR", ALC285_FIXUP_ASUS_SPI_REAR_SPEAKERS), - SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC), - SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC), - SND_PCI_QUIRK(0x1043, 0x8398, "ASUS P1005", ALC269_FIXUP_STEREO_DMIC), --- -2.44.0 - From 7c2c8cca4989bc7803aef60a4aeb3efe1d211a4b Mon Sep 17 00:00:00 2001 From: "Luke D. Jones" Date: Sat, 2 Dec 2023 17:27:23 +1300 diff --git a/SOURCES/kernel-x86_64-debug-fedora.config b/SOURCES/kernel-x86_64-debug-fedora.config index a6ccf31..4c8c459 100644 --- a/SOURCES/kernel-x86_64-debug-fedora.config +++ b/SOURCES/kernel-x86_64-debug-fedora.config @@ -274,7 +274,7 @@ CONFIG_AMD_PMF_DEBUG=y CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m CONFIG_AMD_WBRF=y CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -7279,6 +7279,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index dd908b8..9710775 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -230,7 +230,7 @@ CONFIG_AMD_PMF_DEBUG=y CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m # CONFIG_AMD_WBRF is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6508,6 +6508,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/SOURCES/kernel-x86_64-fedora.config b/SOURCES/kernel-x86_64-fedora.config index 2bc5096..dbab6e9 100644 --- a/SOURCES/kernel-x86_64-fedora.config +++ b/SOURCES/kernel-x86_64-fedora.config @@ -274,7 +274,7 @@ CONFIG_AMD_PMC=m CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m CONFIG_AMD_WBRF=y CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m @@ -7249,6 +7249,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index 611a794..d7ea366 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -230,7 +230,7 @@ CONFIG_AMD_PMC=m CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m # CONFIG_AMD_WBRF is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6484,6 +6484,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/SOURCES/kernel-x86_64-rt-debug-rhel.config b/SOURCES/kernel-x86_64-rt-debug-rhel.config index bfc76ea..cfb8093 100644 --- a/SOURCES/kernel-x86_64-rt-debug-rhel.config +++ b/SOURCES/kernel-x86_64-rt-debug-rhel.config @@ -230,7 +230,7 @@ CONFIG_AMD_PMF_DEBUG=y CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m # CONFIG_AMD_WBRF is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6561,6 +6561,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/SOURCES/kernel-x86_64-rt-rhel.config b/SOURCES/kernel-x86_64-rt-rhel.config index 8def0f0..30a8b7d 100644 --- a/SOURCES/kernel-x86_64-rt-rhel.config +++ b/SOURCES/kernel-x86_64-rt-rhel.config @@ -230,7 +230,7 @@ CONFIG_AMD_PMC=m CONFIG_AMD_PMF=m CONFIG_AMD_PTDMA=m CONFIG_AMD_SFH_HID=m -# CONFIG_AMDTEE is not set +CONFIG_AMDTEE=m # CONFIG_AMD_WBRF is not set # CONFIG_AMD_XGBE_DCB is not set CONFIG_AMD_XGBE=m @@ -6537,6 +6537,9 @@ CONFIG_SPEAKUP_SYNTH_LTLK=m CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m +# CONFIG_SPECTRE_BHI_AUTO is not set +# CONFIG_SPECTRE_BHI_OFF is not set +CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index 46d12cc..b3dcaae 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/kernel.changelog @@ -1,3 +1,11 @@ +* Wed Apr 10 2024 Justin M. Forbes [6.8.5-0] +- Set configs for SPECTRE_BHI (Justin M. Forbes) +- Add AMD PMF bug (Justin M. Forbes) +- redhat/configs: Enable CONFIG_AMDTEE for x86 (David Arcari) +- Add CVE fix for 6.8.5 (Justin M. Forbes) +- Linux v6.8.5 +Resolves: + * Thu Apr 04 2024 Justin M. Forbes [6.8.4-0] - Linux v6.8.4 Resolves: diff --git a/SOURCES/patch-6.8-redhat.patch b/SOURCES/patch-6.8-redhat.patch index 7214ec4..6056744 100644 --- a/SOURCES/patch-6.8-redhat.patch +++ b/SOURCES/patch-6.8-redhat.patch @@ -7,14 +7,12 @@ drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 ++ drivers/ata/libahci.c | 18 +++ - drivers/bluetooth/hci_qca.c | 13 +- drivers/char/ipmi/ipmi_dmi.c | 15 ++ drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 +++++++++++---- drivers/firmware/efi/secureboot.c | 38 +++++ drivers/firmware/sysfb.c | 18 ++- - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 + drivers/hid/hid-rmi.c | 66 -------- drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 +++ drivers/input/rmi4/rmi_driver.c | 124 +++++++++------ @@ -38,10 +36,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ tools/power/cpupower/Makefile | 2 +- - 40 files changed, 675 insertions(+), 190 deletions(-) + 38 files changed, 672 insertions(+), 178 deletions(-) diff --git a/Makefile b/Makefile -index c436247d750c..fba81833741a 100644 +index f29a75b75861..90586379d1e8 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -126,7 +124,7 @@ index d1f3b56e7afc..eaefd0d7cfff 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 97dd70285741..efc3fbc9e9f3 100644 +index 3998109195da..cedcd208de44 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -20,6 +20,7 @@ @@ -137,7 +135,7 @@ index 97dd70285741..efc3fbc9e9f3 100644 #include #include #include -@@ -900,6 +901,13 @@ void __init setup_arch(char **cmdline_p) +@@ -901,6 +902,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -151,7 +149,7 @@ index 97dd70285741..efc3fbc9e9f3 100644 reserve_ibft_region(); x86_init.resources.dmi_setup(); -@@ -1063,19 +1071,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1065,19 +1073,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -283,37 +281,6 @@ index 1a63200ea437..a911e976a596 100644 /* wait for engine to stop. This could be as long as 500 msec */ tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); -diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c -index 8a60ad7acd70..4ecbcb1644cc 100644 ---- a/drivers/bluetooth/hci_qca.c -+++ b/drivers/bluetooth/hci_qca.c -@@ -7,7 +7,6 @@ - * - * Copyright (C) 2007 Texas Instruments, Inc. - * Copyright (c) 2010, 2012, 2018 The Linux Foundation. All rights reserved. -- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. - * - * Acknowledgements: - * This file is based on hci_ll.c, which was... -@@ -1904,17 +1903,7 @@ static int qca_setup(struct hci_uart *hu) - case QCA_WCN6750: - case QCA_WCN6855: - case QCA_WCN7850: -- -- /* Set BDA quirk bit for reading BDA value from fwnode property -- * only if that property exist in DT. -- */ -- if (fwnode_property_present(dev_fwnode(hdev->dev.parent), "local-bd-address")) { -- set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); -- bt_dev_info(hdev, "setting quirk bit to read BDA from fwnode later"); -- } else { -- bt_dev_dbg(hdev, "local-bd-address` is not present in the devicetree so not setting quirk bit for BDA"); -- } -- -+ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); - hci_set_aosp_capable(hdev); - - ret = qca_read_soc_version(hdev, &ver, soc_type); diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c index bbf7029e224b..cf7faa970dd6 100644 --- a/drivers/char/ipmi/ipmi_dmi.c @@ -612,19 +579,6 @@ index 3c197db42c9d..16e4a2e90fae 100644 pd = sysfb_create_simplefb(si, &mode); if (!IS_ERR(pd)) goto unlock_mutex; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index 94bdb5fa6ebc..1fbaf7b81d69 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -4524,6 +4524,8 @@ int amdgpu_device_prepare(struct drm_device *dev) - if (r) - goto unprepare; - -+ flush_delayed_work(&adev->gfx.gfx_off_delay_work); -+ - for (i = 0; i < adev->num_ip_blocks; i++) { - if (!adev->ip_blocks[i].status.valid) - continue; diff --git a/drivers/hid/hid-rmi.c b/drivers/hid/hid-rmi.c index d4af17fdba46..154f0403cbf4 100644 --- a/drivers/hid/hid-rmi.c @@ -971,7 +925,7 @@ index 42eaebb3bf5c..7a35119c3144 100644 if (data->f01_container->dev.driver) { /* Driver already bound, so enable ATTN now. */ diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index cd1210026ac5..448d146c6757 100644 +index ad33161f2374..a4bca95d8322 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -8,6 +8,7 @@ @@ -1046,7 +1000,7 @@ index eff7f5df08e2..b58145ce7775 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index d5d3eea006c1..583d0fa2877d 100644 +index 35200a7a7355..738378291882 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -118,6 +118,14 @@ static const char *sd_cache_types[] = { @@ -1463,7 +1417,7 @@ index a2ff4242e623..f0d2be1ee4f1 100644 int module_sig_check(struct load_info *info, int flags) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 267b9a0a3abc..12612f58ca58 100644 +index 6568f8177e39..14d8237af366 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -22,6 +22,7 @@ @@ -1474,7 +1428,7 @@ index 267b9a0a3abc..12612f58ca58 100644 static bool module_enabled; /* Are we using CONFIG_MODVERSIONS? */ -@@ -1992,6 +1993,12 @@ static void write_buf(struct buffer *b, const char *fname) +@@ -1995,6 +1996,12 @@ static void write_buf(struct buffer *b, const char *fname) } } @@ -1487,7 +1441,7 @@ index 267b9a0a3abc..12612f58ca58 100644 static void write_if_changed(struct buffer *b, const char *fname) { char *tmp; -@@ -2052,6 +2059,7 @@ static void write_mod_c_file(struct module *mod) +@@ -2055,6 +2062,7 @@ static void write_mod_c_file(struct module *mod) add_depends(&buf, mod); add_moddevtable(&buf, mod); add_srcversion(&buf, mod); diff --git a/SOURCES/t2linux.patch b/SOURCES/t2linux.patch index e167e73..dc2e561 100644 --- a/SOURCES/t2linux.patch +++ b/SOURCES/t2linux.patch @@ -8714,7 +8714,7 @@ index bfa30625f..3d99acc1a 100644 static bool efi_noinitrd; static bool efi_nosoftreserve; -@@ -73,6 +74,8 @@ efi_status_t efi_parse_options(char const *cmdline) +@@ -75,6 +76,8 @@ efi_loglevel = CONSOLE_LOGLEVEL_QUIET; } else if (!strcmp(param, "noinitrd")) { efi_noinitrd = true; @@ -8722,19 +8722,19 @@ index bfa30625f..3d99acc1a 100644 + efi_apple_set_os = true; } else if (IS_ENABLED(CONFIG_X86_64) && !strcmp(param, "no5lvl")) { efi_no5lvl = true; - } else if (!strcmp(param, "efi") && val) { + } else if (IS_ENABLED(CONFIG_ARCH_HAS_MEM_ENCRYPT) && diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h index 212687c30..21b414d09 100644 --- a/drivers/firmware/efi/libstub/efistub.h +++ b/drivers/firmware/efi/libstub/efistub.h -@@ -38,6 +38,7 @@ extern bool efi_nochunk; - extern bool efi_nokaslr; +@@ -39,6 +39,7 @@ extern int efi_loglevel; + extern int efi_mem_encrypt; extern bool efi_novamap; +extern bool efi_apple_set_os; - extern const efi_system_table_t *efi_system_table; + typedef union efi_dxe_services_table efi_dxe_services_table_t; @@ -825,6 +826,19 @@ union apple_properties_protocol { } mixed_mode; }; diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 87fe810..a0307c9 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 %define buildid .fsync -%define specrpmversion 6.8.4 -%define specversion 6.8.4 +%define specrpmversion 6.8.5 +%define specversion 6.8.5 %define patchversion 6.8 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.8.4 +%define tarfile_release 6.8.5 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 203%{?buildid}%{?dist} +%define specrelease 201%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.8.4 +%define kabiversion 6.8.5 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4100,19 +4100,20 @@ fi\ # # %changelog -* Wed Apr 10 2024 Jan200101 - 6.8.4-203.fsync.1 -- kernel-fsync v6.8.4 steamdeck-oled fixes +* Thu Apr 11 2024 Jan200101 - 6.8.5-201.fsync +- kernel-fsync v6.8.5 -* Mon Apr 08 2024 Jan200101 - 6.8.4-202.fsync.1 -- kernel-fsync v6.8.4 asus-linux upgrade - -* Sat Apr 06 2024 Jan200101 - 6.8.4-201.fsync -- kernel-fsync v6.8.4 - -* Thu Apr 04 2024 Justin M. Forbes [6.8.4-200] +* Wed Apr 10 2024 Justin M. Forbes [6.8.5-200] - Revert "cpupower: Bump soname version" (Justin M. Forbes) - Drop soname for libcpupower.so since we reverted the bump (Justin M. Forbes) +* Wed Apr 10 2024 Justin M. Forbes [6.8.5-0] +- Set configs for SPECTRE_BHI (Justin M. Forbes) +- Add AMD PMF bug (Justin M. Forbes) +- redhat/configs: Enable CONFIG_AMDTEE for x86 (David Arcari) +- Add CVE fix for 6.8.5 (Justin M. Forbes) +- Linux v6.8.5 + * Thu Apr 04 2024 Justin M. Forbes [6.8.4-0] - Linux v6.8.4 -- cgit v1.2.3