diff options
4 files changed, 28 insertions, 2 deletions
diff --git a/sys-kernel/linux-image-redcore/files/dma_coherent_ok-logic.patch b/sys-kernel/linux-image-redcore/files/dma_coherent_ok-logic.patch new file mode 100644 index 00000000..19e01d57 --- /dev/null +++ b/sys-kernel/linux-image-redcore/files/dma_coherent_ok-logic.patch @@ -0,0 +1,12 @@ +diff -Naur linux-4.16.2/lib/swiotlb.c linux-4.16.2-p/lib/swiotlb.c +--- linux-4.16.2/lib/swiotlb.c 2018-04-12 12:30:01.000000000 +0200 ++++ linux-4.16.2-p/lib/swiotlb.c 2018-04-12 18:01:27.122073379 +0200 +@@ -732,7 +732,7 @@ + goto out_warn; + + *dma_handle = swiotlb_phys_to_dma(dev, phys_addr); +- if (dma_coherent_ok(dev, *dma_handle, size)) ++ if (!dma_coherent_ok(dev, *dma_handle, size)) + goto out_unmap; + + memset(phys_to_virt(phys_addr), 0, size); diff --git a/sys-kernel/linux-image-redcore/linux-image-redcore-4.16.2.ebuild b/sys-kernel/linux-image-redcore/linux-image-redcore-4.16.2.ebuild index 53cb21b6..4845857d 100644 --- a/sys-kernel/linux-image-redcore/linux-image-redcore-4.16.2.ebuild +++ b/sys-kernel/linux-image-redcore/linux-image-redcore-4.16.2.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Official Redcore Linux Kernel Image" HOMEPAGE="https://redcorelinux.org" SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz" -KEYWORDS="~amd64" +KEYWORDS="amd64" LICENSE="GPL-2" SLOT="${PV}" IUSE="+cryptsetup +dmraid +dracut +dkms +mdadm" @@ -36,6 +36,7 @@ PATCHES=( "${FILESDIR}"/enable_alx_wol.patch "${FILESDIR}"/0001-Revert-swiotlb-remove-various-exports.patch "${FILESDIR}"/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch "${FILESDIR}"/0001-Make-it-possible-to-disable-SWIOTLB-code-on-admgpu-a.patch + "${FILESDIR}"/dma_coherent_ok-logic.patch "${FILESDIR}"/mute-pps_state_mismatch.patch "${FILESDIR}"/drop_ancient-and-wrong-msg.patch "${FILESDIR}"/nouveau-pascal-backlight.patch diff --git a/sys-kernel/linux-sources-redcore/files/dma_coherent_ok-logic.patch b/sys-kernel/linux-sources-redcore/files/dma_coherent_ok-logic.patch new file mode 100644 index 00000000..19e01d57 --- /dev/null +++ b/sys-kernel/linux-sources-redcore/files/dma_coherent_ok-logic.patch @@ -0,0 +1,12 @@ +diff -Naur linux-4.16.2/lib/swiotlb.c linux-4.16.2-p/lib/swiotlb.c +--- linux-4.16.2/lib/swiotlb.c 2018-04-12 12:30:01.000000000 +0200 ++++ linux-4.16.2-p/lib/swiotlb.c 2018-04-12 18:01:27.122073379 +0200 +@@ -732,7 +732,7 @@ + goto out_warn; + + *dma_handle = swiotlb_phys_to_dma(dev, phys_addr); +- if (dma_coherent_ok(dev, *dma_handle, size)) ++ if (!dma_coherent_ok(dev, *dma_handle, size)) + goto out_unmap; + + memset(phys_to_virt(phys_addr), 0, size); diff --git a/sys-kernel/linux-sources-redcore/linux-sources-redcore-4.16.2.ebuild b/sys-kernel/linux-sources-redcore/linux-sources-redcore-4.16.2.ebuild index 6f3c1a6e..8a020814 100644 --- a/sys-kernel/linux-sources-redcore/linux-sources-redcore-4.16.2.ebuild +++ b/sys-kernel/linux-sources-redcore/linux-sources-redcore-4.16.2.ebuild @@ -12,7 +12,7 @@ DESCRIPTION="Official Redcore Linux Kernel Sources" HOMEPAGE="https://redcorelinux.org" SRC_URI="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz" -KEYWORDS="~amd64" +KEYWORDS="amd64" LICENSE="GPL-2" SLOT="${PV}" IUSE="" @@ -30,6 +30,7 @@ PATCHES=( "${FILESDIR}"/enable_alx_wol.patch "${FILESDIR}"/0001-Revert-swiotlb-remove-various-exports.patch "${FILESDIR}"/0001-Revert-x86-ACPI-cstate-Allow-ACPI-C1-FFH-MWAIT-use-o.patch "${FILESDIR}"/0001-Make-it-possible-to-disable-SWIOTLB-code-on-admgpu-a.patch + "${FILESDIR}"/dma_coherent_ok-logic.patch "${FILESDIR}"/mute-pps_state_mismatch.patch "${FILESDIR}"/drop_ancient-and-wrong-msg.patch "${FILESDIR}"/nouveau-pascal-backlight.patch |