From: miod <miod@openbsd.org>
Date: Mon, 7 Aug 2023 17:11:13 +0000 (+0000)
Subject: Revert 1.43 and always make our own mapping of the Mostek chip. Trying to
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=3342c5b5e14d3357186dec2ce685a8dbeb101e14;p=openbsd

Revert 1.43 and always make our own mapping of the Mostek chip. Trying to
reuse the prom mapping here is a bad idea because we alter its writeability
and the prom will not always expect this.

Repairs powerdown on Tapdole Ultrabook IIe.

discussed with and ok kettenis@
---

diff --git a/sys/arch/sparc64/sparc64/clock.c b/sys/arch/sparc64/sparc64/clock.c
index 64635f6f025..0a27a726fc1 100644
--- a/sys/arch/sparc64/sparc64/clock.c
+++ b/sys/arch/sparc64/sparc64/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.78 2023/07/25 18:16:21 cheloha Exp $	*/
+/*	$OpenBSD: clock.c,v 1.79 2023/08/07 17:11:13 miod Exp $	*/
 /*	$NetBSD: clock.c,v 1.41 2001/07/24 19:29:25 eeh Exp $ */
 
 /*
@@ -337,14 +337,7 @@ clockattach_ebus(struct device *parent, struct device *self, void *aux)
 	/* hard code to 8K? */
 	sz = ea->ea_regs[0].size;
 
-	if (ea->ea_nvaddrs) {
-		if (bus_space_map(ea->ea_memtag, ea->ea_vaddrs[0], 0,
-		    BUS_SPACE_MAP_PROMADDRESS, &cwi.cwi_bh) != 0) {
-			printf("%s: can't map register\n", self->dv_xname);
-			return;
-		}
-		bt = ea->ea_memtag;
-	} else if (ebus_bus_map(ea->ea_iotag, 0,
+	if (ebus_bus_map(ea->ea_iotag, 0,
 	    EBUS_PADDR_FROM_REG(&ea->ea_regs[0]), sz, 0, 0, &cwi.cwi_bh) == 0) {
 		bt = ea->ea_iotag;
 	} else if (ebus_bus_map(ea->ea_memtag, 0,