From nobody Mon Jan 16 18:27:39 2023 X-Original-To: dev-commits-src-main@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 4NwgVh1k2vz2t2L2; Mon, 16 Jan 2023 18:27:40 +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 4NwgVh1F2qz3j0s; Mon, 16 Jan 2023 18:27:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673893660; 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=/s7C68vQYuqWIhkqXqITxUelsY1qv8AE6073zvQwvPs=; b=DQDK4rPz8QnbBUJkL9VnetSPKFAllDKrAn7vISXr24Efyyok2pTzvD+ufgsmFogQuhV8Vw aobnsDd7G0BmG5lCXaHewIgFOVdFzgRgnxSfRuAn7g84So7qFS0+td/0VnxxNhl+Fqkz1t mkJDwtcI3pDz5kIfGfgt92SY282KKBAXFu84KbmzbaRcYzO5qm9TZTeIdBGznEswnEzTl8 hNhrKyPVnuY+oiOai9wDOzlAYMm1WQGZm9bbrOjg84XNuSAri+a9czcIKsL0issE+W+OSq GucM0Uxb13hbp0EFs5GChOSzQdzF9KOg7ZAaMF56YXa/N/7hg+6SqGUZr/a1ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673893660; 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=/s7C68vQYuqWIhkqXqITxUelsY1qv8AE6073zvQwvPs=; b=tgYtdEoyJKnt+VAdObXe4ljxtacDHspknY1UU/9u5mr5AWZqcVGWO4fiQDMH7XPbkIHyp6 S7q5aKzAEeD5S9pRL8COe4mZGQVbaIGe5evHVWsuZz4MhvLLKecuRuFwwkNK6w1sUp5Zlf gb4LqRZbuIRE+CSBmoV+cPPRddRPZWv6Q0IbP9NRNKNyE2gbkFdrbVY6tzrBdH63sdPQQY TSMwmNM4wEL9oiB2Ze94lMoc/Rxd8qSFamRJgmKyc4EKY4VFwlayAUAeCGgxzYkulV/3oI V5iasMIAeVKTo3ZAF5zPHBZ7ELCCldot02Q30oor3DMlTe1jwYQjci5c6sAEUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673893660; a=rsa-sha256; cv=none; b=MxONxHX3iFlzhDvKYxXeLqnK9m8fnk3CtoirofzNeGyJMar9HhK8WJSZGISBHOcgi10icF paJF2sB0P5vHs6wxdwW1G8MXqxxbrjKirwEM699ZsjbE6U3jFQZtt6YBoDUYFWUKiWbBn8 sl0PmIPWDevgOQzyesYKTO6zjZWztXr2wwy1bdSx6KnQyRne3vKSj2eFnSfENLQoKloiPM 1GjVNMDA0LX7bdFDF58m9djCpF0DRAXhK06krksUwCxtbUI9yvIrS/nXUiwCWf4fRYFx5F QIwkrDCu6/E01BtOH61Y6qSUjW3LwKROYRW/bCVJofHWHIQDElhyo3Ob4VEysg== 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 4NwgVh0L4Cz1Gq6; Mon, 16 Jan 2023 18:27:40 +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 30GIRdtJ078499; Mon, 16 Jan 2023 18:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GIRduF078498; Mon, 16 Jan 2023 18:27:39 GMT (envelope-from git) Date: Mon, 16 Jan 2023 18:27:39 GMT Message-Id: <202301161827.30GIRduF078498@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: ed53e350d703 - main - linuxkpi: Define `ioremap_cache()` List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dumbbell X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed53e350d703b9e3ab78d137fd59a5a9dfef8b3f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=ed53e350d703b9e3ab78d137fd59a5a9dfef8b3f commit ed53e350d703b9e3ab78d137fd59a5a9dfef8b3f Author: Jean-Sébastien Pédron AuthorDate: 2022-12-30 10:36:24 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-01-16 18:11:58 +0000 linuxkpi: Define `ioremap_cache()` It uses the `VM_MEMATTR_WRITE_BACK` flag on FreeBSD. It replaces `ioremap_wb()` which doesn't exist in Linux. Perhaps it existed in the past and was removed. Reviewed by: emaste, manu Approved by: emaste, manu Differential Revision: https://reviews.freebsd.org/D37916 --- sys/compat/linuxkpi/common/include/linux/io.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index 64e8b294eeff..598ff8e0376d 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -424,7 +424,7 @@ _ioremap_attr(vm_paddr_t _phys_addr, unsigned long _size, int _attr) #else #define ioremap_wc(addr, size) ioremap_nocache(addr, size) #endif -#define ioremap_wb(addr, size) \ +#define ioremap_cache(addr, size) \ _ioremap_attr((addr), (size), VM_MEMATTR_WRITE_BACK) void iounmap(void *addr); @@ -496,7 +496,7 @@ memremap(resource_size_t offset, size_t size, unsigned long flags) void *addr = NULL; if ((flags & MEMREMAP_WB) && - (addr = ioremap_wb(offset, size)) != NULL) + (addr = ioremap_cache(offset, size)) != NULL) goto done; if ((flags & MEMREMAP_WT) && (addr = ioremap_wt(offset, size)) != NULL)