From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F7A4C76188 for ; Mon, 22 Jul 2019 12:56:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B7C62084D for ; Mon, 22 Jul 2019 12:56:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729264AbfGVM4V (ORCPT ); Mon, 22 Jul 2019 08:56:21 -0400 Received: from mx2.suse.de ([195.135.220.15]:60624 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727164AbfGVM4U (ORCPT ); Mon, 22 Jul 2019 08:56:20 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id EE413AC6C; Mon, 22 Jul 2019 12:56:18 +0000 (UTC) Date: Mon, 22 Jul 2019 14:56:18 +0200 Message-ID: From: Takashi Iwai To: Pierre-Louis Bossart Cc: , Mark Brown , "Masahiro Yamada" , Arnd Bergmann , Liam Girdwood , Greg Kroah-Hartman , Jaroslav Kysela , Takashi Iwai , Subject: Re: [alsa-devel] [PATCH] ASoC: SOF: use __u32 instead of uint32_t in uapi headers In-Reply-To: References: <20190721142308.30306-1-yamada.masahiro@socionext.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 22 Jul 2019 14:49:34 +0200, Pierre-Louis Bossart wrote: > > > > On 7/21/19 9:23 AM, Masahiro Yamada wrote: > > When CONFIG_UAPI_HEADER_TEST=y, exported headers are compile-tested to > > make sure they can be included from user-space. > > > > Currently, header.h and fw.h are excluded from the test coverage. > > To make them join the compile-test, we need to fix the build errors > > attached below. > > > > For a case like this, we decided to use __u{8,16,32,64} variable types > > in this discussion: > > > > https://lkml.org/lkml/2019/6/5/18 > > these files are shared with the SOF project and used as is (with minor > formatting) for the firmware compilation. I am not sure I understand > the ask here, are you really asking SOF to use linux-specific type > definitions? Actually this is linux-kernel UAPI header files, so yes, we should follow the convention there as much as possible. So far we haven't been strict about these types. But now we have a unit test for checking it, so it's a good opportunity to address the issues. thanks, Takashi > > > > > Build log: > > > > CC usr/include/sound/sof/header.h.s > > CC usr/include/sound/sof/fw.h.s > > In file included from :32:0: > > ./usr/include/sound/sof/header.h:19:2: error: unknown type name ‘uint32_t’ > > uint32_t magic; /**< 'S', 'O', 'F', '\0' */ > > ^~~~~~~~ > > ./usr/include/sound/sof/header.h:20:2: error: unknown type name ‘uint32_t’ > > uint32_t type; /**< component specific type */ > > ^~~~~~~~ > > ./usr/include/sound/sof/header.h:21:2: error: unknown type name ‘uint32_t’ > > uint32_t size; /**< size in bytes of data excl. this struct */ > > ^~~~~~~~ > > ./usr/include/sound/sof/header.h:22:2: error: unknown type name ‘uint32_t’ > > uint32_t abi; /**< SOF ABI version */ > > ^~~~~~~~ > > ./usr/include/sound/sof/header.h:23:2: error: unknown type name ‘uint32_t’ > > uint32_t reserved[4]; /**< reserved for future use */ > > ^~~~~~~~ > > ./usr/include/sound/sof/header.h:24:2: error: unknown type name ‘uint32_t’ > > uint32_t data[0]; /**< Component data - opaque to core */ > > ^~~~~~~~ > > In file included from :32:0: > > ./usr/include/sound/sof/fw.h:49:2: error: unknown type name ‘uint32_t’ > > uint32_t size; /* bytes minus this header */ > > ^~~~~~~~ > > ./usr/include/sound/sof/fw.h:50:2: error: unknown type name ‘uint32_t’ > > uint32_t offset; /* offset from base */ > > ^~~~~~~~ > > ./usr/include/sound/sof/fw.h:64:2: error: unknown type name ‘uint32_t’ > > uint32_t size; /* bytes minus this header */ > > ^~~~~~~~ > > ./usr/include/sound/sof/fw.h:65:2: error: unknown type name ‘uint32_t’ > > uint32_t num_blocks; /* number of blocks */ > > ^~~~~~~~ > > ./usr/include/sound/sof/fw.h:73:2: error: unknown type name ‘uint32_t’ > > uint32_t file_size; /* size of file minus this header */ > > ^~~~~~~~ > > ./usr/include/sound/sof/fw.h:74:2: error: unknown type name ‘uint32_t’ > > uint32_t num_modules; /* number of modules */ > > ^~~~~~~~ > > ./usr/include/sound/sof/fw.h:75:2: error: unknown type name ‘uint32_t’ > > uint32_t abi; /* version of header format */ > > ^~~~~~~~ > > > > Signed-off-by: Masahiro Yamada > > --- > > > > include/uapi/sound/sof/fw.h | 16 +++++++++------- > > include/uapi/sound/sof/header.h | 14 ++++++++------ > > 2 files changed, 17 insertions(+), 13 deletions(-) > > > > diff --git a/include/uapi/sound/sof/fw.h b/include/uapi/sound/sof/fw.h > > index 1afca973eb09..e9f697467a86 100644 > > --- a/include/uapi/sound/sof/fw.h > > +++ b/include/uapi/sound/sof/fw.h > > @@ -13,6 +13,8 @@ > > #ifndef __INCLUDE_UAPI_SOF_FW_H__ > > #define __INCLUDE_UAPI_SOF_FW_H__ > > +#include > > + > > #define SND_SOF_FW_SIG_SIZE 4 > > #define SND_SOF_FW_ABI 1 > > #define SND_SOF_FW_SIG "Reef" > > @@ -46,8 +48,8 @@ enum snd_sof_fw_blk_type { > > struct snd_sof_blk_hdr { > > enum snd_sof_fw_blk_type type; > > - uint32_t size; /* bytes minus this header */ > > - uint32_t offset; /* offset from base */ > > + __u32 size; /* bytes minus this header */ > > + __u32 offset; /* offset from base */ > > } __packed; > > /* > > @@ -61,8 +63,8 @@ enum snd_sof_fw_mod_type { > > struct snd_sof_mod_hdr { > > enum snd_sof_fw_mod_type type; > > - uint32_t size; /* bytes minus this header */ > > - uint32_t num_blocks; /* number of blocks */ > > + __u32 size; /* bytes minus this header */ > > + __u32 num_blocks; /* number of blocks */ > > } __packed; > > /* > > @@ -70,9 +72,9 @@ struct snd_sof_mod_hdr { > > */ > > struct snd_sof_fw_header { > > unsigned char sig[SND_SOF_FW_SIG_SIZE]; /* "Reef" */ > > - uint32_t file_size; /* size of file minus this header */ > > - uint32_t num_modules; /* number of modules */ > > - uint32_t abi; /* version of header format */ > > + __u32 file_size; /* size of file minus this header */ > > + __u32 num_modules; /* number of modules */ > > + __u32 abi; /* version of header format */ > > } __packed; > > #endif > > diff --git a/include/uapi/sound/sof/header.h b/include/uapi/sound/sof/header.h > > index 7868990b0d6f..5f4518e7a972 100644 > > --- a/include/uapi/sound/sof/header.h > > +++ b/include/uapi/sound/sof/header.h > > @@ -9,6 +9,8 @@ > > #ifndef __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__ > > #define __INCLUDE_UAPI_SOUND_SOF_USER_HEADER_H__ > > +#include > > + > > /* > > * Header for all non IPC ABI data. > > * > > @@ -16,12 +18,12 @@ > > * Used by any bespoke component data structures or binary blobs. > > */ > > struct sof_abi_hdr { > > - uint32_t magic; /**< 'S', 'O', 'F', '\0' */ > > - uint32_t type; /**< component specific type */ > > - uint32_t size; /**< size in bytes of data excl. this struct */ > > - uint32_t abi; /**< SOF ABI version */ > > - uint32_t reserved[4]; /**< reserved for future use */ > > - uint32_t data[0]; /**< Component data - opaque to core */ > > + __u32 magic; /**< 'S', 'O', 'F', '\0' */ > > + __u32 type; /**< component specific type */ > > + __u32 size; /**< size in bytes of data excl. this struct */ > > + __u32 abi; /**< SOF ABI version */ > > + __u32 reserved[4]; /**< reserved for future use */ > > + __u32 data[0]; /**< Component data - opaque to core */ > > } __packed; > > #endif > > >