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::241; helo=mail-lf0-x241.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::241]) (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 DB5F72097214C for ; Sun, 17 Jun 2018 13:12:51 -0700 (PDT) Received: by mail-lf0-x241.google.com with SMTP id d24-v6so21555618lfa.8 for ; Sun, 17 Jun 2018 13:12:51 -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=Vb8UocRCNRZ1bHPjM44PrKUkq9FgfhHDL/Ff7W46Za4=; b=gKPNCDQFWHxr2oqCyWVLkpm54LJf89g6J52BGV/AZRpoR47WSxlZJdRjhFq155gIiJ u1AnUi4S1o6ZFIV0/y5regT8TF6d/5Oss0gLvskB5IJh8nkPDZIWU7n3/t35Verh/nhH P0LTRZeQqqN3JL9m3T0DVTNop98ft2x6sYYt1tPLcrDz2u1mr78ugzi6V/1qn4jHS5Li RxbYz/uN7atA/h/J1XLXQUGsZ7zRax9DPfcfC6iSdIphbTWM1UkpVXgbK/pZ8mkY+mq0 7zysZg5kfkPOhw+xzaJTWVGGUqUHOd7N91mEhYc1BrqrghkBpzMfOUg77qpI6LVJpKqh ZBGg== 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=Vb8UocRCNRZ1bHPjM44PrKUkq9FgfhHDL/Ff7W46Za4=; b=XIIuFyChYkEL378WAKde6D+jtXkKVF1CmZey6+BcGXikPLlXc4g/GfwAFT1wyR6VyI P0Uf8UMw2jOKcla6tKzVATwYzkPF1SSYh32d8SR+buEyW3hVlUUehWeO01Vl8uMpQyuk GxoMxCevl/0w7yLOVb/n9JkwDuVc+PVGVS5AvW0L6bmPpMsr0z584w5332ZHXpf5jh+t +9WfnHH5jIOmy5u1tXpz+zzGGz1Ngdybf4lJCjvYTOPFGGUurzHzK61bd1DOKNU+e9tj v+zmCNuRANNxjyyLtyb9MSetSJwitosJ4/G8z+zbSzEdVmn4XNrF4YZ8CgMt4XZqJ7kG /aQQ== X-Gm-Message-State: APt69E1onnKbXZiwJxqYOr98KuAAx3MOtYtM28mh8j/J4aZxD0+sC+RQ +b/ohHJXKKEP3jFPr7NEFABE9CMv2KI= X-Google-Smtp-Source: ADUXVKIwM6tDqZnQ7XsECCqDvDeKVxzdbfcR8tec7ugJ+M1sXCbgibTvFx+vDlqFyFCr/jopKywtHw== X-Received: by 2002:a19:9f95:: with SMTP id i143-v6mr6026127lfe.125.1529266369925; Sun, 17 Jun 2018 13:12:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Jun 2018 13:12:49 -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:59 +0200 Message-Id: <1529266325-18371-20-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 19/25] Marvell/Drivers: MvBoardDesc: Extend protocol with MDIO support 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:52 -0000 Introduce new callback that can provide information about MDIO controllers to the Mdio driver. Extend ArmadaBoardDescLib with new structure MV_BOARD_MDIO_DESC, for holding board specific data. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas --- Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h | 8 +++++ Silicon/Marvell/Include/Protocol/BoardDesc.h | 8 +++++ Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c | 36 ++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h index 32bd915..b11fa9d 100644 --- a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h +++ b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h @@ -25,6 +25,14 @@ typedef struct { } MV_BOARD_COMPHY_DESC; // +// MDIO devices per-board description +// +typedef struct { + MV_SOC_MDIO_DESC *SoC; + UINTN MdioDevCount; +} MV_BOARD_MDIO_DESC; + +// // NonDiscoverableDevices per-board description // diff --git a/Silicon/Marvell/Include/Protocol/BoardDesc.h b/Silicon/Marvell/Include/Protocol/BoardDesc.h index b6dac75..55297f5 100644 --- a/Silicon/Marvell/Include/Protocol/BoardDesc.h +++ b/Silicon/Marvell/Include/Protocol/BoardDesc.h @@ -50,6 +50,13 @@ EFI_STATUS typedef EFI_STATUS +(EFIAPI *MV_BOARD_DESC_MDIO_GET) ( + IN MARVELL_BOARD_DESC_PROTOCOL *This, + IN OUT MV_BOARD_MDIO_DESC **MdioDesc + ); + +typedef +EFI_STATUS (EFIAPI *MV_BOARD_DESC_AHCI_GET) ( IN MARVELL_BOARD_DESC_PROTOCOL *This, IN OUT MV_BOARD_AHCI_DESC **AhciDesc @@ -92,6 +99,7 @@ VOID struct _MARVELL_BOARD_DESC_PROTOCOL { MV_BOARD_DESC_AHCI_GET BoardDescAhciGet; MV_BOARD_DESC_COMPHY_GET BoardDescComPhyGet; + MV_BOARD_DESC_MDIO_GET BoardDescMdioGet; MV_BOARD_DESC_PP2_GET BoardDescPp2Get; MV_BOARD_DESC_SDMMC_GET BoardDescSdMmcGet; MV_BOARD_DESC_UTMI_GET BoardDescUtmiGet; diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c index 6bbe40b..5dfc559 100644 --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c @@ -100,6 +100,41 @@ MvBoardDescComPhyGet ( STATIC EFI_STATUS +MvBoardDescMdioGet ( + IN MARVELL_BOARD_DESC_PROTOCOL *This, + IN OUT MV_BOARD_MDIO_DESC **MdioDesc + ) +{ + MV_BOARD_MDIO_DESC *BoardDesc; + MV_SOC_MDIO_DESC *SoCDesc; + UINTN MdioCount, Index; + EFI_STATUS Status; + + /* Get SoC data about all available MDIO controllers */ + Status = ArmadaSoCDescMdioGet (&SoCDesc, &MdioCount); + if (EFI_ERROR (Status)) { + return Status; + } + + /* Allocate and fill board description */ + BoardDesc = AllocateZeroPool (MdioCount * sizeof (MV_BOARD_MDIO_DESC)); + if (BoardDesc == NULL) { + DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); + return EFI_OUT_OF_RESOURCES; + } + + for (Index = 0; Index < MdioCount; Index++) { + BoardDesc[Index].SoC = &SoCDesc[Index]; + } + + BoardDesc->MdioDevCount = MdioCount; + *MdioDesc = BoardDesc; + + return EFI_SUCCESS; +} + +STATIC +EFI_STATUS MvBoardDescAhciGet ( IN MARVELL_BOARD_DESC_PROTOCOL *This, IN OUT MV_BOARD_AHCI_DESC **AhciDesc @@ -456,6 +491,7 @@ MvBoardDescInitProtocol ( { BoardDescProtocol->BoardDescAhciGet = MvBoardDescAhciGet; BoardDescProtocol->BoardDescComPhyGet = MvBoardDescComPhyGet; + BoardDescProtocol->BoardDescMdioGet = MvBoardDescMdioGet; BoardDescProtocol->BoardDescPp2Get = MvBoardDescPp2Get; BoardDescProtocol->BoardDescSdMmcGet = MvBoardDescSdMmcGet; BoardDescProtocol->BoardDescUtmiGet = MvBoardDescUtmiGet; -- 2.7.4