On Fri, 31 Jan 2025, Jean-SébastienPédron wrote:
The branch main has been updated by dumbbell:
URL:
https://cgit.FreeBSD.org/src/commit/?id=03e39d3d42e70482cd6f65ecaa5cf8ff9674d27c
commit 03e39d3d42e70482cd6f65ecaa5cf8ff9674d27c
Author: Jean-Sébastien Pédron <dumbb...@freebsd.org>
AuthorDate: 2024-12-21 22:02:16 +0000
Commit: Jean-Sébastien Pédron <dumbb...@freebsd.org>
CommitDate: 2025-01-31 16:00:46 +0000
linuxkpi: Declare `PCI_IRQ_LEGACY` even for linuxkpi 6.7
[Why]
DRM drivers in Linux 6.7 already use this constant.
The change is wrong and if commits would have been for more than two
hours in reviews that would have been helpful.
% git tag --contains 58ff9c5acb4aef58e118bbf39736cc4d6c11a3d3
shows that the alias define came with v6.8-rc1 (and apart from rtw88 no
one had been using the legacy version before, so the version check
was kept to a minumum so it could be removed sooned than later).
Adding more pre-6.8 drivers changes that backward compat need.
In the meantime the define was removed in Linux 0e1fdd222f0a and
that was in v6.10-rc1.
So the check these days should simply read (LINUXKPI_VERSION <= 61000)
and be good.
/bz
Reviewed by: manu
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D48742
---
sys/compat/linuxkpi/common/include/linux/pci.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h
b/sys/compat/linuxkpi/common/include/linux/pci.h
index c6fc1195f71b..aa6b778c3477 100644
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -238,7 +238,7 @@ extern const char *pci_power_names[6];
#define PCI_IRQ_MSIX 0x04
#define PCI_IRQ_ALL_TYPES (PCI_IRQ_MSIX|PCI_IRQ_MSI|PCI_IRQ_INTX)
-#if defined(LINUXKPI_VERSION) && (LINUXKPI_VERSION >= 60800)
+#if defined(LINUXKPI_VERSION) && (LINUXKPI_VERSION >= 60700)
#define PCI_IRQ_LEGACY PCI_IRQ_INTX
#endif
--
Bjoern A. Zeeb r15:7
