Date: Mon, 30 Jan 2012 19:19:02 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 205416 for review Message-ID: <201201301919.q0UJJ2p3088537@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@205416?ac=10 Change 205416 by jhb@jhb_jhbbsd on 2012/01/30 19:18:57 Account for mismerge. Affected files ... .. //depot/projects/multipass/sys/dev/acpica/acpi.c#10 edit Differences ... ==== //depot/projects/multipass/sys/dev/acpica/acpi.c#10 (text+ko) ==== @@ -1117,38 +1117,6 @@ return (0); } -static int -acpi_set_resource(device_t dev, device_t child, int type, int rid, - u_long start, u_long count) -{ - struct acpi_device *ad = device_get_ivars(child); - struct resource_list *rl = &ad->ad_rl; - char *pcilink_ids[] = { "PNP0C0F", NULL }; - char *sysres_ids[] = { "PNP0C01", "PNP0C02", NULL }; - u_long end; - - /* Ignore IRQ resources for PCI link devices. */ - if (type == SYS_RES_IRQ && ACPI_ID_PROBE(dev, child, pcilink_ids) != NULL) - return (0); - - /* Add the resource. */ - end = (start + count - 1); - resource_list_add(rl, type, rid, start, end, count); - - /* Don't reserve system resources. */ - if (ACPI_ID_PROBE(dev, child, sysres_ids) != NULL) - return (0); - - /* - * Reserve the resource. - * - * XXX: Ignores failure for now. Failure here is probably a - * BIOS/firmware bug? - */ - resource_list_reserve(rl, dev, child, type, &rid, start, end, count, 0); - return (0); -} - static char *pcilink_ids[] = { "PNP0C0F", NULL }; static char *sysres_ids[] = { "PNP0C01", "PNP0C02", NULL }; @@ -1848,12 +1816,9 @@ /* * 3. Embedded controllers (to handle early accesses) - * 4. PCI Link Devices (XXX: still?) */ if (acpi_MatchHid(handle, "PNP0C09")) *order = 3; - else if (acpi_MatchHid(handle, "PNP0C0F")) - *order = 4; } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201201301919.q0UJJ2p3088537>