Module Name: src Committed By: hkenken Date: Mon Aug 19 03:45:51 UTC 2019
Modified Files: src/sys/arch/arm/imx/fdt: if_enet_imx.c imx6_ahcisata.c imx6_gpio.c imx6_pcie.c imx6_usb.c Log Message: Enable FDT_INTR_MPSAFE flag. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/fdt/if_enet_imx.c \ src/sys/arch/arm/imx/fdt/imx6_pcie.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/fdt/imx6_ahcisata.c \ src/sys/arch/arm/imx/fdt/imx6_gpio.c src/sys/arch/arm/imx/fdt/imx6_usb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/imx/fdt/if_enet_imx.c diff -u src/sys/arch/arm/imx/fdt/if_enet_imx.c:1.2 src/sys/arch/arm/imx/fdt/if_enet_imx.c:1.3 --- src/sys/arch/arm/imx/fdt/if_enet_imx.c:1.2 Tue Jul 30 06:26:31 2019 +++ src/sys/arch/arm/imx/fdt/if_enet_imx.c Mon Aug 19 03:45:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: if_enet_imx.c,v 1.2 2019/07/30 06:26:31 hkenken Exp $ */ +/* $NetBSD: if_enet_imx.c,v 1.3 2019/08/19 03:45:51 hkenken Exp $ */ /*- * Copyright (c) 2019 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.2 2019/07/30 06:26:31 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_enet_imx.c,v 1.3 2019/08/19 03:45:51 hkenken Exp $"); #include "opt_fdt.h" @@ -118,8 +118,8 @@ enet_attach(device_t parent, device_t se aprint_error_dev(self, "failed to decode interrupt\n"); goto failure; } - sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_NET, 0, - enet_intr, sc); + sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_NET, + FDT_INTR_MPSAFE, enet_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr); Index: src/sys/arch/arm/imx/fdt/imx6_pcie.c diff -u src/sys/arch/arm/imx/fdt/imx6_pcie.c:1.2 src/sys/arch/arm/imx/fdt/imx6_pcie.c:1.3 --- src/sys/arch/arm/imx/fdt/imx6_pcie.c:1.2 Fri Jul 26 06:57:54 2019 +++ src/sys/arch/arm/imx/fdt/imx6_pcie.c Mon Aug 19 03:45:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_pcie.c,v 1.2 2019/07/26 06:57:54 skrll Exp $ */ +/* $NetBSD: imx6_pcie.c,v 1.3 2019/08/19 03:45:51 hkenken Exp $ */ /*- * Copyright (c) 2019 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.2 2019/07/26 06:57:54 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.3 2019/08/19 03:45:51 hkenken Exp $"); #include "opt_pci.h" #include "opt_fdt.h" @@ -179,7 +179,8 @@ imx6_pcie_attach(device_t parent, device return; } - sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, 0, imxpcie_intr, sc); + sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, + FDT_INTR_MPSAFE, imxpcie_intr, sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr); Index: src/sys/arch/arm/imx/fdt/imx6_ahcisata.c diff -u src/sys/arch/arm/imx/fdt/imx6_ahcisata.c:1.1 src/sys/arch/arm/imx/fdt/imx6_ahcisata.c:1.2 --- src/sys/arch/arm/imx/fdt/imx6_ahcisata.c:1.1 Wed Jul 24 13:12:33 2019 +++ src/sys/arch/arm/imx/fdt/imx6_ahcisata.c Mon Aug 19 03:45:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_ahcisata.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $ */ +/* $NetBSD: imx6_ahcisata.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $ */ /*- * Copyright (c) 2019 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx6_ahcisata.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_ahcisata.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -181,8 +181,8 @@ imx6_ahcisata_attach(device_t parent, de return; } - sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, 0, - ahci_intr, &sc->sc); + sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_BIO, + FDT_INTR_MPSAFE, ahci_intr, &sc->sc); if (sc->sc_ih == NULL) { aprint_error_dev(self, "failed to establish interrupt on %s\n", intrstr); Index: src/sys/arch/arm/imx/fdt/imx6_gpio.c diff -u src/sys/arch/arm/imx/fdt/imx6_gpio.c:1.1 src/sys/arch/arm/imx/fdt/imx6_gpio.c:1.2 --- src/sys/arch/arm/imx/fdt/imx6_gpio.c:1.1 Wed Jul 24 13:12:33 2019 +++ src/sys/arch/arm/imx/fdt/imx6_gpio.c Mon Aug 19 03:45:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_gpio.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $ */ +/* $NetBSD: imx6_gpio.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $ */ /*- * Copyright (c) 2019 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx6_gpio.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_gpio.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $"); #include "opt_fdt.h" #include "gpio.h" @@ -123,8 +123,8 @@ imxgpio_attach(device_t parent, device_t aprint_error_dev(self, "failed to decode interrupt\n"); return; } - sc->gpio_is = fdtbus_intr_establish(phandle, 0, IPL_HIGH, 0, - pic_handle_intr, &sc->gpio_pic); + sc->gpio_is = fdtbus_intr_establish(phandle, 0, IPL_HIGH, + FDT_INTR_MPSAFE, pic_handle_intr, &sc->gpio_pic); if (sc->gpio_is == NULL) { aprint_error_dev(self, "couldn't establish interrupt on %s\n", intrstr); @@ -136,8 +136,8 @@ imxgpio_attach(device_t parent, device_t aprint_error_dev(self, "failed to decode interrupt\n"); return; } - sc->gpio_is_high = fdtbus_intr_establish(phandle, 1, IPL_HIGH, 0, - pic_handle_intr, &sc->gpio_pic); + sc->gpio_is_high = fdtbus_intr_establish(phandle, 1, IPL_HIGH, + FDT_INTR_MPSAFE, pic_handle_intr, &sc->gpio_pic); if (sc->gpio_is_high == NULL) { aprint_error_dev(self, "couldn't establish interrupt on %s\n", intrstr); Index: src/sys/arch/arm/imx/fdt/imx6_usb.c diff -u src/sys/arch/arm/imx/fdt/imx6_usb.c:1.1 src/sys/arch/arm/imx/fdt/imx6_usb.c:1.2 --- src/sys/arch/arm/imx/fdt/imx6_usb.c:1.1 Wed Jul 24 13:12:33 2019 +++ src/sys/arch/arm/imx/fdt/imx6_usb.c Mon Aug 19 03:45:51 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_usb.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $ */ +/* $NetBSD: imx6_usb.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $ */ /*- * Copyright (c) 2019 Genetec Corporation. All rights reserved. * Written by Hashimoto Kenichi for Genetec Corporation. @@ -25,7 +25,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.1 2019/07/24 13:12:33 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_usb.c,v 1.2 2019/08/19 03:45:51 hkenken Exp $"); #include "opt_fdt.h" @@ -265,7 +265,8 @@ imx6_usb_intr_establish(struct imxehci_s aprint_error_dev(sc->sc_dev, "failed to decode interrupt\n"); return NULL; } - ih = fdtbus_intr_establish(ifsc->sc_phandle, 0, IPL_USB, 0, ehci_intr, hsc); + ih = fdtbus_intr_establish(ifsc->sc_phandle, 0, IPL_USB, + FDT_INTR_MPSAFE, ehci_intr, hsc); if (ih == NULL) { aprint_error_dev(sc->sc_dev, "failed to establish interrupt on %s\n", intrstr);