diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-16 19:02:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-16 19:02:04 -0400 |
commit | 7d69cff26ceadce8638cb65191285932a3de3d4c (patch) | |
tree | 7a23eb561e6a25fbd111af2d0152cc6f34c2cecd /drivers/scsi/lpfc/lpfc_attr.c | |
parent | 8fa6f4974d55ad1fb0a9522c5a5cfd050a517048 (diff) | |
parent | 0351b8f81392c6dbbbb036e5c8f73ceff68726e9 (diff) |
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, qla2xxx, storvsc,
aacraid, ipr) plus an assortment of minor updates. There's also a
major update to aic1542 which moves the driver into this millenium"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (106 commits)
change SCSI Maintainer email
sd, mmc, virtio_blk, string_helpers: fix block size units
ufs: add support to allow non standard behaviours (quirks)
ufs-qcom: save controller revision info in internal structure
qla2xxx: Update driver version to 8.07.00.18-k
qla2xxx: Restore physical port WWPN only, when port down detected for FA-WWPN port.
qla2xxx: Fix virtual port configuration, when switch port is disabled/enabled.
qla2xxx: Prevent multiple firmware dump collection for ISP27XX.
qla2xxx: Disable Interrupt handshake for ISP27XX.
qla2xxx: Add debugging info for MBX timeout.
qla2xxx: Add serdes read/write support for ISP27XX
qla2xxx: Add udev notification to save fw dump for ISP27XX
qla2xxx: Add message for sucessful FW dump collected for ISP27XX.
qla2xxx: Add support to load firmware from file for ISP 26XX/27XX.
qla2xxx: Fix beacon blink for ISP27XX.
qla2xxx: Increase the wait time for firmware to be ready for P3P.
qla2xxx: Fix crash due to wrong casting of reg for ISP27XX.
qla2xxx: Fix warnings reported by static checker.
lpfc: Update version to 10.5.0.0 for upstream patch set
lpfc: Update copyright to 2015
...
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_attr.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_attr.c | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 2f9b96826ac0..d65bd178d131 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /******************************************************************* | 1 | /******************************************************************* |
2 | * This file is part of the Emulex Linux Device Driver for * | 2 | * This file is part of the Emulex Linux Device Driver for * |
3 | * Fibre Channel Host Bus Adapters. * | 3 | * Fibre Channel Host Bus Adapters. * |
4 | * Copyright (C) 2004-2014 Emulex. All rights reserved. * | 4 | * Copyright (C) 2004-2015 Emulex. All rights reserved. * |
5 | * EMULEX and SLI are trademarks of Emulex. * | 5 | * EMULEX and SLI are trademarks of Emulex. * |
6 | * www.emulex.com * | 6 | * www.emulex.com * |
7 | * Portions Copyright (C) 2004-2005 Christoph Hellwig * | 7 | * Portions Copyright (C) 2004-2005 Christoph Hellwig * |
@@ -406,8 +406,13 @@ lpfc_option_rom_version_show(struct device *dev, struct device_attribute *attr, | |||
406 | struct Scsi_Host *shost = class_to_shost(dev); | 406 | struct Scsi_Host *shost = class_to_shost(dev); |
407 | struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; | 407 | struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; |
408 | struct lpfc_hba *phba = vport->phba; | 408 | struct lpfc_hba *phba = vport->phba; |
409 | char fwrev[FW_REV_STR_SIZE]; | ||
410 | |||
411 | if (phba->sli_rev < LPFC_SLI_REV4) | ||
412 | return snprintf(buf, PAGE_SIZE, "%s\n", phba->OptionROMVersion); | ||
409 | 413 | ||
410 | return snprintf(buf, PAGE_SIZE, "%s\n", phba->OptionROMVersion); | 414 | lpfc_decode_firmware_rev(phba, fwrev, 1); |
415 | return snprintf(buf, PAGE_SIZE, "%s\n", fwrev); | ||
411 | } | 416 | } |
412 | 417 | ||
413 | /** | 418 | /** |
@@ -4568,12 +4573,18 @@ LPFC_ATTR_R(multi_ring_type, FC_TYPE_IP, 1, | |||
4568 | 4573 | ||
4569 | /* | 4574 | /* |
4570 | # lpfc_fdmi_on: controls FDMI support. | 4575 | # lpfc_fdmi_on: controls FDMI support. |
4571 | # 0 = no FDMI support | 4576 | # Set NOT Set |
4572 | # 1 = support FDMI without attribute of hostname | 4577 | # bit 0 = FDMI support no FDMI support |
4573 | # 2 = support FDMI with attribute of hostname | 4578 | # LPFC_FDMI_SUPPORT just turns basic support on/off |
4574 | # Value range [0,2]. Default value is 0. | 4579 | # bit 1 = Register delay no register delay (60 seconds) |
4580 | # LPFC_FDMI_REG_DELAY 60 sec registration delay after FDMI login | ||
4581 | # bit 2 = All attributes Use a attribute subset | ||
4582 | # LPFC_FDMI_ALL_ATTRIB applies to both port and HBA attributes | ||
4583 | # Port attrutes subset: 1 thru 6 OR all: 1 thru 0xd 0x101 0x102 0x103 | ||
4584 | # HBA attributes subset: 1 thru 0xb OR all: 1 thru 0xc | ||
4585 | # Value range [0,7]. Default value is 0. | ||
4575 | */ | 4586 | */ |
4576 | LPFC_VPORT_ATTR_RW(fdmi_on, 0, 0, 2, "Enable FDMI support"); | 4587 | LPFC_VPORT_ATTR_RW(fdmi_on, 0, 0, 7, "Enable FDMI support"); |
4577 | 4588 | ||
4578 | /* | 4589 | /* |
4579 | # Specifies the maximum number of ELS cmds we can have outstanding (for | 4590 | # Specifies the maximum number of ELS cmds we can have outstanding (for |