Commit 12d2cd47 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by James Bottomley

[SCSI] hpsa: make hpsa_find_memory_BAR not require the per HBA structure.

Rationale for this is that in order to fix the hard reset code used
by kdump, we need to use this function before we even have the per
HBA structure.
Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 6798cc0a
...@@ -3313,20 +3313,20 @@ static inline bool hpsa_board_disabled(struct pci_dev *pdev) ...@@ -3313,20 +3313,20 @@ static inline bool hpsa_board_disabled(struct pci_dev *pdev)
return ((command & PCI_COMMAND_MEMORY) == 0); return ((command & PCI_COMMAND_MEMORY) == 0);
} }
static int __devinit hpsa_pci_find_memory_BAR(struct ctlr_info *h, static int __devinit hpsa_pci_find_memory_BAR(struct pci_dev *pdev,
unsigned long *memory_bar) unsigned long *memory_bar)
{ {
int i; int i;
for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
if (pci_resource_flags(h->pdev, i) & IORESOURCE_MEM) { if (pci_resource_flags(pdev, i) & IORESOURCE_MEM) {
/* addressing mode bits already removed */ /* addressing mode bits already removed */
*memory_bar = pci_resource_start(h->pdev, i); *memory_bar = pci_resource_start(pdev, i);
dev_dbg(&h->pdev->dev, "memory BAR = %lx\n", dev_dbg(&pdev->dev, "memory BAR = %lx\n",
*memory_bar); *memory_bar);
return 0; return 0;
} }
dev_warn(&h->pdev->dev, "no memory BAR found\n"); dev_warn(&pdev->dev, "no memory BAR found\n");
return -ENODEV; return -ENODEV;
} }
...@@ -3503,7 +3503,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h) ...@@ -3503,7 +3503,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h)
return err; return err;
} }
hpsa_interrupt_mode(h); hpsa_interrupt_mode(h);
err = hpsa_pci_find_memory_BAR(h, &h->paddr); err = hpsa_pci_find_memory_BAR(h->pdev, &h->paddr);
if (err) if (err)
goto err_out_free_res; goto err_out_free_res;
h->vaddr = remap_pci_mem(h->paddr, 0x250); h->vaddr = remap_pci_mem(h->paddr, 0x250);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment