5217af301c
different "platforms" on x86 machines. The existing code already handles having two platforms: ACPI and legacy. However, the existing approach was rather hardcoded and difficult to extend. These changes take the approach that each x86 hardware platform should provide its own nexus(4) driver (it can inherit most of its behavior from the default legacy nexus(4) driver) which is responsible for probing for the platform and performing appropriate platform-specific setup during attach (such as adding a platform-specific bus device). This does mean changing the x86 platform busses to no longer use an identify routine for probing, but to move that logic into their matching nexus(4) driver instead. - Make the default nexus(4) driver in nexus.c on i386 and amd64 handle the legacy platform. It's probe routine now returns BUS_PROBE_GENERIC so it can be overriden. - Expose a nexus_init_resources() routine which initializes the various resource managers so that subclassed nexus(4) drivers can invoke it from their attach routine. - The legacy nexus(4) driver explicitly adds a legacy0 device in its attach routine. - The ACPI driver no longer contains an new-bus identify method. Instead it exposes a public function (acpi_identify()) which is a probe routine that the MD nexus(4) drivers can use to probe for ACPI. All of the probe logic in acpi_probe() is now moved into acpi_identify() and acpi_probe() is just a stub. - On i386 and amd64, an ACPI-specific nexus(4) driver checks for ACPI via acpi_identify() and claims the nexus0 device if the probe succeeds. It then explicitly adds an acpi0 device in its attach routine. - The legacy(4) driver no longer knows anything about the acpi0 device. - On ia64 if acpi_identify() fails you basically end up with no devices. This matches the previous behavior where the old acpi_identify() would fail to add an acpi0 device again leaving you with no devices. Discussed with: imp Silence on: arch@
114 lines
2.8 KiB
C
114 lines
2.8 KiB
C
/*-
|
|
* Copyright (c) 2001 Mitsuru IWASAKI
|
|
* 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.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/bus.h>
|
|
#include <sys/kernel.h>
|
|
#include <sys/module.h>
|
|
|
|
#include <contrib/dev/acpica/acpi.h>
|
|
#include <dev/acpica/acpivar.h>
|
|
|
|
#include <machine/nexusvar.h>
|
|
|
|
static int intr_model = ACPI_INTR_PIC;
|
|
|
|
int
|
|
acpi_machdep_init(device_t dev)
|
|
{
|
|
struct acpi_softc *sc;
|
|
|
|
sc = devclass_get_softc(devclass_find("acpi"), 0);
|
|
acpi_install_wakeup_handler(sc);
|
|
|
|
if (intr_model != ACPI_INTR_PIC)
|
|
acpi_SetIntrModel(intr_model);
|
|
|
|
return (0);
|
|
}
|
|
|
|
void
|
|
acpi_SetDefaultIntrModel(int model)
|
|
{
|
|
|
|
intr_model = model;
|
|
}
|
|
|
|
int
|
|
acpi_machdep_quirks(int *quirks)
|
|
{
|
|
return (0);
|
|
}
|
|
|
|
void
|
|
acpi_cpu_c1()
|
|
{
|
|
__asm __volatile("sti; hlt");
|
|
}
|
|
|
|
/*
|
|
* ACPI nexus(4) driver.
|
|
*/
|
|
static int
|
|
nexus_acpi_probe(device_t dev)
|
|
{
|
|
int error;
|
|
|
|
error = acpi_identify();
|
|
if (error)
|
|
return (error);
|
|
|
|
return (BUS_PROBE_DEFAULT);
|
|
}
|
|
|
|
static int
|
|
nexus_acpi_attach(device_t dev)
|
|
{
|
|
|
|
nexus_init_resources();
|
|
bus_generic_probe(dev);
|
|
if (BUS_ADD_CHILD(dev, 10, "acpi", 0) == NULL)
|
|
panic("failed to add acpi0 device");
|
|
|
|
return (bus_generic_attach(dev));
|
|
}
|
|
|
|
static device_method_t nexus_acpi_methods[] = {
|
|
/* Device interface */
|
|
DEVMETHOD(device_probe, nexus_acpi_probe),
|
|
DEVMETHOD(device_attach, nexus_acpi_attach),
|
|
|
|
{ 0, 0 }
|
|
};
|
|
|
|
DEFINE_CLASS_1(nexus, nexus_acpi_driver, nexus_acpi_methods, 1, nexus_driver);
|
|
static devclass_t nexus_devclass;
|
|
|
|
DRIVER_MODULE(nexus_acpi, root, nexus_acpi_driver, nexus_devclass, 0, 0);
|