diff options
Diffstat (limited to 'libre/linux-libre')
-rw-r--r-- | libre/linux-libre/0002-Revert-drm-amd-display-reuse-current-context-instead.patch | 181 | ||||
-rw-r--r-- | libre/linux-libre/0002-iommu-amd-Don-t-initialise-remapping-irqdomain-if-IO.patch | 71 | ||||
-rw-r--r-- | libre/linux-libre/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch | 77 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 24 | ||||
-rw-r--r-- | libre/linux-libre/config.i686 | 18 | ||||
-rw-r--r-- | libre/linux-libre/config.x86_64 | 197 | ||||
-rw-r--r-- | libre/linux-libre/sphinx-workaround.patch | 19 |
7 files changed, 268 insertions, 319 deletions
diff --git a/libre/linux-libre/0002-Revert-drm-amd-display-reuse-current-context-instead.patch b/libre/linux-libre/0002-Revert-drm-amd-display-reuse-current-context-instead.patch deleted file mode 100644 index a1a37986a..000000000 --- a/libre/linux-libre/0002-Revert-drm-amd-display-reuse-current-context-instead.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 66128e7bf7011076ebe47fa5d4b18faad8244c5d Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Tue, 9 Feb 2021 17:21:58 -0500 -Subject: [PATCH 2/3] Revert "drm/amd/display: reuse current context instead of - recreating one" - -This reverts commit 8866a67ab86cc0812e65c04f1ef02bcc41e24d68. - -This breaks hotplug of HDMI on some systems, resulting in -a blank screen also causes failures for displays to light up -on other systems. - -Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1487 -Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1492 -Bug: https://bugzilla.kernel.org/show_bug.cgi?id=211649 -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> ---- - .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 23 +++++++++------- - drivers/gpu/drm/amd/display/dc/core/dc.c | 27 ++++++------------- - drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 ++- - 3 files changed, 23 insertions(+), 30 deletions(-) - -diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -index 961abf1cf040..e438baa1adc1 100644 ---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c -@@ -1934,7 +1934,7 @@ static void dm_gpureset_commit_state(struct dc_state *dc_state, - dc_commit_updates_for_stream( - dm->dc, bundle->surface_updates, - dc_state->stream_status->plane_count, -- dc_state->streams[k], &bundle->stream_update); -+ dc_state->streams[k], &bundle->stream_update, dc_state); - } - - cleanup: -@@ -1965,7 +1965,8 @@ static void dm_set_dpms_off(struct dc_link *link) - - stream_update.stream = stream_state; - dc_commit_updates_for_stream(stream_state->ctx->dc, NULL, 0, -- stream_state, &stream_update); -+ stream_state, &stream_update, -+ stream_state->ctx->dc->current_state); - mutex_unlock(&adev->dm.dc_lock); - } - -@@ -7548,7 +7549,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, - struct drm_crtc *pcrtc, - bool wait_for_vblank) - { -- int i; -+ uint32_t i; - uint64_t timestamp_ns; - struct drm_plane *plane; - struct drm_plane_state *old_plane_state, *new_plane_state; -@@ -7589,7 +7590,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, - amdgpu_dm_commit_cursors(state); - - /* update planes when needed */ -- for_each_oldnew_plane_in_state_reverse(state, plane, old_plane_state, new_plane_state, i) { -+ for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) { - struct drm_crtc *crtc = new_plane_state->crtc; - struct drm_crtc_state *new_crtc_state; - struct drm_framebuffer *fb = new_plane_state->fb; -@@ -7812,7 +7813,8 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, - bundle->surface_updates, - planes_count, - acrtc_state->stream, -- &bundle->stream_update); -+ &bundle->stream_update, -+ dc_state); - - /** - * Enable or disable the interrupts on the backend. -@@ -8148,13 +8150,13 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) - struct dm_connector_state *dm_new_con_state = to_dm_connector_state(new_con_state); - struct dm_connector_state *dm_old_con_state = to_dm_connector_state(old_con_state); - struct amdgpu_crtc *acrtc = to_amdgpu_crtc(dm_new_con_state->base.crtc); -- struct dc_surface_update surface_updates[MAX_SURFACES]; -+ struct dc_surface_update dummy_updates[MAX_SURFACES]; - struct dc_stream_update stream_update; - struct dc_info_packet hdr_packet; - struct dc_stream_status *status = NULL; - bool abm_changed, hdr_changed, scaling_changed; - -- memset(&surface_updates, 0, sizeof(surface_updates)); -+ memset(&dummy_updates, 0, sizeof(dummy_updates)); - memset(&stream_update, 0, sizeof(stream_update)); - - if (acrtc) { -@@ -8211,15 +8213,16 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) - * To fix this, DC should permit updating only stream properties. - */ - for (j = 0; j < status->plane_count; j++) -- surface_updates[j].surface = status->plane_states[j]; -+ dummy_updates[j].surface = status->plane_states[0]; - - - mutex_lock(&dm->dc_lock); - dc_commit_updates_for_stream(dm->dc, -- surface_updates, -+ dummy_updates, - status->plane_count, - dm_new_crtc_state->stream, -- &stream_update); -+ &stream_update, -+ dc_state); - mutex_unlock(&dm->dc_lock); - } - -diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c -index 6cf1a5a2a5ec..58eb0d69873a 100644 ---- a/drivers/gpu/drm/amd/display/dc/core/dc.c -+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c -@@ -2679,7 +2679,8 @@ void dc_commit_updates_for_stream(struct dc *dc, - struct dc_surface_update *srf_updates, - int surface_count, - struct dc_stream_state *stream, -- struct dc_stream_update *stream_update) -+ struct dc_stream_update *stream_update, -+ struct dc_state *state) - { - const struct dc_stream_status *stream_status; - enum surface_update_type update_type; -@@ -2698,12 +2699,6 @@ void dc_commit_updates_for_stream(struct dc *dc, - - - if (update_type >= UPDATE_TYPE_FULL) { -- struct dc_plane_state *new_planes[MAX_SURFACES]; -- -- memset(new_planes, 0, sizeof(new_planes)); -- -- for (i = 0; i < surface_count; i++) -- new_planes[i] = srf_updates[i].surface; - - /* initialize scratch memory for building context */ - context = dc_create_state(dc); -@@ -2712,21 +2707,15 @@ void dc_commit_updates_for_stream(struct dc *dc, - return; - } - -- dc_resource_state_copy_construct( -- dc->current_state, context); -+ dc_resource_state_copy_construct(state, context); - -- /*remove old surfaces from context */ -- if (!dc_rem_all_planes_for_stream(dc, stream, context)) { -- DC_ERROR("Failed to remove streams for new validate context!\n"); -- return; -- } -+ for (i = 0; i < dc->res_pool->pipe_count; i++) { -+ struct pipe_ctx *new_pipe = &context->res_ctx.pipe_ctx[i]; -+ struct pipe_ctx *old_pipe = &dc->current_state->res_ctx.pipe_ctx[i]; - -- /* add surface to context */ -- if (!dc_add_all_planes_for_stream(dc, stream, new_planes, surface_count, context)) { -- DC_ERROR("Failed to add streams for new validate context!\n"); -- return; -+ if (new_pipe->plane_state && new_pipe->plane_state != old_pipe->plane_state) -+ new_pipe->plane_state->force_full_update = true; - } -- - } - - -diff --git a/drivers/gpu/drm/amd/display/dc/dc_stream.h b/drivers/gpu/drm/amd/display/dc/dc_stream.h -index e243c01b9672..b7910976b81a 100644 ---- a/drivers/gpu/drm/amd/display/dc/dc_stream.h -+++ b/drivers/gpu/drm/amd/display/dc/dc_stream.h -@@ -283,7 +283,8 @@ void dc_commit_updates_for_stream(struct dc *dc, - struct dc_surface_update *srf_updates, - int surface_count, - struct dc_stream_state *stream, -- struct dc_stream_update *stream_update); -+ struct dc_stream_update *stream_update, -+ struct dc_state *state); - /* - * Log the current stream state. - */ --- -2.30.1 - diff --git a/libre/linux-libre/0002-iommu-amd-Don-t-initialise-remapping-irqdomain-if-IO.patch b/libre/linux-libre/0002-iommu-amd-Don-t-initialise-remapping-irqdomain-if-IO.patch new file mode 100644 index 000000000..975223cc0 --- /dev/null +++ b/libre/linux-libre/0002-iommu-amd-Don-t-initialise-remapping-irqdomain-if-IO.patch @@ -0,0 +1,71 @@ +From a4010c3d6f43dec4bf0010cab87cb3d29b4c7087 Mon Sep 17 00:00:00 2001 +From: David Woodhouse <dwmw@amazon.co.uk> +Date: Mon, 15 Mar 2021 11:15:02 +0000 +Subject: [PATCH 2/2] iommu/amd: Don't initialise remapping irqdomain if IOMMU + is disabled + +When the IOMMU is disabled, the driver still enumerates and initialises +the hardware in order to turn it off. Because IRQ remapping setup is +done early, the irqdomain is set up opportunistically. + +In commit b34f10c2dc59 ("iommu/amd: Stop irq_remapping_select() matching +when remapping is disabled") I already make the irq_remapping_select() +function check the amd_iommu_irq_setup flag because that might get +cleared only after the irqdomain setup is done, when the IVRS is parsed. + +However, in the case where 'amd_iommu=off' is passed on the command line, +the IRQ remapping setup isn't done but the amd_iommu_irq_setup flag is +still set by the early IRQ remap init code. Stop it doing that, by +bailing out of amd_iommu_prepare() early when it's disabled. + +This avoids the crash in irq_remapping_select() as it dereferences the +NULL amd_iommu_rlookup_table[]: + +[ 0.243659] Switched APIC routing to physical x2apic. +[ 0.262206] BUG: kernel NULL pointer dereference, address: 0000000000000500 +[ 0.262927] #PF: supervisor read access in kernel mode +[ 0.263390] #PF: error_code(0x0000) - not-present page +[ 0.263844] PGD 0 P4D 0 +[ 0.264135] Oops: 0000 [#1] SMP PTI +[ 0.264460] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.12.0-rc3 #831 +[ 0.265069] Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-1.fc33 04/01/2014 +[ 0.265825] RIP: 0010:irq_remapping_select+0x57/0xb0 +[ 0.266327] Code: 4b 0c 48 3d 30 e0 a7 9e 75 0d eb 35 48 8b 00 48 3d 30 e0 a7 9e 74 2a 0f b6 50 10 39 d1 75 ed 0f b7 40 12 48 8b 15 69 e3 d2 01 <48> 8b 14 c2 48 85 d2 74 0e b8 01 00 00 00 48 3b aa 90 04 00 00 74 +[ 0.268412] RSP: 0000:ffffffff9e803db0 EFLAGS: 00010246 +[ 0.268919] RAX: 00000000000000a0 RBX: ffffffff9e803df8 RCX: 0000000000000000 +[ 0.269550] RDX: 0000000000000000 RSI: 0000000000000000 RDI: ffff98120112fe79 +[ 0.270245] RBP: ffff9812011c8218 R08: 0000000000000001 R09: 000000000000000a +[ 0.270922] R10: 000000000000000a R11: f000000000000000 R12: ffff9812011c8218 +[ 0.271549] R13: ffff98120181ed88 R14: 0000000000000000 R15: 0000000000000000 +[ 0.272221] FS: 0000000000000000(0000) GS:ffff98127dc00000(0000) knlGS:0000000000000000 +[ 0.272997] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 0.273508] CR2: 0000000000000500 CR3: 0000000030810000 CR4: 00000000000006b0 +[ 0.274178] Call Trace: +[ 0.274416] irq_find_matching_fwspec+0x41/0xc0 +[ 0.274812] mp_irqdomain_create+0x65/0x150 +[ 0.275251] setup_IO_APIC+0x70/0x811 + +Fixes: a1a785b57242 ("iommu/amd: Implement select() method on remapping irqdomain") +Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212017 +Signed-off-by: David Woodhouse <dwmw@amazon.co.uk> +--- + drivers/iommu/amd/init.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c +index 78339b0bb8e5..398909dab640 100644 +--- a/drivers/iommu/amd/init.c ++++ b/drivers/iommu/amd/init.c +@@ -2998,6 +2998,9 @@ int __init amd_iommu_prepare(void) + { + int ret; + ++ if (amd_iommu_disabled) ++ return -ENODEV; ++ + amd_iommu_irq_remap = true; + + ret = iommu_go_to_state(IOMMU_ACPI_FINISHED); +-- +2.31.1 + diff --git a/libre/linux-libre/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch b/libre/linux-libre/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch deleted file mode 100644 index ce37719ff..000000000 --- a/libre/linux-libre/0003-drm-amdgpu-fix-shutdown-with-s0ix.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 04ec031772dd6faf64506c739ce7073b0f91310b Mon Sep 17 00:00:00 2001 -From: Alex Deucher <alexander.deucher@amd.com> -Date: Thu, 18 Feb 2021 12:05:53 -0500 -Subject: [PATCH 3/3] drm/amdgpu: fix shutdown with s0ix - -For shutdown needs to be handled differently and s0ix. Add -a new flag to shutdown and use it to adjust behavior appropriately. - -Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1499 -Fixes: 628c36d7b238e2 ("drm/amdgpu: update amdgpu device suspend/resume sequence for s0i3 support") -Signed-off-by: Alex Deucher <alexander.deucher@amd.com> -Cc: Prike Liang <Prike.Liang@amd.com> ---- - drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + - drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 ++++-- - drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 ++ - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -index 5993dd0fdd8e..4ae244048d53 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h -@@ -1002,6 +1002,7 @@ struct amdgpu_device { - /* s3/s4 mask */ - bool in_suspend; - bool in_hibernate; -+ bool in_shutdown; - - atomic_t in_gpu_reset; - enum pp_mp1_state mp1_state; -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -index cab1ebaf6d62..d07ff05ad042 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c -@@ -2666,7 +2666,8 @@ static int amdgpu_device_ip_suspend_phase1(struct amdgpu_device *adev) - { - int i, r; - -- if (!amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) { -+ if (adev->in_shutdown || -+ !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) { - amdgpu_device_set_pg_state(adev, AMD_PG_STATE_UNGATE); - amdgpu_device_set_cg_state(adev, AMD_CG_STATE_UNGATE); - } -@@ -3726,7 +3727,8 @@ int amdgpu_device_suspend(struct drm_device *dev, bool fbcon) - - amdgpu_fence_driver_suspend(adev); - -- if (!amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) -+ if (adev->in_shutdown || -+ !amdgpu_acpi_is_s0ix_supported(adev) || amdgpu_in_reset(adev)) - r = amdgpu_device_ip_suspend_phase2(adev); - else - amdgpu_gfx_state_change_set(adev, sGpuChangeState_D3Entry); -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -index 7169fb5e3d9c..2aacb96cf320 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c -@@ -1259,6 +1259,7 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) - if (amdgpu_ras_intr_triggered()) - return; - -+ adev->in_shutdown = true; - /* if we are running in a VM, make sure the device - * torn down properly on reboot/shutdown. - * unfortunately we can't detect certain -@@ -1268,6 +1269,7 @@ amdgpu_pci_shutdown(struct pci_dev *pdev) - adev->mp1_state = PP_MP1_STATE_UNLOAD; - amdgpu_device_ip_suspend(adev); - adev->mp1_state = PP_MP1_STATE_NONE; -+ adev->in_shutdown = false; - } - - static int amdgpu_pmops_suspend(struct device *dev) --- -2.30.1 - diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 5d7c8a8ac..e8118a59c 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -14,11 +14,11 @@ _replacesoldkernels=() # '%' gets replaced with kernel suffix _replacesoldmodules=() # '%' gets replaced with kernel suffix pkgbase=linux-libre -pkgver=5.11.2 +pkgver=5.11.11 pkgrel=1 pkgdesc='Linux-libre' -rcnver=5.11 -rcnrel=armv7-x10 +rcnver=5.11.11 +rcnrel=armv7-x14 url='https://linux-libre.fsfla.org/' arch=(i686 x86_64 armv7h) license=(GPL2) @@ -46,9 +46,7 @@ source=( 0002-fix-Atmel-maXTouch-touchscreen-support.patch # Arch Linux patches 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch - 0002-Revert-drm-amd-display-reuse-current-context-instead.patch - 0003-drm-amdgpu-fix-shutdown-with-s0ix.patch - sphinx-workaround.patch # Sphinx 3.5 broke the build again + 0002-iommu-amd-Don-t-initialise-remapping-irqdomain-if-IO.patch ) source_i686=( # avoid using zstd compression in ultra mode (exhausts virtual memory) @@ -76,7 +74,7 @@ validpgpkeys=( ) sha512sums=('3a34006add9ea318b0c2863388925ba34d57d342535b00c9ebc61fbfc69ef206b64af21c35b101466508c4308b5da310743c8add74dd703e259612953104ae43' 'SKIP' - '64c5a9076b502d3da538e781f3819af24ddb90316c2d181037c0f77e5204ec555aa0464d58fbd0025ee6c4f1b28db33d38ddc8de0bc2a83be9190c900fdf6a2c' + 'b35fc1d243fa3fdfa2b50b8f01ccab297f958f497e58a104da18631fafe3923216f3f1e97b9c2bb9e719c8a7ae8cabe8198a1a82cb5e8e50488b64d7af4dc940' 'SKIP' '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3' 'SKIP' @@ -84,8 +82,8 @@ sha512sums=('3a34006add9ea318b0c2863388925ba34d57d342535b00c9ebc61fbfc69ef206b64 'SKIP' '267295aa0cea65684968420c68b32f1a66a22d018b9d2b2c1ef14267bcf4cb68aaf7099d073cbfefe6c25c8608bdcbbd45f7ac8893fdcecbf1e621abdfe9ecc1' 'SKIP' - '621284c7afe40d118ceb7595ae936527899547c4579aaa06a340db37569c3b0f3c5768e9feb285d3b3acbda28d4957aa3568f2fe698bc477c3d0e00227bb7278' - '3700586f61e511deb7247ca915ea13d83321b2143335019f48385363383e8a99b4ebef87ed961b5bf954a416a2b18b09744a5b6cc97503d6d663618f31951570' + '8a617e10ca40401d89e5a1c78b0936a47d340d56c438d04499df626743799ed2835c2ebb246905c2b5b8842d9622157f80b93f3b0f97575334c81ce68882fa2b' + 'f3b148250fd8a393c6998c50331da811bc56127cce7cd13c887e60ad8327d0c991022b09c0e02743bd9086ad200c4957c7de5699bbeb7dfb042f603e4776e0d4' '51e8b4da770067e8257d292622d865cb16ac57fdfd8967bdfb74efec197dae9eab958e5637a728640ae60885bdde41c06c8076227a4f83db0b752215f91f3a87' '53103bf55b957b657039510527df0df01279dec59cda115a4d6454e4135025d4546167fa30bdc99107f232561c1e096d8328609ab5a876cf7017176f92ad3e0b' '167bc73c6c1c63931806238905dc44c7d87c5a5c0f6293159f2133dfe717fb44081018d810675716d1605ec7dff5e8333b87b19e09e2de21d0448e447437873b' @@ -94,11 +92,9 @@ sha512sums=('3a34006add9ea318b0c2863388925ba34d57d342535b00c9ebc61fbfc69ef206b64 '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af' 'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168' '748d98aef69e93959eab6a7f20a7972aff50c577a079bba807b10fe9b3b98799b47215d76797360d336ba4c3c656d7eafe3e81f2a59a2b6888d1884071db6e95' - '798b96e22ae79a62516e38194f4a377c8bed22c6fbf9f33fcdf205136bf1e5429c01a803c71f8eb412df2a5637eb6266fd4677618d64f64e9b53725371f574c6' - '6e0cdf8ae337245cb4df53496649905d4900dc0401b5fa7ebea70a46ed88f2f5759a1bfe571207975e1d92c734babdb8b3505cd432731d0713ce1339b6df71d4' - '93c03382b6678ce5e94a5d06e6737965629d7dc49d16e968d225e664d88f07a12abe0e04908f1cdaa75ff1cde88783cae9f0794d1075bc65bc7baeff392e0ae2') + 'da919328f8f7efd2c177a68ff864fdf1a76d777c142af4c90d3efc4a8419599e3479f8e0de0e8282599b9030c33a9e3b46548005d36c058ab08b51c03732bb45') sha512sums_i686=('3a346ff5e0fdefafd28bc3dd0e4b6cd68e3f0014e59d1611d99f2edb8d074fd32649eeb0894a7e340e4f907b5cfc0e08e0753e0427a68dc113bb22835a892968') -sha512sums_armv7h=('baf54a93781f5df415be494ebb10d2ef29da33807cf7bdf5ad84746c90b13f04c95a9d330faf1f11ef41b6fb1e09628455be686c3c9e6ea9ac028ee45f3b81bb' +sha512sums_armv7h=('a4aa00ca3f03d524d3fb6379116c4e4e7908e7c30f6347f55be256c44d806d8db5f04c96369d5a725e45b7390e9fde842f388cdc5d5699d80ec5d1519f7367f4' 'SKIP' 'b832287560c841e292d71be01c65045ee2ee6ac41f05176ebe349d730b5b79887bb629d176d5fd16a3e7ebb5e51de30b6d6fad6fad53821063188248bd1415bb' 'f997a0afaaffb66533168f5d9cc341871eb54feb88d6ce578e816add82596bedf4dc242510e171e1e5b56464cf701384a32ed916176ea0c2db24209d754d3c58' @@ -194,7 +190,7 @@ _package() { provides=(VIRTUALBOX-GUEST-MODULES WIREGUARD-MODULE) replaces=(virtualbox-guest-modules-arch wireguard-arch) provides+=("${_replacesarchkernel[@]/%/=$pkgver}" "LINUX-ABI_VERSION=$pkgver") - conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") + conflicts+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") replaces+=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") cd $_srcname diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686 index 1ddf569a5..c82f9b2d6 100644 --- a/libre/linux-libre/config.i686 +++ b/libre/linux-libre/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.11.0-gnu Kernel Configuration +# Linux/x86 5.11.9-gnu Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -247,6 +247,7 @@ CONFIG_BPF_SYSCALL=y # CONFIG_BPF_PRELOAD is not set # CONFIG_USERFAULTFD is not set CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -689,7 +690,7 @@ CONFIG_GOOGLE_VPD=m # CONFIG_EFI_VARS is not set CONFIG_EFI_ESRT=y CONFIG_EFI_VARS_PSTORE=y -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_RUNTIME_WRAPPERS=y @@ -2050,7 +2051,6 @@ CONFIG_PCIEASPM_DEFAULT=y CONFIG_PCIE_PME=y CONFIG_PCIE_DPC=y CONFIG_PCIE_PTM=y -# CONFIG_PCIE_BW is not set CONFIG_PCIE_EDR=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y @@ -4176,7 +4176,7 @@ CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_I2C=y CONFIG_SERIAL_SC16IS7XX_SPI=y # CONFIG_SERIAL_TIMBERDALE is not set -CONFIG_SERIAL_BCM63XX=m +# CONFIG_SERIAL_BCM63XX is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 @@ -6774,7 +6774,7 @@ CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_COMPONENT=y CONFIG_SND_HDA_I915=y CONFIG_SND_HDA_EXT_CORE=m -CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_PREALLOC_SIZE=0 CONFIG_SND_INTEL_NHLT=y CONFIG_SND_INTEL_DSP_CONFIG=m CONFIG_SND_SPI=y @@ -6825,7 +6825,7 @@ CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m # CONFIG_SND_SOC_AMD_RENOIR is not set CONFIG_SND_ATMEL_SOC=m # CONFIG_SND_SOC_MIKROE_PROTO is not set -CONFIG_SND_BCM63XX_I2S_WHISTLER=m +# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set CONFIG_SND_DESIGNWARE_I2S=m CONFIG_SND_DESIGNWARE_PCM=y @@ -6872,7 +6872,7 @@ CONFIG_SND_SOC_INTEL_CML_H=m CONFIG_SND_SOC_INTEL_CML_LP=m CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m -# CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_ACPI_INTEL_MATCH=m CONFIG_SND_SOC_INTEL_MACH=y @@ -9666,8 +9666,8 @@ CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/bin/init" # CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_HASH=y diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64 index e74067b9d..4d9b088c9 100644 --- a/libre/linux-libre/config.x86_64 +++ b/libre/linux-libre/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.11.0-gnu Kernel Configuration +# Linux/x86 5.11.11-gnu Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0" CONFIG_CC_IS_GCC=y @@ -262,6 +262,7 @@ CONFIG_BPF_PRELOAD=y CONFIG_BPF_PRELOAD_UMD=m CONFIG_USERFAULTFD=y CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_KCMP=y CONFIG_RSEQ=y # CONFIG_EMBEDDED is not set CONFIG_HAVE_PERF_EVENTS=y @@ -702,7 +703,7 @@ CONFIG_GOOGLE_VPD=m # CONFIG_EFI_VARS is not set CONFIG_EFI_ESRT=y CONFIG_EFI_VARS_PSTORE=y -# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set +CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y CONFIG_EFI_RUNTIME_MAP=y # CONFIG_EFI_FAKE_MEMMAP is not set CONFIG_EFI_SOFT_RESERVE=y @@ -2093,7 +2094,6 @@ CONFIG_PCIEASPM_DEFAULT=y CONFIG_PCIE_PME=y CONFIG_PCIE_DPC=y CONFIG_PCIE_PTM=y -# CONFIG_PCIE_BW is not set CONFIG_PCIE_EDR=y CONFIG_PCI_MSI=y CONFIG_PCI_MSI_IRQ_DOMAIN=y @@ -4159,7 +4159,7 @@ CONFIG_SERIAL_SC16IS7XX_CORE=m CONFIG_SERIAL_SC16IS7XX=m CONFIG_SERIAL_SC16IS7XX_I2C=y CONFIG_SERIAL_SC16IS7XX_SPI=y -CONFIG_SERIAL_BCM63XX=m +# CONFIG_SERIAL_BCM63XX is not set CONFIG_SERIAL_ALTERA_JTAGUART=m CONFIG_SERIAL_ALTERA_UART=m CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4 @@ -6509,7 +6509,7 @@ CONFIG_SND_HDA_DSP_LOADER=y CONFIG_SND_HDA_COMPONENT=y CONFIG_SND_HDA_I915=y CONFIG_SND_HDA_EXT_CORE=m -CONFIG_SND_HDA_PREALLOC_SIZE=4096 +CONFIG_SND_HDA_PREALLOC_SIZE=0 CONFIG_SND_INTEL_NHLT=y CONFIG_SND_INTEL_DSP_CONFIG=m CONFIG_SND_SPI=y @@ -6560,7 +6560,7 @@ CONFIG_SND_SOC_AMD_RV_RT5682_MACH=m CONFIG_SND_SOC_AMD_RENOIR=m CONFIG_SND_SOC_AMD_RENOIR_MACH=m CONFIG_SND_ATMEL_SOC=m -CONFIG_SND_BCM63XX_I2S_WHISTLER=m +# CONFIG_SND_BCM63XX_I2S_WHISTLER is not set CONFIG_SND_DESIGNWARE_I2S=m CONFIG_SND_DESIGNWARE_PCM=y @@ -6607,7 +6607,7 @@ CONFIG_SND_SOC_INTEL_CML_H=m CONFIG_SND_SOC_INTEL_CML_LP=m CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m -# CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set +CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_ACPI_INTEL_MATCH=m CONFIG_SND_SOC_INTEL_MACH=y @@ -7183,13 +7183,59 @@ CONFIG_USBIP_VHCI_HCD=m CONFIG_USBIP_VHCI_HC_PORTS=8 CONFIG_USBIP_VHCI_NR_HCS=1 CONFIG_USBIP_HOST=m +CONFIG_USBIP_VUDC=m # CONFIG_USBIP_DEBUG is not set -# CONFIG_USB_CDNS3 is not set -# CONFIG_USB_MUSB_HDRC is not set -# CONFIG_USB_DWC3 is not set -# CONFIG_USB_DWC2 is not set -# CONFIG_USB_CHIPIDEA is not set -# CONFIG_USB_ISP1760 is not set +CONFIG_USB_CDNS3=m +CONFIG_USB_CDNS3_GADGET=y +CONFIG_USB_CDNS3_HOST=y +CONFIG_USB_CDNS3_PCI_WRAP=m +CONFIG_USB_MUSB_HDRC=m +# CONFIG_USB_MUSB_HOST is not set +# CONFIG_USB_MUSB_GADGET is not set +CONFIG_USB_MUSB_DUAL_ROLE=y + +# +# Platform Glue Layer +# + +# +# MUSB DMA mode +# +# CONFIG_MUSB_PIO_ONLY is not set +CONFIG_USB_DWC3=m +CONFIG_USB_DWC3_ULPI=y +# CONFIG_USB_DWC3_HOST is not set +# CONFIG_USB_DWC3_GADGET is not set +CONFIG_USB_DWC3_DUAL_ROLE=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_PCI=m +CONFIG_USB_DWC3_HAPS=m +CONFIG_USB_DWC2=m +# CONFIG_USB_DWC2_HOST is not set + +# +# Gadget/Dual-role mode requires USB Gadget support to be enabled +# +# CONFIG_USB_DWC2_PERIPHERAL is not set +CONFIG_USB_DWC2_DUAL_ROLE=y +CONFIG_USB_DWC2_PCI=m +# CONFIG_USB_DWC2_DEBUG is not set +# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set +CONFIG_USB_CHIPIDEA=m +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_CHIPIDEA_PCI=m +CONFIG_USB_CHIPIDEA_MSM=m +CONFIG_USB_CHIPIDEA_GENERIC=m +CONFIG_USB_ISP1760=m +CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1761_UDC=y +# CONFIG_USB_ISP1760_HOST_ROLE is not set +# CONFIG_USB_ISP1760_GADGET_ROLE is not set +CONFIG_USB_ISP1760_DUAL_ROLE=y # # USB port drivers @@ -7298,7 +7344,120 @@ CONFIG_TAHVO_USB=m CONFIG_USB_ISP1301=m # end of USB Physical Layer drivers -# CONFIG_USB_GADGET is not set +CONFIG_USB_GADGET=m +# CONFIG_USB_GADGET_DEBUG is not set +# CONFIG_USB_GADGET_DEBUG_FILES is not set +# CONFIG_USB_GADGET_DEBUG_FS is not set +CONFIG_USB_GADGET_VBUS_DRAW=2 +CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2 +CONFIG_U_SERIAL_CONSOLE=y + +# +# USB Peripheral Controller +# +CONFIG_USB_FOTG210_UDC=m +CONFIG_USB_GR_UDC=m +CONFIG_USB_R8A66597=m +CONFIG_USB_PXA27X=m +CONFIG_USB_MV_UDC=m +CONFIG_USB_MV_U3D=m +CONFIG_USB_SNP_CORE=m +CONFIG_USB_M66592=m +CONFIG_USB_BDC_UDC=m + +# +# Platform Support +# +CONFIG_USB_AMD5536UDC=m +CONFIG_USB_NET2272=m +# CONFIG_USB_NET2272_DMA is not set +CONFIG_USB_NET2280=m +CONFIG_USB_GOKU=m +CONFIG_USB_EG20T=m +CONFIG_USB_MAX3420_UDC=m +CONFIG_USB_DUMMY_HCD=m +# end of USB Peripheral Controller + +CONFIG_USB_LIBCOMPOSITE=m +CONFIG_USB_F_ACM=m +CONFIG_USB_F_SS_LB=m +CONFIG_USB_U_SERIAL=m +CONFIG_USB_U_ETHER=m +CONFIG_USB_U_AUDIO=m +CONFIG_USB_F_SERIAL=m +CONFIG_USB_F_OBEX=m +CONFIG_USB_F_NCM=m +CONFIG_USB_F_ECM=m +CONFIG_USB_F_PHONET=m +CONFIG_USB_F_EEM=m +CONFIG_USB_F_SUBSET=m +CONFIG_USB_F_RNDIS=m +CONFIG_USB_F_MASS_STORAGE=m +CONFIG_USB_F_FS=m +CONFIG_USB_F_UAC1=m +CONFIG_USB_F_UAC1_LEGACY=m +CONFIG_USB_F_UAC2=m +CONFIG_USB_F_UVC=m +CONFIG_USB_F_MIDI=m +CONFIG_USB_F_HID=m +CONFIG_USB_F_PRINTER=m +CONFIG_USB_F_TCM=m +CONFIG_USB_CONFIGFS=m +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_PHONET=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +CONFIG_USB_CONFIGFS_F_TCM=y + +# +# USB Gadget precomposed configurations +# +CONFIG_USB_ZERO=m +CONFIG_USB_AUDIO=m +# CONFIG_GADGET_UAC1 is not set +CONFIG_USB_ETH=m +CONFIG_USB_ETH_RNDIS=y +CONFIG_USB_ETH_EEM=y +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=m +CONFIG_USB_FUNCTIONFS=m +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_GADGET_TARGET=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_MIDI_GADGET=m +CONFIG_USB_G_PRINTER=m +CONFIG_USB_CDC_COMPOSITE=m +CONFIG_USB_G_NOKIA=m +CONFIG_USB_G_ACM_MS=m +CONFIG_USB_G_MULTI=m +CONFIG_USB_G_MULTI_RNDIS=y +CONFIG_USB_G_MULTI_CDC=y +CONFIG_USB_G_HID=m +CONFIG_USB_G_DBGP=m +# CONFIG_USB_G_DBGP_PRINTK is not set +CONFIG_USB_G_DBGP_SERIAL=y +CONFIG_USB_G_WEBCAM=m +CONFIG_USB_RAW_GADGET=m +# end of USB Gadget precomposed configurations + CONFIG_TYPEC=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_TCPCI=m @@ -7830,7 +7989,7 @@ CONFIG_HYPERV_BALLOON=m # CONFIG_XEN_BALLOON=y CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y -CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512 +CONFIG_XEN_MEMORY_HOTPLUG_LIMIT=512 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y CONFIG_XEN_DEV_EVTCHN=m CONFIG_XEN_BACKEND=y @@ -8385,8 +8544,7 @@ CONFIG_AD7887=m CONFIG_AD7923=m CONFIG_AD7949=m CONFIG_AD799X=m -CONFIG_AD9467=m -CONFIG_ADI_AXI_ADC=m +# CONFIG_AD9467 is not set CONFIG_AXP20X_ADC=m CONFIG_AXP288_ADC=m CONFIG_CC10001_ADC=m @@ -8885,6 +9043,7 @@ CONFIG_PHY_PXA_28NM_USB2=m CONFIG_PHY_CPCAP_USB=m CONFIG_PHY_QCOM_USB_HS=m CONFIG_PHY_QCOM_USB_HSIC=m +CONFIG_PHY_SAMSUNG_USB2=m CONFIG_PHY_TUSB1210=m CONFIG_PHY_INTEL_LGM_EMMC=m # end of PHY Subsystem @@ -9439,8 +9598,8 @@ CONFIG_SECURITY_TOMOYO=y CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048 CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024 # CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set -CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init" -CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init" +CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/usr/bin/tomoyo-init" +CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/usr/bin/init" # CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_HASH=y diff --git a/libre/linux-libre/sphinx-workaround.patch b/libre/linux-libre/sphinx-workaround.patch deleted file mode 100644 index a6e2c4900..000000000 --- a/libre/linux-libre/sphinx-workaround.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git i/Documentation/conf.py w/Documentation/conf.py -index 6a767294887e..d1d145759fed 100644 ---- i/Documentation/conf.py -+++ w/Documentation/conf.py -@@ -267,11 +267,9 @@ except ImportError: - - html_static_path = ['sphinx-static'] - --html_context = { -- 'css_files': [ -- '_static/theme_overrides.css', -- ], --} -+html_css_files = [ -+ '_static/theme_overrides.css', -+] - - # Add any extra paths that contain custom files (such as robots.txt or - # .htaccess) here, relative to this directory. These files are copied |