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::143; helo=mail-lf1-x143.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf1-x143.google.com (mail-lf1-x143.google.com [IPv6:2a00:1450:4864:20::143]) (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 E0DE82194D3AE for ; Wed, 9 Jan 2019 17:45:04 -0800 (PST) Received: by mail-lf1-x143.google.com with SMTP id e26so7140776lfc.2 for ; Wed, 09 Jan 2019 17:45:04 -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=jmyItvIvrw+POPBksYiYS6PClDJvVKndnM+fA+wCBmc=; b=LbnEwP8GpaYelweyNVboYpKUVobfRvGaN0bmLFyX1fRowj4tDozD6yKAQFZNFMqZ/L I07Vz361zenzOKBiAHNA77+EjsAwoVqn2dCZ2LU7gOaP3ZItOmSuaNu5cOtg68MpJXRG DnYYNUoHUl4ByNNP9sJtt3PvL8JptS5X66q6d1EryFPrANpaOP9DXVWg8oPxZdrQFOrU 42CJsB64gz/FzgKNnqYKyKuQtPyseCdmDv0y/3BW62DowAiFt3Opqr1vkMd032bgssua BANKeaEDuGbZrNNTSJtU+YnF8twGMvbazygPxrKT+1mqEHVIr6hGgjRB5sHo/BEy9M0v e3Sw== 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=jmyItvIvrw+POPBksYiYS6PClDJvVKndnM+fA+wCBmc=; b=As0Lknz3H2LKKhGLimV89AP24j72Oa1+VBU2ZM2pbGoxFUSJFYwxPJ3YQM3vyLcG2K mOr+UwBGiWfOgMbAEo+yYV9pkzht7wVKpgzLWlmkXAQHmRO5/lVJcBtGtiC363vXY07v R9ysK7tLsxSn5wPDxQNQsjRPF50ADXh/qlSZcxGJ2hsriRgfsdu0hgjvg1GEZI/YKN5m gtQWdaD5+UlxO3wiL6dOM/38sRdqDWPJ9YqxNtxn3htg83UJraatvyYKK+oOjpH/e0/F XzrSOt37elNBqQakgC6IrLlUuuLvwcDbHF/XZ41JVv7WpVYl+FDNno1DSwhHnLyhy9Bf mvAg== X-Gm-Message-State: AJcUukfmptcujlLMOX+t5u/qYxKh6KzqSJLgOkcB573NBpVk4e7UtJ4C hbl8/zURNzlf8EXnaMu7AECFMX+LmQI= X-Google-Smtp-Source: ALg8bN7IOPC1ONPEfVlb15ihjZQBESVI1EX4LbfiX2zctvqznD4xhqhF3zVnr/NYFpIhzLeg3hYJkA== X-Received: by 2002:a19:ee08:: with SMTP id g8mr4869577lfb.72.1547084702828; Wed, 09 Jan 2019 17:45:02 -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 l21-v6sm15034142ljj.48.2019.01.09.17.45.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Jan 2019 17:45:02 -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, 10 Jan 2019 02:44:33 +0100 Message-Id: <1547084679-29597-7-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1547084679-29597-1-git-send-email-mw@semihalf.com> References: <1547084679-29597-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v2 06/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, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -0000 X-List-Received-Date: Thu, 10 Jan 2019 01:45:05 -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 | 43 ++++++++++++++++++++ 2 files changed, 51 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..e348b85 100644 --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c @@ -100,6 +100,48 @@ MvBoardDescComPhyGet ( STATIC EFI_STATUS +MvBoardGpioDescriptionGet ( + IN MARVELL_BOARD_DESC_PROTOCOL *This, + IN OUT MV_BOARD_GPIO_DESCRIPTION **GpioDescription + ) +{ + MV_BOARD_GPIO_DESCRIPTION *Description; + UINTN SoCGpioCount, GpioExpanderCount; + MV_GPIO_EXPANDER *GpioExpanders; + GPIO_CONTROLLER *SoCGpio; + EFI_STATUS Status; + + /* 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 I2C IO expanders */ + Status = ArmadaBoardGpioExpanderGet (&GpioExpanders, &GpioExpanderCount); + if (EFI_ERROR (Status)) { + return Status; + } + + /* Allocate and fill board description */ + Description = AllocateZeroPool (sizeof (MV_BOARD_GPIO_DESCRIPTION)); + if (Description == NULL) { + DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); + return EFI_OUT_OF_RESOURCES; + } + + Description->SoCGpio = SoCGpio; + Description->GpioDeviceCount = SoCGpioCount; + Description->GpioExpanders = GpioExpanders; + Description->GpioExpanderCount = GpioExpanderCount; + + *GpioDescription = Description; + + return EFI_SUCCESS; +} + +STATIC +EFI_STATUS MvBoardDescI2cGet ( IN MARVELL_BOARD_DESC_PROTOCOL *This, IN OUT MV_BOARD_I2C_DESC **I2cDesc @@ -571,6 +613,7 @@ MvBoardDescInitProtocol ( BoardDescProtocol->BoardDescUtmiGet = MvBoardDescUtmiGet; BoardDescProtocol->BoardDescXhciGet = MvBoardDescXhciGet; BoardDescProtocol->BoardDescFree = MvBoardDescFree; + BoardDescProtocol->GpioDescriptionGet = MvBoardGpioDescriptionGet; return EFI_SUCCESS; } -- 2.7.4