From nobody Mon Jun 26 12:08:54 2023 X-Original-To: dev-commits-src-branches@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 4QqRTL6hGzz4k6rb; Mon, 26 Jun 2023 12:08:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QqRTL5gDMz3jyg; Mon, 26 Jun 2023 12:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781334; 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=a1SkeeX7FFB9EuWbWg2RmIIrwRe6cFz/QMDp1utizsE=; b=GZoos1BN2OQXSs1Fns/K/VBjDacyRBvpks53OFsp/YQMdkCM203TTszYrsOgF/sTm8/WND Lgb0Bs4QB6foHQBM0Qo/eeZgw6hUnVb1OjT2MHH+hFsxwYEC4VmnXFXUxeVcFaAjidJ0NI EOHCHWeFNoU/qQYYBkvSIP9opPgKrFlQyIgrXTb2WLHeVvnOktnCDAjJ/3/nrJMvQrxZm3 FYvQBwO79rf4RUJB20QgFWqQ8gTm3Ok2wWOKvDcEITPJKtQI3HY8dZazI+rMf2qfI3daEM zh80btkss35pB5uRWkeD96nlLo+fHWMsPZT0ySUqQDeuZF3PoYgmRUZQj0a16g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687781334; 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=a1SkeeX7FFB9EuWbWg2RmIIrwRe6cFz/QMDp1utizsE=; b=asKKMCfl0e4910O5Fbi3aGM6wu6Q61MsbreW2ICBIhYNWvi5ExWnckFS238EVTYFObr7ln RAfVe3qdbcOd7HwxjAyrQSjtDqP1Y4DajU2aZ9dv3PtVIc8aObBszQAHnA8xxLqgEYljq9 xnB11+DrIs5p9b+Ht17py/gJz0HOM52w43/J5ftexpgxzYhocwtLwl5rMX9OQhn5xMSWI4 nsE/mlMeTSuj9cawtBoCReNgIYF62A3oUwt22fcar37wnMdZzk1LBqdgOY8pDRLh4+YB0S 9IF7Nsc+usd/uKeB5GeaVzkYPgRGunIQE1y/8w+Td9FDxzEP3gslusYryafsXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687781334; a=rsa-sha256; cv=none; b=IkjKLVpIkwmOhX2dmjWn3uBkdqWwXxLFHZu9XwRbQ+TqFZLd2TB4GHmX4ouDS7QeqDOnIA Q5r1pxfyEY1pG4yE+NYayqZ2H4N782lXnusPyM/RVWs1btgojI0iDOdWpuGZ1YNtUbeuEX nwbBSNYdyFmHI+urNHrYSPjadg+q304hcTKYDpi2ywX/5SYrHkX8pIoF7UN4iW4hWXXzIt 0410e5cJqQK9XlfuvkI2hqhTP0bPaiJFN+h1f6lmUFw6IIxgEeuOKG7aL19xjltAwshuzF AO58jOhnoauOTh+5j20JwqY3MqFjf/pC7nXRco6kvf9zRkT2EylZnkW4dFN8GQ== 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 4QqRTL4mRrz18P1; Mon, 26 Jun 2023 12:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35QC8sTm083428; Mon, 26 Jun 2023 12:08:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QC8sO6083427; Mon, 26 Jun 2023 12:08:54 GMT (envelope-from git) Date: Mon, 26 Jun 2023 12:08:54 GMT Message-Id: <202306261208.35QC8sO6083427@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: 50b27a0771b1 - stable/13 - LinuxKPI: pci: update struct msi_desc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 50b27a0771b112bba2b52ed137903c49947e884d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=50b27a0771b112bba2b52ed137903c49947e884d commit 50b27a0771b112bba2b52ed137903c49947e884d Author: Bjoern A. Zeeb AuthorDate: 2023-05-20 00:48:28 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-06-26 09:19:50 +0000 LinuxKPI: pci: update struct msi_desc It seems struct msi_desc is setup differently (or was changed) compared to how we added it a while ago. Catch up in order to keep drivers directly accessing fields compiling. Sponsored by: The FreeBSD Foundation Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40175 (cherry picked from commit 17bde9cbc6fc3ac219aa11243c0b75025786f628) --- sys/compat/linuxkpi/common/include/linux/pci.h | 8 ++++++-- sys/compat/linuxkpi/common/src/linux_pci.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index c2643a27b910..9cc56237482c 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -312,13 +312,17 @@ struct msi_msg { uint32_t data; }; -struct msi_desc { - struct msi_msg msg; +struct pci_msi_desc { struct { bool is_64; } msi_attrib; }; +struct msi_desc { + struct msi_msg msg; + struct pci_msi_desc pci; +}; + /* * If we find drivers accessing this from multiple KPIs we may have to * refcount objects of this structure. diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 88a6b749a043..4ee3e3dc5838 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1016,7 +1016,7 @@ lkpi_pci_msi_desc_alloc(int irq) desc = malloc(sizeof(*desc), M_DEVBUF, M_WAITOK | M_ZERO); - desc->msi_attrib.is_64 = + desc->pci.msi_attrib.is_64 = (msi->msi_ctrl & PCIM_MSICTRL_64BIT) ? true : false; desc->msg.data = msi->msi_data;