From nobody Fri Sep 18 06:51:28 2026 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 4hmNZS4l5Zz6sld1 for ; Fri, 18 Sep 2026 06:51:28 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hmNZS44rWz4Y3L for ; Fri, 18 Sep 2026 06:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789714288; 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=Ka8qgQAeJKtTfltcWGEDCaiBeGpV6wgLn8blzGWRO10=; b=GKgZMZloWnj95uNlCKG1Y1qdCECJkrBEk8Tzk+Rld1Fl2+r7rBgadrCojWrpwLcnOZm8+J OgUfLsaSZckL/gPzHVewQi53BpKd91OC+cwRCvRIZMPmhZhhvgZeuS3rP7FPk20e9T4zdY 1NPhk+e1K+7K85IFQnzsnp8MUxfb4nr5TDC3wWveRVooUXqQ8ryaN2hNh5Bp/BAf0S8gT6 wyl8dBqYcrZtimSlI11hP2/bhN3RTk2BosVH2EIY54IBJsxUN1blJsjLjghhV6cVkfgmX0 R/b5/r0T8biG84g/hrbt6Mq1CBpMeUKxrnygpRfcFXTdX1qtLD6zxObvHJvKvQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789714288; b=HFBocIpO4GtQg+4AAUrtNoJKzSYuw3o+s9CeH1q10HgITi8YTTK9ISgiFFLfI1yS9Xd1iZ 8lUILnF1UjdMzu1uf3JeRIHpJbazkUfB0TLat/F+OfqWURQlRKVwrx/B/PATZI8zbNkVzP H2kqDk6QIWOcmeyEfp1PMpmJNGc3V2RkgYfNSuCF/AXEIRHkCZaDOdP88n3ClDOMJ90Kw6 +uuGkUbN9RQxQHAQ2aU/aMN9dzOMVuo9ze3TIObuRSysiqVdlFx4e+sE984P1PqL+FARoR l8+OkBkimzUwOssBpKffpwYcydhPmWqNdawgEsedjDYGIHBS0cRWohxNWG5Stg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789714288; 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=Ka8qgQAeJKtTfltcWGEDCaiBeGpV6wgLn8blzGWRO10=; b=Z/y+DM8+IP5lWAJrSJeAeHgvJuGaODvgT0/J3kI8xwfPt1hi5PhDvTNd1ri1Tgs78AxJO3 dNqRjlNw/oxVYEIlbEljz66oHyGF2PJqeTiQoe/6646CKRYCwJ+ccTtcMTerEy3tV9LEg4 Auz8t0TVqDbnemp61bKjK6G7QLmfjpCAHWQupSMIB4i2+1zqpJ4MeUT3nCLiZcYFlZiqKH X8ZX9ZXXBzlSUUm/6p8/ihsGCcRzhQD2MGkVb2XHVFxKfF5odZQpUUHWUERfVY7S/vC6Ip 2Zc7EWxbvGSeKbJtgadK5RrVzdlaMm1hAcbjK4WhE0x9mE1FgXrkZTrLqwil0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hmNZS39hyz17Ym for ; Fri, 18 Sep 2026 06:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3355b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 18 Sep 2026 06:51:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 54b5d177aa98 - main - LinuxKPI: Add devm_memremap and devm_ioremap_wc functions 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54b5d177aa988207a4ca68763ac8e20c8145c17f Auto-Submitted: auto-generated Date: Fri, 18 Sep 2026 06:51:28 +0000 Message-Id: <6aacdf70.3355b.268a5cfc@gitrepo.freebsd.org> The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=54b5d177aa988207a4ca68763ac8e20c8145c17f commit 54b5d177aa988207a4ca68763ac8e20c8145c17f Author: Vladimir Kondratyev AuthorDate: 2026-09-18 06:49:36 +0000 Commit: Vladimir Kondratyev CommitDate: 2026-09-18 06:50:21 +0000 LinuxKPI: Add devm_memremap and devm_ioremap_wc functions Required by drm-kmod 6.12.101. Reviewed by: bz, dumbbell Differential Revision: https://reviews.freebsd.org/D59732 --- sys/compat/linuxkpi/common/include/linux/io.h | 14 +++++++++++++ sys/compat/linuxkpi/common/src/linux_page.c | 30 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/io.h b/sys/compat/linuxkpi/common/include/linux/io.h index 4dfc04b3f3fc..5da0b64045f2 100644 --- a/sys/compat/linuxkpi/common/include/linux/io.h +++ b/sys/compat/linuxkpi/common/include/linux/io.h @@ -521,6 +521,20 @@ done: return (addr); } +#define devm_memremap(...) linuxkpi_devm_memremap(__VA_ARGS__) +void *linuxkpi_devm_memremap(struct device *dev, resource_size_t offset, + size_t size, unsigned long flags); + +static inline void * +devm_ioremap_wc(struct device *dev, resource_size_t offset, + resource_size_t size) +{ + void *addr; + + addr = devm_memremap(dev, offset, size, MEMREMAP_WC); + return (IS_ERR(addr) ? NULL : addr); +} + static inline void memunmap(void *addr) { diff --git a/sys/compat/linuxkpi/common/src/linux_page.c b/sys/compat/linuxkpi/common/src/linux_page.c index 14abc3376a1c..430f05175179 100644 --- a/sys/compat/linuxkpi/common/src/linux_page.c +++ b/sys/compat/linuxkpi/common/src/linux_page.c @@ -65,6 +65,7 @@ #include #include #include +#include #ifdef __i386__ DEFINE_IDR(mtrr_idr); @@ -420,6 +421,35 @@ iounmap(void *addr) kfree(vmmap); } +static void +lkpi_devm_memremap_unmap(struct device *dev, void *p) +{ + void **dr = p; + + memunmap(*dr); +} + +void * +linuxkpi_devm_memremap(struct device *dev, resource_size_t offset, size_t size, + unsigned long flags) +{ + void **dr, *addr; + + dr = devres_alloc(lkpi_devm_memremap_unmap, sizeof(*dr), GFP_KERNEL); + if (dr == NULL) + return (ERR_PTR(-ENOMEM)); + addr = memremap(offset, size, flags); + if (addr != NULL) { + *dr = addr; + devres_add(dev, dr); + } else { + addr = ERR_PTR(-ENXIO); + devres_free(dr); + } + + return (addr); +} + void * vmap(struct page **pages, unsigned int count, unsigned long flags, int prot) {