Commit 7a8cf29d authored by Mark Haverkamp's avatar Mark Haverkamp Committed by James Bottomley

[SCSI] aacraid: Greater than 2TB capacity support

Received from Mark Salyzyn from Adaptec.

There are a few adapters that are capable of creating devices with this large
of a capacity, but now that we have the large fib support in, the management
applications will be capable of generating them.  The problem is, once they are
created, the driver will not be able to access the devices correctly without
this patch.
Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent c4a3e0a5
This diff is collapsed.
#if (!defined(dprintk)) #if (!defined(dprintk))
# define dprintk(x) # define dprintk(x)
#endif #endif
/* eg: if (nblank(dprintk(x))) */
#define _nblank(x) #x
#define nblank(x) _nblank(x)[0]
/*------------------------------------------------------------------------------ /*------------------------------------------------------------------------------
* D E F I N E S * D E F I N E S
...@@ -1012,6 +1016,7 @@ struct aac_dev ...@@ -1012,6 +1016,7 @@ struct aac_dev
/* macro side-effects BEWARE */ /* macro side-effects BEWARE */
# define raw_io_interface \ # define raw_io_interface \
init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4) init->InitStructRevision==cpu_to_le32(ADAPTER_INIT_STRUCT_REVISION_4)
u8 raw_io_64;
u8 printf_enabled; u8 printf_enabled;
}; };
...@@ -1362,8 +1367,10 @@ struct aac_srb_reply ...@@ -1362,8 +1367,10 @@ struct aac_srb_reply
#define VM_CtBlockVerify64 18 #define VM_CtBlockVerify64 18
#define VM_CtHostRead64 19 #define VM_CtHostRead64 19
#define VM_CtHostWrite64 20 #define VM_CtHostWrite64 20
#define VM_DrvErrTblLog 21
#define VM_NameServe64 22
#define MAX_VMCOMMAND_NUM 21 /* used for sizing stats array - leave last */ #define MAX_VMCOMMAND_NUM 23 /* used for sizing stats array - leave last */
/* /*
* Descriptive information (eg, vital stats) * Descriptive information (eg, vital stats)
...@@ -1472,6 +1479,7 @@ struct aac_mntent { ...@@ -1472,6 +1479,7 @@ struct aac_mntent {
manager (eg, filesystem) */ manager (eg, filesystem) */
__le32 altoid; /* != oid <==> snapshot or __le32 altoid; /* != oid <==> snapshot or
broken mirror exists */ broken mirror exists */
__le32 capacityhigh;
}; };
#define FSCS_NOTCLEAN 0x0001 /* fsck is neccessary before mounting */ #define FSCS_NOTCLEAN 0x0001 /* fsck is neccessary before mounting */
......
...@@ -315,6 +315,13 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev) ...@@ -315,6 +315,13 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
- sizeof(struct aac_fibhdr) - sizeof(struct aac_fibhdr)
- sizeof(struct aac_write) + sizeof(struct sgmap)) - sizeof(struct aac_write) + sizeof(struct sgmap))
/ sizeof(struct sgmap); / sizeof(struct sgmap);
dev->raw_io_64 = 0;
if ((!aac_adapter_sync_cmd(dev, GET_ADAPTER_PROPERTIES,
0, 0, 0, 0, 0, 0, status+0, status+1, status+2, NULL, NULL)) &&
(status[0] == 0x00000001)) {
if (status[1] & AAC_OPT_NEW_COMM_64)
dev->raw_io_64 = 1;
}
if ((!aac_adapter_sync_cmd(dev, GET_COMM_PREFERRED_SETTINGS, if ((!aac_adapter_sync_cmd(dev, GET_COMM_PREFERRED_SETTINGS,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
status+0, status+1, status+2, status+3, status+4)) status+0, status+1, status+2, status+3, status+4))
......
...@@ -772,6 +772,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, ...@@ -772,6 +772,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
shost->irq = pdev->irq; shost->irq = pdev->irq;
shost->base = pci_resource_start(pdev, 0); shost->base = pci_resource_start(pdev, 0);
shost->unique_id = unique_id; shost->unique_id = unique_id;
shost->max_cmd_len = 16;
aac = (struct aac_dev *)shost->hostdata; aac = (struct aac_dev *)shost->hostdata;
aac->scsi_host_ptr = shost; aac->scsi_host_ptr = shost;
......
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