From nobody Tue Jan 24 08:54:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P1LP51FBVz30x0Q; Tue, 24 Jan 2023 08:54:01 +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 4P1LP50JzQz3R4C; Tue, 24 Jan 2023 08:54:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lYYVcvC/qLccrnq6rs6UWL/ONAmezfAbl0KRavmQ1es=; b=AaEbVm2ADF6GE3sQ41yjimvDpJ81d+ZysbQlccJrOYuAFJku13rH9F77XmaOnzDlSDCVTW OG6bv4bJCEoaTeO5pVse+y8siLQITiCW4awjQ9S9DI8TMnCDjur0UG44c5j90YQYGoSz1z e5VExly2FMyMSe9S7HdMHd+wCl+wosAvVcTJXmavU92FSfGKoMerchSn1PRlpJ2tDVrIG8 1n9Fi8O4aum7uFVJhMEyEbGA9nyQsL/OKfnjGW/rfvaZ8bAzvioUFJ0lLZlbsm4JLJ8kb7 vZZH+vue6yT4JQbUDNxfMKGNfLwrPC8qsLvHSOngl2SonogSukQzmbo6D907Nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674550441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lYYVcvC/qLccrnq6rs6UWL/ONAmezfAbl0KRavmQ1es=; b=GZ63ysOVA/XEO8Gn0GioLHNWgjwlb8kmummkJ37OD7l9m35ws7fiSGP/Z7IKJ2S/LS7u0Q HgZjwHzi1Z+o1CDj5Tw3eKl8gXVeafXEm0mT9EodYITq8aDKmSfTJQY1VednfPbhVlwcdl m/wfOihEwgyD43KNgpzX367akqjtb8XirDBRY2Xx5ulLI8K9ty3KlKJSkJYAu3lxfoCkLB 6ZiiY2Sdr3e+44yDcclri3FR25sDsfwWnV1X4sLOJqJKC5NnRNzWUuk3hw0wJDV5v5KLFO eVWaFNSbCYPyUwnPcbKIXh3zM/JzDDkTy7UkjDKksk/ptptFFXI/uOTsqNdoBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674550441; a=rsa-sha256; cv=none; b=HzrTokEJCtFUrmLTtgAZUSpt3p5dJead9RbgwQU1mUhsYvI9uWzRimvp/MlXNIRX2CILp7 vj2cHIPZ3+eM0CA7ALx3mPEH3Xmao3iG3QYLLc7O3fm5UAgCwkHIV+yjRrfTV7Dbz+iTMK lRjZEtY4HCU8F6MuTGxJ1k7Hm1ZS2VtraaE5wInaWDsmFyncJSafwydVmHhetgS1Nxj6wK 3h+dEA892eTwFjUPcSDq/JWkR6k5F92q+9m5zUYbxxMwVE00TZcmQQ9qDTGwlWcE1huZ+H j1HQu6jK90lB8d83kQ0xJEH1FyW82ZnLC14x32pN7HeQ5ewrXmhIvMEsSkVLzg== 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 4P1LP46VRtz13Qd; Tue, 24 Jan 2023 08:54:00 +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 30O8s0fY035913; Tue, 24 Jan 2023 08:54:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30O8s0RD035912; Tue, 24 Jan 2023 08:54:00 GMT (envelope-from git) Date: Tue, 24 Jan 2023 08:54:00 GMT Message-Id: <202301240854.30O8s0RD035912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 67f40afb696e - stable/13 - linuxkpi: Add List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 67f40afb696ea31bb340ea48b2ce185f076b0179 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=67f40afb696ea31bb340ea48b2ce185f076b0179 commit 67f40afb696ea31bb340ea48b2ce185f076b0179 Author: Jean-Sébastien Pédron AuthorDate: 2022-11-11 17:40:57 +0000 Commit: Emmanuel Vadot CommitDate: 2023-01-24 09:08:00 +0000 linuxkpi: Add I took the implementation from OpenBSD, commit d55ef580b1748517027c3eabdb715316ca5b1442. The only difference is the addition of `dma_buf_map_is_equal()`. Reviewed by: manu Approved by: manu Differential Revision: https://reviews.freebsd.org/D36963 (cherry picked from commit 0e5569a08cf02e036774235e54e1008a26167b36) --- .../linuxkpi/common/include/linux/dma-buf-map.h | 91 ++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-buf-map.h b/sys/compat/linuxkpi/common/include/linux/dma-buf-map.h new file mode 100644 index 000000000000..567ce3b072b3 --- /dev/null +++ b/sys/compat/linuxkpi/common/include/linux/dma-buf-map.h @@ -0,0 +1,91 @@ +/* Public domain. */ + +#ifndef _LINUX_DMA_BUF_MAP_H +#define _LINUX_DMA_BUF_MAP_H + +#include +#include + +struct dma_buf_map { + union { + void *vaddr_iomem; + void *vaddr; + }; + bool is_iomem; +}; + +static inline void +dma_buf_map_incr(struct dma_buf_map *dbm, size_t n) +{ + if (dbm->is_iomem) + dbm->vaddr_iomem += n; + else + dbm->vaddr += n; +} + +static inline void +dma_buf_map_memcpy_to(struct dma_buf_map *dbm, const void *src, size_t len) +{ + if (dbm->is_iomem) + memcpy_toio(dbm->vaddr_iomem, src, len); + else + memcpy(dbm->vaddr, src, len); +} + +static inline bool +dma_buf_map_is_null(const struct dma_buf_map *dbm) +{ + if (dbm->is_iomem) + return (dbm->vaddr_iomem == NULL); + else + return (dbm->vaddr == NULL); +} + +static inline bool +dma_buf_map_is_set(const struct dma_buf_map *dbm) +{ + if (dbm->is_iomem) + return (dbm->vaddr_iomem != NULL); + else + return (dbm->vaddr != NULL); +} + +static inline bool +dma_buf_map_is_equal( + const struct dma_buf_map *dbm_a, const struct dma_buf_map *dbm_b) +{ + if (dbm_a->is_iomem != dbm_b->is_iomem) + return (false); + + if (dbm_a->is_iomem) + return (dbm_a->vaddr_iomem == dbm_b->vaddr_iomem); + else + return (dbm_a->vaddr == dbm_b->vaddr); +} + +static inline void +dma_buf_map_clear(struct dma_buf_map *dbm) +{ + if (dbm->is_iomem) { + dbm->vaddr_iomem = NULL; + dbm->is_iomem = false; + } else { + dbm->vaddr = NULL; + } +} + +static inline void +dma_buf_map_set_vaddr_iomem(struct dma_buf_map *dbm, void *addr) +{ + dbm->vaddr_iomem = addr; + dbm->is_iomem = true; +} + +static inline void +dma_buf_map_set_vaddr(struct dma_buf_map *dbm, void *addr) +{ + dbm->vaddr = addr; + dbm->is_iomem = false; +} + +#endif