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 62F5C21124FF7 for ; Fri, 8 Jun 2018 08:35:12 -0700 (PDT) Received: by mail-lf0-x241.google.com with SMTP id g21-v6so18731094lfb.4 for ; Fri, 08 Jun 2018 08:35:12 -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=kaDewu0chaAURppnrPuBcw1wnumVQipr2QYL0cgmlX4=; b=IP88tQ7+1EFQJgzDVr7ueth1AN0dBZ7WzybEyW3O8c9q6Q9iONYf6Xl6PUO9xOH2e1 1K7rdVJEoGDch7lYtF5PmWW28yGp3ppPIMzh48DzGlMKWOkdTcPqoCLiYbvrxko8d8tz +oNrxVdIaEfvz8eb3PaADaWQ48OvHbulndnsp3RFQSvXeXQ1vH/2WJjurcJP/pGy3t1R zVZXaSegm0F6Pi5c6u6rDC7f3VIu2/54gVoXGD9tAgZm8jtYS4vCxMt/o2/PUQYg7ytA 5qYbd+ELg8GJDRy5yrvKPd36lqiuI0/Pj3SH9OdIGXJoL6kvWwRJ4ntUyy8KZybPZehC MqHQ== 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=kaDewu0chaAURppnrPuBcw1wnumVQipr2QYL0cgmlX4=; b=Hiq4qiTxrmdHQG8IOxwlg9l1dXakmYzwx2VOU+WA++PiOPV6LTaVWv6GluhuANo7jm kmK5F0PYRsq3qqU8xvZdpbh2Nsh7+w7OYccuYBV8+S6f+y1uTAVRBHe0l2fZlHv2TcrM /FBR/NlGXcrQi2fmtIeA10Uv7MsOCU2LXkRfl3PhIplbSTUI9QyBFd9V43jIDs0lIKzw I/1sQmwNja1Yoxz3vtwrnFSHyGJqNrXJjVFXIRdbrKGO52QGGG94JcC0XLhjzNOnaP/7 3ohYqT8kmI8ROM6E21RZeaEwQnGGY06sb7woSScaucsNzm6/Gro9f4nnWh+gp2o+rU4N 5WiQ== X-Gm-Message-State: APt69E3klv/El62+vHFTW0hyutZaKQs5wsknm/HTGQ6zW0R6E7xyAzw8 DvrCN0GsW3hgyr7rPCurLXwgwb8x7E4= X-Google-Smtp-Source: ADUXVKLxaeJig3U+D2nyYFJd8FZYo1gQcEe/dj9vSFKiCfycTzYo0ieoQjF4bxCgYudkSsraYb4aEw== X-Received: by 2002:a2e:5f8f:: with SMTP id x15-v6mr4801442lje.70.1528472110293; Fri, 08 Jun 2018 08:35:10 -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 v79-v6sm7355396lfd.32.2018.06.08.08.35.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jun 2018 08:35:09 -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: Fri, 8 Jun 2018 17:34:21 +0200 Message-Id: <1528472063-1660-24-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528472063-1660-1-git-send-email-mw@semihalf.com> References: <1528472063-1660-1-git-send-email-mw@semihalf.com> Subject: [platforms PATCH 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: Fri, 08 Jun 2018 15:35:12 -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: Hua Jing --- Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c | 62 ++++++++++++++++++++ Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf | 1 + Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h | 11 ++++ Silicon/Marvell/Include/Protocol/BoardDesc.h | 8 +++ 4 files changed, 82 insertions(+) diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c index 8f3bdfa..a133085 100644 --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c @@ -96,6 +96,67 @@ MvBoardDescComPhyGet ( STATIC EFI_STATUS +MvBoardDescI2cGet ( + IN MARVELL_BOARD_DESC_PROTOCOL *This, + IN OUT MV_BOARD_I2C_DESC **I2cDesc + ) +{ + UINT8 *I2cDeviceTable, I2cCount; + UINTN I2cDeviceTableSize, 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 */ + I2cDeviceTable = (UINT8 *)PcdGetPtr (PcdI2cControllersEnabled); + if (I2cDeviceTable == NULL) { + /* No I2C on platform */ + return EFI_SUCCESS; + } + + I2cDeviceTableSize = PcdGetSize (PcdI2cControllersEnabled); + + /* Check if PCD with I2C controllers is correctly defined */ + if (I2cDeviceTableSize > I2cCount) { + DEBUG ((DEBUG_ERROR, + "%a: Wrong PcdI2cControllersEnabled format\n", + __FUNCTION__)); + return EFI_INVALID_PARAMETER; + } + + /* Allocate and fill board description */ + BoardDesc = AllocateZeroPool (I2cDeviceTableSize * 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 < I2cDeviceTableSize; Index++) { + if (!MVHW_DEV_ENABLED (I2c, 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 @@ -470,6 +531,7 @@ MvBoardDescInitProtocol ( ) { BoardDescProtocol->BoardDescComPhyGet = MvBoardDescComPhyGet; + BoardDescProtocol->BoardDescI2cGet = MvBoardDescI2cGet; BoardDescProtocol->BoardDescMdioGet = MvBoardDescMdioGet; BoardDescProtocol->BoardDescAhciGet = MvBoardDescAhciGet; BoardDescProtocol->BoardDescSdMmcGet = MvBoardDescSdMmcGet; diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf index 71b7ebd..cc93eba 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.PcdPp2Controllers gMarvellTokenSpaceGuid.PcdUtmiControllersEnabled gMarvellTokenSpaceGuid.PcdUtmiPortType diff --git a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h index 5379679..74361d4 100644 --- a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h +++ b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h @@ -28,6 +28,17 @@ typedef struct { } MV_BOARD_COMPHY_DESC; // +// I2C devices per-board description +// +// TODO - Extend structure with entire +// ports description instead of PCDs. +// +typedef struct { + MV_SOC_I2C_DESC *SoC; + UINT8 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 cff802a..0b73d27 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 @@ -98,6 +105,7 @@ VOID struct _MARVELL_BOARD_DESC_PROTOCOL { MV_BOARD_DESC_COMPHY_GET BoardDescComPhyGet; + MV_BOARD_DESC_I2C_GET BoardDescI2cGet; MV_BOARD_DESC_MDIO_GET BoardDescMdioGet; MV_BOARD_DESC_AHCI_GET BoardDescAhciGet; MV_BOARD_DESC_SDMMC_GET BoardDescSdMmcGet; -- 2.7.4