From nobody Thu Feb 16 11:55:35 2023 X-Original-To: dev-commits-src-branches@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 4PHYKz2KQ2z3q5HX; Thu, 16 Feb 2023 11:55:35 +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 4PHYKz1dBfz479F; Thu, 16 Feb 2023 11:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548535; 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=QnmT5kYKotRi16ZhZcH3pmObJAkU42iPT89Z1IWlVtA=; b=pKDdq068RgW5X41zcYDtvhK1y7I90SWYVXt/+WhmXQa6mU4TWapGOoTw3uZYq094aoWR1O YEwmS9yOIX/cGecSSQ+QtBmdeN5zrAdC4yQN6txSFnutKgtcwc0vWWVHjafTpj9YeVPCrG VR8hzzhxIbsqmu50xuLvIY0Vd9+HDzros902HGuIhTK57LOBCgrIDKveGQdgxIsoxeBf4f VaEkwy5rPiKkjLAHdFIv2urI2ZCWfxbXlSmiHuzqtcDINk6UTJvnpT6ir+j8NPY4lUH3lV 8bXmIuMelXIyz85B59zydABd1vODicuo1rQLegfkjCsTlzHqx9TwqaelRDbRcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676548535; 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=QnmT5kYKotRi16ZhZcH3pmObJAkU42iPT89Z1IWlVtA=; b=eXZpakgJwIw8FbhSGhIReaEJtgUef6e/Jc1NDH5lcGDs1nNZwfdFYFiz25x47fFq0iKeH+ UzOxSGPbX2d+P3EqH7DBq2vzYDZ/8oALgK0YM/V705ZwrZZqYZFfK9TOBXXgYbKiqC0pSQ MgKT2CTqD4/amBLdpQc1RN9oYGIubIAgSENXpCJuMUEke/smRkl7TMeHwboLxOb6LjLyWN pbqlq0sLm6wO5wqockrJUzCQWgaKCrNet98hIk/6euemAcBKt1LMGTWrgeCXwLNAiFauwq Nal8+sJRblpHhQ2U1acM+1P1D6GIDyJ1RQIWx4wjhDz22DBQ8h6CX9A6BP4c+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676548535; a=rsa-sha256; cv=none; b=n3e5sE5GBrXlCUzpsA5XqTWt4EkaSx9ajLdlxCCg8zrZj44zyl8BAtAWKobYQFTJ/k50lA oPOykDFOJ8oEIGUgKgkOaVxE/pZ4jeeh7DIlLnsJjLIGQz4rpRRAV/Ap/07P3NdXhhJSdu 4AQ1yJ4xtEok7raE9xHyZpbr91Plev6fPsqsYYhVS6ye0rKPAXS67FSsjE/UfrnXkerql1 oE/NcXFdT06crTn5uogff+81IYjEpkY4ZJwDBWra3lInZ71mIT20HP3kLMcgYEKZOmoURt 8swPcrJC2dLe7I72n8z395AIekeVX+PXTeGnlryfK//Ablat0hG4AIGYI45a9w== 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 4PHYKz0hsSz1350; Thu, 16 Feb 2023 11:55:35 +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 31GBtZce054754; Thu, 16 Feb 2023 11:55:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31GBtZuM054753; Thu, 16 Feb 2023 11:55:35 GMT (envelope-from git) Date: Thu, 16 Feb 2023 11:55:35 GMT Message-Id: <202302161155.31GBtZuM054753@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: =?utf-8?Q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Subject: git: 14b9db7ff854 - stable/13 - linuxkpi: Define `ioremap_cache()` List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 14b9db7ff85488fa5f85e8be2bdbe4e5ec0b3079 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dumbbell (ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=14b9db7ff85488fa5f85e8be2bdbe4e5ec0b3079 commit 14b9db7ff85488fa5f85e8be2bdbe4e5ec0b3079 Author: Jean-Sébastien Pédron AuthorDate: 2022-12-30 10:36:24 +0000 Commit: Jean-Sébastien Pédron CommitDate: 2023-02-16 11:55:10 +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 (cherry picked from commit ed53e350d703b9e3ab78d137fd59a5a9dfef8b3f) --- 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 7041710fe0c2..4eb69bca6141 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -420,7 +420,7 @@ void *_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); @@ -492,7 +492,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)