git: 421bf3a96867 - main - LinuxKPI: pci: fix argument type to linuxkpi_pci_iomap[_range]

The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=421bf3a968674cbb1fc7eb1c323fd4d5d2409718

commit 421bf3a968674cbb1fc7eb1c323fd4d5d2409718
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2025-07-31 07:14:28 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
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