diff options
author | James Smart <James.Smart@Emulex.Com> | 2009-04-06 18:48:10 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-04-27 10:42:47 -0400 |
commit | a257bf905efd22fd2c055580b0ab2e8e7ed1b6a1 (patch) | |
tree | e0f2ef6b9627d86456c92d56fa2c088c6d6544bf /drivers/scsi/lpfc/lpfc_attr.c | |
parent | 3621a710a7dbb2d22a8e95d94bcf0c2d13ef57fc (diff) |
[SCSI] lpfc 8.3.1: misc fixes/changes
8.3.1 Fixes/Changes :
- Fix incorrect byte-swapping on word 4 of IOCB (data length) which
caused LUNs to not be discovered on big-endian (e.g. PPC)
- Remove a bad cast of MBslimaddr which loses the __iomem (sparse)
- Make lpfc_debugfs_mask_disc_trc static (sparse)
- Correct misspelled word BlockGuard in lpfc_logmsg.h comment
- Replaced repeated code segment for canceling IOCBs from a list with
a function call, lpfc_sli_cancel_iocbs().
- Increased HBQ buffers to support 40KB SSC sequences.
- Added sysfs interface to update speed and topology parameter without
link bounce.
- Fixed bug with sysfs fc_host WWNs not being updated after changing
the WWNs.
- Check if the active mailbox is NULL in the beginning of the mailbox
timeout handler - fixes panic in the mailbox timeout handler while
running IO stress test
- Fixed system panic in lpfc_pci_remove_one() due to ndlp indirect
reference to phba through vport
- Removed de-reference of scsi device after call to scsi_done() to fix
panic in scsi completion path while accessing scsi device after
scsi_done is called.
- Fixed "Nodelist not empty" message when unloading the driver after
target reboot test
- Added LP2105 HBA model description
- Added code to print all 16 words of unrecognized ASYNC events
- Fixed memory leak in vport create + delete loop
- Added support for handling dual error bit from HBA
- Fixed a driver NULL pointer dereference in lpfc_sli_process_sol_iocb
- Fixed a discovery bug with FC switch reboot in lpfc_setup_disc_node
- Take NULL termintator into account when calculating available buffer space
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_attr.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_attr.c | 67 |
1 files changed, 55 insertions, 12 deletions
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 69296cd6e9d7..c14f0cbdb125 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
@@ -2216,18 +2216,41 @@ LPFC_VPORT_ATTR_R(scan_down, 1, 0, 1, | |||
2216 | * non-zero return value from lpfc_issue_lip() | 2216 | * non-zero return value from lpfc_issue_lip() |
2217 | * -EINVAL val out of range | 2217 | * -EINVAL val out of range |
2218 | **/ | 2218 | **/ |
2219 | static int | 2219 | static ssize_t |
2220 | lpfc_topology_set(struct lpfc_hba *phba, int val) | 2220 | lpfc_topology_store(struct device *dev, struct device_attribute *attr, |
2221 | const char *buf, size_t count) | ||
2221 | { | 2222 | { |
2223 | struct Scsi_Host *shost = class_to_shost(dev); | ||
2224 | struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; | ||
2225 | struct lpfc_hba *phba = vport->phba; | ||
2226 | int val = 0; | ||
2227 | int nolip = 0; | ||
2228 | const char *val_buf = buf; | ||
2222 | int err; | 2229 | int err; |
2223 | uint32_t prev_val; | 2230 | uint32_t prev_val; |
2231 | |||
2232 | if (!strncmp(buf, "nolip ", strlen("nolip "))) { | ||
2233 | nolip = 1; | ||
2234 | val_buf = &buf[strlen("nolip ")]; | ||
2235 | } | ||
2236 | |||
2237 | if (!isdigit(val_buf[0])) | ||
2238 | return -EINVAL; | ||
2239 | if (sscanf(val_buf, "%i", &val) != 1) | ||
2240 | return -EINVAL; | ||
2241 | |||
2224 | if (val >= 0 && val <= 6) { | 2242 | if (val >= 0 && val <= 6) { |
2225 | prev_val = phba->cfg_topology; | 2243 | prev_val = phba->cfg_topology; |
2226 | phba->cfg_topology = val; | 2244 | phba->cfg_topology = val; |
2245 | if (nolip) | ||
2246 | return strlen(buf); | ||
2247 | |||
2227 | err = lpfc_issue_lip(lpfc_shost_from_vport(phba->pport)); | 2248 | err = lpfc_issue_lip(lpfc_shost_from_vport(phba->pport)); |
2228 | if (err) | 2249 | if (err) { |
2229 | phba->cfg_topology = prev_val; | 2250 | phba->cfg_topology = prev_val; |
2230 | return err; | 2251 | return -EINVAL; |
2252 | } else | ||
2253 | return strlen(buf); | ||
2231 | } | 2254 | } |
2232 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT, | 2255 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT, |
2233 | "%d:0467 lpfc_topology attribute cannot be set to %d, " | 2256 | "%d:0467 lpfc_topology attribute cannot be set to %d, " |
@@ -2240,7 +2263,6 @@ module_param(lpfc_topology, int, 0); | |||
2240 | MODULE_PARM_DESC(lpfc_topology, "Select Fibre Channel topology"); | 2263 | MODULE_PARM_DESC(lpfc_topology, "Select Fibre Channel topology"); |
2241 | lpfc_param_show(topology) | 2264 | lpfc_param_show(topology) |
2242 | lpfc_param_init(topology, 0, 0, 6) | 2265 | lpfc_param_init(topology, 0, 0, 6) |
2243 | lpfc_param_store(topology) | ||
2244 | static DEVICE_ATTR(lpfc_topology, S_IRUGO | S_IWUSR, | 2266 | static DEVICE_ATTR(lpfc_topology, S_IRUGO | S_IWUSR, |
2245 | lpfc_topology_show, lpfc_topology_store); | 2267 | lpfc_topology_show, lpfc_topology_store); |
2246 | 2268 | ||
@@ -2281,7 +2303,7 @@ lpfc_stat_data_ctrl_store(struct device *dev, struct device_attribute *attr, | |||
2281 | unsigned long base, step, bucket_type; | 2303 | unsigned long base, step, bucket_type; |
2282 | 2304 | ||
2283 | if (!strncmp(buf, "setbucket", strlen("setbucket"))) { | 2305 | if (!strncmp(buf, "setbucket", strlen("setbucket"))) { |
2284 | if (strlen(buf) > LPFC_MAX_DATA_CTRL_LEN) | 2306 | if (strlen(buf) > (LPFC_MAX_DATA_CTRL_LEN - 1)) |
2285 | return -EINVAL; | 2307 | return -EINVAL; |
2286 | 2308 | ||
2287 | strcpy(bucket_data, buf); | 2309 | strcpy(bucket_data, buf); |
@@ -2598,12 +2620,29 @@ static struct bin_attribute sysfs_drvr_stat_data_attr = { | |||
2598 | * non-zero return value from lpfc_issue_lip() | 2620 | * non-zero return value from lpfc_issue_lip() |
2599 | * -EINVAL val out of range | 2621 | * -EINVAL val out of range |
2600 | **/ | 2622 | **/ |
2601 | static int | 2623 | static ssize_t |
2602 | lpfc_link_speed_set(struct lpfc_hba *phba, int val) | 2624 | lpfc_link_speed_store(struct device *dev, struct device_attribute *attr, |
2625 | const char *buf, size_t count) | ||
2603 | { | 2626 | { |
2627 | struct Scsi_Host *shost = class_to_shost(dev); | ||
2628 | struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata; | ||
2629 | struct lpfc_hba *phba = vport->phba; | ||
2630 | int val = 0; | ||
2631 | int nolip = 0; | ||
2632 | const char *val_buf = buf; | ||
2604 | int err; | 2633 | int err; |
2605 | uint32_t prev_val; | 2634 | uint32_t prev_val; |
2606 | 2635 | ||
2636 | if (!strncmp(buf, "nolip ", strlen("nolip "))) { | ||
2637 | nolip = 1; | ||
2638 | val_buf = &buf[strlen("nolip ")]; | ||
2639 | } | ||
2640 | |||
2641 | if (!isdigit(val_buf[0])) | ||
2642 | return -EINVAL; | ||
2643 | if (sscanf(val_buf, "%i", &val) != 1) | ||
2644 | return -EINVAL; | ||
2645 | |||
2607 | if (((val == LINK_SPEED_1G) && !(phba->lmt & LMT_1Gb)) || | 2646 | if (((val == LINK_SPEED_1G) && !(phba->lmt & LMT_1Gb)) || |
2608 | ((val == LINK_SPEED_2G) && !(phba->lmt & LMT_2Gb)) || | 2647 | ((val == LINK_SPEED_2G) && !(phba->lmt & LMT_2Gb)) || |
2609 | ((val == LINK_SPEED_4G) && !(phba->lmt & LMT_4Gb)) || | 2648 | ((val == LINK_SPEED_4G) && !(phba->lmt & LMT_4Gb)) || |
@@ -2611,14 +2650,19 @@ lpfc_link_speed_set(struct lpfc_hba *phba, int val) | |||
2611 | ((val == LINK_SPEED_10G) && !(phba->lmt & LMT_10Gb))) | 2650 | ((val == LINK_SPEED_10G) && !(phba->lmt & LMT_10Gb))) |
2612 | return -EINVAL; | 2651 | return -EINVAL; |
2613 | 2652 | ||
2614 | if ((val >= 0 && val <= LPFC_MAX_LINK_SPEED) | 2653 | if ((val >= 0 && val <= 8) |
2615 | && (LPFC_LINK_SPEED_BITMAP & (1 << val))) { | 2654 | && (LPFC_LINK_SPEED_BITMAP & (1 << val))) { |
2616 | prev_val = phba->cfg_link_speed; | 2655 | prev_val = phba->cfg_link_speed; |
2617 | phba->cfg_link_speed = val; | 2656 | phba->cfg_link_speed = val; |
2657 | if (nolip) | ||
2658 | return strlen(buf); | ||
2659 | |||
2618 | err = lpfc_issue_lip(lpfc_shost_from_vport(phba->pport)); | 2660 | err = lpfc_issue_lip(lpfc_shost_from_vport(phba->pport)); |
2619 | if (err) | 2661 | if (err) { |
2620 | phba->cfg_link_speed = prev_val; | 2662 | phba->cfg_link_speed = prev_val; |
2621 | return err; | 2663 | return -EINVAL; |
2664 | } else | ||
2665 | return strlen(buf); | ||
2622 | } | 2666 | } |
2623 | 2667 | ||
2624 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT, | 2668 | lpfc_printf_log(phba, KERN_ERR, LOG_INIT, |
@@ -2665,7 +2709,6 @@ lpfc_link_speed_init(struct lpfc_hba *phba, int val) | |||
2665 | return -EINVAL; | 2709 | return -EINVAL; |
2666 | } | 2710 | } |
2667 | 2711 | ||
2668 | lpfc_param_store(link_speed) | ||
2669 | static DEVICE_ATTR(lpfc_link_speed, S_IRUGO | S_IWUSR, | 2712 | static DEVICE_ATTR(lpfc_link_speed, S_IRUGO | S_IWUSR, |
2670 | lpfc_link_speed_show, lpfc_link_speed_store); | 2713 | lpfc_link_speed_show, lpfc_link_speed_store); |
2671 | 2714 | ||