From: Sasha Levin Date: Mon, 21 Oct 2019 03:47:27 +0000 (-0400) Subject: fixes for 4.19 X-Git-Tag: v4.4.198~50^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=377c47b271f91cb9c601b380c64eed2d05117993;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.19 Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/libata-ahci-fix-pcs-quirk-application.patch b/queue-4.19/libata-ahci-fix-pcs-quirk-application.patch new file mode 100644 index 00000000000..835087451ce --- /dev/null +++ b/queue-4.19/libata-ahci-fix-pcs-quirk-application.patch @@ -0,0 +1,45 @@ +From 2902e5e03448f3fba81f23d75d0d72bde4cbe11e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 15 Oct 2019 12:54:17 -0700 +Subject: libata/ahci: Fix PCS quirk application + +From: Dan Williams + +[ Upstream commit 09d6ac8dc51a033ae0043c1fe40b4d02563c2496 ] + +Commit c312ef176399 "libata/ahci: Drop PCS quirk for Denverton and +beyond" got the polarity wrong on the check for which board-ids should +have the quirk applied. The board type board_ahci_pcs7 is defined at the +end of the list such that "pcs7" boards can be special cased in the +future if they need the quirk. All prior Intel board ids "< +board_ahci_pcs7" should proceed with applying the quirk. + +Reported-by: Andreas Friedrich +Reported-by: Stephen Douthit +Fixes: c312ef176399 ("libata/ahci: Drop PCS quirk for Denverton and beyond") +Cc: +Signed-off-by: Dan Williams +Signed-off-by: Jens Axboe +Signed-off-by: Sasha Levin +--- + drivers/ata/ahci.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c +index 5d110b1362e74..fa1c5a4429579 100644 +--- a/drivers/ata/ahci.c ++++ b/drivers/ata/ahci.c +@@ -1633,7 +1633,9 @@ static void ahci_intel_pcs_quirk(struct pci_dev *pdev, struct ahci_host_priv *hp + */ + if (!id || id->vendor != PCI_VENDOR_ID_INTEL) + return; +- if (((enum board_ids) id->driver_data) < board_ahci_pcs7) ++ ++ /* Skip applying the quirk on Denverton and beyond */ ++ if (((enum board_ids) id->driver_data) >= board_ahci_pcs7) + return; + + /* +-- +2.20.1 + diff --git a/queue-4.19/md-raid0-fix-warning-message-for-parameter-default_l.patch b/queue-4.19/md-raid0-fix-warning-message-for-parameter-default_l.patch new file mode 100644 index 00000000000..876fb398c99 --- /dev/null +++ b/queue-4.19/md-raid0-fix-warning-message-for-parameter-default_l.patch @@ -0,0 +1,36 @@ +From f809201cf029bcad1f26df138b2c22ced075a241 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Mon, 14 Oct 2019 16:58:35 -0700 +Subject: md/raid0: fix warning message for parameter default_layout + +From: Song Liu + +[ Upstream commit 3874d73e06c9b9dc15de0b7382fc223986d75571 ] + +The message should match the parameter, i.e. raid0.default_layout. + +Fixes: c84a1372df92 ("md/raid0: avoid RAID0 data corruption due to layout confusion.") +Cc: NeilBrown +Reported-by: Ivan Topolsky +Signed-off-by: Song Liu +Signed-off-by: Sasha Levin +--- + drivers/md/raid0.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c +index 43fa7dbf844b0..3cafbfd655f5d 100644 +--- a/drivers/md/raid0.c ++++ b/drivers/md/raid0.c +@@ -158,7 +158,7 @@ static int create_strip_zones(struct mddev *mddev, struct r0conf **private_conf) + } else { + pr_err("md/raid0:%s: cannot assemble multi-zone RAID0 with default_layout setting\n", + mdname(mddev)); +- pr_err("md/raid0: please set raid.default_layout to 1 or 2\n"); ++ pr_err("md/raid0: please set raid0.default_layout to 1 or 2\n"); + err = -ENOTSUPP; + goto abort; + } +-- +2.20.1 + diff --git a/queue-4.19/revert-drm-radeon-fix-eeh-during-kexec.patch b/queue-4.19/revert-drm-radeon-fix-eeh-during-kexec.patch new file mode 100644 index 00000000000..26718a55c20 --- /dev/null +++ b/queue-4.19/revert-drm-radeon-fix-eeh-during-kexec.patch @@ -0,0 +1,49 @@ +From 974f4270471669f0905bbaf6cc8faafff43b078d Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 9 Oct 2019 13:12:37 -0500 +Subject: Revert "drm/radeon: Fix EEH during kexec" + +From: Alex Deucher + +[ Upstream commit 8d13c187c42e110625d60094668a8f778c092879 ] + +This reverts commit 6f7fe9a93e6c09bf988c5059403f5f88e17e21e6. + +This breaks some boards. Maybe just enable this on PPC for +now? + +Bug: https://bugzilla.kernel.org/show_bug.cgi?id=205147 +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/radeon/radeon_drv.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c +index d83310751a8e4..c26f09b47ecb2 100644 +--- a/drivers/gpu/drm/radeon/radeon_drv.c ++++ b/drivers/gpu/drm/radeon/radeon_drv.c +@@ -395,19 +395,11 @@ radeon_pci_remove(struct pci_dev *pdev) + static void + radeon_pci_shutdown(struct pci_dev *pdev) + { +- struct drm_device *ddev = pci_get_drvdata(pdev); +- + /* if we are running in a VM, make sure the device + * torn down properly on reboot/shutdown + */ + if (radeon_device_is_virtual()) + radeon_pci_remove(pdev); +- +- /* Some adapters need to be suspended before a +- * shutdown occurs in order to prevent an error +- * during kexec. +- */ +- radeon_suspend_kms(ddev, true, true, false); + } + + static int radeon_pmops_suspend(struct device *dev) +-- +2.20.1 + diff --git a/queue-4.19/series b/queue-4.19/series index bac25ae1cc9..819021d6dea 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -18,3 +18,6 @@ net-hisilicon-fix-usage-of-uninitialized-variable-in.patch lib-textsearch-fix-escapes-in-example-code.patch r8152-set-macpassthru-in-reset_resume-callback.patch namespace-fix-namespace.pl-script-to-support-relativ.patch +libata-ahci-fix-pcs-quirk-application.patch +md-raid0-fix-warning-message-for-parameter-default_l.patch +revert-drm-radeon-fix-eeh-during-kexec.patch