Commit 6799d4f2 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:
 "Ten small fixes, all in drivers"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: target: qla2xxx: Wait for stop_phase1 at WWN removal
  scsi: hisi_sas: Drop free_irq() of devm_request_irq() allocated irq
  scsi: vmw_pvscsi: Set correct residual data length
  scsi: bnx2fc: Return failure if io_req is already in ABTS processing
  scsi: aic7xxx: Remove multiple definition of globals
  scsi: aic7xxx: Restore several defines for aic7xxx firmware build
  scsi: target: iblock: Fix smp_processor_id() BUG messages
  scsi: libsas: Use _safe() loop in sas_resume_port()
  scsi: target: tcmu: Fix xarray RCU warning
  scsi: target: core: Avoid smp_processor_id() in preemptible code
parents 0217a27e 2ef7665d

drivers/scsi/aic7xxx/aicasm/aicasm_gram.y

+0 −1
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
#include "aicasm_symbol.h"

#include "aicasm_insformat.h"



int yylineno;

char *yyfilename;

char stock_prefix[] = "aic_";

char *prefix = stock_prefix;

drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ struct macro_arg { 
	regex_t	arg_regex;

	char   *replacement_text;

};

STAILQ_HEAD(macro_arg_list, macro_arg) args;

STAILQ_HEAD(macro_arg_list, macro_arg);



struct macro_info {

	struct macro_arg_list args;

drivers/scsi/aic7xxx/scsi_message.h

+11 −0
Original line number Diff line number Diff line
@@ -3,6 +3,17 @@ 
 * $FreeBSD: src/sys/cam/scsi/scsi_message.h,v 1.2 2000/05/01 20:21:29 peter Exp $

 */



/* Messages (1 byte) */		     /* I/T (M)andatory or (O)ptional */

#define MSG_SAVEDATAPOINTER	0x02 /* O/O */

#define MSG_RESTOREPOINTERS	0x03 /* O/O */

#define MSG_DISCONNECT		0x04 /* O/O */

#define MSG_MESSAGE_REJECT	0x07 /* M/M */

#define MSG_NOOP		0x08 /* M/M */



/* Messages (2 byte) */

#define MSG_SIMPLE_Q_TAG	0x20 /* O/O */

#define MSG_IGN_WIDE_RESIDUE	0x23 /* O/O */



/* Identify message */		     /* M/M */	

#define MSG_IDENTIFYFLAG	0x80 

#define MSG_IDENTIFY_DISCFLAG	0x40

drivers/scsi/bnx2fc/bnx2fc_io.c

+1 −0
Original line number Diff line number Diff line
@@ -1220,6 +1220,7 @@ int bnx2fc_eh_abort(struct scsi_cmnd *sc_cmd) 
		   was a result from the ABTS request rather than the CLEANUP

		   request */

		set_bit(BNX2FC_FLAG_IO_CLEANUP,	&io_req->req_flags);

		rc = FAILED;

		goto done;

	}

drivers/scsi/hisi_sas/hisi_sas_v3_hw.c

+4 −4
Original line number Diff line number Diff line
@@ -4811,14 +4811,14 @@ hisi_sas_v3_destroy_irqs(struct pci_dev *pdev, struct hisi_hba *hisi_hba) 
{

	int i;



	free_irq(pci_irq_vector(pdev, 1), hisi_hba);

	free_irq(pci_irq_vector(pdev, 2), hisi_hba);

	free_irq(pci_irq_vector(pdev, 11), hisi_hba);

	devm_free_irq(&pdev->dev, pci_irq_vector(pdev, 1), hisi_hba);

	devm_free_irq(&pdev->dev, pci_irq_vector(pdev, 2), hisi_hba);

	devm_free_irq(&pdev->dev, pci_irq_vector(pdev, 11), hisi_hba);

	for (i = 0; i < hisi_hba->cq_nvecs; i++) {

		struct hisi_sas_cq *cq = &hisi_hba->cq[i];

		int nr = hisi_sas_intr_conv ? 16 : 16 + i;



		free_irq(pci_irq_vector(pdev, nr), cq);

		devm_free_irq(&pdev->dev, pci_irq_vector(pdev, nr), cq);

	}

	pci_free_irq_vectors(pdev);

}