From 83875a30510af6e58d8a76def87ee39f22f3152c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 10 Apr 2019 14:59:12 +0000 Subject: [PATCH 1/4] scst/include/backport.h: Backport irq_set_affinity_notifier() git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8177 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/include/backport.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/scst/include/backport.h b/scst/include/backport.h index 67ab63fcb..e05627e85 100644 --- a/scst/include/backport.h +++ b/scst/include/backport.h @@ -498,6 +498,20 @@ ssize_t kernel_write(struct file *file, const void *buf, size_t count, #endif #endif +/* */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && !defined(RHEL_MAJOR) +/* + * See also commit cd7eab44e994 ("genirq: Add IRQ affinity notifiers"; + * v2.6.39). + */ +struct irq_affinity_notify; +static inline int +irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify) +{ + return 0; +} +#endif + /* */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) || \ From 339d30b6bc341a0a269122e8c3a091d48487b6f6 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 10 Apr 2019 14:59:48 +0000 Subject: [PATCH 2/4] scripts/kernel-functions: Fix up ____ilog2_NaN() prototype git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8178 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/kernel-functions | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/kernel-functions b/scripts/kernel-functions index 016389820..e619739f8 100644 --- a/scripts/kernel-functions +++ b/scripts/kernel-functions @@ -411,6 +411,11 @@ index 141da26fda4b..343ec388ae2e 100644 EOF ;; esac + + # Use sed to patch the ____ilog2_NaN() prototype. + sed -i 's/__attribute__((const, noreturn))/__attribute__((noreturn))/' \ + include/linux/log2.h tools/include/linux/log2.h 2>/dev/null + # After patch-v4.14.1[12] has been applied, the execute bit has to be # set for sync-check.sh since patch can't do that. for f in "tools/objtool/sync-check.sh"; do From 2c9922245d6922d49d36bac93eef3508b1424331 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 10 Apr 2019 15:00:33 +0000 Subject: [PATCH 3/4] scripts/kernel-functions: Fix the code for retrieving kernel code from a git repo git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8179 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/kernel-functions | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scripts/kernel-functions b/scripts/kernel-functions index e619739f8..de2be73e7 100644 --- a/scripts/kernel-functions +++ b/scripts/kernel-functions @@ -114,6 +114,12 @@ function extract_kernel_tree { fi mv "linux-$1" ".." || return $? cd "../linux-$1" || return $? + ) + rmdir "${tmpdir}" +} + +# Patch a kernel tree where $1 is the kernel version. +function patch_kernel { if [ "$1" = "2.6.29" -o "$1" = "2.6.29.1" -o "$1" = "2.6.29.2" -o "$1" = "2.6.29.3" ] then patch -f -s -p1 <<'EOF' @@ -423,8 +429,6 @@ EOF chmod a+x "$f" fi done - ) - rmdir "${tmpdir}" } function download_and_extract_kernel_tree { @@ -436,6 +440,8 @@ function download_and_extract_kernel_tree { { git tag -l "v$1" >/dev/null || git fetch stable; } && git archive "v$1" ) | tar -C "linux-$1" -xf- - fi - download_kernel "$1" && extract_kernel_tree "$1" + else + download_kernel "$1" && extract_kernel_tree "$1" + fi && + (cd linux-$1 && patch_kernel "$1") } From 3aad36b25b7e0e415e47ef2fa4e0e55c0ff25e2c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 10 Apr 2019 15:01:15 +0000 Subject: [PATCH 4/4] qla2x00t-32gbit/Kconfig: Sync with kernel v5.1-rc1 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@8180 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- qla2x00t-32gbit/Kconfig | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qla2x00t-32gbit/Kconfig b/qla2x00t-32gbit/Kconfig index 285e25b8b..09f9cc0d6 100644 --- a/qla2x00t-32gbit/Kconfig +++ b/qla2x00t-32gbit/Kconfig @@ -1,8 +1,10 @@ config SCSI_QLA_FC tristate "QLogic QLA2XXX Fibre Channel Support" depends on PCI && SCSI - select SCSI_FC_ATTRS + depends on SCSI_FC_ATTRS + depends on NVME_FC || !NVME_FC select FW_LOADER + select BTREE ---help--- This qla2xxx driver supports all QLogic Fibre Channel PCI and PCIe host adapters. @@ -26,6 +28,8 @@ config SCSI_QLA_FC http://ldriver.qlogic.com/firmware/ + They are also included in the linux-firmware tree as well. + config SCSI_QLA2XXX_TARGET bool "QLogic 2xxx target mode support" depends on SCSI_QLA_FC