svn commit: r258213 - in stable/9/sys/dev: mvs siis

[Alexander Motin]

Author: mav
Date: Sat Nov 16 10:34:16 2013
New Revision: 258213
URL: http://svnweb.freebsd.org/changeset/base/258213

Log:
  MFC r249622:
  Make siis(4) and mvs(4) send bus_get_dma_tag() requests to parent buses
  passing real bus' child pointers instead of grandchilds.

Modified:
  stable/9/sys/dev/mvs/mvs_pci.c
  stable/9/sys/dev/mvs/mvs_soc.c
  stable/9/sys/dev/siis/siis.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/mvs/mvs_pci.c
==============================================================================
--- stable/9/sys/dev/mvs/mvs_pci.c	Sat Nov 16 09:01:24 2013	(r258212)
+++ stable/9/sys/dev/mvs/mvs_pci.c	Sat Nov 16 10:34:16 2013	(r258213)
@@ -488,6 +488,13 @@ mvs_child_location_str(device_t dev, dev
 	return (0);
 }
 
+static bus_dma_tag_t
+mvs_get_dma_tag(device_t bus, device_t child)
+{
+
+	return (bus_get_dma_tag(bus));
+}
+
 static device_method_t mvs_methods[] = {
 	DEVMETHOD(device_probe,     mvs_probe),
 	DEVMETHOD(device_attach,    mvs_attach),
@@ -500,6 +507,7 @@ static device_method_t mvs_methods[] = {
 	DEVMETHOD(bus_setup_intr,   mvs_setup_intr),
 	DEVMETHOD(bus_teardown_intr,mvs_teardown_intr),
 	DEVMETHOD(bus_child_location_str, mvs_child_location_str),
+	DEVMETHOD(bus_get_dma_tag,  mvs_get_dma_tag),
 	DEVMETHOD(mvs_edma,         mvs_edma),
 	{ 0, 0 }
 };

Modified: stable/9/sys/dev/mvs/mvs_soc.c
==============================================================================
--- stable/9/sys/dev/mvs/mvs_soc.c	Sat Nov 16 09:01:24 2013	(r258212)
+++ stable/9/sys/dev/mvs/mvs_soc.c	Sat Nov 16 10:34:16 2013	(r258213)
@@ -429,6 +429,13 @@ mvs_child_location_str(device_t dev, dev
 	return (0);
 }
 
+static bus_dma_tag_t
+mvs_get_dma_tag(device_t bus, device_t child)
+{
+
+	return (bus_get_dma_tag(bus));
+}
+
 static device_method_t mvs_methods[] = {
 	DEVMETHOD(device_probe,     mvs_probe),
 	DEVMETHOD(device_attach,    mvs_attach),
@@ -440,8 +447,9 @@ static device_method_t mvs_methods[] = {
 	DEVMETHOD(bus_release_resource,     mvs_release_resource),
 	DEVMETHOD(bus_setup_intr,   mvs_setup_intr),
 	DEVMETHOD(bus_teardown_intr,mvs_teardown_intr),
-	DEVMETHOD(mvs_edma,         mvs_edma),
 	DEVMETHOD(bus_child_location_str, mvs_child_location_str),
+	DEVMETHOD(bus_get_dma_tag,  mvs_get_dma_tag),
+	DEVMETHOD(mvs_edma,         mvs_edma),
 	{ 0, 0 }
 };
 static driver_t mvs_driver = {

Modified: stable/9/sys/dev/siis/siis.c
==============================================================================
--- stable/9/sys/dev/siis/siis.c	Sat Nov 16 09:01:24 2013	(r258212)
+++ stable/9/sys/dev/siis/siis.c	Sat Nov 16 10:34:16 2013	(r258213)
@@ -414,6 +414,13 @@ siis_child_location_str(device_t dev, de
 	return (0);
 }
 
+static bus_dma_tag_t
+siis_get_dma_tag(device_t bus, device_t child)
+{
+
+	return (bus_get_dma_tag(bus));
+}
+
 devclass_t siis_devclass;
 static device_method_t siis_methods[] = {
 	DEVMETHOD(device_probe,     siis_probe),
@@ -427,6 +434,7 @@ static device_method_t siis_methods[] = 
 	DEVMETHOD(bus_setup_intr,   siis_setup_intr),
 	DEVMETHOD(bus_teardown_intr,siis_teardown_intr),
 	DEVMETHOD(bus_child_location_str, siis_child_location_str),
+	DEVMETHOD(bus_get_dma_tag,  siis_get_dma_tag),
 	{ 0, 0 }
 };
 static driver_t siis_driver = {