From nobody Thu Jul 31 17:39:00 2025 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 4btGXh66vmz62qVt; Thu, 31 Jul 2025 17:39:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4btGXh49Mgz3ZBv; Thu, 31 Jul 2025 17:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753983540; 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=wx823zPtYc/YsmY5J31kmiuhMVgD1Ni6vvfXcXwFshU=; b=MbBzvvV7K3TQVrWjv3fph9uiptCWk+zi7mNws95gFeZanisf1opQdS1yXhlrWnHf43pv// qIekcCBGKBRDXXK/5063bfzkYDmEzuBsu60i+q4Fjsf8AsRmoHEX6HGQFTwy1hGQNaXTsk 1XNcS7g9s98CK7xwnkDSynXjLy82FnLXExPyMyg8GmaVZWEAymo6MgZt9wTu4A2i8jSRU0 R8QDCbsaS2w7jHrDLIU7VcpPPvALXlFYfmJ6Fu23mlHQ7dUpUuUwregfdeVe5TwaA5v+/3 E3NrBt7t401pxN2iZIY3KUX6T4T5K5l6yFCyjrlToYmNKe5YES4h4mdkfm7LYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753983540; 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=wx823zPtYc/YsmY5J31kmiuhMVgD1Ni6vvfXcXwFshU=; b=HOWm313q8ua8fBV9Af8XipWisVKGgu50toM5cFsYjCU/WOJhDKTvftpEawSxiRtH62WwzD Sxe+8fuGmd/GQuwNmy4d9O0u1UPwRQGvjbzyKy1hMpBMbh1Xdo/BcS4BxuAHhgXMVJ/yxi OkZZM2SbbVyFhglxpQRxRyMfrPJKohOcRnQqbpfXIPU4Rjk8m1GimQm5LHWTdFDwfDiGUh YaLu28AX6yVmlQZG49Gfh+TljeLIwgy4CPOVPek8s5NfbpRpqR6kYuWZl4D2hSjY/w1T5E Y3uE1JMadZWrRLTOBxB1khoo9RF5dnLBrWDfvqbTLjBCeHGL0x7jYThqJALW7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753983540; a=rsa-sha256; cv=none; b=LWOVRImV91B4eUSgPo//UrTtcSGCYdvaMGeGcSyOQNhKJasNM7jMkvihM47gfarSz5o/4z S6AyoFDuZ/8mjgcxZRVdTmO//bqp1vk5HRV0Ohq4d5VpQUUJ1fIi3uqY4FZP3c+ShLlpya cX9bnghdPWaoiJ558wuxxMonJMcThUPAsw0avQwwenBcbj7aYNK9087q6OYkoj+DCbd9Bj aH35Tq+jLXCtwpkCj0OHnbnRT3W96ow+cvXxxPzQjeM1QC5rtQO+RzZRnTgZVi+p7rkOfN o+8j+XrR7VibFyByjfuUfRBvtuc4EQFYR1+CaJ9UWs+0I2wq6RCgrlGtV8eRRQ== 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 4btGXh3kZRz19st; Thu, 31 Jul 2025 17:39:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56VHd0dr015219; Thu, 31 Jul 2025 17:39:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56VHd0Y9015216; Thu, 31 Jul 2025 17:39:00 GMT (envelope-from git) Date: Thu, 31 Jul 2025 17:39:00 GMT Message-Id: <202507311739.56VHd0Y9015216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 421bf3a96867 - main - LinuxKPI: pci: fix argument type to linuxkpi_pci_iomap[_range] 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 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/main X-Git-Reftype: branch X-Git-Commit: 421bf3a968674cbb1fc7eb1c323fd4d5d2409718 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=421bf3a968674cbb1fc7eb1c323fd4d5d2409718 commit 421bf3a968674cbb1fc7eb1c323fd4d5d2409718 Author: Bjoern A. Zeeb AuthorDate: 2025-07-31 07:14:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-31 17:37:54 +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 MFC after: 3 days Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D51651 --- 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 5864ed45065b..059f8561c71e 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. @@ -362,9 +362,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 55202da00440..057585d9edc0 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. @@ -752,7 +752,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; @@ -792,25 +792,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