From nobody Tue Oct 24 19:25:58 2023 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 4SFMVG67xWz4yPMg; Tue, 24 Oct 2023 19:25:58 +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 4SFMVG5Nmfz4NVV; Tue, 24 Oct 2023 19:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698175558; 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=nrdasXmNW12r8s7LkdCODi+q9vy4KYc2rtekp0Uqv3s=; b=fcpwRUSfEnvVNefgHHH7/ST1v6hHu8aJPOgQmsQpQsl51l2G9D5J2/0b60arW6EppM4OB4 a2qEH9pS8dnT6tODwgR/piXEylWMs8FW2K2WGcq84HBIJvslKKfowUN680sz1hIbYVGNTc a9GA434sIYTUcIx4M5IfA2DSVSgX3gtt7nNAmsnLIxu0+sykx61jC+rANbwsicx6KdOUmF dceTrTrQC0Vf2BBrlNNOjj3XUOktCzDH1TXQ2wlFmxSU82Pgunb5ON4NQh6iusAjTKUopF 1Cy241hBFI8PgDPvKO1RgvCll1Vbq5745KKSpr4pXIcmJzQIXi67NS3BmB8Hcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698175558; a=rsa-sha256; cv=none; b=U+eGRpvQw3AjDP7yjFaFX0d6Lwtt7W917w39sTcgMxJxrwEsBBzGULX9JYc1muKrtzhG+d 1LNTTrMGcv/b8l8QSL6tXpde2qH/orp0GN96kzXD0lsgylwEuoFJ1fwbz2alNyeLmSWqoq 6pU7iLKy64nVMzUVV1TuhIjhfYkJZkGY7kacXa726U1oHc/s4yzLAapKvXYsnii7AcsCG1 FTGqoAc2d2tNfXs8AhOWLI3Gf4iWGbzE6ZewhkWODrICK4QL/gYm6L0IKhOvj5JbzBNYWa TlkczTDbXF3skXi5YZ2c/KMT71jrCRTkcKHZRGOu7fTxCa4rEVTK3iNPFIhdLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698175558; 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=nrdasXmNW12r8s7LkdCODi+q9vy4KYc2rtekp0Uqv3s=; b=oKGhdmfZYO8EwSXBUXYNOELgAwdlnZwSUnxzWJ3dwxOlW7luhfjaWkqFpDHcQ3uEsSh2j+ /ltJGfg4fXfLBuD2dM3XK00sl+XFHcVZzuTSn0evXftzqKWufnORLWWzlBQEyleO5ntmHi bEjFXxhZpGHbN3rRuQg+nsGIM8W2kQHznLyF/u9tXwLv0Bu85UxCr3gBLUGEHgipjqmEFK KEgHnqDjWKQUuj+gFNxpwiQG4Wu6HwJtGFK0cVADEXI7dxJXoThe6BcU/nZ/7k1upl1JLz zow+QO24Zm31kI7IfHVNJN8EvH/p28ANp6X24FmjhZm3g9G93efxZiS7sIDvXg== 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 4SFMVG4LT4zbFB; Tue, 24 Oct 2023 19:25:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39OJPwZJ074488; Tue, 24 Oct 2023 19:25:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OJPwdn074485; Tue, 24 Oct 2023 19:25:58 GMT (envelope-from git) Date: Tue, 24 Oct 2023 19:25:58 GMT Message-Id: <202310241925.39OJPwdn074485@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 2574d1b43667 - stable/13 - x86: Cosmetic cleanups to struct msi_intsrc 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2574d1b43667462ebd413c54cc57365d6d2b37f4 Auto-Submitted: auto-generated The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2574d1b43667462ebd413c54cc57365d6d2b37f4 commit 2574d1b43667462ebd413c54cc57365d6d2b37f4 Author: John Baldwin AuthorDate: 2023-10-20 21:53:05 +0000 Commit: John Baldwin CommitDate: 2023-10-24 19:19:44 +0000 x86: Cosmetic cleanups to struct msi_intsrc - Sort members by size. - Change msi_msix from a u_int to a bool. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42305 (cherry picked from commit bfccb4a429795954cfeca4ba60a07c0e1ec35e07) --- sys/x86/x86/msi.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 246645efbc10..888635cba3f4 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -114,15 +114,15 @@ struct msi_intsrc { struct intsrc msi_intsrc; device_t msi_dev; /* Owning device. (g) */ struct msi_intsrc *msi_first; /* First source in group. */ + u_int *msi_irqs; /* Group's IRQ list. (g) */ u_int msi_irq; /* IRQ cookie. */ - u_int msi_msix; /* MSI-X message. */ - u_int msi_vector:8; /* IDT vector. */ u_int msi_cpu; /* Local APIC ID. (g) */ + u_int msi_remap_cookie; /* IOMMU cookie. */ + u_int msi_vector:8; /* IDT vector. */ u_int msi_count:8; /* Messages in this group. (g) */ u_int msi_maxcount:8; /* Alignment for this group. (g) */ u_int msi_enabled:8; /* Enabled messages in this group. (g) */ - u_int *msi_irqs; /* Group's IRQ list. (g) */ - u_int msi_remap_cookie; + bool msi_msix; /* MSI-X message. */ }; static void msi_create_source(void); @@ -277,7 +277,7 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) /* Allocate IDT vectors on this cpu. */ if (msi->msi_count > 1) { - KASSERT(msi->msi_msix == 0, ("MSI-X message group")); + KASSERT(!msi->msi_msix, ("MSI-X message group")); vector = apic_alloc_vectors(apic_id, msi->msi_irqs, msi->msi_count, msi->msi_maxcount); } else @@ -733,7 +733,7 @@ again: msi->msi_cpu = cpu; msi->msi_first = msi; msi->msi_vector = vector; - msi->msi_msix = 1; + msi->msi_msix = true; msi->msi_count = 1; msi->msi_maxcount = 1; msi->msi_irqs = NULL; @@ -775,7 +775,7 @@ msix_release(int irq) msi->msi_dev = NULL; apic_free_vector(msi->msi_cpu, msi->msi_vector, msi->msi_irq); msi->msi_vector = 0; - msi->msi_msix = 0; + msi->msi_msix = false; msi->msi_count = 0; msi->msi_maxcount = 0;