From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0079.outbound.protection.outlook.com [104.47.37.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3D67E21EB529A for ; Thu, 31 Aug 2017 07:58:50 -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=Ca+7RmUpSEsluXJB6g9EgxLR6kHdyI9Bw9K8sAtzFZg=; b=TxDHQJvdKW9kxhU+SviYF0cM15Q0ZdIghmGqHdllLCKBQFvBgytc4I4heWhmRPIQd1ePRO2rX22Ia359BNIjxHO2zIheKo2s9i1z9NLIBpH2PFKzCIelx7oEXwipq45lqmoLNyni/vQWuM12nq9tSuGqfTAiYKzHsYCOG+XJ4ws= 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 SN1PR12MB0158.namprd12.prod.outlook.com (10.162.3.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Thu, 31 Aug 2017 15:01:31 +0000 From: Brijesh Singh To: edk2-devel@lists.01.org Cc: Brijesh Singh , Ard Biesheuvel , Jordan Justen , Tom Lendacky , Laszlo Ersek Date: Thu, 31 Aug 2017 11:01:14 -0400 Message-Id: <1504191674-3949-5-git-send-email-brijesh.singh@amd.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504191674-3949-1-git-send-email-brijesh.singh@amd.com> References: <1504191674-3949-1-git-send-email-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: MWHPR08CA0056.namprd08.prod.outlook.com (10.173.236.30) To SN1PR12MB0158.namprd12.prod.outlook.com (10.162.3.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 679ed136-5761-4a6d-80eb-08d4f0812aa9 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:SN1PR12MB0158; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 3:tDS2Em7W7uNCLx+1L4+XvDBACXGrq1LxwnMaqNrKzJlh0dTTx6Qxj8j2KFtomeMcsuuwSYbepWTm9fMQIVc38kCVJM+yYhwGQ1prTWL1vupKw6ql7YyBlwwaTZza5WVUFXhPCQU2JqO+1FUaJC1dY6MBSGrXn1bXwHASzaAwSz+wcA2r/qrB6tZgrylUKmITCGB0Y/MWv/WOfX69pyZdcaxePbyJktvGSzUE4vtHMv4nEz08pE8GFLk+JpVAdFlh; 25:IwuYrxPyn4gTJU6x4TWWsXTAoBdW7bLpUdINA4Ys9XUCek9qHYSfmNAjmEbXfng6Y4Fz+mwD+kNWLPvvAW/5z2xe+bccpjMCb76Odb8pBQfMtbfhWbexYmKMaGAxrvMImBwxhvzdZLrouAUdGMCxgFzPJOztkDiEIS6FpnG53oz669w8wuPFWBjw8SO1KTBEIDYksrBX59jjEt+Z6yUWaQeyMT4LHd+fzFhD+toH895VOeJS2MJzP9FfAaVeLApsx5PBeuDxG7xB2S81YFXfltgjVGLkoiG7PItKk1B3nlfaMruLrqc3mimsFXTF4knwcXHodjKApUsTl6RRAcBdAw==; 31:x7F6Q2omU64tkijfOTanPwbgj8eXB/j7j70tYRzkJaYpF6Ya1NJuSH2Mf6Z49QGKs7GfeEVN05/DAmmuzNI+vX78Qt43e2R4Z8jlx92+3nNHQUynO8XJD7zjnW+VdIH6yk+WZS7Nc1ZdbAsKqnnpFp7Yhpmr9Puv3rVFnRo0UaFoBA6HhX0oZ+lwDxVyYUt9wpd1QPmwOoXLfoDJf+1zspehibx1H6DYX5/yXtAntlQ= X-MS-TrafficTypeDiagnostic: SN1PR12MB0158: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:YHoAHZPay/bdetpsyPAbcro/jgthWuHBUmoujTbyLQLBaTesTqx0bZU/HacMvo3Ygzomw/cpvULMHWx/uOBvhzFKzegTPX6qaQcmnbktuUQHZdsOwcyuAJbDbUvc1LML1xi6l/aQVYLfumHXhBeAQiqVKIODXsa0YScPz3Jvk7xPwMWvW3tJIb0YyToxIgCbWS5EMZijFCD6t5uQlX3DJ0faFj8WJGdEHlkf1e4ZDz2nQuSWmI/ULY0Ocg9hO4oD0zdnoE/JBjU7SJzFqP/ff7pEFxNYghNFvF535r2tvtEagOi0KOfhXc7lEgYlEW78A6NNVqD6btL1LMp4w6eNn2jRU1sIC9ZLlacHW6pNX5zPz4A8pnj0+3eIvqs/DcK6p6WV3zf8V330IFJVl6dxNe9SmidQQbevJ2NHRN1AgEfNd7ieHb1aQi0H+k81IsOM5t0PnmOZ0LAQuRmfI0PW+3ivND0mHMVbPgtO/MaVDzPtHC7R/DagVHXLAJP6PeNw; 4:Eaq7Fjp/OidlITkt6lvTldSmaUxrjv1/O0myrKWhUaSJ8zxguJHq53+xQMSSJz3aB8vKAFAdSCsvibO/UFHMKDSGTcf/9gSNLNLFHKUNmuyeqdyIQKo+ax1IGSb3A3GFjgZ/2X9le+CvkO+VoKEiD7ANeaCp35KMYvvfbN6U8z1ZtspRkBHlQA27n5QavmiGVREAsJQ51aeHzEtH3XeT5iRAXef8VLm8TinzZadrKppUHMiuu+O5vkRukA0DQJzwSEgnnlF/w4N7kx4DV7Idk5CfviGjtKkMYmIqqDyUGhk8P75fCJzijPb03OSSVP6dhVcBUW+TESq6e+6ogj1bHg== 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)(100000703101)(100105400095)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:SN1PR12MB0158; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:SN1PR12MB0158; X-Forefront-PRVS: 04163EF38A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(39860400002)(199003)(189002)(81156014)(8676002)(478600001)(81166006)(5003940100001)(50226002)(76176999)(8936002)(4326008)(50986999)(2361001)(110136004)(2906002)(2351001)(189998001)(66066001)(106356001)(105586002)(7736002)(42186005)(53416004)(54906002)(47776003)(25786009)(97736004)(53936002)(33646002)(101416001)(305945005)(6486002)(6916009)(2950100002)(48376002)(3846002)(6116002)(36756003)(6666003)(5660300001)(86362001)(50466002)(68736007)(344415003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0158; H:brijesh-build-machine.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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; SN1PR12MB0158; 23:PFendrRAKWpfw931T2FOPxZYStXfsNzJBF2M9QVvM?= =?us-ascii?Q?/wnHqrtOxvoh4OFf2wTIk3gHTJ6i/yG7wwkV80QpoQCSHU3duEo6Neu+MmuS?= =?us-ascii?Q?p+KxHWHLsyzRGQotl82RUONgkQxAuDGgFJHuhztr2yedSf/GABhE1Sk1p8tn?= =?us-ascii?Q?Bqh1B5Hclz6NN42DDg5VZqG1bxX5mn+wIwxYwKFXJrgKjXiV/xmW5dLDugbx?= =?us-ascii?Q?yqVTuIXM9bjFCbyAkxMe8KmTgXidxEuK3XQVR3GFOuvXQ9WpMtuIDEf+Q5C6?= =?us-ascii?Q?OxYIw0Er6RjSfoJe+4b+JT6XuI/raw3GncC6onKjyqEP/h14Aylj+zktLO9G?= =?us-ascii?Q?UkdCuIKx7EwIVHtWkdR1YzNqR05ofgihKvDS9Lcy/i2p2E1Yun6kaQnOEQjX?= =?us-ascii?Q?gQBGOEto5OtgIR8ml6lp0Roex0KawqAwnmEMivLhTcA1Q/QC0W1SXC2yOGO2?= =?us-ascii?Q?Yv3JCLdZxJFRIX9a0l4hYwdxBFyCW0BGDw9WUFx7WvPXohas9lGVKhb040tv?= =?us-ascii?Q?tlJufAjvoTG7ExFczNkZ//g5bcF8ZauzAitUVl0wzSSFq1qFIoxC+sJMK+St?= =?us-ascii?Q?z7v4YvuUC0hwOtjsyhaOb56q7veeWz5VPjOdGuZpCuAu+aCzn7+tsVAPiQ+y?= =?us-ascii?Q?BY3a8o1FhfyvXfdfeDJ8byDXqdUGLTDuq4fIwb+x8963ONKd2V5SeMTP11vZ?= =?us-ascii?Q?KPU1QS9LQLg6QATbdbDnDBw0XbrUD52q9bGAKXUR3q8oTpWdTM8uxqUdKLci?= =?us-ascii?Q?yMunLNZwvO1CVOP70ddpOF38yqt3Ol5AtMrIrZrXtP2jT6rw8i9zTR9kBHt9?= =?us-ascii?Q?uKMpxRI+w7VnXEl59tD0Yiz+6MMDc9jABMwJbGox5eoUN2wffoAmDDCKrRno?= =?us-ascii?Q?meeR1r0hdtyWBZ+dS53YAnnsOgFS1T4HHTCnDC5GPub2hsAHZ0w/O7I7SiAj?= =?us-ascii?Q?hs27DN9isiTwC0G7VdWl50uFANN/vOq0qr+4vMdS2eGxZxkF8Y2hwIo4QkG9?= =?us-ascii?Q?L29DcrR+mYGRoJSijMnGoksHyhvGvDo6Djlh5Mr13vZ+7lABvGnf/AjzlN+Y?= =?us-ascii?Q?epUYHQT3zQrXLzgi9zKrnVoDp8SwZreo1VgeaYnhgY7MHlUiJWTQuLZZtgkL?= =?us-ascii?Q?bu3dpt3+OI=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 6:Z8Su+Cp4FLfeUoS0qHqf0ScQyTF1fv/NXk9HDZAkuZKo6xePJhKVHJykqk6IYaU6qjP/xIZeKf6tijBCWtIUEgbUIfT28X4B8Pi51azRx+bdJFu7kw7OC7Co2d1Hf5PkYIM+grKPbo8xosqdgIAqhbCJ7xtgpbwEGVgVDYKcbuao3ec503RObWW37XdyzMYRVDAJi93Ki/lvpRuzsHg6edZsMUKbKPVHr1UIso/N4PO9P3G98uScGEcQCiyJyS38r4zlTmO4K44xnUemwRGAM5g9pRIKSKF6eNWUjX7Npx9PUdjihfFz2PSdp3Pc9V4d9dC11f678Bi/0F+nK5t2Tw==; 5:OaFIC5vyD9VhnPN+gPbOhQpmrdE+Z2Ua3UbplhC2uE1MR/oU7NTlyADvMWyL9mBJjMhnoJqPBhQiaa6xSlh6SIbufz8wEYyVmfC0UOzACUsY28VjP9XurFFxRcw/YEjPPW7gD9tCfz8AG0Yk60gG3w==; 24:EzetIcsWOaQj1+3OaWfxgaf0jhTgPW9qnwT7SdhpBBIV2W21psOhDs73WLWozMpvPELZFIPZkA0QYotVSmlbJKGuwOghRQK5kn6Oo+02Y20=; 7:B6707mySslCnT50oRXF5OUmQzSYxvA5GVChzQzg0yvn9zeeISf5p4cDoqOnBeiNlArLqbF9hwiI30kK7t/m6Gr7bOljPs+3WcC+6w+IFuMN9MMZQC6uZRl927bGIzTiXEhlUygweF/tLQQ63bKxChwVv9B3Q3oiFARrXmmOtthraPpsMBKhey8J+t+WHYLhx96lgpP5g1POcSllXt9Esh3fe0R82t/v06ZuQqix4N7o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:tD5TvrYkhNLBDeAPTGT/oq5pMb3wF1WM5/fAGJnHRMI2vDoqxg+INF0SjN/C1EP60kpv6/NrBWl5Skng64Kbk9JQMwz1tf+ID8oT5nu+FTaCegTapDfTRsMq6yPlBWapaxVe8QVNPj/BS1Y14lPRJF2jBWY/mBGjjVq2xc42PTGa389nkFSNvxtxKmpKzr90Rel+Y6Wxn4BuJSVZbA59meVkNH30KCTXBmiBAwvqPqnyWHNi2Zhe5oag8aIuHg/P X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2017 15:01:31.5469 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0158 Subject: [PATCH v3 4/4] OvmfPkg/VirtioScsiDxe: negotiate VIRTIO_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: Thu, 31 Aug 2017 14:58:50 -0000 Content-Type: text/plain VirtioScsiDxe driver has been updated to use IOMMU-like member functions from VIRTIO_DEVICE_PROTOCOL to translate the system physical address to device address. 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 Reviewed-by: Laszlo Ersek Signed-off-by: Brijesh Singh --- OvmfPkg/VirtioScsiDxe/VirtioScsi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c index 337fb4b2f1e0..313b4f66c7f8 100644 --- a/OvmfPkg/VirtioScsiDxe/VirtioScsi.c +++ b/OvmfPkg/VirtioScsiDxe/VirtioScsi.c @@ -1011,7 +1011,8 @@ VirtioScsiInit ( goto Failed; } - Features &= VIRTIO_SCSI_F_INOUT | VIRTIO_F_VERSION_1; + Features &= VIRTIO_SCSI_F_INOUT | VIRTIO_F_VERSION_1 | + VIRTIO_F_IOMMU_PLATFORM; // // In virtio-1.0, feature negotiation is expected to complete before queue @@ -1091,7 +1092,7 @@ VirtioScsiInit ( // 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