Commit 33611ba0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "These seven patches are mostly minor build, Kconfig and error leg
  fixes"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: qedi: Fix return code in qedi_ep_connect()
  scsi: lpfc: fix linking against modular NVMe support
  scsi: scsi_transport_fc: return -EBUSY for deleted vport
  scsi: libcxgbi: add check for valid cxgbi_task_data
  scsi: aic7xxx: fix firmware build with O=path
  scsi: megaraid_sas: fix memleak in megasas_alloc_cmdlist_fusion
  scsi: qedi: Add ISCSI_BOOT_SYSFS to Kconfig
parents 26c5cebf 2c675218

drivers/scsi/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1230,6 +1230,8 @@ config SCSI_LPFC 
	tristate "Emulex LightPulse Fibre Channel Support"

	depends on PCI && SCSI

	depends on SCSI_FC_ATTRS

	depends on NVME_TARGET_FC || NVME_TARGET_FC=n

	depends on NVME_FC || NVME_FC=n

	select CRC_T10DIF

	---help---

          This lpfc driver supports the Emulex LightPulse

drivers/scsi/aic7xxx/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -55,9 +55,9 @@ aicasm-7xxx-opts-$(CONFIG_AIC7XXX_REG_PRETTY_PRINT) := \ 


ifeq ($(CONFIG_AIC7XXX_BUILD_FIRMWARE),y)

