mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
[SCSI] lpfc 8.1.7: Standardize the driver on a single define for the maximum supported targets
Standardize the driver on a single define for the maximum supported targets. Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
parent
5a0e326dfa
commit
e17da18e2f
3 changed files with 8 additions and 7 deletions
|
@ -21,10 +21,12 @@
|
||||||
|
|
||||||
struct lpfc_sli2_slim;
|
struct lpfc_sli2_slim;
|
||||||
|
|
||||||
#define LPFC_MAX_TARGET 256 /* max targets supported */
|
|
||||||
#define LPFC_MAX_DISC_THREADS 64 /* max outstanding discovery els req */
|
|
||||||
#define LPFC_MAX_NS_RETRY 3 /* max NameServer retries */
|
|
||||||
|
|
||||||
|
#define LPFC_MAX_TARGET 256 /* max number of targets supported */
|
||||||
|
#define LPFC_MAX_DISC_THREADS 64 /* max outstanding discovery els
|
||||||
|
requests */
|
||||||
|
#define LPFC_MAX_NS_RETRY 3 /* Number of retry attempts to contact
|
||||||
|
the NameServer before giving up. */
|
||||||
#define LPFC_DFT_HBA_Q_DEPTH 2048 /* max cmds per hba */
|
#define LPFC_DFT_HBA_Q_DEPTH 2048 /* max cmds per hba */
|
||||||
#define LPFC_LC_HBA_Q_DEPTH 1024 /* max cmds per low cost hba */
|
#define LPFC_LC_HBA_Q_DEPTH 1024 /* max cmds per low cost hba */
|
||||||
#define LPFC_LP101_HBA_Q_DEPTH 128 /* max cmds per low cost hba */
|
#define LPFC_LP101_HBA_Q_DEPTH 128 /* max cmds per low cost hba */
|
||||||
|
@ -41,7 +43,6 @@ struct lpfc_sli2_slim;
|
||||||
(( (u64)(high)<<16 ) << 16)|( (u64)(low))))
|
(( (u64)(high)<<16 ) << 16)|( (u64)(low))))
|
||||||
/* Provide maximum configuration definitions. */
|
/* Provide maximum configuration definitions. */
|
||||||
#define LPFC_DRVR_TIMEOUT 16 /* driver iocb timeout value in sec */
|
#define LPFC_DRVR_TIMEOUT 16 /* driver iocb timeout value in sec */
|
||||||
#define MAX_FCP_TARGET 256 /* max num of FCP targets supported */
|
|
||||||
#define FC_MAX_ADPTMSG 64
|
#define FC_MAX_ADPTMSG 64
|
||||||
|
|
||||||
#define MAX_HBAEVT 32
|
#define MAX_HBAEVT 32
|
||||||
|
|
|
@ -1084,7 +1084,7 @@ lpfc_register_remote_port(struct lpfc_hba * phba,
|
||||||
fc_remote_port_rolechg(rport, rport_ids.roles);
|
fc_remote_port_rolechg(rport, rport_ids.roles);
|
||||||
|
|
||||||
if ((rport->scsi_target_id != -1) &&
|
if ((rport->scsi_target_id != -1) &&
|
||||||
(rport->scsi_target_id < MAX_FCP_TARGET)) {
|
(rport->scsi_target_id < LPFC_MAX_TARGET)) {
|
||||||
ndlp->nlp_sid = rport->scsi_target_id;
|
ndlp->nlp_sid = rport->scsi_target_id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1313,7 +1313,7 @@ lpfc_nlp_list(struct lpfc_hba * phba, struct lpfc_nodelist * nlp, int list)
|
||||||
if ((rport_add == mapped) &&
|
if ((rport_add == mapped) &&
|
||||||
((!nlp->rport) ||
|
((!nlp->rport) ||
|
||||||
(nlp->rport->scsi_target_id == -1) ||
|
(nlp->rport->scsi_target_id == -1) ||
|
||||||
(nlp->rport->scsi_target_id >= MAX_FCP_TARGET))) {
|
(nlp->rport->scsi_target_id >= LPFC_MAX_TARGET))) {
|
||||||
nlp->nlp_state = NLP_STE_UNMAPPED_NODE;
|
nlp->nlp_state = NLP_STE_UNMAPPED_NODE;
|
||||||
spin_lock_irq(phba->host->host_lock);
|
spin_lock_irq(phba->host->host_lock);
|
||||||
nlp->nlp_flag |= NLP_TGT_NO_SCSIID;
|
nlp->nlp_flag |= NLP_TGT_NO_SCSIID;
|
||||||
|
|
|
@ -1078,7 +1078,7 @@ lpfc_reset_bus_handler(struct scsi_cmnd *cmnd)
|
||||||
* targets known to the driver. Should any target reset
|
* targets known to the driver. Should any target reset
|
||||||
* fail, this routine returns failure to the midlayer.
|
* fail, this routine returns failure to the midlayer.
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < MAX_FCP_TARGET; i++) {
|
for (i = 0; i < LPFC_MAX_TARGET; i++) {
|
||||||
/* Search the mapped list for this target ID */
|
/* Search the mapped list for this target ID */
|
||||||
match = 0;
|
match = 0;
|
||||||
list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) {
|
list_for_each_entry(ndlp, &phba->fc_nlpmap_list, nlp_listp) {
|
||||||
|
|
Loading…
Reference in a new issue