From: "Wu, Hao A" <hao.a.wu@intel.com>
To: "devel@edk2.groups.io" <devel@edk2.groups.io>,
"Wu, Hao A" <hao.a.wu@intel.com>,
"Chiu, Ian" <Ian.chiu@intel.com>
Cc: "Chu, Maggie" <maggie.chu@intel.com>, "Ni, Ray" <ray.ni@intel.com>
Subject: Re: [edk2-devel] [PATCH v2] MdeModulePkg\UfsBlockIoPei: UFS MMIO address size support both 32/64 bits
Date: Wed, 10 Nov 2021 03:01:31 +0000 [thread overview]
Message-ID: <DM6PR11MB40255C86FF5BDBD768120914CA939@DM6PR11MB4025.namprd11.prod.outlook.com> (raw)
In-Reply-To: <DM6PR11MB4025EF74F133FDBC111A7668CA919@DM6PR11MB4025.namprd11.prod.outlook.com>
Pushed via:
PR - https://github.com/tianocore/edk2/pull/2192
Commit - https://github.com/tianocore/edk2/commit/a7b35aae13b2d69b9be68874f275f511b1367a5e
Best Regards,
Hao Wu
> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Wu, Hao
> A
> Sent: Monday, November 8, 2021 4:12 PM
> To: devel@edk2.groups.io; Chiu, Ian <Ian.chiu@intel.com>
> Cc: Chu, Maggie <maggie.chu@intel.com>; Ni, Ray <ray.ni@intel.com>
> Subject: Re: [edk2-devel] [PATCH v2] MdeModulePkg\UfsBlockIoPei: UFS
> MMIO address size support both 32/64 bits
>
> > -----Original Message-----
> > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of
> > ian.chiu@intel.com
> > Sent: Friday, November 5, 2021 5:46 PM
> > To: devel@edk2.groups.io
> > Cc: Chiu, Ian <Ian.chiu@intel.com>; Chiu, Ian <Ian.chiu@intel.com>;
> > Chu, Maggie <maggie.chu@intel.com>; Ni, Ray <ray.ni@intel.com>; Wu,
> > Hao A <hao.a.wu@intel.com>
> > Subject: [edk2-devel] [PATCH v2] MdeModulePkg\UfsBlockIoPei: UFS
> MMIO
> > address size support both 32/64 bits
> >
> > From: Ian Chiu <Ian.chiu@intel.com>
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3703
> >
> > MMIO base address size will overflow while finding two or more Host
> > controller in the system. Correct it and support 32 and 64 bits
> > address space.
>
>
> Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
>
> Best Regards,
> Hao Wu
>
>
> >
> > Signed-off-by: Ian Chiu <ian.chiu@intel.com>
> > Cc: Maggie Chu <maggie.chu@intel.com>
> > Cc: Ray Ni <ray.ni@intel.com>
> > Cc: Hao A Wu <hao.a.wu@intel.com>
> > ---
> > MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c | 47
> > +++++++++++++++++++-
> > 1 file changed, 45 insertions(+), 2 deletions(-)
> >
> > diff --git a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
> > b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
> > index 447a05b5b2..86f1529eec 100644
> > --- a/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
> > +++ b/MdeModulePkg/Bus/Pci/UfsPciHcPei/UfsPciHcPei.c
> > @@ -76,6 +76,8 @@ InitializeUfsHcPeim (
> > UINT16 Device;
> >
> > UINT16 Function;
> >
> > UINT32 Size;
> >
> > + UINT64 MmioSize;
> >
> > + UINT32 BarAddr;
> >
> > UINT8 SubClass;
> >
> > UINT8 BaseClass;
> >
> > UFS_HC_PEI_PRIVATE_DATA *Private;
> >
> > @@ -106,6 +108,7 @@ InitializeUfsHcPeim (
> > Private->PpiList = mPpiList;
> >
> > Private->PpiList.Ppi = &Private->UfsHostControllerPpi;
> >
> >
> >
> > + BarAddr = PcdGet32 (PcdUfsPciHostControllerMmioBase);
> >
> > for (Bus = 0; Bus < 256; Bus++) {
> >
> > for (Device = 0; Device < 32; Device++) {
> >
> > for (Function = 0; Function < 8; Function++) {
> >
> > @@ -119,17 +122,57 @@ InitializeUfsHcPeim (
> > PciAnd16 (PCI_LIB_ADDRESS (Bus, Device, Function,
> > PCI_COMMAND_OFFSET), (UINT16)~(EFI_PCI_COMMAND_BUS_MASTER
> |
> > EFI_PCI_COMMAND_MEMORY_SPACE));
> >
> > PciWrite32 (PCI_LIB_ADDRESS (Bus, Device, Function,
> > PCI_BASE_ADDRESSREG_OFFSET), 0xFFFFFFFF);
> >
> > Size = PciRead32 (PCI_LIB_ADDRESS (Bus, Device, Function,
> > PCI_BASE_ADDRESSREG_OFFSET));
> >
> > +
> >
> > + switch (Size & 0x07) {
> >
> > + case 0x0:
> >
> > + //
> >
> > + // Memory space: anywhere in 32 bit address space
> >
> > + //
> >
> > + MmioSize = (~(Size & 0xFFFFFFF0)) + 1;
> >
> > + break;
> >
> > + case 0x4:
> >
> > + //
> >
> > + // Memory space: anywhere in 64 bit address space
> >
> > + //
> >
> > + MmioSize = Size & 0xFFFFFFF0;
> >
> > + PciWrite32 (PCI_LIB_ADDRESS(Bus, Device, Function,
> > PCI_BASE_ADDRESSREG_OFFSET + 4), 0xFFFFFFFF);
> >
> > + Size = PciRead32 (PCI_LIB_ADDRESS(Bus, Device,
> > + Function,
> > PCI_BASE_ADDRESSREG_OFFSET + 4));
> >
> > +
> >
> > + //
> >
> > + // Fix the length to support some specific 64 bit BAR
> >
> > + //
> >
> > + Size |= ((UINT32)(-1) << HighBitSet32 (Size));
> >
> > +
> >
> > + //
> >
> > + // Calculate the size of 64bit bar
> >
> > + //
> >
> > + MmioSize |= LShiftU64 ((UINT64) Size, 32);
> >
> > + MmioSize = (~(MmioSize)) + 1;
> >
> > +
> >
> > + //
> >
> > + // Clean the high 32bits of this 64bit BAR to 0 as we
> > + only allow a 32bit
> > BAR.
> >
> > + //
> >
> > + PciWrite32 (PCI_LIB_ADDRESS (Bus, Device, Function,
> > PCI_BASE_ADDRESSREG_OFFSET + 4), 0);
> >
> > + break;
> >
> > + default:
> >
> > + //
> >
> > + // Unknown BAR type
> >
> > + //
> >
> > + ASSERT (FALSE);
> >
> > + continue;
> >
> > + };
> >
> > //
> >
> > // Assign resource to the Ufs Pci host controller's MMIO BAR.
> >
> > // Enable the Ufs Pci host controller by setting BME and
> > MSE bits of PCI_CMD register.
> >
> > //
> >
> > - PciWrite32 (PCI_LIB_ADDRESS (Bus, Device, Function,
> > PCI_BASE_ADDRESSREG_OFFSET), (UINT32)(PcdGet32
> > (PcdUfsPciHostControllerMmioBase) + Size * Private->TotalUfsHcs));
> >
> > + PciWrite32 (PCI_LIB_ADDRESS (Bus, Device, Function,
> > PCI_BASE_ADDRESSREG_OFFSET), BarAddr);
> >
> > PciOr16 (PCI_LIB_ADDRESS (Bus, Device, Function,
> > PCI_COMMAND_OFFSET), (EFI_PCI_COMMAND_BUS_MASTER |
> > EFI_PCI_COMMAND_MEMORY_SPACE));
> >
> > //
> >
> > // Record the allocated Mmio base address.
> >
> > //
> >
> > - Private->UfsHcPciAddr[Private->TotalUfsHcs] = PcdGet32
> > (PcdUfsPciHostControllerMmioBase) + Size * Private->TotalUfsHcs;
> >
> > + Private->UfsHcPciAddr[Private->TotalUfsHcs] = BarAddr;
> >
> > Private->TotalUfsHcs++;
> >
> > + BarAddr += (UINT32)MmioSize;
> >
> > ASSERT (Private->TotalUfsHcs < MAX_UFS_HCS);
> >
> > }
> >
> > }
> >
> > --
> > 2.16.2.windows.1
> >
> >
> >
> > -=-=-=-=-=-=
> > Groups.io Links: You receive all messages sent to this group.
> > View/Reply Online (#83381):
> > https://edk2.groups.io/g/devel/message/83381
> > Mute This Topic: https://groups.io/mt/86836608/1768737
> > Group Owner: devel+owner@edk2.groups.io
> > Unsubscribe: https://edk2.groups.io/g/devel/unsub [hao.a.wu@intel.com]
> > -=-=-=-=-=-=
> >
>
>
>
>
>
prev parent reply other threads:[~2021-11-10 3:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-05 9:46 [PATCH v2] MdeModulePkg\UfsBlockIoPei: UFS MMIO address size support both 32/64 bits ian.chiu
2021-11-08 8:11 ` [edk2-devel] " Wu, Hao A
2021-11-10 3:01 ` Wu, Hao A [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=DM6PR11MB40255C86FF5BDBD768120914CA939@DM6PR11MB4025.namprd11.prod.outlook.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox