[alsa-devel] [PATCH] ASoC: sof: include types.h at header.h
Content-Transfer-Encoding: 8bit
Without <types.h> we will get these error
linux/include/sound/sof/header.h:125:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:136:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:137:2: error: unknown type name ‘uint32_t’uint32_t cmd; ... linux/include/sound/sof/dai-imx.h:18:2: error: unknown type name ‘uint16_t’uint16_t reserved1; linux/include/sound/sof/dai-imx.h:30:2: error: unknown type name ‘uint16_t’uint16_t tdm_slot_width; linux/include/sound/sof/dai-imx.h:31:2: error: unknown type name ‘uint16_t’uint16_t reserved2;
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com --- include/sound/sof/header.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/sound/sof/header.h b/include/sound/sof/header.h index 10f00c0..332143f 100644 --- a/include/sound/sof/header.h +++ b/include/sound/sof/header.h @@ -9,6 +9,7 @@ #ifndef __INCLUDE_SOUND_SOF_HEADER_H__ #define __INCLUDE_SOUND_SOF_HEADER_H__
+#include <linux/types.h> #include <uapi/sound/sof/abi.h>
/** \addtogroup sof_uapi uAPI
Hello Morimoto-san,
On Tue, Oct 15, 2019 at 8:45 AM Kuninori Morimoto kuninori.morimoto.gx@renesas.com wrote:
Content-Transfer-Encoding: 8bit
Without <types.h> we will get these error
linux/include/sound/sof/header.h:125:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:136:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:137:2: error: unknown type name ‘uint32_t’uint32_t cmd; ... linux/include/sound/sof/dai-imx.h:18:2: error: unknown type name ‘uint16_t’uint16_t reserved1; linux/include/sound/sof/dai-imx.h:30:2: error: unknown type name ‘uint16_t’uint16_t tdm_slot_width; linux/include/sound/sof/dai-imx.h:31:2: error: unknown type name ‘uint16_t’uint16_t reserved2;
I think your patch is OK, but you should update the commit message because Stephen Rothwell already fixed dai-imx.h compilation error in linux-next.
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com
include/sound/sof/header.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/sound/sof/header.h b/include/sound/sof/header.h index 10f00c0..332143f 100644 --- a/include/sound/sof/header.h +++ b/include/sound/sof/header.h @@ -9,6 +9,7 @@ #ifndef __INCLUDE_SOUND_SOF_HEADER_H__ #define __INCLUDE_SOUND_SOF_HEADER_H__
+#include <linux/types.h> #include <uapi/sound/sof/abi.h>
/** \addtogroup sof_uapi uAPI
2.7.4
Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Hi Daniel
Content-Transfer-Encoding: 8bit
Without <types.h> we will get these error
linux/include/sound/sof/header.h:125:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:136:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:137:2: error: unknown type name ‘uint32_t’uint32_t cmd; ... linux/include/sound/sof/dai-imx.h:18:2: error: unknown type name ‘uint16_t’uint16_t reserved1; linux/include/sound/sof/dai-imx.h:30:2: error: unknown type name ‘uint16_t’uint16_t tdm_slot_width; linux/include/sound/sof/dai-imx.h:31:2: error: unknown type name ‘uint16_t’uint16_t reserved2;
I think your patch is OK, but you should update the commit message because Stephen Rothwell already fixed dai-imx.h compilation error in linux-next.
I see. Thanks
But hmm... I couldn't find it at linux-next/master today... Not yet merged ?
Thank you for your help !! Best regards --- Kuninori Morimoto
On Tue, Oct 15, 2019 at 9:57 AM Kuninori Morimoto kuninori.morimoto.gx@renesas.com wrote:
Hi Daniel
Content-Transfer-Encoding: 8bit
Without <types.h> we will get these error
linux/include/sound/sof/header.h:125:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:136:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:137:2: error: unknown type name ‘uint32_t’uint32_t cmd; ... linux/include/sound/sof/dai-imx.h:18:2: error: unknown type name ‘uint16_t’uint16_t reserved1; linux/include/sound/sof/dai-imx.h:30:2: error: unknown type name ‘uint16_t’uint16_t tdm_slot_width; linux/include/sound/sof/dai-imx.h:31:2: error: unknown type name ‘uint16_t’uint16_t reserved2;
I think your patch is OK, but you should update the commit message because Stephen Rothwell already fixed dai-imx.h compilation error in linux-next.
I see. Thanks
But hmm... I couldn't find it at linux-next/master today... Not yet merged ?
Yes, this is strange. I've sent an email to Stephen and also added you to Cc.
But, your patch is still valid because Stephen used +#include <linux/types.h> in dai-imx.h and you are now fixing the generic situation by including it in header.h.
Lets see if Stephen can clarify the situation. Perhaps we can drop his patch and only have yours.
On 10/15/19 2:07 AM, Daniel Baluta wrote:
On Tue, Oct 15, 2019 at 9:57 AM Kuninori Morimoto kuninori.morimoto.gx@renesas.com wrote:
Hi Daniel
Content-Transfer-Encoding: 8bit
Without <types.h> we will get these error
linux/include/sound/sof/header.h:125:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:136:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:137:2: error: unknown type name ‘uint32_t’uint32_t cmd; ... linux/include/sound/sof/dai-imx.h:18:2: error: unknown type name ‘uint16_t’uint16_t reserved1; linux/include/sound/sof/dai-imx.h:30:2: error: unknown type name ‘uint16_t’uint16_t tdm_slot_width; linux/include/sound/sof/dai-imx.h:31:2: error: unknown type name ‘uint16_t’uint16_t reserved2;
I think your patch is OK, but you should update the commit message because Stephen Rothwell already fixed dai-imx.h compilation error in linux-next.
I see. Thanks
But hmm... I couldn't find it at linux-next/master today... Not yet merged ?
Yes, this is strange. I've sent an email to Stephen and also added you to Cc.
But, your patch is still valid because Stephen used +#include <linux/types.h> in dai-imx.h and you are now fixing the generic situation by including it in header.h.
Lets see if Stephen can clarify the situation. Perhaps we can drop his patch and only have yours.
this is a file shared with the firmware, we shouldn't have to add linux specific stuff in there.
Also I don't know how you get those errors, we've been using this file for some time, can you clarify how this error happens?
Thanks.
Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Hi Pierre-Louis
Without <types.h> we will get these error
linux/include/sound/sof/header.h:125:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:136:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:137:2: error: unknown type name ‘uint32_t’uint32_t cmd; ... linux/include/sound/sof/dai-imx.h:18:2: error: unknown type name ‘uint16_t’uint16_t reserved1; linux/include/sound/sof/dai-imx.h:30:2: error: unknown type name ‘uint16_t’uint16_t tdm_slot_width; linux/include/sound/sof/dai-imx.h:31:2: error: unknown type name ‘uint16_t’uint16_t reserved2;
(snip)
this is a file shared with the firmware, we shouldn't have to add linux specific stuff in there.
Also I don't know how you get those errors, we've been using this file for some time, can you clarify how this error happens?
I had got this error by using "make allyesconfig" and compile for x86.
Thank you for your help !! Best regards --- Kuninori Morimoto
On Wed, Oct 16, 2019 at 3:28 AM Kuninori Morimoto kuninori.morimoto.gx@renesas.com wrote:
Hi Pierre-Louis
Without <types.h> we will get these error
linux/include/sound/sof/header.h:125:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:136:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:137:2: error: unknown type name ‘uint32_t’uint32_t cmd; ... linux/include/sound/sof/dai-imx.h:18:2: error: unknown type name ‘uint16_t’uint16_t reserved1; linux/include/sound/sof/dai-imx.h:30:2: error: unknown type name ‘uint16_t’uint16_t tdm_slot_width; linux/include/sound/sof/dai-imx.h:31:2: error: unknown type name ‘uint16_t’uint16_t reserved2;
(snip)
this is a file shared with the firmware, we shouldn't have to add linux specific stuff in there.
Also I don't know how you get those errors, we've been using this file for some time, can you clarify how this error happens?
I had got this error by using "make allyesconfig" and compile for x86.
Thank you for your help !! Best regards
Kuninori Morimoto
On Wed, Oct 16, 2019 at 3:28 AM Kuninori Morimoto kuninori.morimoto.gx@renesas.com wrote:
Hi Pierre-Louis
Without <types.h> we will get these error
linux/include/sound/sof/header.h:125:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:136:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:137:2: error: unknown type name ‘uint32_t’uint32_t cmd; ... linux/include/sound/sof/dai-imx.h:18:2: error: unknown type name ‘uint16_t’uint16_t reserved1; linux/include/sound/sof/dai-imx.h:30:2: error: unknown type name ‘uint16_t’uint16_t tdm_slot_width; linux/include/sound/sof/dai-imx.h:31:2: error: unknown type name ‘uint16_t’uint16_t reserved2;
(snip)
this is a file shared with the firmware, we shouldn't have to add linux specific stuff in there.
Also I don't know how you get those errors, we've been using this file for some time, can you clarify how this error happens?
I had got this error by using "make allyesconfig" and compile for x86.
Sorry, I've earlier sent an empty message.
Ok, then IStephen's patch fixes the issue and we should not touch include/sound/sof/header.h
That means Mark needs to drop Morimoto-san's patch.
On Wed, Oct 16, 2019 at 2:21 PM Mark Brown broonie@kernel.org wrote:
On Wed, Oct 16, 2019 at 02:11:57PM +0300, Daniel Baluta wrote:
That means Mark needs to drop Morimoto-san's patch.
Please send a patch reverting it if you think that's the best option.
On a second thought header.h from FW side includes <stdint.h> so I think it is fair that header.h from Linux kernel to include <types.h>
Another remark I have is that usually kernel headers should include their <uapi> counterparts, but in header.h doesn't happen. I wonder why.
In my opinion the best solution would be this:
diff --git a/include/sound/sof/header.h b/include/sound/sof/header.h index 10f00c08dbb7..a0d6b5896467 100644 --- a/include/sound/sof/header.h +++ b/include/sound/sof/header.h @@ -9,6 +9,7 @@ #ifndef __INCLUDE_SOUND_SOF_HEADER_H__ #define __INCLUDE_SOUND_SOF_HEADER_H__
+#include <uapi/sound/sof/header.h> #include <uapi/sound/sof/abi.h>
/** \addtogroup sof_uapi uAPI
I need Pierre to have a look.
The patch
ASoC: sof: include types.h at header.h
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.5
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
From 03048217624a9472c1c7a205c8ea9bf8d4026e59 Mon Sep 17 00:00:00 2001
From: Kuninori Morimoto kuninori.morimoto.gx@renesas.com Date: Tue, 15 Oct 2019 14:44:09 +0900 Subject: [PATCH] ASoC: sof: include types.h at header.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Content-Transfer-Encoding: 8bit
Without <types.h> we will get these error
linux/include/sound/sof/header.h:125:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:136:2: error: unknown type name ‘uint32_t’uint32_t size; linux/include/sound/sof/header.h:137:2: error: unknown type name ‘uint32_t’uint32_t cmd; ... linux/include/sound/sof/dai-imx.h:18:2: error: unknown type name ‘uint16_t’uint16_t reserved1; linux/include/sound/sof/dai-imx.h:30:2: error: unknown type name ‘uint16_t’uint16_t tdm_slot_width; linux/include/sound/sof/dai-imx.h:31:2: error: unknown type name ‘uint16_t’uint16_t reserved2;
Signed-off-by: Kuninori Morimoto kuninori.morimoto.gx@renesas.com Link: https://lore.kernel.org/r/87a7a24l7r.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown broonie@kernel.org --- include/sound/sof/header.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/sound/sof/header.h b/include/sound/sof/header.h index 10f00c08dbb7..332143ff7278 100644 --- a/include/sound/sof/header.h +++ b/include/sound/sof/header.h @@ -9,6 +9,7 @@ #ifndef __INCLUDE_SOUND_SOF_HEADER_H__ #define __INCLUDE_SOUND_SOF_HEADER_H__
+#include <linux/types.h> #include <uapi/sound/sof/abi.h>
/** \addtogroup sof_uapi uAPI
participants (4)
-
Daniel Baluta -
Kuninori Morimoto -
Mark Brown -
Pierre-Louis Bossart