From nobody Thu Apr 25 13:06:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1617266669; cv=none; d=zohomail.com; s=zohoarc; b=cwtAjO0GtHCJukPffZZyiUeW0nHg0I5Do/9akgd3hnrfLh7dkhUhl1md6zwngmYkpG+j+8KBr03wUamCm0WMADDhPnUBVQT/nCLTFTrOxUsL0eFnJfWQe2hfHFagyqyyELOzw0v6JQmjbFRUY+5PSNuhKwYafg/KMqx4voocej4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617266669; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EVCTE1tfqI4iUXHiO5xFd7e8mHxtUGLrwEPBx00R958=; b=kHok7oTWeo1yMQ6c0pDaVFvn8PsndPr5fW6BnXeWsydMZws9uf4YuDz8ogVTkaEJ+jsQCqW/OqLnIHmUbMMNzPYZ5XWYEZ9r2wXPY182fLhPG1p2TMkkFgSL8aMtjq1xNT/4AOlHL7dYh9EqEF3NvNyXdasZSdSTf3ZvBj7zgjc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617266669334392.755056391862; Thu, 1 Apr 2021 01:44:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.104170.198911 (Exim 4.92) (envelope-from ) id 1lRsvy-00068V-SM; Thu, 01 Apr 2021 08:44:10 +0000 Received: by outflank-mailman (output) from mailman id 104170.198911; Thu, 01 Apr 2021 08:44:10 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRsvy-00068O-PL; Thu, 01 Apr 2021 08:44:10 +0000 Received: by outflank-mailman (input) for mailman id 104170; Thu, 01 Apr 2021 08:44:08 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRsvw-00068H-JW for xen-devel@lists.xenproject.org; Thu, 01 Apr 2021 08:44:08 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ff23fd63-710c-46c3-8f90-b409ab186394; Thu, 01 Apr 2021 08:44:07 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id BF2A1AE86; Thu, 1 Apr 2021 08:44:06 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: ff23fd63-710c-46c3-8f90-b409ab186394 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1617266646; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EVCTE1tfqI4iUXHiO5xFd7e8mHxtUGLrwEPBx00R958=; b=tyd7dgVvsLyTX3ldvHPf2mSEZI6d5TO41Hsq1IcgrXwSWoDsT1AxGciCXL8jP58OwmhL1V pSMqGtdvjSA2di/unGO4Oshs9ePmDFdgWkrB1Xb2x1phKR2Rpvk6dZtiNIsmrCyuFJKDzj JGwOHG9Qk22r6g95AxemrduZPxjqrPc= Subject: [PATCH 1/6] VT-d: improve save/restore of registers across S3 From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian References: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Message-ID: <2ff7ac44-5a67-55e5-758b-680e68ebacaa@suse.com> Date: Thu, 1 Apr 2021 10:44:06 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" The static allocation of the save space is not only very inefficient (most of the array slots won't ever get used), but is also the sole reason for a build-time upper bound on the number of IOMMUs. Introduce a structure containing just the one needed field we can't (easily) restore from other in-memory state, and allocate the respective array dynamically. Take the opportunity and make the FEUADDR write dependent upon x2apic_enabled, like is already the case in dma_msi_set_affinity(). Also alter properties of nr_iommus: static, unsigned, and __initdata. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -57,7 +57,7 @@ bool __read_mostly iommu_qinval =3D true; bool __read_mostly iommu_snoop =3D true; #endif =20 -int nr_iommus; +static unsigned int __initdata nr_iommus; =20 static struct iommu_ops vtd_ops; static struct tasklet vtd_fault_tasklet; @@ -1165,13 +1165,6 @@ int __init iommu_alloc(struct acpi_drhd_ unsigned long sagaw, nr_dom; int agaw; =20 - if ( nr_iommus >=3D MAX_IOMMUS ) - { - dprintk(XENLOG_ERR VTDPREFIX, - "IOMMU: nr_iommus %d > MAX_IOMMUS\n", nr_iommus + 1); - return -ENOMEM; - } - iommu =3D xzalloc(struct vtd_iommu); if ( iommu =3D=3D NULL ) return -ENOMEM; @@ -2226,6 +2219,10 @@ static void __hwdom_init setup_hwdom_rmr pcidevs_unlock(); } =20 +static struct iommu_state { + uint32_t fectl; +} *__read_mostly iommu_state; + static int __init vtd_setup(void) { struct acpi_drhd_unit *drhd; @@ -2251,6 +2248,13 @@ static int __init vtd_setup(void) goto error; } =20 + iommu_state =3D xmalloc_array(struct iommu_state, nr_iommus); + if ( !iommu_state ) + { + ret =3D -ENOMEM; + goto error; + } + /* We enable the following features only if they are supported by all = VT-d * engines: Snoop Control, DMA passthrough, Queued Invalidation, Inter= rupt * Remapping, and Posted Interrupt @@ -2508,8 +2512,6 @@ static int intel_iommu_group_id(u16 seg, return PCI_BDF2(bus, devfn); } =20 -static u32 iommu_state[MAX_IOMMUS][MAX_IOMMU_REGS]; - static int __must_check vtd_suspend(void) { struct acpi_drhd_unit *drhd; @@ -2534,14 +2536,7 @@ static int __must_check vtd_suspend(void iommu =3D drhd->iommu; i =3D iommu->index; =20 - iommu_state[i][DMAR_FECTL_REG] =3D - (u32) dmar_readl(iommu->reg, DMAR_FECTL_REG); - iommu_state[i][DMAR_FEDATA_REG] =3D - (u32) dmar_readl(iommu->reg, DMAR_FEDATA_REG); - iommu_state[i][DMAR_FEADDR_REG] =3D - (u32) dmar_readl(iommu->reg, DMAR_FEADDR_REG); - iommu_state[i][DMAR_FEUADDR_REG] =3D - (u32) dmar_readl(iommu->reg, DMAR_FEUADDR_REG); + iommu_state[i].fectl =3D dmar_readl(iommu->reg, DMAR_FECTL_REG); =20 /* don't disable VT-d engine when force_iommu is set. */ if ( force_iommu ) @@ -2594,15 +2589,13 @@ static void vtd_resume(void) for_each_drhd_unit ( drhd ) { iommu =3D drhd->iommu; - i =3D iommu->index; =20 spin_lock_irqsave(&iommu->register_lock, flags); - dmar_writel(iommu->reg, DMAR_FEDATA_REG, - iommu_state[i][DMAR_FEDATA_REG]); - dmar_writel(iommu->reg, DMAR_FEADDR_REG, - iommu_state[i][DMAR_FEADDR_REG]); - dmar_writel(iommu->reg, DMAR_FEUADDR_REG, - iommu_state[i][DMAR_FEUADDR_REG]); + dmar_writel(iommu->reg, DMAR_FEDATA_REG, iommu->msi.msg.data); + dmar_writel(iommu->reg, DMAR_FEADDR_REG, iommu->msi.msg.address_lo= ); + if ( x2apic_enabled ) + dmar_writel(iommu->reg, DMAR_FEUADDR_REG, + iommu->msi.msg.address_hi); spin_unlock_irqrestore(&iommu->register_lock, flags); } =20 @@ -2615,8 +2608,7 @@ static void vtd_resume(void) i =3D iommu->index; =20 spin_lock_irqsave(&iommu->register_lock, flags); - dmar_writel(iommu->reg, DMAR_FECTL_REG, - (u32) iommu_state[i][DMAR_FECTL_REG]); + dmar_writel(iommu->reg, DMAR_FECTL_REG, iommu_state[i].fectl); spin_unlock_irqrestore(&iommu->register_lock, flags); =20 iommu_enable_translation(drhd); --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -499,8 +499,6 @@ struct qinval_entry { #define VTD_PAGE_TABLE_LEVEL_3 3 #define VTD_PAGE_TABLE_LEVEL_4 4 =20 -#define MAX_IOMMU_REGS 0xc0 - extern struct list_head acpi_drhd_units; extern struct list_head acpi_rmrr_units; extern struct list_head acpi_ioapic_units; --- a/xen/include/asm-x86/iommu.h +++ b/xen/include/asm-x86/iommu.h @@ -22,7 +22,6 @@ #include =20 #define DEFAULT_DOMAIN_ADDRESS_WIDTH 48 -#define MAX_IOMMUS 32 =20 struct g2m_ioport { struct list_head list; From nobody Thu Apr 25 13:06:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1617266691; cv=none; d=zohomail.com; s=zohoarc; b=IlvniidV6UWz374COFE6kNnDUlnVC8+5vLBrtAlst46Ys2JOtLrrvlLSYzYa8lMSSn3+UWoxkazI73+VjeNKb/zbW+DOJ11FR2SqID5TtWtZyO9FzYzjzxQUHFVtPxGb44dF+5ietiTLoP9u14Q6XT6C3w+GUq/XTHhUNAFE8/A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617266691; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5qi6++u9QBggB8E7CGEoTNUFM2DKPu+n9nR4wGp6C/U=; b=TJ5gA1Y53yTaU6PR7VMZNTcaBshznCkxCnui9BLIhOfZ4Nk4qYJgmMaMPlO1w+04x0ck3+WUkxjQDsPmj+cbCdXXnlqfbKQzHDuN2z4iLKC71YW3k9+9dDy6F6c6SRYHBHzcYCwlQYeE8BSMbHBb0DfzUyprJV/ML/kkiGyJteo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617266691305115.42098991299167; Thu, 1 Apr 2021 01:44:51 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.104175.198924 (Exim 4.92) (envelope-from ) id 1lRswQ-0006Gi-8X; Thu, 01 Apr 2021 08:44:38 +0000 Received: by outflank-mailman (output) from mailman id 104175.198924; Thu, 01 Apr 2021 08:44:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRswQ-0006Gb-5V; Thu, 01 Apr 2021 08:44:38 +0000 Received: by outflank-mailman (input) for mailman id 104175; Thu, 01 Apr 2021 08:44:37 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRswP-0006GT-5t for xen-devel@lists.xenproject.org; Thu, 01 Apr 2021 08:44:37 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id e703b07c-674a-4a5d-8e3e-639abbca8c6f; Thu, 01 Apr 2021 08:44:36 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id BED10AE8D; Thu, 1 Apr 2021 08:44:35 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e703b07c-674a-4a5d-8e3e-639abbca8c6f X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1617266675; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5qi6++u9QBggB8E7CGEoTNUFM2DKPu+n9nR4wGp6C/U=; b=RGHEfTZYySo1EMvwvxwxQK9e2SYicqFszHLrDPzRlPxPscjsrTilBG+cu32oDWIgVrNRgj rsUB10uiziJIfDY2WELwdwmhKZIh4X6Zcz+sygR227WN06vDZTw6efxHRbT+ARQn9HZfWR Xrfptbo+SHJFAOofp2QXx4c+OU8GfQs= Subject: [PATCH 2/6] VT-d: don't open-code dmar_readl() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian References: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Message-ID: Date: Thu, 1 Apr 2021 10:44:35 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" While at it also drop the unnecessary use of a local variable there. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -990,8 +990,7 @@ static void __do_iommu_page_fault(struct } clear_overflow: /* clear primary fault overflow */ - fault_status =3D readl(iommu->reg + DMAR_FSTS_REG); - if ( fault_status & DMA_FSTS_PFO ) + if ( dmar_readl(iommu->reg, DMAR_FSTS_REG) & DMA_FSTS_PFO ) { spin_lock_irqsave(&iommu->register_lock, flags); dmar_writel(iommu->reg, DMAR_FSTS_REG, DMA_FSTS_PFO); From nobody Thu Apr 25 13:06:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1617266712; cv=none; d=zohomail.com; s=zohoarc; b=j8KnIK2ipoMhbp+uWhfcWk9JYycTsZc2SVG5hzvcK4J89ZlzPB5yXyQxBdr0r1E117vk0cn/PAbaBMEMLwiXt4gTZo7AeA8TIm2xPZWivXKKDvnpMwShl+H6ej+QDEAxHz8dLzTgbDRFhOWiDc4/zOhxB382A1BS67MTzMtSnRo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617266712; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QXGl+Z7RFWWbp6so6Tz4DSduWEpNaC1fGMoL4+RAnfw=; b=QZbRLzn+b5M4ytetArN7wnBzWxQwlMuDWKCGlvdSMyhRRanKf6QTl4ynE8NDyrjA9FhQESyI+0vzEnRF1OLiTewtzwdsilt3YcnHyZrPMP99K1tyJ3GN12CcN87V2FO6yat59TnbMWeqxv3UyROaCfTlKYZKtcxMw8FYmUV9gdg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617266712963658.0534195710903; Thu, 1 Apr 2021 01:45:12 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.104179.198948 (Exim 4.92) (envelope-from ) id 1lRswk-0006QM-RW; Thu, 01 Apr 2021 08:44:58 +0000 Received: by outflank-mailman (output) from mailman id 104179.198948; Thu, 01 Apr 2021 08:44:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRswk-0006QE-OK; Thu, 01 Apr 2021 08:44:58 +0000 Received: by outflank-mailman (input) for mailman id 104179; Thu, 01 Apr 2021 08:44:57 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRswi-0006Pc-VZ for xen-devel@lists.xenproject.org; Thu, 01 Apr 2021 08:44:57 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 9ede36b3-4053-4dfe-8ccb-620126c57cad; Thu, 01 Apr 2021 08:44:56 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 777A5AE8D; Thu, 1 Apr 2021 08:44:55 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9ede36b3-4053-4dfe-8ccb-620126c57cad X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1617266695; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QXGl+Z7RFWWbp6so6Tz4DSduWEpNaC1fGMoL4+RAnfw=; b=YFqKBl8t+X/fp14wXCvuISzEcX96Oj9LnuDL2GWTfM3/HrsQUMIjDGkExvaym5vw4XqXoX 4ubzo1mMMNqI4gqSKFqmZNSyI4D5z7MTk/X3mBXtFZUfXTLc0YBDGnqWl2FjrixmG9td7/ oF04HydMdM6Y2Fme5BTCtNDRK/IaF2k= Subject: [PATCH 3/6] VT-d: bring print_qi_regs() in line with print_iommu_regs() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian References: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Message-ID: Date: Thu, 1 Apr 2021 10:44:55 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Shorten the names printed. There's also no need to go through a local variable. While at it also constify the function's parameter. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/qinval.c +++ b/xen/drivers/passthrough/vtd/qinval.c @@ -33,18 +33,11 @@ =20 static int __must_check invalidate_sync(struct vtd_iommu *iommu); =20 -static void print_qi_regs(struct vtd_iommu *iommu) +static void print_qi_regs(const struct vtd_iommu *iommu) { - u64 val; - - val =3D dmar_readq(iommu->reg, DMAR_IQA_REG); - printk("DMAR_IQA_REG =3D %"PRIx64"\n", val); - - val =3D dmar_readq(iommu->reg, DMAR_IQH_REG); - printk("DMAR_IQH_REG =3D %"PRIx64"\n", val); - - val =3D dmar_readq(iommu->reg, DMAR_IQT_REG); - printk("DMAR_IQT_REG =3D %"PRIx64"\n", val); + printk(" IQA =3D %"PRIx64"\n", dmar_readq(iommu->reg, DMAR_IQA_REG)); + printk(" IQH =3D %"PRIx64"\n", dmar_readq(iommu->reg, DMAR_IQH_REG)); + printk(" IQT =3D %"PRIx64"\n", dmar_readq(iommu->reg, DMAR_IQT_REG)); } =20 static unsigned int qinval_next_index(struct vtd_iommu *iommu) From nobody Thu Apr 25 13:06:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1617266731; cv=none; d=zohomail.com; s=zohoarc; b=Zn8cWBHOYjDR50MjKbry7LTatVwMEbipvJY3wVxLD0/KSj9NVrTUMfVn1cCGeAKHw6LwkHcTn3GT0nGhgBXOoqaoqr1Qs4MmecF6icCu+kuWZ35oc9DQQLIpTBfcC0zgc28IRJ2m/epcqeey84cEwMQrSXFaLM8NjDs4b5+SIYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617266731; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Oa+4GqEAwgAdkWZtpOQ4w42vy8M9iwn2JbhahcRbFHk=; b=Fy02ru1lnflCFE0mvIN2PXq2Uau9jT75YzKyfhY0jC7FkQzmphntmrbjJk+rZCr68/KinWUKB5vgZKyy5tiQAAQ0xUZU0nCIvJuxEMtJ+Qbjhb9dXt0rHSRaEMV8LjXBMcsf9lp5BLQxPCwDugz+LJF0kVDL8LmCEnFmOLTYk6A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1617266731470983.9556064716202; Thu, 1 Apr 2021 01:45:31 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.104184.198960 (Exim 4.92) (envelope-from ) id 1lRsx3-0006Y1-62; Thu, 01 Apr 2021 08:45:17 +0000 Received: by outflank-mailman (output) from mailman id 104184.198960; Thu, 01 Apr 2021 08:45:17 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRsx3-0006Xu-2S; Thu, 01 Apr 2021 08:45:17 +0000 Received: by outflank-mailman (input) for mailman id 104184; Thu, 01 Apr 2021 08:45:16 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRsx2-0006Xi-Cq for xen-devel@lists.xenproject.org; Thu, 01 Apr 2021 08:45:16 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id f0586108-a1c4-4fbc-976c-8edaee73635d; Thu, 01 Apr 2021 08:45:15 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id DE21BAF28; Thu, 1 Apr 2021 08:45:14 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: f0586108-a1c4-4fbc-976c-8edaee73635d X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1617266715; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oa+4GqEAwgAdkWZtpOQ4w42vy8M9iwn2JbhahcRbFHk=; b=p4bdMQfAUysFNQynw9wXfroabi+6rKY/aIIN+h8kgvJbfnyKUolIWMUHub1Stm3KeUKcQn zYBbTrL+x61AgBP/SOdhOY0NZhTcNBYA6CtEUfgt5F8LNTHgez5osoN0kGfcAWSN7CF+S6 ZLISuj2XfJnjNEY3S3KdqcpJVh0RKN8= Subject: [PATCH 4/6] VT-d: qinval indexes are only up to 19 bits wide From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian References: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Message-ID: Date: Thu, 1 Apr 2021 10:45:14 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" There's no need for 64-bit accesses to these registers (outside of initial setup and dumping). Also remove some stray blanks. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/qinval.c +++ b/xen/drivers/passthrough/vtd/qinval.c @@ -42,14 +42,13 @@ static void print_qi_regs(const struct v =20 static unsigned int qinval_next_index(struct vtd_iommu *iommu) { - u64 tail; + unsigned int tail =3D dmar_readl(iommu->reg, DMAR_IQT_REG); =20 - tail =3D dmar_readq(iommu->reg, DMAR_IQT_REG); tail >>=3D QINVAL_INDEX_SHIFT; =20 /* (tail+1 =3D=3D head) indicates a full queue, wait for HW */ - while ( ( tail + 1 ) % QINVAL_ENTRY_NR =3D=3D - ( dmar_readq(iommu->reg, DMAR_IQH_REG) >> QINVAL_INDEX_SHIFT )= ) + while ( (tail + 1) % QINVAL_ENTRY_NR =3D=3D + (dmar_readl(iommu->reg, DMAR_IQH_REG) >> QINVAL_INDEX_SHIFT) ) cpu_relax(); =20 return tail; @@ -57,12 +56,12 @@ static unsigned int qinval_next_index(st =20 static void qinval_update_qtail(struct vtd_iommu *iommu, unsigned int inde= x) { - u64 val; + unsigned int val; =20 /* Need hold register lock when update tail */ ASSERT( spin_is_locked(&iommu->register_lock) ); val =3D (index + 1) % QINVAL_ENTRY_NR; - dmar_writeq(iommu->reg, DMAR_IQT_REG, (val << QINVAL_INDEX_SHIFT)); + dmar_writel(iommu->reg, DMAR_IQT_REG, val << QINVAL_INDEX_SHIFT); } =20 static int __must_check queue_invalidate_context_sync(struct vtd_iommu *io= mmu, From nobody Thu Apr 25 13:06:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1617266753; cv=none; d=zohomail.com; s=zohoarc; b=ewe+z1n/13EsHXMmOmOpyzKP23SDAvhF6oMIEDQH22vz8ft5XnEC7/As5ahgn1wFjnz0XWhwAaiKNMxvBqEw3jVlRZhfHoRB57Ed7ii/n2+iGDgJgH4fmGCBpE0O0aEWoBngyraNqWibGIkZJuxu14I93eHXugmOHmib7w5qqlA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617266753; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U0UO+wcl/jJCDP3esQE6oeXB/el7db31934Dib0PPcY=; b=OMDk/4QgOiywYXAV4wEWYD1KkFnOVLbRj8hTtjd5ayNWV4Jzyjkpg+zWdtRemh4vyRweBfgZ8nsrevMa+TXL2r7VB6rXGIdia/efz2VYJ8oFvTPOFaoq1CtZa3jtnA4RYgpxqMhVfbj/XhnhUsDWrTQDdomVRxwchGT7z5F6jlU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 161726675387298.02472749627066; Thu, 1 Apr 2021 01:45:53 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.104188.198972 (Exim 4.92) (envelope-from ) id 1lRsxQ-0006fh-Ga; Thu, 01 Apr 2021 08:45:40 +0000 Received: by outflank-mailman (output) from mailman id 104188.198972; Thu, 01 Apr 2021 08:45:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRsxQ-0006fa-Cy; Thu, 01 Apr 2021 08:45:40 +0000 Received: by outflank-mailman (input) for mailman id 104188; Thu, 01 Apr 2021 08:45:39 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRsxP-0006ea-Os for xen-devel@lists.xenproject.org; Thu, 01 Apr 2021 08:45:39 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c655badc-64b4-4a19-a25d-c955f41f23d5; Thu, 01 Apr 2021 08:45:35 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C5355AEFB; Thu, 1 Apr 2021 08:45:34 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c655badc-64b4-4a19-a25d-c955f41f23d5 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1617266734; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U0UO+wcl/jJCDP3esQE6oeXB/el7db31934Dib0PPcY=; b=ssFYZXkOpDDuCBuV8ar2q5Oy2a+BYqVUl/Y8nlVS6h0oQX3+2zYyEY439LwNm3qooOBYm0 c/WZh7B6lp9mTmcPNRLO0l37Ih8O/u7vclO6KIOiE/NDIUzqtzukR5o6OjMVvdtTnLPrQ1 ZmUB5IdTwQKyUQvVzuFczKqXD1oHwFs= Subject: [PATCH 5/6] VT-d: avoid pointless use of 64-bit constants From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian References: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Message-ID: Date: Thu, 1 Apr 2021 10:45:34 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" When the respective registers are just 32 bits wide there's no point in making corresponding constants 64-bit ones. Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -121,30 +121,30 @@ #define DMA_TLB_IVA_HINT(x) ((((u64)x) & 1) << 6) =20 /* GCMD_REG */ -#define DMA_GCMD_TE (((u64)1) << 31) -#define DMA_GCMD_SRTP (((u64)1) << 30) -#define DMA_GCMD_SFL (((u64)1) << 29) -#define DMA_GCMD_EAFL (((u64)1) << 28) -#define DMA_GCMD_WBF (((u64)1) << 27) -#define DMA_GCMD_QIE (((u64)1) << 26) -#define DMA_GCMD_IRE (((u64)1) << 25) -#define DMA_GCMD_SIRTP (((u64)1) << 24) -#define DMA_GCMD_CFI (((u64)1) << 23) +#define DMA_GCMD_TE (1u << 31) +#define DMA_GCMD_SRTP (1u << 30) +#define DMA_GCMD_SFL (1u << 29) +#define DMA_GCMD_EAFL (1u << 28) +#define DMA_GCMD_WBF (1u << 27) +#define DMA_GCMD_QIE (1u << 26) +#define DMA_GCMD_IRE (1u << 25) +#define DMA_GCMD_SIRTP (1u << 24) +#define DMA_GCMD_CFI (1u << 23) =20 /* GSTS_REG */ -#define DMA_GSTS_TES (((u64)1) << 31) -#define DMA_GSTS_RTPS (((u64)1) << 30) -#define DMA_GSTS_FLS (((u64)1) << 29) -#define DMA_GSTS_AFLS (((u64)1) << 28) -#define DMA_GSTS_WBFS (((u64)1) << 27) -#define DMA_GSTS_QIES (((u64)1) <<26) -#define DMA_GSTS_IRES (((u64)1) <<25) -#define DMA_GSTS_SIRTPS (((u64)1) << 24) -#define DMA_GSTS_CFIS (((u64)1) <<23) +#define DMA_GSTS_TES (1u << 31) +#define DMA_GSTS_RTPS (1u << 30) +#define DMA_GSTS_FLS (1u << 29) +#define DMA_GSTS_AFLS (1u << 28) +#define DMA_GSTS_WBFS (1u << 27) +#define DMA_GSTS_QIES (1u << 26) +#define DMA_GSTS_IRES (1u << 25) +#define DMA_GSTS_SIRTPS (1u << 24) +#define DMA_GSTS_CFIS (1u << 23) =20 /* PMEN_REG */ -#define DMA_PMEN_EPM (((u32)1) << 31) -#define DMA_PMEN_PRS (((u32)1) << 0) +#define DMA_PMEN_EPM (1u << 31) +#define DMA_PMEN_PRS (1u << 0) =20 /* CCMD_REG */ #define DMA_CCMD_INVL_GRANU_OFFSET 61 @@ -164,21 +164,23 @@ #define DMA_CCMD_CAIG_MASK(x) (((u64)x) & ((u64) 0x3 << 59)) =20 /* FECTL_REG */ -#define DMA_FECTL_IM (((u64)1) << 31) +#define DMA_FECTL_IM (1u << 31) =20 /* FSTS_REG */ -#define DMA_FSTS_PFO ((u64)1 << 0) -#define DMA_FSTS_PPF ((u64)1 << 1) -#define DMA_FSTS_AFO ((u64)1 << 2) -#define DMA_FSTS_APF ((u64)1 << 3) -#define DMA_FSTS_IQE ((u64)1 << 4) -#define DMA_FSTS_ICE ((u64)1 << 5) -#define DMA_FSTS_ITE ((u64)1 << 6) -#define DMA_FSTS_FAULTS DMA_FSTS_PFO | DMA_FSTS_PPF | DMA_FSTS_AFO | DM= A_FSTS_APF | DMA_FSTS_IQE | DMA_FSTS_ICE | DMA_FSTS_ITE +#define DMA_FSTS_PFO (1u << 0) +#define DMA_FSTS_PPF (1u << 1) +#define DMA_FSTS_AFO (1u << 2) +#define DMA_FSTS_APF (1u << 3) +#define DMA_FSTS_IQE (1u << 4) +#define DMA_FSTS_ICE (1u << 5) +#define DMA_FSTS_ITE (1u << 6) +#define DMA_FSTS_FAULTS (DMA_FSTS_PFO | DMA_FSTS_PPF | DMA_FSTS_AFO | \ + DMA_FSTS_APF | DMA_FSTS_IQE | DMA_FSTS_ICE | \ + DMA_FSTS_ITE) #define dma_fsts_fault_record_index(s) (((s) >> 8) & 0xff) =20 /* FRCD_REG, 32 bits access */ -#define DMA_FRCD_F (((u64)1) << 31) +#define DMA_FRCD_F (1u << 31) #define dma_frcd_type(d) ((d >> 30) & 1) #define dma_frcd_fault_reason(c) (c & 0xff) #define dma_frcd_source_id(c) (c & 0xffff) From nobody Thu Apr 25 13:06:03 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1617266770; cv=none; d=zohomail.com; s=zohoarc; b=XKPZOpAU9DYVbfvPGBBATH8qtnUDtqOa+Y1jxxhP4PduLIuswZ2scK1EPxbAbDSGa3F+kTXNjznL6fgAgXEFTcGGxq1949gBSGdbyZbscW/29yg0JIZqwV+BvNhCvsJ6G8M0HkYlEOifu0OyUz8iCJWCFVl8hqU1RqYUPRKPraU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617266770; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=sz7pYz3SSChzPfaCLOKsspYeFrYrOKDDv1mzKeQ9WSc=; b=c2ZYsrINa52TkqwY22lqiIF8D2CRyVogEoRMfMuEK5KCAUuoVSdLFtoAihTGQORCWCmDUv7ZdFAHsAzK1XWS/fAY/hPPmybWFwbyKnGTQ7YXtjpTibbKn+IEyi2FXMv8QEUomGSsF5f2wM2BMmaeiIT+ZnrzPX9JDXb6zl7VjDA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 161726677061747.92339004012263; Thu, 1 Apr 2021 01:46:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.104190.198984 (Exim 4.92) (envelope-from ) id 1lRsxg-0006lq-PK; Thu, 01 Apr 2021 08:45:56 +0000 Received: by outflank-mailman (output) from mailman id 104190.198984; Thu, 01 Apr 2021 08:45:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRsxg-0006lh-LU; Thu, 01 Apr 2021 08:45:56 +0000 Received: by outflank-mailman (input) for mailman id 104190; Thu, 01 Apr 2021 08:45:55 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lRsxf-0006lL-IS for xen-devel@lists.xenproject.org; Thu, 01 Apr 2021 08:45:55 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 4b40a4a9-cb32-4a9a-8f79-f2e4d4d12201; Thu, 01 Apr 2021 08:45:55 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 3AB96B06A; Thu, 1 Apr 2021 08:45:54 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 4b40a4a9-cb32-4a9a-8f79-f2e4d4d12201 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1617266754; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sz7pYz3SSChzPfaCLOKsspYeFrYrOKDDv1mzKeQ9WSc=; b=C5WivcIWPbxFb6n70fdiFuFmF4fq79Pu1zMvQzJiACePVHeSlekCBdlwsPuqPU1cSV2Xsl aR5QJ1ZXPtr7eXm/7eRGmZXZeT0PMQLhouqcMw5zxFu2JADtp5XulLevIiYMy5KbO/+Nek ucvVtRFVaVzMChaOiI2ODEpPqTA22A0= Subject: [PATCH 6/6] VT-d: drop unused #define-s From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Kevin Tian References: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Message-ID: <38aab031-d9a3-dfa2-9958-ec625a0ce042@suse.com> Date: Thu, 1 Apr 2021 10:45:53 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <157e4a65-6d0b-7ea8-1c23-cd393c8c0d7f@suse.com> Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Jan Beulich --- a/xen/drivers/passthrough/vtd/iommu.h +++ b/xen/drivers/passthrough/vtd/iommu.h @@ -471,26 +471,12 @@ struct qinval_entry { /* Queue invalidation head/tail shift */ #define QINVAL_INDEX_SHIFT 4 =20 -#define qinval_present(v) ((v).lo & 1) -#define qinval_fault_disable(v) (((v).lo >> 1) & 1) - -#define qinval_set_present(v) do {(v).lo |=3D 1;} while(0) -#define qinval_clear_present(v) do {(v).lo &=3D ~1;} while(0) - -#define RESERVED_VAL 0 - #define TYPE_INVAL_CONTEXT 0x1 #define TYPE_INVAL_IOTLB 0x2 #define TYPE_INVAL_DEVICE_IOTLB 0x3 #define TYPE_INVAL_IEC 0x4 #define TYPE_INVAL_WAIT 0x5 =20 -#define NOTIFY_TYPE_POLL 1 -#define NOTIFY_TYPE_INTR 1 -#define INTERRUTP_FLAG 1 -#define STATUS_WRITE 1 -#define FENCE_FLAG 1 - #define IEC_GLOBAL_INVL 0 #define IEC_INDEX_INVL 1 #define IRTA_EIME (((u64)1) << 11)