diff options
author | Evgeny Myandin | 2022-08-17 20:19:47 +0300 |
---|---|---|
committer | Evgeny Myandin | 2022-08-17 20:19:47 +0300 |
commit | 7154d723cca4c9d4571fd59bc002008f14d774d6 (patch) | |
tree | 67ce13a0e65b5d888b07a0987118b7c1ef68a8b1 | |
parent | 11c19a74a79b9a70edc588f1fc9060d69fedba6e (diff) | |
download | aur-7154d723cca4c9d4571fd59bc002008f14d774d6.tar.gz |
release kernel 5.19.2
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | 0102-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch (renamed from 0103-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch) | 0 | ||||
-rw-r--r-- | 0102-soundwire_Raise_DEFAULT_PROBE_TIMEOUT_to_10000_ms.patch | 22 | ||||
-rw-r--r-- | 0103-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch (renamed from 0104-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch) | 0 | ||||
-rw-r--r-- | 0104-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch (renamed from 0105-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch) | 0 | ||||
-rw-r--r-- | 0105-soundwire_intel-use_pm_runtime_resume_on_component_probe.patch | 79 | ||||
-rw-r--r-- | 0303-revert-fbcon-remove-soft-scrollback-code.patch | 4 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | config | 10 |
9 files changed, 105 insertions, 48 deletions
@@ -1,5 +1,5 @@ pkgbase = linux-acs-manjaro - pkgver = 5.19.1 + pkgver = 5.19.2 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -18,13 +18,13 @@ pkgbase = linux-acs-manjaro makedepends = xz options = !strip source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.19.1.xz + source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.19.2.xz source = config source = 0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch - source = 0102-soundwire_Raise_DEFAULT_PROBE_TIMEOUT_to_10000_ms.patch - source = 0103-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch - source = 0104-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch - source = 0105-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch + source = 0102-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch + source = 0103-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch + source = 0104-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch + source = 0105-soundwire_intel-use_pm_runtime_resume_on_component_probe.patch source = 0301-revert-fbcon-remove-now-unusued-softback_lines-cursor-argument.patch source = 0302-revert-fbcon-remove-no-op-fbcon_set_origin.patch source = 0303-revert-fbcon-remove-soft-scrollback-code.patch @@ -43,16 +43,16 @@ pkgbase = linux-acs-manjaro source = 0413-bootsplash.gitpatch source = 0999-acs.gitpatch sha256sums = ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8 - sha256sums = e3b9167a3286441f843220bc3339f7bafc256ec4e7b5a080badca6ce8b6c7926 - sha256sums = 826f50bdd86393897014c7da0f71970a05814b22a1f7b1a89fc9f783db707579 + sha256sums = f21999b35f7e2a4ce1e8dd86c3a21d1199532b7aa48526c5599b8c6e7a14aa47 + sha256sums = 5eb7c73534ee30d1dfc89fd9bf99e3049cebd0785e0cc88d442d9476c98ef0c5 sha256sums = 05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467 - sha256sums = 02b035fa598f9e281b9b5b645809d1bcacfa189c733dc291b4305c77cde52960 sha256sums = c0a9c427b55bd1c13ccebbb503926c4ce30823fcec6d1a949fec981a4ec3a367 sha256sums = b8701a6316fb286b44adb703528462303f361d9c7af9667fb19553c4ac90816c sha256sums = 2c2c72e5f72cf306d38f91869619c6f808b5f694341eeba398de1b0919bf755b + sha256sums = e96f2ac9e9f880451875a3aecbc10268ee8268494a8c9dce49291426d7896253 sha256sums = 2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326 sha256sums = 94a8538251ad148f1025cc3de446ce64f73dc32b01815426fb159c722e8fa5bc - sha256sums = 85d39aa2c229081a329ca93ee2e353d1538730389c978a8539f8f4923b274b49 + sha256sums = 2e8a9c21fbd0f50cc450df7a2823ad670d0b3c2ffa0f613a729cb2caaf02cb9f sha256sums = 57ce3e0ba6bf400d36358a9d30589905f6e51bc037d7165f5a2658b6bdc86793 sha256sums = a26b3abaec1cd5731bc8431fecb8b3eb0ba47c1992e614643320df14ff859556 sha256sums = 8c1c880f2caa9c7ae43281a35410203887ea8eae750fe8d360d0c8bf80fcc6e0 diff --git a/0103-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch b/0102-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch index b7cedda240a4..b7cedda240a4 100644 --- a/0103-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch +++ b/0102-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch diff --git a/0102-soundwire_Raise_DEFAULT_PROBE_TIMEOUT_to_10000_ms.patch b/0102-soundwire_Raise_DEFAULT_PROBE_TIMEOUT_to_10000_ms.patch deleted file mode 100644 index b3b16a1cd33c..000000000000 --- a/0102-soundwire_Raise_DEFAULT_PROBE_TIMEOUT_to_10000_ms.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 1a4cc32c3bae9e69b3530de3c690eaa33c2348a4 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org> -Date: Sat, 23 Jul 2022 11:14:46 +0200 -Subject: [PATCH] soundwire: Raise DEFAULT_PROBE_TIMEOUT to 10000 ms - -See: https://github.com/thesofproject/linux/issues/3777#issuecomment-1192655300 ---- - drivers/soundwire/bus.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h -index 7631ef5e71fb07..d3ed828daac0ae 100644 ---- a/drivers/soundwire/bus.h -+++ b/drivers/soundwire/bus.h -@@ -5,7 +5,7 @@ - #define __SDW_BUS_H - - #define DEFAULT_BANK_SWITCH_TIMEOUT 3000 --#define DEFAULT_PROBE_TIMEOUT 2000 -+#define DEFAULT_PROBE_TIMEOUT 10000 - - u64 sdw_dmi_override_adr(struct sdw_bus *bus, u64 addr); diff --git a/0104-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch b/0103-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch index db3f5d3f11fb..db3f5d3f11fb 100644 --- a/0104-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch +++ b/0103-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch diff --git a/0105-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch b/0104-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch index ae01710bd9a6..ae01710bd9a6 100644 --- a/0105-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch +++ b/0104-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch diff --git a/0105-soundwire_intel-use_pm_runtime_resume_on_component_probe.patch b/0105-soundwire_intel-use_pm_runtime_resume_on_component_probe.patch new file mode 100644 index 000000000000..d096bc6268aa --- /dev/null +++ b/0105-soundwire_intel-use_pm_runtime_resume_on_component_probe.patch @@ -0,0 +1,79 @@ +From 928a0c25a874a13d69d58ef68fede866259b039b Mon Sep 17 00:00:00 2001 +From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> +Date: Tue, 21 Jun 2022 17:56:40 -0500 +Subject: [PATCH] soundwire: intel: use pm_runtime_resume() on component probe +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +During the card registration, transactions on the SoundWire bus can be +initiated. If the ALSA card is registered after the bus suspends, +timeouts can be seen while reading/writing codec registers. This is +extremely easy to reproduce in driver bind/unbind tests. + +In an initial experiment, the ASoC soc-component.c code was modified +to initiate a pm_runtime resume on a component probe. The results +showed this was too invasive. Instead this patch suggests resuming the +SoundWire component only. + +Because of the parent-child hierarchy enforced by the pm_runtime +framework, it can be argued that the codec component probe should be +enough to resume all necessary devices, and indeed the same resume +will be applied to SoundWire codecs used on Intel platforms. + +Calling pm_runtime_resume() on both the Intel and codec sides has the +benefit of resuming the bus without assuming any order during the card +registration. The first component on a dailink to be probed will +resume the bus. In addition, if a codec driver did not implement this +transition, the Intel component would still resume the bus and avoid +timeouts on card registration. + +BugLink: https://github.com/thesofproject/linux/issues/3651 +Reviewed-by: Rander Wang <rander.wang@intel.com> +Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> +Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> +Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> +Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> +Link: https://lore.kernel.org/r/20220621225641.221170-4-pierre-louis.bossart@linux.intel.com +Signed-off-by: Vinod Koul <vkoul@kernel.org> +--- + drivers/soundwire/intel.c | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/drivers/soundwire/intel.c b/drivers/soundwire/intel.c +index 505c5ef061e3f5..95ce292994ccb6 100644 +--- a/drivers/soundwire/intel.c ++++ b/drivers/soundwire/intel.c +@@ -1043,6 +1043,23 @@ static int intel_trigger(struct snd_pcm_substream *substream, int cmd, struct sn + return ret; + } + ++static int intel_component_probe(struct snd_soc_component *component) ++{ ++ int ret; ++ ++ /* ++ * make sure the device is pm_runtime_active before initiating ++ * bus transactions during the card registration. ++ * We use pm_runtime_resume() here, without taking a reference ++ * and releasing it immediately. ++ */ ++ ret = pm_runtime_resume(component->dev); ++ if (ret < 0 && ret != -EACCES) ++ return ret; ++ ++ return 0; ++} ++ + static int intel_component_dais_suspend(struct snd_soc_component *component) + { + struct snd_soc_dai *dai; +@@ -1098,6 +1115,7 @@ static const struct snd_soc_dai_ops intel_pcm_dai_ops = { + + static const struct snd_soc_component_driver dai_component = { + .name = "soundwire", ++ .probe = intel_component_probe, + .suspend = intel_component_dais_suspend + }; + + diff --git a/0303-revert-fbcon-remove-soft-scrollback-code.patch b/0303-revert-fbcon-remove-soft-scrollback-code.patch index 40f2efd0a6f8..eebf8182f21e 100644 --- a/0303-revert-fbcon-remove-soft-scrollback-code.patch +++ b/0303-revert-fbcon-remove-soft-scrollback-code.patch @@ -293,9 +293,9 @@ count = vc->vc_rows; + if (softback_top) + fbcon_softback_note(vc, t, count); - if (logo_shown >= 0) - goto redraw_up; switch (fb_scrollmode(p)) { + case SCROLL_MOVE: + fbcon_redraw_blit(vc, info, p, t, b - t - count, @@ -2078,6 +2266,14 @@ static int fbcon_switch(struct vc_data * info = fbcon_info_from_console(vc->vc_num); ops = info->fbcon_par; @@ -12,7 +12,7 @@ pkgbase=linux-acs-manjaro pkgname=('linux-acs-manjaro' 'linux-acs-manjaro-headers') _kernelname=-ACS-MANJARO _basekernel=5.19 -pkgver=5.19.1 +pkgver=5.19.2 pkgrel=1 arch=('x86_64') url="https://www.kernel.org/" @@ -24,10 +24,10 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x 'config' # ARCH Patches '0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch' - '0102-soundwire_Raise_DEFAULT_PROBE_TIMEOUT_to_10000_ms.patch' - '0103-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch' - '0104-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch' - '0105-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch' + '0102-drm_i915_psr_Use_full_update_In_case_of_area_calculation_fails.patch' + '0103-drm_i915_Ensure_damage_clip_area_is_within_pipe_area.patch' + '0104-mm_vmscan_fix_extreme_overreclaim_and_swap_floods.patch' + '0105-soundwire_intel-use_pm_runtime_resume_on_component_probe.patch' # MANJARO Patches # Bootsplash @@ -50,16 +50,16 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x # ACS override patch '0999-acs.gitpatch') sha256sums=('ff240c579b9ee1affc318917de07394fc1c3bb49dac25ec1287370c2e15005a8' - 'e3b9167a3286441f843220bc3339f7bafc256ec4e7b5a080badca6ce8b6c7926' - '826f50bdd86393897014c7da0f71970a05814b22a1f7b1a89fc9f783db707579' + 'f21999b35f7e2a4ce1e8dd86c3a21d1199532b7aa48526c5599b8c6e7a14aa47' + '5eb7c73534ee30d1dfc89fd9bf99e3049cebd0785e0cc88d442d9476c98ef0c5' '05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467' - '02b035fa598f9e281b9b5b645809d1bcacfa189c733dc291b4305c77cde52960' 'c0a9c427b55bd1c13ccebbb503926c4ce30823fcec6d1a949fec981a4ec3a367' 'b8701a6316fb286b44adb703528462303f361d9c7af9667fb19553c4ac90816c' '2c2c72e5f72cf306d38f91869619c6f808b5f694341eeba398de1b0919bf755b' + 'e96f2ac9e9f880451875a3aecbc10268ee8268494a8c9dce49291426d7896253' '2b11905b63b05b25807dd64757c779da74dd4c37e36d3f7a46485b1ee5a9d326' '94a8538251ad148f1025cc3de446ce64f73dc32b01815426fb159c722e8fa5bc' - '85d39aa2c229081a329ca93ee2e353d1538730389c978a8539f8f4923b274b49' + '2e8a9c21fbd0f50cc450df7a2823ad670d0b3c2ffa0f613a729cb2caaf02cb9f' '57ce3e0ba6bf400d36358a9d30589905f6e51bc037d7165f5a2658b6bdc86793' 'a26b3abaec1cd5731bc8431fecb8b3eb0ba47c1992e614643320df14ff859556' '8c1c880f2caa9c7ae43281a35410203887ea8eae750fe8d360d0c8bf80fcc6e0' @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.19.1-3 Kernel Configuration +# Linux/x86 5.19.2-1 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.1 20220730" CONFIG_CC_IS_GCC=y @@ -763,6 +763,7 @@ CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y CONFIG_HAVE_NMI=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_GENERIC_SMP_IDLE_THREAD=y @@ -904,7 +905,6 @@ CONFIG_MODULE_SIG_HASH="sha512" # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS_XZ is not set CONFIG_MODULE_COMPRESS_ZSTD=y -# CONFIG_MODULE_DECOMPRESS is not set CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS=y CONFIG_MODPROBE_PATH="/sbin/modprobe" CONFIG_MODULES_TREE_LOOKUP=y @@ -8492,6 +8492,7 @@ CONFIG_NITRO_ENCLAVES=m CONFIG_ACRN_HSM=m CONFIG_EFI_SECRET=m CONFIG_SEV_GUEST=m +CONFIG_VIRTIO_ANCHOR=y CONFIG_VIRTIO=y CONFIG_VIRTIO_PCI_LIB=m CONFIG_VIRTIO_PCI_LIB_LEGACY=m @@ -8572,6 +8573,7 @@ CONFIG_XEN_FRONT_PGDIR_SHBUF=m CONFIG_XEN_UNPOPULATED_ALLOC=y CONFIG_XEN_GRANT_DMA_OPS=y CONFIG_XEN_VIRTIO=y +# CONFIG_XEN_VIRTIO_FORCE_GRANT is not set # end of Xen driver support # CONFIG_GREYBUS is not set @@ -10435,8 +10437,7 @@ CONFIG_CRYPTO_CRC32=m CONFIG_CRYPTO_CRC32_PCLMUL=m CONFIG_CRYPTO_XXHASH=m CONFIG_CRYPTO_BLAKE2B=m -CONFIG_CRYPTO_BLAKE2S=m -CONFIG_CRYPTO_BLAKE2S_X86=m +CONFIG_CRYPTO_BLAKE2S_X86=y CONFIG_CRYPTO_CRCT10DIF=y CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_CRC64_ROCKSOFT=y @@ -11051,7 +11052,6 @@ CONFIG_IO_STRICT_DEVMEM=y # # x86 Debugging # -CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y CONFIG_EARLY_PRINTK_USB=y # CONFIG_X86_VERBOSE_BOOTUP is not set CONFIG_EARLY_PRINTK=y |