Commit 6c92f7db authored by Dave Carroll's avatar Dave Carroll Committed by Martin K. Petersen

scsi: aacraid: Fix 2T+ drives on SmartIOC-2000

The logic for supporting large drives was previously tied to 4Kn support
for SmartIOC-2000. As SmartIOC-2000 does not support volumes using 4Kn
drives, use the intended option flag AAC_OPT_NEW_COMM_64 to determine
support for volumes greater than 2T.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarDave Carroll <david.carroll@microsemi.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3e009749
...@@ -699,14 +699,14 @@ static void _aac_probe_container1(void * context, struct fib * fibptr) ...@@ -699,14 +699,14 @@ static void _aac_probe_container1(void * context, struct fib * fibptr)
int status; int status;
dresp = (struct aac_mount *) fib_data(fibptr); dresp = (struct aac_mount *) fib_data(fibptr);
if (!(fibptr->dev->supplement_adapter_info.supported_options2 & if (!aac_supports_2T(fibptr->dev)) {
AAC_OPTION_VARIABLE_BLOCK_SIZE))
dresp->mnt[0].capacityhigh = 0; dresp->mnt[0].capacityhigh = 0;
if ((le32_to_cpu(dresp->status) != ST_OK) || if ((le32_to_cpu(dresp->status) == ST_OK) &&
(le32_to_cpu(dresp->mnt[0].vol) != CT_NONE)) { (le32_to_cpu(dresp->mnt[0].vol) != CT_NONE)) {
_aac_probe_container2(context, fibptr); _aac_probe_container2(context, fibptr);
return; return;
} }
}
scsicmd = (struct scsi_cmnd *) context; scsicmd = (struct scsi_cmnd *) context;
if (!aac_valid_context(scsicmd, fibptr)) if (!aac_valid_context(scsicmd, fibptr))
......
...@@ -2701,6 +2701,11 @@ static inline int aac_is_src(struct aac_dev *dev) ...@@ -2701,6 +2701,11 @@ static inline int aac_is_src(struct aac_dev *dev)
return 0; return 0;
} }
static inline int aac_supports_2T(struct aac_dev *dev)
{
return (dev->adapter_info.options & AAC_OPT_NEW_COMM_64);
}
char * get_container_type(unsigned type); char * get_container_type(unsigned type);
extern int numacb; extern int numacb;
extern char aac_driver_version[]; extern char aac_driver_version[];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment