Module Name: src
Committed By: nonaka
Date: Tue Jun 21 11:33:33 UTC 2016
Modified Files:
src/sys/arch/amd64/amd64: mainbus.c
src/sys/arch/i386/i386: mainbus.c
src/sys/arch/ia64/ia64: mainbus.c
src/sys/arch/xen/xen: hypervisor.c
src/sys/dev/acpi: acpi.c acpivar.h
Log Message:
Pass bus_dma(9) tag to allow for porting sdhc(4) at acpi.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amd64/amd64/mainbus.c
cvs rdiff -u -r1.101 -r1.102 src/sys/arch/i386/i386/mainbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/ia64/mainbus.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/xen/xen/hypervisor.c
cvs rdiff -u -r1.261 -r1.262 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/acpi/acpivar.h
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/amd64/amd64/mainbus.c
diff -u src/sys/arch/amd64/amd64/mainbus.c:1.36 src/sys/arch/amd64/amd64/mainbus.c:1.37
--- src/sys/arch/amd64/amd64/mainbus.c:1.36 Wed Aug 5 07:01:10 2015
+++ src/sys/arch/amd64/amd64/mainbus.c Tue Jun 21 11:33:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.36 2015/08/05 07:01:10 mrg Exp $ */
+/* $NetBSD: mainbus.c,v 1.37 2016/06/21 11:33:32 nonaka Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.36 2015/08/05 07:01:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.37 2016/06/21 11:33:32 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -248,6 +248,8 @@ mainbus_attach(device_t parent, device_t
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
PCI_FLAGS_MWI_OKAY;
mba.mba_acpi.aa_ic = &x86_isa_chipset;
+ mba.mba_acpi.aa_dmat = &pci_bus_dma_tag;
+ mba.mba_acpi.aa_dmat64 = &pci_bus_dma64_tag;
config_found_ia(self, "acpibus", &mba.mba_acpi, 0);
}
#endif
Index: src/sys/arch/i386/i386/mainbus.c
diff -u src/sys/arch/i386/i386/mainbus.c:1.101 src/sys/arch/i386/i386/mainbus.c:1.102
--- src/sys/arch/i386/i386/mainbus.c:1.101 Wed Aug 5 07:01:11 2015
+++ src/sys/arch/i386/i386/mainbus.c Tue Jun 21 11:33:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.101 2015/08/05 07:01:11 mrg Exp $ */
+/* $NetBSD: mainbus.c,v 1.102 2016/06/21 11:33:32 nonaka Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.101 2015/08/05 07:01:11 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.102 2016/06/21 11:33:32 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -345,6 +345,8 @@ mainbus_rescan(device_t self, const char
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
PCI_FLAGS_MWI_OKAY;
mba.mba_acpi.aa_ic = &x86_isa_chipset;
+ mba.mba_acpi.aa_dmat = &pci_bus_dma_tag;
+ mba.mba_acpi.aa_dmat64 = NULL;
sc->sc_acpi =
config_found_ia(self, "acpibus", &mba.mba_acpi, 0);
#if 0 /* XXXJRT not yet */
Index: src/sys/arch/ia64/ia64/mainbus.c
diff -u src/sys/arch/ia64/ia64/mainbus.c:1.9 src/sys/arch/ia64/ia64/mainbus.c:1.10
--- src/sys/arch/ia64/ia64/mainbus.c:1.9 Tue May 17 17:34:50 2011
+++ src/sys/arch/ia64/ia64/mainbus.c Tue Jun 21 11:33:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.9 2011/05/17 17:34:50 dyoung Exp $ */
+/* $NetBSD: mainbus.c,v 1.10 2016/06/21 11:33:33 nonaka Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9 2011/05/17 17:34:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2016/06/21 11:33:33 nonaka Exp $");
#include "acpica.h"
@@ -124,6 +124,8 @@ mainbus_attach(device_t parent, device_t
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
PCI_FLAGS_MWI_OKAY;
aaa.aa_ic = 0;
+ aaa.aa_dmat = NULL; /* XXX */
+ aaa.aa_dmat64 = NULL; /* XXX */
config_found_ia(self, "acpibus", &aaa, 0);
#endif
Index: src/sys/arch/xen/xen/hypervisor.c
diff -u src/sys/arch/xen/xen/hypervisor.c:1.67 src/sys/arch/xen/xen/hypervisor.c:1.68
--- src/sys/arch/xen/xen/hypervisor.c:1.67 Sun Jun 12 09:08:09 2016
+++ src/sys/arch/xen/xen/hypervisor.c Tue Jun 21 11:33:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.c,v 1.67 2016/06/12 09:08:09 jnemeth Exp $ */
+/* $NetBSD: hypervisor.c,v 1.68 2016/06/21 11:33:33 nonaka Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -53,7 +53,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.67 2016/06/12 09:08:09 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.68 2016/06/21 11:33:33 nonaka Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -307,6 +307,12 @@ hypervisor_attach(device_t parent, devic
PCI_FLAGS_MRL_OKAY | PCI_FLAGS_MRM_OKAY |
PCI_FLAGS_MWI_OKAY;
hac.hac_acpi.aa_ic = &x86_isa_chipset;
+ hac.hac_acpi.aa_dmat = &pci_bus_dma_tag;
+#ifdef _LP64
+ hac.hac_acpi.aa_dmat64 = &pci_bus_dma64_tag;
+#else
+ hac.hac_acpi.aa_dmat64 = NULL;
+#endif /* _LP64 */
config_found_ia(self, "acpibus", &hac.hac_acpi, 0);
}
#endif /* NACPICA */
Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.261 src/sys/dev/acpi/acpi.c:1.262
--- src/sys/dev/acpi/acpi.c:1.261 Fri Oct 2 05:22:52 2015
+++ src/sys/dev/acpi/acpi.c Tue Jun 21 11:33:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.261 2015/10/02 05:22:52 msaitoh Exp $ */
+/* $NetBSD: acpi.c,v 1.262 2016/06/21 11:33:33 nonaka Exp $ */
/*-
* Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.261 2015/10/02 05:22:52 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi.c,v 1.262 2016/06/21 11:33:33 nonaka Exp $");
#include "opt_acpi.h"
#include "opt_pcifixup.h"
@@ -452,6 +452,8 @@ acpi_attach(device_t parent, device_t se
sc->sc_pc = aa->aa_pc;
sc->sc_pciflags = aa->aa_pciflags;
sc->sc_ic = aa->aa_ic;
+ sc->sc_dmat = aa->aa_dmat;
+ sc->sc_dmat64 = aa->aa_dmat64;
SIMPLEQ_INIT(&sc->ad_head);
@@ -863,6 +865,8 @@ acpi_rescan_early(struct acpi_softc *sc)
aa.aa_pc = sc->sc_pc;
aa.aa_pciflags = sc->sc_pciflags;
aa.aa_ic = sc->sc_ic;
+ aa.aa_dmat = sc->sc_dmat;
+ aa.aa_dmat64 = sc->sc_dmat64;
ad->ad_device = config_found_ia(sc->sc_dev,
"acpinodebus", &aa, acpi_print);
@@ -927,6 +931,8 @@ acpi_rescan_nodes(struct acpi_softc *sc)
aa.aa_pc = sc->sc_pc;
aa.aa_pciflags = sc->sc_pciflags;
aa.aa_ic = sc->sc_ic;
+ aa.aa_dmat = sc->sc_dmat;
+ aa.aa_dmat64 = sc->sc_dmat64;
ad->ad_device = config_found_ia(sc->sc_dev,
"acpinodebus", &aa, acpi_print);
Index: src/sys/dev/acpi/acpivar.h
diff -u src/sys/dev/acpi/acpivar.h:1.73 src/sys/dev/acpi/acpivar.h:1.74
--- src/sys/dev/acpi/acpivar.h:1.73 Mon Aug 1 11:25:59 2011
+++ src/sys/dev/acpi/acpivar.h Tue Jun 21 11:33:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: acpivar.h,v 1.73 2011/08/01 11:25:59 jmcneill Exp $ */
+/* $NetBSD: acpivar.h,v 1.74 2016/06/21 11:33:33 nonaka Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -62,6 +62,8 @@ struct acpibus_attach_args {
pci_chipset_tag_t aa_pc; /* PCI chipset */
int aa_pciflags; /* PCI bus flags */
isa_chipset_tag_t aa_ic; /* ISA chipset */
+ bus_dma_tag_t aa_dmat; /* PCI DMA tag */
+ bus_dma_tag_t aa_dmat64; /* PCI 64bit DMA tag */
};
/*
@@ -160,6 +162,8 @@ struct acpi_softc {
int sc_pciflags; /* PCI bus flags */
int sc_pci_bus; /* internal PCI fixup */
isa_chipset_tag_t sc_ic; /* ISA chipset tag */
+ bus_dma_tag_t sc_dmat; /* PCI DMA tag */
+ bus_dma_tag_t sc_dmat64; /* PCI 64bit DMA tag */
void *sc_sdhook; /* shutdown hook */
@@ -185,6 +189,8 @@ struct acpi_attach_args {
pci_chipset_tag_t aa_pc; /* PCI chipset tag */
int aa_pciflags; /* PCI bus flags */
isa_chipset_tag_t aa_ic; /* ISA chipset */
+ bus_dma_tag_t aa_dmat; /* PCI DMA tag */
+ bus_dma_tag_t aa_dmat64; /* PCI 64bit DMA tag */
};
/*
