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

Commit e1438581 authored by Mike Miller's avatar Mike Miller Committed by Jens Axboe
Browse files

cciss: change to discover first memory BAR 



Add a method for discovering the first memory BAR.  All Smart Array
controllers to date have always had the the memory BAR as the first BAR.
A new controller to be released later this year breaks that model.

Signed-off-by: default avatarMike Miller <mike.miller@hp.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 0a9279cc

drivers/block/cciss.c

+14 −5
Original line number Diff line number Diff line
@@ -3265,12 +3265,21 @@ static int __devinit cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) 
 */

	cciss_interrupt_mode(c, pdev, board_id);



	/*

	 * Memory base addr is first addr , the second points to the config

	 *   table

	/* find the memory BAR */

	for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {

		if (pci_resource_flags(pdev, i) & IORESOURCE_MEM)

			break;

	}

	if (i == DEVICE_COUNT_RESOURCE) {

		printk(KERN_WARNING "cciss: No memory BAR found\n");

		err = -ENODEV;

		goto err_out_free_res;

	}



	c->paddr = pci_resource_start(pdev, i); /* addressing mode bits

						 * already removed

						 */



	c->paddr = pci_resource_start(pdev, 0);	/* addressing mode bits already removed */

#ifdef CCISS_DEBUG

	printk("address 0 = %lx\n", c->paddr);

#endif				/* CCISS_DEBUG */