|
@@ -3615,6 +3615,7 @@ static int megasas_init_fw(struct megasas_instance *instance)
|
|
|
u32 max_sectors_1;
|
|
|
u32 max_sectors_2;
|
|
|
u32 tmp_sectors, msix_enable, scratch_pad_2;
|
|
|
+ resource_size_t base_addr;
|
|
|
struct megasas_register_set __iomem *reg_set;
|
|
|
struct megasas_ctrl_info *ctrl_info;
|
|
|
unsigned long bar_list;
|
|
@@ -3623,14 +3624,14 @@ static int megasas_init_fw(struct megasas_instance *instance)
|
|
|
/* Find first memory bar */
|
|
|
bar_list = pci_select_bars(instance->pdev, IORESOURCE_MEM);
|
|
|
instance->bar = find_first_bit(&bar_list, sizeof(unsigned long));
|
|
|
- instance->base_addr = pci_resource_start(instance->pdev, instance->bar);
|
|
|
if (pci_request_selected_regions(instance->pdev, instance->bar,
|
|
|
"megasas: LSI")) {
|
|
|
printk(KERN_DEBUG "megasas: IO memory region busy!\n");
|
|
|
return -EBUSY;
|
|
|
}
|
|
|
|
|
|
- instance->reg_set = ioremap_nocache(instance->base_addr, 8192);
|
|
|
+ base_addr = pci_resource_start(instance->pdev, instance->bar);
|
|
|
+ instance->reg_set = ioremap_nocache(base_addr, 8192);
|
|
|
|
|
|
if (!instance->reg_set) {
|
|
|
printk(KERN_DEBUG "megasas: Failed to map IO mem\n");
|