From nobody Fri Jan 16 19:40:14 2026 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 4dt9Db3B0tz6Nl94 for ; Fri, 16 Jan 2026 19:40:15 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dt9DZ6bFLz3w5J for ; Fri, 16 Jan 2026 19:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592414; 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=yHqFBKgAsqH+LEHOimS6FMFG7vVJO7dKDt1UkTqtFY8=; b=NoIBaU9kXjjkykvuCmt4OmD3gEgDDeBR8/o+8//1XovK46UBP82ckrBphdsK1zMyj1EoNk +NwhX+J9E9JiEyqv8OcHAy6U5s9S45JKaJ20sV/1SonS9aGImVifpkado3aNMbGzeJ2fGL GIHMwKaEyGpZQlx54P/es/Q6qJfJTS6WlbOecydD3Yr7MpSTLlhwtNnBjisMx1s8jBe+vC LM6qk+j+Lk69+gPBJXQZtl3YLNPIaEcjW/yXIpbeiqv04YicPIG7BzonRzgSkuMknMNdnA MjlBDLM67x/H6kqt3SdUy2xDcmCtR6tRIolnuaNVlTk6Qy3z/a5CJD6jjQ/nnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768592414; 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=yHqFBKgAsqH+LEHOimS6FMFG7vVJO7dKDt1UkTqtFY8=; b=f+1KsWsUoxyuFQa4AOpyW3vCuR9Ph+b7UTR/b9liz+wUPTK8vEChkmxtNyMuqFwLWeTyTR 8opsfGvYX7VZrLviNdlvL9Rnv/QjbZDT1dCMBLS4KQkLxjHXVFmnvX1tiiG/vqNeL1VzSV msR8BYkK20a+MuGs950g2A4qpS+UChQybiGFIAthVTBGKKuVafK3s3Hw3cCJ4/d/c7lGCt CqJyxNzB+yddqOwya6q9xaH/ZST+I59Cm2jiQ3dcDBqz7FY8SCqBJHmZZ8iqE4YZ7Ha1hn jy9gQDHJYJGh81rFTlcqQYUwTm6s9GtKLnHNxKQjWO1dscTQkQ2R5u88ugGf6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768592414; a=rsa-sha256; cv=none; b=jH0ixkVQUVCqEZ6/wA/4Y6O1hghAqUslpPPl7431GG1SpTR9GSnj5fLHfOEc96CI23yWpm I4rnzcVcBB0kLPepujLj9HXJoNnkmquwG8gvjowcOcvQbTSV50Pt8EhL/5tf94YRU7vk9o wh/ZwcZbt5UvhZ70BU/RY37rwO4to4/agfWlGSmytGvQ6Y9uNDZIp4VsTspZpU1n5/BAa8 MMMOo/ory5z/SLGtGwl62UnzV1rX2NJmldNqkmMuOVypEwxkoQroUOL0uBjstB3vgTjuHu BQw9jjwdvYvMppFyBvA9GhWepAzYNhWi85JtzTsgrxtSqwcRzI09QzLE4Vi7MA== 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 4dt9DZ65wQzBqr for ; Fri, 16 Jan 2026 19:40:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id cad3 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 16 Jan 2026 19:40:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: 96419b3aa91e - stable/14 - LinuxKPI: pci: fix argument type to linuxkpi_pci_iomap[_range] 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 96419b3aa91e71ef09832061afd6ffc630280faf Auto-Submitted: auto-generated Date: Fri, 16 Jan 2026 19:40:14 +0000 Message-Id: <696a941e.cad3.79517fd0@gitrepo.freebsd.org> The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=96419b3aa91e71ef09832061afd6ffc630280faf commit 96419b3aa91e71ef09832061afd6ffc630280faf Author: Bjoern A. Zeeb AuthorDate: 2025-07-31 07:14:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-01-16 19:37:39 +0000 LinuxKPI: pci: fix argument type to linuxkpi_pci_iomap[_range] The last argument (maxlen) to linuxkpi_pci_iomap_range and linuxkpi_pci_iomap is an unsigned long not an int. LinuxKPI is not using that argument in the end but fix it where needed. While here adjust the name to 'maxlen' and remove the "mmio_" to bar and off. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D51651 (cherry picked from commit 421bf3a968674cbb1fc7eb1c323fd4d5d2409718) --- sys/compat/linuxkpi/common/include/linux/pci.h | 8 ++++---- sys/compat/linuxkpi/common/src/linux_pci.c | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index d1445043ce4d..af3a4f276930 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -4,7 +4,7 @@ * Copyright (c) 2010 Panasas, Inc. * Copyright (c) 2013-2016 Mellanox Technologies, Ltd. * All rights reserved. - * Copyright (c) 2020-2022 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * * Portions of this software were developed by Björn Zeeb * under sponsorship from the FreeBSD Foundation. @@ -354,9 +354,9 @@ bool pci_device_is_present(struct pci_dev *pdev); int linuxkpi_pcim_enable_device(struct pci_dev *pdev); void __iomem **linuxkpi_pcim_iomap_table(struct pci_dev *pdev); -void *linuxkpi_pci_iomap_range(struct pci_dev *pdev, int mmio_bar, - unsigned long mmio_off, unsigned long mmio_size); -void *linuxkpi_pci_iomap(struct pci_dev *pdev, int mmio_bar, int mmio_size); +void *linuxkpi_pci_iomap_range(struct pci_dev *, int, + unsigned long, unsigned long); +void *linuxkpi_pci_iomap(struct pci_dev *, int, unsigned long); void linuxkpi_pci_iounmap(struct pci_dev *pdev, void *res); int linuxkpi_pcim_iomap_regions(struct pci_dev *pdev, uint32_t mask, const char *name); diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 52d9120fed5a..3c17dbbd82c3 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1,7 +1,7 @@ /*- * Copyright (c) 2015-2016 Mellanox Technologies, Ltd. * All rights reserved. - * Copyright (c) 2020-2022 The FreeBSD Foundation + * Copyright (c) 2020-2025 The FreeBSD Foundation * * Portions of this software were developed by Björn Zeeb * under sponsorship from the FreeBSD Foundation. @@ -735,7 +735,7 @@ linuxkpi_pcim_iomap_table(struct pci_dev *pdev) } static struct resource * -_lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size __unused) +_lkpi_pci_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen __unused) { struct pci_mmio_region *mmio, *p; int type; @@ -775,25 +775,25 @@ _lkpi_pci_iomap(struct pci_dev *pdev, int bar, int mmio_size __unused) } void * -linuxkpi_pci_iomap_range(struct pci_dev *pdev, int mmio_bar, - unsigned long mmio_off, unsigned long mmio_size) +linuxkpi_pci_iomap_range(struct pci_dev *pdev, int bar, + unsigned long off, unsigned long maxlen) { struct resource *res; - res = _lkpi_pci_iomap(pdev, mmio_bar, mmio_size); + res = _lkpi_pci_iomap(pdev, bar, maxlen); if (res == NULL) return (NULL); /* This is a FreeBSD extension so we can use bus_*(). */ if (pdev->want_iomap_res) return (res); - MPASS(mmio_off < rman_get_size(res)); - return ((void *)(rman_get_bushandle(res) + mmio_off)); + MPASS(off < rman_get_size(res)); + return ((void *)(rman_get_bushandle(res) + off)); } void * -linuxkpi_pci_iomap(struct pci_dev *pdev, int mmio_bar, int mmio_size) +linuxkpi_pci_iomap(struct pci_dev *pdev, int bar, unsigned long maxlen) { - return (linuxkpi_pci_iomap_range(pdev, mmio_bar, 0, mmio_size)); + return (linuxkpi_pci_iomap_range(pdev, bar, 0, maxlen)); } void