Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
Pull PCI fixes from Jesse Barnes: "A couple of fixes for booting specific machines, and one for a minor memory leak on pre-_CRS platforms." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci: x86/PCI: do not tie MSI MS-7253 use_crs quirk to BIOS version x86/PCI: use host bridge _CRS info on MSI MS-7253 PCI: fix memleak when ACPI _CRS is not used.
This commit is contained in:
commit
4f0449e26f
|
@ -60,6 +60,16 @@ static const struct dmi_system_id pci_use_crs_table[] __initconst = {
|
||||||
DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
/* https://bugzilla.kernel.org/show_bug.cgi?id=42619 */
|
||||||
|
{
|
||||||
|
.callback = set_use_crs,
|
||||||
|
.ident = "MSI MS-7253",
|
||||||
|
.matches = {
|
||||||
|
DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"),
|
||||||
|
DMI_MATCH(DMI_BOARD_NAME, "MS-7253"),
|
||||||
|
DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"),
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
/* Now for the blacklist.. */
|
/* Now for the blacklist.. */
|
||||||
|
|
||||||
|
@ -282,9 +292,6 @@ static void add_resources(struct pci_root_info *info)
|
||||||
int i;
|
int i;
|
||||||
struct resource *res, *root, *conflict;
|
struct resource *res, *root, *conflict;
|
||||||
|
|
||||||
if (!pci_use_crs)
|
|
||||||
return;
|
|
||||||
|
|
||||||
coalesce_windows(info, IORESOURCE_MEM);
|
coalesce_windows(info, IORESOURCE_MEM);
|
||||||
coalesce_windows(info, IORESOURCE_IO);
|
coalesce_windows(info, IORESOURCE_IO);
|
||||||
|
|
||||||
|
@ -336,8 +343,13 @@ get_current_resources(struct acpi_device *device, int busnum,
|
||||||
acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
|
acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource,
|
||||||
&info);
|
&info);
|
||||||
|
|
||||||
add_resources(&info);
|
if (pci_use_crs) {
|
||||||
return;
|
add_resources(&info);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
kfree(info.name);
|
||||||
|
|
||||||
name_alloc_fail:
|
name_alloc_fail:
|
||||||
kfree(info.res);
|
kfree(info.res);
|
||||||
|
|
Loading…
Reference in a new issue