 @@ -1,14 +1,14 @@
-/*	$NetBSD: acpi_pci_link.c,v 1.22 2014/09/14 19:54:05 mrg Exp $	*/
+/*	$NetBSD: acpi_pci_link.c,v 1.22.26.1 2020/03/08 11:03:19 martin Exp $	*/
 /*-
  * Copyright (c) 2002 Mitsuru IWASAKI <iwasaki@jp.freebsd.org>
  * 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.
 @@ -17,27 +17,27 @@
  * 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>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.22 2014/09/14 19:54:05 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.22.26.1 2020/03/08 11:03:19 martin Exp $");
 #include <sys/param.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/pci/pcireg.h>
 #include "opt_acpi.h"
 @@ -245,26 +245,27 @@ link_add_crs(ACPI_RESOURCE *res, void *c
 		break;
 	default:
 		req->res_index++;
+	}
 	return (AE_OK);
+}
 /*
  * Populate the set of possible IRQs for each device.
  */
 static ACPI_STATUS
 link_add_prs(ACPI_RESOURCE *res, void *context)
+{
 	ACPI_RESOURCE *tmp;
 	struct link_res_request *req;
 	struct link *link;
 	uint8_t *irqs = NULL;
 	uint32_t *ext_irqs = NULL;
 	int i, is_ext_irq = 1;
 	req = (struct link_res_request *)context;
 	switch (res->Type) {
 	case ACPI_RESOURCE_TYPE_START_DEPENDENT:
 		switch (req->in_dpf) {
 		case DPF_OUTSIDE:
 			/* We've started the first DPF. */
 			req->in_dpf = DPF_FIRST;
 @@ -291,52 +292,48 @@ link_add_prs(ACPI_RESOURCE *res, void *c
 		if (req->in_dpf == DPF_IGNORE)
 			break;
 		KASSERT(req->link_index < req->sc->pl_num_links);
 		link = &req->sc->pl_links[req->link_index];
 		if (link->l_res_index == -1) {
 			KASSERT(req->sc->pl_crs_bad);
 			link->l_res_index = req->res_index;
+		}
 		req->link_index++;
 		req->res_index++;
 		/*
-		 * Stash a copy of the resource for later use when
+		 * Stash a copy of the resource for later use when doing
-		 * doing _SRS.
+		 * _SRS.
 		 * Note that in theory res->Length may exceed the size
 		 * of ACPI_RESOURCE, due to variable length lists in
 		 * subtypes.  However, all uses of l_prs_template only
 		 * rely on lists lengths of zero or one, for which
 		 * sizeof(ACPI_RESOURCE) is sufficient space anyway.
 		 * We cannot read longer than Length bytes, in case we
 		 * read off the end of mapped memory.  So we read
 		 * whichever length is shortest, Length or
 		 * sizeof(ACPI_RESOURCE).
 		 */
-		KASSERT(res->Length >= ACPI_RS_SIZE_MIN);
+		tmp = &link->l_prs_template;
 		if (is_ext_irq) {
 			memcpy(tmp, res, ACPI_RS_SIZE(tmp->Data.ExtendedIrq));
-		memset(&link->l_prs_template, 0, sizeof(link->l_prs_template));
+			/*
-		memcpy(&link->l_prs_template, res,
+			 * XXX acpi_AppendBufferResource() cannot handle
-		       MIN(res->Length, sizeof(link->l_prs_template)));
+			 * optional data.
 			 */
 			memset(&tmp->Data.ExtendedIrq.ResourceSource, 0,
 			    sizeof(tmp->Data.ExtendedIrq.ResourceSource));
 			tmp->Length = ACPI_RS_SIZE(tmp->Data.ExtendedIrq);
 		if (is_ext_irq) {
 			link->l_num_irqs =
 			    res->Data.ExtendedIrq.InterruptCount;
 			link->l_trig = res->Data.ExtendedIrq.Triggering;
 			link->l_pol = res->Data.ExtendedIrq.Polarity;
 			ext_irqs = res->Data.ExtendedIrq.Interrupts;
 		} else {
 			memcpy(tmp, res, ACPI_RS_SIZE(tmp->Data.Irq));
 			link->l_num_irqs = res->Data.Irq.InterruptCount;
 			link->l_trig = res->Data.Irq.Triggering;
 			link->l_pol = res->Data.Irq.Polarity;
 			irqs = res->Data.Irq.Interrupts;
+		}
 		if (link->l_num_irqs == 0)
 			break;
 		/*
 		 * Save a list of the valid IRQs.  Also, if all of the
 		 * valid IRQs are ISA IRQs, then mark this link as
 		 * routed via an ISA interrupt.
 		 */
 @@ -727,158 +724,139 @@ acpi_pci_link_add_reference(void *v, int
 			    sc->pl_name, bios_irq, link->l_initial_irq);
 	} else if (bios_irq != link->l_bios_irq)
 		printf(
 	    "%s: BIOS IRQ %u for %d.%d.INT%c does not match "
 	    "previous BIOS IRQ %u\n",
 		    sc->pl_name, bios_irq, (int)bus, slot, pin + 'A',
 		    link->l_bios_irq);
 	ACPI_SERIAL_END(pci_link);
+}
 static ACPI_STATUS
 acpi_pci_link_srs_from_crs(struct acpi_pci_link_softc *sc, ACPI_BUFFER *srsbuf)
+{
-	ACPI_RESOURCE *resource, *end, newres, *resptr;
+	ACPI_RESOURCE *end, *res;
 	ACPI_BUFFER crsbuf;
 	ACPI_STATUS status;
 	struct link *link;
 	int i, in_dpf;
 	/* Fetch the _CRS. */
-	crsbuf.Pointer = NULL;
+	srsbuf->Pointer = NULL;
-	crsbuf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
+	srsbuf->Length = ACPI_ALLOCATE_BUFFER;
-	status = AcpiGetCurrentResources(sc->pl_handle, &crsbuf);
+	status = AcpiGetCurrentResources(sc->pl_handle, srsbuf);
-	if (ACPI_SUCCESS(status) && crsbuf.Pointer == NULL)
+	if (ACPI_SUCCESS(status) && srsbuf->Pointer == NULL)
 		status = AE_NO_MEMORY;
 	if (ACPI_FAILURE(status)) {
 		aprint_verbose("%s: Unable to fetch current resources: %s\n",
 		    sc->pl_name, AcpiFormatException(status));
 		return (status);
+	}
 	/* Fill in IRQ resources via link structures. */
 	srsbuf->Pointer = NULL;
 	link = sc->pl_links;
 	i = 0;
 	in_dpf = DPF_OUTSIDE;
-	resource = (ACPI_RESOURCE *)crsbuf.Pointer;
+	res = (ACPI_RESOURCE *)srsbuf->Pointer;
-	end = (ACPI_RESOURCE *)((char *)crsbuf.Pointer + crsbuf.Length);
+	end = (ACPI_RESOURCE *)((char *)srsbuf->Pointer + srsbuf->Length);
 	for (;;) {
-		switch (resource->Type) {
+		switch (res->Type) {
 		case ACPI_RESOURCE_TYPE_START_DEPENDENT:
 			switch (in_dpf) {
 			case DPF_OUTSIDE:
 				/* We've started the first DPF. */
 				in_dpf = DPF_FIRST;
 				break;
 			case DPF_FIRST:
 				/* We've started the second DPF. */
 				panic(
 		"%s: Multiple dependent functions within a current resource",
 				    __func__);
 				break;
+			}
 			resptr = NULL;
 			break;
 		case ACPI_RESOURCE_TYPE_END_DEPENDENT:
 			/* We are finished with DPF parsing. */
 			KASSERT(in_dpf != DPF_OUTSIDE);
 			in_dpf = DPF_OUTSIDE;
 			resptr = NULL;
 			break;
 		case ACPI_RESOURCE_TYPE_IRQ:
-			newres = link->l_prs_template;
+			res->Data.Irq.InterruptCount = 1;
 			resptr = &newres;
 			resptr->Data.Irq.InterruptCount = 1;
 			if (PCI_INTERRUPT_VALID(link->l_irq)) {
 				KASSERT(link->l_irq < NUM_ISA_INTERRUPTS);
-				resptr->Data.Irq.Interrupts[0] = link->l_irq;
+				res->Data.Irq.Interrupts[0] = link->l_irq;
-				resptr->Data.Irq.Triggering = link->l_trig;
+				res->Data.Irq.Triggering = link->l_trig;
-				resptr->Data.Irq.Polarity = link->l_pol;
+				res->Data.Irq.Polarity = link->l_pol;
 			} else
-				resptr->Data.Irq.Interrupts[0] = 0;
+				res->Data.Irq.Interrupts[0] = 0;
 			link++;
 			i++;
 			break;
 		case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
-			newres = link->l_prs_template;
+			res->Data.ExtendedIrq.InterruptCount = 1;
 			resptr = &newres;
 			resptr->Data.ExtendedIrq.InterruptCount = 1;
 			if (PCI_INTERRUPT_VALID(link->l_irq)) {
-				resptr->Data.ExtendedIrq.Interrupts[0] =
+				res->Data.ExtendedIrq.Interrupts[0] =
 				    link->l_irq;
-				resptr->Data.ExtendedIrq.Triggering =
+				res->Data.ExtendedIrq.Triggering =
 				    link->l_trig;
-				resptr->Data.ExtendedIrq.Polarity = link->l_pol;
+				res->Data.ExtendedIrq.Polarity = link->l_pol;
 			} else
-				resptr->Data.ExtendedIrq.Interrupts[0] = 0;
+				res->Data.ExtendedIrq.Interrupts[0] = 0;
 			link++;
 			i++;
 			break;
 		default:
 			resptr = resource;
 		if (resptr != NULL) {
 			status = acpi_AppendBufferResource(srsbuf, resptr);
 			if (ACPI_FAILURE(status)) {
 				printf("%s: Unable to build resources: %s\n",
 				    sc->pl_name, AcpiFormatException(status));
 				if (srsbuf->Pointer != NULL)
 					ACPI_FREE(srsbuf->Pointer);
 				ACPI_FREE(crsbuf.Pointer);
 				return (status);
+		}
-		if (resource->Type == ACPI_RESOURCE_TYPE_END_TAG)
+		if (res->Type == ACPI_RESOURCE_TYPE_END_TAG)
 			break;
-		resource = ACPI_NEXT_RESOURCE(resource);
+		res = ACPI_NEXT_RESOURCE(res);
-		if (resource >= end)
+		if (res >= end)
 			break;
+	}
 	ACPI_FREE(crsbuf.Pointer);
 	return (AE_OK);
+}
 static ACPI_STATUS
 acpi_pci_link_srs_from_links(struct acpi_pci_link_softc *sc,
     ACPI_BUFFER *srsbuf)
+{
 	ACPI_RESOURCE newres;
 	ACPI_STATUS status;
 	struct link *link;
 	int i;
 	/* Start off with an empty buffer. */
 	srsbuf->Pointer = NULL;
 	link = sc->pl_links;
 	for (i = 0; i < sc->pl_num_links; i++) {
 		/* Add a new IRQ resource from each link. */
 		link = &sc->pl_links[i];
-		newres = link->l_prs_template;
+		if (link->l_prs_template.Type == ACPI_RESOURCE_TYPE_IRQ) {
 		if (newres.Type == ACPI_RESOURCE_TYPE_IRQ) {
 			/* Build an IRQ resource. */
 			bcopy(&link->l_prs_template, &newres,
 			    ACPI_RS_SIZE(newres.Data.Irq));
 			newres.Data.Irq.InterruptCount = 1;
 			if (PCI_INTERRUPT_VALID(link->l_irq)) {
 				KASSERT(link->l_irq < NUM_ISA_INTERRUPTS);
 				newres.Data.Irq.Interrupts[0] = link->l_irq;
 				newres.Data.Irq.Triggering = link->l_trig;
 				newres.Data.Irq.Polarity = link->l_pol;
 			} else
 				newres.Data.Irq.Interrupts[0] = 0;
 		} else {
 			/* Build an ExtIRQ resuorce. */
 			bcopy(&link->l_prs_template, &newres,
 			    ACPI_RS_SIZE(newres.Data.ExtendedIrq));
 			newres.Data.ExtendedIrq.InterruptCount = 1;
 			if (PCI_INTERRUPT_VALID(link->l_irq)) {
 				newres.Data.ExtendedIrq.Interrupts[0] =
 				    link->l_irq;
 				newres.Data.ExtendedIrq.Triggering =
 				    link->l_trig;
 				newres.Data.ExtendedIrq.Polarity =
 				    link->l_pol;
 			} else {
 				newres.Data.ExtendedIrq.Interrupts[0] = 0;
+			}
+		}