Received: by 2002:a05:6a10:6744:0:0:0:0 with SMTP id w4csp4109584pxu; Tue, 20 Oct 2020 08:27:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5g9UiEFRIut0sv+ekbRJnB44EfUZdHb9wb96qNUleinjd/AcLUGLYnySLWY8EoHMJrBgu X-Received: by 2002:a17:906:4048:: with SMTP id y8mr3674444ejj.466.1603207654462; Tue, 20 Oct 2020 08:27:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603207654; cv=none; d=google.com; s=arc-20160816; b=WA9GRDqeDE92tj3+6Wj6gQdOWNUdbqmmU6LcB4y5A9fQNj3O6bkRYPKB1uzadF5iNK shnV4EMCKR+fd58absNZRAV9yqmQND0YvsW/LIDNDCIknI9ygWq6H8+QLBg02qgcHivn q4zYjxpWHkrh5HK03KAplx577NGSG9XW7REw7SU8Qh+vhyAMeGtLJ0Zk0BjGqlEaBDIQ T6rASQWAbIYpVYTs89phivAeApAK9vR7dRM8yI36k/uYegmS0pNiKSb/Qq0gKbsu59qx 5019SdQL+eGw0TboqwRWcTy5TcFEZtfUrdBjAC9lHH3gRau/3GpHgWpnXcsFvzkKDBBd pU0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=vlxejmWzuvG+iFuN5q3cb/TDmHy5IE9Wz4Kj6e/MD9g=; b=JeeCm5mSUNtzD8EwLHl/6fBlBXCBwEXUsG9dllaQPxAsS1cev7GycKg5mli/tFa4U3 mbFQVR4i4n7bj41Vq+L3dAkRczZHJ45KXkitS40B1HAsNT/OwbYclPCnwJ8iAFDJmJkZ g7ngqFqdhCXQ99pYD2HKaECpRtRhprdzX0reT+1Ik6EQ8rW+3Zfl7fB66ttLKFcTrzmI luOEmLtiyFb3buP5HHWXbN6YangYd6aYliy8Il1BZ6ySt29TwxjeV/Ic5sGkTsv3G71Q cM8cSyWRvVVFS+MXDIKXxhT3NczX2y2emyyu+91C36VyBbrWZFnazfmw0m47cF9jmrr0 7rSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G18ZBZgP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o14si1372422edq.11.2020.10.20.08.27.11; Tue, 20 Oct 2020 08:27:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G18ZBZgP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731718AbgJSUep (ORCPT + 99 others); Mon, 19 Oct 2020 16:34:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731715AbgJSUen (ORCPT ); Mon, 19 Oct 2020 16:34:43 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 583AEC0613CE for ; Mon, 19 Oct 2020 13:34:42 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id p21so420904pju.0 for ; Mon, 19 Oct 2020 13:34:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vlxejmWzuvG+iFuN5q3cb/TDmHy5IE9Wz4Kj6e/MD9g=; b=G18ZBZgPN1gDaFH0QuUYEiRxE8OzxCQXEUlp7SCk0d4c9mPs8EF8d6v5rXNIfneCdz Q9xw28io8+wUdlaPQE4JUPntlcJqexbdo578zq5DiWFV0plpUvHlqPrAgLzwid/U11gt RqQKu6sq/pKNqeTqMxlZmWsBvDLhmHMcIJ8DjNJURzxpfH4dKixUOFepx4jZf/OvHlKT B9vceHu+zBwIww1Kf6YX3rNW8dPkyOgdFGQ4LGbBvCalBDOJFoUTjwOUCFYlpL669ZKt X1zK45Uw2y5TDOAWgqS9gdWacVdtNFOCQ8cHeRPz43I5uSNghR99FZkQwSEWSNBMh0jB oSEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vlxejmWzuvG+iFuN5q3cb/TDmHy5IE9Wz4Kj6e/MD9g=; b=s/bqtjz0VXg1ZKTad14d7TfuQw1lLYMa4d1nleLsyTyyoXaTv1JemRDflX7LZEQLgj 98ZVMvZ0TgCoGhEDF8BWZZtPw2m8DXpwzXAOPcgwj/Vdv3uAVIh17mjKNjVto/W3/NxW pmKZw+bYyKj8BLafTAfcj2UxKCU4nV46A5RXGdSkW0PlgByddo7ihdp7494tdBtwKUb+ exCKn9shU03l0eCH1GTvLaFu6iQuos3vyC0JhHNwWJ8kT0Q/MDyEcxcRqajXu1oUciRE U09bZ4xGOPzr64fkf3edY6i5XW0ihSGGsTDW86fD3LTrRI5eAIf0JyW2bNBQg5aFahpw /t3w== X-Gm-Message-State: AOAM531JVlsWThXi4AH2iXQnTCdMzG4QiKf23/lb7fdTbpUA5NKnzUZd /t5GM4/8J+9hLqhgOXHkQoCHTg== X-Received: by 2002:a17:90a:148:: with SMTP id z8mr1176926pje.173.1603139681900; Mon, 19 Oct 2020 13:34:41 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id q123sm631847pfq.56.2020.10.19.13.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Oct 2020 13:34:41 -0700 (PDT) From: Mathieu Poirier To: ohad@wizery.com, bjorn.andersson@linaro.org Cc: guennadi.liakhovetski@linux.intel.com, arnaud.pouliquen@st.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/8] rpmsg: Introduce __rpmsg{16|32|64} types Date: Mon, 19 Oct 2020 14:34:31 -0600 Message-Id: <20201019203438.501174-2-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201019203438.501174-1-mathieu.poirier@linaro.org> References: <20201019203438.501174-1-mathieu.poirier@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Introduce __rpmsg{16|32|64} types along with byte order conversion functions based on an rpmsg_device operation as a foundation to make RPMSG modular and transport agnostic. Suggested-by: Guennadi Liakhovetski Signed-off-by: Mathieu Poirier --- include/linux/rpmsg.h | 51 ++++++++++++++++++++++++ include/linux/rpmsg_byteorder.h | 67 ++++++++++++++++++++++++++++++++ include/uapi/linux/rpmsg_types.h | 11 ++++++ 3 files changed, 129 insertions(+) create mode 100644 include/linux/rpmsg_byteorder.h create mode 100644 include/uapi/linux/rpmsg_types.h diff --git a/include/linux/rpmsg.h b/include/linux/rpmsg.h index 9fe156d1c018..97098a90c496 100644 --- a/include/linux/rpmsg.h +++ b/include/linux/rpmsg.h @@ -17,6 +17,7 @@ #include #include #include +#include #define RPMSG_ADDR_ANY 0xFFFFFFFF @@ -46,6 +47,7 @@ struct rpmsg_channel_info { * @dst: destination address * @ept: the rpmsg endpoint of this channel * @announce: if set, rpmsg will announce the creation/removal of this channel + * @little_endian: True if transport is using little endian byte representation */ struct rpmsg_device { struct device dev; @@ -55,6 +57,7 @@ struct rpmsg_device { u32 dst; struct rpmsg_endpoint *ept; bool announce; + bool little_endian; const struct rpmsg_device_ops *ops; }; @@ -111,6 +114,54 @@ struct rpmsg_driver { int (*callback)(struct rpmsg_device *, void *, int, void *, u32); }; +static inline u16 rpmsg16_to_cpu(struct rpmsg_device *rpdev, __rpmsg16 val) +{ + if (!rpdev) + return __rpmsg16_to_cpu(rpmsg_is_little_endian(), val); + else + return __rpmsg16_to_cpu(rpdev->little_endian, val); +} + +static inline __rpmsg16 cpu_to_rpmsg16(struct rpmsg_device *rpdev, u16 val) +{ + if (!rpdev) + return __cpu_to_rpmsg16(rpmsg_is_little_endian(), val); + else + return __cpu_to_rpmsg16(rpdev->little_endian, val); +} + +static inline u32 rpmsg32_to_cpu(struct rpmsg_device *rpdev, __rpmsg32 val) +{ + if (!rpdev) + return __rpmsg32_to_cpu(rpmsg_is_little_endian(), val); + else + return __rpmsg32_to_cpu(rpdev->little_endian, val); +} + +static inline __rpmsg32 cpu_to_rpmsg32(struct rpmsg_device *rpdev, u32 val) +{ + if (!rpdev) + return __cpu_to_rpmsg32(rpmsg_is_little_endian(), val); + else + return __cpu_to_rpmsg32(rpdev->little_endian, val); +} + +static inline u64 rpmsg64_to_cpu(struct rpmsg_device *rpdev, __rpmsg64 val) +{ + if (!rpdev) + return __rpmsg64_to_cpu(rpmsg_is_little_endian(), val); + else + return __rpmsg64_to_cpu(rpdev->little_endian, val); +} + +static inline __rpmsg64 cpu_to_rpmsg64(struct rpmsg_device *rpdev, u64 val) +{ + if (!rpdev) + return __cpu_to_rpmsg64(rpmsg_is_little_endian(), val); + else + return __cpu_to_rpmsg64(rpdev->little_endian, val); +} + #if IS_ENABLED(CONFIG_RPMSG) int register_rpmsg_device(struct rpmsg_device *dev); diff --git a/include/linux/rpmsg_byteorder.h b/include/linux/rpmsg_byteorder.h new file mode 100644 index 000000000000..c0f565dbad6d --- /dev/null +++ b/include/linux/rpmsg_byteorder.h @@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Follows implementation found in linux/virtio_byteorder.h + */ +#ifndef _LINUX_RPMSG_BYTEORDER_H +#define _LINUX_RPMSG_BYTEORDER_H +#include +#include + +static inline bool rpmsg_is_little_endian(void) +{ +#ifdef __LITTLE_ENDIAN + return true; +#else + return false; +#endif +} + +static inline u16 __rpmsg16_to_cpu(bool little_endian, __rpmsg16 val) +{ + if (little_endian) + return le16_to_cpu((__force __le16)val); + else + return be16_to_cpu((__force __be16)val); +} + +static inline __rpmsg16 __cpu_to_rpmsg16(bool little_endian, u16 val) +{ + if (little_endian) + return (__force __rpmsg16)cpu_to_le16(val); + else + return (__force __rpmsg16)cpu_to_be16(val); +} + +static inline u32 __rpmsg32_to_cpu(bool little_endian, __rpmsg32 val) +{ + if (little_endian) + return le32_to_cpu((__force __le32)val); + else + return be32_to_cpu((__force __be32)val); +} + +static inline __rpmsg32 __cpu_to_rpmsg32(bool little_endian, u32 val) +{ + if (little_endian) + return (__force __rpmsg32)cpu_to_le32(val); + else + return (__force __rpmsg32)cpu_to_be32(val); +} + +static inline u64 __rpmsg64_to_cpu(bool little_endian, __rpmsg64 val) +{ + if (little_endian) + return le64_to_cpu((__force __le64)val); + else + return be64_to_cpu((__force __be64)val); +} + +static inline __rpmsg64 __cpu_to_rpmsg64(bool little_endian, u64 val) +{ + if (little_endian) + return (__force __rpmsg64)cpu_to_le64(val); + else + return (__force __rpmsg64)cpu_to_be64(val); +} + +#endif /* _LINUX_RPMSG_BYTEORDER_H */ diff --git a/include/uapi/linux/rpmsg_types.h b/include/uapi/linux/rpmsg_types.h new file mode 100644 index 000000000000..36e3b9404391 --- /dev/null +++ b/include/uapi/linux/rpmsg_types.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _UAPI_LINUX_RPMSG_TYPES_H +#define _UAPI_LINUX_RPMSG_TYPES_H + +#include + +typedef __u16 __bitwise __rpmsg16; +typedef __u32 __bitwise __rpmsg32; +typedef __u64 __bitwise __rpmsg64; + +#endif /* _UAPI_LINUX_RPMSG_TYPES_H */ -- 2.25.1