aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrking@us.ibm.com <brking@us.ibm.com>2005-11-01 18:02:49 -0500
committerJames Bottomley <jejb@mulgrave.(none)>2005-11-06 14:12:32 -0500
commitd71a8b0cba62eada61edce86670f8d63a1bef0c8 (patch)
treebdaa891da597a7649f113bbc5b03a6cac9ed0b64
parent86f51436dd851e1b8f33348be8a3d69f4f0e5e10 (diff)
[SCSI] ipr: Increase ipr device scanning limits
Increase device scanning limits so that all devices are found. Signed-off-by: Brian King <brking@us.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/ipr.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index cdd0f4bdb98c..2f18284b6004 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -98,14 +98,14 @@
98#define IPR_NUM_LOG_HCAMS 2 98#define IPR_NUM_LOG_HCAMS 2
99#define IPR_NUM_CFG_CHG_HCAMS 2 99#define IPR_NUM_CFG_CHG_HCAMS 2
100#define IPR_NUM_HCAMS (IPR_NUM_LOG_HCAMS + IPR_NUM_CFG_CHG_HCAMS) 100#define IPR_NUM_HCAMS (IPR_NUM_LOG_HCAMS + IPR_NUM_CFG_CHG_HCAMS)
101#define IPR_MAX_NUM_TARGETS_PER_BUS 0x10 101#define IPR_MAX_NUM_TARGETS_PER_BUS 256
102#define IPR_MAX_NUM_LUNS_PER_TARGET 256 102#define IPR_MAX_NUM_LUNS_PER_TARGET 256
103#define IPR_MAX_NUM_VSET_LUNS_PER_TARGET 8 103#define IPR_MAX_NUM_VSET_LUNS_PER_TARGET 8
104#define IPR_VSET_BUS 0xff 104#define IPR_VSET_BUS 0xff
105#define IPR_IOA_BUS 0xff 105#define IPR_IOA_BUS 0xff
106#define IPR_IOA_TARGET 0xff 106#define IPR_IOA_TARGET 0xff
107#define IPR_IOA_LUN 0xff 107#define IPR_IOA_LUN 0xff
108#define IPR_MAX_NUM_BUSES 4 108#define IPR_MAX_NUM_BUSES 8
109#define IPR_MAX_BUS_TO_SCAN IPR_MAX_NUM_BUSES 109#define IPR_MAX_BUS_TO_SCAN IPR_MAX_NUM_BUSES
110 110
111#define IPR_NUM_RESET_RELOAD_RETRIES 3 111#define IPR_NUM_RESET_RELOAD_RETRIES 3
@@ -1325,7 +1325,7 @@ static inline int ipr_is_naca_model(struct ipr_resource_entry *res)
1325static inline int ipr_is_device(struct ipr_res_addr *res_addr) 1325static inline int ipr_is_device(struct ipr_res_addr *res_addr)
1326{ 1326{
1327 if ((res_addr->bus < IPR_MAX_NUM_BUSES) && 1327 if ((res_addr->bus < IPR_MAX_NUM_BUSES) &&
1328 (res_addr->target < IPR_MAX_NUM_TARGETS_PER_BUS)) 1328 (res_addr->target < (IPR_MAX_NUM_TARGETS_PER_BUS - 1)))
1329 return 1; 1329 return 1;
1330 1330
1331 return 0; 1331 return 0;