scsi: arcmsr: Update ACB_ADAPTER_TYPE_B for >4GB ccb addressing (e66764f2) · Commits · 戴 / test

drivers/scsi/arcmsr/arcmsr_hba.c

+17 −5

Original line number	Diff line number	Diff line
		@@ -1418,7 +1418,10 @@ static void arcmsr_done4abort_postqueue(struct AdapterControlBlock *acb)
		flag_ccb = reg->done_qbuffer[i];
		if (flag_ccb != 0) {
		reg->done_qbuffer[i] = 0;
		pARCMSR_CDB = (struct ARCMSR_CDB )(acb->vir2phy_offset+(flag_ccb << 5));/frame must be 32 bytes aligned*/
		ccb_cdb_phy = (flag_ccb << 5) & 0xffffffff;
		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_MODE0) ? true : false;
		arcmsr_drain_donequeue(acb, pCCB, error);
		@@ -2358,13 +2361,18 @@ static void arcmsr_hbaB_postqueue_isr(struct AdapterControlBlock *acb)
		struct ARCMSR_CDB *pARCMSR_CDB;
		struct CommandControlBlock *pCCB;
		bool error;
		unsigned long cdb_phy_addr;

		index = reg->doneq_index;
		while ((flag_ccb = reg->done_qbuffer[index]) != 0) {
		reg->done_qbuffer[index] = 0;
		pARCMSR_CDB = (struct ARCMSR_CDB )(acb->vir2phy_offset+(flag_ccb << 5));/frame must be 32 bytes aligned*/
		cdb_phy_addr = (flag_ccb << 5) & 0xffffffff;
		if (acb->cdb_phyadd_hipart)
		cdb_phy_addr = cdb_phy_addr \| acb->cdb_phyadd_hipart;
		pARCMSR_CDB = (struct ARCMSR_CDB *)(acb->vir2phy_offset + cdb_phy_addr);
		pCCB = container_of(pARCMSR_CDB, struct CommandControlBlock, arcmsr_cdb);
		error = (flag_ccb & ARCMSR_CCBREPLY_FLAG_ERROR_MODE0) ? true : false;
		arcmsr_drain_donequeue(acb, pCCB, error);
		reg->done_qbuffer[index] = 0;
		index++;
		index %= ARCMSR_MAX_HBB_POSTQUEUE;
		reg->doneq_index = index;
		@@ -3329,8 +3337,9 @@ static int arcmsr_hbaB_polling_ccbdone(struct AdapterControlBlock *acb,
		uint32_t flag_ccb, poll_ccb_done = 0, poll_count = 0;
		int index, rtn;
		bool error;
		polling_hbb_ccb_retry:
		unsigned long ccb_cdb_phy;

		polling_hbb_ccb_retry:
		poll_count++;
		/* clear doorbell interrupt */
		writel(ARCMSR_DOORBELL_INT_CLEAR_PATTERN, reg->iop2drv_doorbell);
		@@ -3356,7 +3365,10 @@ static int arcmsr_hbaB_polling_ccbdone(struct AdapterControlBlock *acb,
		index %= ARCMSR_MAX_HBB_POSTQUEUE;
		reg->doneq_index = index;
		/* check if command done with no error*/
		arcmsr_cdb = (struct ARCMSR_CDB *)(acb->vir2phy_offset + (flag_ccb << 5));
		ccb_cdb_phy = (flag_ccb << 5) & 0xffffffff;
		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, arcmsr_cdb);
		poll_ccb_done \|= (ccb == poll_ccb) ? 1 : 0;
		if ((ccb->acb != acb) \|\| (ccb->startdone != ARCMSR_CCB_START)) {

Admin message