From nobody Thu Oct 31 14:34:51 2024 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 4XfRNC327hz5bpF1; Thu, 31 Oct 2024 14:34:51 +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 4XfRNC2c2Cz47Wx; Thu, 31 Oct 2024 14:34:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730385291; 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=immiBpJuEiPCndur+J6S6yPyXK0pbJEATwjiTl72AVM=; b=Q8Qp0MCNjDoW2Ih6/QOWePnJhFVKAxKH8r4FXNtH5lk0YS3ctEbyQnXcgyvLFBModXN/48 EBmnnIRsXAl8NSZ5Pk+wt0vmz9Bap/NyGiXHqyk/6AAE1L/R5GYOo9gpH8qdMR2cvGypBT M/nN1/n8gnO2kH7cXSXL2ZUeliYu/+l//2lLjFXxJT5tVo4YOnJW0KZpX54zpSBz4FAtKn 1HuT49SaCsopho1cpiXgWj4cxSypcrxUHXpFH0XMqCs8qZPTfGs4T6lZex8Fy72osHu55R mt7VCd4BFkDLeTsGqnbA1Nt5nj13pe2RMq/ouekBCya/DUPp9dQ38uUXJjAJ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730385291; 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=immiBpJuEiPCndur+J6S6yPyXK0pbJEATwjiTl72AVM=; b=r3QBOb8OXeKrGaVj+kWTgWAW+Fv63NBeNPhOAzlmKNMmlhJHY3UQ3lJhtbKq7acnXTYdUE zayYdAq7LRUWKboQ5QelZ9lUM/M5DXx0gPdN/afaBJaRvvWJp9K7nNcRfm3YvSsqz/Dg3Q p6OnTFGi9j0u4iKY3ydFk08L4X3+RiyB8NVgY6wlwBsyOWX2QKg7PbJYgRTNMXaOaoTxo7 yaDIgkRHm81VPf/IB3zwWz3qLM/mHaooMmKaYQZjpLKuBGE7qiGsdWLEMQ8RO+8iBF88Lc bY6ryYKKpihukleGwJq0hjJHAMJb76f3gJyHgReFPKl1g3gznnPWhk46YdED+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730385291; a=rsa-sha256; cv=none; b=WwOBM7dkAqUs+lfSQ20UXQ6aHPhrd24d0Wg8S4uxL+j2ilOMbQh+9KFeG3uC6tfZ4k4UKA Cdj0TLeMDN8I7negopa5bDSwflTegXNlVPTfoEQAiDDcds7I894zHVWl8NNBmhVDqqDBtt NF9ON/4hyK+i3ahAMPDgy4gMvOziZbijlmjc8xDRC3uBc6F2BpGr6Dr5iFQJmBn+YYX43l FqODT6A4g7ppV4eiMjt1DnAG2GeM3se3p8KCJeCH6M1OryyjeSyVsh2dGKw/8K9juyjOnP 7PkChVXY719/wAOz2683JCFmWbXQOMsWIZuJEgN6bi1f1qcJUEgeG5xUhTtOQg== 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 4XfRNC2BRYzgcM; Thu, 31 Oct 2024 14:34:51 +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 49VEYpkK005014; Thu, 31 Oct 2024 14:34:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49VEYp7A005011; Thu, 31 Oct 2024 14:34:51 GMT (envelope-from git) Date: Thu, 31 Oct 2024 14:34:51 GMT Message-Id: <202410311434.49VEYp7A005011@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 1579a25f0a1b - stable/14 - LinuxKPI: pci: rename PCI_IRQ_LEGACY to PCI_IRQ_INTX 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1579a25f0a1be6ea4679adb0d03b6a0c048211ac Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1579a25f0a1be6ea4679adb0d03b6a0c048211ac commit 1579a25f0a1be6ea4679adb0d03b6a0c048211ac Author: Bjoern A. Zeeb AuthorDate: 2024-09-26 21:13:35 +0000 Commit: Bjoern A. Zeeb 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}