From nobody Fri Apr 19 01:06:07 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+84078+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84078+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=zd-tech.com.cn ARC-Seal: i=1; a=rsa-sha256; t=1637816860; cv=none; d=zohomail.com; s=zohoarc; b=WratsfphY71ecvg5vGJUALN+SEcSqHP+EB654StyCA1zmMnGKebMEBvTs1jPXdmNwoP64zyf4Qf1D4GHnKuqISXDuYqnJg3UgZuPoMMtRBMsdgTRASI+INCcyi2xFXj0Q/8qwRumqvHyJEkVJI4TixwtMZyx38KW0QSzzEqJyjE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1637816860; h=Content-Type:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=liGOZ4eO5YTS6/G9EpSGh/gBD0zSmZnbeQMkCtKpYfo=; b=iN8p3bcXHU0jDOmgExlSuqzx94ehwEcI2Z+ytEfYX6EHH6TyJpRSpAMikQwfx1ATa/JKpSAtA7KRK7d4XZIdP/EGBr4Es/7yNchCOod5WxKROljEvN7jkKdu5zWDimomUHvXs9kM3cthWqJ4W1q0hPz2mAStembo5SnKSHNXgSg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+84078+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1637816860102664.2810403068183; Wed, 24 Nov 2021 21:07:40 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id bRw7YY1788612xCesB3KhMBB; Wed, 24 Nov 2021 21:07:39 -0800 X-Received: from m97176.mail.qiye.163.com (m97176.mail.qiye.163.com [220.181.97.176]) by mx.groups.io with SMTP id smtpd.web12.8097.1637814844075225067 for ; Wed, 24 Nov 2021 20:34:05 -0800 X-Received: from jdzhang$zd-tech.com.cn ( [223.104.41.165] ) by ajax-webmail-wmsvr16 (Coremail) ; Thu, 25 Nov 2021 12:33:58 +0800 (CST) X-Originating-IP: [223.104.41.165] Date: Thu, 25 Nov 2021 12:33:58 +0800 (CST) From: =?UTF-8?B?5byg5a625a6a?= To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH] MdeModulePkg/Bus/Pci/UhciDxe: Fix the UsbHc memory allocate and free issue X-Priority: 3 MIME-Version: 1.0 Message-ID: <5a353ec9.22c8.17d555f2488.Coremail.jdzhang@zd-tech.com.cn> X-Coremail-Locale: zh_CN X-CM-TRANSID: sOCowADX37s2Ep9hxt9oAA--.55084W X-CM-SenderInfo: xmg2xtdqj66vonwhuxoofrzhdfq/1tbifhhWilrpO+Fj6gABsb X-Coremail-Antispam: 1U5529EdanIXcx71UUUUU7vcSsGvfC2KfnxnUU== Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,jdzhang@zd-tech.com.cn X-Gm-Message-State: YmzBEj7RTQzacomNQ1QxHWV1x1787277AA= Content-Type: multipart/alternative; boundary="----=_Part_22722_1959947011.1637814838408" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1637816859; bh=liGOZ4eO5YTS6/G9EpSGh/gBD0zSmZnbeQMkCtKpYfo=; h=Content-Type:Date:From:Reply-To:Subject:To; b=Atsng7TldKsSM3kcLpdna42IcOeIvZi/Kg7pwpfPUcsQL8ecMmWSpM7o+nN5r11D0Tk kOamLyUtQZjY76uWk2Z/5wfeF7RRhvQiaZxOCiRVafUrC7DgcJLOTkCb26v1OGy8qIdr0 1vSWSRMOT7JFh8a3WFDMJzO2Si2hQ8xbj88= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1637816860781100002 ------=_Part_22722_1959947011.1637814838408 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When use the UsbHcAllocMemFromBlock() and UsbHcFreeMem() to allocate memory= and free memory for the UHC, it should use the corresponding host address = but not the pci bus address. Signed-off-by: jdzhang --- MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c b/MdeModulePkg/Bus/Pci= /UhciDxe/UsbHcMem.c index 9aade19f8e..041638a2de 100644 --- a/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c +++ b/MdeModulePkg/Bus/Pci/UhciDxe/UsbHcMem.c @@ -211,7 +211,7 @@ UsbHcAllocMemFromBlock ( NEXT_BIT (Byte, Bit); } =20 - return Block->Buf + (StartByte * 8 + StartBit) * USBHC_MEM_UNIT; + return Block->BufHost + (StartByte * 8 + StartBit) * USBHC_MEM_UNIT; } =20 /** @@ -518,12 +518,12 @@ UsbHcFreeMem ( // scan the memory block list for the memory block that // completely contains the memory to free. // - if ((Block->Buf <=3D ToFree) && ((ToFree + AllocSize) <=3D (Block->Buf= + Block->BufLen))) { + if ((Block->BufHost <=3D ToFree) && ((ToFree + AllocSize) <=3D (Block-= >BufHost + Block->BufLen))) { // // compute the start byte and bit in the bit array // - Byte =3D ((ToFree - Block->Buf) / USBHC_MEM_UNIT) / 8; - Bit =3D ((ToFree - Block->Buf) / USBHC_MEM_UNIT) % 8; + Byte =3D ((ToFree - Block->BufHost) / USBHC_MEM_UNIT) / 8; + Bit =3D ((ToFree - Block->BufHost) / USBHC_MEM_UNIT) % 8; =20 // // reset associated bits in bit array --=20 2.30.0.windows.1 -=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 (#84078): https://edk2.groups.io/g/devel/message/84078 Mute This Topic: https://groups.io/mt/87296862/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- ------=_Part_22722_1959947011.1637814838408 Content-Type: text/html; charset=GBK Content-Transfer-Encoding: base64 PGRpdiBzdHlsZT0ibGluZS1oZWlnaHQ6MS43O2NvbG9yOiMwMDAwMDA7Zm9udC1zaXplOjE0cHg7 Zm9udC1mYW1pbHk6QXJpYWwiPjxwPldoZW4gdXNlIHRoZSBVc2JIY0FsbG9jTWVtRnJvbUJsb2Nr KCkgYW5kIFVzYkhjRnJlZU1lbSgpIHRvIGFsbG9jYXRlIG1lbW9yeSBhbmQgZnJlZSBtZW1vcnkg Zm9yIHRoZSBVSEMsIGl0IHNob3VsZCB1c2UgdGhlIGNvcnJlc3BvbmRpbmcgaG9zdCBhZGRyZXNz IGJ1dCBub3QgdGhlIHBjaSBidXMgYWRkcmVzcy48L3A+PHA+PGJyPjwvcD48cD5TaWduZWQtb2Zm LWJ5OiBqZHpoYW5nICZsdDtqZHpoYW5nQHpkLXRlY2guY29tLmNuJmd0OzwvcD48cD4tLS08L3A+ PHA+Jm5ic3A7TWRlTW9kdWxlUGtnL0J1cy9QY2kvVWhjaUR4ZS9Vc2JIY01lbS5jIHwgOCArKysr LS0tLTwvcD48cD4mbmJzcDsxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA0IGRlbGV0 aW9ucygtKTwvcD48cD48YnI+PC9wPjxwPmRpZmYgLS1naXQgYS9NZGVNb2R1bGVQa2cvQnVzL1Bj aS9VaGNpRHhlL1VzYkhjTWVtLmMgYi9NZGVNb2R1bGVQa2cvQnVzL1BjaS9VaGNpRHhlL1VzYkhj TWVtLmM8L3A+PHA+aW5kZXggOWFhZGUxOWY4ZS4uMDQxNjM4YTJkZSAxMDA2NDQ8L3A+PHA+LS0t IGEvTWRlTW9kdWxlUGtnL0J1cy9QY2kvVWhjaUR4ZS9Vc2JIY01lbS5jPC9wPjxwPisrKyBiL01k ZU1vZHVsZVBrZy9CdXMvUGNpL1VoY2lEeGUvVXNiSGNNZW0uYzwvcD48cD5AQCAtMjExLDcgKzIx MSw3IEBAIFVzYkhjQWxsb2NNZW1Gcm9tQmxvY2sgKDwvcD48cD4mbmJzcDsgJm5ic3A7ICZuYnNw O05FWFRfQklUIChCeXRlLCBCaXQpOzwvcD48cD4mbmJzcDsgJm5ic3A7fTwvcD48cD4mbmJzcDs8 L3A+PHA+LSZuYnNwOyByZXR1cm4gQmxvY2stJmd0O0J1ZiArIChTdGFydEJ5dGUgKiA4ICsgU3Rh cnRCaXQpICogVVNCSENfTUVNX1VOSVQ7PC9wPjxwPismbmJzcDsgcmV0dXJuIEJsb2NrLSZndDtC dWZIb3N0ICsgKFN0YXJ0Qnl0ZSAqIDggKyBTdGFydEJpdCkgKiBVU0JIQ19NRU1fVU5JVDs8L3A+ PHA+Jm5ic3A7fTwvcD48cD4mbmJzcDs8L3A+PHA+Jm5ic3A7LyoqPC9wPjxwPkBAIC01MTgsMTIg KzUxOCwxMiBAQCBVc2JIY0ZyZWVNZW0gKDwvcD48cD4mbmJzcDsgJm5ic3A7ICZuYnNwOy8vIHNj YW4gdGhlIG1lbW9yeSBibG9jayBsaXN0IGZvciB0aGUgbWVtb3J5IGJsb2NrIHRoYXQ8L3A+PHA+ Jm5ic3A7ICZuYnNwOyAmbmJzcDsvLyBjb21wbGV0ZWx5IGNvbnRhaW5zIHRoZSBtZW1vcnkgdG8g ZnJlZS48L3A+PHA+Jm5ic3A7ICZuYnNwOyAmbmJzcDsvLzwvcD48cD4tJm5ic3A7ICZuYnNwOyBp ZiAoKEJsb2NrLSZndDtCdWYgJmx0Oz0gVG9GcmVlKSAmYW1wOyZhbXA7ICgoVG9GcmVlICsgQWxs b2NTaXplKSAmbHQ7PSAoQmxvY2stJmd0O0J1ZiArIEJsb2NrLSZndDtCdWZMZW4pKSkgezwvcD48 cD4rJm5ic3A7ICZuYnNwOyBpZiAoKEJsb2NrLSZndDtCdWZIb3N0ICZsdDs9IFRvRnJlZSkgJmFt cDsmYW1wOyAoKFRvRnJlZSArIEFsbG9jU2l6ZSkgJmx0Oz0gKEJsb2NrLSZndDtCdWZIb3N0ICsg QmxvY2stJmd0O0J1ZkxlbikpKSB7PC9wPjxwPiZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOy8v PC9wPjxwPiZuYnNwOyAmbmJzcDsgJm5ic3A7ICZuYnNwOy8vIGNvbXB1dGUgdGhlIHN0YXJ0IGJ5 dGUgYW5kIGJpdCBpbiB0aGUgYml0IGFycmF5PC9wPjxwPiZuYnNwOyAmbmJzcDsgJm5ic3A7ICZu YnNwOy8vPC9wPjxwPi0mbmJzcDsgJm5ic3A7ICZuYnNwOyBCeXRlJm5ic3A7ID0gKChUb0ZyZWUg LSBCbG9jay0mZ3Q7QnVmKSAvIFVTQkhDX01FTV9VTklUKSAvIDg7PC9wPjxwPi0mbmJzcDsgJm5i c3A7ICZuYnNwOyBCaXQmbmJzcDsgJm5ic3A7PSAoKFRvRnJlZSAtIEJsb2NrLSZndDtCdWYpIC8g VVNCSENfTUVNX1VOSVQpICUgODs8L3A+PHA+KyZuYnNwOyAmbmJzcDsgJm5ic3A7IEJ5dGUmbmJz cDsgPSAoKFRvRnJlZSAtIEJsb2NrLSZndDtCdWZIb3N0KSAvIFVTQkhDX01FTV9VTklUKSAvIDg7 PC9wPjxwPismbmJzcDsgJm5ic3A7ICZuYnNwOyBCaXQmbmJzcDsgJm5ic3A7PSAoKFRvRnJlZSAt IEJsb2NrLSZndDtCdWZIb3N0KSAvIFVTQkhDX01FTV9VTklUKSAlIDg7PC9wPjxwPiZuYnNwOzwv cD48cD4mbmJzcDsgJm5ic3A7ICZuYnNwOyAmbmJzcDsvLzwvcD48cD4mbmJzcDsgJm5ic3A7ICZu YnNwOyAmbmJzcDsvLyByZXNldCBhc3NvY2lhdGVkIGJpdHMgaW4gYml0IGFycmF5PC9wPjxwPi0t Jm5ic3A7PC9wPjxwPjIuMzAuMC53aW5kb3dzLjE8L3A+PGRpdj48YnI+PC9kaXY+PGJyPjxicj48 YnI+PGRpdiBzdHlsZT0icG9zaXRpb246cmVsYXRpdmU7em9vbToxIj48YnI+PGRpdj48YnI+PC9k aXY+PGRpdiBzdHlsZT0iY2xlYXI6Ym90aCI+PC9kaXY+PC9kaXY+PC9kaXY+DQoKIDxkaXYgd2lk dGg9IjEiIHN0eWxlPSJjb2xvcjp3aGl0ZTtjbGVhcjpib3RoIj5fLl8sXy5fLF88L2Rpdj4gPGhy PiAgIEdyb3Vwcy5pbyBMaW5rczo8cD4gICBZb3UgcmVjZWl2ZSBhbGwgbWVzc2FnZXMgc2VudCB0 byB0aGlzIGdyb3VwLiAgICA8cD4gPGEgdGFyZ2V0PSJfYmxhbmsiIGhyZWY9Imh0dHBzOi8vZWRr Mi5ncm91cHMuaW8vZy9kZXZlbC9tZXNzYWdlLzg0MDc4Ij5WaWV3L1JlcGx5IE9ubGluZSAoIzg0 MDc4KTwvYT4gfCAgICB8ICA8YSB0YXJnZXQ9Il9ibGFuayIgaHJlZj0iaHR0cHM6Ly9ncm91cHMu aW8vbXQvODcyOTY4NjIvMTc4NzI3NyI+TXV0ZSBUaGlzIFRvcGljPC9hPiAgfCA8YSBocmVmPSJo dHRwczovL2VkazIuZ3JvdXBzLmlvL2cvZGV2ZWwvcG9zdCI+TmV3IFRvcGljPC9hPjxicj4gICAg PGEgaHJlZj0iaHR0cHM6Ly9lZGsyLmdyb3Vwcy5pby9nL2RldmVsL2VkaXRzdWIvMTc4NzI3NyI+ WW91ciBTdWJzY3JpcHRpb248L2E+IHwgPGEgaHJlZj0ibWFpbHRvOmRldmVsK293bmVyQGVkazIu Z3JvdXBzLmlvIj5Db250YWN0IEdyb3VwIE93bmVyPC9hPiB8ICA8YSBocmVmPSJodHRwczovL2Vk azIuZ3JvdXBzLmlvL2cvZGV2ZWwvdW5zdWIiPlVuc3Vic2NyaWJlPC9hPiAgW2ltcG9ydGVyQHBh dGNoZXcub3JnXTxicj4gPGRpdiB3aWR0aD0iMSIgc3R5bGU9ImNvbG9yOndoaXRlO2NsZWFyOmJv dGgiPl8uXyxfLl8sXzwvZGl2PiAKDQo= ------=_Part_22722_1959947011.1637814838408--