From: Greg Kroah-Hartman Date: Mon, 16 Mar 2020 11:00:23 +0000 (+0100) Subject: 4.4-stable patches X-Git-Tag: v4.19.111~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c964e523856f9acb2f3102e335dce171f2a6adf;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: drm-amd-display-remove-duplicated-assignment-to-grph_obj_type.patch iommu-vt-d-quirk_ioat_snb_local_iommu-replace-warn_taint-with-pr_warn-add_taint.patch --- diff --git a/queue-4.4/drm-amd-display-remove-duplicated-assignment-to-grph_obj_type.patch b/queue-4.4/drm-amd-display-remove-duplicated-assignment-to-grph_obj_type.patch new file mode 100644 index 00000000000..183a513e510 --- /dev/null +++ b/queue-4.4/drm-amd-display-remove-duplicated-assignment-to-grph_obj_type.patch @@ -0,0 +1,34 @@ +From d785476c608c621b345dd9396e8b21e90375cb0e Mon Sep 17 00:00:00 2001 +From: Colin Ian King +Date: Fri, 8 Nov 2019 14:45:27 +0000 +Subject: drm/amd/display: remove duplicated assignment to grph_obj_type + +From: Colin Ian King + +commit d785476c608c621b345dd9396e8b21e90375cb0e upstream. + +Variable grph_obj_type is being assigned twice, one of these is +redundant so remove it. + +Addresses-Coverity: ("Evaluation order violation") +Signed-off-by: Colin Ian King +Signed-off-by: Alex Deucher +Cc: +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +@@ -346,8 +346,7 @@ bool amdgpu_atombios_get_connector_info_ + router.ddc_valid = false; + router.cd_valid = false; + for (j = 0; j < ((le16_to_cpu(path->usSize) - 8) / 2); j++) { +- uint8_t grph_obj_type= +- grph_obj_type = ++ uint8_t grph_obj_type = + (le16_to_cpu(path->usGraphicObjIds[j]) & + OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT; + diff --git a/queue-4.4/iommu-vt-d-quirk_ioat_snb_local_iommu-replace-warn_taint-with-pr_warn-add_taint.patch b/queue-4.4/iommu-vt-d-quirk_ioat_snb_local_iommu-replace-warn_taint-with-pr_warn-add_taint.patch new file mode 100644 index 00000000000..65b989c9f6c --- /dev/null +++ b/queue-4.4/iommu-vt-d-quirk_ioat_snb_local_iommu-replace-warn_taint-with-pr_warn-add_taint.patch @@ -0,0 +1,53 @@ +From 81ee85d0462410de8eeeec1b9761941fd6ed8c7b Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Mon, 9 Mar 2020 19:25:10 +0100 +Subject: iommu/vt-d: quirk_ioat_snb_local_iommu: replace WARN_TAINT with pr_warn + add_taint + +From: Hans de Goede + +commit 81ee85d0462410de8eeeec1b9761941fd6ed8c7b upstream. + +Quoting from the comment describing the WARN functions in +include/asm-generic/bug.h: + + * WARN(), WARN_ON(), WARN_ON_ONCE, and so on can be used to report + * significant kernel issues that need prompt attention if they should ever + * appear at runtime. + * + * Do not use these macros when checking for invalid external inputs + +The (buggy) firmware tables which the dmar code was calling WARN_TAINT +for really are invalid external inputs. They are not under the kernel's +control and the issues in them cannot be fixed by a kernel update. +So logging a backtrace, which invites bug reports to be filed about this, +is not helpful. + +Fixes: 556ab45f9a77 ("ioat2: catch and recover from broken vtd configurations v6") +Signed-off-by: Hans de Goede +Acked-by: Lu Baolu +Link: https://lore.kernel.org/r/20200309182510.373875-1-hdegoede@redhat.com +BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=701847 +Signed-off-by: Joerg Roedel +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/iommu/intel-iommu.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/iommu/intel-iommu.c ++++ b/drivers/iommu/intel-iommu.c +@@ -3949,10 +3949,11 @@ static void quirk_ioat_snb_local_iommu(s + + /* we know that the this iommu should be at offset 0xa000 from vtbar */ + drhd = dmar_find_matched_drhd_unit(pdev); +- if (WARN_TAINT_ONCE(!drhd || drhd->reg_base_addr - vtbar != 0xa000, +- TAINT_FIRMWARE_WORKAROUND, +- "BIOS assigned incorrect VT-d unit for Intel(R) QuickData Technology device\n")) ++ if (!drhd || drhd->reg_base_addr - vtbar != 0xa000) { ++ pr_warn_once(FW_BUG "BIOS assigned incorrect VT-d unit for Intel(R) QuickData Technology device\n"); ++ add_taint(TAINT_FIRMWARE_WORKAROUND, LOCKDEP_STILL_OK); + pdev->dev.archdata.iommu = DUMMY_DEVICE_DOMAIN_INFO; ++ } + } + DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_IOAT_SNB, quirk_ioat_snb_local_iommu); + diff --git a/queue-4.4/series b/queue-4.4/series index 130c28935bc..4c8d85fae1e 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -19,3 +19,5 @@ net-fec-validate-the-new-settings-in-fec_enet_set_coalesce.patch slip-make-slhc_compress-more-robust-against-malicious-packets.patch bonding-alb-make-sure-arp-header-is-pulled-before-accessing-it.patch net-fq-add-missing-attribute-validation-for-orphan-mask.patch +iommu-vt-d-quirk_ioat_snb_local_iommu-replace-warn_taint-with-pr_warn-add_taint.patch +drm-amd-display-remove-duplicated-assignment-to-grph_obj_type.patch