[src/trunk]: src/sys/dev/acpi Fix 32-bit build.

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d023ef09dc90
branches:  trunk
changeset: 957700:d023ef09dc90
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Dec 07 10:02:51 2020 +0000

description:
Fix 32-bit build.

diffstat:

 sys/dev/acpi/ahcisata_acpi.c |  7 ++++---
 sys/dev/acpi/amdccp_acpi.c   |  7 ++++---
 sys/dev/acpi/atppc_acpi.c    |  7 ++++---
 sys/dev/acpi/dwiic_acpi.c    |  7 ++++---
 sys/dev/acpi/ehci_acpi.c     |  7 ++++---
 sys/dev/acpi/fdc_acpi.c      |  7 ++++---
 sys/dev/acpi/genet_acpi.c    |  6 +++---
 sys/dev/acpi/lpt_acpi.c      |  7 ++++---
 sys/dev/acpi/mpu_acpi.c      |  7 ++++---
 sys/dev/acpi/plgpio_acpi.c   |  7 ++++---
 sys/dev/acpi/spic_acpi.c     |  7 ++++---
 sys/dev/acpi/virtio_acpi.c   |  7 ++++---
 sys/dev/acpi/wb_acpi.c       |  7 ++++---
 sys/dev/acpi/xhci_acpi.c     |  7 ++++---
 14 files changed, 55 insertions(+), 42 deletions(-)

diffs (truncated from 391 to 300 lines):

diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/ahcisata_acpi.c
--- a/sys/dev/acpi/ahcisata_acpi.c      Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/ahcisata_acpi.c      Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_acpi.c,v 1.5 2020/04/15 19:26:51 jmcneill Exp $ */
+/* $NetBSD: ahcisata_acpi.c,v 1.6 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_acpi.c,v 1.5 2020/04/15 19:26:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_acpi.c,v 1.6 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -112,7 +112,8 @@
                sc->sc_dmat = aa->aa_dmat;
        }
 
-       ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+       ih = acpi_intr_establish(self,
+           (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
            IPL_BIO, false, ahci_intr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't install interrupt handler\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/amdccp_acpi.c
--- a/sys/dev/acpi/amdccp_acpi.c        Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/amdccp_acpi.c        Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: amdccp_acpi.c,v 1.3 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: amdccp_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2018 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: amdccp_acpi.c,v 1.3 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdccp_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -95,7 +95,8 @@
        }
 
 #if notyet
-       ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+       ih = acpi_intr_establish(self,
+           (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
            IPL_VM, true, amdccp_intr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't install interrupt handler\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/atppc_acpi.c
--- a/sys/dev/acpi/atppc_acpi.c Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/atppc_acpi.c Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_acpi.c,v 1.18 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: atppc_acpi.c,v 1.19 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.18 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_acpi.c,v 1.19 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include "opt_atppc.h"
 
@@ -140,7 +140,8 @@
                goto out;
        }
 
-       sc->sc_ieh = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+       sc->sc_ieh = acpi_intr_establish(self,
+           (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
            IPL_TTY, false, atppcintr, self device_xname(self));
        if (sc->sc_ieh == NULL) {
                aprint_error_dev(self, "unable to establish interrupt\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/dwiic_acpi.c
--- a/sys/dev/acpi/dwiic_acpi.c Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/dwiic_acpi.c Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dwiic_acpi.c,v 1.3 2019/09/23 08:50:52 jmcneill Exp $ */
+/* $NetBSD: dwiic_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.3 2019/09/23 08:50:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwiic_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -115,7 +115,8 @@
                return;
        }
 
-       ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+       ih = acpi_intr_establish(self,
+           (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
            IPL_VM, true, dwiic_intr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't install interrupt handler\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/ehci_acpi.c
--- a/sys/dev/acpi/ehci_acpi.c  Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/ehci_acpi.c  Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_acpi.c,v 1.3 2018/11/16 23:18:17 jmcneill Exp $ */
+/* $NetBSD: ehci_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_acpi.c,v 1.3 2018/11/16 23:18:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_acpi.c,v 1.4 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -131,7 +131,8 @@
        sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH);
        EOWRITE4(sc, EHCI_USBINTR, 0);
 
-       ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+       ih = acpi_intr_establish(self,
+           (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
            IPL_USB, true, ehci_intr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/fdc_acpi.c
--- a/sys/dev/acpi/fdc_acpi.c   Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/fdc_acpi.c   Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpi.c,v 1.44 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: fdc_acpi.c,v 1.45 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.44 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc_acpi.c,v 1.45 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -181,7 +181,8 @@
                }
        }
 
-       sc->sc_ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+       sc->sc_ih = acpi_intr_establish(self,
+           (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
            IPL_BIO, false, fdcintr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/genet_acpi.c
--- a/sys/dev/acpi/genet_acpi.c Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/genet_acpi.c Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: genet_acpi.c,v 1.2 2020/05/25 19:49:28 jmcneill Exp $ */
+/* $NetBSD: genet_acpi.c,v 1.3 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2020 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #include "opt_net_mpsafe.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genet_acpi.c,v 1.2 2020/05/25 19:49:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genet_acpi.c,v 1.3 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -144,7 +144,7 @@
        if (genet_attach(sc) != 0)
                goto done;
 
-        ih = acpi_intr_establish(self, (uint64_t)handle, IPL_NET,
+        ih = acpi_intr_establish(self, (uint64_t)(uintptr_t)handle, IPL_NET,
            GENET_INTR_MPSAFE, genet_intr, sc, device_xname(self));
        if (ih == NULL) {
                aprint_error_dev(self, "couldn't establish interrupt\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/lpt_acpi.c
--- a/sys/dev/acpi/lpt_acpi.c   Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/lpt_acpi.c   Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt_acpi.c,v 1.21 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: lpt_acpi.c,v 1.22 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.21 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt_acpi.c,v 1.22 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -114,7 +114,8 @@
 
        lpt_attach_subr(sc);
 
-       sc->sc_ih = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+       sc->sc_ih = acpi_intr_establish(self,
+           (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
            IPL_TTY, false, lptintr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "unable to establish interrupt\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/mpu_acpi.c
--- a/sys/dev/acpi/mpu_acpi.c   Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/mpu_acpi.c   Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mpu_acpi.c,v 1.14 2020/12/06 12:23:13 jmcneill Exp $ */
+/* $NetBSD: mpu_acpi.c,v 1.15 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*
  * Copyright (c) 2002 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.14 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mpu_acpi.c,v 1.15 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -116,7 +116,8 @@
        mutex_init(&asc->sc_lock, MUTEX_DEFAULT, IPL_AUDIO);
        mpu_attach(sc);
 
-       sc->arg = acpi_intr_establish(self, (uint64_t)aa->aa_node->ad_handle,
+       sc->arg = acpi_intr_establish(self,
+           (uint64_t)(uintptr_t)aa->aa_node->ad_handle,
            IPL_AUDIO, true, mpu_intr, sc, device_xname(self));
        if (sc->arg == NULL) {
                aprint_error_dev(self, "unable to establish interrupt\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/plgpio_acpi.c
--- a/sys/dev/acpi/plgpio_acpi.c        Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/plgpio_acpi.c        Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plgpio_acpi.c,v 1.5 2018/11/23 14:08:40 jmcneill Exp $ */
+/* $NetBSD: plgpio_acpi.c,v 1.6 2020/12/07 10:02:51 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: plgpio_acpi.c,v 1.5 2018/11/23 14:08:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plgpio_acpi.c,v 1.6 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -131,7 +131,8 @@
                goto done;
        }
 
-       ih = acpi_intr_establish(self, (uint64_t)asc->sc_handle,
+       ih = acpi_intr_establish(self,
+           (uint64_t)(uintptr_t)asc->sc_handle,
            IPL_VM, false, plgpio_acpi_intr, asc, device_xname(self));
        if (ih == NULL)
                aprint_error_dev(self, "couldn't establish interrupt\n");
diff -r 274c86498644 -r d023ef09dc90 sys/dev/acpi/spic_acpi.c
--- a/sys/dev/acpi/spic_acpi.c  Mon Dec 07 08:31:05 2020 +0000
+++ b/sys/dev/acpi/spic_acpi.c  Mon Dec 07 10:02:51 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: spic_acpi.c,v 1.7 2020/12/06 12:23:13 jmcneill Exp $   */
+/*     $NetBSD: spic_acpi.c,v 1.8 2020/12/07 10:02:51 jmcneill Exp $   */
 
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.7 2020/12/06 12:23:13 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spic_acpi.c,v 1.8 2020/12/07 10:02:51 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -114,7 +114,8 @@
                goto out;
        }