From nobody Mon Sep 26 19:44:22 2022 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 4MbtVt34Gdz4cbY4; Mon, 26 Sep 2022 19:44:22 +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 4MbtVt2fLnz3dxR; Mon, 26 Sep 2022 19:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664221462; 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=ehpX92ugRO3I29Uaed/8lotQAZT0qGRAKSxulzCNg28=; b=kI50KuXi+8DNKv/9L53XGe7nig6+Zn+GPLUWKgl1hSlZPEV6jJt0asOk9vyJTJTY7fmelb lwdl/lZyOOBA5jpkfNN43kamdDyvQdOW/A/+uf4H1nlKys+KMkwp8vNHhKzCmq7Zn//IE8 if/VSa9aumOd88MK0/IaPIgP9ZdxHoRoBQC0R3XPwwBCo2UF91QLFuVdflCe04fe7vqGQp UeQPQq5o3zQBy2j+TbCcq9Bhw2MrRTGFIqj3fmLEFJ4VAL2U6E6wANKX6kWtGp82aW+/ZP 9hROjKUrplashyg8T5r2qK6v7sJP8JaU1JV8RpF4YjpkoUHk3JA2iDgs0WDMVw== 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 4MbtVt1jVrzt3D; Mon, 26 Sep 2022 19:44:22 +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 28QJiM5C062672; Mon, 26 Sep 2022 19:44:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28QJiMaQ062671; Mon, 26 Sep 2022 19:44:22 GMT (envelope-from git) Date: Mon, 26 Sep 2022 19:44:22 GMT Message-Id: <202209261944.28QJiMaQ062671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 0b9bc97342f9 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 0b9bc97342f98a911985ace5527aef97863dfd23 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664221462; 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=ehpX92ugRO3I29Uaed/8lotQAZT0qGRAKSxulzCNg28=; b=MXSi3Bvtq6NV0/A4f32p3uo3wK6lfdPlzfuplqo6wgyxuF/JvF1yyqVN6pOxfAeRfXAt5Z 2c+Fe9UYeeg71zTtwO6EnoQzWaBI99iXqcywEIZsYtTBykokte+WGkUmgtSbu5Zu1FFOTv b8O9nkB371w1dA+ECHUlQbYm6agZL/syDCknme2mAaw85GICIGnjZAcOUNKDc/Yz19VcGR pKBcjAEvyBfl+oy8YjYNF6ck5ltgXvdyCB4FFPdlodyMd+7eZMosDCGUh0QWhRdml1Ehsy O689ELwvFomm/nEikVOkQG9eSuiNXWqyahFzIUjx43QOoCoqFZu+rYWMLscuSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664221462; a=rsa-sha256; cv=none; b=OF0PQ8XgOXiE5G4q/vYrP9TS2xFOAGPqtbXn8iyv0w+K9mR7Aw1ex/4r2ni+gPsANgzQ5c yXZ8DhaQBWE6pwLQ7TmRbnvqGRgOnJz9WU696ZJox7Gj/zOtMnUZgJtVDG4LCikNvOc41d nE3TZQztINmY3GPLuV4bj4eIscGX6aal/RUuK1A3DCLfjdzLWddrJDxCFKtm8GkGZvu8Y7 CAjEukt4Xymgr/a3OoQI3D1pz23or3VqeeQSlk5FHGbNVyE+q2lhqbMki+VygqmAtRLYfu tSGjP55HG2q09zOgeF9d61ZbbMOC//Hx4kVcwOOHfWC4fCfrCc+ybgo+kF98wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=0b9bc97342f98a911985ace5527aef97863dfd23 commit 0b9bc97342f98a911985ace5527aef97863dfd23 Author: Bjoern A. Zeeb AuthorDate: 2022-09-23 22:13:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-09-26 19:42:02 +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(). MFC after: 1 week Reviewed by: hselasky Differential Revision: https://reviews.freebsd.org/D36686 --- 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 8401006fbf5f..d3d25fcce857 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -288,11 +288,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,