From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::441; helo=mail-wr1-x441.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (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 7A1A3211B5098 for ; Mon, 14 Jan 2019 15:45:22 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id l9so874747wrt.13 for ; Mon, 14 Jan 2019 15:45:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=zGIve1LvS/xvNwmwZoMiIJ5C2dOSadEckIK1fQuve4c=; b=D0kmJxe77kp3Iie0Ppo4Md7RpPkqXJtum8aSpRqvKZuX3UCFSUhPvR/B6uUclKuBR2 wMIkjDLYAoq0w2BX00CuwKmfxFwqTqlA/DuV0EB6SZZKQCsG6MR+01HUUdxEmF4ly5eK IRmZTN2PCPsMuNmiQz2VkDP4WTuwJmPeTa+rQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=zGIve1LvS/xvNwmwZoMiIJ5C2dOSadEckIK1fQuve4c=; b=chxRJ2cdCT7k9UV7X/QZQlXwHProAYJ2ctd0Y1CoP/NzKaaLiYfv8RCq8xilJznZ4+ feg7o+JvJLJmWbmAD8RRIJiYaL9OqQPtBX/4tRi2opBMY2chxoSz1LKzmtPcrZxWKx6Y vpZkDIlcCK1oo2w1xxjSpNLEQQfPcFcGxqYl/4s3PjhbhabnSCNDG29xYBBYbRkN3SQ8 ojWz6U9X209NtIwvPTxjjpsTePsArcRr9ZbZc3R+ZpbbMckoFKYTZD++AYNJYgbG/dfA 3YAke5cPjKKSM80pTIcnufhmMBn9IVXm+x9339pnPMJKb4sk1cpyMzgpJi4B9sE54sae Q/tA== X-Gm-Message-State: AJcUukd+vK0pK1sxf20nSMW4P3aazq5hZuPbuo03Fc7lb0Symhcs42dr Visbm0oI5F4WTR4JTSmJOxLYm4CBbik= X-Google-Smtp-Source: ALg8bN5OAPoZqX1zVOWSmijWPKob7zIgahBcVmdaWuJPMCxFJm/E3+Lnr3VBegojauDSdJ83kYFk+g== X-Received: by 2002:a5d:5607:: with SMTP id l7mr675197wrv.25.1547509520782; Mon, 14 Jan 2019 15:45:20 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id 129sm48089983wmd.18.2019.01.14.15.45.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 Jan 2019 15:45:19 -0800 (PST) Date: Mon, 14 Jan 2019 23:45:18 +0000 From: Leif Lindholm To: Marcin Wojtas Cc: edk2-devel@lists.01.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com Message-ID: <20190114234518.ftnywsbyywyr76wq@bivouac.eciton.net> References: <1547084679-29597-1-git-send-email-mw@semihalf.com> <1547084679-29597-2-git-send-email-mw@semihalf.com> MIME-Version: 1.0 In-Reply-To: <1547084679-29597-2-git-send-email-mw@semihalf.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [platforms: PATCH v2 01/12] Marvell/Library: ArmadaSoCDescLib: Add GPIO information 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: Mon, 14 Jan 2019 23:45:23 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Jan 10, 2019 at 02:44:28AM +0100, Marcin Wojtas wrote: > This patch introduces new library callback (ArmadaSoCGpioGet ()), > which dynamically allocates and fills EmbeddedGpio's > GPIO_CONTROLLER structure with the SoC description of GPIO controllers. > > Because the library header is indirectly used in many modules, > update all dependencies after including EmbeddedGpio.h. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marcin Wojtas Reviewed-by: Leif Lindholm > --- > Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf | 1 + > Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf | 1 + > Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf | 1 + > Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf | 1 + > Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf | 1 + > Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf | 1 + > Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf | 1 + > Silicon/Marvell/Library/IcuLib/IcuLib.inf | 1 + > Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf | 1 + > Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h | 10 +++++ > Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h | 12 ++++++ > Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c | 39 ++++++++++++++++++++ > 12 files changed, 70 insertions(+) > > diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf > index 5503463..e707fe9 100644 > --- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf > +++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf > @@ -25,6 +25,7 @@ > PlatInitDxe.c > > [Packages] > + EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > Silicon/Marvell/Marvell.dec > diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf > index 2b73b73..48a320c 100644 > --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf > +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.inf > @@ -24,6 +24,7 @@ > Armada7k8kSoCDescLib.c > > [Packages] > + EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > Silicon/Marvell/Marvell.dec > diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf > index 0b93948..0b641fe 100644 > --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf > +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf > @@ -42,6 +42,7 @@ > MvBoardDescDxe.h > > [Packages] > + EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > Silicon/Marvell/Marvell.dec > diff --git a/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf > index 0eef350..e5bd370 100755 > --- a/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf > +++ b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf > @@ -41,6 +41,7 @@ > MvI2cDxe.c > > [Packages] > + EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > ArmPlatformPkg/ArmPlatformPkg.dec > diff --git a/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf > index 739576f..8a877da 100644 > --- a/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf > +++ b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf > @@ -45,6 +45,7 @@ > [Packages] > ArmPkg/ArmPkg.dec > ArmPlatformPkg/ArmPlatformPkg.dec > + EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > Silicon/Marvell/Marvell.dec > diff --git a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf > index 00c738a..09c5842 100644 > --- a/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf > +++ b/Silicon/Marvell/Drivers/SdMmc/XenonDxe/XenonDxe.inf > @@ -35,6 +35,7 @@ > XenonSdMmcOverride.h > > [Packages] > + EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > Silicon/Marvell/Marvell.dec > diff --git a/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf > index 36f498b..c360edd 100644 > --- a/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf > +++ b/Silicon/Marvell/Library/ComPhyLib/ComPhyLib.inf > @@ -41,6 +41,7 @@ > [Packages] > MdePkg/MdePkg.dec > MdeModulePkg/MdeModulePkg.dec > + EmbeddedPkg/EmbeddedPkg.dec > ArmPkg/ArmPkg.dec > ArmPlatformPkg/ArmPlatformPkg.dec > Silicon/Marvell/Marvell.dec > diff --git a/Silicon/Marvell/Library/IcuLib/IcuLib.inf b/Silicon/Marvell/Library/IcuLib/IcuLib.inf > index 0010141..ea662be 100644 > --- a/Silicon/Marvell/Library/IcuLib/IcuLib.inf > +++ b/Silicon/Marvell/Library/IcuLib/IcuLib.inf > @@ -24,6 +24,7 @@ > IcuLib.c > > [Packages] > + EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > Silicon/Marvell/Marvell.dec > diff --git a/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf > index e2381f4..805a057 100644 > --- a/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf > +++ b/Silicon/Marvell/Library/UtmiPhyLib/UtmiPhyLib.inf > @@ -41,6 +41,7 @@ > [Packages] > ArmPkg/ArmPkg.dec > ArmPlatformPkg/ArmPlatformPkg.dec > + EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > MdePkg/MdePkg.dec > Silicon/Marvell/Marvell.dec > diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h > index c14b985..bfc8639 100644 > --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h > +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.h > @@ -22,6 +22,7 @@ > // Common macros > // > #define MV_SOC_CP_BASE(Cp) (0xF2000000 + ((Cp) * 0x2000000)) > +#define MV_SOC_AP806_COUNT 1 > > // > // Platform description of AHCI controllers > @@ -38,6 +39,15 @@ > #define MV_SOC_COMPHY_MUX_BITS 4 > > // > +// Platform description of GPIO controllers > +// > +#define MV_SOC_AP806_GPIO_BASE 0xF06F5040 > +#define MV_SOC_AP806_GPIO_PIN_COUNT 20 > +#define MV_SOC_GPIO_PER_CP_COUNT 2 > +#define MV_SOC_CP_GPIO_BASE(Gpio) (0x440100 + ((Gpio) * 0x40)) > +#define MV_SOC_CP_GPIO_PIN_COUNT(Gpio) ((Gpio) == 0 ? 32 : 31) > + > +// > // Platform description of I2C controllers > // > #define MV_SOC_I2C_PER_CP_COUNT 2 > diff --git a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h > index cdfb51b..26b075a 100644 > --- a/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h > +++ b/Silicon/Marvell/Include/Library/ArmadaSoCDescLib.h > @@ -17,6 +17,8 @@ > #include > #include > > +#include > + > // > // ComPhy SoC description > // > @@ -46,6 +48,16 @@ ArmadaSoCDescCpBaseGet ( > ); > > // > +// GPIO devices description template definition > +// > +EFI_STATUS > +EFIAPI > +ArmadaSoCGpioGet ( > + IN OUT GPIO_CONTROLLER **SoCGpioDescription, > + IN OUT UINTN *Count > + ); > + > +// > // I2C > // > typedef struct { > diff --git a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c > index 6902fda..5b72c20 100644 > --- a/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c > +++ b/Silicon/Marvell/Armada7k8k/Library/Armada7k8kSoCDescLib/Armada7k8kSoCDescLib.c > @@ -74,6 +74,45 @@ ArmadaSoCDescCpBaseGet ( > > EFI_STATUS > EFIAPI > +ArmadaSoCGpioGet ( > + IN OUT GPIO_CONTROLLER **SoCGpioDescription, > + IN OUT UINTN *Count > + ) > +{ > + GPIO_CONTROLLER *GpioInstance; > + UINTN CpCount, CpIndex, Index; > + > + CpCount = FixedPcdGet8 (PcdMaxCpCount); > + > + *Count = CpCount * MV_SOC_GPIO_PER_CP_COUNT + MV_SOC_AP806_COUNT; > + GpioInstance = AllocateZeroPool (*Count * sizeof (GPIO_CONTROLLER)); > + if (GpioInstance == NULL) { > + DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); > + return EFI_OUT_OF_RESOURCES; > + } > + > + *SoCGpioDescription = GpioInstance; > + > + /* AP806 GPIO controller */ > + GpioInstance->RegisterBase = MV_SOC_AP806_GPIO_BASE; > + GpioInstance->InternalGpioCount = MV_SOC_AP806_GPIO_PIN_COUNT; > + GpioInstance++; > + > + /* CP110 GPIO controllers */ > + for (CpIndex = 0; CpIndex < CpCount; CpIndex++) { > + for (Index = 0; Index < MV_SOC_GPIO_PER_CP_COUNT; Index++) { > + GpioInstance->RegisterBase = MV_SOC_CP_BASE (CpIndex) + > + MV_SOC_CP_GPIO_BASE (Index); > + GpioInstance->InternalGpioCount = MV_SOC_CP_GPIO_PIN_COUNT (Index); > + GpioInstance++; > + } > + } > + > + return EFI_SUCCESS; > +} > + > +EFI_STATUS > +EFIAPI > ArmadaSoCDescI2cGet ( > IN OUT MV_SOC_I2C_DESC **I2cDesc, > IN OUT UINTN *DescCount > -- > 2.7.4 >