From owner-dev-commits-src-branches@freebsd.org Sun Jul 18 00:36:38 2021 Return-Path: Delivered-To: dev-commits-src-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F024C65F0F0; Sun, 18 Jul 2021 00:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GS5dK1cBnz4RZy; Sun, 18 Jul 2021 00:36:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0AF0E1A493; Sun, 18 Jul 2021 00:36:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16I0aXmm049283; Sun, 18 Jul 2021 00:36:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16I0aXvo049282; Sun, 18 Jul 2021 00:36:33 GMT (envelope-from git) Date: Sun, 18 Jul 2021 00:36:33 GMT Message-Id: <202107180036.16I0aXvo049282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: d8310b668b25 - stable/13 - LinuxKPI: byteorder.h MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d8310b668b2545d21708bd36f4bfdb926fa329d3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2021 00:36:38 -0000 The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d8310b668b2545d21708bd36f4bfdb926fa329d3 commit d8310b668b2545d21708bd36f4bfdb926fa329d3 Author: Bjoern A. Zeeb AuthorDate: 2021-05-24 17:54:16 +0000 Commit: Bjoern A. Zeeb CommitDate: 2021-07-18 00:35:02 +0000 LinuxKPI: byteorder.h Add a few more le_{tp,add}_cpu*() #defines/functions found in wireless drivers. While here fill most of the combinatorics gaps and also add the remaining combinations [1]. Suggested by: emaste [1] (for one part) Sponsored by: The FreeBSD Foundation Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D30418 (cherry picked from commit 5aeeab54b0e1042b09dcea43540994c1ce43eebd) --- sys/compat/linuxkpi/common/include/asm/byteorder.h | 138 +++++++++++++++------ 1 file changed, 102 insertions(+), 36 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/byteorder.h b/sys/compat/linuxkpi/common/include/asm/byteorder.h index 0a6c2b039c66..05e39bb52149 100644 --- a/sys/compat/linuxkpi/common/include/asm/byteorder.h +++ b/sys/compat/linuxkpi/common/include/asm/byteorder.h @@ -41,54 +41,120 @@ #define __BIG_ENDIAN #endif -#define cpu_to_le64(x) htole64(x) -#define le64_to_cpu(x) le64toh(x) -#define cpu_to_le32(x) htole32(x) -#define le32_to_cpu(x) le32toh(x) -#define cpu_to_le16(x) htole16(x) -#define le16_to_cpu(x) le16toh(x) -#define cpu_to_be64(x) htobe64(x) -#define be64_to_cpu(x) be64toh(x) -#define cpu_to_be32(x) htobe32(x) -#define be32_to_cpu(x) be32toh(x) -#define cpu_to_be16(x) htobe16(x) -#define be16_to_cpu(x) be16toh(x) +#define __cpu_to_le64(x) htole64(x) +#define cpu_to_le64(x) __cpu_to_le64(x) +#define __le64_to_cpu(x) le64toh(x) +#define le64_to_cpu(x) __le64_to_cpu(x) +#define __cpu_to_le32(x) htole32(x) +#define cpu_to_le32(x) __cpu_to_le32(x) +#define __le32_to_cpu(x) le32toh(x) +#define le32_to_cpu(x) __le32_to_cpu(x) +#define __cpu_to_le16(x) htole16(x) +#define cpu_to_le16(x) __cpu_to_le16(x) +#define __le16_to_cpu(x) le16toh(x) +#define le16_to_cpu(x) __le16_to_cpu(x) +#define __cpu_to_be64(x) htobe64(x) +#define cpu_to_be64(x) __cpu_to_be64(x) +#define __be64_to_cpu(x) be64toh(x) +#define be64_to_cpu(x) __be64_to_cpu(x) +#define __cpu_to_be32(x) htobe32(x) +#define cpu_to_be32(x) __cpu_to_be32(x) +#define __be32_to_cpu(x) be32toh(x) +#define be32_to_cpu(x) __be32_to_cpu(x) +#define __cpu_to_be16(x) htobe16(x) +#define cpu_to_be16(x) __cpu_to_be16(x) #define __be16_to_cpu(x) be16toh(x) +#define be16_to_cpu(x) __be16_to_cpu(x) -#define cpu_to_le64p(x) htole64(*((const uint64_t *)(x))) -#define le64_to_cpup(x) le64toh(*((const uint64_t *)(x))) -#define cpu_to_le32p(x) htole32(*((const uint32_t *)(x))) -#define le32_to_cpup(x) le32toh(*((const uint32_t *)(x))) -#define cpu_to_le16p(x) htole16(*((const uint16_t *)(x))) -#define le16_to_cpup(x) le16toh(*((const uint16_t *)(x))) -#define cpu_to_be64p(x) htobe64(*((const uint64_t *)(x))) -#define be64_to_cpup(x) be64toh(*((const uint64_t *)(x))) -#define cpu_to_be32p(x) htobe32(*((const uint32_t *)(x))) -#define be32_to_cpup(x) be32toh(*((const uint32_t *)(x))) -#define cpu_to_be16p(x) htobe16(*((const uint16_t *)(x))) -#define be16_to_cpup(x) be16toh(*((const uint16_t *)(x))) +#define __cpu_to_le64p(x) htole64(*((const uint64_t *)(x))) +#define cpu_to_le64p(x) __cpu_to_le64p(x) +#define __le64_to_cpup(x) le64toh(*((const uint64_t *)(x))) +#define le64_to_cpup(x) __le64_to_cpup(x) +#define __cpu_to_le32p(x) htole32(*((const uint32_t *)(x))) +#define cpu_to_le32p(x) __cpu_to_le32p(x) +#define __le32_to_cpup(x) le32toh(*((const uint32_t *)(x))) +#define le32_to_cpup(x) __le32_to_cpup(x) +#define __cpu_to_le16p(x) htole16(*((const uint16_t *)(x))) +#define cpu_to_le16p(x) __cpu_to_le16p(x) +#define __le16_to_cpup(x) le16toh(*((const uint16_t *)(x))) +#define le16_to_cpup(x) __le16_to_cpup(x) +#define __cpu_to_be64p(x) htobe64(*((const uint64_t *)(x))) +#define cpu_to_be64p(x) __cpu_to_be64p(x) +#define __be64_to_cpup(x) be64toh(*((const uint64_t *)(x))) +#define be64_to_cpup(x) __be64_to_cpup(x) +#define __cpu_to_be32p(x) htobe32(*((const uint32_t *)(x))) +#define cpu_to_be32p(x) __cpu_to_be32p(x) +#define __be32_to_cpup(x) be32toh(*((const uint32_t *)(x))) +#define be32_to_cpup(x) __be32_to_cpup(x) +#define __cpu_to_be16p(x) htobe16(*((const uint16_t *)(x))) +#define cpu_to_be16p(x) __cpu_to_be16p(x) +#define __be16_to_cpup(x) be16toh(*((const uint16_t *)(x))) +#define be16_to_cpup(x) __be16_to_cpup(x) -#define cpu_to_le64s(x) do { *((uint64_t *)(x)) = cpu_to_le64p((x)); } while (0) -#define le64_to_cpus(x) do { *((uint64_t *)(x)) = le64_to_cpup((x)); } while (0) -#define cpu_to_le32s(x) do { *((uint32_t *)(x)) = cpu_to_le32p((x)); } while (0) -#define le32_to_cpus(x) do { *((uint32_t *)(x)) = le32_to_cpup((x)); } while (0) -#define cpu_to_le16s(x) do { *((uint16_t *)(x)) = cpu_to_le16p((x)); } while (0) -#define le16_to_cpus(x) do { *((uint16_t *)(x)) = le16_to_cpup((x)); } while (0) -#define cpu_to_be64s(x) do { *((uint64_t *)(x)) = cpu_to_be64p((x)); } while (0) -#define be64_to_cpus(x) do { *((uint64_t *)(x)) = be64_to_cpup((x)); } while (0) -#define cpu_to_be32s(x) do { *((uint32_t *)(x)) = cpu_to_be32p((x)); } while (0) -#define be32_to_cpus(x) do { *((uint32_t *)(x)) = be32_to_cpup((x)); } while (0) -#define cpu_to_be16s(x) do { *((uint16_t *)(x)) = cpu_to_be16p((x)); } while (0) -#define be16_to_cpus(x) do { *((uint16_t *)(x)) = be16_to_cpup((x)); } while (0) + +#define __cpu_to_le64s(x) do { *((uint64_t *)(x)) = cpu_to_le64p((x)); } while (0) +#define cpu_to_le64s(x) __cpu_to_le64s(x) +#define __le64_to_cpus(x) do { *((uint64_t *)(x)) = le64_to_cpup((x)); } while (0) +#define le64_to_cpus(x) __le64_to_cpus(x) +#define __cpu_to_le32s(x) do { *((uint32_t *)(x)) = cpu_to_le32p((x)); } while (0) +#define cpu_to_le32s(x) __cpu_to_le32s(x) +#define __le32_to_cpus(x) do { *((uint32_t *)(x)) = le32_to_cpup((x)); } while (0) +#define le32_to_cpus(x) __le32_to_cpus(x) +#define __cpu_to_le16s(x) do { *((uint16_t *)(x)) = cpu_to_le16p((x)); } while (0) +#define cpu_to_le16s(x) __cpu_to_le16s(x) +#define __le16_to_cpus(x) do { *((uint16_t *)(x)) = le16_to_cpup((x)); } while (0) +#define le16_to_cpus(x) __le16_to_cpus(x) +#define __cpu_to_be64s(x) do { *((uint64_t *)(x)) = cpu_to_be64p((x)); } while (0) +#define cpu_to_be64s(x) __cpu_to_be64s(x) +#define __be64_to_cpus(x) do { *((uint64_t *)(x)) = be64_to_cpup((x)); } while (0) +#define be64_to_cpus(x) __be64_to_cpus(x) +#define __cpu_to_be32s(x) do { *((uint32_t *)(x)) = cpu_to_be32p((x)); } while (0) +#define cpu_to_be32s(x) __cpu_to_be32s(x) +#define __be32_to_cpus(x) do { *((uint32_t *)(x)) = be32_to_cpup((x)); } while (0) +#define be32_to_cpus(x) __be32_to_cpus(x) +#define __cpu_to_be16s(x) do { *((uint16_t *)(x)) = cpu_to_be16p((x)); } while (0) +#define cpu_to_be16s(x) __cpu_to_be16s(x) +#define __be16_to_cpus(x) do { *((uint16_t *)(x)) = be16_to_cpup((x)); } while (0) +#define be16_to_cpus(x) __be16_to_cpus(x) #define swab16(x) bswap16(x) #define swab32(x) bswap32(x) #define swab64(x) bswap64(x) +static inline void +be64_add_cpu(uint64_t *var, uint64_t val) +{ + *var = cpu_to_be64(be64_to_cpu(*var) + val); +} + +static inline void +be32_add_cpu(uint32_t *var, uint32_t val) +{ + *var = cpu_to_be32(be32_to_cpu(*var) + val); +} + static inline void be16_add_cpu(uint16_t *var, uint16_t val) { *var = cpu_to_be16(be16_to_cpu(*var) + val); } +static __inline void +le64_add_cpu(uint64_t *var, uint64_t val) +{ + *var = cpu_to_le64(le64_to_cpu(*var) + val); +} + +static __inline void +le32_add_cpu(uint32_t *var, uint32_t val) +{ + *var = cpu_to_le32(le32_to_cpu(*var) + val); +} + +static inline void +le16_add_cpu(uint16_t *var, uint16_t val) +{ + *var = cpu_to_le16(le16_to_cpu(*var) + val); +} + #endif /* _ASM_BYTEORDER_H_ */