git: 1579a25f0a1b - stable/14 - LinuxKPI: pci: rename PCI_IRQ_LEGACY to PCI_IRQ_INTX

The branch stable/14 has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=1579a25f0a1be6ea4679adb0d03b6a0c048211ac

commit 1579a25f0a1be6ea4679adb0d03b6a0c048211ac
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2024-09-26 21:13:35 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2024-10-31 14:33:56 +0000

    LinuxKPI: pci: rename PCI_IRQ_LEGACY to PCI_IRQ_INTX
    
    PCI_IRQ_LEGACY was added in 366d68f28379 (likely) for rtw88 only.
    The define now got renamed and I cannot find any other use but
    rtw88 and rtw89.
    We keep the old name as comapt while driver updates are in
    progress enabling it defining LINUXKPI_VERSION for the two drivers.
    
    Sponsored by;   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D46822
    
    (cherry picked from commit 157e93e0e8138fbaa6ab5d5b20b0c23f903667a6)
---
 sys/compat/linuxkpi/common/include/linux/pci.h | 8 ++++++--
 sys/compat/linuxkpi/common/src/linux_pci.c     | 2 +-
 sys/modules/rtw88/Makefile                     | 1 +
 sys/modules/rtw89/Makefile                     | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h
index aa756c6e5b09..c91521ae6df4 100644
--- a/sys/compat/linuxkpi/common/include/linux/pci.h
+++ b/sys/compat/linuxkpi/common/include/linux/pci.h
@@ -233,10 +233,14 @@ extern const char *pci_power_names[6];
 #define	PCI_L1SS_CTL1			0x8
 #define	PCI_L1SS_CTL1_L1SS_MASK		0xf
 
-#define	PCI_IRQ_LEGACY			0x01
+#define	PCI_IRQ_INTX			0x01
 #define	PCI_IRQ_MSI			0x02
 #define	PCI_IRQ_MSIX			0x04
-#define	PCI_IRQ_ALL_TYPES		(PCI_IRQ_MSIX|PCI_IRQ_MSI|PCI_IRQ_LEGACY)
+#define	PCI_IRQ_ALL_TYPES		(PCI_IRQ_MSIX|PCI_IRQ_MSI|PCI_IRQ_INTX)
+
+#if defined(LINUXKPI_VERSION) && (LINUXKPI_VERSION >= 60800)
+#define	PCI_IRQ_LEGACY			PCI_IRQ_INTX
+#endif
 
 struct pci_dev;
 
diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c
index 59775629e247..ce7f91cd15ac 100644
--- a/sys/compat/linuxkpi/common/src/linux_pci.c
+++ b/sys/compat/linuxkpi/common/src/linux_pci.c
@@ -1305,7 +1305,7 @@ out:
 		if (error == 0 && pdev->msi_enabled)
 			return (pdev->dev.irq_end - pdev->dev.irq_start);
 	}
-	if (flags & PCI_IRQ_LEGACY) {
+	if (flags & PCI_IRQ_INTX) {
 		if (pdev->irq)
 			return (1);
 	}
diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile
index da4233b7c79e..db42192233a7 100644
--- a/sys/modules/rtw88/Makefile
+++ b/sys/modules/rtw88/Makefile
@@ -33,6 +33,7 @@ SRCS+=	opt_wlan.h opt_inet6.h opt_inet.h
 #CFLAGS+=	-ferror-limit=0
 
 CFLAGS+=	-DKBUILD_MODNAME='"rtw88"'
+CFLAGS+=	-DLINUXKPI_VERSION=60800
 
 CFLAGS+=	-I${DEVRTW88DIR}
 CFLAGS+=	${LINUXKPI_INCLUDES}
diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile
index 9f81912a762d..eb2d9cddb413 100644
--- a/sys/modules/rtw89/Makefile
+++ b/sys/modules/rtw89/Makefile
@@ -33,6 +33,7 @@ SRCS+=	${LINUXKPI_GENSRCS}
 SRCS+=	opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h
 
 CFLAGS+=	-DKBUILD_MODNAME='"rtw89"'
+CFLAGS+=	-DLINUXKPI_VERSION=60800
 
 CFLAGS+=	-I${DEVRTW89DIR}
 CFLAGS+=	${LINUXKPI_INCLUDES}