From: kettenis <kettenis@openbsd.org>
Date: Sun, 16 Apr 2023 11:38:42 +0000 (+0000)
Subject: Too many ACPI implementations advertise serial ports that aren't actually
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=51da441f69745f9258cf5102dfc160391e0c4f1e;p=openbsd

Too many ACPI implementations advertise serial ports that aren't actually
implemented.  This leads to hangs when we run "ttyflags -a" in /etc/rc.
Add the same probe that we have in the ISA version of the driver to make
sure the port is actually there.

ok patrick@
---

diff --git a/sys/dev/acpi/com_acpi.c b/sys/dev/acpi/com_acpi.c
index 3efcedb962b..d469c1e1124 100644
--- a/sys/dev/acpi/com_acpi.c
+++ b/sys/dev/acpi/com_acpi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com_acpi.c,v 1.10 2022/06/28 21:02:14 kettenis Exp $	*/
+/*	$OpenBSD: com_acpi.c,v 1.11 2023/04/16 11:38:42 kettenis Exp $	*/
 /*
  * Copyright (c) 2018 Mark Kettenis
  *
@@ -64,13 +64,30 @@ com_acpi_match(struct device *parent, void *match, void *aux)
 {
 	struct acpi_attach_args *aaa = aux;
 	struct cfdata *cf = match;
+	bus_space_handle_t ioh;
+	bus_space_tag_t iot;
+	int rv;
 
 	if (aaa->aaa_naddr < 1 || aaa->aaa_nirq < 1)
 		return 0;
 	if (cf->acpidevcf_addr != aaa->aaa_addr[0] &&
 	    cf->acpidevcf_addr != ACPIDEVCF_ADDR_UNK)
 		return 0;
-	return acpi_matchhids(aaa, com_hids, cf->cf_driver->cd_name);
+
+	if (!acpi_matchhids(aaa, com_hids, cf->cf_driver->cd_name))
+		return 0;
+	if (com_acpi_is_designware(aaa->aaa_dev))
+		return 1;
+
+	if (aaa->aaa_addr[0] == comconsaddr)
+		return 1;
+	iot = aaa->aaa_bst[0];
+	if (bus_space_map(iot, aaa->aaa_addr[0], aaa->aaa_size[0], 0, &ioh))
+		return 0;
+	rv = comprobe1(iot, ioh);
+	bus_space_unmap(iot, ioh, aaa->aaa_size[0]);
+
+	return rv;
 }
 
 void