From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4010:c07::242; helo=mail-lf0-x242.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A8FD82097213B for ; Sun, 17 Jun 2018 13:12:50 -0700 (PDT) Received: by mail-lf0-x242.google.com with SMTP id t2-v6so15162020lfd.6 for ; Sun, 17 Jun 2018 13:12:50 -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=i7np8Uh/aqBuO25Die9PfQETW8IVnK0SgHCcypy2r04=; b=gKjFVR8f9ABFvsSlk/9k6T3kXHs49U9QWRV8qEPDiNyfQw7Orgn9TyG3JOIzzGHZCO xDkxR1M1lLXMoIZlQXEibqM9s/j1qqGD4KzZoXCdCFuLuaCgCMedc8ZWpExQEFDsJQas NifeEdMdqXQ8SpzIweB6b/m0kiLT9PtUTvTjsVYHO+IN2CQpsvJjq/C2Wey1sR8e3l6X RbDiVLDiYIkbYgAOKdpABVQCRN1DuLKLRGwjCndj3X9yICslG1M3EdT687TOcTgdW1c+ BJDPCwiRIysdqyGtVh3Uz01E72KkGauXwd2SEDB6QwaDuBQm9kjs+v9uoqybJoZ87nuC gHfA== 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=i7np8Uh/aqBuO25Die9PfQETW8IVnK0SgHCcypy2r04=; b=sHieVhiEj9ECVcUHC8xULXv9lbdy12aG+4qoPcsftdiaHmYFQrcJ3ZHjCn+5P47NBZ pT4fHB9OYmRqeOpLbGOhsbR5Jg6Le34rU3+zvkd3u7S16/NvuUi6eXwnYMznfcXb9T8o 9SmK9zCgKKMXOmyb6r/BAKTwqdZzIE3ujjJctT52HFtIRb5UdNDsP+4G8qmGXUuXa27e vgqJaAMIwkKbh5iuuBnaQxfLtJx0KI+2tqwQ7Iu/jKigLhYd86snfrxIu556fF97KB53 8oM10NwgQpuimFfN/hVhnDLxP11M6yMBzneLW7ASAhVSP4/hKMJOc5xBmgSi3LiaxXbH h4Dw== X-Gm-Message-State: APt69E3lS4sx4H1YX5NPQaNQtJkAGh9XyXviGLpP8DXva/vBce7W2Xsp 4igGJwecA/SgO8vMbPfiqyvbYM3GNA0= X-Google-Smtp-Source: ADUXVKKIp7bjo24QWJZWjV6vyjBb2bibSpV3J6Z3VwF3PYZwZmSujp272l8pp/Nd740AbkjQugOzwQ== X-Received: by 2002:a19:f71a:: with SMTP id z26-v6mr5469512lfe.137.1529266368780; Sun, 17 Jun 2018 13:12:48 -0700 (PDT) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id q75-v6sm387272lfq.47.2018.06.17.13.12.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Jun 2018 13:12:48 -0700 (PDT) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, jinghua@marvell.com, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com Date: Sun, 17 Jun 2018 22:11:58 +0200 Message-Id: <1529266325-18371-19-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529266325-18371-1-git-send-email-mw@semihalf.com> References: <1529266325-18371-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v2 18/25] Marvell/Armada7k8k: Extend ArmadaSoCDescLib with MDIO information X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jun 2018 20:12:51 -0000 This patch introduces new library callback (ArmadaSoCDescMdioGet ()), which dynamically allocates and fills MV_SOC_MDIO_DESC structure with the SoC description of Mdio controllers. 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 | 15 ++++++++++ Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c | 29 ++++++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h index f372ca0..c864f94 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h @@ -38,6 +38,12 @@ #define MV_SOC_COMPHY_MUX_BITS 4 // +// Platform description of MDIO controllers +// +#define MV_SOC_MDIO_BASE(Cp) (MV_SOC_CP_BASE ((Cp)) + 0x12A200) +#define MV_SOC_MDIO_ID(Cp) (Cp) + +// // 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 a133d1c..304d068 100644 --- a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h +++ b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h @@ -37,6 +37,21 @@ ArmadaSoCDescComPhyGet ( ); // +// MDIO +// +typedef struct { + UINTN MdioId; + UINTN MdioBaseAddress; +} MV_SOC_MDIO_DESC; + +EFI_STATUS +EFIAPI +ArmadaSoCDescMdioGet ( + IN OUT MV_SOC_MDIO_DESC **MdioDesc, + IN OUT UINTN *DescCount + ); + +// // NonDiscoverable devices SoC description // // AHCI diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c index 580c0f4..652677f 100644 --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c @@ -63,6 +63,35 @@ ArmadaSoCDescComPhyGet ( EFI_STATUS EFIAPI +ArmadaSoCDescMdioGet ( + IN OUT MV_SOC_MDIO_DESC **MdioDesc, + IN OUT UINTN *DescCount + ) +{ + MV_SOC_MDIO_DESC *Desc; + UINTN CpCount, CpIndex; + + CpCount = FixedPcdGet8 (PcdMaxCpCount); + + Desc = AllocateZeroPool (CpCount * sizeof (MV_SOC_MDIO_DESC)); + if (Desc == NULL) { + DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); + return EFI_OUT_OF_RESOURCES; + } + + for (CpIndex = 0; CpIndex < CpCount; CpIndex++) { + Desc[CpIndex].MdioId = MV_SOC_MDIO_ID (CpIndex); + Desc[CpIndex].MdioBaseAddress = MV_SOC_MDIO_BASE (CpIndex); + } + + *MdioDesc = Desc; + *DescCount = CpCount; + + return EFI_SUCCESS; +} + +EFI_STATUS +EFIAPI ArmadaSoCDescAhciGet ( IN OUT MV_SOC_AHCI_DESC **AhciDesc, IN OUT UINTN *DescCount -- 2.7.4