From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4864:20::141; helo=mail-lf1-x141.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) (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 CA97A2194D3AE for ; Thu, 17 Jan 2019 03:15:44 -0800 (PST) Received: by mail-lf1-x141.google.com with SMTP id i26so7515325lfc.0 for ; Thu, 17 Jan 2019 03:15:44 -0800 (PST) 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=9lLfccD38wMALOwPM3/+0ulUjNX48XCOQAYqSM8jIcs=; b=w06HAWT6mCt4M+CWE2t3vtNudltixcUkUbqUkgxvexlxQJZa7pTnrrSts31F5S7y0F ujvPQMHUArLTUGreYT6mC7Q3IINFs2ZcC01FqCGbF10QCuD37coAx1ExB7mobngsTbGF 8a1bFjwGfziHTmhgkq0VFh32lMP6HfWNVGiJqem04oNsIppfePJJLnjlK4j9kzOjpOyb zrMPq6Z41dh3fLnxF7HkFoqNZPFAj4O/2YjoCGsUHvdyJvyN8W7Z37mE5vWREecYWv0h xD7A4IsuE9HNUmTZZj8fSBsUwoDumW/reJFg7Rf20MUNTRAUfw6pgBc4B87ReUnRU7rY pDag== 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=9lLfccD38wMALOwPM3/+0ulUjNX48XCOQAYqSM8jIcs=; b=RuKyLFokP7VEZ+mIbvj24CHRUPB1nL2dHSiMKruWUr+7AFL92NUeaeRXr86bcpn2iB WMt40KAZgMA5dIqp47tmNRvnpMBpHVllKYLyWkV32TkBQQYrYChbs5C/jk9Y2P5/i2ke KlZQ/pdzMcXoDFIeqakQCiv1WcDn2mTUePCZ04FJCQv7eMXQIk9JFLlBPUwfYw5dWhR7 agzFVR7nVRwHtsuo+nwymEkljTAV8ih9FHggie9c3PsQ4bXLqHYqVkaWTsiay+9j2twz lMYhPRGVNg4cidRpVVSUJ21ZqNuzYOui+3/xNoOFWyRnoGNJYvlU6ETA7T0Hf5Y/nLui F3UA== X-Gm-Message-State: AJcUukdAhpQ8EaQRtzkY978Q4KPg6FR1KQK1ot6efRfNJeiLrOXnJwmq AUJUsUnyKcsZwIjuNk7BdRRXTJQnb28= X-Google-Smtp-Source: ALg8bN4KhhH6MUqljxIifQvAt2yY1z2HCPw645BHfowJ2jGYP+buqRfsbRV+ljNwiZukL3xtvWuRkg== X-Received: by 2002:a19:3b45:: with SMTP id i66mr10299913lfa.28.1547723742867; Thu, 17 Jan 2019 03:15:42 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id d23sm238003lfc.11.2019.01.17.03.15.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 17 Jan 2019 03:15:42 -0800 (PST) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com Date: Thu, 17 Jan 2019 12:15:10 +0100 Message-Id: <1547723715-4562-8-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547723715-4562-1-git-send-email-mw@semihalf.com> References: <1547723715-4562-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v3 07/12] Marvell/Drivers: MvBoardDesc: Extend protocol with GPIO support X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 X-List-Received-Date: Thu, 17 Jan 2019 11:15:45 -0000 Introduce new callback that can provide information about GPIO SoC controllers, as well as on-board I2C IO expanders. According ArmadaSoCDescLib ArmadaBoardDescLib routines are used for obtaining required data. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas --- Silicon/Marvell/Include/Protocol/BoardDesc.h | 8 ++++ Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c | 50 ++++++++++++++++++++ 2 files changed, 58 insertions(+) diff --git a/Silicon/Marvell/Include/Protocol/BoardDesc.h b/Silicon/Marvell/Include/Protocol/BoardDesc.h index 1d57a16..02905ea 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_GPIO_DESCRIPTION_GET) ( + IN MARVELL_BOARD_DESC_PROTOCOL *This, + IN OUT MV_BOARD_GPIO_DESCRIPTION **GpioDescription + ); + +typedef +EFI_STATUS (EFIAPI *MV_BOARD_DESC_I2C_GET) ( IN MARVELL_BOARD_DESC_PROTOCOL *This, IN OUT MV_BOARD_I2C_DESC **I2cDesc @@ -113,6 +120,7 @@ struct _MARVELL_BOARD_DESC_PROTOCOL { MV_BOARD_DESC_UTMI_GET BoardDescUtmiGet; MV_BOARD_DESC_XHCI_GET BoardDescXhciGet; MV_BOARD_DESC_FREE BoardDescFree; + MV_BOARD_GPIO_DESCRIPTION_GET GpioDescriptionGet; }; #endif // __MARVELL_BOARD_DESC_PROTOCOL_H__ diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c index f71bfc4..973c362 100644 --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c @@ -35,6 +35,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. MV_BOARD_DESC *mBoardDescInstance; +STATIC MV_BOARD_GPIO_DESCRIPTION *mGpioDescription; + STATIC EFI_STATUS MvBoardDescComPhyGet ( @@ -100,6 +102,53 @@ MvBoardDescComPhyGet ( STATIC EFI_STATUS +MvBoardGpioDescriptionGet ( + IN MARVELL_BOARD_DESC_PROTOCOL *This, + IN OUT MV_BOARD_GPIO_DESCRIPTION **GpioDescription + ) +{ + UINTN SoCGpioCount, GpioExpanderCount; + MV_GPIO_EXPANDER *GpioExpanders; + GPIO_CONTROLLER *SoCGpio; + EFI_STATUS Status; + + /* Use existing structure if already created. */ + if (mGpioDescription != NULL) { + *GpioDescription = mGpioDescription; + return EFI_SUCCESS; + } + + /* Get SoC data about all available GPIO controllers. */ + Status = ArmadaSoCGpioGet (&SoCGpio, &SoCGpioCount); + if (EFI_ERROR (Status)) { + return Status; + } + + /* Get per-board information about all available GPIO expanders. */ + Status = ArmadaBoardGpioExpanderGet (&GpioExpanders, &GpioExpanderCount); + if (EFI_ERROR (Status)) { + return Status; + } + + /* Allocate and fill board description. */ + mGpioDescription = AllocateZeroPool (sizeof (MV_BOARD_GPIO_DESCRIPTION)); + if (mGpioDescription == NULL) { + DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); + return EFI_OUT_OF_RESOURCES; + } + + mGpioDescription->SoCGpio = SoCGpio; + mGpioDescription->GpioDeviceCount = SoCGpioCount; + mGpioDescription->GpioExpanders = GpioExpanders; + mGpioDescription->GpioExpanderCount = GpioExpanderCount; + + *GpioDescription = mGpioDescription; + + return EFI_SUCCESS; +} + +STATIC +EFI_STATUS MvBoardDescI2cGet ( IN MARVELL_BOARD_DESC_PROTOCOL *This, IN OUT MV_BOARD_I2C_DESC **I2cDesc @@ -571,6 +620,7 @@ MvBoardDescInitProtocol ( BoardDescProtocol->BoardDescUtmiGet = MvBoardDescUtmiGet; BoardDescProtocol->BoardDescXhciGet = MvBoardDescXhciGet; BoardDescProtocol->BoardDescFree = MvBoardDescFree; + BoardDescProtocol->GpioDescriptionGet = MvBoardGpioDescriptionGet; return EFI_SUCCESS; } -- 2.7.4