microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[SCSI] megaraid_sas: Use lowest memory bar for SR-IOV VF support 

The following patch modifies the megaraid_sas driver to select the
lowest memory bar available so the driver will work in SR-IOV VF
environments where the memory bar mapping changes.

Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
adam radford 2010-12-14 18:56:07 -08:00 коммит произвёл James Bottomley
Родитель 80d9da98b4
Коммит b6d5d8808b
2 изменённых файлов: 10 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
drivers/scsi/megaraid/megaraid_sas.h
Просмотреть файл

@ -1338,6 +1338,7 @@ struct megasas_instance {
u8 msi_flag; u8 msi_flag;
struct msix_entry msixentry; struct msix_entry msixentry;
unsigned long bar;
}; };
enum { enum {

27
drivers/scsi/megaraid/megaraid_sas_base.c
Просмотреть файл

@ -3236,21 +3236,14 @@ static int megasas_init_mfi(struct megasas_instance *instance)
u32 tmp_sectors; u32 tmp_sectors;
struct megasas_register_set __iomem *reg_set; struct megasas_register_set __iomem *reg_set;
struct megasas_ctrl_info *ctrl_info; struct megasas_ctrl_info *ctrl_info;
/* unsigned long bar_list;
* Map the message registers
*/
if ((instance->pdev->device == PCI_DEVICE_ID_LSI_SAS1078GEN2) ||
(instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0071SKINNY) ||
(instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0073SKINNY) ||
(instance->pdev->device == PCI_DEVICE_ID_LSI_SAS0079GEN2)) {
instance->base_addr = pci_resource_start(instance->pdev, 1);
} else {
instance->base_addr = pci_resource_start(instance->pdev, 0);
}
if (pci_request_selected_regions(instance->pdev, /* Find first memory bar */
pci_select_bars(instance->pdev, IORESOURCE_MEM), bar_list = pci_select_bars(instance->pdev, IORESOURCE_MEM);
"megasas: LSI")) { 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"); printk(KERN_DEBUG "megasas: IO memory region busy!\n");
return -EBUSY; return -EBUSY;
} }
@ -3411,8 +3404,7 @@ static int megasas_init_mfi(struct megasas_instance *instance)
iounmap(instance->reg_set); iounmap(instance->reg_set);
fail_ioremap: fail_ioremap:
pci_release_selected_regions(instance->pdev, pci_release_selected_regions(instance->pdev, instance->bar);
pci_select_bars(instance->pdev, IORESOURCE_MEM));
return -EINVAL; return -EINVAL;
} }
@ -3432,8 +3424,7 @@ static void megasas_release_mfi(struct megasas_instance *instance)
iounmap(instance->reg_set); iounmap(instance->reg_set);
pci_release_selected_regions(instance->pdev, pci_release_selected_regions(instance->pdev, instance->bar);
pci_select_bars(instance->pdev, IORESOURCE_MEM));
} }
/** /**