From nobody Fri Jan 31 19:52:37 2025 X-Original-To: dev-commits-src-main@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 4Yl64b4bvqz5mxLq; Fri, 31 Jan 2025 19:52:47 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yl64b44QDz3MFH; Fri, 31 Jan 2025 19:52:47 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738353167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JK8leZWq53iHmG4rH012s5ZvBAGe6UO3UV2LZwNhzy0=; b=o8Nn1gPFEYZvKZQhWBLLOKv//18qMslDwmIuyHBrGxj/7/Lwrhxekr7TUPIX8FUlrNX3IL lNzoJIXAECm+8hCDB+Pb+5uPkCim0t9bBjF5kXox4HHBxMvF7RIOjSAMD+JmvwX0i3N6o0 6DprXV3gFnQEVgsMp7pGwcKoEtAGZvfXzRHLlHOJvlhaZNcKlB6X8RbLjh7uSxzNOOcIau EuOSW0ZKBziF2O+6zaS5oG87OtkzoFUgDkLoh2AaOLleSO9wZrB4ETFKVi0MCvracHMM+R wZLt2nNcqA5yxMjyR5dDH1U8x2no5+ru6dP44DALornDedZHL/kL/55kz2DzHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738353167; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JK8leZWq53iHmG4rH012s5ZvBAGe6UO3UV2LZwNhzy0=; b=ckgqZcILhgBECKhb3nTBAS3IptujRBd8Ksa1rKoROuG+ZHiKAimRT4cdKWznCgaoZ27iot ni90s6bmOYll2q7rivOmqar5gXg+03b+kppDJ0wQtxmOI9Vr3UgZzx9fdmqAjaHdHGwEs7 kbvOwdopnAVMkuVcAxp8KJazgdkTj8o2V3iGhZmFha7g2Y1L8o6z0mIp6x8mdXo3Q2eleN WZL2jt/O1ZRUfZkLfKEUvvAh/LY2Qw5oKOqkfg+1FZdLwrW7tlRLqUxq1Lj7dzM4yI6ITd B9GOExmo/S+BBtW7XrZvE/BAuiDacOOrhBcxIiMCPnySX3QWlSFgfZ7J/fnyyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738353167; a=rsa-sha256; cv=none; b=xIhK14y0Fl3+1uJca5p6E/4S3015fWtuE9f/ezpnTv8oeMELx1anBxZDF9JETxrJgOTaXu goFqbP5xpl9kueZQ0lW07Pm3/dSjBOYgqSuedcuRsLvb6XMHRlZjEeFLwOKMyFWHSxq3tc oqhOxlBOjlh83IpLi+DcAv6felUKp7d6oNYaKiP1yQ+G2evugo5O5f+At9ELd1lcBQf0Oa JgKnys5z6csUf1dbNma8RY/JhF/nE9/cZBaQhSujqXzw9vbD9JFkNkDQf+uuGvFCnqJXzC ZmvVLFfWwuyvP85EN9EicQzgd8Gnb+oyjODBfXBwtDKgxWIDtoqu8tW5plFkcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx-01.divo.sbone.de (mx-01.divo.sbone.de [IPv6:2003:a:140a:2200:6:594:fffe:19]) (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 ECDSA (prime256v1) client-digest SHA256) (Client CN "mx-01.divo.sbone.de", Issuer "E6" (verified OK)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Yl64b2mKTzlWv; Fri, 31 Jan 2025 19:52:47 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by mx-01.divo.sbone.de (Postfix) with ESMTPS id BD337A64805; Fri, 31 Jan 2025 19:52:39 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 08C652D029DD; Fri, 31 Jan 2025 19:52:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id 7RljKLj1XQj7; Fri, 31 Jan 2025 19:52:38 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 7D65F2D029D8; Fri, 31 Jan 2025 19:52:38 +0000 (UTC) Date: Fri, 31 Jan 2025 19:52:37 +0000 (UTC) From: "Bjoern A. Zeeb" To: =?UTF-8?Q?Jean-S=C3=A9bastienP=C3=A9dron?= cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 03e39d3d42e7 - main - linuxkpi: Declare `PCI_IRQ_LEGACY` even for linuxkpi 6.7 In-Reply-To: <202501311603.50VG38oN038372@gitrepo.freebsd.org> Message-ID: References: <202501311603.50VG38oN038372@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/mixed; BOUNDARY="1098556516-211439509-1738352803=:2254" Content-ID: This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --1098556516-211439509-1738352803=:2254 Content-Type: text/plain; CHARSET=UTF-8; format=flowed Content-Transfer-Encoding: 8BIT Content-ID: <308548oo-4527-9188-opo0-68qr72820237@mnoonqbm.arg> 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 > AuthorDate: 2024-12-21 22:02:16 +0000 > Commit: Jean-Sébastien Pédron > 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 --1098556516-211439509-1738352803=:2254--