From be9871ff2f95cf50a1234452cf9b6ce68a111533 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Sat, 4 Jan 2020 20:51:57 +0100 Subject: [PATCH] Refresh 0013-scsi-hisi_sas-Relocate-some-codes-to-avoid-an-unused.patch for context changes in 4.19.93. --- debian/changelog | 2 ++ ...si_sas-Relocate-some-codes-to-avoid-an-unused.patch | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a05eb1662..94a11c834 100644 --- a/debian/changelog +++ b/debian/changelog @@ -946,6 +946,8 @@ linux (4.19.93-1) UNRELEASED; urgency=medium * [rt] Update to 4.19.90-rt35 * [rt] Drop 0013-x86-ioapic-Don-t-let-setaffinity-unmask-threaded-EOI.patch * [rt] Drop 0245-Revert-arm64-preempt-Fix-big-endian-when-checking-pr.patch + * Refresh 0013-scsi-hisi_sas-Relocate-some-codes-to-avoid-an-unused.patch + for context changes in 4.19.93. -- Salvatore Bonaccorso Sat, 14 Dec 2019 22:00:16 +0100 diff --git a/debian/patches/bugfix/arm64/huawei-taishan/0013-scsi-hisi_sas-Relocate-some-codes-to-avoid-an-unused.patch b/debian/patches/bugfix/arm64/huawei-taishan/0013-scsi-hisi_sas-Relocate-some-codes-to-avoid-an-unused.patch index 911e2bf40..060fbcfb8 100644 --- a/debian/patches/bugfix/arm64/huawei-taishan/0013-scsi-hisi_sas-Relocate-some-codes-to-avoid-an-unused.patch +++ b/debian/patches/bugfix/arm64/huawei-taishan/0013-scsi-hisi_sas-Relocate-some-codes-to-avoid-an-unused.patch @@ -17,10 +17,8 @@ Signed-off-by: Martin K. Petersen drivers/scsi/hisi_sas/hisi_sas_main.c | 44 ++++++++++++++------------- 1 file changed, 23 insertions(+), 21 deletions(-) -Index: linux/drivers/scsi/hisi_sas/hisi_sas_main.c -=================================================================== ---- linux.orig/drivers/scsi/hisi_sas/hisi_sas_main.c -+++ linux/drivers/scsi/hisi_sas/hisi_sas_main.c +--- a/drivers/scsi/hisi_sas/hisi_sas_main.c ++++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -303,36 +303,19 @@ static int hisi_sas_task_prep(struct sas int *pass) { @@ -90,5 +88,5 @@ Index: linux/drivers/scsi/hisi_sas/hisi_sas_main.c + dev = hisi_hba->dev; + if (unlikely(test_bit(HISI_SAS_REJECT_CMD_BIT, &hisi_hba->flags))) { - if (in_softirq()) - return -EINVAL; + /* + * For IOs from upper layer, it may already disable preempt