From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0040.outbound.protection.outlook.com [104.47.40.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A211F21D2E62C for ; Wed, 23 Aug 2017 05:20:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=YY+vASHcZkg+9gChPWo6DhYdrGP7E30ALMAIDu7jtDo=; b=wEvOi3BT0A9PjDEKn3ymXZayR/fZjrHGSEzIZRyeIN+k7taz8qCeHcoCidmsVsREiANWpLOpL864wgDUVIXHUrJhPK5mJpG4mWnu44NOAANzXsjoES8fiIlbvNTVFzdP+RDr9BCNuYwfhQjGVLgTG1vYMAJtVDbgcvgF5P5SNsQ= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from brijesh-build-machine.amd.com (165.204.77.1) by DM2PR12MB0155.namprd12.prod.outlook.com (2a01:111:e400:50ce::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1362.18; Wed, 23 Aug 2017 12:23:07 +0000 From: Brijesh Singh To: edk2-devel@lists.01.org Cc: Brijesh Singh , Ard Biesheuvel , Jordan Justen , Tom Lendacky , Laszlo Ersek Date: Wed, 23 Aug 2017 08:22:44 -0400 Message-Id: <1503490967-5559-21-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503490967-5559-1-git-send-email-brijesh.singh@amd.com> References: <1503490967-5559-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM5PR12CA0069.namprd12.prod.outlook.com (2603:10b6:3:103::31) To DM2PR12MB0155.namprd12.prod.outlook.com (2a01:111:e400:50ce::18) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cfdf56e5-718e-414a-a66a-08d4ea21b5f1 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:DM2PR12MB0155; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0155; 3:idZSlaXF6wZYjKwA+aB3tZW9mkd2MsaFe1PxXUQRTRw0YPdzy8hHC6paBeRT9S+yGOeirISyoF6o3e6J0HC5d2spQChShT0uVD9qLNjS2u/oopxy75isZukz6NL/1ovZupL/8hEViLyW580Egq6J+RPSUkBw6zlVaSrXN+b/h+sM2eFNk5me6z3WcD8h8NwXSNjkQMEavHGenr82nwYr/KK//dO5XkjM3FWKtlRFBOkiU6vqCgt7ALTXM2vwJWaE; 25:qSwlPpOIEPmSWqGVDOngtqKN1wOCn16SbmFXC2ZwcNxRSxBC2UuT8af1eV73Nw7HWaSiZkxvi3dTU2bO50/0gpbSDwy5h4XLkCcd535CTNv/Y18l3yP2HjOIrG3X7SBDL4huSpMjNwsel6GqHvDBfQ/H7A85VN+cLO3heOaVtI963VvBIHP84cAbmY4mYn5Y6Y8DHFkMvrRCwmW+6lubUiLvlbybZ67mItLZKQMuaAjRZdviMc2M627F4HJkIQyGcqfHo6zTh+HIuG6u7RQ+061OMnzx7rLfvBmu6HK7514kbBSp63CjDS7am/gL3kVxk+GwWw2/ncxfIGxWaRlGRw==; 31:RsF7e3aSvw8wE2Ur5F+Tu/ikXUFN5uR502lorMr9IoEgRbpbRdw0gzJ+9/yxe4S4weos/PNDNKonPNF/0XXGiPn5C+COjngnFUF9lsG5PdEiblsC2QJjRMBGihXBzvHQSkVUg3kWMIpOqwJBtHioGSlZbwUTszYX1q3Sm7zqJftncVrA5POc28Xs1KqfOdiIu9ObKyXpEwBGLQxPECuYNMwIeL26x/p0zhOjziuf5dg= X-MS-TrafficTypeDiagnostic: DM2PR12MB0155: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0155; 20:KHduew1PfgmKt5SkAlU724MWc/uwnf7WttPTiu/Y6fbe47md4sq9yvW9wxuFvNuhpn8Q1jDs0knWzyRUNVNFGeXemCq3jCZGmu0M7V26pQqmhmup+oYF2s15/W0Avjwjs2V4UYp7e7LYQ1BBFE3nFK5SPxOJd9Ly1X6HiMrb7USqyscg4qqxAmtZuIHaDLNiiVdbxDSP9ZNm9SBObTAA1Rqw0Qlpp+HRAOOTHmlsMaNZkptSfm4p67q3lA+6EvNMnil93egeMMjBc7UfCdQ4WqEdxJgu954wUqx04I3cMk2MWjUov3APn2WC/uhTPYHCKVoJsHMYBm3bFgRpIigl1RNZ8nQAnc+C4S6bZuYJk6AjlZ1PwYS2GHu9ohUPN7LpLJHcwLurKDrXjZy4oaRHGftKulWFKHWESmOZcmCo7h7hXI3stGEdARag/6h3XojV6+jkJkJKl7rt2Qak8me8tCKeUc2vp8AEISGSq2jXYcbC5X0K8Frkrt6NkjeYN0K+; 4:QptHR8JyetpVWwC6LD2Gt19j+T9Sl3g6M6M9dMZSC/mQ1dHbmfpyg3AUvGt21frvX7U9mK8pKnd/8KRMUj4dwZgk827UcveX8Hq8rVJ+wb48YuNqD1QfRp4r8mVdc5KybiqmrvN/y2sHatfe/5GpA56yeGLJQQvqnfYP/I7LN7Z9yKD5x4yrkS4Ao7IYkb3/W7SueLQt2qbqh7hnKeaXjELnyvCqmL36gwdPmDxT9RTxQAf6cpWQ7A5sxu0RAg2uqtdsjXcAUPixr/M1HNYNCVkcfmShZ+2XYxuzL8hoehxZUAHB4Nbo0YjVd/8RfRZeZcCYdjXZY0+Du0WjopSc6g== X-Exchange-Antispam-Report-Test: UriScan:(767451399110)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(100000703101)(100105400095)(3002001)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123560025)(20161123564025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM2PR12MB0155; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM2PR12MB0155; X-Forefront-PRVS: 040866B734 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(39860400002)(189002)(199003)(305945005)(47776003)(97736004)(101416001)(110136004)(6666003)(189998001)(478600001)(7736002)(3846002)(66066001)(5003940100001)(6116002)(6486002)(48376002)(86362001)(105586002)(2950100002)(4326008)(106356001)(36756003)(6916009)(50466002)(2906002)(50226002)(42186005)(2351001)(33646002)(53416004)(25786009)(7350300001)(81156014)(76176999)(5660300001)(68736007)(54906002)(8676002)(53936002)(50986999)(81166006)(2361001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0155; H:brijesh-build-machine.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR12MB0155; 23:4gtdHgNC3YJLyCiNp63Eo6Gz41j+tEx4ELUgustwG?= =?us-ascii?Q?ZtVdZfcgUYyR40H7Wk0DG9SPa1u6ijq2qud+1DPG00POGlonHCYiCbskyTyW?= =?us-ascii?Q?BrL9CT131DcYRgHNdAd+9Up5UiurW9sWHWCDE9V27mpLqaXjrO2RUPHlqmgV?= =?us-ascii?Q?ofa1dsrDL+cOjF4Ax9pyqtKA7AVZ6CLSodD1QrE2H6qfpYMGwAb/Jeyt6Xbg?= =?us-ascii?Q?kvxjyXk4FWLdB9wB/GfUwXk4yNn8yzugXS5+YSrAAK/8zuBynYay/c2siYbb?= =?us-ascii?Q?2Q6JZ+4GPL6DzfrNK4ExiVHl5oxqE8M8UKfi64f5coF71NhYdx/2LDEXgLT3?= =?us-ascii?Q?7VZw7d62cqmUOlpsdrx65ydZFcAXNrZ+lYXG/2Nhuv68xpTIOmczZPM79JoR?= =?us-ascii?Q?OJmDmRkp48GCs5VSoDUvccsXIO/5IidFGT9sqhUMxzjABBSwx+x1wbb2gTx2?= =?us-ascii?Q?Vn31NfF8N1thWa7e8y6qqJTXawC/ITzl/dtICt1I5WNsA0v+ebBL/dJEk6Ek?= =?us-ascii?Q?9gvFkKfwZ84V6rD5CcEy5PHOdElVybqrpYVnYSpdkwIbeoErrRLJMclrUrwy?= =?us-ascii?Q?eHdmpQxw36/TpMkNl1pjVIqIJ4UMcxKdk24ePb4XCoapUoollPlAxy7ZUidV?= =?us-ascii?Q?Br7ZPM9y4neweYOquGxU200us0Mlb0BXN7wrPVxYbvDeqriVJmOq/N96g0l0?= =?us-ascii?Q?blAfPvWG72exH299HIBkpz3hDsA8zGBkqXV98uQjCLkA8siRphDMpy9BeZxB?= =?us-ascii?Q?nDt4LwJbYJPStlaEY4g2viEnofnIEpEvdAKQXteVafUsoCQ+yp7cUfbJJBYp?= =?us-ascii?Q?fN/u5cJuyNzo77/dYFGuJPa2HlzdlRYQwhBdF7PohAgfSfmAk8LrpnVsE98b?= =?us-ascii?Q?Bg0jHQLcaUdcWwLH/Sa2ewZ47led8AIVTyjcDPaYLLmwPdB4pgUz0LLSOHMu?= =?us-ascii?Q?xORFsIkXuvit0ed4yVIdn6QmMGCOy/ygAYBQYbXMtPt9h1W9HqPR4mt3EhW3?= =?us-ascii?Q?bWVqIJSbxLa2xl9CVeb4EWI8U4AvWbFuuzHQTrnMposY0P52TfPA5DwJCONK?= =?us-ascii?Q?grqNuOGU9rmyc0skyTQmQFQpYpI6WypbHPzHjTvjxf9Hw/g54CmUzrlFA2Cq?= =?us-ascii?Q?gHT/insl/TuzarO+CKeCGzB5FHHvh1K?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0155; 6:ns0IQa3nwnRjOMmhCDvHOnUKo69+ziSO2F0DcnFuerKaI6yZtYwKsCMeXFPuRqgVIliziK8imdu7dtcVhMoPjUaFsbTQyWeNNg9Za0HxpIHrq6K3snAstF2UJkq5X4M7r/32Po8ORXoftUC2+MqDLzHzVSCCq6datzxj7P3LufBxBR+yaZXmRyPrj30e4UxSccVb8tScTFHLpIX6X4uKOd4qXBCttdEDKt1yZkmYjIeTRs68P8d+SML10ptQ4vdolXbRWKdTe2gb2cSPe6ni6hGj5aFiYPpxpAqfTwlDWMspyvMtyT0fvXsvhWLKXcE9n2hLjPZLahC+m+KCatfBCw==; 5:zOKBiN7Ei2L7ttTWCAN6mL520DOfEGqC50AiHI9/hGKfQ1/QghbOSxurDkppRDxpf5q/JTCOUC88JBey+URzIjvMzntLHlINKVvuonX+Qix42Ixcf/O0W3/cWoMLKgm76pQvs+TV3Tzv67qNv5aEhA==; 24:Ydxp5O2PMIRtx/b0MK3QlC0/7dOoOSMzpoU5wqxfrd5Tm52nCOSXmBs8Cs6XtDRp0Cx/xKfnHOeD99P+6L13mqIY3lOk1XVAhAKff+ChU+4=; 7:PJg7BvK97nhqPwKpihRnUu4lH55WiROSnVe8Yu6fsp7+uU5rxv4aHSUM2zHQ8qssQZH319LKf3SEtYvuzRhv+DD65NRCe2B+CWzuhjzj9cf1PvvRZmGTG7aM9h7N4VKUk/jyx9QWnIuKB1U+SXgZqPJjxkwP2fFQRl5P7Xz+IO+HV/jJIUxO4W+TB7YbqUs4yqQOsG5yGSMNk83CMR2v8vo2vQTuXY9iPRrGAobm1Xk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0155; 20:XVA987FOHWyzHP1eq4dOUWsHSq3WdSDjH234qpSRw2kuZnCEbGLN5KAyeLqITH1RPGmF3/oG+CTHxqS1g0VER8ZKFZiCUMn/j967Y3sT5VDbloI8RucAapDUBzqIZNy7Vk2r7D2oVsHBu52MviaO5cGwZAN/cyzDMBNbVD+rdj1QUpoGEGw1ul4/ejfAYqThD6VMxmpsuFJAXjIo42Zk3qtxU4nMl6N9uCVMZR1fJiVYb6pj0ZpbYcLNSMudG5Qd X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Aug 2017 12:23:07.1697 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0155 Subject: [PATCH v3 20/23] OvmfPkg/VirtioRngDxe: negotiate VIRITO_F_IOMMU_PLATFORM X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2017 12:20:36 -0000 Content-Type: text/plain In previous patches, we have implemented IOMMU-like member functions in VIRTIO_DEVICE_PROTOCOL to translate the physical address to bus address and virtio drivers are updated to use those member functions. We do not need to do anything special when VIRTIO_F_IOMMU_PLATFORM bit is present hence treat it in parallel with VIRTIO_F_VERSION_1. Cc: Ard Biesheuvel Cc: Jordan Justen Cc: Tom Lendacky Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Brijesh Singh --- OvmfPkg/VirtioRngDxe/VirtioRng.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/VirtioRngDxe/VirtioRng.c b/OvmfPkg/VirtioRngDxe/VirtioRng.c index 59f32d343179..32512d882f7d 100644 --- a/OvmfPkg/VirtioRngDxe/VirtioRng.c +++ b/OvmfPkg/VirtioRngDxe/VirtioRng.c @@ -278,7 +278,7 @@ VirtioRngInit ( goto Failed; } - Features &= VIRTIO_F_VERSION_1; + Features &= VIRTIO_F_VERSION_1 | VIRTIO_F_IOMMU_PLATFORM; // // In virtio-1.0, feature negotiation is expected to complete before queue @@ -359,7 +359,7 @@ VirtioRngInit ( // step 5 -- Report understood features and guest-tuneables. // if (Dev->VirtIo->Revision < VIRTIO_SPEC_REVISION (1, 0, 0)) { - Features &= ~(UINT64)VIRTIO_F_VERSION_1; + Features &= ~(UINT64)VIRTIO_F_VERSION_1 | VIRTIO_F_IOMMU_PLATFORM; Status = Dev->VirtIo->SetGuestFeatures (Dev->VirtIo, Features); if (EFI_ERROR (Status)) { goto UnmapQueue; -- 2.7.4