scsi: arcmsr: Rename acb structure member roundup_ccbsize to ioqueue_size (381d66da) · Commits · 戴 / test

drivers/scsi/arcmsr/arcmsr.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -739,7 +739,7 @@ struct AdapterControlBlock
		#define ACB_ADAPTER_TYPE_C 0x00000002 /* hbc L IOP */
		#define ACB_ADAPTER_TYPE_D 0x00000003 /* hbd M IOP */
		#define ACB_ADAPTER_TYPE_E 0x00000004 /* hba L IOP */
		u32 roundup_ccbsize;
		u32 ioqueue_size;
		struct pci_dev * pdev;
		struct Scsi_Host * host;
		unsigned long vir2phy_offset;

drivers/scsi/arcmsr/arcmsr_hba.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -229,7 +229,7 @@ static void arcmsr_free_mu(struct AdapterControlBlock *acb)
		case ACB_ADAPTER_TYPE_B:
		case ACB_ADAPTER_TYPE_D:
		case ACB_ADAPTER_TYPE_E: {
		dma_free_coherent(&acb->pdev->dev, acb->roundup_ccbsize,
		dma_free_coherent(&acb->pdev->dev, acb->ioqueue_size,
		acb->dma_coherent2, acb->dma_coherent_handle2);
		break;
		}
		@@ -586,8 +586,8 @@ static bool arcmsr_alloc_io_queue(struct AdapterControlBlock *acb)
		switch (acb->adapter_type) {
		case ACB_ADAPTER_TYPE_B: {
		struct MessageUnit_B *reg;
		acb->roundup_ccbsize = roundup(sizeof(struct MessageUnit_B), 32);
		dma_coherent = dma_zalloc_coherent(&pdev->dev, acb->roundup_ccbsize,
		acb->ioqueue_size = roundup(sizeof(struct MessageUnit_B), 32);
		dma_coherent = dma_zalloc_coherent(&pdev->dev, acb->ioqueue_size,
		&dma_coherent_handle, GFP_KERNEL);
		if (!dma_coherent) {
		pr_notice("arcmsr%d: DMA allocation failed\n", acb->host->host_no);
		@@ -616,8 +616,8 @@ static bool arcmsr_alloc_io_queue(struct AdapterControlBlock *acb)
		case ACB_ADAPTER_TYPE_D: {
		struct MessageUnit_D *reg;

		acb->roundup_ccbsize = roundup(sizeof(struct MessageUnit_D), 32);
		dma_coherent = dma_zalloc_coherent(&pdev->dev, acb->roundup_ccbsize,
		acb->ioqueue_size = roundup(sizeof(struct MessageUnit_D), 32);
		dma_coherent = dma_zalloc_coherent(&pdev->dev, acb->ioqueue_size,
		&dma_coherent_handle, GFP_KERNEL);
		if (!dma_coherent) {
		pr_notice("arcmsr%d: DMA allocation failed\n", acb->host->host_no);
		@@ -658,8 +658,8 @@ static bool arcmsr_alloc_io_queue(struct AdapterControlBlock *acb)
		case ACB_ADAPTER_TYPE_E: {
		uint32_t completeQ_size;
		completeQ_size = sizeof(struct deliver_completeQ) * ARCMSR_MAX_HBE_DONEQUEUE + 128;
		acb->roundup_ccbsize = roundup(completeQ_size, 32);
		dma_coherent = dma_zalloc_coherent(&pdev->dev, acb->roundup_ccbsize,
		acb->ioqueue_size = roundup(completeQ_size, 32);
		dma_coherent = dma_zalloc_coherent(&pdev->dev, acb->ioqueue_size,
		&dma_coherent_handle, GFP_KERNEL);
		if (!dma_coherent){
		pr_notice("arcmsr%d: DMA allocation failed\n", acb->host->host_no);
		@@ -668,7 +668,7 @@ static bool arcmsr_alloc_io_queue(struct AdapterControlBlock *acb)
		acb->dma_coherent_handle2 = dma_coherent_handle;
		acb->dma_coherent2 = dma_coherent;
		acb->pCompletionQ = dma_coherent;
		acb->completionQ_entry = acb->roundup_ccbsize / sizeof(struct deliver_completeQ);
		acb->completionQ_entry = acb->ioqueue_size / sizeof(struct deliver_completeQ);
		acb->doneq_index = 0;
		}
		break;
		@@ -3787,7 +3787,7 @@ static int arcmsr_iop_confirm(struct AdapterControlBlock *acb)
		cdb_phyaddr_hi32 = (uint32_t)((dma_coherent_handle >> 16) >> 16);
		writel(cdb_phyaddr, &reg->msgcode_rwbuffer[5]);
		writel(cdb_phyaddr_hi32, &reg->msgcode_rwbuffer[6]);
		writel(acb->roundup_ccbsize, &reg->msgcode_rwbuffer[7]);
		writel(acb->ioqueue_size, &reg->msgcode_rwbuffer[7]);
		writel(ARCMSR_INBOUND_MESG0_SET_CONFIG, &reg->inbound_msgaddr0);
		acb->out_doorbell ^= ARCMSR_HBEMU_DRV2IOP_MESSAGE_CMD_DONE;
		writel(acb->out_doorbell, &reg->iobound_doorbell);

Admin message