From nobody Mon Feb 9 04:03:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+45668+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45668+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1565837680; cv=none; d=zoho.com; s=zohoarc; b=BwzFeXIImZp01ztdbNRwQ+Nan4HwnboKTmUEF27BlTCOXcy770UKni90K0gLXUqx2gSAceONiaqE8Gx2aUFxA7yeDz+6lzivaVHwPPESkQDdGyeNgQxcBHrnuV62R0o/ppL9vdi13U2pV8ijMLJjH17T8ZAKnZp/RUPa+FF7mTA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565837680; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=azdSaVjPfbOEj8CMoKfUdo+ZWRtOVcngjXWZltrqMaE=; b=S+1IRFgYWpsrO1p8gls8gjI9cMT2Ivgp5rr+cJVrPBPLGPxaTNEznhkSSycN0nC6z+sOAa9dXFvVBE8u4ub94mWhz/acr7/dI93mVaK8Sx5jjd8P49rRWDprledoRtuNpHqosUpfVuyxjvzdDbOmfzXmgR55ZIgq2vfbaS23px4= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+45668+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1565837680867990.4244939157893; Wed, 14 Aug 2019 19:54:40 -0700 (PDT) Return-Path: X-Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by groups.io with SMTP; Wed, 14 Aug 2019 19:54:39 -0700 X-Received: by mail-lf1-f68.google.com with SMTP id v16so697920lfg.11 for ; Wed, 14 Aug 2019 19:54:38 -0700 (PDT) X-Gm-Message-State: APjAAAUjvFwJDWOND3euk2jeuAEGOF5OdMKOBPajGb6kuuyX95AyVHqm c//NEvJIbcxPOmHmGyGpqpmN2gyuLATD2w== X-Google-Smtp-Source: APXvYqwPbcflQxyxxx/c5Ajzf1NxpNdx7zB/gSpMBYIi5iQekMyRL4WzZ3jgvxhQe7Sh6Nqf+MFRnA== X-Received: by 2002:ac2:5ec3:: with SMTP id d3mr1220517lfq.44.1565837676811; Wed, 14 Aug 2019 19:54:36 -0700 (PDT) X-Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id n17sm214035lfi.37.2019.08.14.19.54.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Aug 2019 19:54:36 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com Subject: [edk2-devel] [edk2-platforms: PATCH v2 05/10] Marvell/Library: ArmadaSoCDescLib: Extend Xenon information Date: Thu, 15 Aug 2019 04:54:09 +0200 Message-Id: <1565837654-13258-6-git-send-email-mw@semihalf.com> In-Reply-To: <1565837654-13258-1-git-send-email-mw@semihalf.com> References: <1565837654-13258-1-git-send-email-mw@semihalf.com> Precedence: Bulk List-Unsubscribe: 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,mw@semihalf.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1565837679; bh=BfOSuD4gW51lREzpLTyXv9P0XVi1pLqvAAM3QL04kZo=; h=Cc:Date:From:Reply-To:Subject:To; b=ZLyxluy6uaN1l84swbJacIHCdKaVqYUI67NRNLhcGVTyBDuZu8e0R7+JK3huCdxo/Km uKtFHwhhifmVajMPVJmbsLXDx2F9c3v6wlHrpB4QdlClsTrFo7EbkkP4EEqCcHPkAYkv3 0Vpwm16Lo1ZqxjDoJY4ZpYBVd0lnouxqouI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hitherto SoC description library code assumed that there could be only two Xenon SdMmc controller instances in the SoC. Remove this limitation, so that to support CN913x SoCs, which may have up to 4 of such interfaces. Signed-off-by: Marcin Wojtas Reviewed-by: Leif Lindholm --- Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescL= ib.h | 5 +-- Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescL= ib.c | 34 +++++++++++++------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada= 7k8kSoCDescLib.h b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/= Armada7k8kSoCDescLib.h index 0296d43..265b4f4 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoC= DescLib.h +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoC= DescLib.h @@ -90,8 +90,9 @@ // // Platform description of SDMMC controllers // -#define MV_SOC_MAX_SDMMC_COUNT 2 -#define MV_SOC_SDMMC_BASE(Index) ((Index) =3D=3D 0 ? 0xF06E0000 : = 0xF2780000) +#define MV_SOC_SDMMC_PER_CP_COUNT 1 +#define MV_SOC_AP80X_SDMMC_BASE 0xF06E0000 +#define MV_SOC_CP_SDMMC_BASE(Cp) (MV_SOC_CP_BASE (Cp) + 0x780000) =20 // // Platform description of UTMI PHY's diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada= 7k8kSoCDescLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/= Armada7k8kSoCDescLib.c index 5947601..3ffd57e 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoC= DescLib.c +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoC= DescLib.c @@ -349,26 +349,36 @@ EFI_STATUS EFIAPI ArmadaSoCDescSdMmcGet ( IN OUT MV_SOC_SDMMC_DESC **SdMmcDesc, - IN OUT UINTN *DescCount + IN OUT UINTN *Count ) { - MV_SOC_SDMMC_DESC *Desc; - UINTN Index; + MV_SOC_SDMMC_DESC *SdMmc; + UINTN CpCount, CpIndex; =20 - Desc =3D AllocateZeroPool (MV_SOC_MAX_SDMMC_COUNT * sizeof (MV_SOC_SDMMC= _DESC)); - if (Desc =3D=3D NULL) { + CpCount =3D FixedPcdGet8 (PcdMaxCpCount); + + *Count =3D CpCount * MV_SOC_SDMMC_PER_CP_COUNT + MV_SOC_AP806_COUNT; + SdMmc =3D AllocateZeroPool (*Count * sizeof (MV_SOC_SDMMC_DESC)); + if (SdMmc =3D=3D NULL) { DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); return EFI_OUT_OF_RESOURCES; } =20 - for (Index =3D 0; Index < MV_SOC_MAX_SDMMC_COUNT; Index++) { - Desc[Index].SdMmcBaseAddress =3D MV_SOC_SDMMC_BASE (Index); - Desc[Index].SdMmcMemSize =3D SIZE_1KB; - Desc[Index].SdMmcDmaType =3D NonDiscoverableDeviceDmaTypeCoherent; - } + *SdMmcDesc =3D SdMmc; + + /* AP80x controller */ + SdMmc->SdMmcBaseAddress =3D MV_SOC_AP80X_SDMMC_BASE; + SdMmc->SdMmcMemSize =3D SIZE_1KB; + SdMmc->SdMmcDmaType =3D NonDiscoverableDeviceDmaTypeCoherent; + SdMmc++; =20 - *SdMmcDesc =3D Desc; - *DescCount =3D MV_SOC_MAX_SDMMC_COUNT; + /* CP11x controllers */ + for (CpIndex =3D 0; CpIndex < CpCount; CpIndex++) { + SdMmc->SdMmcBaseAddress =3D MV_SOC_CP_SDMMC_BASE (CpIndex); + SdMmc->SdMmcMemSize =3D SIZE_1KB; + SdMmc->SdMmcDmaType =3D NonDiscoverableDeviceDmaTypeCoherent; + SdMmc++; + } =20 return EFI_SUCCESS; } --=20 2.7.4 -=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 (#45668): https://edk2.groups.io/g/devel/message/45668 Mute This Topic: https://groups.io/mt/32882737/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-