From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id E25517803E1 for ; Wed, 20 Mar 2024 08:22:31 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=QmcZmHjT+nihUHpHqxi/h0+n5KeVjQAS5POGIVm7+Ak=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1710922950; v=1; b=T3s0JfT3t2iYBymWm7w1tfT2nieYZVtS8xK1t8oCCUWJLcmO68Zbhg5V02OIPxFv/cpqjQKF IoBW+zSXm+/4o/NrSw6wwNOgquugadxj3243Gc2BMbeEwztc3H1fk8RNyvxw9DwHrx10ONRrwrV b67HU7BRNsCEkPw5LwZXUdAbQyND39wsGWW2psdRu0bpjrvbnkpm/61t4Qn9qNN47BZplmjU6he qlmUcLLO1CBcNcTx9tOMeMD+PdagmW+CLjrwrBKDpwBNDzmfmL3nyZDvqRxzZY0S6NwztDC3wLe ijY42gaXryD9E2wfQTuiZ7miE3V1s/XwdNNVa2FDm/ewg== X-Received: by 127.0.0.2 with SMTP id h2YvYY7687511xCzZ5TCNBDi; Wed, 20 Mar 2024 01:22:30 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by mx.groups.io with SMTP id smtpd.web10.38717.1710922949388282565 for ; Wed, 20 Mar 2024 01:22:29 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,11018"; a="17279365" X-IronPort-AV: E=Sophos;i="6.07,139,1708416000"; d="scan'208";a="17279365" X-Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2024 01:22:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,139,1708416000"; d="scan'208";a="18545253" X-Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmviesa005.fm.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 20 Mar 2024 01:22:29 -0700 X-Received: from fmsmsx602.amr.corp.intel.com (10.18.126.82) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 20 Mar 2024 01:22:28 -0700 X-Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx602.amr.corp.intel.com (10.18.126.82) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Wed, 20 Mar 2024 01:22:27 -0700 X-Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.169) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 20 Mar 2024 01:22:27 -0700 X-Received: from MN0PR11MB6034.namprd11.prod.outlook.com (2603:10b6:208:375::17) by SA1PR11MB6821.namprd11.prod.outlook.com (2603:10b6:806:29d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.15; Wed, 20 Mar 2024 08:22:20 +0000 X-Received: from MN0PR11MB6034.namprd11.prod.outlook.com ([fe80::f91f:3355:add2:3216]) by MN0PR11MB6034.namprd11.prod.outlook.com ([fe80::f91f:3355:add2:3216%3]) with mapi id 15.20.7409.009; Wed, 20 Mar 2024 08:22:20 +0000 From: "Xianglei Cai" To: "devel@edk2.groups.io" CC: "Wu, Hao A" , "Ni, Ray" , Liming Gao , "Huang, Jenny" , "Shih, More" Subject: Re: [edk2-devel] [PATCH 1/1] MdeModulePkg/XhciDxe: Reset endpoint while USB Transaction error Thread-Topic: [PATCH 1/1] MdeModulePkg/XhciDxe: Reset endpoint while USB Transaction error Thread-Index: AQHadDwIf2tyGjoQhEqIk0Rxr/uogbFAVrQA Date: Wed, 20 Mar 2024 08:22:20 +0000 Message-ID: References: <2ef49d5cd3593dc573f3fac9db533b4a93ef04b5.1710220024.git.xianglei.cai@intel.com> In-Reply-To: <2ef49d5cd3593dc573f3fac9db533b4a93ef04b5.1710220024.git.xianglei.cai@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: MN0PR11MB6034:EE_|SA1PR11MB6821:EE_ x-ms-office365-filtering-correlation-id: 355626bc-7f11-4e6e-2ccf-08dc48b6dca5 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: hXLokFu7vOhbo870QrcjJHIfdcnUDsa7NOZt9TcGt1OuQfKvq6f/anECsxF7CGQDlajnNiwA5x38ctpVQN1e7zzt84NXau4PDJFJIH00JIND4x0o7002lWoivqOE54u8j/xDLpON/Bo60vel4pB4dNpMJn55r3w68twUBTbC97tOSD0RdhZ3FpHsqz6xXeP5GAhgc7kQNwBt+4FfPCBMtygi7YKOw44upsDPGBFPcEIthozL2ltw1YWQCjXjE7GIJ/kS3Wbktg+CRW8wwGR4VVYd/uE2ES8nbEclhQ00nGUWIJDqkNgP/tkcwLKJhmTKwZWPzWxudHPVHrokDN2oaWWS0jYW2SJcn2vVorFpm616uO5eVhpwjoQnfc20peaQbGobNUwaxNVE8VIaRsIn9XU8I9jvTBslJZ5ch80Ab9sxTEdnr8Bg6b9k8g4HfcSiHNANHtSIBUn8pch+1s6iliX44BQgYRaE607VvryNR4AcDHlHARw2yAx6T+bWw9Blrizpft8JQ9LOuSz4/7fHWsD3RpbvdeJGv7pl/q2+hCXSy3eZywajPIdP1cjjp5nTsIyJargfppO8ycxTCg4Wn0/23/4UnRJiHCLN8ckq760Mih23fms+MDbJYtStgTCOWuv5PkSv4eBZZjn2ewQsufJVjQsgf6mjqbt+L42vuqE= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?n3pe9/3FGFUZGDY0b0OQ71YVYChwBj6VclPF1hzi/T57m2CpYsK5EoP7Wd2d?= =?us-ascii?Q?i5+jRMmQLVTllbz4QzcyuajWS8mb9CELY2zCDY87iV7Tn2cSTciN3SdA4+Af?= =?us-ascii?Q?DsV+Uorgr27y1AphsBLSlF14e672BaSsug1VnQhvI6lSMZHLC0snwS4v6qfT?= =?us-ascii?Q?CEhipZOQaGIR1LCVH9xyQGqPDGQp2+yVJMYJsOoWMmRgSb2TLgkDFWBg+K7u?= =?us-ascii?Q?ZC/RFSwMKnbtDepdglZXZnYqY2KQTiyex5z5optU5gNvFYoOM/N0IHiBBWjE?= =?us-ascii?Q?Ct6aH3xwgN810qqKjrYkuWESzstYueAityuAQkQoWyWdfemuYfnxk5hSma6V?= =?us-ascii?Q?y3/AoE/CbUIsUPgebIyTEYZXK0bgMSzSouYQZBXdnFeDsmvC9wgKjBr6BhXc?= =?us-ascii?Q?m3NW7Q8KWOXua9FQInNYTUlVfuXkLLOs7ZkxI1+U7XxiRMjgNvL3R34ORQ41?= =?us-ascii?Q?mnczHiy3HpCD7uWjdz5hBrxvFe4hLb8QSV9w+Mljbo2CNppy0CwZ5GNkUp0Y?= =?us-ascii?Q?F65L6cejVAv4YQH6CV3fytfZucTchyjKaXHgV/2Prtk1T6ZGDi2156AajpjE?= =?us-ascii?Q?5L7hvtGpujbX7ti1Srb8RgaQsukYsq+zjLYMogzM5fG7DD7uRE2oRNrcnDx7?= =?us-ascii?Q?iy5yX2EE0zCLIoWa+Rjsh5ysEQJw5ljT5y+qUXWZHQEscbT4vE7PZpyzm5Fp?= =?us-ascii?Q?P3NCQS7mNEQsMxjVamnAPpNMvGnmzbHu0DeSusp3Wpt4a+uP3fRA0Sh+XcGy?= =?us-ascii?Q?XKti904uz6+3chQCvqmkpcncdmjhtRp5gEN1vHwkFBI7btNFsfXjASVfg7fj?= =?us-ascii?Q?TW5dJYoTZsS18Jayofr4vx9P+GkcGJ8Z8jztfcXJkffYFBHrZHsn8i/6E1vR?= =?us-ascii?Q?R0npYJOfaUVHxEosQLpmMWjN0e5TLMebQ6OB/HeuSlN8GQdQWajcsyF8Gk/P?= =?us-ascii?Q?uiKLZls6L7ZaayeU5i2sSUwNLaIxFm0Xm/6ElaWdPmguq89pYECMv9HUokux?= =?us-ascii?Q?+blH6KSCtFVq5nroGb9b3gkJfQUZOr7qDv+8PvxHONkBbhzc9aDQ9gsuuZAa?= =?us-ascii?Q?v+6bicVEAli6oHRBJt4nbDVPpk2eVFre5lZUm5b5SP4j7A0jReZiO/pPRpi9?= =?us-ascii?Q?lJVK08WwS3CFotDXOCoo4z6va2C6Bea2ChIcaJabcAHrv1gH7y0Ba+j8RXbY?= =?us-ascii?Q?swdjUofP1z2GJQWBdZ8pJJUcM5+Ge4+Kjqq7RpWX2RaMP03FJ7qMkF6jweXL?= =?us-ascii?Q?/+7vO9/BWWbVPm/A/xZ9TBgecAQ+WPOyXh1DYsYP7vIy/S74uGJNLwIbcY+4?= =?us-ascii?Q?EE/JQBnEnMynyz1ExG7T88CmM8L1aCVQFtsQXRpdw/1jwuh0oTPlISPFUonH?= =?us-ascii?Q?sKrJIaWn1qvBj76yJ8t0SQgKWn7SP/pD9AWsIFVpc9y4k8HxoLiPm8lNn0Ni?= =?us-ascii?Q?PUqLx3Z//xnG3gbectGWjo2T0A/JXY56BDhblnfQk0FSyW/4tsVhth4XiMKn?= =?us-ascii?Q?dimECKQfjy3EK+6OoSHN8WGPaQMgUmtuKkazSg9Hg3Nt3HtsbLBztwj76+sy?= =?us-ascii?Q?4BSKSlsC7GcPJRbvJD4ye/CB6nJ6PsLVLq3WVoXh?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6034.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 355626bc-7f11-4e6e-2ccf-08dc48b6dca5 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Mar 2024 08:22:20.2767 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 4cBDf509/dIVMvz7fDeMDKNV0hNkMT0WOhXYCTppgq73m3qeBxppDbk/7Z52Iz5NW3N9KTZSLrWYdYOO4MbtBg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR11MB6821 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Wed, 20 Mar 2024 01:22:29 -0700 Reply-To: devel@edk2.groups.io,xianglei.cai@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: uJUvT8xi1xPfFSV8hFBKTjyex7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=T3s0JfT3; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Hi All, Could you help review this change? Very Appreciate. Best regards, Xianglei -----Original Message----- From: Cai, Xianglei =20 Sent: Tuesday, March 12, 2024 1:13 PM To: devel@edk2.groups.io Cc: Cai, Xianglei ; Wu, Hao A ;= Ni, Ray ; Liming Gao ; Huang, = Jenny ; Shih, More Subject: [PATCH 1/1] MdeModulePkg/XhciDxe: Reset endpoint while USB Transac= tion error https://bugzilla.tianocore.org/show_bug.cgi?id=3D4556 Based on XHCI spec 4.8.3, software should do the reset endpoint while USB T= ransaction occur. Also add the error code for USB Transaction error since UEFI spec don't hav= e the related definition. Cc: Hao A Wu Cc: Ray Ni Cc: Liming Gao Cc: Jenny Huang Cc: More Shih Signed-off-by: Xianglei Cai --- MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c | 2 +- MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c | 2 +- MdePkg/Include/Protocol/UsbIo.h | 21 +++++++++++---------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c b/MdeModulePkg/Bus/Pci/Xhc= iDxe/Xhci.c index f4e61d223c1b..63cc29b26536 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/Xhci.c @@ -825,7 +825,7 @@ XhcTransfer ( *TransferResult =3D Urb->Result; *DataLength =3D Urb->Completed; =20 - if ((*TransferResult =3D=3D EFI_USB_ERR_STALL) || (*TransferResult =3D= =3D EFI_USB_ERR_BABBLE)) { + if ((*TransferResult =3D=3D EFI_USB_ERR_STALL) || (*TransferResult =3D= =3D=20 + EFI_USB_ERR_BABBLE) || (*TransferResult =3D=3D EFI_USB_ERR_TRANSACTION)) = { ASSERT (Status =3D=3D EFI_DEVICE_ERROR); RecoveryStatus =3D XhcRecoverHaltedEndpoint (Xhc, Urb); if (EFI_ERROR (RecoveryStatus)) { diff --git a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c b/MdeModulePkg/Bus/Pc= i/XhciDxe/XhciSched.c index 05528a478baf..e77852f62f10 100644 --- a/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c +++ b/MdeModulePkg/Bus/Pci/XhciDxe/XhciSched.c @@ -1193,7 +1193,7 @@ XhcCheckUrbResult ( goto EXIT; =20 case TRB_COMPLETION_USB_TRANSACTION_ERROR: - CheckedUrb->Result |=3D EFI_USB_ERR_TIMEOUT; + CheckedUrb->Result |=3D EFI_USB_ERR_TRANSACTION; CheckedUrb->Finished =3D TRUE; DEBUG ((DEBUG_ERROR, "XhcCheckUrbResult: TRANSACTION_ERROR! Comple= tecode =3D %x\n", EvtTrb->Completecode)); goto EXIT; diff --git a/MdePkg/Include/Protocol/UsbIo.h b/MdePkg/Include/Protocol/UsbI= o.h index a780b4e07b44..211ef0c94156 100644 --- a/MdePkg/Include/Protocol/UsbIo.h +++ b/MdePkg/Include/Protocol/UsbIo.h @@ -50,16 +50,17 @@ typedef enum { // // USB Transfer Results // -#define EFI_USB_NOERROR 0x00 -#define EFI_USB_ERR_NOTEXECUTE 0x01 -#define EFI_USB_ERR_STALL 0x02 -#define EFI_USB_ERR_BUFFER 0x04 -#define EFI_USB_ERR_BABBLE 0x08 -#define EFI_USB_ERR_NAK 0x10 -#define EFI_USB_ERR_CRC 0x20 -#define EFI_USB_ERR_TIMEOUT 0x40 -#define EFI_USB_ERR_BITSTUFF 0x80 -#define EFI_USB_ERR_SYSTEM 0x100 +#define EFI_USB_NOERROR 0x00 +#define EFI_USB_ERR_NOTEXECUTE 0x01 +#define EFI_USB_ERR_STALL 0x02 +#define EFI_USB_ERR_BUFFER 0x04 +#define EFI_USB_ERR_BABBLE 0x08 +#define EFI_USB_ERR_NAK 0x10 +#define EFI_USB_ERR_CRC 0x20 +#define EFI_USB_ERR_TIMEOUT 0x40 +#define EFI_USB_ERR_BITSTUFF 0x80 +#define EFI_USB_ERR_SYSTEM 0x100 +#define EFI_USB_ERR_TRANSACTION 0x200 =20 /** Async USB transfer callback routine. -- 2.42.0.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#116914): https://edk2.groups.io/g/devel/message/116914 Mute This Topic: https://groups.io/mt/104879589/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-