On Sun, Jul 01, 2018 at 02:15:04PM +0200, Mark Kettenis wrote:
> Diff below makes it possible to attach ahci(4) at acpi(4) as required by
> arm64 machines like the MACCHIATOBin and Overdrive 1000.
>
> ok?
>
ok mlarkin
>
> Index: dev/acpi/ahci_acpi.c
> ===================================================================
> RCS file: dev/acpi/ahci_acpi.c
> diff -N dev/acpi/ahci_acpi.c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ dev/acpi/ahci_acpi.c 1 Jul 2018 12:13:03 -0000
> @@ -0,0 +1,145 @@
> +/* $OpenBSD$ */
> +/*
> + * Copyright (c) 2018 Mark Kettenis
> + *
> + * Permission to use, copy, modify, and distribute this software for any
> + * purpose with or without fee is hereby granted, provided that the above
> + * copyright notice and this permission notice appear in all copies.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
> + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
> + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
> + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
> + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
> + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
> + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> + */
> +
> +#include <sys/param.h>
> +#include <sys/malloc.h>
> +#include <sys/systm.h>
> +
> +#include <dev/acpi/acpireg.h>
> +#include <dev/acpi/acpivar.h>
> +#include <dev/acpi/acpidev.h>
> +#include <dev/acpi/amltypes.h>
> +#include <dev/acpi/dsdt.h>
> +
> +#undef DEVNAME
> +#include <dev/ic/ahcireg.h>
> +#include <dev/ic/ahcivar.h>
> +
> +struct ahci_acpi_softc {
> + struct ahci_softc sc;
> + struct acpi_softc *sc_acpi;
> + struct aml_node *sc_node;
> +
> + bus_addr_t sc_addr;
> + bus_size_t sc_size;
> +
> + int sc_irq;
> + int sc_irq_flags;
> + void *sc_ih;
> +};
> +
> +int ahci_acpi_match(struct device *, void *, void *);
> +void ahci_acpi_attach(struct device *, struct device *, void *);
> +
> +struct cfattach ahci_acpi_ca = {
> + sizeof(struct ahci_acpi_softc), ahci_acpi_match, ahci_acpi_attach
> +};
> +
> +const char *ahci_hids[] = {
> + "AMDI0600",
> + "LNRO001E",
> + NULL
> +};
> +
> +int ahci_acpi_parse_resources(int, union acpi_resource *, void *);
> +
> +int
> +ahci_acpi_match(struct device *parent, void *match, void *aux)
> +{
> + struct acpi_attach_args *aaa = aux;
> + struct cfdata *cf = match;
> +
> + return acpi_matchhids(aaa, ahci_hids, cf->cf_driver->cd_name);
> +}
> +
> +void
> +ahci_acpi_attach(struct device *parent, struct device *self, void *aux)
> +{
> + struct acpi_attach_args *aaa = aux;
> + struct ahci_acpi_softc *sc = (struct ahci_acpi_softc *)self;
> + struct aml_value res;
> +
> + sc->sc_acpi = (struct acpi_softc *)parent;
> + sc->sc_node = aaa->aaa_node;
> + printf(" %s", sc->sc_node->name);
> +
> + if (aml_evalname(sc->sc_acpi, sc->sc_node, "_CRS", 0, NULL, &res)) {
> + printf(": can't find registers\n");
> + return;
> + }
> +
> + aml_parse_resource(&res, ahci_acpi_parse_resources, sc);
> + printf(" addr 0x%lx/0x%lx", sc->sc_addr, sc->sc_size);
> + if (sc->sc_addr == 0 || sc->sc_size == 0) {
> + printf("\n");
> + return;
> + }
> +
> + printf(" irq %d", sc->sc_irq);
> +
> + sc->sc.sc_iot = aaa->aaa_memt;
> + sc->sc.sc_ios = sc->sc_size;
> + sc->sc.sc_dmat = aaa->aaa_dmat;
> +
> + if (bus_space_map(sc->sc.sc_iot, sc->sc_addr, sc->sc_size, 0,
> + &sc->sc.sc_ioh)) {
> + printf(": can't map registers\n");
> + return;
> + }
> +
> + sc->sc_ih = acpi_intr_establish(sc->sc_irq, sc->sc_irq_flags, IPL_BIO,
> + ahci_intr, sc, sc->sc.sc_dev.dv_xname);
> + if (sc->sc_ih == NULL) {
> + printf(": can't establish interrupt\n");
> + return;
> + }
> +
> + printf(":");
> +
> + if (ahci_attach(&sc->sc) != 0) {
> + /* error printed by ahci_attach */
> + goto irq;
> + }
> +
> + return;
> +
> +irq:
> + return;
> +}
> +
> +int
> +ahci_acpi_parse_resources(int crsidx, union acpi_resource *crs, void *arg)
> +{
> + struct ahci_acpi_softc *sc = arg;
> + int type = AML_CRSTYPE(crs);
> +
> + switch (type) {
> + case LR_MEM32FIXED:
> + /* AHCI registers are specified by the first resource. */
> + if (sc->sc_size == 0) {
> + sc->sc_addr = crs->lr_m32fixed._bas;
> + sc->sc_size = crs->lr_m32fixed._len;
> + }
> + break;
> + case LR_EXTIRQ:
> + sc->sc_irq = crs->lr_extirq.irq[0];
> + sc->sc_irq_flags = crs->lr_extirq.flags;
> + break;
> + }
> +
> + return 0;
> +}
> Index: dev/acpi/files.acpi
> ===================================================================
> RCS file: /cvs/src/sys/dev/acpi/files.acpi,v
> retrieving revision 1.45
> diff -u -p -r1.45 files.acpi
> --- dev/acpi/files.acpi 1 Jul 2018 10:29:30 -0000 1.45
> +++ dev/acpi/files.acpi 1 Jul 2018 12:13:03 -0000
> @@ -137,6 +137,10 @@ device ccpmic
> attach ccpmic at i2c
> file dev/acpi/ccpmic.c ccpmic
>
> +# AHCI
> +attach ahci at acpi with ahci_acpi
> +file dev/acpi/ahci_acpi.c ahci_acpi
> +
> # NS16550 compatible UART
> attach com at acpi with com_acpi
> file dev/acpi/com_acpi.c com_acpi
>
