From owner-freebsd-current@FreeBSD.ORG Sat Sep 3 13:20:41 2011 Return-Path: Delivered-To: freebsd-current@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E3EC1065674; Sat, 3 Sep 2011 13:20:41 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 9FAB68FC08; Sat, 3 Sep 2011 13:20:40 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id QAA02323; Sat, 03 Sep 2011 16:20:38 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1Qzq9G-000IeF-1v; Sat, 03 Sep 2011 16:20:38 +0300 Message-ID: <4E6229A4.2000505@FreeBSD.org> Date: Sat, 03 Sep 2011 16:20:36 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:6.0.1) Gecko/20110901 Thunderbird/6.0.1 MIME-Version: 1.0 To: John Baldwin References: <4E23EE49.5040801@FreeBSD.org> <201107191116.07116.jhb@freebsd.org> <4E33A990.7040006@FreeBSD.org> <201108021806.04759.jhb@freebsd.org> In-Reply-To: <201108021806.04759.jhb@freebsd.org> X-Enigmail-Version: undefined Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: freebsd-current@FreeBSD.org Subject: Re: ichwd0: unable to reserve GCS registers X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 13:20:41 -0000 on 03/08/2011 01:06 John Baldwin said the following: > On Saturday, July 30, 2011 2:49:52 am Andriy Gapon wrote: >> on 19/07/2011 18:16 John Baldwin said the following: >>> Hmm, can you get devinfo -r output from a working kernel with ichwd loaded? >>> You might be able to just build the kernel with 'nooptions NEW_PCIB'. >> >> I believe that I've got a similar problem with amdsbwd(4). >> It needs some resources (I/O ports) that belong to ACPI. >> The problem is that the driver attaches to isa bus which is under >> isab->pci->pcib and those particular resources are not assigned to the Host-PCI >> bridge. >> >> I think that you already made a suggestion that perhaps isa bus should directly >> attach to acpi bus when acpi is available. Not sure if there are any >> alternative approaches. > > Can you try this: Sorry for taking so long to reply to this. The patch does help me with the amdsbwd watchdog driver! I tested the patch on top of r225331. If you would like any additional information please let me know. > --- //depot/projects/pci/sys/dev/acpica/acpi.c 2011-06-25 12:05:19.000000000 0000 > +++ //depot/projects/pci/sys/dev/acpica/acpi.c 2011-08-02 20:21:42.000000000 0000 > @@ -1238,7 +1238,6 @@ > struct resource_list_entry *rle; > struct resource_list *rl; > struct resource *res; > - struct rman *rm; > int isdefault = (start == 0UL && end == ~0UL); > > /* > @@ -1291,15 +1290,29 @@ > } else > res = BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type, rid, > start, end, count, flags); > - if (res != NULL || start + count - 1 != end) > - return (res); > > /* > * If the first attempt failed and this is an allocation of a > * specific range, try to satisfy the request via a suballocation > - * from our system resource regions. Note that we only handle > - * memory and I/O port system resources. > + * from our system resource regions. > */ > + if (res == NULL && start + count - 1 == end) > + res = acpi_alloc_sysres(child, type, rid, start, end, count, flags); > + return (res); > +} > + > +/* > + * Attempt to allocate a specific resource range from the system > + * resource ranges. Note that we only handle memory and I/O port > + * system resources. > + */ > +struct resource * > +acpi_alloc_sysres(device_t child, int type, int *rid, u_long start, u_long end, > + u_long count, u_int flags) > +{ > + struct rman *rm; > + struct resource *res; > + > switch (type) { > case SYS_RES_IOPORT: > rm = &acpi_rman_io; > @@ -1311,6 +1324,7 @@ > return (NULL); > } > > + KASSERT(start + count - 1 == end, ("wildcard resource range")); > res = rman_reserve_resource(rm, start, end, count, flags & ~RF_ACTIVE, > child); > if (res == NULL) > --- //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c 2011-07-22 18:19:55.000000000 0000 > +++ //depot/projects/pci/sys/dev/acpica/acpi_pcib_acpi.c 2011-08-02 20:21:42.000000000 0000 > @@ -541,6 +541,7 @@ > { > #ifdef NEW_PCIB > struct acpi_hpcib_softc *sc; > + struct resource *res; > #endif > > #if defined(__i386__) || defined(__amd64__) > @@ -549,8 +550,11 @@ > > #ifdef NEW_PCIB > sc = device_get_softc(dev); > - return (pcib_host_res_alloc(&sc->ap_host_res, child, type, rid, start, end, > - count, flags)); > + res = pcib_host_res_alloc(&sc->ap_host_res, child, type, rid, start, end, > + count, flags); > + if (res == NULL && start + count - 1 == end) > + res = acpi_alloc_sysres(child, type, rid, start, end, count, flags); > + return (res); > #else > return (bus_generic_alloc_resource(dev, child, type, rid, start, end, > count, flags)); > --- //depot/projects/pci/sys/dev/acpica/acpivar.h 2011-06-22 16:25:39.000000000 0000 > +++ //depot/projects/pci/sys/dev/acpica/acpivar.h 2011-08-02 20:21:42.000000000 0000 > @@ -382,6 +382,8 @@ > struct resource *res, ACPI_RESOURCE *acpi_res); > ACPI_STATUS acpi_parse_resources(device_t dev, ACPI_HANDLE handle, > struct acpi_parse_resource_set *set, void *arg); > +struct resource *acpi_alloc_sysres(device_t child, int type, int *rid, > + u_long start, u_long end, u_long count, u_int flags); > > /* ACPI event handling */ > UINT32 acpi_event_power_button_sleep(void *context); > -- Andriy Gapon