From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=vHOutf0u; spf=pass (domain: linaro.org, ip: 209.85.128.65, mailfrom: leif.lindholm@linaro.org) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by groups.io with SMTP; Fri, 16 Aug 2019 10:34:53 -0700 Received: by mail-wm1-f65.google.com with SMTP id p77so3637307wme.0 for ; Fri, 16 Aug 2019 10:34:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=iEa+/lsAHbBWLcK5LTOi0yCAL7UyKcoAhvUAykLCsVI=; b=vHOutf0ucZeRal9QQar2hgtAfrSF+SYDAhZE1YUioZ3nobHKSe0/IZxgCcMIBZhLMP VjTu+Zn6BNJJClMh2OE/xGLUw7/Ngb2KGphxIMmliRw80vs3jqvOzaZeN33rhTGJFHRN nWHx27LUcYDZpxSkv1xZxG5FlZO2A8VBsWS2HgJXb1UKcJxSrenU2rLdIuVUX2gitf38 Vu5DnGdkWMy8z3xDoZRQoSqSO2Y6FnxYto2AdmO8saYoHp3JBxZifoXWm2bxej6RW+Cq u+Oi6eiuUzXrL3Pra2HGManC7fQPYk52slxJ7mcGGRjCJ6fTu4MQ0QA8XhM9bSLDXKSd 7Q2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=iEa+/lsAHbBWLcK5LTOi0yCAL7UyKcoAhvUAykLCsVI=; b=JcSon5rSBYurmM5bJsouRilIK0ZE8A6NHX63MWiep0hvrV44YmUYf2qgXsBciudR5p KXePr5o5rkPkA6JdVioVDMwAkc9n9OAtNmboZiPF2SqoE3aO2qcZmXl7TQ+yWY/V67HD yrRjHyi7J2x1sOzB9mn2UirOXeAHuOLlY5VRRadRStluEh/4TYgAPrp8Xs9dOzZNvHFZ EhMUlJcRLo8L6AMLx5SmtEmRmum91+K8P7jWhgZjUVOLkDt3q2cXE10srNDuJM801afl mxotXcyIg+83AZIFHgoajqEMSYvVI0nLQaI2iHSLMLESjhrtUqbvXi8RrNSRDGbshQfr gJuA== X-Gm-Message-State: APjAAAXGAFWz4RZs7p7cQ321i6MSyddU88B/VVACFh9pUmWRJQq+uFFY yfFUOgTjdEfPQhu022SEM/4rug== X-Google-Smtp-Source: APXvYqw5Fcdp6GWOmDUrNkIgPEtuMZixl04Xrzc7xvIUZXOH9EfcKvy5fv0mdTQ1AZoIR1fzodQYvA== X-Received: by 2002:a1c:5402:: with SMTP id i2mr8394916wmb.41.1565976891500; Fri, 16 Aug 2019 10:34:51 -0700 (PDT) Return-Path: Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id 4sm9742680wro.78.2019.08.16.10.34.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2019 10:34:50 -0700 (PDT) Date: Fri, 16 Aug 2019 18:34:49 +0100 From: "Leif Lindholm" To: Marcin Wojtas Cc: devel@edk2.groups.io, ard.biesheuvel@linaro.org, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com Subject: Re: [edk2-platforms: PATCH v2 05/10] Marvell/Library: ArmadaSoCDescLib: Extend Xenon information Message-ID: <20190816173449.GX29255@bivouac.eciton.net> References: <1565837654-13258-1-git-send-email-mw@semihalf.com> <1565837654-13258-6-git-send-email-mw@semihalf.com> MIME-Version: 1.0 In-Reply-To: <1565837654-13258-6-git-send-email-mw@semihalf.com> User-Agent: Mutt/1.10.1 (2018-07-13) Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Aug 15, 2019 at 04:54:09AM +0200, Marcin Wojtas wrote: > 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/Armada7k8kSoCDescLib.h | 5 +-- > Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c | 34 +++++++++++++------- > 2 files changed, 25 insertions(+), 14 deletions(-) > > diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h > index 0296d43..265b4f4 100644 > --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h > +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h > @@ -90,8 +90,9 @@ > // > // Platform description of SDMMC controllers > // > -#define MV_SOC_MAX_SDMMC_COUNT 2 > -#define MV_SOC_SDMMC_BASE(Index) ((Index) == 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) > > // > // Platform description of UTMI PHY's > diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c > index 5947601..3ffd57e 100644 > --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c > +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.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; > > - Desc = AllocateZeroPool (MV_SOC_MAX_SDMMC_COUNT * sizeof (MV_SOC_SDMMC_DESC)); > - if (Desc == NULL) { > + CpCount = FixedPcdGet8 (PcdMaxCpCount); > + > + *Count = CpCount * MV_SOC_SDMMC_PER_CP_COUNT + MV_SOC_AP806_COUNT; > + SdMmc = AllocateZeroPool (*Count * sizeof (MV_SOC_SDMMC_DESC)); > + if (SdMmc == NULL) { > DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); > return EFI_OUT_OF_RESOURCES; > } > > - for (Index = 0; Index < MV_SOC_MAX_SDMMC_COUNT; Index++) { > - Desc[Index].SdMmcBaseAddress = MV_SOC_SDMMC_BASE (Index); > - Desc[Index].SdMmcMemSize = SIZE_1KB; > - Desc[Index].SdMmcDmaType = NonDiscoverableDeviceDmaTypeCoherent; > - } > + *SdMmcDesc = SdMmc; > + > + /* AP80x controller */ > + SdMmc->SdMmcBaseAddress = MV_SOC_AP80X_SDMMC_BASE; > + SdMmc->SdMmcMemSize = SIZE_1KB; > + SdMmc->SdMmcDmaType = NonDiscoverableDeviceDmaTypeCoherent; > + SdMmc++; > > - *SdMmcDesc = Desc; > - *DescCount = MV_SOC_MAX_SDMMC_COUNT; > + /* CP11x controllers */ > + for (CpIndex = 0; CpIndex < CpCount; CpIndex++) { > + SdMmc->SdMmcBaseAddress = MV_SOC_CP_SDMMC_BASE (CpIndex); > + SdMmc->SdMmcMemSize = SIZE_1KB; > + SdMmc->SdMmcDmaType = NonDiscoverableDeviceDmaTypeCoherent; > + SdMmc++; > + } > > return EFI_SUCCESS; > } > -- > 2.7.4 >