From 5691afc709955e6d08588428fb86f5f5eb715f2c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 6 Jan 2021 22:55:05 +0000 Subject: sys-kernel/linux-{image,sources}-redcore-lts : version bump (v5.10.5), allow unpriviledged users to create namespaces, fix https://bugzilla.kernel.org/show_bug.cgi?id=211033 (patch queued for 5.10.6, but why wait) --- sys-kernel/linux-image-redcore-lts/Manifest | 2 +- ...m-if-pixel-clock-changed-with-link-active.patch | 109 -------------- .../files/5.10-amd64.config | 4 +- ...-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch | 13 ++ .../linux-image-redcore-lts-5.10.4.ebuild | 166 --------------------- .../linux-image-redcore-lts-5.10.5.ebuild | 166 +++++++++++++++++++++ sys-kernel/linux-sources-redcore-lts/Manifest | 2 +- ...m-if-pixel-clock-changed-with-link-active.patch | 109 -------------- .../files/5.10-amd64.config | 4 +- ...-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch | 13 ++ .../linux-sources-redcore-lts-5.10.4.ebuild | 91 ----------- .../linux-sources-redcore-lts-5.10.5.ebuild | 91 +++++++++++ 12 files changed, 289 insertions(+), 481 deletions(-) delete mode 100644 sys-kernel/linux-image-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch create mode 100644 sys-kernel/linux-image-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch delete mode 100644 sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.10.4.ebuild create mode 100644 sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.10.5.ebuild delete mode 100644 sys-kernel/linux-sources-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch create mode 100644 sys-kernel/linux-sources-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch delete mode 100644 sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-5.10.4.ebuild create mode 100644 sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-5.10.5.ebuild diff --git a/sys-kernel/linux-image-redcore-lts/Manifest b/sys-kernel/linux-image-redcore-lts/Manifest index 5994eb82..6e07733f 100644 --- a/sys-kernel/linux-image-redcore-lts/Manifest +++ b/sys-kernel/linux-image-redcore-lts/Manifest @@ -1 +1 @@ -DIST linux-5.10.4.tar.xz 116612908 BLAKE2B 57f6d719451aacfd298452703ae02e6188885500e8cdf18fffa6b9967b0934a23cd378ab4c49b76ccb2f7a9012d6aa7ff1349d488cb31e40924be2f27b244cec SHA512 aab782786cc06b5f1872bbb88c4f55a73d222f8ecf1ab8f5b7d96de2160b11b4407e02a44b206d2c00e395ba0662aa5a038b8e10d185621a0b33c576b523b490 +DIST linux-5.10.5.tar.xz 116604852 BLAKE2B 25b71eb091ea6526a7ebfef5bc201b76d612e5138b6b3caa708f90e76196c30d1865c223e2084a118a3883a9620d47c9576b1ab7db2c8d9c0f204dda7c640eab SHA512 f3462c8ee26c34a8ee344fa146f6f3aeceab03ef1cff83f3b831251f52aa70823d67085030a37b7fea21b305e20bcd7616d16557a7b5bd757b8f84d9805413da diff --git a/sys-kernel/linux-image-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch b/sys-kernel/linux-image-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch deleted file mode 100644 index 631e709d..00000000 --- a/sys-kernel/linux-image-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 965421096770bb0d69444950c1f839e8e5504da5 Mon Sep 17 00:00:00 2001 -From: Rodrigo Siqueira -Date: Tue, 15 Dec 2020 10:45:05 -0500 -Subject: [PATCH] drm/amd/display: Add get_dig_frontend implementation for DCEx - -Some old ASICs might not implement/require get_dig_frontend helper; in -this scenario, we can have a NULL pointer exception when we try to call -it inside vbios disable operation. For example, this situation might -happen when using Polaris12 with an eDP panel. This commit avoids this -situation by adding a specific get_dig_frontend implementation for DCEx. - -Cc: Alex Deucher -Cc: Borislav Petkov -Cc: Harry Wentland -Cc: Nicholas Kazlauskas -Cc: Chiawen Huang -Signed-off-by: Rodrigo Siqueira -Signed-off-by: Alex Deucher ---- - .../drm/amd/display/dc/dce/dce_link_encoder.c | 45 ++++++++++++++++++- - .../drm/amd/display/dc/dce/dce_link_encoder.h | 2 + - 2 files changed, 45 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c -index b409f6b2bfd8..f355cd1e9090 100644 ---- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c -+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c -@@ -119,7 +119,8 @@ static const struct link_encoder_funcs dce110_lnk_enc_funcs = { - .disable_hpd = dce110_link_encoder_disable_hpd, - .is_dig_enabled = dce110_is_dig_enabled, - .destroy = dce110_link_encoder_destroy, -- .get_max_link_cap = dce110_link_encoder_get_max_link_cap -+ .get_max_link_cap = dce110_link_encoder_get_max_link_cap, -+ .get_dig_frontend = dce110_get_dig_frontend, - }; - - static enum bp_result link_transmitter_control( -@@ -235,6 +236,45 @@ static void set_link_training_complete( - - } - -+unsigned int dce110_get_dig_frontend(struct link_encoder *enc) -+{ -+ struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc); -+ u32 value; -+ enum engine_id result; -+ -+ REG_GET(DIG_BE_CNTL, DIG_FE_SOURCE_SELECT, &value); -+ -+ switch (value) { -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGA: -+ result = ENGINE_ID_DIGA; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGB: -+ result = ENGINE_ID_DIGB; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGC: -+ result = ENGINE_ID_DIGC; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGD: -+ result = ENGINE_ID_DIGD; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGE: -+ result = ENGINE_ID_DIGE; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGF: -+ result = ENGINE_ID_DIGF; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGG: -+ result = ENGINE_ID_DIGG; -+ break; -+ default: -+ // invalid source select DIG -+ ASSERT(false); -+ result = ENGINE_ID_UNKNOWN; -+ } -+ -+ return result; -+} -+ - void dce110_link_encoder_set_dp_phy_pattern_training_pattern( - struct link_encoder *enc, - uint32_t index) -@@ -1665,7 +1705,8 @@ static const struct link_encoder_funcs dce60_lnk_enc_funcs = { - .disable_hpd = dce110_link_encoder_disable_hpd, - .is_dig_enabled = dce110_is_dig_enabled, - .destroy = dce110_link_encoder_destroy, -- .get_max_link_cap = dce110_link_encoder_get_max_link_cap -+ .get_max_link_cap = dce110_link_encoder_get_max_link_cap, -+ .get_dig_frontend = dce110_get_dig_frontend - }; - - void dce60_link_encoder_construct( -diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h -index cb714a48b171..fc6ade824c23 100644 ---- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h -+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h -@@ -295,6 +295,8 @@ void dce110_link_encoder_connect_dig_be_to_fe( - enum engine_id engine, - bool connect); - -+unsigned int dce110_get_dig_frontend(struct link_encoder *enc); -+ - void dce110_link_encoder_set_dp_phy_pattern_training_pattern( - struct link_encoder *enc, - uint32_t index); --- -2.25.4 - diff --git a/sys-kernel/linux-image-redcore-lts/files/5.10-amd64.config b/sys-kernel/linux-image-redcore-lts/files/5.10-amd64.config index 90a1a253..941d6f95 100644 --- a/sys-kernel/linux-image-redcore-lts/files/5.10-amd64.config +++ b/sys-kernel/linux-image-redcore-lts/files/5.10-amd64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.4-redcore-lts Kernel Configuration +# Linux/x86 5.10.5-redcore-lts Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Gentoo Hardened 10.2.0-r10 p4) 10.2.0" CONFIG_CC_IS_GCC=y @@ -191,7 +191,7 @@ CONFIG_UTS_NS=y CONFIG_TIME_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y -# CONFIG_USER_NS_UNPRIVILEGED is not set +CONFIG_USER_NS_UNPRIVILEGED=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_CHECKPOINT_RESTORE=y diff --git a/sys-kernel/linux-image-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch b/sys-kernel/linux-image-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch new file mode 100644 index 00000000..c1092a74 --- /dev/null +++ b/sys-kernel/linux-image-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch @@ -0,0 +1,13 @@ +diff -Nur a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 2021-01-06 13:56:56.000000000 +0000 ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 2021-01-06 22:44:20.751987382 +0000 +@@ -2278,8 +2278,7 @@ + + drm_connector_update_edid_property(connector, + aconnector->edid); +- aconnector->num_modes = drm_add_edid_modes(connector, aconnector->edid); +- drm_connector_list_update(connector); ++ drm_add_edid_modes(connector, aconnector->edid); + + if (aconnector->dc_link->aux_mode) + drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux, diff --git a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.10.4.ebuild b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.10.4.ebuild deleted file mode 100644 index 6a4de404..00000000 --- a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.10.4.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -EXTRAVERSION="redcore-lts" -KV_FULL="${PV}-${EXTRAVERSION}" -KV_MAJOR="5.10" - -DESCRIPTION="Redcore Linux Kernel Image (LTS)" -HOMEPAGE="https://redcorelinux.org" -SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz" - -KEYWORDS="~amd64" -LICENSE="GPL-2" -SLOT="${PVR}" -IUSE="+cryptsetup +dmraid +dracut +dkms +mdadm" - -RESTRICT="binchecks strip mirror" -DEPEND=" - app-arch/lz4 - app-arch/xz-utils - sys-devel/autoconf - sys-devel/bc - sys-devel/make - cryptsetup? ( sys-fs/cryptsetup ) - dmraid? ( sys-fs/dmraid ) - dracut? ( >=sys-kernel/dracut-0.44-r8 ) - dkms? ( sys-kernel/dkms sys-kernel/linux-sources-redcore-lts:${SLOT} ) - mdadm? ( sys-fs/mdadm ) - >=sys-kernel/linux-firmware-20180314" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/"${KV_MAJOR}"-ath10k-be-quiet.patch - "${FILESDIR}"/"${KV_MAJOR}"-enable_alx_wol.patch - "${FILESDIR}"/"${KV_MAJOR}"-ata-fix-NCQ-LOG-strings-and-move-to-debug.patch - "${FILESDIR}"/"${KV_MAJOR}"-radeon_dp_aux_transfer_native-no-ratelimited_debug.patch - "${FILESDIR}"/"${KV_MAJOR}"-acpi-use-kern_warning_even_when_error.patch - "${FILESDIR}"/"${KV_MAJOR}"-Unknow-SSD-HFM128GDHTNG-8310B-QUIRK_NO_APST.patch - "${FILESDIR}"/"${KV_MAJOR}"-nvme-Patriot_Viper_VPN100-QUIRK_IGNORE_DEV_SUBNQN.patch - "${FILESDIR}"/"${KV_MAJOR}"-acer-wmi-silence-unknow-functions-messages.patch - "${FILESDIR}"/"${KV_MAJOR}"-do_not_bug_the_next_18-years.patch - "${FILESDIR}"/"${KV_MAJOR}"-iwlwifi-use-debug-for-debug-infos.patch - "${FILESDIR}"/"${KV_MAJOR}"-compress-modules-zstd-support.patch - "${FILESDIR}"/"${KV_MAJOR}"-fix-bootconfig-makefile.patch - "${FILESDIR}"/"${KV_MAJOR}"-apic_vector-spam-in-debug-mode-only.patch - "${FILESDIR}"/"${KV_MAJOR}"-iwlwifi-fix-5e003982b07ae.patch - "${FILESDIR}"/"${KV_MAJOR}"-enable-new-amd-energy-driver-for-all-ryzen.patch - "${FILESDIR}"/"${KV_MAJOR}"-amd_iommu_init_info.patch - "${FILESDIR}"/"${KV_MAJOR}"-0001-Revert-hwmon-k10temp-Remove-support-for-displaying-v.patch - "${FILESDIR}"/"${KV_MAJOR}"-k10temp-fix-ZEN2-desktop-add-ZEN3-desktop.patch - "${FILESDIR}"/"${KV_MAJOR}"-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch - "${FILESDIR}"/"${KV_MAJOR}"-add-amd-sfh-hid_driver.patch - "${FILESDIR}"/"${KV_MAJOR}"-add-sbtsi_driver.patch - "${FILESDIR}"/"${KV_MAJOR}"-0001-Revert-cpufreq-Avoid-configuring-old-governors-as-de.patch - "${FILESDIR}"/"${KV_MAJOR}"-revert-parts-of-a00ec3874e7d326ab2dffbed92faddf6a77a84e9-no-Intel-NO.patch - "${FILESDIR}"/"${KV_MAJOR}"-linux-hardened.patch - "${FILESDIR}"/"${KV_MAJOR}"-uksm-linux-hardened.patch -) - -S="${WORKDIR}"/linux-"${PV}" - -pkg_setup() { - export KBUILD_BUILD_USER="nexus" - export KBUILD_BUILD_HOST="nexus.redcorelinux.org" - - export REAL_ARCH="$ARCH" - unset ARCH ; unset LDFLAGS #will interfere with Makefile if set -} - -src_prepare() { - default - emake mrproper - sed -ri "s|^(EXTRAVERSION =).*|\1 -${EXTRAVERSION}|" Makefile - cp "${FILESDIR}"/"${KV_MAJOR}"-amd64.config .config - rm -rf $(find . -type f|grep -F \.orig) -} - -src_compile() { - emake prepare modules_prepare bzImage modules -} - -src_install() { - dodir boot - insinto boot - newins .config config-"${KV_FULL}" - newins System.map System.map-"${KV_FULL}" - newins arch/x86/boot/bzImage vmlinuz-"${KV_FULL}" - - dodir usr/src/linux-"${KV_FULL}" - insinto usr/src/linux-"${KV_FULL}" - doins Module.symvers - doins System.map - exeinto usr/src/linux-"${KV_FULL}" - doexe vmlinux - - emake INSTALL_MOD_PATH="${D}" modules_install - - rm -f "${D}"lib/modules/"${KV_FULL}"/build - rm -f "${D}"lib/modules/"${KV_FULL}"/source - export local KSYMS - for KSYMS in build source ; do - dosym ../../../usr/src/linux-"${KV_FULL}" lib/modules/"${KV_FULL}"/"${KSYMS}" - done -} - -_grub2_update_grubcfg() { - if [[ -x $(which grub2-mkconfig) ]]; then - elog "Updating GRUB-2 bootloader configuration, please wait" - grub2-mkconfig -o "${ROOT}"boot/grub/grub.cfg - else - elog "It looks like you're not using GRUB-2, you must update bootloader configuration by hand" - fi -} - -_dracut_initrd_create() { - if [[ -x $(which dracut) ]]; then - elog "Generating initrd for "${KV_FULL}", please wait" - addpredict /etc/ld.so.cache~ - dracut -N -f --kver="${KV_FULL}" "${ROOT}"boot/initrd-"${KV_FULL}" - else - elog "It looks like you're not using dracut, you must generate an initrd by hand" - fi -} - -_dracut_initrd_delete() { - rm -rf "${ROOT}"boot/initrd-"${KV_FULL}" -} - -_dkms_modules_delete() { - if [[ -x $(which dkms) ]] ; then - export local DKMSMOD - for DKMSMOD in $(dkms status | cut -d " " -f1,2 | sed -e 's/,//g' | sed -e 's/ /\//g' | sed -e 's/://g' | uniq) ; do - dkms remove "${DKMSMOD}" -k "${KV_FULL}" - done - fi -} - -_kernel_modules_delete() { - rm -rf "${ROOT}"lib/modules/"${KV_FULL}" -} - -pkg_postinst() { - if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then - if use dracut; then - _dracut_initrd_create - fi - _grub2_update_grubcfg - fi -} - -pkg_postrm() { - if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then - if use dracut; then - _dracut_initrd_delete - fi - _grub2_update_grubcfg - fi - if use dkms; then - _dkms_modules_delete - fi - _kernel_modules_delete -} diff --git a/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.10.5.ebuild b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.10.5.ebuild new file mode 100644 index 00000000..a794afdd --- /dev/null +++ b/sys-kernel/linux-image-redcore-lts/linux-image-redcore-lts-5.10.5.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +EXTRAVERSION="redcore-lts" +KV_FULL="${PV}-${EXTRAVERSION}" +KV_MAJOR="5.10" + +DESCRIPTION="Redcore Linux Kernel Image (LTS)" +HOMEPAGE="https://redcorelinux.org" +SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz" + +KEYWORDS="~amd64" +LICENSE="GPL-2" +SLOT="${PVR}" +IUSE="+cryptsetup +dmraid +dracut +dkms +mdadm" + +RESTRICT="binchecks strip mirror" +DEPEND=" + app-arch/lz4 + app-arch/xz-utils + sys-devel/autoconf + sys-devel/bc + sys-devel/make + cryptsetup? ( sys-fs/cryptsetup ) + dmraid? ( sys-fs/dmraid ) + dracut? ( >=sys-kernel/dracut-0.44-r8 ) + dkms? ( sys-kernel/dkms sys-kernel/linux-sources-redcore-lts:${SLOT} ) + mdadm? ( sys-fs/mdadm ) + >=sys-kernel/linux-firmware-20180314" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/"${KV_MAJOR}"-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch + "${FILESDIR}"/"${KV_MAJOR}"-ath10k-be-quiet.patch + "${FILESDIR}"/"${KV_MAJOR}"-enable_alx_wol.patch + "${FILESDIR}"/"${KV_MAJOR}"-ata-fix-NCQ-LOG-strings-and-move-to-debug.patch + "${FILESDIR}"/"${KV_MAJOR}"-radeon_dp_aux_transfer_native-no-ratelimited_debug.patch + "${FILESDIR}"/"${KV_MAJOR}"-acpi-use-kern_warning_even_when_error.patch + "${FILESDIR}"/"${KV_MAJOR}"-Unknow-SSD-HFM128GDHTNG-8310B-QUIRK_NO_APST.patch + "${FILESDIR}"/"${KV_MAJOR}"-nvme-Patriot_Viper_VPN100-QUIRK_IGNORE_DEV_SUBNQN.patch + "${FILESDIR}"/"${KV_MAJOR}"-acer-wmi-silence-unknow-functions-messages.patch + "${FILESDIR}"/"${KV_MAJOR}"-do_not_bug_the_next_18-years.patch + "${FILESDIR}"/"${KV_MAJOR}"-iwlwifi-use-debug-for-debug-infos.patch + "${FILESDIR}"/"${KV_MAJOR}"-compress-modules-zstd-support.patch + "${FILESDIR}"/"${KV_MAJOR}"-fix-bootconfig-makefile.patch + "${FILESDIR}"/"${KV_MAJOR}"-apic_vector-spam-in-debug-mode-only.patch + "${FILESDIR}"/"${KV_MAJOR}"-iwlwifi-fix-5e003982b07ae.patch + "${FILESDIR}"/"${KV_MAJOR}"-enable-new-amd-energy-driver-for-all-ryzen.patch + "${FILESDIR}"/"${KV_MAJOR}"-amd_iommu_init_info.patch + "${FILESDIR}"/"${KV_MAJOR}"-0001-Revert-hwmon-k10temp-Remove-support-for-displaying-v.patch + "${FILESDIR}"/"${KV_MAJOR}"-k10temp-fix-ZEN2-desktop-add-ZEN3-desktop.patch + "${FILESDIR}"/"${KV_MAJOR}"-add-amd-sfh-hid_driver.patch + "${FILESDIR}"/"${KV_MAJOR}"-add-sbtsi_driver.patch + "${FILESDIR}"/"${KV_MAJOR}"-0001-Revert-cpufreq-Avoid-configuring-old-governors-as-de.patch + "${FILESDIR}"/"${KV_MAJOR}"-revert-parts-of-a00ec3874e7d326ab2dffbed92faddf6a77a84e9-no-Intel-NO.patch + "${FILESDIR}"/"${KV_MAJOR}"-linux-hardened.patch + "${FILESDIR}"/"${KV_MAJOR}"-uksm-linux-hardened.patch +) + +S="${WORKDIR}"/linux-"${PV}" + +pkg_setup() { + export KBUILD_BUILD_USER="nexus" + export KBUILD_BUILD_HOST="nexus.redcorelinux.org" + + export REAL_ARCH="$ARCH" + unset ARCH ; unset LDFLAGS #will interfere with Makefile if set +} + +src_prepare() { + default + emake mrproper + sed -ri "s|^(EXTRAVERSION =).*|\1 -${EXTRAVERSION}|" Makefile + cp "${FILESDIR}"/"${KV_MAJOR}"-amd64.config .config + rm -rf $(find . -type f|grep -F \.orig) +} + +src_compile() { + emake prepare modules_prepare bzImage modules +} + +src_install() { + dodir boot + insinto boot + newins .config config-"${KV_FULL}" + newins System.map System.map-"${KV_FULL}" + newins arch/x86/boot/bzImage vmlinuz-"${KV_FULL}" + + dodir usr/src/linux-"${KV_FULL}" + insinto usr/src/linux-"${KV_FULL}" + doins Module.symvers + doins System.map + exeinto usr/src/linux-"${KV_FULL}" + doexe vmlinux + + emake INSTALL_MOD_PATH="${D}" modules_install + + rm -f "${D}"lib/modules/"${KV_FULL}"/build + rm -f "${D}"lib/modules/"${KV_FULL}"/source + export local KSYMS + for KSYMS in build source ; do + dosym ../../../usr/src/linux-"${KV_FULL}" lib/modules/"${KV_FULL}"/"${KSYMS}" + done +} + +_grub2_update_grubcfg() { + if [[ -x $(which grub2-mkconfig) ]]; then + elog "Updating GRUB-2 bootloader configuration, please wait" + grub2-mkconfig -o "${ROOT}"boot/grub/grub.cfg + else + elog "It looks like you're not using GRUB-2, you must update bootloader configuration by hand" + fi +} + +_dracut_initrd_create() { + if [[ -x $(which dracut) ]]; then + elog "Generating initrd for "${KV_FULL}", please wait" + addpredict /etc/ld.so.cache~ + dracut -N -f --kver="${KV_FULL}" "${ROOT}"boot/initrd-"${KV_FULL}" + else + elog "It looks like you're not using dracut, you must generate an initrd by hand" + fi +} + +_dracut_initrd_delete() { + rm -rf "${ROOT}"boot/initrd-"${KV_FULL}" +} + +_dkms_modules_delete() { + if [[ -x $(which dkms) ]] ; then + export local DKMSMOD + for DKMSMOD in $(dkms status | cut -d " " -f1,2 | sed -e 's/,//g' | sed -e 's/ /\//g' | sed -e 's/://g' | uniq) ; do + dkms remove "${DKMSMOD}" -k "${KV_FULL}" + done + fi +} + +_kernel_modules_delete() { + rm -rf "${ROOT}"lib/modules/"${KV_FULL}" +} + +pkg_postinst() { + if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then + if use dracut; then + _dracut_initrd_create + fi + _grub2_update_grubcfg + fi +} + +pkg_postrm() { + if [ $(stat -c %d:%i /) == $(stat -c %d:%i /proc/1/root/.) ]; then + if use dracut; then + _dracut_initrd_delete + fi + _grub2_update_grubcfg + fi + if use dkms; then + _dkms_modules_delete + fi + _kernel_modules_delete +} diff --git a/sys-kernel/linux-sources-redcore-lts/Manifest b/sys-kernel/linux-sources-redcore-lts/Manifest index 5994eb82..6e07733f 100644 --- a/sys-kernel/linux-sources-redcore-lts/Manifest +++ b/sys-kernel/linux-sources-redcore-lts/Manifest @@ -1 +1 @@ -DIST linux-5.10.4.tar.xz 116612908 BLAKE2B 57f6d719451aacfd298452703ae02e6188885500e8cdf18fffa6b9967b0934a23cd378ab4c49b76ccb2f7a9012d6aa7ff1349d488cb31e40924be2f27b244cec SHA512 aab782786cc06b5f1872bbb88c4f55a73d222f8ecf1ab8f5b7d96de2160b11b4407e02a44b206d2c00e395ba0662aa5a038b8e10d185621a0b33c576b523b490 +DIST linux-5.10.5.tar.xz 116604852 BLAKE2B 25b71eb091ea6526a7ebfef5bc201b76d612e5138b6b3caa708f90e76196c30d1865c223e2084a118a3883a9620d47c9576b1ab7db2c8d9c0f204dda7c640eab SHA512 f3462c8ee26c34a8ee344fa146f6f3aeceab03ef1cff83f3b831251f52aa70823d67085030a37b7fea21b305e20bcd7616d16557a7b5bd757b8f84d9805413da diff --git a/sys-kernel/linux-sources-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch b/sys-kernel/linux-sources-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch deleted file mode 100644 index 631e709d..00000000 --- a/sys-kernel/linux-sources-redcore-lts/files/5.10-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 965421096770bb0d69444950c1f839e8e5504da5 Mon Sep 17 00:00:00 2001 -From: Rodrigo Siqueira -Date: Tue, 15 Dec 2020 10:45:05 -0500 -Subject: [PATCH] drm/amd/display: Add get_dig_frontend implementation for DCEx - -Some old ASICs might not implement/require get_dig_frontend helper; in -this scenario, we can have a NULL pointer exception when we try to call -it inside vbios disable operation. For example, this situation might -happen when using Polaris12 with an eDP panel. This commit avoids this -situation by adding a specific get_dig_frontend implementation for DCEx. - -Cc: Alex Deucher -Cc: Borislav Petkov -Cc: Harry Wentland -Cc: Nicholas Kazlauskas -Cc: Chiawen Huang -Signed-off-by: Rodrigo Siqueira -Signed-off-by: Alex Deucher ---- - .../drm/amd/display/dc/dce/dce_link_encoder.c | 45 ++++++++++++++++++- - .../drm/amd/display/dc/dce/dce_link_encoder.h | 2 + - 2 files changed, 45 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c -index b409f6b2bfd8..f355cd1e9090 100644 ---- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c -+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c -@@ -119,7 +119,8 @@ static const struct link_encoder_funcs dce110_lnk_enc_funcs = { - .disable_hpd = dce110_link_encoder_disable_hpd, - .is_dig_enabled = dce110_is_dig_enabled, - .destroy = dce110_link_encoder_destroy, -- .get_max_link_cap = dce110_link_encoder_get_max_link_cap -+ .get_max_link_cap = dce110_link_encoder_get_max_link_cap, -+ .get_dig_frontend = dce110_get_dig_frontend, - }; - - static enum bp_result link_transmitter_control( -@@ -235,6 +236,45 @@ static void set_link_training_complete( - - } - -+unsigned int dce110_get_dig_frontend(struct link_encoder *enc) -+{ -+ struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc); -+ u32 value; -+ enum engine_id result; -+ -+ REG_GET(DIG_BE_CNTL, DIG_FE_SOURCE_SELECT, &value); -+ -+ switch (value) { -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGA: -+ result = ENGINE_ID_DIGA; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGB: -+ result = ENGINE_ID_DIGB; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGC: -+ result = ENGINE_ID_DIGC; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGD: -+ result = ENGINE_ID_DIGD; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGE: -+ result = ENGINE_ID_DIGE; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGF: -+ result = ENGINE_ID_DIGF; -+ break; -+ case DCE110_DIG_FE_SOURCE_SELECT_DIGG: -+ result = ENGINE_ID_DIGG; -+ break; -+ default: -+ // invalid source select DIG -+ ASSERT(false); -+ result = ENGINE_ID_UNKNOWN; -+ } -+ -+ return result; -+} -+ - void dce110_link_encoder_set_dp_phy_pattern_training_pattern( - struct link_encoder *enc, - uint32_t index) -@@ -1665,7 +1705,8 @@ static const struct link_encoder_funcs dce60_lnk_enc_funcs = { - .disable_hpd = dce110_link_encoder_disable_hpd, - .is_dig_enabled = dce110_is_dig_enabled, - .destroy = dce110_link_encoder_destroy, -- .get_max_link_cap = dce110_link_encoder_get_max_link_cap -+ .get_max_link_cap = dce110_link_encoder_get_max_link_cap, -+ .get_dig_frontend = dce110_get_dig_frontend - }; - - void dce60_link_encoder_construct( -diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h -index cb714a48b171..fc6ade824c23 100644 ---- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h -+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h -@@ -295,6 +295,8 @@ void dce110_link_encoder_connect_dig_be_to_fe( - enum engine_id engine, - bool connect); - -+unsigned int dce110_get_dig_frontend(struct link_encoder *enc); -+ - void dce110_link_encoder_set_dp_phy_pattern_training_pattern( - struct link_encoder *enc, - uint32_t index); --- -2.25.4 - diff --git a/sys-kernel/linux-sources-redcore-lts/files/5.10-amd64.config b/sys-kernel/linux-sources-redcore-lts/files/5.10-amd64.config index 90a1a253..941d6f95 100644 --- a/sys-kernel/linux-sources-redcore-lts/files/5.10-amd64.config +++ b/sys-kernel/linux-sources-redcore-lts/files/5.10-amd64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.10.4-redcore-lts Kernel Configuration +# Linux/x86 5.10.5-redcore-lts Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (Gentoo Hardened 10.2.0-r10 p4) 10.2.0" CONFIG_CC_IS_GCC=y @@ -191,7 +191,7 @@ CONFIG_UTS_NS=y CONFIG_TIME_NS=y CONFIG_IPC_NS=y CONFIG_USER_NS=y -# CONFIG_USER_NS_UNPRIVILEGED is not set +CONFIG_USER_NS_UNPRIVILEGED=y CONFIG_PID_NS=y CONFIG_NET_NS=y CONFIG_CHECKPOINT_RESTORE=y diff --git a/sys-kernel/linux-sources-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch b/sys-kernel/linux-sources-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch new file mode 100644 index 00000000..c1092a74 --- /dev/null +++ b/sys-kernel/linux-sources-redcore-lts/files/5.10-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch @@ -0,0 +1,13 @@ +diff -Nur a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 2021-01-06 13:56:56.000000000 +0000 ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c 2021-01-06 22:44:20.751987382 +0000 +@@ -2278,8 +2278,7 @@ + + drm_connector_update_edid_property(connector, + aconnector->edid); +- aconnector->num_modes = drm_add_edid_modes(connector, aconnector->edid); +- drm_connector_list_update(connector); ++ drm_add_edid_modes(connector, aconnector->edid); + + if (aconnector->dc_link->aux_mode) + drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux, diff --git a/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-5.10.4.ebuild b/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-5.10.4.ebuild deleted file mode 100644 index 80369653..00000000 --- a/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-5.10.4.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils - -EXTRAVERSION="redcore-lts" -KV_FULL="${PV}-${EXTRAVERSION}" -KV_MAJOR="5.10" - -DESCRIPTION="Redcore Linux Kernel Sources (LTS)" -HOMEPAGE="https://redcorelinux.org" -SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz" - -KEYWORDS="~amd64" -LICENSE="GPL-2" -SLOT="${PVR}" -IUSE="" - -RESTRICT="strip mirror" -DEPEND=" - app-arch/lz4 - app-arch/xz-utils - sys-devel/autoconf - sys-devel/bc - sys-devel/make" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}"/"${KV_MAJOR}"-ath10k-be-quiet.patch - "${FILESDIR}"/"${KV_MAJOR}"-enable_alx_wol.patch - "${FILESDIR}"/"${KV_MAJOR}"-ata-fix-NCQ-LOG-strings-and-move-to-debug.patch - "${FILESDIR}"/"${KV_MAJOR}"-radeon_dp_aux_transfer_native-no-ratelimited_debug.patch - "${FILESDIR}"/"${KV_MAJOR}"-acpi-use-kern_warning_even_when_error.patch - "${FILESDIR}"/"${KV_MAJOR}"-Unknow-SSD-HFM128GDHTNG-8310B-QUIRK_NO_APST.patch - "${FILESDIR}"/"${KV_MAJOR}"-nvme-Patriot_Viper_VPN100-QUIRK_IGNORE_DEV_SUBNQN.patch - "${FILESDIR}"/"${KV_MAJOR}"-acer-wmi-silence-unknow-functions-messages.patch - "${FILESDIR}"/"${KV_MAJOR}"-do_not_bug_the_next_18-years.patch - "${FILESDIR}"/"${KV_MAJOR}"-iwlwifi-use-debug-for-debug-infos.patch - "${FILESDIR}"/"${KV_MAJOR}"-compress-modules-zstd-support.patch - "${FILESDIR}"/"${KV_MAJOR}"-fix-bootconfig-makefile.patch - "${FILESDIR}"/"${KV_MAJOR}"-apic_vector-spam-in-debug-mode-only.patch - "${FILESDIR}"/"${KV_MAJOR}"-iwlwifi-fix-5e003982b07ae.patch - "${FILESDIR}"/"${KV_MAJOR}"-enable-new-amd-energy-driver-for-all-ryzen.patch - "${FILESDIR}"/"${KV_MAJOR}"-amd_iommu_init_info.patch - "${FILESDIR}"/"${KV_MAJOR}"-0001-Revert-hwmon-k10temp-Remove-support-for-displaying-v.patch - "${FILESDIR}"/"${KV_MAJOR}"-k10temp-fix-ZEN2-desktop-add-ZEN3-desktop.patch - "${FILESDIR}"/"${KV_MAJOR}"-8353d30e747f-drm-amd-display-disable-stream-if-pixel-clock-changed-with-link-active.patch - "${FILESDIR}"/"${KV_MAJOR}"-add-amd-sfh-hid_driver.patch - "${FILESDIR}"/"${KV_MAJOR}"-add-sbtsi_driver.patch - "${FILESDIR}"/"${KV_MAJOR}"-0001-Revert-cpufreq-Avoid-configuring-old-governors-as-de.patch - "${FILESDIR}"/"${KV_MAJOR}"-revert-parts-of-a00ec3874e7d326ab2dffbed92faddf6a77a84e9-no-Intel-NO.patch - "${FILESDIR}"/"${KV_MAJOR}"-linux-hardened.patch - "${FILESDIR}"/"${KV_MAJOR}"-uksm-linux-hardened.patch -) - -S="${WORKDIR}"/linux-"${PV}" - -pkg_setup() { - export KBUILD_BUILD_USER="nexus" - export KBUILD_BUILD_HOST="nexus.redcorelinux.org" - - export REAL_ARCH="$ARCH" - unset ARCH ; unset LDFLAGS #will interfere with Makefile if set -} - -src_prepare() { - default - emake mrproper - sed -ri "s|^(EXTRAVERSION =).*|\1 -${EXTRAVERSION}|" Makefile - cp "${FILESDIR}"/"${KV_MAJOR}"-amd64.config .config - rm -rf $(find . -type f|grep -F \.orig) -} - -src_compile() { - emake prepare modules_prepare -} - -src_install() { - dodir usr/src/linux-"${KV_FULL}" - cp -ax "${S}"/* "${D}"usr/src/linux-"${KV_FULL}" -} - -_kernel_sources_delete() { - rm -rf "${ROOT}"usr/src/linux-"${KV_FULL}" -} - -pkg_postrm() { - _kernel_sources_delete -} diff --git a/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-5.10.5.ebuild b/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-5.10.5.ebuild new file mode 100644 index 00000000..5d88da65 --- /dev/null +++ b/sys-kernel/linux-sources-redcore-lts/linux-sources-redcore-lts-5.10.5.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +EXTRAVERSION="redcore-lts" +KV_FULL="${PV}-${EXTRAVERSION}" +KV_MAJOR="5.10" + +DESCRIPTION="Redcore Linux Kernel Sources (LTS)" +HOMEPAGE="https://redcorelinux.org" +SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${PV}.tar.xz" + +KEYWORDS="~amd64" +LICENSE="GPL-2" +SLOT="${PVR}" +IUSE="" + +RESTRICT="strip mirror" +DEPEND=" + app-arch/lz4 + app-arch/xz-utils + sys-devel/autoconf + sys-devel/bc + sys-devel/make" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/"${KV_MAJOR}"-revert-a135a1b4c4db1f3b8cbed9676a40ede39feb3362.patch + "${FILESDIR}"/"${KV_MAJOR}"-ath10k-be-quiet.patch + "${FILESDIR}"/"${KV_MAJOR}"-enable_alx_wol.patch + "${FILESDIR}"/"${KV_MAJOR}"-ata-fix-NCQ-LOG-strings-and-move-to-debug.patch + "${FILESDIR}"/"${KV_MAJOR}"-radeon_dp_aux_transfer_native-no-ratelimited_debug.patch + "${FILESDIR}"/"${KV_MAJOR}"-acpi-use-kern_warning_even_when_error.patch + "${FILESDIR}"/"${KV_MAJOR}"-Unknow-SSD-HFM128GDHTNG-8310B-QUIRK_NO_APST.patch + "${FILESDIR}"/"${KV_MAJOR}"-nvme-Patriot_Viper_VPN100-QUIRK_IGNORE_DEV_SUBNQN.patch + "${FILESDIR}"/"${KV_MAJOR}"-acer-wmi-silence-unknow-functions-messages.patch + "${FILESDIR}"/"${KV_MAJOR}"-do_not_bug_the_next_18-years.patch + "${FILESDIR}"/"${KV_MAJOR}"-iwlwifi-use-debug-for-debug-infos.patch + "${FILESDIR}"/"${KV_MAJOR}"-compress-modules-zstd-support.patch + "${FILESDIR}"/"${KV_MAJOR}"-fix-bootconfig-makefile.patch + "${FILESDIR}"/"${KV_MAJOR}"-apic_vector-spam-in-debug-mode-only.patch + "${FILESDIR}"/"${KV_MAJOR}"-iwlwifi-fix-5e003982b07ae.patch + "${FILESDIR}"/"${KV_MAJOR}"-enable-new-amd-energy-driver-for-all-ryzen.patch + "${FILESDIR}"/"${KV_MAJOR}"-amd_iommu_init_info.patch + "${FILESDIR}"/"${KV_MAJOR}"-0001-Revert-hwmon-k10temp-Remove-support-for-displaying-v.patch + "${FILESDIR}"/"${KV_MAJOR}"-k10temp-fix-ZEN2-desktop-add-ZEN3-desktop.patch + "${FILESDIR}"/"${KV_MAJOR}"-add-amd-sfh-hid_driver.patch + "${FILESDIR}"/"${KV_MAJOR}"-add-sbtsi_driver.patch + "${FILESDIR}"/"${KV_MAJOR}"-0001-Revert-cpufreq-Avoid-configuring-old-governors-as-de.patch + "${FILESDIR}"/"${KV_MAJOR}"-revert-parts-of-a00ec3874e7d326ab2dffbed92faddf6a77a84e9-no-Intel-NO.patch + "${FILESDIR}"/"${KV_MAJOR}"-linux-hardened.patch + "${FILESDIR}"/"${KV_MAJOR}"-uksm-linux-hardened.patch +) + +S="${WORKDIR}"/linux-"${PV}" + +pkg_setup() { + export KBUILD_BUILD_USER="nexus" + export KBUILD_BUILD_HOST="nexus.redcorelinux.org" + + export REAL_ARCH="$ARCH" + unset ARCH ; unset LDFLAGS #will interfere with Makefile if set +} + +src_prepare() { + default + emake mrproper + sed -ri "s|^(EXTRAVERSION =).*|\1 -${EXTRAVERSION}|" Makefile + cp "${FILESDIR}"/"${KV_MAJOR}"-amd64.config .config + rm -rf $(find . -type f|grep -F \.orig) +} + +src_compile() { + emake prepare modules_prepare +} + +src_install() { + dodir usr/src/linux-"${KV_FULL}" + cp -ax "${S}"/* "${D}"usr/src/linux-"${KV_FULL}" +} + +_kernel_sources_delete() { + rm -rf "${ROOT}"usr/src/linux-"${KV_FULL}" +} + +pkg_postrm() { + _kernel_sources_delete +} -- cgit v1.2.3