Merge pull request #26 from lgirdwood/topic/sof-dev-sparse

lgirdwood · web-flow · commit bbe7c7a835b6 · 2018-07-05T20:38:14.000+01:00
Topic/sof dev sparse
diff --git a/sound/soc/sof/core.c b/sound/soc/sof/core.c
@@ -34,7 +34,7 @@ struct snd_sof_pcm *snd_sof_find_spcm_dai(struct snd_sof_dev *sdev,
 	struct snd_sof_pcm *spcm = NULL;
 
 	list_for_each_entry(spcm, &sdev->pcm_list, list) {
-		if (spcm->pcm.dai_id == rtd->dai_link->id)
+		if (le32_to_cpu(spcm->pcm.dai_id) == rtd->dai_link->id)
 			return spcm;
 	}
 
@@ -87,7 +87,7 @@ struct snd_sof_pcm *snd_sof_find_spcm_pcm_id(struct snd_sof_dev *sdev,
 	struct snd_sof_pcm *spcm = NULL;
 
 	list_for_each_entry(spcm, &sdev->pcm_list, list) {
-		if (spcm->pcm.pcm_id == pcm_id)
+		if (le32_to_cpu(spcm->pcm.pcm_id) == pcm_id)
 			return spcm;
 	}
 
diff --git a/sound/soc/sof/debug.c b/sound/soc/sof/debug.c
@@ -32,7 +32,7 @@ static int sof_dfsentry_open(struct inode *inode, struct file *file)
 static ssize_t sof_dfsentry_read(struct file *file, char __user *buffer,
 				 size_t count, loff_t *ppos)
 {
-	struct snd_sof_dfsentry *dfse = file->private_data;
+	struct snd_sof_dfsentry_io *dfse = file->private_data;
 	struct snd_sof_dev *sdev = dfse->sdev;
 	int size;
 	u32 *buf;
@@ -78,7 +78,7 @@ int snd_sof_debugfs_create_item(struct snd_sof_dev *sdev,
 				void __iomem *base, size_t size,
 				const char *name)
 {
-	struct snd_sof_dfsentry *dfse;
+	struct snd_sof_dfsentry_io *dfse;
 
 	if (!sdev)
 		return -EINVAL;
@@ -118,7 +118,8 @@ int snd_sof_dbg_init(struct snd_sof_dev *sdev)
 	for (i = 0; i < ops->debug_map_count; i++) {
 		map = &ops->debug_map[i];
 
-		err = snd_sof_debugfs_create_item(sdev, sdev->bar[map->bar] +
+		err = snd_sof_debugfs_create_item(sdev,
+						  sdev->bar[map->bar] +
 						  map->offset, map->size,
 						  map->name);
 		if (err < 0)
diff --git a/sound/soc/sof/intel/bdw.c b/sound/soc/sof/intel/bdw.c
@@ -87,12 +87,12 @@ static void bdw_block_write(struct snd_sof_dev *sdev, u32 offset, void *src,
 	n = size % 4;
 
 	/* __iowrite32_copy use 32bit size values so divide by 4 */
-	__iowrite32_copy((void *)dest, src, m);
+	__iowrite32_copy(dest, src, m);
 
 	if (n) {
 		for (i = 0; i < n; i++)
 			tmp |= (u32)*(src_byte + m * 4 + i) << (i * 8);
-		__iowrite32_copy((void *)(dest + m * 4), &tmp, 1);
+		__iowrite32_copy(dest + m * 4, &tmp, 1);
 	}
 }
 
diff --git a/sound/soc/sof/intel/byt.c b/sound/soc/sof/intel/byt.c
@@ -140,12 +140,12 @@ static void byt_block_write(struct snd_sof_dev *sdev, u32 offset, void *src,
 	n = size % 4;
 
 	/* __iowrite32_copy use 32bit size values so divide by 4 */
-	__iowrite32_copy((void *)dest, src, m);
+	__iowrite32_copy(dest, src, m);
 
 	if (n) {
 		for (i = 0; i < n; i++)
 			tmp |= (u32)*(src_byte + m * 4 + i) << (i * 8);
-		__iowrite32_copy((void *)(dest + m * 4), &tmp, 1);
+		__iowrite32_copy(dest + m * 4, &tmp, 1);
 	}
 }
 
diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
@@ -77,12 +77,12 @@ void hda_dsp_block_write(struct snd_sof_dev *sdev, u32 offset, void *src,
 	n = size % 4;
 
 	/* __iowrite32_copy use 32bit size values so divide by 4 */
-	__iowrite32_copy((void *)dest, src, m);
+	__iowrite32_copy(dest, src, m);
 
 	if (n) {
 		for (i = 0; i < n; i++)
 			tmp |= (u32)*(src_byte + m * 4 + i) << (i * 8);
-		__iowrite32_copy((void *)(dest + m * 4), &tmp, 1);
+		__iowrite32_copy(dest + m * 4, &tmp, 1);
 	}
 }
 
diff --git a/sound/soc/sof/intel/hsw.c b/sound/soc/sof/intel/hsw.c
@@ -88,12 +88,12 @@ static void hsw_block_write(struct snd_sof_dev *sdev, u32 offset, void *src,
 	n = size % 4;
 
 	/* __iowrite32_copy use 32bit size values so divide by 4 */
-	__iowrite32_copy((void *)dest, src, m);
+	__iowrite32_copy(dest, src, m);
 
 	if (n) {
 		for (i = 0; i < n; i++)
 			tmp |= (u32)*(src_byte + m * 4 + i) << (i * 8);
-		__iowrite32_copy((void *)(dest + m * 4), &tmp, 1);
+		__iowrite32_copy(dest + m * 4, &tmp, 1);
 	}
 }
 
diff --git a/sound/soc/sof/ipc.c b/sound/soc/sof/ipc.c
@@ -192,8 +192,8 @@ static void ipc_tx_next_msg(struct work_struct *work)
 }
 
 /* find original TX message from DSP reply */
-struct snd_sof_ipc_msg *sof_ipc_reply_find_msg(struct snd_sof_ipc *ipc,
-					       u32 header)
+static struct snd_sof_ipc_msg *sof_ipc_reply_find_msg(struct snd_sof_ipc *ipc,
+						      u32 header)
 {
 	struct snd_sof_dev *sdev = ipc->sdev;
 	struct snd_sof_ipc_msg *msg;
@@ -213,11 +213,10 @@ struct snd_sof_ipc_msg *sof_ipc_reply_find_msg(struct snd_sof_ipc *ipc,
 		header);
 	return NULL;
 }
-EXPORT_SYMBOL(sof_ipc_reply_find_msg);
 
 /* mark IPC message as complete - locks held by caller */
-void sof_ipc_tx_msg_reply_complete(struct snd_sof_ipc *ipc,
-				   struct snd_sof_ipc_msg *msg)
+static void sof_ipc_tx_msg_reply_complete(struct snd_sof_ipc *ipc,
+					  struct snd_sof_ipc_msg *msg)
 {
 	msg->complete = true;
 	wake_up(&msg->waitq);
diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
@@ -291,10 +291,10 @@ static int sof_pcm_open(struct snd_pcm_substream *substream)
 	/* set any runtime constraints based on topology */
 	snd_pcm_hw_constraint_step(substream->runtime, 0,
 				   SNDRV_PCM_HW_PARAM_BUFFER_SIZE,
-				   caps->period_size_min);
+				   le32_to_cpu(caps->period_size_min));
 	snd_pcm_hw_constraint_step(substream->runtime, 0,
 				   SNDRV_PCM_HW_PARAM_PERIOD_SIZE,
-				   caps->period_size_min);
+				   le32_to_cpu(caps->period_size_min));
 
 	/* set runtime config */
 	runtime->hw.info = SNDRV_PCM_INFO_MMAP |
@@ -303,12 +303,12 @@ static int sof_pcm_open(struct snd_pcm_substream *substream)
 			  SNDRV_PCM_INFO_PAUSE |
 			  SNDRV_PCM_INFO_RESUME |
 			  SNDRV_PCM_INFO_NO_PERIOD_WAKEUP;
-	runtime->hw.formats = caps->formats;
-	runtime->hw.period_bytes_min = caps->period_size_min;
-	runtime->hw.period_bytes_max = caps->period_size_max;
-	runtime->hw.periods_min = caps->periods_min;
-	runtime->hw.periods_max = caps->periods_max;
-	runtime->hw.buffer_bytes_max = caps->buffer_size_max;
+	runtime->hw.formats = le64_to_cpu(caps->formats);
+	runtime->hw.period_bytes_min = le32_to_cpu(caps->period_size_min);
+	runtime->hw.period_bytes_max = le32_to_cpu(caps->period_size_max);
+	runtime->hw.periods_min = le32_to_cpu(caps->periods_min);
+	runtime->hw.periods_max = le32_to_cpu(caps->periods_max);
+	runtime->hw.buffer_bytes_max = le32_to_cpu(caps->buffer_size_max);
 
 	dev_dbg(sdev->dev, "period min %zd max %zd bytes\n",
 		runtime->hw.period_bytes_min,
@@ -398,8 +398,8 @@ static int sof_pcm_new(struct snd_soc_pcm_runtime *rtd)
 
 	ret = snd_pcm_lib_preallocate_pages(pcm->streams[stream].substream,
 					    SNDRV_DMA_TYPE_DEV_SG, sdev->parent,
-					    caps->buffer_size_min,
-					    caps->buffer_size_max);
+					    le32_to_cpu(caps->buffer_size_min),
+					    le32_to_cpu(caps->buffer_size_max));
 	if (ret) {
 		dev_err(sdev->dev, "error: can't alloc DMA buffer size 0x%x/0x%x for %s %d\n",
 			caps->buffer_size_min, caps->buffer_size_max,
@@ -431,8 +431,8 @@ static int sof_pcm_new(struct snd_soc_pcm_runtime *rtd)
 
 	ret = snd_pcm_lib_preallocate_pages(pcm->streams[stream].substream,
 					    SNDRV_DMA_TYPE_DEV_SG, sdev->parent,
-					    caps->buffer_size_min,
-					    caps->buffer_size_max);
+					    le32_to_cpu(caps->buffer_size_min),
+					    le32_to_cpu(caps->buffer_size_max));
 	if (ret) {
 		dev_err(sdev->dev, "error: can't alloc DMA buffer size 0x%x/0x%x for %s %d\n",
 			caps->buffer_size_min, caps->buffer_size_max,
@@ -506,7 +506,7 @@ static int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd,
 		channels->max = 2;
 
 		snd_mask_none(fmt);
-		snd_mask_set(fmt, SNDRV_PCM_FORMAT_S16_LE);
+		snd_mask_set(fmt, (__force int)SNDRV_PCM_FORMAT_S16_LE);
 
 		return 0;
 	}
@@ -516,13 +516,13 @@ static int sof_pcm_dai_link_fixup(struct snd_soc_pcm_runtime *rtd,
 
 	switch (dai->comp_dai.config.frame_fmt) {
 	case SOF_IPC_FRAME_S16_LE:
-		snd_mask_set(fmt, SNDRV_PCM_FORMAT_S16_LE);
+		snd_mask_set(fmt, (__force int)SNDRV_PCM_FORMAT_S16_LE);
 		break;
 	case SOF_IPC_FRAME_S24_4LE:
-		snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+		snd_mask_set(fmt, (__force int)SNDRV_PCM_FORMAT_S24_LE);
 		break;
 	case SOF_IPC_FRAME_S32_LE:
-		snd_mask_set(fmt, SNDRV_PCM_FORMAT_S32_LE);
+		snd_mask_set(fmt, (__force int)SNDRV_PCM_FORMAT_S32_LE);
 		break;
 	default:
 		dev_err(sdev->dev, "No available DAI format!\n");
diff --git a/sound/soc/sof/sof-priv.h b/sound/soc/sof/sof-priv.h
@@ -107,9 +107,9 @@ struct snd_sof_dsp_ops {
 
 	/* mailbox */
 	void (*mailbox_read)(struct snd_sof_dev *sof_dev, u32 offset,
-			     void __iomem *addr, size_t bytes);
+			     void *addr, size_t bytes);
 	void (*mailbox_write)(struct snd_sof_dev *sof_dev, u32 offset,
-			      void __iomem *addr, size_t bytes);
+			      void *addr, size_t bytes);
 
 	/* ipc */
 	int (*send_msg)(struct snd_sof_dev *sof_dev,
@@ -171,7 +171,14 @@ struct sof_ops_table {
 };
 
 /* FS entry for debug files that can expose DSP memories, registers */
-struct snd_sof_dfsentry {
+struct snd_sof_dfsentry_io {
+	struct dentry *dfsentry;
+	size_t size;
+	void __iomem *buf;
+	struct snd_sof_dev *sdev;
+};
+
+struct snd_sof_dfsentry_buf {
 	struct dentry *dfsentry;
 	size_t size;
 	void *buf;
@@ -401,6 +408,7 @@ struct snd_sof_pcm *snd_sof_find_spcm_comp(struct snd_sof_dev *sdev,
 					   int *direction);
 struct snd_sof_pcm *snd_sof_find_spcm_pcm_id(struct snd_sof_dev *sdev,
 					     unsigned int pcm_id);
+void sof_ipc_drop_all(struct snd_sof_ipc *ipc);
 
 /*
  * Stream IPC
diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c
diff --git a/sound/soc/sof/trace.c b/sound/soc/sof/trace.c

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct snd_sof_pcm snd_sof_find_spcm_dai(struct snd_sof_dev sdev,`
`34`	`34`	`struct snd_sof_pcm *spcm = NULL;`
`35`	`35`
`36`	`36`	`list_for_each_entry(spcm, &sdev->pcm_list, list) {`
`37`		`- if (spcm->pcm.dai_id == rtd->dai_link->id)`
	`37`	`+ if (le32_to_cpu(spcm->pcm.dai_id) == rtd->dai_link->id)`
`38`	`38`	`return spcm;`
`39`	`39`	`}`
`40`	`40`
`@@ -87,7 +87,7 @@ struct snd_sof_pcm snd_sof_find_spcm_pcm_id(struct snd_sof_dev sdev,`
`87`	`87`	`struct snd_sof_pcm *spcm = NULL;`
`88`	`88`
`89`	`89`	`list_for_each_entry(spcm, &sdev->pcm_list, list) {`
`90`		`- if (spcm->pcm.pcm_id == pcm_id)`
	`90`	`+ if (le32_to_cpu(spcm->pcm.pcm_id) == pcm_id)`
`91`	`91`	`return spcm;`
`92`	`92`	`}`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -87,12 +87,12 @@ static void bdw_block_write(struct snd_sof_dev sdev, u32 offset, void src,`
`87`	`87`	`n = size % 4;`
`88`	`88`
`89`	`89`	`/* __iowrite32_copy use 32bit size values so divide by 4 */`
`90`		`- __iowrite32_copy((void *)dest, src, m);`
	`90`	`+ __iowrite32_copy(dest, src, m);`
`91`	`91`
`92`	`92`	`if (n) {`
`93`	`93`	`for (i = 0; i < n; i++)`
`94`	`94`	`tmp \|= (u32)(src_byte + m 4 + i) << (i * 8);`
`95`		`- __iowrite32_copy((void )(dest + m 4), &tmp, 1);`
	`95`	`+ __iowrite32_copy(dest + m * 4, &tmp, 1);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -140,12 +140,12 @@ static void byt_block_write(struct snd_sof_dev sdev, u32 offset, void src,`
`140`	`140`	`n = size % 4;`
`141`	`141`
`142`	`142`	`/* __iowrite32_copy use 32bit size values so divide by 4 */`
`143`		`- __iowrite32_copy((void *)dest, src, m);`
	`143`	`+ __iowrite32_copy(dest, src, m);`
`144`	`144`
`145`	`145`	`if (n) {`
`146`	`146`	`for (i = 0; i < n; i++)`
`147`	`147`	`tmp \|= (u32)(src_byte + m 4 + i) << (i * 8);`
`148`		`- __iowrite32_copy((void )(dest + m 4), &tmp, 1);`
	`148`	`+ __iowrite32_copy(dest + m * 4, &tmp, 1);`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
Original file line number	Diff line number	Diff line change
`@@ -77,12 +77,12 @@ void hda_dsp_block_write(struct snd_sof_dev sdev, u32 offset, void src,`
`77`	`77`	`n = size % 4;`
`78`	`78`
`79`	`79`	`/* __iowrite32_copy use 32bit size values so divide by 4 */`
`80`		`- __iowrite32_copy((void *)dest, src, m);`
	`80`	`+ __iowrite32_copy(dest, src, m);`
`81`	`81`
`82`	`82`	`if (n) {`
`83`	`83`	`for (i = 0; i < n; i++)`
`84`	`84`	`tmp \|= (u32)(src_byte + m 4 + i) << (i * 8);`
`85`		`- __iowrite32_copy((void )(dest + m 4), &tmp, 1);`
	`85`	`+ __iowrite32_copy(dest + m * 4, &tmp, 1);`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -88,12 +88,12 @@ static void hsw_block_write(struct snd_sof_dev sdev, u32 offset, void src,`
`88`	`88`	`n = size % 4;`
`89`	`89`
`90`	`90`	`/* __iowrite32_copy use 32bit size values so divide by 4 */`
`91`		`- __iowrite32_copy((void *)dest, src, m);`
	`91`	`+ __iowrite32_copy(dest, src, m);`
`92`	`92`
`93`	`93`	`if (n) {`
`94`	`94`	`for (i = 0; i < n; i++)`
`95`	`95`	`tmp \|= (u32)(src_byte + m 4 + i) << (i * 8);`
`96`		`- __iowrite32_copy((void )(dest + m 4), &tmp, 1);`
	`96`	`+ __iowrite32_copy(dest + m * 4, &tmp, 1);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -192,8 +192,8 @@ static void ipc_tx_next_msg(struct work_struct *work)`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`/* find original TX message from DSP reply */`
`195`		`-struct snd_sof_ipc_msg sof_ipc_reply_find_msg(struct snd_sof_ipc ipc,`
`196`		`- u32 header)`
	`195`	`+static struct snd_sof_ipc_msg sof_ipc_reply_find_msg(struct snd_sof_ipc ipc,`
	`196`	`+ u32 header)`
`197`	`197`	`{`
`198`	`198`	`struct snd_sof_dev *sdev = ipc->sdev;`
`199`	`199`	`struct snd_sof_ipc_msg *msg;`
`@@ -213,11 +213,10 @@ struct snd_sof_ipc_msg sof_ipc_reply_find_msg(struct snd_sof_ipc ipc,`
`213`	`213`	`header);`
`214`	`214`	`return NULL;`
`215`	`215`	`}`
`216`		`-EXPORT_SYMBOL(sof_ipc_reply_find_msg);`
`217`	`216`
`218`	`217`	`/* mark IPC message as complete - locks held by caller */`
`219`		`-void sof_ipc_tx_msg_reply_complete(struct snd_sof_ipc *ipc,`
`220`		`- struct snd_sof_ipc_msg *msg)`
	`218`	`+static void sof_ipc_tx_msg_reply_complete(struct snd_sof_ipc *ipc,`
	`219`	`+ struct snd_sof_ipc_msg *msg)`
`221`	`220`	`{`
`222`	`221`	`msg->complete = true;`
`223`	`222`	`wake_up(&msg->waitq);`