From nobody Wed Nov 29 16:37:48 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 4SgQ3c6QxBz52wST; Wed, 29 Nov 2023 16:37:48 +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 4SgQ3c4Vp5z3G1w; Wed, 29 Nov 2023 16:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275868; 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=T46rl1w4raKyeTsTnwB7KGFH3DmXl20AXnySsFGZCL4=; b=kuy77q68J+PVa8BN5MauSd2LYN6Efp0VqmC5zxc2kXQBv4FJsRBPGLuMoli4e7HD0WIZHe R6OnxpYcHnlRMoaRIywdikkzc7SzEouXPKtIyKuT6upnAtd97ZSGiaQQOu3eK6TbM1Ny/D 5W6gZC8rPqnUsPxLtYLQqBLRcWuby41sd7FUDdorWj3UnhALcfqdfyF+3i9ACCnblSFQZA gB682UFZwN0cUtvMsRUZzG8hKT9cpRP5wlcQ7wwTKQNJyf2QB6wE1mQd6rC3YXWQaavodD f6pzF6FziioT5aoIwLyZgKCGy2yXqA0uhe9e3eV3c6Jr//h+3AnwcdMo8av5tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701275868; 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=T46rl1w4raKyeTsTnwB7KGFH3DmXl20AXnySsFGZCL4=; b=TSxhssF83DpLTZQnTsarBxowKMPsG5AW2wBpgTmsK96PYS197q7zxbsH0OW977Ew/uHL3u xV2iO4nh9hfeZPTqU0JoRBEEgfgcl0e/P/RqiZZXSM99IDJdjzPLNmzahJckzKI+u03O2B lYw1wtfgBqPfqHDz1dz4K2vtGpQYp00fY+I6wGYsLmHMTlFmIbV9DcU+8bsYXZNPWNucZi ZkXSQ9/j394prjiGGpJANK8Vz5+qeMj3LI12JsoYSTMHeNHp7Kq72+/3E0TKj74uH2hJKY 5bTUyX21ppvANtdc1rLhVe/Tf0OMH9pvhymV6iRaAblMHohHaeM6/ecaKFe6Mw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701275868; a=rsa-sha256; cv=none; b=QDZH5p93bKWJJ47Ef/ELk/TWnUFfj5OCmntuZnsaZuMiM8s3pduqE7BBo1uvNx5Yw/p7aB Yv8lNubtNECmtDxeSEE8pYkF/Y9O1m58mjUIIsAORW4mYG+pFj66LQ9qn1rnTrOMkJqPvb vHCOq9glhE5KWc7WOWxOurbxaxFML8K4DTr6KBknZKVHeP/233lCd+6KD2bWJCRTonxzUE 3jWEpmxYqClIr80T7kDbUK/WnEQwB3tuxaatja41pAW58K+41NDq+PDQeWrMunQOYb5JQV Ay6iJ15Jt7AdJJoQ7QmtZTyCC/KSYQwV6n5xVdpDX0zLk/QQ7AbkZJ1bjhp5nw== 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 4SgQ3c3cfkz1Bgy; Wed, 29 Nov 2023 16:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ATGbmH2044195; Wed, 29 Nov 2023 16:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ATGbmkM044192; Wed, 29 Nov 2023 16:37:48 GMT (envelope-from git) Date: Wed, 29 Nov 2023 16:37:48 GMT Message-Id: <202311291637.3ATGbmkM044192@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: a55a8bfe5d13 - stable/13 - LinuxKPI: add DMA_MAPPING_ERROR 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a55a8bfe5d13108c806759a8a85bcb9add610848 Auto-Submitted: auto-generated The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a55a8bfe5d13108c806759a8a85bcb9add610848 commit a55a8bfe5d13108c806759a8a85bcb9add610848 Author: Bjoern A. Zeeb AuthorDate: 2022-09-23 22:13:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-11-29 16:36:03 +0000 LinuxKPI: add DMA_MAPPING_ERROR While we deal with 0 returned, some drivers directly use and check for DMA_MAPPING_ERROR. Add the case and check for both in dma_mapping_error(). (cherry picked from commit 0b9bc97342f98a911985ace5527aef97863dfd23) --- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 7b12e927addf..3b98e03ad6a4 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -286,11 +286,15 @@ dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, { } +#define DMA_MAPPING_ERROR (~(dma_addr_t)0) + static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { - return (dma_addr == 0); + if (dma_addr == 0 || dma_addr == DMA_MAPPING_ERROR) + return (-ENOMEM); + return (0); } static inline unsigned int dma_set_max_seg_size(struct device *dev,