$(obj)/aic7xxx_seq.h: $(src)/aic7xxx.seq $(src)/aic7xxx.reg $(obj)/aicasm/aicasm

	$(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic7xxx_reg.h \

	$(obj)/aicasm/aicasm -I$(srctree)/$(src) -r $(obj)/aic7xxx_reg.h \

			      $(aicasm-7xxx-opts-y) -o $(obj)/aic7xxx_seq.h \

			      $(src)/aic7xxx.seq

			      $(srctree)/$(src)/aic7xxx.seq



$(aic7xxx-gen-y): $(obj)/aic7xxx_seq.h

else
@@ -72,14 +72,14 @@ aicasm-79xx-opts-$(CONFIG_AIC79XX_REG_PRETTY_PRINT) := \ 


ifeq ($(CONFIG_AIC79XX_BUILD_FIRMWARE),y)

$(obj)/aic79xx_seq.h: $(src)/aic79xx.seq $(src)/aic79xx.reg $(obj)/aicasm/aicasm

	$(obj)/aicasm/aicasm -I$(src) -r $(obj)/aic79xx_reg.h \

	$(obj)/aicasm/aicasm -I$(srctree)/$(src) -r $(obj)/aic79xx_reg.h \

			      $(aicasm-79xx-opts-y) -o $(obj)/aic79xx_seq.h \

			      $(src)/aic79xx.seq

			      $(srctree)/$(src)/aic79xx.seq



$(aic79xx-gen-y): $(obj)/aic79xx_seq.h

else

$(obj)/aic79xx_reg_print.c: $(src)/aic79xx_reg_print.c_shipped

endif



$(obj)/aicasm/aicasm: $(src)/aicasm/*.[chyl]

	$(MAKE) -C $(src)/aicasm
 
$(obj)/aicasm/aicasm: $(srctree)/$(src)/aicasm/*.[chyl]

	$(MAKE) -C $(srctree)/$(src)/aicasm OUTDIR=$(shell pwd)/$(obj)/aicasm/

drivers/scsi/aic7xxx/aicasm/Makefile

+29 −24
Original line number Diff line number Diff line 
PROG=	aicasm



OUTDIR ?= ./



.SUFFIXES= .l .y .c .h



CSRCS=	aicasm.c aicasm_symbol.c

YSRCS=	aicasm_gram.y aicasm_macro_gram.y

LSRCS=	aicasm_scan.l aicasm_macro_scan.l



GENHDRS=	aicdb.h $(YSRCS:.y=.h)

GENSRCS=	$(YSRCS:.y=.c) $(LSRCS:.l=.c)

GENHDRS=	$(addprefix ${OUTDIR}/,aicdb.h $(YSRCS:.y=.h))

GENSRCS=	$(addprefix ${OUTDIR}/,$(YSRCS:.y=.c) $(LSRCS:.l=.c))



SRCS=	${CSRCS} ${GENSRCS}

LIBS=	-ldb

clean-files:= ${GENSRCS} ${GENHDRS} $(YSRCS:.y=.output) $(PROG)

# Override default kernel CFLAGS.  This is a userland app.

AICASM_CFLAGS:= -I/usr/include -I.

AICASM_CFLAGS:= -I/usr/include -I. -I$(OUTDIR)

LEX= flex

YACC= bison

YFLAGS= -d
@@ -32,22 +34,25 @@ YFLAGS+= -t -v 
LFLAGS= -d

endif



$(PROG):  ${GENHDRS} $(SRCS)

	$(AICASM_CC) $(AICASM_CFLAGS) $(SRCS) -o $(PROG) $(LIBS)

$(PROG):  $(OUTDIR) ${GENHDRS} $(SRCS)

	$(AICASM_CC) $(AICASM_CFLAGS) $(SRCS) -o $(OUTDIR)/$(PROG) $(LIBS)



$(OUTDIR):

	mkdir -p $(OUTDIR)



aicdb.h:

$(OUTDIR)/aicdb.h:

	@if [ -e "/usr/include/db4/db_185.h" ]; then		\

		echo "#include <db4/db_185.h>" > aicdb.h;	\

		echo "#include <db4/db_185.h>" > $@;	\

	 elif [ -e "/usr/include/db3/db_185.h" ]; then		\

		echo "#include <db3/db_185.h>" > aicdb.h;	\

		echo "#include <db3/db_185.h>" > $@;	\

	 elif [ -e "/usr/include/db2/db_185.h" ]; then		\

		echo "#include <db2/db_185.h>" > aicdb.h;	\

		echo "#include <db2/db_185.h>" > $@;	\

	 elif [ -e "/usr/include/db1/db_185.h" ]; then		\

		echo "#include <db1/db_185.h>" > aicdb.h;	\

		echo "#include <db1/db_185.h>" > $@;	\

	 elif [ -e "/usr/include/db/db_185.h" ]; then		\

		echo "#include <db/db_185.h>" > aicdb.h;	\

		echo "#include <db/db_185.h>" > $@;	\

	 elif [ -e "/usr/include/db_185.h" ]; then		\

		echo "#include <db_185.h>" > aicdb.h;		\

		echo "#include <db_185.h>" > $@;		\

	 else							\

		echo "*** Install db development libraries";	\

	 fi
@@ -58,23 +63,23 @@ clean: 
# Create a dependency chain in generated files

# to avoid concurrent invocations of the single

# rule that builds them all.

aicasm_gram.c: aicasm_gram.h

aicasm_gram.c aicasm_gram.h: aicasm_gram.y

$(OUTDIR)/aicasm_gram.c: $(OUTDIR)/aicasm_gram.h

$(OUTDIR)/aicasm_gram.c $(OUTDIR)/aicasm_gram.h: aicasm_gram.y

	$(YACC) $(YFLAGS) -b $(<:.y=) $<

	mv $(<:.y=).tab.c $(<:.y=.c)

	mv $(<:.y=).tab.h $(<:.y=.h)

	mv $(<:.y=).tab.c $(OUTDIR)/$(<:.y=.c)

	mv $(<:.y=).tab.h $(OUTDIR)/$(<:.y=.h)



# Create a dependency chain in generated files

# to avoid concurrent invocations of the single

# rule that builds them all.

aicasm_macro_gram.c: aicasm_macro_gram.h

aicasm_macro_gram.c aicasm_macro_gram.h: aicasm_macro_gram.y

$(OUTDIR)/aicasm_macro_gram.c: $(OUTDIR)/aicasm_macro_gram.h

$(OUTDIR)/aicasm_macro_gram.c $(OUTDIR)/aicasm_macro_gram.h: aicasm_macro_gram.y

	$(YACC) $(YFLAGS) -b $(<:.y=) -p mm $<

	mv $(<:.y=).tab.c $(<:.y=.c)

	mv $(<:.y=).tab.h $(<:.y=.h)

	mv $(<:.y=).tab.c $(OUTDIR)/$(<:.y=.c)

	mv $(<:.y=).tab.h $(OUTDIR)/$(<:.y=.h)



aicasm_scan.c: aicasm_scan.l

$(OUTDIR)/aicasm_scan.c: aicasm_scan.l

	$(LEX) $(LFLAGS) -o $@ $<



aicasm_macro_scan.c: aicasm_macro_scan.l

$(OUTDIR)/aicasm_macro_scan.c: aicasm_macro_scan.l

	$(LEX) $(LFLAGS) -Pmm -o $@ $<

drivers/scsi/cxgbi/libcxgbi.c

+7 −0
Original line number Diff line number Diff line
@@ -2128,6 +2128,13 @@ void cxgbi_cleanup_task(struct iscsi_task *task) 
	struct iscsi_tcp_task *tcp_task = task->dd_data;

	struct cxgbi_task_data *tdata = iscsi_task_cxgbi_data(task);



	if (!tcp_task || !tdata || (tcp_task->dd_data != tdata)) {

		pr_info("task 0x%p,0x%p, tcp_task 0x%p, tdata 0x%p/0x%p.\n",

			task, task->sc, tcp_task,

			tcp_task ? tcp_task->dd_data : NULL, tdata);

		return;

	}



	log_debug(1 << CXGBI_DBG_ISCSI,

		"task 0x%p, skb 0x%p, itt 0x%x.\n",

		task, tdata->skb, task->hdr_itt);

drivers/scsi/megaraid/megaraid_sas_fusion.c

+5 −1
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ static int megasas_create_sg_sense_fusion(struct megasas_instance *instance) 
int

megasas_alloc_cmdlist_fusion(struct megasas_instance *instance)

{

	u32 max_mpt_cmd, i;

	u32 max_mpt_cmd, i, j;

	struct fusion_context *fusion;



	fusion = instance->ctrl_context;
@@ -450,11 +450,15 @@ megasas_alloc_cmdlist_fusion(struct megasas_instance *instance) 
		fusion->cmd_list[i] = kzalloc(sizeof(struct megasas_cmd_fusion),

					      GFP_KERNEL);

		if (!fusion->cmd_list[i]) {

			for (j = 0; j < i; j++)

				kfree(fusion->cmd_list[j]);

			kfree(fusion->cmd_list);

			dev_err(&instance->pdev->dev,

				"Failed from %s %d\n",  __func__, __LINE__);

			return -ENOMEM;

		}

	}



	return 0;

}

int

CRA Git | Maintained and supported by SUSTech CRA and CCSE