On Mon, Oct 21, 2019 at 11:48 AM Gavin Hu <gavin...@arm.com> wrote:
>
> There are two definitions conflicting each other, for more
> details, refer to [1].
>
> include/rte_atomic_64.h:19: error: "dmb" redefined [-Werror]
> drivers/bus/fslmc/mc/fsl_mc_sys.h:36: note: this is the location of the
> previous definition
> #define dmb() {__asm__ __volatile__("" : : : "memory"); }
>
> The fix is to reuse the EAL definition to avoid conflicts.
>
> [1] http://inbox.dpdk.org/users/VI1PR08MB537631AB25F41B8880DCCA988FDF0@i
> VI1PR08MB5376.eurprd08.prod.outlook.com/T/#u
This url is broken as reported previously.
I can fix when applying, but please take the time to fix basic issues
like this when reported.
>
> Fixes: 3af733ba8da8 ("bus/fslmc: introduce MC object functions")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Gavin Hu <gavin...@arm.com>
> Reviewed-by: Phil Yang <phi.y...@arm.com>
> Acked-by: Hemant Agrawal <hemant.agra...@nxp.com>
Was the last change on using EAL memory barrier properly seen by Hemant ?
Just want to be sure he is ok.
> ---
> drivers/bus/fslmc/mc/fsl_mc_sys.h | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/bus/fslmc/mc/fsl_mc_sys.h
> b/drivers/bus/fslmc/mc/fsl_mc_sys.h
> index d0c7b39..68ce38b 100644
> --- a/drivers/bus/fslmc/mc/fsl_mc_sys.h
> +++ b/drivers/bus/fslmc/mc/fsl_mc_sys.h
> @@ -31,12 +31,10 @@ struct fsl_mc_io {
> #include <errno.h>
> #include <sys/uio.h>
> #include <linux/byteorder/little_endian.h>
> +#include <rte_atomic.h>
>
> -#ifndef dmb
> -#define dmb() {__asm__ __volatile__("" : : : "memory"); }
> -#endif
> -#define __iormb() dmb()
> -#define __iowmb() dmb()
> +#define __iormb() rte_io_rmb()
> +#define __iowmb() rte_io_wmb()
> #define __arch_getq(a) (*(volatile uint64_t *)(a))
> #define __arch_putq(v, a) (*(volatile uint64_t *)(a) = (v))
> #define __arch_putq32(v, a) (*(volatile uint32_t *)(a) = (v))
> --
> 2.7.4
>
--
David Marchand
