Skip to content

L
linux
Commit 626fa32c authored by Ching Huang's avatar Ching Huang Committed by Christoph Hellwig
Browse files
Options

arcmsr: rename functions and variables 

Rename some variable and function names for readability and consistency.
Signed-off-by: default avatarChing Huang <ching2048@areca.com.tw>
Reviewed-by: default avatarTomas Henzl <thenzl@redhat.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 5eb6bfa0
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 119 deletions
drivers/scsi/arcmsr/arcmsr.h
View file @ 626fa32c
...@@ -359,7 +359,7 @@ struct ARCMSR_CDB ...@@ -359,7 +359,7 @@ struct ARCMSR_CDB
#define ARCMSR_CDB_FLAG_ORDEREDQ 0x10 #define ARCMSR_CDB_FLAG_ORDEREDQ 0x10
uint8_t msgPages; uint8_t msgPages;
uint32_t Context; uint32_t msgContext;
uint32_t DataLength; uint32_t DataLength;
uint8_t Cdb[16]; uint8_t Cdb[16];
uint8_t DeviceStatus; uint8_t DeviceStatus;
...@@ -562,7 +562,7 @@ struct AdapterControlBlock ...@@ -562,7 +562,7 @@ struct AdapterControlBlock
/* dma_coherent used for memory free */ /* dma_coherent used for memory free */
dma_addr_t dma_coherent_handle; dma_addr_t dma_coherent_handle;
/* dma_coherent_handle used for memory free */ /* dma_coherent_handle used for memory free */
dma_addr_t dma_coherent_handle_hbb_mu; dma_addr_t dma_coherent_handle2;
unsigned int uncache_size; unsigned int uncache_size;
uint8_t rqbuffer[ARCMSR_MAX_QBUFFER]; uint8_t rqbuffer[ARCMSR_MAX_QBUFFER];
/* data collection buffer for read from 80331 */ /* data collection buffer for read from 80331 */
...@@ -613,7 +613,7 @@ struct CommandControlBlock{ ...@@ -613,7 +613,7 @@ struct CommandControlBlock{
struct list_head list; /*x32: 8byte, x64: 16byte*/ struct list_head list; /*x32: 8byte, x64: 16byte*/
struct scsi_cmnd *pcmd; /*8 bytes pointer of linux scsi command */ struct scsi_cmnd *pcmd; /*8 bytes pointer of linux scsi command */
struct AdapterControlBlock *acb; /*x32: 4byte, x64: 8byte*/ struct AdapterControlBlock *acb; /*x32: 4byte, x64: 8byte*/
uint32_t cdb_phyaddr_pattern; /*x32: 4byte, x64: 4byte*/ uint32_t cdb_phyaddr; /*x32: 4byte, x64: 4byte*/
uint32_t arc_cdb_size; /*x32:4byte,x64:4byte*/ uint32_t arc_cdb_size; /*x32:4byte,x64:4byte*/
uint16_t ccb_flags; /*x32: 2byte, x64: 2byte*/ uint16_t ccb_flags; /*x32: 2byte, x64: 2byte*/
#define CCB_FLAG_READ 0x0000 #define CCB_FLAG_READ 0x0000
......
drivers/scsi/arcmsr/arcmsr_hba.c
View file @ 626fa32c
...@@ -99,16 +99,16 @@ static u32 arcmsr_disable_outbound_ints(struct AdapterControlBlock *acb); ...@@ -99,16 +99,16 @@ static u32 arcmsr_disable_outbound_ints(struct AdapterControlBlock *acb);
static void arcmsr_enable_outbound_ints(struct AdapterControlBlock *acb, static void arcmsr_enable_outbound_ints(struct AdapterControlBlock *acb,
u32 intmask_org); u32 intmask_org);
static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb); static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb);
static void arcmsr_flush_hba_cache(struct AdapterControlBlock *acb); static void arcmsr_hbaA_flush_cache(struct AdapterControlBlock *acb);
static void arcmsr_flush_hbb_cache(struct AdapterControlBlock *acb); static void arcmsr_hbaB_flush_cache(struct AdapterControlBlock *acb);
static void arcmsr_request_device_map(unsigned long pacb); static void arcmsr_request_device_map(unsigned long pacb);
static void arcmsr_request_hba_device_map(struct AdapterControlBlock *acb); static void arcmsr_hbaA_request_device_map(struct AdapterControlBlock *acb);
static void arcmsr_request_hbb_device_map(struct AdapterControlBlock *acb); static void arcmsr_hbaB_request_device_map(struct AdapterControlBlock *acb);
static void arcmsr_request_hbc_device_map(struct AdapterControlBlock *acb); static void arcmsr_hbaC_request_device_map(struct AdapterControlBlock *acb);
static void arcmsr_message_isr_bh_fn(struct work_struct *work); static void arcmsr_message_isr_bh_fn(struct work_struct *work);
static bool arcmsr_get_firmware_spec(struct AdapterControlBlock *acb); static bool arcmsr_get_firmware_spec(struct AdapterControlBlock *acb);
static void arcmsr_start_adapter_bgrb(struct AdapterControlBlock *acb); static void arcmsr_start_adapter_bgrb(struct AdapterControlBlock *acb);
static void arcmsr_hbc_message_isr(struct AdapterControlBlock *pACB); static void arcmsr_hbaC_message_isr(struct AdapterControlBlock *pACB);
static void arcmsr_hardware_reset(struct AdapterControlBlock *acb); static void arcmsr_hardware_reset(struct AdapterControlBlock *acb);
static const char *arcmsr_info(struct Scsi_Host *); static const char *arcmsr_info(struct Scsi_Host *);
static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb); static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb);
...@@ -201,7 +201,7 @@ static struct pci_driver arcmsr_pci_driver = { ...@@ -201,7 +201,7 @@ static struct pci_driver arcmsr_pci_driver = {
**************************************************************************** ****************************************************************************
*/ */
static void arcmsr_free_hbb_mu(struct AdapterControlBlock *acb) static void arcmsr_free_mu(struct AdapterControlBlock *acb)
{ {
switch (acb->adapter_type) { switch (acb->adapter_type) {
case ACB_ADAPTER_TYPE_A: case ACB_ADAPTER_TYPE_A:
...@@ -210,7 +210,7 @@ static void arcmsr_free_hbb_mu(struct AdapterControlBlock *acb) ...@@ -210,7 +210,7 @@ static void arcmsr_free_hbb_mu(struct AdapterControlBlock *acb)
case ACB_ADAPTER_TYPE_B:{ case ACB_ADAPTER_TYPE_B:{
dma_free_coherent(&acb->pdev->dev, dma_free_coherent(&acb->pdev->dev,
sizeof(struct MessageUnit_B), sizeof(struct MessageUnit_B),
acb->pmuB, acb->dma_coherent_handle_hbb_mu); acb->pmuB, acb->dma_coherent_handle2);
} }
} }
} }
...@@ -316,7 +316,7 @@ static int arcmsr_bios_param(struct scsi_device *sdev, ...@@ -316,7 +316,7 @@ static int arcmsr_bios_param(struct scsi_device *sdev,
return 0; return 0;
} }
static uint8_t arcmsr_hba_wait_msgint_ready(struct AdapterControlBlock *acb) static uint8_t arcmsr_hbaA_wait_msgint_ready(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
int i; int i;
...@@ -334,7 +334,7 @@ static uint8_t arcmsr_hba_wait_msgint_ready(struct AdapterControlBlock *acb) ...@@ -334,7 +334,7 @@ static uint8_t arcmsr_hba_wait_msgint_ready(struct AdapterControlBlock *acb)
return false; return false;
} }
static uint8_t arcmsr_hbb_wait_msgint_ready(struct AdapterControlBlock *acb) static uint8_t arcmsr_hbaB_wait_msgint_ready(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
int i; int i;
...@@ -354,7 +354,7 @@ static uint8_t arcmsr_hbb_wait_msgint_ready(struct AdapterControlBlock *acb) ...@@ -354,7 +354,7 @@ static uint8_t arcmsr_hbb_wait_msgint_ready(struct AdapterControlBlock *acb)
return false; return false;
} }
static uint8_t arcmsr_hbc_wait_msgint_ready(struct AdapterControlBlock *pACB) static uint8_t arcmsr_hbaC_wait_msgint_ready(struct AdapterControlBlock *pACB)
{ {
struct MessageUnit_C *phbcmu = (struct MessageUnit_C *)pACB->pmuC; struct MessageUnit_C *phbcmu = (struct MessageUnit_C *)pACB->pmuC;
int i; int i;
...@@ -372,13 +372,13 @@ static uint8_t arcmsr_hbc_wait_msgint_ready(struct AdapterControlBlock *pACB) ...@@ -372,13 +372,13 @@ static uint8_t arcmsr_hbc_wait_msgint_ready(struct AdapterControlBlock *pACB)
return false; return false;
} }
static void arcmsr_flush_hba_cache(struct AdapterControlBlock *acb) static void arcmsr_hbaA_flush_cache(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
int retry_count = 30; int retry_count = 30;
writel(ARCMSR_INBOUND_MESG0_FLUSH_CACHE, &reg->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_FLUSH_CACHE, &reg->inbound_msgaddr0);
do { do {
if (arcmsr_hba_wait_msgint_ready(acb)) if (arcmsr_hbaA_wait_msgint_ready(acb))
break; break;
else { else {
retry_count--; retry_count--;
...@@ -388,13 +388,13 @@ static void arcmsr_flush_hba_cache(struct AdapterControlBlock *acb) ...@@ -388,13 +388,13 @@ static void arcmsr_flush_hba_cache(struct AdapterControlBlock *acb)
} while (retry_count != 0); } while (retry_count != 0);
} }
static void arcmsr_flush_hbb_cache(struct AdapterControlBlock *acb) static void arcmsr_hbaB_flush_cache(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
int retry_count = 30; int retry_count = 30;
writel(ARCMSR_MESSAGE_FLUSH_CACHE, reg->drv2iop_doorbell); writel(ARCMSR_MESSAGE_FLUSH_CACHE, reg->drv2iop_doorbell);
do { do {
if (arcmsr_hbb_wait_msgint_ready(acb)) if (arcmsr_hbaB_wait_msgint_ready(acb))
break; break;
else { else {
retry_count--; retry_count--;
...@@ -404,14 +404,14 @@ static void arcmsr_flush_hbb_cache(struct AdapterControlBlock *acb) ...@@ -404,14 +404,14 @@ static void arcmsr_flush_hbb_cache(struct AdapterControlBlock *acb)
} while (retry_count != 0); } while (retry_count != 0);
} }
static void arcmsr_flush_hbc_cache(struct AdapterControlBlock *pACB) static void arcmsr_hbaC_flush_cache(struct AdapterControlBlock *pACB)
{ {
struct MessageUnit_C *reg = (struct MessageUnit_C *)pACB->pmuC; struct MessageUnit_C *reg = (struct MessageUnit_C *)pACB->pmuC;
int retry_count = 30;/* enlarge wait flush adapter cache time: 10 minute */ int retry_count = 30;/* enlarge wait flush adapter cache time: 10 minute */
writel(ARCMSR_INBOUND_MESG0_FLUSH_CACHE, &reg->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_FLUSH_CACHE, &reg->inbound_msgaddr0);
writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell); writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell);
do { do {
if (arcmsr_hbc_wait_msgint_ready(pACB)) { if (arcmsr_hbaC_wait_msgint_ready(pACB)) {
break; break;
} else { } else {
retry_count--; retry_count--;
...@@ -426,16 +426,16 @@ static void arcmsr_flush_adapter_cache(struct AdapterControlBlock *acb) ...@@ -426,16 +426,16 @@ static void arcmsr_flush_adapter_cache(struct AdapterControlBlock *acb)
switch (acb->adapter_type) { switch (acb->adapter_type) {
case ACB_ADAPTER_TYPE_A: { case ACB_ADAPTER_TYPE_A: {
arcmsr_flush_hba_cache(acb); arcmsr_hbaA_flush_cache(acb);
} }
break; break;
case ACB_ADAPTER_TYPE_B: { case ACB_ADAPTER_TYPE_B: {
arcmsr_flush_hbb_cache(acb); arcmsr_hbaB_flush_cache(acb);
} }
break; break;
case ACB_ADAPTER_TYPE_C: { case ACB_ADAPTER_TYPE_C: {
arcmsr_flush_hbc_cache(acb); arcmsr_hbaC_flush_cache(acb);
} }
} }
} }
...@@ -480,7 +480,9 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb) ...@@ -480,7 +480,9 @@ static int arcmsr_alloc_ccb_pool(struct AdapterControlBlock *acb)
acb->vir2phy_offset = (unsigned long)dma_coherent - (unsigned long)dma_coherent_handle; acb->vir2phy_offset = (unsigned long)dma_coherent - (unsigned long)dma_coherent_handle;
for(i = 0; i < ARCMSR_MAX_FREECCB_NUM; i++){ for(i = 0; i < ARCMSR_MAX_FREECCB_NUM; i++){
cdb_phyaddr = dma_coherent_handle + offsetof(struct CommandControlBlock, arcmsr_cdb); cdb_phyaddr = dma_coherent_handle + offsetof(struct CommandControlBlock, arcmsr_cdb);
ccb_tmp->cdb_phyaddr_pattern = ((acb->adapter_type == ACB_ADAPTER_TYPE_C) ? cdb_phyaddr : (cdb_phyaddr >> 5)); ccb_tmp->cdb_phyaddr =
((acb->adapter_type == ACB_ADAPTER_TYPE_C) ?
cdb_phyaddr : (cdb_phyaddr >> 5));
acb->pccb_pool[i] = ccb_tmp; acb->pccb_pool[i] = ccb_tmp;
ccb_tmp->acb = acb; ccb_tmp->acb = acb;
INIT_LIST_HEAD(&ccb_tmp->list); INIT_LIST_HEAD(&ccb_tmp->list);
...@@ -700,7 +702,7 @@ static int arcmsr_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -700,7 +702,7 @@ static int arcmsr_probe(struct pci_dev *pdev, const struct pci_device_id *id)
arcmsr_flush_adapter_cache(acb); arcmsr_flush_adapter_cache(acb);
arcmsr_free_ccb_pool(acb); arcmsr_free_ccb_pool(acb);
free_hbb_mu: free_hbb_mu:
arcmsr_free_hbb_mu(acb); arcmsr_free_mu(acb);
unmap_pci_region: unmap_pci_region:
arcmsr_unmap_pciregion(acb); arcmsr_unmap_pciregion(acb);
pci_release_regs: pci_release_regs:
...@@ -798,40 +800,40 @@ static int arcmsr_resume(struct pci_dev *pdev) ...@@ -798,40 +800,40 @@ static int arcmsr_resume(struct pci_dev *pdev)
return -ENODEV; return -ENODEV;
} }
static uint8_t arcmsr_abort_hba_allcmd(struct AdapterControlBlock *acb) static uint8_t arcmsr_hbaA_abort_allcmd(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
writel(ARCMSR_INBOUND_MESG0_ABORT_CMD, &reg->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_ABORT_CMD, &reg->inbound_msgaddr0);
if (!arcmsr_hba_wait_msgint_ready(acb)) { if (!arcmsr_hbaA_wait_msgint_ready(acb)) {
printk(KERN_NOTICE printk(KERN_NOTICE
"arcmsr%d: wait 'abort all outstanding command' timeout \n" "arcmsr%d: wait 'abort all outstanding command' timeout\n"
, acb->host->host_no); , acb->host->host_no);
return false; return false;
} }
return true; return true;
} }
static uint8_t arcmsr_abort_hbb_allcmd(struct AdapterControlBlock *acb) static uint8_t arcmsr_hbaB_abort_allcmd(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
writel(ARCMSR_MESSAGE_ABORT_CMD, reg->drv2iop_doorbell); writel(ARCMSR_MESSAGE_ABORT_CMD, reg->drv2iop_doorbell);
if (!arcmsr_hbb_wait_msgint_ready(acb)) { if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
printk(KERN_NOTICE printk(KERN_NOTICE
"arcmsr%d: wait 'abort all outstanding command' timeout \n" "arcmsr%d: wait 'abort all outstanding command' timeout\n"
, acb->host->host_no); , acb->host->host_no);
return false; return false;
} }
return true; return true;
} }
static uint8_t arcmsr_abort_hbc_allcmd(struct AdapterControlBlock *pACB) static uint8_t arcmsr_hbaC_abort_allcmd(struct AdapterControlBlock *pACB)
{ {
struct MessageUnit_C *reg = (struct MessageUnit_C *)pACB->pmuC; struct MessageUnit_C *reg = (struct MessageUnit_C *)pACB->pmuC;
writel(ARCMSR_INBOUND_MESG0_ABORT_CMD, &reg->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_ABORT_CMD, &reg->inbound_msgaddr0);
writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell); writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell);
if (!arcmsr_hbc_wait_msgint_ready(pACB)) { if (!arcmsr_hbaC_wait_msgint_ready(pACB)) {
printk(KERN_NOTICE printk(KERN_NOTICE
"arcmsr%d: wait 'abort all outstanding command' timeout \n" "arcmsr%d: wait 'abort all outstanding command' timeout\n"
, pACB->host->host_no); , pACB->host->host_no);
return false; return false;
} }
...@@ -842,17 +844,17 @@ static uint8_t arcmsr_abort_allcmd(struct AdapterControlBlock *acb) ...@@ -842,17 +844,17 @@ static uint8_t arcmsr_abort_allcmd(struct AdapterControlBlock *acb)
uint8_t rtnval = 0; uint8_t rtnval = 0;
switch (acb->adapter_type) { switch (acb->adapter_type) {
case ACB_ADAPTER_TYPE_A: { case ACB_ADAPTER_TYPE_A: {
rtnval = arcmsr_abort_hba_allcmd(acb); rtnval = arcmsr_hbaA_abort_allcmd(acb);
} }
break; break;
case ACB_ADAPTER_TYPE_B: { case ACB_ADAPTER_TYPE_B: {
rtnval = arcmsr_abort_hbb_allcmd(acb); rtnval = arcmsr_hbaB_abort_allcmd(acb);
} }
break; break;
case ACB_ADAPTER_TYPE_C: { case ACB_ADAPTER_TYPE_C: {
rtnval = arcmsr_abort_hbc_allcmd(acb); rtnval = arcmsr_hbaC_abort_allcmd(acb);
} }
} }
return rtnval; return rtnval;
...@@ -1109,7 +1111,7 @@ static void arcmsr_remove(struct pci_dev *pdev) ...@@ -1109,7 +1111,7 @@ static void arcmsr_remove(struct pci_dev *pdev)
} }
arcmsr_free_irq(pdev, acb); arcmsr_free_irq(pdev, acb);
arcmsr_free_ccb_pool(acb); arcmsr_free_ccb_pool(acb);
arcmsr_free_hbb_mu(acb); arcmsr_free_mu(acb);
arcmsr_unmap_pciregion(acb); arcmsr_unmap_pciregion(acb);
pci_release_regions(pdev); pci_release_regions(pdev);
scsi_host_put(host); scsi_host_put(host);
...@@ -1194,7 +1196,7 @@ static int arcmsr_build_ccb(struct AdapterControlBlock *acb, ...@@ -1194,7 +1196,7 @@ static int arcmsr_build_ccb(struct AdapterControlBlock *acb,
arcmsr_cdb->TargetID = pcmd->device->id; arcmsr_cdb->TargetID = pcmd->device->id;
arcmsr_cdb->LUN = pcmd->device->lun; arcmsr_cdb->LUN = pcmd->device->lun;
arcmsr_cdb->Function = 1; arcmsr_cdb->Function = 1;
arcmsr_cdb->Context = 0; arcmsr_cdb->msgContext = 0;
memcpy(arcmsr_cdb->Cdb, pcmd->cmnd, pcmd->cmd_len); memcpy(arcmsr_cdb->Cdb, pcmd->cmnd, pcmd->cmd_len);
nseg = scsi_dma_map(pcmd); nseg = scsi_dma_map(pcmd);
...@@ -1235,7 +1237,7 @@ static int arcmsr_build_ccb(struct AdapterControlBlock *acb, ...@@ -1235,7 +1237,7 @@ static int arcmsr_build_ccb(struct AdapterControlBlock *acb,
static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandControlBlock *ccb) static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandControlBlock *ccb)
{ {
uint32_t cdb_phyaddr_pattern = ccb->cdb_phyaddr_pattern; uint32_t cdb_phyaddr = ccb->cdb_phyaddr;
struct ARCMSR_CDB *arcmsr_cdb = (struct ARCMSR_CDB *)&ccb->arcmsr_cdb; struct ARCMSR_CDB *arcmsr_cdb = (struct ARCMSR_CDB *)&ccb->arcmsr_cdb;
atomic_inc(&acb->ccboutstandingcount); atomic_inc(&acb->ccboutstandingcount);
ccb->startdone = ARCMSR_CCB_START; ccb->startdone = ARCMSR_CCB_START;
...@@ -1244,13 +1246,12 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr ...@@ -1244,13 +1246,12 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
if (arcmsr_cdb->Flags & ARCMSR_CDB_FLAG_SGL_BSIZE) if (arcmsr_cdb->Flags & ARCMSR_CDB_FLAG_SGL_BSIZE)
writel(cdb_phyaddr_pattern | ARCMSR_CCBPOST_FLAG_SGL_BSIZE, writel(cdb_phyaddr | ARCMSR_CCBPOST_FLAG_SGL_BSIZE,
&reg->inbound_queueport); &reg->inbound_queueport);
else { else
writel(cdb_phyaddr_pattern, &reg->inbound_queueport); writel(cdb_phyaddr, &reg->inbound_queueport);
}
}
break; break;
}
case ACB_ADAPTER_TYPE_B: { case ACB_ADAPTER_TYPE_B: {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
...@@ -1259,10 +1260,10 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr ...@@ -1259,10 +1260,10 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr
ending_index = ((index + 1) % ARCMSR_MAX_HBB_POSTQUEUE); ending_index = ((index + 1) % ARCMSR_MAX_HBB_POSTQUEUE);
writel(0, &reg->post_qbuffer[ending_index]); writel(0, &reg->post_qbuffer[ending_index]);
if (arcmsr_cdb->Flags & ARCMSR_CDB_FLAG_SGL_BSIZE) { if (arcmsr_cdb->Flags & ARCMSR_CDB_FLAG_SGL_BSIZE) {
writel(cdb_phyaddr_pattern | ARCMSR_CCBPOST_FLAG_SGL_BSIZE,\ writel(cdb_phyaddr | ARCMSR_CCBPOST_FLAG_SGL_BSIZE,
&reg->post_qbuffer[index]); &reg->post_qbuffer[index]);
} else { } else {
writel(cdb_phyaddr_pattern, &reg->post_qbuffer[index]); writel(cdb_phyaddr, &reg->post_qbuffer[index]);
} }
index++; index++;
index %= ARCMSR_MAX_HBB_POSTQUEUE;/*if last index number set it to 0 */ index %= ARCMSR_MAX_HBB_POSTQUEUE;/*if last index number set it to 0 */
...@@ -1275,7 +1276,7 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr ...@@ -1275,7 +1276,7 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr
uint32_t ccb_post_stamp, arc_cdb_size; uint32_t ccb_post_stamp, arc_cdb_size;
arc_cdb_size = (ccb->arc_cdb_size > 0x300) ? 0x300 : ccb->arc_cdb_size; arc_cdb_size = (ccb->arc_cdb_size > 0x300) ? 0x300 : ccb->arc_cdb_size;
ccb_post_stamp = (cdb_phyaddr_pattern | ((arc_cdb_size - 1) >> 6) | 1); ccb_post_stamp = (cdb_phyaddr | ((arc_cdb_size - 1) >> 6) | 1);
if (acb->cdb_phyaddr_hi32) { if (acb->cdb_phyaddr_hi32) {
writel(acb->cdb_phyaddr_hi32, &phbcmu->inbound_queueport_high); writel(acb->cdb_phyaddr_hi32, &phbcmu->inbound_queueport_high);
writel(ccb_post_stamp, &phbcmu->inbound_queueport_low); writel(ccb_post_stamp, &phbcmu->inbound_queueport_low);
...@@ -1286,40 +1287,40 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr ...@@ -1286,40 +1287,40 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr
} }
} }
static void arcmsr_stop_hba_bgrb(struct AdapterControlBlock *acb) static void arcmsr_hbaA_stop_bgrb(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
acb->acb_flags &= ~ACB_F_MSG_START_BGRB; acb->acb_flags &= ~ACB_F_MSG_START_BGRB;
writel(ARCMSR_INBOUND_MESG0_STOP_BGRB, &reg->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_STOP_BGRB, &reg->inbound_msgaddr0);
if (!arcmsr_hba_wait_msgint_ready(acb)) { if (!arcmsr_hbaA_wait_msgint_ready(acb)) {
printk(KERN_NOTICE printk(KERN_NOTICE
"arcmsr%d: wait 'stop adapter background rebulid' timeout \n" "arcmsr%d: wait 'stop adapter background rebulid' timeout\n"
, acb->host->host_no); , acb->host->host_no);
} }
} }
static void arcmsr_stop_hbb_bgrb(struct AdapterControlBlock *acb) static void arcmsr_hbaB_stop_bgrb(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
acb->acb_flags &= ~ACB_F_MSG_START_BGRB; acb->acb_flags &= ~ACB_F_MSG_START_BGRB;
writel(ARCMSR_MESSAGE_STOP_BGRB, reg->drv2iop_doorbell); writel(ARCMSR_MESSAGE_STOP_BGRB, reg->drv2iop_doorbell);
if (!arcmsr_hbb_wait_msgint_ready(acb)) { if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
printk(KERN_NOTICE printk(KERN_NOTICE
"arcmsr%d: wait 'stop adapter background rebulid' timeout \n" "arcmsr%d: wait 'stop adapter background rebulid' timeout\n"
, acb->host->host_no); , acb->host->host_no);
} }
} }
static void arcmsr_stop_hbc_bgrb(struct AdapterControlBlock *pACB) static void arcmsr_hbaC_stop_bgrb(struct AdapterControlBlock *pACB)
{ {
struct MessageUnit_C *reg = (struct MessageUnit_C *)pACB->pmuC; struct MessageUnit_C *reg = (struct MessageUnit_C *)pACB->pmuC;
pACB->acb_flags &= ~ACB_F_MSG_START_BGRB; pACB->acb_flags &= ~ACB_F_MSG_START_BGRB;
writel(ARCMSR_INBOUND_MESG0_STOP_BGRB, &reg->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_STOP_BGRB, &reg->inbound_msgaddr0);
writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell); writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell);
if (!arcmsr_hbc_wait_msgint_ready(pACB)) { if (!arcmsr_hbaC_wait_msgint_ready(pACB)) {
printk(KERN_NOTICE printk(KERN_NOTICE
"arcmsr%d: wait 'stop adapter background rebulid' timeout \n" "arcmsr%d: wait 'stop adapter background rebulid' timeout\n"
, pACB->host->host_no); , pACB->host->host_no);
} }
return; return;
...@@ -1328,16 +1329,16 @@ static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb) ...@@ -1328,16 +1329,16 @@ static void arcmsr_stop_adapter_bgrb(struct AdapterControlBlock *acb)
{ {
switch (acb->adapter_type) { switch (acb->adapter_type) {
case ACB_ADAPTER_TYPE_A: { case ACB_ADAPTER_TYPE_A: {
arcmsr_stop_hba_bgrb(acb); arcmsr_hbaA_stop_bgrb(acb);
} }
break; break;
case ACB_ADAPTER_TYPE_B: { case ACB_ADAPTER_TYPE_B: {
arcmsr_stop_hbb_bgrb(acb); arcmsr_hbaB_stop_bgrb(acb);
} }
break; break;
case ACB_ADAPTER_TYPE_C: { case ACB_ADAPTER_TYPE_C: {
arcmsr_stop_hbc_bgrb(acb); arcmsr_hbaC_stop_bgrb(acb);
} }
} }
} }
...@@ -1515,7 +1516,7 @@ static void arcmsr_iop2drv_data_read_handle(struct AdapterControlBlock *acb) ...@@ -1515,7 +1516,7 @@ static void arcmsr_iop2drv_data_read_handle(struct AdapterControlBlock *acb)
} }
} }
static void arcmsr_hba_doorbell_isr(struct AdapterControlBlock *acb) static void arcmsr_hbaA_doorbell_isr(struct AdapterControlBlock *acb)
{ {
uint32_t outbound_doorbell; uint32_t outbound_doorbell;
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
...@@ -1530,7 +1531,7 @@ static void arcmsr_hba_doorbell_isr(struct AdapterControlBlock *acb) ...@@ -1530,7 +1531,7 @@ static void arcmsr_hba_doorbell_isr(struct AdapterControlBlock *acb)
} while (outbound_doorbell & (ARCMSR_OUTBOUND_IOP331_DATA_WRITE_OK } while (outbound_doorbell & (ARCMSR_OUTBOUND_IOP331_DATA_WRITE_OK
| ARCMSR_OUTBOUND_IOP331_DATA_READ_OK)); | ARCMSR_OUTBOUND_IOP331_DATA_READ_OK));
} }
static void arcmsr_hbc_doorbell_isr(struct AdapterControlBlock *pACB) static void arcmsr_hbaC_doorbell_isr(struct AdapterControlBlock *pACB)
{ {
uint32_t outbound_doorbell; uint32_t outbound_doorbell;
struct MessageUnit_C *reg = (struct MessageUnit_C *)pACB->pmuC; struct MessageUnit_C *reg = (struct MessageUnit_C *)pACB->pmuC;
...@@ -1550,13 +1551,13 @@ static void arcmsr_hbc_doorbell_isr(struct AdapterControlBlock *pACB) ...@@ -1550,13 +1551,13 @@ static void arcmsr_hbc_doorbell_isr(struct AdapterControlBlock *pACB)
if (outbound_doorbell & ARCMSR_HBCMU_IOP2DRV_DATA_READ_OK) if (outbound_doorbell & ARCMSR_HBCMU_IOP2DRV_DATA_READ_OK)
arcmsr_iop2drv_data_read_handle(pACB); arcmsr_iop2drv_data_read_handle(pACB);
if (outbound_doorbell & ARCMSR_HBCMU_IOP2DRV_MESSAGE_CMD_DONE) if (outbound_doorbell & ARCMSR_HBCMU_IOP2DRV_MESSAGE_CMD_DONE)
arcmsr_hbc_message_isr(pACB); arcmsr_hbaC_message_isr(pACB);
outbound_doorbell = readl(&reg->outbound_doorbell); outbound_doorbell = readl(&reg->outbound_doorbell);
} while (outbound_doorbell & (ARCMSR_HBCMU_IOP2DRV_DATA_WRITE_OK } while (outbound_doorbell & (ARCMSR_HBCMU_IOP2DRV_DATA_WRITE_OK
| ARCMSR_HBCMU_IOP2DRV_DATA_READ_OK | ARCMSR_HBCMU_IOP2DRV_DATA_READ_OK
| ARCMSR_HBCMU_IOP2DRV_MESSAGE_CMD_DONE)); | ARCMSR_HBCMU_IOP2DRV_MESSAGE_CMD_DONE));
} }
static void arcmsr_hba_postqueue_isr(struct AdapterControlBlock *acb) static void arcmsr_hbaA_postqueue_isr(struct AdapterControlBlock *acb)
{ {
uint32_t flag_ccb; uint32_t flag_ccb;
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
...@@ -1570,7 +1571,7 @@ static void arcmsr_hba_postqueue_isr(struct AdapterControlBlock *acb) ...@@ -1570,7 +1571,7 @@ static void arcmsr_hba_postqueue_isr(struct AdapterControlBlock *acb)
arcmsr_drain_donequeue(acb, pCCB, error); arcmsr_drain_donequeue(acb, pCCB, error);
} }
} }
static void arcmsr_hbb_postqueue_isr(struct AdapterControlBlock *acb) static void arcmsr_hbaB_postqueue_isr(struct AdapterControlBlock *acb)
{ {
uint32_t index; uint32_t index;
uint32_t flag_ccb; uint32_t flag_ccb;
...@@ -1591,7 +1592,7 @@ static void arcmsr_hbb_postqueue_isr(struct AdapterControlBlock *acb) ...@@ -1591,7 +1592,7 @@ static void arcmsr_hbb_postqueue_isr(struct AdapterControlBlock *acb)
} }
} }
static void arcmsr_hbc_postqueue_isr(struct AdapterControlBlock *acb) static void arcmsr_hbaC_postqueue_isr(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_C *phbcmu; struct MessageUnit_C *phbcmu;
struct ARCMSR_CDB *arcmsr_cdb; struct ARCMSR_CDB *arcmsr_cdb;
...@@ -1630,14 +1631,14 @@ static void arcmsr_hbc_postqueue_isr(struct AdapterControlBlock *acb) ...@@ -1630,14 +1631,14 @@ static void arcmsr_hbc_postqueue_isr(struct AdapterControlBlock *acb)
** We want this in order to compare the drivemap so that we can detect newly-attached drives. ** We want this in order to compare the drivemap so that we can detect newly-attached drives.
********************************************************************************** **********************************************************************************
*/ */
static void arcmsr_hba_message_isr(struct AdapterControlBlock *acb) static void arcmsr_hbaA_message_isr(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_A *reg = acb->pmuA; struct MessageUnit_A *reg = acb->pmuA;
/*clear interrupt and message state*/ /*clear interrupt and message state*/
writel(ARCMSR_MU_OUTBOUND_MESSAGE0_INT, &reg->outbound_intstatus); writel(ARCMSR_MU_OUTBOUND_MESSAGE0_INT, &reg->outbound_intstatus);
schedule_work(&acb->arcmsr_do_message_isr_bh); schedule_work(&acb->arcmsr_do_message_isr_bh);
} }
static void arcmsr_hbb_message_isr(struct AdapterControlBlock *acb) static void arcmsr_hbaB_message_isr(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
...@@ -1654,7 +1655,7 @@ static void arcmsr_hbb_message_isr(struct AdapterControlBlock *acb) ...@@ -1654,7 +1655,7 @@ static void arcmsr_hbb_message_isr(struct AdapterControlBlock *acb)
** We want this in order to compare the drivemap so that we can detect newly-attached drives. ** We want this in order to compare the drivemap so that we can detect newly-attached drives.
********************************************************************************** **********************************************************************************
*/ */
static void arcmsr_hbc_message_isr(struct AdapterControlBlock *acb) static void arcmsr_hbaC_message_isr(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_C *reg = acb->pmuC; struct MessageUnit_C *reg = acb->pmuC;
/*clear interrupt and message state*/ /*clear interrupt and message state*/
...@@ -1662,7 +1663,7 @@ static void arcmsr_hbc_message_isr(struct AdapterControlBlock *acb) ...@@ -1662,7 +1663,7 @@ static void arcmsr_hbc_message_isr(struct AdapterControlBlock *acb)
schedule_work(&acb->arcmsr_do_message_isr_bh); schedule_work(&acb->arcmsr_do_message_isr_bh);
} }
static int arcmsr_handle_hba_isr(struct AdapterControlBlock *acb) static int arcmsr_hbaA_handle_isr(struct AdapterControlBlock *acb)
{ {
uint32_t outbound_intstatus; uint32_t outbound_intstatus;
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
...@@ -1673,11 +1674,11 @@ static int arcmsr_handle_hba_isr(struct AdapterControlBlock *acb) ...@@ -1673,11 +1674,11 @@ static int arcmsr_handle_hba_isr(struct AdapterControlBlock *acb)
do { do {
writel(outbound_intstatus, &reg->outbound_intstatus); writel(outbound_intstatus, &reg->outbound_intstatus);
if (outbound_intstatus & ARCMSR_MU_OUTBOUND_DOORBELL_INT) if (outbound_intstatus & ARCMSR_MU_OUTBOUND_DOORBELL_INT)
arcmsr_hba_doorbell_isr(acb); arcmsr_hbaA_doorbell_isr(acb);
if (outbound_intstatus & ARCMSR_MU_OUTBOUND_POSTQUEUE_INT) if (outbound_intstatus & ARCMSR_MU_OUTBOUND_POSTQUEUE_INT)
arcmsr_hba_postqueue_isr(acb); arcmsr_hbaA_postqueue_isr(acb);
if (outbound_intstatus & ARCMSR_MU_OUTBOUND_MESSAGE0_INT) if (outbound_intstatus & ARCMSR_MU_OUTBOUND_MESSAGE0_INT)
arcmsr_hba_message_isr(acb); arcmsr_hbaA_message_isr(acb);
outbound_intstatus = readl(&reg->outbound_intstatus) & outbound_intstatus = readl(&reg->outbound_intstatus) &
acb->outbound_int_enable; acb->outbound_int_enable;
} while (outbound_intstatus & (ARCMSR_MU_OUTBOUND_DOORBELL_INT } while (outbound_intstatus & (ARCMSR_MU_OUTBOUND_DOORBELL_INT
...@@ -1686,7 +1687,7 @@ static int arcmsr_handle_hba_isr(struct AdapterControlBlock *acb) ...@@ -1686,7 +1687,7 @@ static int arcmsr_handle_hba_isr(struct AdapterControlBlock *acb)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int arcmsr_handle_hbb_isr(struct AdapterControlBlock *acb) static int arcmsr_hbaB_handle_isr(struct AdapterControlBlock *acb)
{ {
uint32_t outbound_doorbell; uint32_t outbound_doorbell;
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
...@@ -1702,9 +1703,9 @@ static int arcmsr_handle_hbb_isr(struct AdapterControlBlock *acb) ...@@ -1702,9 +1703,9 @@ static int arcmsr_handle_hbb_isr(struct AdapterControlBlock *acb)
if (outbound_doorbell & ARCMSR_IOP2DRV_DATA_READ_OK) if (outbound_doorbell & ARCMSR_IOP2DRV_DATA_READ_OK)
arcmsr_iop2drv_data_read_handle(acb); arcmsr_iop2drv_data_read_handle(acb);
if (outbound_doorbell & ARCMSR_IOP2DRV_CDB_DONE) if (outbound_doorbell & ARCMSR_IOP2DRV_CDB_DONE)
arcmsr_hbb_postqueue_isr(acb); arcmsr_hbaB_postqueue_isr(acb);
if (outbound_doorbell & ARCMSR_IOP2DRV_MESSAGE_CMD_DONE) if (outbound_doorbell & ARCMSR_IOP2DRV_MESSAGE_CMD_DONE)
arcmsr_hbb_message_isr(acb); arcmsr_hbaB_message_isr(acb);
outbound_doorbell = readl(reg->iop2drv_doorbell) & outbound_doorbell = readl(reg->iop2drv_doorbell) &
acb->outbound_int_enable; acb->outbound_int_enable;
} while (outbound_doorbell & (ARCMSR_IOP2DRV_DATA_WRITE_OK } while (outbound_doorbell & (ARCMSR_IOP2DRV_DATA_WRITE_OK
...@@ -1714,7 +1715,7 @@ static int arcmsr_handle_hbb_isr(struct AdapterControlBlock *acb) ...@@ -1714,7 +1715,7 @@ static int arcmsr_handle_hbb_isr(struct AdapterControlBlock *acb)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static int arcmsr_handle_hbc_isr(struct AdapterControlBlock *pACB) static int arcmsr_hbaC_handle_isr(struct AdapterControlBlock *pACB)
{ {
uint32_t host_interrupt_status; uint32_t host_interrupt_status;
struct MessageUnit_C *phbcmu = (struct MessageUnit_C *)pACB->pmuC; struct MessageUnit_C *phbcmu = (struct MessageUnit_C *)pACB->pmuC;
...@@ -1730,10 +1731,10 @@ static int arcmsr_handle_hbc_isr(struct AdapterControlBlock *pACB) ...@@ -1730,10 +1731,10 @@ static int arcmsr_handle_hbc_isr(struct AdapterControlBlock *pACB)
return IRQ_NONE; return IRQ_NONE;
do { do {
if (host_interrupt_status & ARCMSR_HBCMU_OUTBOUND_DOORBELL_ISR) if (host_interrupt_status & ARCMSR_HBCMU_OUTBOUND_DOORBELL_ISR)
arcmsr_hbc_doorbell_isr(pACB); arcmsr_hbaC_doorbell_isr(pACB);
/* MU post queue interrupts*/ /* MU post queue interrupts*/
if (host_interrupt_status & ARCMSR_HBCMU_OUTBOUND_POSTQUEUE_ISR) if (host_interrupt_status & ARCMSR_HBCMU_OUTBOUND_POSTQUEUE_ISR)
arcmsr_hbc_postqueue_isr(pACB); arcmsr_hbaC_postqueue_isr(pACB);
host_interrupt_status = readl(&phbcmu->host_int_status); host_interrupt_status = readl(&phbcmu->host_int_status);
} while (host_interrupt_status & (ARCMSR_HBCMU_OUTBOUND_POSTQUEUE_ISR | } while (host_interrupt_status & (ARCMSR_HBCMU_OUTBOUND_POSTQUEUE_ISR |
ARCMSR_HBCMU_OUTBOUND_DOORBELL_ISR)); ARCMSR_HBCMU_OUTBOUND_DOORBELL_ISR));
...@@ -1743,13 +1744,13 @@ static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb) ...@@ -1743,13 +1744,13 @@ static irqreturn_t arcmsr_interrupt(struct AdapterControlBlock *acb)
{ {
switch (acb->adapter_type) { switch (acb->adapter_type) {
case ACB_ADAPTER_TYPE_A: case ACB_ADAPTER_TYPE_A:
return arcmsr_handle_hba_isr(acb); return arcmsr_hbaA_handle_isr(acb);
break; break;
case ACB_ADAPTER_TYPE_B: case ACB_ADAPTER_TYPE_B:
return arcmsr_handle_hbb_isr(acb); return arcmsr_hbaB_handle_isr(acb);
break; break;
case ACB_ADAPTER_TYPE_C: case ACB_ADAPTER_TYPE_C:
return arcmsr_handle_hbc_isr(acb); return arcmsr_hbaC_handle_isr(acb);
default: default:
return IRQ_NONE; return IRQ_NONE;
} }
...@@ -2168,7 +2169,7 @@ static int arcmsr_queue_command_lck(struct scsi_cmnd *cmd, ...@@ -2168,7 +2169,7 @@ static int arcmsr_queue_command_lck(struct scsi_cmnd *cmd,
static DEF_SCSI_QCMD(arcmsr_queue_command) static DEF_SCSI_QCMD(arcmsr_queue_command)
static bool arcmsr_get_hba_config(struct AdapterControlBlock *acb) static bool arcmsr_hbaA_get_config(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
char *acb_firm_model = acb->firm_model; char *acb_firm_model = acb->firm_model;
...@@ -2179,7 +2180,7 @@ static bool arcmsr_get_hba_config(struct AdapterControlBlock *acb) ...@@ -2179,7 +2180,7 @@ static bool arcmsr_get_hba_config(struct AdapterControlBlock *acb)
char __iomem *iop_device_map = (char __iomem *)(&reg->message_rwbuffer[21]); char __iomem *iop_device_map = (char __iomem *)(&reg->message_rwbuffer[21]);
int count; int count;
writel(ARCMSR_INBOUND_MESG0_GET_CONFIG, &reg->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_GET_CONFIG, &reg->inbound_msgaddr0);
if (!arcmsr_hba_wait_msgint_ready(acb)) { if (!arcmsr_hbaA_wait_msgint_ready(acb)) {
printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \ printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \
miscellaneous data' timeout \n", acb->host->host_no); miscellaneous data' timeout \n", acb->host->host_no);
return false; return false;
...@@ -2219,7 +2220,7 @@ static bool arcmsr_get_hba_config(struct AdapterControlBlock *acb) ...@@ -2219,7 +2220,7 @@ static bool arcmsr_get_hba_config(struct AdapterControlBlock *acb)
acb->firm_cfg_version = readl(&reg->message_rwbuffer[25]); /*firm_cfg_version,25,100-103*/ acb->firm_cfg_version = readl(&reg->message_rwbuffer[25]); /*firm_cfg_version,25,100-103*/
return true; return true;
} }
static bool arcmsr_get_hbb_config(struct AdapterControlBlock *acb) static bool arcmsr_hbaB_get_config(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
struct pci_dev *pdev = acb->pdev; struct pci_dev *pdev = acb->pdev;
...@@ -2240,7 +2241,7 @@ static bool arcmsr_get_hbb_config(struct AdapterControlBlock *acb) ...@@ -2240,7 +2241,7 @@ static bool arcmsr_get_hbb_config(struct AdapterControlBlock *acb)
printk(KERN_NOTICE "arcmsr%d: dma_alloc_coherent got error for hbb mu\n", acb->host->host_no); printk(KERN_NOTICE "arcmsr%d: dma_alloc_coherent got error for hbb mu\n", acb->host->host_no);
return false; return false;
} }
acb->dma_coherent_handle_hbb_mu = dma_coherent_handle; acb->dma_coherent_handle2 = dma_coherent_handle;
reg = (struct MessageUnit_B *)dma_coherent; reg = (struct MessageUnit_B *)dma_coherent;
acb->pmuB = reg; acb->pmuB = reg;
reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL); reg->drv2iop_doorbell= (uint32_t __iomem *)((unsigned long)acb->mem_base0 + ARCMSR_DRV2IOP_DOORBELL);
...@@ -2255,7 +2256,7 @@ static bool arcmsr_get_hbb_config(struct AdapterControlBlock *acb) ...@@ -2255,7 +2256,7 @@ static bool arcmsr_get_hbb_config(struct AdapterControlBlock *acb)
iop_device_map = (char __iomem *)(&reg->message_rwbuffer[21]); /*firm_version,21,84-99*/ iop_device_map = (char __iomem *)(&reg->message_rwbuffer[21]); /*firm_version,21,84-99*/
writel(ARCMSR_MESSAGE_GET_CONFIG, reg->drv2iop_doorbell); writel(ARCMSR_MESSAGE_GET_CONFIG, reg->drv2iop_doorbell);
if (!arcmsr_hbb_wait_msgint_ready(acb)) { if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \ printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \
miscellaneous data' timeout \n", acb->host->host_no); miscellaneous data' timeout \n", acb->host->host_no);
return false; return false;
...@@ -2303,7 +2304,7 @@ static bool arcmsr_get_hbb_config(struct AdapterControlBlock *acb) ...@@ -2303,7 +2304,7 @@ static bool arcmsr_get_hbb_config(struct AdapterControlBlock *acb)
return true; return true;
} }
static bool arcmsr_get_hbc_config(struct AdapterControlBlock *pACB) static bool arcmsr_hbaC_get_config(struct AdapterControlBlock *pACB)
{ {
uint32_t intmask_org, Index, firmware_state = 0; uint32_t intmask_org, Index, firmware_state = 0;
struct MessageUnit_C *reg = pACB->pmuC; struct MessageUnit_C *reg = pACB->pmuC;
...@@ -2367,13 +2368,13 @@ static bool arcmsr_get_firmware_spec(struct AdapterControlBlock *acb) ...@@ -2367,13 +2368,13 @@ static bool arcmsr_get_firmware_spec(struct AdapterControlBlock *acb)
switch (acb->adapter_type) { switch (acb->adapter_type) {
case ACB_ADAPTER_TYPE_A: case ACB_ADAPTER_TYPE_A:
rtn = arcmsr_get_hba_config(acb); rtn = arcmsr_hbaA_get_config(acb);
break; break;
case ACB_ADAPTER_TYPE_B: case ACB_ADAPTER_TYPE_B:
rtn = arcmsr_get_hbb_config(acb); rtn = arcmsr_hbaB_get_config(acb);
break; break;
case ACB_ADAPTER_TYPE_C: case ACB_ADAPTER_TYPE_C:
rtn = arcmsr_get_hbc_config(acb); rtn = arcmsr_hbaC_get_config(acb);
break; break;
default: default:
break; break;
...@@ -2386,7 +2387,7 @@ static bool arcmsr_get_firmware_spec(struct AdapterControlBlock *acb) ...@@ -2386,7 +2387,7 @@ static bool arcmsr_get_firmware_spec(struct AdapterControlBlock *acb)
return rtn; return rtn;
} }
static int arcmsr_polling_hba_ccbdone(struct AdapterControlBlock *acb, static int arcmsr_hbaA_polling_ccbdone(struct AdapterControlBlock *acb,
struct CommandControlBlock *poll_ccb) struct CommandControlBlock *poll_ccb)
{ {
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
...@@ -2442,7 +2443,7 @@ static int arcmsr_polling_hba_ccbdone(struct AdapterControlBlock *acb, ...@@ -2442,7 +2443,7 @@ static int arcmsr_polling_hba_ccbdone(struct AdapterControlBlock *acb,
return rtn; return rtn;
} }
static int arcmsr_polling_hbb_ccbdone(struct AdapterControlBlock *acb, static int arcmsr_hbaB_polling_ccbdone(struct AdapterControlBlock *acb,
struct CommandControlBlock *poll_ccb) struct CommandControlBlock *poll_ccb)
{ {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
...@@ -2506,7 +2507,8 @@ static int arcmsr_polling_hbb_ccbdone(struct AdapterControlBlock *acb, ...@@ -2506,7 +2507,8 @@ static int arcmsr_polling_hbb_ccbdone(struct AdapterControlBlock *acb,
return rtn; return rtn;
} }
static int arcmsr_polling_hbc_ccbdone(struct AdapterControlBlock *acb, struct CommandControlBlock *poll_ccb) static int arcmsr_hbaC_polling_ccbdone(struct AdapterControlBlock *acb,
struct CommandControlBlock *poll_ccb)
{ {
struct MessageUnit_C *reg = (struct MessageUnit_C *)acb->pmuC; struct MessageUnit_C *reg = (struct MessageUnit_C *)acb->pmuC;
uint32_t flag_ccb, ccb_cdb_phy; uint32_t flag_ccb, ccb_cdb_phy;
...@@ -2569,16 +2571,16 @@ static int arcmsr_polling_ccbdone(struct AdapterControlBlock *acb, ...@@ -2569,16 +2571,16 @@ static int arcmsr_polling_ccbdone(struct AdapterControlBlock *acb,
switch (acb->adapter_type) { switch (acb->adapter_type) {
case ACB_ADAPTER_TYPE_A: { case ACB_ADAPTER_TYPE_A: {
rtn = arcmsr_polling_hba_ccbdone(acb, poll_ccb); rtn = arcmsr_hbaA_polling_ccbdone(acb, poll_ccb);
} }
break; break;
case ACB_ADAPTER_TYPE_B: { case ACB_ADAPTER_TYPE_B: {
rtn = arcmsr_polling_hbb_ccbdone(acb, poll_ccb); rtn = arcmsr_hbaB_polling_ccbdone(acb, poll_ccb);
} }
break; break;
case ACB_ADAPTER_TYPE_C: { case ACB_ADAPTER_TYPE_C: {
rtn = arcmsr_polling_hbc_ccbdone(acb, poll_ccb); rtn = arcmsr_hbaC_polling_ccbdone(acb, poll_ccb);
} }
} }
return rtn; return rtn;
...@@ -2612,7 +2614,7 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb) ...@@ -2612,7 +2614,7 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)
writel(cdb_phyaddr_hi32, &reg->message_rwbuffer[1]); writel(cdb_phyaddr_hi32, &reg->message_rwbuffer[1]);
writel(ARCMSR_INBOUND_MESG0_SET_CONFIG, \ writel(ARCMSR_INBOUND_MESG0_SET_CONFIG, \
&reg->inbound_msgaddr0); &reg->inbound_msgaddr0);
if (!arcmsr_hba_wait_msgint_ready(acb)) { if (!arcmsr_hbaA_wait_msgint_ready(acb)) {
printk(KERN_NOTICE "arcmsr%d: ""set ccb high \ printk(KERN_NOTICE "arcmsr%d: ""set ccb high \
part physical address timeout\n", part physical address timeout\n",
acb->host->host_no); acb->host->host_no);
...@@ -2630,12 +2632,12 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb) ...@@ -2630,12 +2632,12 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)
reg->postq_index = 0; reg->postq_index = 0;
reg->doneq_index = 0; reg->doneq_index = 0;
writel(ARCMSR_MESSAGE_SET_POST_WINDOW, reg->drv2iop_doorbell); writel(ARCMSR_MESSAGE_SET_POST_WINDOW, reg->drv2iop_doorbell);
if (!arcmsr_hbb_wait_msgint_ready(acb)) { if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
printk(KERN_NOTICE "arcmsr%d:can not set diver mode\n", \ printk(KERN_NOTICE "arcmsr%d:can not set diver mode\n", \
acb->host->host_no); acb->host->host_no);
return 1; return 1;
} }
post_queue_phyaddr = acb->dma_coherent_handle_hbb_mu; post_queue_phyaddr = acb->dma_coherent_handle2;
rwbuffer = reg->message_rwbuffer; rwbuffer = reg->message_rwbuffer;
/* driver "set config" signature */ /* driver "set config" signature */
writel(ARCMSR_SIGNATURE_SET_CONFIG, rwbuffer++); writel(ARCMSR_SIGNATURE_SET_CONFIG, rwbuffer++);
...@@ -2649,13 +2651,13 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb) ...@@ -2649,13 +2651,13 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)
writel(1056, rwbuffer); writel(1056, rwbuffer);
writel(ARCMSR_MESSAGE_SET_CONFIG, reg->drv2iop_doorbell); writel(ARCMSR_MESSAGE_SET_CONFIG, reg->drv2iop_doorbell);
if (!arcmsr_hbb_wait_msgint_ready(acb)) { if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
printk(KERN_NOTICE "arcmsr%d: 'set command Q window' \ printk(KERN_NOTICE "arcmsr%d: 'set command Q window' \
timeout \n",acb->host->host_no); timeout \n",acb->host->host_no);
return 1; return 1;
} }
writel(ARCMSR_MESSAGE_START_DRIVER_MODE, reg->drv2iop_doorbell); writel(ARCMSR_MESSAGE_START_DRIVER_MODE, reg->drv2iop_doorbell);
if (!arcmsr_hbb_wait_msgint_ready(acb)) { if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
pr_err("arcmsr%d: can't set driver mode.\n", pr_err("arcmsr%d: can't set driver mode.\n",
acb->host->host_no); acb->host->host_no);
return 1; return 1;
...@@ -2672,7 +2674,7 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb) ...@@ -2672,7 +2674,7 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)
writel(cdb_phyaddr_hi32, &reg->msgcode_rwbuffer[1]); writel(cdb_phyaddr_hi32, &reg->msgcode_rwbuffer[1]);
writel(ARCMSR_INBOUND_MESG0_SET_CONFIG, &reg->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_SET_CONFIG, &reg->inbound_msgaddr0);
writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell); writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell);
if (!arcmsr_hbc_wait_msgint_ready(acb)) { if (!arcmsr_hbaC_wait_msgint_ready(acb)) {
printk(KERN_NOTICE "arcmsr%d: 'set command Q window' \ printk(KERN_NOTICE "arcmsr%d: 'set command Q window' \
timeout \n", acb->host->host_no); timeout \n", acb->host->host_no);
return 1; return 1;
...@@ -2713,7 +2715,7 @@ static void arcmsr_wait_firmware_ready(struct AdapterControlBlock *acb) ...@@ -2713,7 +2715,7 @@ static void arcmsr_wait_firmware_ready(struct AdapterControlBlock *acb)
} }
} }
static void arcmsr_request_hba_device_map(struct AdapterControlBlock *acb) static void arcmsr_hbaA_request_device_map(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
if (unlikely(atomic_read(&acb->rq_map_token) == 0) || ((acb->acb_flags & ACB_F_BUS_RESET) != 0 ) || ((acb->acb_flags & ACB_F_ABORT) != 0 )){ if (unlikely(atomic_read(&acb->rq_map_token) == 0) || ((acb->acb_flags & ACB_F_BUS_RESET) != 0 ) || ((acb->acb_flags & ACB_F_ABORT) != 0 )){
...@@ -2735,7 +2737,7 @@ static void arcmsr_request_hba_device_map(struct AdapterControlBlock *acb) ...@@ -2735,7 +2737,7 @@ static void arcmsr_request_hba_device_map(struct AdapterControlBlock *acb)
return; return;
} }
static void arcmsr_request_hbb_device_map(struct AdapterControlBlock *acb) static void arcmsr_hbaB_request_device_map(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_B __iomem *reg = acb->pmuB; struct MessageUnit_B __iomem *reg = acb->pmuB;
if (unlikely(atomic_read(&acb->rq_map_token) == 0) || ((acb->acb_flags & ACB_F_BUS_RESET) != 0 ) || ((acb->acb_flags & ACB_F_ABORT) != 0 )){ if (unlikely(atomic_read(&acb->rq_map_token) == 0) || ((acb->acb_flags & ACB_F_BUS_RESET) != 0 ) || ((acb->acb_flags & ACB_F_ABORT) != 0 )){
...@@ -2757,7 +2759,7 @@ static void arcmsr_request_hbb_device_map(struct AdapterControlBlock *acb) ...@@ -2757,7 +2759,7 @@ static void arcmsr_request_hbb_device_map(struct AdapterControlBlock *acb)
return; return;
} }
static void arcmsr_request_hbc_device_map(struct AdapterControlBlock *acb) static void arcmsr_hbaC_request_device_map(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_C __iomem *reg = acb->pmuC; struct MessageUnit_C __iomem *reg = acb->pmuC;
if (unlikely(atomic_read(&acb->rq_map_token) == 0) || ((acb->acb_flags & ACB_F_BUS_RESET) != 0) || ((acb->acb_flags & ACB_F_ABORT) != 0)) { if (unlikely(atomic_read(&acb->rq_map_token) == 0) || ((acb->acb_flags & ACB_F_BUS_RESET) != 0) || ((acb->acb_flags & ACB_F_ABORT) != 0)) {
...@@ -2785,48 +2787,48 @@ static void arcmsr_request_device_map(unsigned long pacb) ...@@ -2785,48 +2787,48 @@ static void arcmsr_request_device_map(unsigned long pacb)
struct AdapterControlBlock *acb = (struct AdapterControlBlock *)pacb; struct AdapterControlBlock *acb = (struct AdapterControlBlock *)pacb;
switch (acb->adapter_type) { switch (acb->adapter_type) {
case ACB_ADAPTER_TYPE_A: { case ACB_ADAPTER_TYPE_A: {
arcmsr_request_hba_device_map(acb); arcmsr_hbaA_request_device_map(acb);
} }
break; break;
case ACB_ADAPTER_TYPE_B: { case ACB_ADAPTER_TYPE_B: {
arcmsr_request_hbb_device_map(acb); arcmsr_hbaB_request_device_map(acb);
} }
break; break;
case ACB_ADAPTER_TYPE_C: { case ACB_ADAPTER_TYPE_C: {
arcmsr_request_hbc_device_map(acb); arcmsr_hbaC_request_device_map(acb);
} }
} }
} }
static void arcmsr_start_hba_bgrb(struct AdapterControlBlock *acb) static void arcmsr_hbaA_start_bgrb(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_A __iomem *reg = acb->pmuA; struct MessageUnit_A __iomem *reg = acb->pmuA;
acb->acb_flags |= ACB_F_MSG_START_BGRB; acb->acb_flags |= ACB_F_MSG_START_BGRB;
writel(ARCMSR_INBOUND_MESG0_START_BGRB, &reg->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_START_BGRB, &reg->inbound_msgaddr0);
if (!arcmsr_hba_wait_msgint_ready(acb)) { if (!arcmsr_hbaA_wait_msgint_ready(acb)) {
printk(KERN_NOTICE "arcmsr%d: wait 'start adapter background \ printk(KERN_NOTICE "arcmsr%d: wait 'start adapter background \
rebulid' timeout \n", acb->host->host_no); rebulid' timeout \n", acb->host->host_no);
} }
} }
static void arcmsr_start_hbb_bgrb(struct AdapterControlBlock *acb) static void arcmsr_hbaB_start_bgrb(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
acb->acb_flags |= ACB_F_MSG_START_BGRB; acb->acb_flags |= ACB_F_MSG_START_BGRB;
writel(ARCMSR_MESSAGE_START_BGRB, reg->drv2iop_doorbell); writel(ARCMSR_MESSAGE_START_BGRB, reg->drv2iop_doorbell);
if (!arcmsr_hbb_wait_msgint_ready(acb)) { if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
printk(KERN_NOTICE "arcmsr%d: wait 'start adapter background \ printk(KERN_NOTICE "arcmsr%d: wait 'start adapter background \
rebulid' timeout \n",acb->host->host_no); rebulid' timeout \n",acb->host->host_no);
} }
} }
static void arcmsr_start_hbc_bgrb(struct AdapterControlBlock *pACB) static void arcmsr_hbaC_start_bgrb(struct AdapterControlBlock *pACB)
{ {
struct MessageUnit_C *phbcmu = (struct MessageUnit_C *)pACB->pmuC; struct MessageUnit_C *phbcmu = (struct MessageUnit_C *)pACB->pmuC;
pACB->acb_flags |= ACB_F_MSG_START_BGRB; pACB->acb_flags |= ACB_F_MSG_START_BGRB;
writel(ARCMSR_INBOUND_MESG0_START_BGRB, &phbcmu->inbound_msgaddr0); writel(ARCMSR_INBOUND_MESG0_START_BGRB, &phbcmu->inbound_msgaddr0);
writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &phbcmu->inbound_doorbell); writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &phbcmu->inbound_doorbell);
if (!arcmsr_hbc_wait_msgint_ready(pACB)) { if (!arcmsr_hbaC_wait_msgint_ready(pACB)) {
printk(KERN_NOTICE "arcmsr%d: wait 'start adapter background \ printk(KERN_NOTICE "arcmsr%d: wait 'start adapter background \
rebulid' timeout \n", pACB->host->host_no); rebulid' timeout \n", pACB->host->host_no);
} }
...@@ -2836,13 +2838,13 @@ static void arcmsr_start_adapter_bgrb(struct AdapterControlBlock *acb) ...@@ -2836,13 +2838,13 @@ static void arcmsr_start_adapter_bgrb(struct AdapterControlBlock *acb)
{ {
switch (acb->adapter_type) { switch (acb->adapter_type) {
case ACB_ADAPTER_TYPE_A: case ACB_ADAPTER_TYPE_A:
arcmsr_start_hba_bgrb(acb); arcmsr_hbaA_start_bgrb(acb);
break; break;
case ACB_ADAPTER_TYPE_B: case ACB_ADAPTER_TYPE_B:
arcmsr_start_hbb_bgrb(acb); arcmsr_hbaB_start_bgrb(acb);
break; break;
case ACB_ADAPTER_TYPE_C: case ACB_ADAPTER_TYPE_C:
arcmsr_start_hbc_bgrb(acb); arcmsr_hbaC_start_bgrb(acb);
} }
} }
...@@ -2900,7 +2902,7 @@ static void arcmsr_enable_eoi_mode(struct AdapterControlBlock *acb) ...@@ -2900,7 +2902,7 @@ static void arcmsr_enable_eoi_mode(struct AdapterControlBlock *acb)
{ {
struct MessageUnit_B *reg = acb->pmuB; struct MessageUnit_B *reg = acb->pmuB;
writel(ARCMSR_MESSAGE_ACTIVE_EOI_MODE, reg->drv2iop_doorbell); writel(ARCMSR_MESSAGE_ACTIVE_EOI_MODE, reg->drv2iop_doorbell);
if (!arcmsr_hbb_wait_msgint_ready(acb)) { if (!arcmsr_hbaB_wait_msgint_ready(acb)) {
printk(KERN_NOTICE "ARCMSR IOP enables EOI_MODE TIMEOUT"); printk(KERN_NOTICE "ARCMSR IOP enables EOI_MODE TIMEOUT");
return; return;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7