mirror of
https://github.com/torvalds/linux.git
synced 2024-11-05 03:21:32 +00:00
acd53127c4
This is the usual grab bag of driver updates (lpfc, hpsa, megaraid_sas, cxgbi, be2iscsi) plus an assortment of minor updates. There are also one new driver: the Cisco snic; the advansys driver has been rewritten to get rid of the warning about converting it to the DMA API, the tape statistics patch got in and finally, there's a resuffle of SCSI header files to separate more cleanly initiator from target mode (and better share the common definitions). Signed-off-by: James Bottomley <JBottomley@Odin.com> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABAgAGBQJViKWdAAoJEDeqqVYsXL0MAr8IAMmlA6HBVjMJJFCEOY9corHj e70MNQa7LUgf+JCdOtzGcvHXTiFFd4IHZAwXUJAnsC4IU2QWEfi1bjUTErlqBIGk LoZlXXpEHnFpmWot3OluOzzcGcxede8rVgPiKWVVdojIngBC2+LL/i2vPCJ84ri9 WCVlk6KBvWZXuU6JuOKAb2FO9HOX7Q61wuKAMast2Qc6RNc2ksgc7VbstsITqzZ9 FVEsjmQ5lqUj+xdxBpiUOdUpc22IJ4VcpBgQ2HrThvg6vf4aq937RJ/g4vi/g0SU Utk0a3bUw1H/WnYAfJVFx83nVEsS/954Z7/ERDg1sjlfLYwQtQnpov0XIbPIbZU= =k9IT -----END PGP SIGNATURE----- Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi Pull SCSI updates from James Bottomley: "This is the usual grab bag of driver updates (lpfc, hpsa, megaraid_sas, cxgbi, be2iscsi) plus an assortment of minor updates. There is also one new driver: the Cisco snic. The advansys driver has been rewritten to get rid of the warning about converting it to the DMA API, the tape statistics patch got in and finally, there's a resuffle of SCSI header files to separate more cleanly initiator from target mode (and better share the common definitions)" * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (156 commits) snic: driver for Cisco SCSI HBA qla2xxx: Fix indentation qla2xxx: Comment out unreachable code fusion: remove dead MTRR code advansys: fix compilation errors and warnings when CONFIG_PCI is not set mptsas: fix depth param in scsi_track_queue_full megaraid: fix irq setup process regression lpfc: Update version to 10.7.0.0 for upstream patch set. lpfc: Fix to drop PLOGIs from fabric node till LOGO processing completes lpfc: Fix scsi task management error message. lpfc: Fix cq_id masking problem. lpfc: Fix scsi prep dma buf error. lpfc: Add support for using block multi-queue lpfc: Devices are not discovered during takeaway/giveback testing lpfc: Fix vport deletion failure. lpfc: Check for active portpeerbeacon. lpfc: Update driver version for upstream patch set 10.6.0.1. lpfc: Change buffer pool empty message to miscellaneous category lpfc: Fix incorrect log message reported for empty FCF record. lpfc: Fix rport leak. ...
63 lines
1.3 KiB
C
63 lines
1.3 KiB
C
#ifndef TARGET_CORE_PSCSI_H
|
|
#define TARGET_CORE_PSCSI_H
|
|
|
|
#define PSCSI_VERSION "v4.0"
|
|
|
|
/* used in pscsi_find_alloc_len() */
|
|
#ifndef INQUIRY_DATA_SIZE
|
|
#define INQUIRY_DATA_SIZE 0x24
|
|
#endif
|
|
|
|
/* used in pscsi_add_device_to_list() */
|
|
#define PSCSI_DEFAULT_QUEUEDEPTH 1
|
|
|
|
#define PS_RETRY 5
|
|
#define PS_TIMEOUT_DISK (15*HZ)
|
|
#define PS_TIMEOUT_OTHER (500*HZ)
|
|
|
|
#include <linux/device.h>
|
|
#include <linux/kref.h>
|
|
#include <linux/kobject.h>
|
|
|
|
struct scsi_device;
|
|
|
|
struct pscsi_plugin_task {
|
|
unsigned char pscsi_sense[TRANSPORT_SENSE_BUFFER];
|
|
int pscsi_direction;
|
|
int pscsi_result;
|
|
u32 pscsi_resid;
|
|
unsigned char pscsi_cdb[0];
|
|
} ____cacheline_aligned;
|
|
|
|
#define PDF_HAS_CHANNEL_ID 0x01
|
|
#define PDF_HAS_TARGET_ID 0x02
|
|
#define PDF_HAS_LUN_ID 0x04
|
|
#define PDF_HAS_VPD_UNIT_SERIAL 0x08
|
|
#define PDF_HAS_VPD_DEV_IDENT 0x10
|
|
#define PDF_HAS_VIRT_HOST_ID 0x20
|
|
|
|
struct pscsi_dev_virt {
|
|
struct se_device dev;
|
|
int pdv_flags;
|
|
int pdv_host_id;
|
|
int pdv_channel_id;
|
|
int pdv_target_id;
|
|
int pdv_lun_id;
|
|
struct block_device *pdv_bd;
|
|
struct scsi_device *pdv_sd;
|
|
struct Scsi_Host *pdv_lld_host;
|
|
} ____cacheline_aligned;
|
|
|
|
typedef enum phv_modes {
|
|
PHV_VIRTUAL_HOST_ID,
|
|
PHV_LLD_SCSI_HOST_NO
|
|
} phv_modes_t;
|
|
|
|
struct pscsi_hba_virt {
|
|
int phv_host_id;
|
|
phv_modes_t phv_mode;
|
|
struct Scsi_Host *phv_lld_host;
|
|
} ____cacheline_aligned;
|
|
|
|
#endif /*** TARGET_CORE_PSCSI_H ***/
|