From patchwork Tue Aug 6 23:09:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Gomez via B4 Relay X-Patchwork-Id: 13755427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 43867C49EA1 for ; Tue, 6 Aug 2024 23:10:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E6FE510E0F1; Tue, 6 Aug 2024 23:10:08 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="HSoAOz7r"; dkim-atps=neutral Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by gabe.freedesktop.org (Postfix) with ESMTPS id 835DE10E0F6; Tue, 6 Aug 2024 23:10:05 +0000 (UTC) Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 602AB61154; Tue, 6 Aug 2024 23:10:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPS id 951A6C32786; Tue, 6 Aug 2024 23:10:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722985803; bh=gwRv4pCIfpi2yjceV4ySL6EBr771qtq3A547owu3a/w=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=HSoAOz7rgsv66grJP/k15A/DykRnOnUycdinS56zDhlh/+0MsznkltnyXqLaIQlS/ W5IDRxorOQPhKfJ9WYrOqaOxnE5HJiGFn8950C5nnNSnI37BMiY3sOOqu6d6IBFATq pMkRLKfDdyW0maVEf47VNRRvnWZ26qYXfGPB3oga6zj+rceMe2ligh62y/KLT7JLG1 2cLkO59/ztuT3pDZowD7nauXyY5I9EunHsYsLE8ctnjgYWpXLnq2DH8BSivBpvcXuZ usDbMatguOvpXX2SjZlP10dK3Wi8Y8RNXSn7hGVqjZ1Fi5wvyKrOGQnIuPXB0JMClV 0VwV4/+XTmR5A== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87479C52D7B; Tue, 6 Aug 2024 23:10:03 +0000 (UTC) From: Daniel Gomez via B4 Relay Date: Wed, 07 Aug 2024 01:09:23 +0200 Subject: [PATCH 09/12] include: add endian.h support MIME-Version: 1.0 Message-Id: <20240807-macos-build-support-v1-9-4cd1ded85694@samsung.com> References: <20240807-macos-build-support-v1-0-4cd1ded85694@samsung.com> In-Reply-To: <20240807-macos-build-support-v1-0-4cd1ded85694@samsung.com> To: Masahiro Yamada , Nathan Chancellor , Nicolas Schier , Lucas De Marchi , =?utf-8?q?Thomas_Hellstr=C3=B6?= =?utf-8?q?m?= , Rodrigo Vivi , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , William Hubbs , Chris Brannon , Kirk Reiser , Samuel Thibault , Paul Moore , Stephen Smalley , Ondrej Mosnacek , Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Greg Kroah-Hartman , Jiri Slaby , Nick Desaulniers , Bill Wendling , Justin Stitt Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, speakup@linux-speakup.org, selinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-serial@vger.kernel.org, llvm@lists.linux.dev, Finn Behrens , "Daniel Gomez (Samsung)" , gost.dev@samsung.com, Daniel Gomez X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=ed25519-sha256; t=1722985800; l=6952; i=da.gomez@samsung.com; s=20240621; h=from:subject:message-id; bh=DtZVbn0fWX0kStQGRH/0NcswkT82D02BPxc7A212O48=; b=fHToSejWCNC5a5Y0d5FDWxUWxPOD39gQvn8dIfP7DYUHRLm01btwYrXIxK+zbXzSjEERCFH2E Toa//DYARs3Ad+ILXuWzrEr8j9YMAEO2jiTPhk1LqJjkcFnDKwl/eqB X-Developer-Key: i=da.gomez@samsung.com; a=ed25519; pk=BqYk31UHkmv0WZShES6pIZcdmPPGay5LbzifAdZ2Ia4= X-Endpoint-Received: by B4 Relay for da.gomez@samsung.com/20240621 with auth_id=175 X-Original-From: Daniel Gomez X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: da.gomez@samsung.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Daniel Gomez macOS hosts do not include endian.h header required for gen-hyper object. Add a copy of the include/endian.h from the GNU C Library (glibc), version glib-2.40 into include/endian and a copy of bits/ uintn-identity.h into include/endian/bits and update the gen-hyper Makefile to include the library path. Remove the following from glibc include/endian.h: diff --git a/include/endian/endian.h b/include/endian/endian.h index fd20a2b1985d..f70e07f1d3c6 100644 --- a/include/endian/endian.h +++ b/include/endian/endian.h @@ -18,11 +18,6 @@ #ifndef _ENDIAN_H #define _ENDIAN_H 1 -#include - -/* Get the definitions of __*_ENDIAN, __BYTE_ORDER, and __FLOAT_WORD_ORDER. */ -#include - #ifdef __USE_MISC # define LITTLE_ENDIAN __LITTLE_ENDIAN # define BIG_ENDIAN __BIG_ENDIAN @@ -30,9 +25,6 @@ # define BYTE_ORDER __BYTE_ORDER #endif -#if defined __USE_MISC && !defined __ASSEMBLER__ -/* Conversion interfaces. */ -# include # include # if __BYTE_ORDER == __LITTLE_ENDIAN @@ -67,6 +59,5 @@ # define be64toh(x) __uint64_identity (x) # define le64toh(x) __bswap_64 (x) # endif -#endif #endif /* endian.h */ Remove the following from glibc bits/uintn-identity.h: diff --git a/include/endian/bits/uintn-identity.h b/include/endian/bits/uintn-identity.h index 8104070583c7..0310c9d955da 100644 --- a/include/endian/bits/uintn-identity.h +++ b/include/endian/bits/uintn-identity.h @@ -23,8 +23,6 @@ #ifndef _BITS_UINTN_IDENTITY_H #define _BITS_UINTN_IDENTITY_H 1 -#include - /* These inline functions are to ensure the appropriate type conversions and associated diagnostics from macros that convert to a given endianness. */ Signed-off-by: Daniel Gomez --- arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- include/endian/bits/uintn-identity.h | 48 +++++++++++++++++++++++++++ include/endian/endian.h | 63 ++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 1 deletion(-) diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile index 40541c0812bf..1bbe2c2a4aed 100644 --- a/arch/arm64/kvm/hyp/nvhe/Makefile +++ b/arch/arm64/kvm/hyp/nvhe/Makefile @@ -15,7 +15,7 @@ ccflags-y += -fno-stack-protector \ $(DISABLE_STACKLEAK_PLUGIN) hostprogs := gen-hyprel -HOST_EXTRACFLAGS += -I$(objtree)/include -I$(srctree)/include/elf +HOST_EXTRACFLAGS += -I$(objtree)/include -I$(srctree)/include/elf -I$(srctree)/include/endian lib-objs := clear_page.o copy_page.o memcpy.o memset.o lib-objs := $(addprefix ../../../lib/, $(lib-objs)) diff --git a/include/endian/bits/uintn-identity.h b/include/endian/bits/uintn-identity.h new file mode 100644 index 000000000000..0310c9d955da --- /dev/null +++ b/include/endian/bits/uintn-identity.h @@ -0,0 +1,48 @@ +/* Inline functions to return unsigned integer values unchanged. + Copyright (C) 2017-2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#if !defined _NETINET_IN_H && !defined _ENDIAN_H +# error "Never use directly; include or instead." +#endif + +#ifndef _BITS_UINTN_IDENTITY_H +#define _BITS_UINTN_IDENTITY_H 1 + +/* These inline functions are to ensure the appropriate type + conversions and associated diagnostics from macros that convert to + a given endianness. */ + +static __inline __uint16_t +__uint16_identity (__uint16_t __x) +{ + return __x; +} + +static __inline __uint32_t +__uint32_identity (__uint32_t __x) +{ + return __x; +} + +static __inline __uint64_t +__uint64_identity (__uint64_t __x) +{ + return __x; +} + +#endif /* _BITS_UINTN_IDENTITY_H. */ diff --git a/include/endian/endian.h b/include/endian/endian.h new file mode 100644 index 000000000000..f70e07f1d3c6 --- /dev/null +++ b/include/endian/endian.h @@ -0,0 +1,63 @@ +/* Copyright (C) 1992-2024 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _ENDIAN_H +#define _ENDIAN_H 1 + +#ifdef __USE_MISC +# define LITTLE_ENDIAN __LITTLE_ENDIAN +# define BIG_ENDIAN __BIG_ENDIAN +# define PDP_ENDIAN __PDP_ENDIAN +# define BYTE_ORDER __BYTE_ORDER +#endif + +# include + +# if __BYTE_ORDER == __LITTLE_ENDIAN +# define htobe16(x) __bswap_16 (x) +# define htole16(x) __uint16_identity (x) +# define be16toh(x) __bswap_16 (x) +# define le16toh(x) __uint16_identity (x) + +# define htobe32(x) __bswap_32 (x) +# define htole32(x) __uint32_identity (x) +# define be32toh(x) __bswap_32 (x) +# define le32toh(x) __uint32_identity (x) + +# define htobe64(x) __bswap_64 (x) +# define htole64(x) __uint64_identity (x) +# define be64toh(x) __bswap_64 (x) +# define le64toh(x) __uint64_identity (x) + +# else +# define htobe16(x) __uint16_identity (x) +# define htole16(x) __bswap_16 (x) +# define be16toh(x) __uint16_identity (x) +# define le16toh(x) __bswap_16 (x) + +# define htobe32(x) __uint32_identity (x) +# define htole32(x) __bswap_32 (x) +# define be32toh(x) __uint32_identity (x) +# define le32toh(x) __bswap_32 (x) + +# define htobe64(x) __uint64_identity (x) +# define htole64(x) __bswap_64 (x) +# define be64toh(x) __uint64_identity (x) +# define le64toh(x) __bswap_64 (x) +# endif + +#endif /* endian.h */