From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=aftemzUW; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.167.67, mailfrom: mw@semihalf.com) Received: from mail-lf1-f67.google.com (mail-lf1-f67.google.com [209.85.167.67]) by groups.io with SMTP; Mon, 20 May 2019 08:27:54 -0700 Received: by mail-lf1-f67.google.com with SMTP id q17so10669904lfo.4 for ; Mon, 20 May 2019 08:27:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=n/WxT5cLbsqCXhcSVU1sb85yyqwpgy4xIypecGINkCM=; b=aftemzUWydhvIl/ROwH5SkOGaq21NzoD/IXAs2apyhqvxdDHGUhuZ/pF1NgcOokyyy TnPKT1Nix+LwlGVx5nQK3uG4nmBOTyIj+59ZL7usFBllbhTInV6niAADjDKKigTCxD2s D9gbR+mAoxkfVhmfp3ixhHVzc/sxdsrBdVlMG3Gsktuj6OqpROFKpUAjsOaGVeAyfwQM gRKVX+xUX6/riKfvEThke6z3YuNcBMK7dlY7gm26bwOwJJwpAMpWRLXsBcwT8J/vSSsS ubyISFuNPjxY/ArErIUQyiJW1w7iowj1H4hCky7Hi2Sj3dkDpsk/WjGIhHQmrCNnnFQD iZlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n/WxT5cLbsqCXhcSVU1sb85yyqwpgy4xIypecGINkCM=; b=Cltj4QP1hAks44ivaQJJT2Hlximf0D0jrB7tgnXmdKUuuDOZeH58q3KKokHQtYq44U usYSuNJYBBDRT4uvyEIofdgDtZkDxMcswRo8vNy/nALGI9Zk3Q3Y/R3rja1pp6FejkKh WULBtcYSOLfcz2KLY8Auu9WtFQFXm1UoANcf1SjtMFK8T3RfTnZYdI06O8wI67keK9gb BAWTZFKdaOxQGyCM/ncd0j60V+sQsadnh9ehwdv7cM+8TRT4HWs2NdqsE6mQsClm3uDr LXUxMk9JXDd45mNYN0FXbZ/gMDZ1/rLo5CHCCXfJEH9Dm/49AR+J1B12SyelL88XiduZ eqPg== X-Gm-Message-State: APjAAAXhq+xutKSg0Z7vAZttQHzrCubvi3YtOPGj96m2WnMXBbk8l9I7 DBbp/A9XOTjzXXHaxMVI3AWNjyvbIdg= X-Google-Smtp-Source: APXvYqwq7hPwuYNUh2CPl+7++94dIs41dK5/yqkw06A+kMX/sDKrfy1/wWhVHZBcP0omjO2xRfi1eQ== X-Received: by 2002:a19:3f4f:: with SMTP id m76mr36051586lfa.17.1558366071603; Mon, 20 May 2019 08:27:51 -0700 (PDT) Return-Path: Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id d5sm3906205lji.85.2019.05.20.08.27.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 May 2019 08:27:50 -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, Jici.Gao@arm.com, rebecca@bluestop.org, kettenis@jive.eu Subject: [edk2-platforms: PATCH v2 02/14] Marvell/Library: ArmadaSoCDescLib: Add PCIE information Date: Mon, 20 May 2019 17:27:15 +0200 Message-Id: <1558366047-15994-3-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1558366047-15994-1-git-send-email-mw@semihalf.com> References: <1558366047-15994-1-git-send-email-mw@semihalf.com> This patch introduces new library callback (ArmadaSoCPcieGet ()), which dynamically allocates and fills array with all available PCIE controllers' base addresses. It is needed for the configuration of PCIE, whose support will be added in the upcoming patches. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas --- Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h | 6 +++ Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h | 20 +++++++++ Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c | 44 ++++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h index 74883fd..0296d43 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h @@ -76,6 +76,12 @@ #define MV_SOC_MDIO_ID(Cp) (Cp) // +// Platform description of PCIE +// +#define MV_SOC_PCIE_PER_CP_COUNT 3 +#define MV_SOC_PCIE_BASE(Index) (0x600000 + ((Index) * 0x20000)) + +// // Platform description of PP2 NIC // #define MV_SOC_PP2_BASE(Cp) MV_SOC_CP_BASE (Cp) diff --git a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h index cd9c9f2..6432916 100644 --- a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h +++ b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h @@ -185,6 +185,26 @@ ArmadaSoCDescXhciGet ( IN OUT UINTN *DescCount ); +/** + This function returns the total number of PCIE controllers and an array + with their base addresses. + + @param[in out] **PcieDbiAddresses Array containing PCIE controllers' base + adresses. + @param[in out] *Count Total amount of available PCIE controllers. + + @retval EFI_SUCCESS The data were obtained successfully. + @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a + lack of resources. + +**/ +EFI_STATUS +EFIAPI +ArmadaSoCPcieGet ( + IN OUT EFI_PHYSICAL_ADDRESS **PcieDbiAddresses, + IN OUT UINTN *Count + ); + // // PP2 NIC devices SoC description // diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c index b637966..5947601 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c @@ -272,6 +272,50 @@ ArmadaSoCDescAhciGet ( return EFI_SUCCESS; } +/** + This function returns the total number of PCIE controllers and an array + with their base addresses. + + @param[in out] **PcieBaseAddresses Array containing PCIE controllers' base + adresses. + @param[in out] *Count Total amount of available PCIE controllers. + + @retval EFI_SUCCESS The data were obtained successfully. + @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a + lack of resources. + +**/ +EFI_STATUS +EFIAPI +ArmadaSoCPcieGet ( + IN OUT EFI_PHYSICAL_ADDRESS **PcieBaseAddresses, + IN OUT UINTN *Count + ) +{ + UINTN CpCount, CpIndex, Index; + EFI_PHYSICAL_ADDRESS *BaseAddress; + + CpCount = FixedPcdGet8 (PcdMaxCpCount); + + *Count = CpCount * MV_SOC_PCIE_PER_CP_COUNT; + BaseAddress = AllocateZeroPool (*Count * sizeof (EFI_PHYSICAL_ADDRESS)); + if (BaseAddress == NULL) { + DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); + return EFI_OUT_OF_RESOURCES; + } + + *PcieBaseAddresses = BaseAddress; + + for (CpIndex = 0; CpIndex < CpCount; CpIndex++) { + for (Index = 0; Index < MV_SOC_PCIE_PER_CP_COUNT; Index++) { + *BaseAddress = MV_SOC_CP_BASE (CpIndex) + MV_SOC_PCIE_BASE (Index); + BaseAddress++; + } + } + + return EFI_SUCCESS; +} + EFI_STATUS EFIAPI ArmadaSoCDescPp2Get ( -- 2.7.4