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 B857D21107824 for ; Mon, 18 Jun 2018 15:59:30 -0700 (PDT) Received: by mail-lf0-x241.google.com with SMTP id i15-v6so27174495lfc.2 for ; Mon, 18 Jun 2018 15:59:30 -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=4gZXvj4qSJ+6OCMfF8sIRWTHwWuOz/+vLS0nr4+dYDA=; b=oaFDMK+qDUtU8AeLccsaVUXCqYuqwdFjkgUMBG5gp++C0emzxHwCpMrhGA95C2hkeo UkpywR8xP/4w5Rib4Wu72BrhSbxSbBq9EtgPGxjPbgGOWTc5kSQJqW9j9t9GWs0IxvQm cljp4daOr94mMSzyoz4V1cLEHSpE0G9yu/dXrqLyOYxBSgGLPbFdwj4h4g857JCl0EfR B5locShCXDoJS14HNdMBL4iUvsWgYpkAEZZL1wbGzL3s6Xq8Dm3xQxvnyFSiO75/4kJo +McNXVB67a0qu2CgfYbMRkI8WEez4cv5pqdI568HkPVGxSBHWmJrPB4f3V/y91xo27Gk 6pAA== 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=4gZXvj4qSJ+6OCMfF8sIRWTHwWuOz/+vLS0nr4+dYDA=; b=MZBVxzgs3gEKx0j646U+/AJA2JEmydUYo7X+Rfy+t6YdivsqNG15Exf3w9wVlX61e0 ii9tgeVvMFFLHFXsBlXeZo4bmAhWEuWtMhwRD+lvyzxLjLL0thKpH5UaRNabktErY97M M9p/rnKDqy5E3GZBqzI3NH6mfZUeF5EkMnSPHE3oGKEGyrEy/jgP7G7kYT8K9OtgW0Px yCVi17qEIgzswPGTguKmPxWDIHqwrafs1sPH/WhoEJzwpADfE8120CCp0xMc+CjvB/5p 6/T5ljBPGVyGYOwP6H0UKfUHl2iuDvlXx4wBZVMx10oy08OM2UdV7qjd6LcntEA9Hpqx vY8g== X-Gm-Message-State: APt69E29gcKj7B4gF2byN3GHgtkUHioed85d+MAvqDaLDdvrgZmrE3+8 jNsy2+fJ3iDUTLFdfNglG8qYLmHcv2k= X-Google-Smtp-Source: ADUXVKJSOLUoRCcyPBe58LNU8QXYqCzgAEuMUFXGi+AKpwfoY9NnyfcdgesrfLhY7n5TP1kGiulUKw== X-Received: by 2002:a2e:1414:: with SMTP id u20-v6mr9652422ljd.134.1529362768709; Mon, 18 Jun 2018 15:59:28 -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 h136-v6sm3020754lfe.23.2018.06.18.15.59.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jun 2018 15:59:28 -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: Tue, 19 Jun 2018 00:58:42 +0200 Message-Id: <1529362724-9244-24-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529362724-9244-1-git-send-email-mw@semihalf.com> References: <1529362724-9244-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v3 23/25] Marvell/Drivers: MvBoardDesc: Extend protocol with I2C 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: Mon, 18 Jun 2018 22:59:31 -0000 Introduce new callback that can provide information about I2C controllers to the I2c driver. Extend ArmadaBoardDescLib with new structure MV_BOARD_I2C_DESC, for holding board specific data. In further steps it should be extended and replace PCD I2C devices' representation with the appropriate structures. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas Reviewed-by: Leif Lindholm --- Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf | 1 + Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h | 8 +++ Silicon/Marvell/Include/Protocol/BoardDesc.h | 8 +++ Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c | 66 ++++++++++++++++++++ 4 files changed, 83 insertions(+) diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf index dea99fd..41f72d6 100644 --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf @@ -58,6 +58,7 @@ [Pcd] gMarvellTokenSpaceGuid.PcdComPhyDevices + gMarvellTokenSpaceGuid.PcdI2cControllersEnabled gMarvellTokenSpaceGuid.PcdPciEAhci gMarvellTokenSpaceGuid.PcdPciESdhci gMarvellTokenSpaceGuid.PcdPciEXhci diff --git a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h index b11fa9d..ee8e06e 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; // +// I2C devices per-board description +// +typedef struct { + MV_SOC_I2C_DESC *SoC; + UINTN I2cDevCount; +} MV_BOARD_I2C_DESC; + +// // MDIO devices per-board description // typedef struct { diff --git a/Silicon/Marvell/Include/Protocol/BoardDesc.h b/Silicon/Marvell/Include/Protocol/BoardDesc.h index 55297f5..1d57a16 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_I2C_GET) ( + IN MARVELL_BOARD_DESC_PROTOCOL *This, + IN OUT MV_BOARD_I2C_DESC **I2cDesc + ); + +typedef +EFI_STATUS (EFIAPI *MV_BOARD_DESC_MDIO_GET) ( IN MARVELL_BOARD_DESC_PROTOCOL *This, IN OUT MV_BOARD_MDIO_DESC **MdioDesc @@ -99,6 +106,7 @@ VOID struct _MARVELL_BOARD_DESC_PROTOCOL { MV_BOARD_DESC_AHCI_GET BoardDescAhciGet; MV_BOARD_DESC_COMPHY_GET BoardDescComPhyGet; + MV_BOARD_DESC_I2C_GET BoardDescI2cGet; MV_BOARD_DESC_MDIO_GET BoardDescMdioGet; MV_BOARD_DESC_PP2_GET BoardDescPp2Get; MV_BOARD_DESC_SDMMC_GET BoardDescSdMmcGet; diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c index 5dfc559..39dc06c 100644 --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c @@ -100,6 +100,71 @@ MvBoardDescComPhyGet ( STATIC EFI_STATUS +MvBoardDescI2cGet ( + IN MARVELL_BOARD_DESC_PROTOCOL *This, + IN OUT MV_BOARD_I2C_DESC **I2cDesc + ) +{ + UINT8 *I2cDeviceEnabled; + UINTN I2cCount, I2cDeviceEnabledSize, I2cIndex, Index; + MV_BOARD_I2C_DESC *BoardDesc; + MV_SOC_I2C_DESC *SoCDesc; + EFI_STATUS Status; + + /* Get SoC data about all available I2C controllers */ + Status = ArmadaSoCDescI2cGet (&SoCDesc, &I2cCount); + if (EFI_ERROR (Status)) { + return Status; + } + + /* + * Obtain table with enabled I2C controllers + * which is represented as an array of UINT8 values + * (0x0 - disabled, 0x1 enabled). + */ + I2cDeviceEnabled = PcdGetPtr (PcdI2cControllersEnabled); + if (I2cDeviceEnabled == NULL) { + /* No I2C on platform */ + return EFI_SUCCESS; + } + + I2cDeviceEnabledSize = PcdGetSize (PcdI2cControllersEnabled); + + /* Check if PCD with I2C controllers is correctly defined */ + if (I2cDeviceEnabledSize > I2cCount) { + DEBUG ((DEBUG_ERROR, + "%a: Wrong PcdI2cControllersEnabled format\n", + __FUNCTION__)); + return EFI_INVALID_PARAMETER; + } + + /* Allocate and fill board description */ + BoardDesc = AllocateZeroPool (I2cDeviceEnabledSize * sizeof (MV_BOARD_I2C_DESC)); + if (BoardDesc == NULL) { + DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); + return EFI_OUT_OF_RESOURCES; + } + + I2cIndex = 0; + for (Index = 0; Index < I2cDeviceEnabledSize; Index++) { + if (!I2cDeviceEnabled[Index]) { + DEBUG ((DEBUG_INFO, "%a: Skip I2c controller %d\n", __FUNCTION__, Index)); + continue; + } + + BoardDesc[I2cIndex].SoC = &SoCDesc[Index]; + I2cIndex++; + } + + BoardDesc->I2cDevCount = I2cIndex; + + *I2cDesc = BoardDesc; + + return EFI_SUCCESS; +} + +STATIC +EFI_STATUS MvBoardDescMdioGet ( IN MARVELL_BOARD_DESC_PROTOCOL *This, IN OUT MV_BOARD_MDIO_DESC **MdioDesc @@ -491,6 +556,7 @@ MvBoardDescInitProtocol ( { BoardDescProtocol->BoardDescAhciGet = MvBoardDescAhciGet; BoardDescProtocol->BoardDescComPhyGet = MvBoardDescComPhyGet; + BoardDescProtocol->BoardDescI2cGet = MvBoardDescI2cGet; BoardDescProtocol->BoardDescMdioGet = MvBoardDescMdioGet; BoardDescProtocol->BoardDescPp2Get = MvBoardDescPp2Get; BoardDescProtocol->BoardDescSdMmcGet = MvBoardDescSdMmcGet; -- 2.7.4