Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 21 Dec 2016 01:32:19 +0000 (UTC)
From:      Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r310343 - head/sys/arm/freescale/imx
Message-ID:  <201612210132.uBL1WJJJ075948@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: gonzo
Date: Wed Dec 21 01:32:19 2016
New Revision: 310343
URL: https://svnweb.freebsd.org/changeset/base/310343

Log:
  [iMX6] Fix build for SSI driver and add dependency for SDMA driver
  
  - Pass correct pointer to OF_getencprop
  - Check the size of "dmas" property
  - Add dependency on sdma driver
  
  Reviewed by:	br
  MFC after:	1 week
  Differential Revision:	https://reviews.freebsd.org/D8873

Modified:
  head/sys/arm/freescale/imx/imx6_ssi.c

Modified: head/sys/arm/freescale/imx/imx6_ssi.c
==============================================================================
--- head/sys/arm/freescale/imx/imx6_ssi.c	Wed Dec 21 00:50:21 2016	(r310342)
+++ head/sys/arm/freescale/imx/imx6_ssi.c	Wed Dec 21 01:32:19 2016	(r310343)
@@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$");
 	bus_space_write_4(_sc->bst, _sc->bsh, _reg, _val)
 
 #define	SSI_NCHANNELS	1
+#define	DMAS_TOTAL	8
 
 /* i.MX6 SSI registers */
 
@@ -187,8 +188,8 @@ struct sc_info {
 	struct sdma_conf	*conf;
 	struct ssi_rate		*sr;
 	struct sdma_softc	*sdma_sc;
-	int			sdma_ev_rx;
-	int			sdma_ev_tx;
+	uint32_t		sdma_ev_rx;
+	uint32_t		sdma_ev_tx;
 	int			sdma_channel;
 };
 
@@ -437,7 +438,7 @@ find_sdma_controller(struct sc_info *sc)
 	struct sdma_softc *sdma_sc;
 	phandle_t node, sdma_node;
 	device_t sdma_dev;
-	int dts_value[8];
+	pcell_t dts_value[DMAS_TOTAL];
 	int len;
 
 	if ((node = ofw_bus_get_node(sc->dev)) == -1)
@@ -446,7 +447,14 @@ find_sdma_controller(struct sc_info *sc)
 	if ((len = OF_getproplen(node, "dmas")) <= 0)
 		return (ENXIO);
 
-	OF_getencprop(node, "dmas", &dts_value, len);
+	if (len != sizeof(dts_value)) {
+		device_printf(sc->dev,
+		    "\"dmas\" property length is invalid: %d (expected %d)",
+		    len, sizeof(dts_value));
+		return (ENXIO);
+	}
+
+	OF_getencprop(node, "dmas", dts_value, sizeof(dts_value));
 
 	sc->sdma_ev_rx = dts_value[1];
 	sc->sdma_ev_tx = dts_value[5];
@@ -850,4 +858,5 @@ static driver_t ssi_pcm_driver = {
 
 DRIVER_MODULE(ssi, simplebus, ssi_pcm_driver, pcm_devclass, 0, 0);
 MODULE_DEPEND(ssi, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER);
+MODULE_DEPEND(ssi, sdma, 0, 0, 0);
 MODULE_VERSION(ssi, 1);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201612210132.uBL1WJJJ075948>