From nobody Wed Sep 7 15:10:18 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 4MN5KR02Cdz4bPJm; Wed, 7 Sep 2022 15:10:19 +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 4MN5KQ6JmLz3YZB; Wed, 7 Sep 2022 15:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563418; 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=lR76G3zy6NnUUPnpcE05E+nvT9T8V3CwIeC0bVP8DJA=; b=Q8MDF7I0yiGuMkJLTw/iCYlsP6athnUVubulW7zfToVbVHmqO2YR/LQadECnW/JJn/OTDH XIp/5YqNBgV7+msJC9K4iCKbxcHpgpmReN/QToyRRTKmk31CSWfxm50/hVrAX42hCQw3Is DFf8/VoPsQ+GJHC27Ddzr+u6yQ+ltuH4IOscVZfT1KW6Af1yctsOTKrhgj591seVaaiaaq zJMmKNnVUvKfDy3YR73xv8k2xXPVZUSlRb90rdksQXxQ6IHMFT/gpxSxGsTsvBZYCvvHDR N1o9L0NrTQ/CYNRILa/S82x+LOzl/oglbzaQIo0cm3jEovDFuTYae40u0Dc6rA== 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 4MN5KQ5GpwzYqj; Wed, 7 Sep 2022 15:10:18 +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 287FAIc5024411; Wed, 7 Sep 2022 15:10:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 287FAIFC024403; Wed, 7 Sep 2022 15:10:18 GMT (envelope-from git) Date: Wed, 7 Sep 2022 15:10:18 GMT Message-Id: <202209071510.287FAIFC024403@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: 567ee6830d8d - stable/13 - linuxkpi: Add arch_io_{reserve,free}_memtype_wc 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: 567ee6830d8d79a9a537b9cd0e4ac08817592019 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662563418; 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=lR76G3zy6NnUUPnpcE05E+nvT9T8V3CwIeC0bVP8DJA=; b=tmZCgGFoGhLW5gNI8wcNsCPQ9gsSfaedu62rIsoLDrqc9WxsP5WACgil//r+HVfQNWK0er bWWXlc/do6Pq5Y8LIvMQHaaxV6TbIhZQeLak+B9VrSskH701Zsx+0q2iDduwi9r2UbX+av +8FFZfVS/Ctm89HO/SiUnQHpUaTObt0WkmSg3g0vljh7er0y+92196ITvG5MlKjdS23U4Y bzVz++EEJGELzNGmiaQhQtt50gSIKx5ukJ/UD6WikIwO5oBKYF8DYAGfC1YD/gU0Ck9cjg rRxUFNRjFLiX6EYngM0JCkMeN3311PRRJRlZ4EBqxV8JO3H2KiuJuyNzPG+qtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662563418; a=rsa-sha256; cv=none; b=moSgsK2wTa+8if34TvXUbf2eUqw9wtZn/SCZM0WwpH0oJOk+FYOwvzNzJLcPgmwfKceOT3 B3OsOjd8vcvAezHOBba0ABx8Mi+zAjyd8/77zi2AFAaxFyJOLDMJO9PGb38sDoW4o6vfuT cWBVXh5d13Mz8gfQojC6tMkoOMPZu6MjQRESOYaFk6BWuGyNYQAU/MpkvNTx4nObOrUBu9 OTf/G90mQj8NM9Ibn+7n3eFCjrQs/drCe8PM3nL+3lxn3Gq9M7KsPuSxeSO9g4TOsmiRiW bZubevFBVtYDyrma64hnRWrwDTEXuyV3BqBxi6xoKuSUUj8ny3TYnoF3TUJFsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=567ee6830d8d79a9a537b9cd0e4ac08817592019 commit 567ee6830d8d79a9a537b9cd0e4ac08817592019 Author: Emmanuel Vadot AuthorDate: 2022-08-02 08:27:00 +0000 Commit: Emmanuel Vadot CommitDate: 2022-09-07 15:09:04 +0000 linuxkpi: Add arch_io_{reserve,free}_memtype_wc Reviewed by: hselasky Obtained from: drm-kmod Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D36022 (cherry picked from commit 789dbdbb485749340110be550a03c6df22bc9c9c) --- sys/compat/linuxkpi/common/include/linux/io.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index d2ebf7e328cf..5c3e4bec5484 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -38,6 +38,7 @@ #include #include +#include /* * XXX This is all x86 specific. It should be bus space access. @@ -490,4 +491,19 @@ void lkpi_arch_phys_wc_del(int); #define arch_phys_wc_index(x) \ (((x) < __MTRR_ID_BASE) ? -1 : ((x) - __MTRR_ID_BASE)) +#if defined(__amd64__) || defined(__i386__) || defined(__aarch64__) || defined(__powerpc__) || defined(__riscv) +static inline int +arch_io_reserve_memtype_wc(resource_size_t start, resource_size_t size) +{ + + return (set_memory_wc(start, size >> PAGE_SHIFT)); +} + +static inline void +arch_io_free_memtype_wc(resource_size_t start, resource_size_t size) +{ + set_memory_wb(start, size >> PAGE_SHIFT); +} +#endif + #endif /* _LINUXKPI_LINUX_IO_H_ */