Commit c71ec551 authored by Ching Huang's avatar Ching Huang Committed by Martin K. Petersen
Browse files

scsi: arcmsr: Update ACB_ADAPTER_TYPE_C for >4GB ccb addressing 



From Ching Huang <ching2048@areca.com.tw>

Update ACB_ADAPTER_TYPE_C for >4GB ccb addressing

Signed-off-by: default avatarChing Huang <ching2048@areca.com.tw>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent e66764f2

drivers/scsi/arcmsr/arcmsr_hba.c

+15 −12
Original line number Diff line number Diff line
@@ -1438,7 +1438,9 @@ static void arcmsr_done4abort_postqueue(struct AdapterControlBlock *acb) 
			/*need to do*/

			flag_ccb = readl(&reg->outbound_queueport_low);

			ccb_cdb_phy = (flag_ccb & 0xFFFFFFF0);

			pARCMSR_CDB = (struct  ARCMSR_CDB *)(acb->vir2phy_offset+ccb_cdb_phy);/*frame must be 32 bytes aligned*/

			if (acb->cdb_phyadd_hipart)

				ccb_cdb_phy = ccb_cdb_phy | acb->cdb_phyadd_hipart;

			pARCMSR_CDB = (struct  ARCMSR_CDB *)(acb->vir2phy_offset + ccb_cdb_phy);

			pCCB = container_of(pARCMSR_CDB, struct CommandControlBlock, arcmsr_cdb);

			error = (flag_ccb & ARCMSR_CCBREPLY_FLAG_ERROR_MODE1) ? true : false;

			arcmsr_drain_donequeue(acb, pCCB, error);
@@ -1786,13 +1788,9 @@ static void arcmsr_post_ccb(struct AdapterControlBlock *acb, struct CommandContr 


		arc_cdb_size = (ccb->arc_cdb_size > 0x300) ? 0x300 : ccb->arc_cdb_size;

		ccb_post_stamp = (cdb_phyaddr | ((arc_cdb_size - 1) >> 6) | 1);

		if (acb->cdb_phyaddr_hi32) {

			writel(acb->cdb_phyaddr_hi32, &phbcmu->inbound_queueport_high);

			writel(ccb_post_stamp, &phbcmu->inbound_queueport_low);

		} else {

		writel(upper_32_bits(ccb->cdb_phyaddr), &phbcmu->inbound_queueport_high);

		writel(ccb_post_stamp, &phbcmu->inbound_queueport_low);

		}

		}

		break;

	case ACB_ADAPTER_TYPE_D: {

		struct MessageUnit_D  *pmu = acb->pmuD;
@@ -2384,7 +2382,8 @@ static void arcmsr_hbaC_postqueue_isr(struct AdapterControlBlock *acb) 
	struct MessageUnit_C __iomem *phbcmu;

	struct ARCMSR_CDB *arcmsr_cdb;

	struct CommandControlBlock *ccb;

	uint32_t flag_ccb, ccb_cdb_phy, throttling = 0;

	uint32_t flag_ccb, throttling = 0;

	unsigned long ccb_cdb_phy;

	int error;



	phbcmu = acb->pmuC;
@@ -2394,6 +2393,8 @@ static void arcmsr_hbaC_postqueue_isr(struct AdapterControlBlock *acb) 
	while ((flag_ccb = readl(&phbcmu->outbound_queueport_low)) !=

			0xFFFFFFFF) {

		ccb_cdb_phy = (flag_ccb & 0xFFFFFFF0);

		if (acb->cdb_phyadd_hipart)

			ccb_cdb_phy = ccb_cdb_phy | acb->cdb_phyadd_hipart;

		arcmsr_cdb = (struct ARCMSR_CDB *)(acb->vir2phy_offset

			+ ccb_cdb_phy);

		ccb = container_of(arcmsr_cdb, struct CommandControlBlock,
@@ -3401,12 +3402,14 @@ static int arcmsr_hbaC_polling_ccbdone(struct AdapterControlBlock *acb, 
		struct CommandControlBlock *poll_ccb)

{

	struct MessageUnit_C __iomem *reg = acb->pmuC;

	uint32_t flag_ccb, ccb_cdb_phy;

	uint32_t flag_ccb;

	struct ARCMSR_CDB *arcmsr_cdb;

	bool error;

	struct CommandControlBlock *pCCB;

	uint32_t poll_ccb_done = 0, poll_count = 0;

	int rtn;

	unsigned long ccb_cdb_phy;



polling_hbc_ccb_retry:

	poll_count++;

	while (1) {
@@ -3425,7 +3428,9 @@ static int arcmsr_hbaC_polling_ccbdone(struct AdapterControlBlock *acb, 
		}

		flag_ccb = readl(&reg->outbound_queueport_low);

		ccb_cdb_phy = (flag_ccb & 0xFFFFFFF0);

		arcmsr_cdb = (struct ARCMSR_CDB *)(acb->vir2phy_offset + ccb_cdb_phy);/*frame must be 32 bytes aligned*/

		if (acb->cdb_phyadd_hipart)

			ccb_cdb_phy = ccb_cdb_phy | acb->cdb_phyadd_hipart;

		arcmsr_cdb = (struct ARCMSR_CDB *)(acb->vir2phy_offset + ccb_cdb_phy);

		pCCB = container_of(arcmsr_cdb, struct CommandControlBlock, arcmsr_cdb);

		poll_ccb_done |= (pCCB == poll_ccb) ? 1 : 0;

		/* check ifcommand done with no error*/
@@ -3801,7 +3806,6 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb) 
		}

		break;

	case ACB_ADAPTER_TYPE_C: {

		if (cdb_phyaddr_hi32 != 0) {

			struct MessageUnit_C __iomem *reg = acb->pmuC;



			printk(KERN_NOTICE "arcmsr%d: cdb_phyaddr_hi32=0x%x\n",
@@ -3816,7 +3820,6 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb) 
				return 1;

			}

		}

		}

		break;

	case ACB_ADAPTER_TYPE_D: {

		uint32_t __iomem *rwbuffer;