Date: Mon, 7 Nov 2005 22:21:52 GMT From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 86440 for review Message-ID: <200511072221.jA7MLq4S028895@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=86440 Change 86440 by peter@peter_daintree on 2005/11/07 22:21:39 IFC @86439 Affected files ... .. //depot/projects/hammer/sbin/kldconfig/kldconfig.c#6 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#66 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#28 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#21 integrate .. //depot/projects/hammer/sys/dev/si/sireg.h#3 integrate .. //depot/projects/hammer/usr.sbin/config/configvers.h#9 integrate Differences ... ==== //depot/projects/hammer/sbin/kldconfig/kldconfig.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.7 2005/02/10 09:19:29 ru Exp $"); +__FBSDID("$FreeBSD: src/sbin/kldconfig/kldconfig.c,v 1.8 2005/11/07 19:22:20 ru Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -270,7 +270,7 @@ while ((p = strsep(&path, ";")) != NULL) if (!uniq) { - if (((pe = malloc(sizeof(pe))) == NULL) || + if (((pe = malloc(sizeof(*pe))) == NULL) || ((pe->path = strdup(p)) == NULL)) { errno = ENOMEM; err(1, "allocating path element"); ==== //depot/projects/hammer/sys/dev/acpica/acpi.c#66 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.217 2005/11/01 22:44:07 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.219 2005/11/07 21:52:06 jhb Exp $"); #include "opt_acpi.h" #include <sys/param.h> ==== //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#28 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.57 2005/09/11 18:39:01 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.58 2005/11/07 21:48:45 jhb Exp $"); #include "opt_acpi.h" #include <sys/param.h> @@ -96,6 +96,13 @@ if (entry->Source == NULL || entry->Source[0] == '\0') return; + /* + * In practice, we only see SourceIndex's of 0 out in the wild. + * When indices != 0 have been found, they've been bugs in the ASL. + */ + if (entry->SourceIndex != 0) + return; + /* Lookup the associated handle and device. */ pcib = (device_t)arg; if (ACPI_FAILURE(AcpiGetHandle(ACPI_ROOT_OBJECT, entry->Source, &handle))) @@ -236,8 +243,12 @@ /* * If source is empty/NULL, the source index is a global IRQ number * and it's hard-wired so we're done. + * + * XXX: If the source index is non-zero, ignore the source device and + * assume that this is a hard-wired entry. */ - if (prt->Source == NULL || prt->Source[0] == '\0') { + if (prt->Source == NULL || prt->Source[0] == '\0' || + prt->SourceIndex != 0) { if (bootverbose) device_printf(pcib, "slot %d INT%c hardwired to IRQ %d\n", pci_get_slot(dev), 'A' + pin, prt->SourceIndex); ==== //depot/projects/hammer/sys/dev/acpica/acpi_resource.c#21 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.36 2005/11/01 22:44:07 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_resource.c,v 1.38 2005/11/07 21:52:06 jhb Exp $"); #include "opt_acpi.h" #include <sys/param.h> ==== //depot/projects/hammer/sys/dev/si/sireg.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * NO EVENT SHALL THE AUTHORS BE LIABLE. * - * $FreeBSD: src/sys/dev/si/sireg.h,v 1.10 2005/01/06 01:43:14 imp Exp $ + * $FreeBSD: src/sys/dev/si/sireg.h,v 1.11 2005/11/07 21:53:58 jhb Exp $ */ /* @@ -62,14 +62,14 @@ #define SIEISAIOSIZE 0x100 /* XXX How many ports */ /* SI old PCI */ -#define SIPCIBADR 0x10 /* Which BADR to map in RAM */ +#define SIPCIBADR PCIR_BAR(0) /* Which BADR to map in RAM */ #define SIPCI_MEMSIZE 0x100000 /* Mapping size */ #define SIPCIRESET 0xc0001 /* 0 = Reset */ #define SIPCIINTCL 0x40001 /* 0 = clear int */ /* SI Jet PCI */ -#define SIJETSSIDREG 0x2c /* Is it an SX or RIO? */ -#define SIJETBADR 0x18 /* Which BADR to map in RAM */ +#define SIJETSSIDREG PCIR_SUBVEND_0 /* Is it an SX or RIO? */ +#define SIJETBADR PCIR_BAR(2) /* Which BADR to map in RAM */ /* SI Jet PCI & ISA */ #define SIJETIDBASE 0x7c00 /* ID ROM base */ #define SISPLXID 0x984d /* Specialix ID */ ==== //depot/projects/hammer/usr.sbin/config/configvers.h#9 (text+ko) ==== @@ -7,7 +7,7 @@ * libs or param.h/osreldate. * * It is the version number of the protocol between config(8) and the - * sys/conf/* Makefiles (the kernel build system). + * sys/conf/ Makefiles (the kernel build system). * * It is now also used to trap certain problems that the syntax parser cannot * detect. @@ -25,7 +25,7 @@ * The people that are inconvenienced by gratuitous bumps are developers * who run config by hand. * - * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.39 2005/11/07 17:37:27 peter Exp $ + * $FreeBSD: src/usr.sbin/config/configvers.h,v 1.40 2005/11/07 18:45:46 rwatson Exp $ */ #define CONFIGVERS 600003
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200511072221.jA7MLq4S028895>