From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=star.zeng@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 75E4C2034A8AA for ; Mon, 22 Jan 2018 23:44:47 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jan 2018 23:50:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,400,1511856000"; d="scan'208";a="21846229" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by FMSMGA003.fm.intel.com with ESMTP; 22 Jan 2018 23:50:13 -0800 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 22 Jan 2018 23:50:13 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 22 Jan 2018 23:50:13 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.189]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Tue, 23 Jan 2018 15:50:11 +0800 From: "Zeng, Star" To: "Wu, Hao A" , "edk2-devel@lists.01.org" CC: "Ni, Ruiyu" , "Tian, Feng" , "Zeng, Star" Thread-Topic: [PATCH] MdeModulePkg/NvmExpressDxe: Fix data buffer not mapped for Write cmd Thread-Index: AQHTlAeXjEA18snGMEWPBxdT7UZs4qOBFR0w Date: Tue, 23 Jan 2018 07:50:10 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103BA00EE3@shsmsx102.ccr.corp.intel.com> References: <20180123050358.17840-1-hao.a.wu@intel.com> In-Reply-To: <20180123050358.17840-1-hao.a.wu@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] MdeModulePkg/NvmExpressDxe: Fix data buffer not mapped for Write cmd X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Jan 2018 07:44:48 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng Is it ok to do more test, for example with SCT? Thanks, Star -----Original Message----- From: Wu, Hao A=20 Sent: Tuesday, January 23, 2018 1:04 PM To: edk2-devel@lists.01.org Cc: Wu, Hao A ; Zeng, Star ; Ni, R= uiyu ; Tian, Feng Subject: [PATCH] MdeModulePkg/NvmExpressDxe: Fix data buffer not mapped for= Write cmd Within function NvmExpressPassThru(): The data buffer for the below 2 Admin command: Create I/O Completion Queue command (Opcode 01h) Create I/O Submission Queu= e command (Opcode 05h) are not mapped to the PCI controller specific addresses. But the current code logic also prevents the below NVM command: Write (Opcode 01h) from mapping its data buffer. Hence, this commit refine the logics to resolve this issue. Cc: Star Zeng Cc: Ruiyu Ni Cc: Feng Tian Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Hao Wu --- MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c b/MdeM= odulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c index 7356c1d673..302cfdcd8d 100644 --- a/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c +++ b/MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressPassthru.c @@ -3,7 +3,7 @@ NVM Express specification. =20 (C) Copyright 2014 Hewlett-Packard Development Company, L.P.
- Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.
+ Copyright (c) 2013 - 2018, Intel Corporation. All rights=20 + reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BS= D License which accompanies this distribution. The full text of the license may b= e found at @@ -593,7 +593,8 @@ NvmExpressPassThru ( // these two cmds are special which requires their data buffer must supp= ort simultaneous access by both the // processor and a PCI Bus Master. It's caller's responsbility to ensure= this. // - if (((Sq->Opc & (BIT0 | BIT1)) !=3D 0) && (Sq->Opc !=3D NVME_ADMIN_CRIOC= Q_CMD) && (Sq->Opc !=3D NVME_ADMIN_CRIOSQ_CMD)) { + if (((Sq->Opc & (BIT0 | BIT1)) !=3D 0) && + !((Packet->QueueType =3D=3D NVME_ADMIN_QUEUE) && ((Sq->Opc =3D=3D=20 + NVME_ADMIN_CRIOCQ_CMD) || (Sq->Opc =3D=3D NVME_ADMIN_CRIOSQ_CMD)))) { if ((Packet->TransferLength =3D=3D 0) || (Packet->TransferBuffer =3D= =3D NULL)) { return EFI_INVALID_PARAMETER; } -- 2.12.0.windows.1