From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 9E68321AE3CAE for ; Tue, 30 May 2017 20:26:02 -0700 (PDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 May 2017 20:27:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.38,421,1491289200"; d="scan'208";a="1154733782" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga001.fm.intel.com with ESMTP; 30 May 2017 20:27:02 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 30 May 2017 20:27:01 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.146]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.56]) with mapi id 14.03.0319.002; Wed, 31 May 2017 11:26:58 +0800 From: "Zeng, Star" To: "Wu, Hao A" , "edk2-devel@lists.01.org" CC: "Wu, Hao A" , Baranee , "Zeng, Star" Thread-Topic: [edk2] [PATCH] MdeModulePkg/Xhci: Fill the 'interval' field for ISO endpoint context Thread-Index: AQHS2a/60EqpigUL60ubkEq2rlNZ3KINx8fg Date: Wed, 31 May 2017 03:26:58 +0000 Message-ID: <0C09AFA07DD0434D9E2A0C6AEB0483103B8DB2D5@shsmsx102.ccr.corp.intel.com> References: <20170531014803.18280-1-hao.a.wu@intel.com> In-Reply-To: <20170531014803.18280-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/Xhci: Fill the 'interval' field for ISO endpoint context 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, 31 May 2017 03:26:02 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Star Zeng BTW: Could you add the reference to the bugzilla link in the commit log? Thanks, Star -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Hao = Wu Sent: Wednesday, May 31, 2017 9:48 AM To: edk2-devel@lists.01.org Cc: Wu, Hao A ; Baranee ; Zeng, Star= Subject: [edk2] [PATCH] MdeModulePkg/Xhci: Fill the 'interval' field for IS= O endpoint context The commit fills the 'Interval' field of the Endpoint Context data for isoc= hronous endpoints. It will resolve the error when a Configure Endpoint Comm= and is sent to an isochronous endpoint. Cc: Star Zeng Cc: Baranee Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 30 ++++++++++++++++++++++++++++= +- MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c | 30 +++++++++++++++++++++++++= ++++- 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pc= i/XhciDxe/XhciSched.c index 4bec76a85f..58a2f984a9 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c @@ -2,7 +2,7 @@ =20 XHCI transfer scheduling routines. =20 -Copyright (c) 2011 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made availab= le under the terms and conditions of the BSD License which accompanies thi= s distribution. The full text of the license may be found at @@ -2661,6 +2= 661,20 @@ XhcInitializeEndpointContext ( InputContext->EP[Dci-1].EPType =3D ED_ISOCH_OUT; } // + // Get the bInterval from descriptor and init the the interval fie= ld of endpoint context. + // Refer to XHCI 1.1 spec section 6.2.3.6. + // + if (DeviceSpeed =3D=3D EFI_USB_SPEED_FULL) { + Interval =3D EpDesc->Interval; + ASSERT (Interval >=3D 1 && Interval <=3D 16); + InputContext->EP[Dci-1].Interval =3D Interval + 2; + } else if ((DeviceSpeed =3D=3D EFI_USB_SPEED_HIGH) || (DeviceSpeed= =3D=3D EFI_USB_SPEED_SUPER)) { + Interval =3D EpDesc->Interval; + ASSERT (Interval >=3D 1 && Interval <=3D 16); + InputContext->EP[Dci-1].Interval =3D Interval - 1; + } + + // // Do not support isochronous transfer now. // DEBUG ((EFI_D_INFO, "XhcInitializeEndpointContext: Unsupport ISO E= P found, Transfer ring is not allocated.\n")); @@ -2829,6 +2843,20 @@ XhcIn= itializeEndpointContext64 ( InputContext->EP[Dci-1].EPType =3D ED_ISOCH_OUT; } // + // Get the bInterval from descriptor and init the the interval fie= ld of endpoint context. + // Refer to XHCI 1.1 spec section 6.2.3.6. + // + if (DeviceSpeed =3D=3D EFI_USB_SPEED_FULL) { + Interval =3D EpDesc->Interval; + ASSERT (Interval >=3D 1 && Interval <=3D 16); + InputContext->EP[Dci-1].Interval =3D Interval + 2; + } else if ((DeviceSpeed =3D=3D EFI_USB_SPEED_HIGH) || (DeviceSpeed= =3D=3D EFI_USB_SPEED_SUPER)) { + Interval =3D EpDesc->Interval; + ASSERT (Interval >=3D 1 && Interval <=3D 16); + InputContext->EP[Dci-1].Interval =3D Interval - 1; + } + + // // Do not support isochronous transfer now. // DEBUG ((EFI_D_INFO, "XhcInitializeEndpointContext64: Unsupport ISO= EP found, Transfer ring is not allocated.\n")); diff --git a/MdeModulePkg/= Bus/Pci/XhciPei/XhciSched.c b/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c index 7a63dabd8c..3dd2b89097 100644 --- a/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c +++ b/MdeModulePkg/Bus/Pci/XhciPei/XhciSched.c @@ -2,7 +2,7 @@ PEIM to produce gPeiUsb2HostControllerPpiGuid based on gPeiUsbControllerPp= iGuid which is used to enable recovery function from USB Drivers. =20 -Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.
=20 This program and the accompanying materials are licensed and made availab= le under the terms and conditions @@ -1750,6 +1750,20 @@ XhcPeiSetConfigCmd= ( InputContext->EP[Dci-1].EPType =3D ED_ISOCH_OUT; } // + // Get the bInterval from descriptor and init the the interval f= ield of endpoint context. + // Refer to XHCI 1.1 spec section 6.2.3.6. + // + if (DeviceSpeed =3D=3D EFI_USB_SPEED_FULL) { + Interval =3D EpDesc->Interval; + ASSERT (Interval >=3D 1 && Interval <=3D 16); + InputContext->EP[Dci-1].Interval =3D Interval + 2; + } else if ((DeviceSpeed =3D=3D EFI_USB_SPEED_HIGH) || (DeviceSpe= ed =3D=3D EFI_USB_SPEED_SUPER)) { + Interval =3D EpDesc->Interval; + ASSERT (Interval >=3D 1 && Interval <=3D 16); + InputContext->EP[Dci-1].Interval =3D Interval - 1; + } + + // // Do not support isochronous transfer now. // DEBUG ((EFI_D_INFO, "XhcPeiSetConfigCmd: Unsupport ISO EP found,= Transfer ring is not allocated.\n")); @@ -1953,6 +1967,20 @@ XhcPeiSetConf= igCmd64 ( InputContext->EP[Dci-1].EPType =3D ED_ISOCH_OUT; } // + // Get the bInterval from descriptor and init the the interval f= ield of endpoint context. + // Refer to XHCI 1.1 spec section 6.2.3.6. + // + if (DeviceSpeed =3D=3D EFI_USB_SPEED_FULL) { + Interval =3D EpDesc->Interval; + ASSERT (Interval >=3D 1 && Interval <=3D 16); + InputContext->EP[Dci-1].Interval =3D Interval + 2; + } else if ((DeviceSpeed =3D=3D EFI_USB_SPEED_HIGH) || (DeviceSpe= ed =3D=3D EFI_USB_SPEED_SUPER)) { + Interval =3D EpDesc->Interval; + ASSERT (Interval >=3D 1 && Interval <=3D 16); + InputContext->EP[Dci-1].Interval =3D Interval - 1; + } + + // // Do not support isochronous transfer now. // DEBUG ((EFI_D_INFO, "XhcPeiSetConfigCmd64: Unsupport ISO EP foun= d, Transfer ring is not allocated.\n")); -- 2.12.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel