diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 4 | ||||
-rw-r--r-- | 0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch | 4 | ||||
-rw-r--r-- | 0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch | 118 | ||||
-rw-r--r-- | PKGBUILD | 8 |
5 files changed, 132 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-ck pkgver = 5.12.4 - pkgrel = 2 + pkgrel = 3 url = https://wiki.archlinux.org/index.php/Linux-ck arch = x86_64 license = GPL2 @@ -19,6 +19,7 @@ pkgbase = linux-ck source = http://ck.kolivas.org/patches/5.0/5.12/5.12-ck1/patch-5.12-ck1.xz source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch source = 0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch + source = 0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E b2sums = cb6413d9046bfbe68e7444aafd5353a3cf03a78aca38624dc91a313a8944c6da5d66f3fd7cc8dc47fc058287942d28c3e9d9eaa5da42a3a17d3d20e287968b03 @@ -26,8 +27,9 @@ pkgbase = linux-ck b2sums = ccb7779df282b54d9acf59682eaa93a39f27276798d61d4c8be8a3b31e582a377c9d3278a500744a3ed089a337807f95a2d23ef821af2f4a7eec24540092b746 b2sums = 72194a32a06c43809d1272bd675890b6d27c6c54353150a366e8e2c50ad6eca6ee23c5d6281822965a228cfedfa07a60fe135d1b4f539e4a62728d4460cc0b0e b2sums = c9f729ba1efe6f04e7b2c57d3999bc9675b577596dccb2f227e5b6e444285e1fdd270bf67c0fcf9f5808a4c3a4b1c7a5c13a76f754ad9b9447243ccbaf2ce6a3 - b2sums = 7e1ee91f7b0d7e62bf3683295236c9e7f647e97cbe6d6d8d262296ede83c306fa3097ce9952b85f87ee796623505116349219b2b4c0f480a88c703bf6123d0ee - b2sums = f2716cda084e23e7e77cf1ffdff49fe9d87a91626109f4d6c06eb7b66e32f9b59d8b5ff9d67b3e8ccd2c6a604b91339736e493f1a3a3c82b51214c6ae3ede116 + b2sums = 213557da5172046b073aa4fe513f6bf50036bf462b08f6e26dc540ecc42d0caed531a23730e94a178526e8a6d501be6c7043aaf00a1cf293fa9ba7b47101b2e4 + b2sums = b25bea0a96767e766dde01c9c8f1c50673a6dd9d57b3255f474b7c04bb638b9ca7e6cddcc8bb7cf7b0fe7f2cd4d2c454737750128e7284d97558c167ab46c710 + b2sums = 17c8818b268fdbe798fe9594b39753a40e06d4f94932ec33a0ba8cbfd8414c6fa3342190ea00094dfdf3499215d811a98414150025ad8dd2a150d1bea81eadba pkgname = linux-ck pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch index c91a87bcce5d..6c87bcbaa3b6 100644 --- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch +++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch @@ -1,7 +1,7 @@ -From e7aa791810607833c30e50d9fac60bb5b1fb1f27 Mon Sep 17 00:00:00 2001 +From 6fe92facfd70f98899343cae2c4eacfe4225b387 Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com> Date: Mon, 16 Sep 2019 04:53:20 +0200 -Subject: [PATCH 1/3] ZEN: Add sysctl and CONFIG to disallow unprivileged +Subject: [PATCH 1/4] ZEN: Add sysctl and CONFIG to disallow unprivileged CLONE_NEWUSER Our default behavior continues to match the vanilla kernel. diff --git a/0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch b/0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch index f7e49d422e12..891f8d50116e 100644 --- a/0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch +++ b/0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch @@ -1,7 +1,7 @@ -From d290a24cb45e73e4f8d2700d5f47c2132d066fe2 Mon Sep 17 00:00:00 2001 +From a832c8fcc477b77ed614d7697ca05b50a910b4e2 Mon Sep 17 00:00:00 2001 From: Kai-Heng Feng <kai.heng.feng@canonical.com> Date: Wed, 21 Apr 2021 13:20:31 +0800 -Subject: [PATCH 2/3] drm/i915/dp: Use slow and wide link training for +Subject: [PATCH 2/4] drm/i915/dp: Use slow and wide link training for everything MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 diff --git a/0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch b/0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch new file mode 100644 index 000000000000..f3c7aa394c4e --- /dev/null +++ b/0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch @@ -0,0 +1,118 @@ +From 676bfe06a676d970e6b8cc28b7cd18ac1db994c4 Mon Sep 17 00:00:00 2001 +From: Steven Barrett <steven@liquorix.net> +Date: Tue, 18 May 2021 11:35:29 -0500 +Subject: [PATCH 3/4] Revert "bus: mhi: core: Process execution environment + changes serially" + +Fix ath11k / QCA6390 initialization: +https://bugzilla.kernel.org/show_bug.cgi?id=213055 + +This reverts commit 29b9829718c5e9bd68fc1c652f5e0ba9b9a64fed. +--- + drivers/bus/mhi/core/main.c | 40 ++++++++++++++++++------------------- + drivers/bus/mhi/core/pm.c | 7 +++---- + 2 files changed, 22 insertions(+), 25 deletions(-) + +diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c +index 61c37b23dd71..bd71a2b6f984 100644 +--- a/drivers/bus/mhi/core/main.c ++++ b/drivers/bus/mhi/core/main.c +@@ -444,7 +444,7 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv) + struct device *dev = &mhi_cntrl->mhi_dev->dev; + enum mhi_state state = MHI_STATE_MAX; + enum mhi_pm_state pm_state = 0; +- enum mhi_ee_type ee = MHI_EE_MAX; ++ enum mhi_ee_type ee = 0; + + write_lock_irq(&mhi_cntrl->pm_lock); + if (!MHI_REG_ACCESS_VALID(mhi_cntrl->pm_state)) { +@@ -453,7 +453,8 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv) + } + + state = mhi_get_mhi_state(mhi_cntrl); +- ee = mhi_get_exec_env(mhi_cntrl); ++ ee = mhi_cntrl->ee; ++ mhi_cntrl->ee = mhi_get_exec_env(mhi_cntrl); + dev_dbg(dev, "local ee:%s device ee:%s dev_state:%s\n", + TO_MHI_EXEC_STR(mhi_cntrl->ee), TO_MHI_EXEC_STR(ee), + TO_MHI_STATE_STR(state)); +@@ -465,30 +466,27 @@ irqreturn_t mhi_intvec_threaded_handler(int irq_number, void *priv) + } + write_unlock_irq(&mhi_cntrl->pm_lock); + +- if (pm_state != MHI_PM_SYS_ERR_DETECT || ee == mhi_cntrl->ee) +- goto exit_intvec; ++ /* If device supports RDDM don't bother processing SYS error */ ++ if (mhi_cntrl->rddm_image) { ++ /* host may be performing a device power down already */ ++ if (!mhi_is_active(mhi_cntrl)) ++ goto exit_intvec; + +- switch (ee) { +- case MHI_EE_RDDM: +- /* proceed if power down is not already in progress */ +- if (mhi_cntrl->rddm_image && mhi_is_active(mhi_cntrl)) { ++ if (mhi_cntrl->ee == MHI_EE_RDDM && mhi_cntrl->ee != ee) { + mhi_cntrl->status_cb(mhi_cntrl, MHI_CB_EE_RDDM); +- mhi_cntrl->ee = ee; + wake_up_all(&mhi_cntrl->state_event); + } +- break; +- case MHI_EE_PBL: +- case MHI_EE_EDL: +- case MHI_EE_PTHRU: +- mhi_cntrl->status_cb(mhi_cntrl, MHI_CB_FATAL_ERROR); +- mhi_cntrl->ee = ee; +- wake_up_all(&mhi_cntrl->state_event); +- mhi_pm_sys_err_handler(mhi_cntrl); +- break; +- default: ++ goto exit_intvec; ++ } ++ ++ if (pm_state == MHI_PM_SYS_ERR_DETECT) { + wake_up_all(&mhi_cntrl->state_event); +- mhi_pm_sys_err_handler(mhi_cntrl); +- break; ++ ++ /* For fatal errors, we let controller decide next step */ ++ if (MHI_IN_PBL(ee)) ++ mhi_cntrl->status_cb(mhi_cntrl, MHI_CB_FATAL_ERROR); ++ else ++ mhi_pm_sys_err_handler(mhi_cntrl); + } + + exit_intvec: +diff --git a/drivers/bus/mhi/core/pm.c b/drivers/bus/mhi/core/pm.c +index 277704af7eb6..1edce7917b6b 100644 +--- a/drivers/bus/mhi/core/pm.c ++++ b/drivers/bus/mhi/core/pm.c +@@ -377,22 +377,21 @@ static int mhi_pm_mission_mode_transition(struct mhi_controller *mhi_cntrl) + { + struct mhi_event *mhi_event; + struct device *dev = &mhi_cntrl->mhi_dev->dev; +- enum mhi_ee_type ee = MHI_EE_MAX, current_ee = mhi_cntrl->ee; ++ enum mhi_ee_type current_ee = mhi_cntrl->ee; + int i, ret; + + dev_dbg(dev, "Processing Mission Mode transition\n"); + + write_lock_irq(&mhi_cntrl->pm_lock); + if (MHI_REG_ACCESS_VALID(mhi_cntrl->pm_state)) +- ee = mhi_get_exec_env(mhi_cntrl); ++ mhi_cntrl->ee = mhi_get_exec_env(mhi_cntrl); + +- if (!MHI_IN_MISSION_MODE(ee)) { ++ if (!MHI_IN_MISSION_MODE(mhi_cntrl->ee)) { + mhi_cntrl->pm_state = MHI_PM_LD_ERR_FATAL_DETECT; + write_unlock_irq(&mhi_cntrl->pm_lock); + wake_up_all(&mhi_cntrl->state_event); + return -EIO; + } +- mhi_cntrl->ee = ee; + write_unlock_irq(&mhi_cntrl->pm_lock); + + wake_up_all(&mhi_cntrl->state_event); +-- +2.31.1 + @@ -68,7 +68,7 @@ _subarch= pkgbase=linux-ck pkgver=5.12.4 -pkgrel=2 +pkgrel=3 _ckpatchversion=1 arch=(x86_64) url="https://wiki.archlinux.org/index.php/Linux-ck" @@ -86,6 +86,7 @@ source=( "http://ck.kolivas.org/patches/5.0/5.12/5.12-ck${_ckpatchversion}/$_ckpatch.xz" 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch 0002-drm-i915-dp-Use-slow-and-wide-link-training-for-ever.patch + 0003-Revert-bus-mhi-core-Process-execution-environment-ch.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -96,8 +97,9 @@ b2sums=('cb6413d9046bfbe68e7444aafd5353a3cf03a78aca38624dc91a313a8944c6da5d66f3f 'ccb7779df282b54d9acf59682eaa93a39f27276798d61d4c8be8a3b31e582a377c9d3278a500744a3ed089a337807f95a2d23ef821af2f4a7eec24540092b746' '72194a32a06c43809d1272bd675890b6d27c6c54353150a366e8e2c50ad6eca6ee23c5d6281822965a228cfedfa07a60fe135d1b4f539e4a62728d4460cc0b0e' 'c9f729ba1efe6f04e7b2c57d3999bc9675b577596dccb2f227e5b6e444285e1fdd270bf67c0fcf9f5808a4c3a4b1c7a5c13a76f754ad9b9447243ccbaf2ce6a3' - '7e1ee91f7b0d7e62bf3683295236c9e7f647e97cbe6d6d8d262296ede83c306fa3097ce9952b85f87ee796623505116349219b2b4c0f480a88c703bf6123d0ee' - 'f2716cda084e23e7e77cf1ffdff49fe9d87a91626109f4d6c06eb7b66e32f9b59d8b5ff9d67b3e8ccd2c6a604b91339736e493f1a3a3c82b51214c6ae3ede116') + '213557da5172046b073aa4fe513f6bf50036bf462b08f6e26dc540ecc42d0caed531a23730e94a178526e8a6d501be6c7043aaf00a1cf293fa9ba7b47101b2e4' + 'b25bea0a96767e766dde01c9c8f1c50673a6dd9d57b3255f474b7c04bb638b9ca7e6cddcc8bb7cf7b0fe7f2cd4d2c454737750128e7284d97558c167ab46c710' + '17c8818b268fdbe798fe9594b39753a40e06d4f94932ec33a0ba8cbfd8414c6fa3342190ea00094dfdf3499215d811a98414150025ad8dd2a150d1bea81eadba') export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_USER=$pkgbase |