diff --git a/sys/dev/intel/spi_acpi.c b/sys/dev/intel/spi_acpi.c index 015694f4a008..4c22d7a351c4 100644 --- a/sys/dev/intel/spi_acpi.c +++ b/sys/dev/intel/spi_acpi.c @@ -1,111 +1,120 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021 Val Packett * * 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 "opt_acpi.h" #include #include #include #include #include #include #include #include #include "spibus_if.h" static const struct intelspi_acpi_device { const char *hid; enum intelspi_vers vers; } intelspi_acpi_devices[] = { { "80860F0E", SPI_BAYTRAIL }, { "8086228E", SPI_BRASWELL }, }; static char *intelspi_ids[] = { "80860F0E", "8086228E", NULL }; static int intelspi_acpi_probe(device_t dev) { struct intelspi_softc *sc = device_get_softc(dev); char *hid; int i; if (acpi_disabled("spi")) return (ENXIO); if (ACPI_ID_PROBE(device_get_parent(dev), dev, intelspi_ids, &hid) > 0) return (ENXIO); for (i = 0; i < nitems(intelspi_acpi_devices); i++) { if (strcmp(intelspi_acpi_devices[i].hid, hid) == 0) { sc->sc_vers = intelspi_acpi_devices[i].vers; sc->sc_handle = acpi_get_handle(dev); device_set_desc(dev, intelspi_infos[sc->sc_vers].desc); return (BUS_PROBE_DEFAULT); } } return (ENXIO); } static int intelspi_acpi_attach(device_t dev) { struct intelspi_softc *sc = device_get_softc(dev); sc->sc_mem_rid = 0; sc->sc_irq_rid = 0; return (intelspi_attach(dev)); } static device_method_t intelspi_acpi_methods[] = { /* Device interface */ DEVMETHOD(device_probe, intelspi_acpi_probe), DEVMETHOD(device_attach, intelspi_acpi_attach), DEVMETHOD(device_detach, intelspi_detach), DEVMETHOD(device_suspend, intelspi_suspend), DEVMETHOD(device_resume, intelspi_resume), + /* Bus interface */ + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + 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_adjust_resource, bus_generic_adjust_resource), + /* SPI interface */ DEVMETHOD(spibus_transfer, intelspi_transfer), DEVMETHOD_END }; static driver_t intelspi_acpi_driver = { "spi", intelspi_acpi_methods, sizeof(struct intelspi_softc), }; DRIVER_MODULE(intelspi, acpi, intelspi_acpi_driver, 0, 0); MODULE_DEPEND(intelspi, acpi, 1, 1, 1); MODULE_DEPEND(intelspi, spibus, 1, 1, 1); ACPI_PNP_INFO(intelspi_ids); diff --git a/sys/dev/intel/spi_pci.c b/sys/dev/intel/spi_pci.c index c55b5a12228e..cb2b8bd82bfb 100644 --- a/sys/dev/intel/spi_pci.c +++ b/sys/dev/intel/spi_pci.c @@ -1,138 +1,147 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2021 Val Packett * * 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 "opt_acpi.h" #include "opt_pci.h" #include #include #include #include #include #include #include #include #include #include #include "spibus_if.h" static struct intelspi_pci_device { uint32_t devid; enum intelspi_vers vers; } intelspi_pci_devices[] = { { 0x9c658086, SPI_LYNXPOINT }, { 0x9c668086, SPI_LYNXPOINT }, { 0x9ce58086, SPI_LYNXPOINT }, { 0x9ce68086, SPI_LYNXPOINT }, { 0x9d298086, SPI_SUNRISEPOINT }, { 0x9d2a8086, SPI_SUNRISEPOINT }, { 0xa1298086, SPI_SUNRISEPOINT }, { 0xa12a8086, SPI_SUNRISEPOINT }, { 0xa2a98086, SPI_SUNRISEPOINT }, { 0xa2aa8086, SPI_SUNRISEPOINT }, { 0xa3a98086, SPI_SUNRISEPOINT }, { 0xa3aa8086, SPI_SUNRISEPOINT }, }; static int intelspi_pci_probe(device_t dev) { struct intelspi_softc *sc = device_get_softc(dev); uint32_t devid = pci_get_devid(dev); int i; for (i = 0; i < nitems(intelspi_pci_devices); i++) { if (intelspi_pci_devices[i].devid == devid) { sc->sc_vers = intelspi_pci_devices[i].vers; /* The PCI device is listed in ACPI too. * Not that we use the handle for anything... */ sc->sc_handle = acpi_get_handle(dev); device_set_desc(dev, intelspi_infos[sc->sc_vers].desc); return (BUS_PROBE_DEFAULT); } } return (ENXIO); } static int intelspi_pci_attach(device_t dev) { struct intelspi_softc *sc = device_get_softc(dev); sc->sc_mem_rid = PCIR_BAR(0); sc->sc_irq_rid = 0; if (pci_alloc_msi(dev, &sc->sc_irq_rid)) { device_printf(dev, "Using MSI\n"); } return (intelspi_attach(dev)); } static int intelspi_pci_detach(device_t dev) { struct intelspi_softc *sc = device_get_softc(dev); int err; err = intelspi_detach(dev); if (err) return (err); if (sc->sc_irq_rid != 0) pci_release_msi(dev); return (0); } static device_method_t intelspi_pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, intelspi_pci_probe), DEVMETHOD(device_attach, intelspi_pci_attach), DEVMETHOD(device_detach, intelspi_pci_detach), DEVMETHOD(device_suspend, intelspi_suspend), DEVMETHOD(device_resume, intelspi_resume), + /* Bus interface */ + DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), + DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr), + 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_adjust_resource, bus_generic_adjust_resource), + /* SPI interface */ DEVMETHOD(spibus_transfer, intelspi_transfer), DEVMETHOD_END }; static driver_t intelspi_pci_driver = { "spi", intelspi_pci_methods, sizeof(struct intelspi_softc), }; DRIVER_MODULE(intelspi, pci, intelspi_pci_driver, 0, 0); MODULE_DEPEND(intelspi, pci, 1, 1, 1); MODULE_DEPEND(intelspi, spibus, 1, 1, 1); MODULE_PNP_INFO("W32:vendor/device", pci, intelspi, intelspi_pci_devices, nitems(intelspi_pci_devices));