diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch | 2 | ||||
| -rw-r--r-- | 0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch | 118 | ||||
| -rw-r--r-- | PKGBUILD | 12 |
4 files changed, 14 insertions, 136 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-rc - pkgver = 5.12.6rc2 + pkgver = 5.12.7rc1 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -12,22 +12,20 @@ pkgbase = linux-rc makedepends = tar makedepends = xz options = !strip - source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.6-rc2.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.6-rc2.sign - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.5.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.5.tar.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.7-rc1.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.12.7-rc1.sign + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.6.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.12.6.tar.sign source = config source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - source = 0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E - b2sums = 22b06d9d8eb6e90e2e6e9d60b4585ec0a567ef36e2fc8628b5f3de1c76627bc5e658a27d1dcfc5dd45071a392898cb046fa182a14568bf39bcd25a0ddbc4b8d7 + b2sums = 86a039ff9734b5ba37af03690c6b599b7708dac2cd548c2a483ad4fa692d8e4a4c14548756bc08711b76b280a53e700b66bf160b6791f6de7b9db77e591030c1 b2sums = SKIP - b2sums = aa9209e38ad16160982c02d79bba9d9fbe64b2266959c5438e54a43598b110ef6b4a0f80c7605d950e8f8d250cda04fa964edf8e6aced8d0daa2a960ef495cd6 + b2sums = 94a6f2b620a33fa52fabfce5781a7e0cd57ee03e65e823e5f25fc0d0bcaec019f9e955bc78c7799f258273c7e36cc277035d07afe4d4b3036bbe2ff526ce9b85 b2sums = SKIP b2sums = ccb7779df282b54d9acf59682eaa93a39f27276798d61d4c8be8a3b31e582a377c9d3278a500744a3ed089a337807f95a2d23ef821af2f4a7eec24540092b746 - b2sums = 009468b6fb9c859b5cfff12af1fd0ff8be60362c161af2c24a0d1bda5a7827c770cac0e3a7faf985d59419f693fba181c846390a25c6f07c769a652bcaeeaa32 - b2sums = c3a333eea69c74444d8dc0a10ba112fb7bb7faa173140df829cb27afbf5d97c7ade2ae9d88bbd315a51438ca01f88f1f9b06d4bf8a52a2e29c1f5fa9370773ca + b2sums = e43852e13fad5cdf3ce47ed698579bf019ea5c4f2f63191f417e226733b70b984c892bf2fd64bdca89aaa44dfd6b06e01f169bc784d7bf61e6189427e24c8b0a pkgname = linux-rc pkgdesc = The release candidate kernel and modules 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 845e2e19584..b88a6f2efb0 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,4 +1,4 @@ -From ee5cf8733ed55ade590e32453b390090d40f7876 Mon Sep 17 00:00:00 2001 +From 22e3612b3c9305e1010da29ee500a6ad0cc3843f 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 diff --git a/0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch b/0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch deleted file mode 100644 index fb7ab212fd7..00000000000 --- a/0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch +++ /dev/null @@ -1,118 +0,0 @@ -From e3f30700184dbcf2378428ac3fac8a6fd889d8c2 Mon Sep 17 00:00:00 2001 -From: Steven Barrett <steven@liquorix.net> -Date: Tue, 18 May 2021 11:35:29 -0500 -Subject: [PATCH 2/3] 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 - @@ -7,12 +7,12 @@ _srcname=linux-5.12 _major=5.12 ### on initial release this is null otherwise it is the current stable subversion ### ie 1,2,3 corresponding $_major.1, $_major.3 etc -_minor=5 +_minor=6 _minorc=$((_minor+1)) ### on initial release this is just $_major _fullver=$_major.$_minor #_fullver=$_major -_rcver=2 +_rcver=1 _rcpatch=patch-${_major}.${_minorc}-rc${_rcver} pkgver=${_major}.${_minorc}rc${_rcver} arch=(x86_64) @@ -30,19 +30,17 @@ source=( https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_fullver.tar.{xz,sign} config # the main kernel config file 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-Revert-bus-mhi-core-Process-execution-environment-ch.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -b2sums=('22b06d9d8eb6e90e2e6e9d60b4585ec0a567ef36e2fc8628b5f3de1c76627bc5e658a27d1dcfc5dd45071a392898cb046fa182a14568bf39bcd25a0ddbc4b8d7' +b2sums=('86a039ff9734b5ba37af03690c6b599b7708dac2cd548c2a483ad4fa692d8e4a4c14548756bc08711b76b280a53e700b66bf160b6791f6de7b9db77e591030c1' 'SKIP' - 'aa9209e38ad16160982c02d79bba9d9fbe64b2266959c5438e54a43598b110ef6b4a0f80c7605d950e8f8d250cda04fa964edf8e6aced8d0daa2a960ef495cd6' + '94a6f2b620a33fa52fabfce5781a7e0cd57ee03e65e823e5f25fc0d0bcaec019f9e955bc78c7799f258273c7e36cc277035d07afe4d4b3036bbe2ff526ce9b85' 'SKIP' 'ccb7779df282b54d9acf59682eaa93a39f27276798d61d4c8be8a3b31e582a377c9d3278a500744a3ed089a337807f95a2d23ef821af2f4a7eec24540092b746' - '009468b6fb9c859b5cfff12af1fd0ff8be60362c161af2c24a0d1bda5a7827c770cac0e3a7faf985d59419f693fba181c846390a25c6f07c769a652bcaeeaa32' - 'c3a333eea69c74444d8dc0a10ba112fb7bb7faa173140df829cb27afbf5d97c7ade2ae9d88bbd315a51438ca01f88f1f9b06d4bf8a52a2e29c1f5fa9370773ca') + 'e43852e13fad5cdf3ce47ed698579bf019ea5c4f2f63191f417e226733b70b984c892bf2fd64bdca89aaa44dfd6b06e01f169bc784d7bf61e6189427e24c8b0a') export KBUILD_BUILD_HOST=archlinux |