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

arcmsr: fixed getting wrong configuration data 



Fixed getting wrong configuration data of adapter type B and type D.

Signed-off-by: default avatarChing Huang <ching2048@areca.com.tw>
Reviewed-by: default avatarHannes Reinicke <hare@suse.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4cd38e38

drivers/scsi/arcmsr/arcmsr_hba.c

+10 −10
Original line number Diff line number Diff line
@@ -2694,15 +2694,15 @@ static bool arcmsr_hbaB_get_config(struct AdapterControlBlock *acb) 
		acb->firm_model,

		acb->firm_version);



	acb->signature = readl(&reg->message_rwbuffer[1]);

	acb->signature = readl(&reg->message_rwbuffer[0]);

	/*firm_signature,1,00-03*/

	acb->firm_request_len = readl(&reg->message_rwbuffer[2]);

	acb->firm_request_len = readl(&reg->message_rwbuffer[1]);

	/*firm_request_len,1,04-07*/

	acb->firm_numbers_queue = readl(&reg->message_rwbuffer[3]);

	acb->firm_numbers_queue = readl(&reg->message_rwbuffer[2]);

	/*firm_numbers_queue,2,08-11*/

	acb->firm_sdram_size = readl(&reg->message_rwbuffer[4]);

	acb->firm_sdram_size = readl(&reg->message_rwbuffer[3]);

	/*firm_sdram_size,3,12-15*/

	acb->firm_hd_channels = readl(&reg->message_rwbuffer[5]);

	acb->firm_hd_channels = readl(&reg->message_rwbuffer[4]);

	/*firm_ide_channels,4,16-19*/

	acb->firm_cfg_version = readl(&reg->message_rwbuffer[25]);  /*firm_cfg_version,25,100-103*/

	/*firm_ide_channels,4,16-19*/
@@ -2880,15 +2880,15 @@ static bool arcmsr_hbaD_get_config(struct AdapterControlBlock *acb) 
		iop_device_map++;

		count--;

	}

	acb->signature = readl(&reg->msgcode_rwbuffer[1]);

	acb->signature = readl(&reg->msgcode_rwbuffer[0]);

	/*firm_signature,1,00-03*/

	acb->firm_request_len = readl(&reg->msgcode_rwbuffer[2]);

	acb->firm_request_len = readl(&reg->msgcode_rwbuffer[1]);

	/*firm_request_len,1,04-07*/

	acb->firm_numbers_queue = readl(&reg->msgcode_rwbuffer[3]);

	acb->firm_numbers_queue = readl(&reg->msgcode_rwbuffer[2]);

	/*firm_numbers_queue,2,08-11*/

	acb->firm_sdram_size = readl(&reg->msgcode_rwbuffer[4]);

	acb->firm_sdram_size = readl(&reg->msgcode_rwbuffer[3]);

	/*firm_sdram_size,3,12-15*/

	acb->firm_hd_channels = readl(&reg->msgcode_rwbuffer[5]);

	acb->firm_hd_channels = readl(&reg->msgcode_rwbuffer[4]);

	/*firm_hd_channels,4,16-19*/

	acb->firm_cfg_version = readl(&reg->msgcode_rwbuffer[25]);

	pr_notice("Areca RAID Controller%d: Model %s, F/W %s\n",