From 6c525ee43c7a32f3ad0ebdcbd0d0e79b93504eeb Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Tue, 8 Jul 2003 18:59:32 +0000 Subject: [PATCH] Add an ACPI to ISA psuedo bridge driver. It attaches an isab(4) device to ACPI nodes with the plug and play ID's defined for a "Generic ISA Bus Device" as defined in section 10.7 of the ACPI 2.0 specification. This gives machines like the Libretto that contain a fake ISA bus that is not connected via a PCI-ISA bridge an ISA bus for ISA devices to attach to. Tested by: markm --- sys/conf/files | 1 + sys/dev/acpica/acpi_isab.c | 129 +++++++++++++++++++++++++++++++++++++ sys/modules/acpi/Makefile | 2 +- 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 sys/dev/acpica/acpi_isab.c diff --git a/sys/conf/files b/sys/conf/files index 986e16c702ff..6ba2e9d13520 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -241,6 +241,7 @@ dev/acpica/acpi_button.c optional acpi dev/acpica/acpi_cmbat.c optional acpi dev/acpica/acpi_cpu.c optional acpi dev/acpica/acpi_ec.c optional acpi +dev/acpica/acpi_isab.c optional acpi dev/acpica/acpi_lid.c optional acpi dev/acpica/acpi_pci.c optional acpi pci dev/acpica/acpi_pci_link.c optional acpi pci diff --git a/sys/dev/acpica/acpi_isab.c b/sys/dev/acpica/acpi_isab.c new file mode 100644 index 000000000000..bcb466ba1191 --- /dev/null +++ b/sys/dev/acpica/acpi_isab.c @@ -0,0 +1,129 @@ +/*- + * Copyright (c) 2003 John Baldwin + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +/* + * ISA Bridge driver for Generic ISA Bus Devices. See section 10.7 of the + * ACPI 2.0a specification for details on this device. + */ + +#include "opt_acpi.h" +#include +#include +#include +#include + +#include "acpi.h" + +#include +#include + +/* + * Hooks for the ACPI CA debugging infrastructure + */ +#define _COMPONENT ACPI_BUS +ACPI_MODULE_NAME("ISA_ACPI") + +struct acpi_isab_softc { + device_t ap_dev; + ACPI_HANDLE ap_handle; +}; + + +static int acpi_isab_probe(device_t bus); +static int acpi_isab_attach(device_t bus); +static int acpi_isab_read_ivar(device_t dev, device_t child, int which, + uintptr_t *result); + +static device_method_t acpi_isab_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, acpi_isab_probe), + DEVMETHOD(device_attach, acpi_isab_attach), + DEVMETHOD(device_shutdown, bus_generic_shutdown), + DEVMETHOD(device_suspend, bus_generic_suspend), + DEVMETHOD(device_resume, bus_generic_resume), + + /* Bus interface */ + DEVMETHOD(bus_print_child, bus_generic_print_child), + DEVMETHOD(bus_read_ivar, acpi_isab_read_ivar), + DEVMETHOD(bus_alloc_resource, bus_generic_alloc_resource), + DEVMETHOD(bus_release_resource, bus_generic_release_resource), + DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + + {0, 0} +}; + +static driver_t acpi_isab_driver = { + "isab", + acpi_isab_methods, + sizeof(struct acpi_isab_softc), +}; + +DRIVER_MODULE(acpi_isab, acpi, acpi_isab_driver, isab_devclass, 0, 0); + +static int +acpi_isab_probe(device_t dev) +{ + + if ((acpi_get_type(dev) == ACPI_TYPE_DEVICE) && + !acpi_disabled("isa ") && + (acpi_MatchHid(dev, "PNP0A05") || acpi_MatchHid(dev, "PNP0A06"))) { + device_set_desc(dev, "ACPI Generic ISA bridge"); + return(0); + } + return(ENXIO); +} + +static int +acpi_isab_attach(device_t dev) +{ + struct acpi_isab_softc *sc; + + ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); + + sc = device_get_softc(dev); + sc->ap_dev = dev; + sc->ap_handle = acpi_get_handle(dev); + + return (isab_attach(dev)); +} + +static int +acpi_isab_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) +{ + struct acpi_isab_softc *sc = device_get_softc(dev); + + switch (which) { + case ACPI_IVAR_HANDLE: + *result = (uintptr_t)sc->ap_handle; + return(0); + } + return(ENOENT); +} diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile index ef56d3df9541..d875d1c7212d 100644 --- a/sys/modules/acpi/Makefile +++ b/sys/modules/acpi/Makefile @@ -35,7 +35,7 @@ SRCS+= utxface.c # OSD layer SRCS+= acpi.c acpi_acad.c acpi_battery.c acpi_button.c acpi_cmbat.c acpi_cpu.c -SRCS+= acpi_ec.c acpi_lid.c acpi_pci.c acpi_pcib.c acpi_pcib_acpi.c +SRCS+= acpi_ec.c acpi_isab.c acpi_lid.c acpi_pci.c acpi_pcib.c acpi_pcib_acpi.c SRCS+= acpi_pcib_pci.c acpi_powerres.c acpi_resource.c acpi_thermal.c SRCS+= acpi_timer.c acpica_support.c SRCS+= acpi_pci_link.c