Pull SCSI updates from James Bottomley: "This is primarily another round of driver updates (lpfc, bfa, fcoe, ipr) plus a new ufshcd driver. There shouldn't be anything controversial in here (The final deletion of scsi proc_ops which caused some build breakage has been held over until the next merge window to give us more time to stabilise it). I'm afraid, with me moving continents at exactly the wrong time, anything submitted after the merge window opened has been held over to the next merge window." * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (63 commits) [SCSI] ipr: Driver version 2.5.3 [SCSI] ipr: Increase alignment boundary of command blocks [SCSI] ipr: Increase max concurrent oustanding commands [SCSI] ipr: Remove unnecessary memory barriers [SCSI] ipr: Remove unnecessary interrupt clearing on new adapters [SCSI] ipr: Fix target id allocation re-use problem [SCSI] atp870u, mpt2sas, qla4xxx use pci_dev->revision [SCSI] fcoe: Drop the rtnl_mutex before calling fcoe_ctlr_link_up [SCSI] bfa: Update the driver version to 3.0.23.0 [SCSI] bfa: BSG and User interface fixes. [SCSI] bfa: Fix to avoid vport delete hang on request queue full scenario. [SCSI] bfa: Move service parameter programming logic into firmware. [SCSI] bfa: Revised Fabric Assigned Address(FAA) feature implementation. [SCSI] bfa: Flash controller IOC pll init fixes. [SCSI] bfa: Serialize the IOC hw semaphore unlock logic. [SCSI] bfa: Modify ISR to process pending completions [SCSI] bfa: Add fc host issue lip support [SCSI] mpt2sas: remove extraneous sas_log_info messages [SCSI] libfc: fcoe_transport_create fails in single-CPU environment [SCSI] fcoe: reduce contention for fcoe_rx_list lock [v2] ...
Showing the changes to include (3 of 63 files). Show all
Unified · Split
| @@ -194,6 +194,7 @@ struct mtpos { · 193 unmodified lines | ||
| 194 | 194 | #define MT_ST_SYSV 0x1000 |
| 195 | 195 | #define MT_ST_NOWAIT 0x2000 |
| 196 | 196 | #define MT_ST_SILI 0x4000 |
| 197 | +#define MT_ST_NOWAIT_EOF 0x8000 | |
| 197 | 198 | |
| 198 | 199 | /* The mode parameters to be controlled. Parameter chosen with bits 20-28 */ |
| 199 | 200 | #define MT_ST_CLEAR_DEFAULT 0xfffff |
| @@ -261,7 +261,8 @@ struct iscsi_uevent { · 260 unmodified lines | ||
| 261 | 261 | } host_event; |
| 262 | 262 | struct msg_ping_comp { |
| 263 | 263 | uint32_t host_no; |
| 264 | − uint32_t status; | |
| 264 | + uint32_t status; /* enum | |
| 265 | + * iscsi_ping_status_code */ | |
| 265 | 266 | uint32_t pid; /* unique ping id associated |
| 266 | 267 | with each ping request */ |
| 267 | 268 | uint32_t data_size; |
| @@ -483,6 +484,20 @@ enum iscsi_port_state { · 215 unmodified lines | ||
| 483 | 484 | ISCSI_PORT_STATE_UP = 0x2, |
| 484 | 485 | }; |
| 485 | 486 | |
| 487 | +/* iSCSI PING status/error code */ | |
| 488 | +enum iscsi_ping_status_code { | |
| 489 | + ISCSI_PING_SUCCESS = 0, | |
| 490 | + ISCSI_PING_FW_DISABLED = 0x1, | |
| 491 | + ISCSI_PING_IPADDR_INVALID = 0x2, | |
| 492 | + ISCSI_PING_LINKLOCAL_IPV6_ADDR_INVALID = 0x3, | |
| 493 | + ISCSI_PING_TIMEOUT = 0x4, | |
| 494 | + ISCSI_PING_INVALID_DEST_ADDR = 0x5, | |
| 495 | + ISCSI_PING_OVERSIZE_PACKET = 0x6, | |
| 496 | + ISCSI_PING_ICMP_ERROR = 0x7, | |
| 497 | + ISCSI_PING_MAX_REQ_EXCEEDED = 0x8, | |
| 498 | + ISCSI_PING_NO_ARP_RECEIVED = 0x9, | |
| 499 | +}; | |
| 500 | + | |
| 486 | 501 | #define iscsi_ptr(_handle) ((void*)(unsigned long)_handle) |
| 487 | 502 | #define iscsi_handle(_ptr) ((uint64_t)(unsigned long)_ptr) |
| 488 | 503 | |
| @@ -578,6 +593,6 @@ struct iscsi_chap_rec { · 89 unmodified lines | ||
| 578 | 593 | char username[ISCSI_CHAP_AUTH_NAME_MAX_LEN]; |
| 579 | 594 | uint8_t password[ISCSI_CHAP_AUTH_SECRET_MAX_LEN]; |
| 580 | 595 | uint8_t password_length; |
| 581 | −} __packed; | |
| 596 | +}; | |
| 582 | 597 | |
| 583 | 598 | #endif |
| @@ -165,7 +165,8 @@ struct fcoe_ctlr { · 164 unmodified lines | ||
| 165 | 165 | * @switch_name: WWN of switch from advertisement |
| 166 | 166 | * @fabric_name: WWN of fabric from advertisement |
| 167 | 167 | * @fc_map: FC_MAP value from advertisement |
| 168 | − * @fcf_mac: Ethernet address of the FCF | |
| 168 | + * @fcf_mac: Ethernet address of the FCF for FIP traffic | |
| 169 | + * @fcoe_mac: Ethernet address of the FCF for FCoE traffic | |
| 169 | 170 | * @vfid: virtual fabric ID |
| 170 | 171 | * @pri: selection priority, smaller values are better |
| 171 | 172 | * @flogi_sent: current FLOGI sent to this FCF |
| @@ -188,6 +189,7 @@ struct fcoe_fcf { · 16 unmodified lines | ||
| 188 | 189 | u32 fc_map; |
| 189 | 190 | u16 vfid; |
| 190 | 191 | u8 fcf_mac[ETH_ALEN]; |
| 192 | + u8 fcoe_mac[ETH_ALEN]; | |
| 191 | 193 | |
| 192 | 194 | u8 pri; |
| 193 | 195 | u8 flogi_sent; |