Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

scsi: arcmsr: simplify arcmsr_hbaC_get_config function 



Simplify arcmsr_hbaC_get_config function.

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

drivers/scsi/arcmsr/arcmsr_hba.c

+3 −12
Original line number Diff line number Diff line
@@ -3082,7 +3082,7 @@ static bool arcmsr_hbaB_get_config(struct AdapterControlBlock *acb) 


static bool arcmsr_hbaC_get_config(struct AdapterControlBlock *pACB)

{

	uint32_t intmask_org, Index, firmware_state = 0;

	uint32_t intmask_org;

	struct MessageUnit_C __iomem *reg = pACB->pmuC;

	char *acb_firm_model = pACB->firm_model;

	char *acb_firm_version = pACB->firm_version;
@@ -3093,21 +3093,12 @@ static bool arcmsr_hbaC_get_config(struct AdapterControlBlock *pACB) 
	intmask_org = readl(&reg->host_int_mask); /* disable outbound message0 int */

	writel(intmask_org|ARCMSR_HBCMU_ALL_INTMASKENABLE, &reg->host_int_mask);

	/* wait firmware ready */

	do {

		firmware_state = readl(&reg->outbound_msgaddr1);

	} while ((firmware_state & ARCMSR_HBCMU_MESSAGE_FIRMWARE_OK) == 0);

	arcmsr_wait_firmware_ready(pACB);

	/* post "get config" instruction */

	writel(ARCMSR_INBOUND_MESG0_GET_CONFIG, &reg->inbound_msgaddr0);

	writel(ARCMSR_HBCMU_DRV2IOP_MESSAGE_CMD_DONE, &reg->inbound_doorbell);

	/* wait message ready */

	for (Index = 0; Index < 2000; Index++) {

		if (readl(&reg->outbound_doorbell) & ARCMSR_HBCMU_IOP2DRV_MESSAGE_CMD_DONE) {

			writel(ARCMSR_HBCMU_IOP2DRV_MESSAGE_CMD_DONE_DOORBELL_CLEAR, &reg->outbound_doorbell_clear);/*clear interrupt*/

			break;

		}

		udelay(10);

	} /*max 1 seconds*/

	if (Index >= 2000) {

	if (!arcmsr_hbaC_wait_msgint_ready(pACB)) {

		printk(KERN_NOTICE "arcmsr%d: wait 'get adapter firmware \

			miscellaneous data' timeout \n", pACB->host->host_no);

		return false;