mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-17 18:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2020-07-26 16:53:02 -07:00
parent 5106544817 86d602973b
commit 32aa14938d
4 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
iscsi-scst/Makefile
View File

@@ -123,19 +123,21 @@ CONFTEST_OUTPUTS = $(shell \
echo $$t/result-$(KVER).txt; \
done)
CONFTEST_CFLAGS = $(OFED_CFLAGS) \
-DOFED_FLAVOR=$(OFED_FLAVOR) \
CONFTEST_CFLAGS = \
$(shell for t in $(CONFTESTS); do \
cat $$t/result-$(KVER).txt 2>/dev/null; \
done)
ISER_CFLAGS = $(OFED_CFLAGS) -DOFED_FLAVOR=$(OFED_FLAVOR) $(CONFTEST_CFLAGS)
mods: include/iscsi_scst_itf_ver.h $(CONFTEST_OUTPUTS)
$(MAKE) -C $(KDIR) M=$(KMOD) CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)" modules
$(MAKE) -C $(KDIR) M=$(KMOD) CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)"\
modules
echo "$@: INFINIBAND_ENABLED = $(INFINIBAND_ENABLED)"
if $(INFINIBAND_ENABLED); then \
echo " Building against $(OFED_FLAVOR) RDMA kernel headers."; \
$(MAKE) -C $(KDIR) M=$(ISERTMOD) CONFTEST_CFLAGS="$(CONFTEST_CFLAGS)"\
$(OFED_CONFIG) modules; \
if $(INFINIBAND_ENABLED); then \
echo " Building against $(OFED_FLAVOR) RDMA kernel headers.";\
$(MAKE) -C $(KDIR) M=$(ISERTMOD) ISER_CFLAGS="$(ISER_CFLAGS)" \
$(OFED_CONFIG) modules; \
fi
progs: include/iscsi_scst_itf_ver.h

4
iscsi-scst/kernel/Kbuild
View File

@@ -14,9 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers \
$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
[ -e $$d ] || continue; echo $$d; break; done)
KBUILD_EXTRA_SYMBOLS = $(src)/../../scst/src/Module.symvers
ccflags-y += -I$(src)/../include -I$(src)/../../scst/include
ccflags-y += $(CONFTEST_CFLAGS)

2
iscsi-scst/kernel/isert-scst/Kbuild
View File

@@ -14,7 +14,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
LINUXINCLUDE := $(CONFTEST_CFLAGS) $(LINUXINCLUDE)
LINUXINCLUDE := $(ISER_CFLAGS) $(LINUXINCLUDE)
KBUILD_EXTRA_SYMBOLS=$(src)/../../kernel/Module.symvers \
$(shell for d in /usr/src/ofa_kernel/default/Module.symvers; do\
[ -e $$d ] || continue; echo $$d; break; done)

16
scst/include/backport.h
View File

@@ -2032,8 +2032,24 @@ enum {
#define wwn_to_u64(wwn) get_unaligned_be64(wwn)
#endif
/*
* See also commit c39e0af64bce ("scsi: scsi_transport_fc: Add FPIN fc event
* codes") # v5.2
*/
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
static inline void
fc_host_fpin_rcv(struct Scsi_Host *shost, u32 fpin_len, char *fpin_buf)
{
}
#endif
/* <uapi/scsi/fc/fc_els.h> */
/* See also commit a7dff3ad4787 ("scsi: fc: add FPIN ELS definition") # v5.2 */
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0)
#define ELS_FPIN 0x16
#endif
/*
* See also commit 62e9dd177732 ("scsi: qla2xxx: Change in PUREX to handle FPIN
* ELS requests").