From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::241; helo=mail-wm0-x241.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::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 9342221199B2B for ; Tue, 12 Jun 2018 15:42:11 -0700 (PDT) Received: by mail-wm0-x241.google.com with SMTP id r125-v6so1679540wmg.2 for ; Tue, 12 Jun 2018 15:42:11 -0700 (PDT) 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=XwXE/iijXXJXbVqZPU5Vot1XDA7cQ7VoBCe4z4L2YvA=; b=G71k+OImobO7zmPsPi+p0zvhh6ZG3N6URnlniORKdnkyuRuLg5Qo9JrqI6ggj8Mr1W ahkChHsKvXlGDOWfezQKhbKKHvuOncSzwVfH6kQRcXzJdmk2LQ7GoxPwY2O7mxgRh2gx eluJUOOMHvCWbCI9Eql/wFEggUKGZHlXkxpyQ= 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=XwXE/iijXXJXbVqZPU5Vot1XDA7cQ7VoBCe4z4L2YvA=; b=Yswi7/KLnnptVna7RkpM17jqPX3tE5+Ag39b3PXEEbcAq2oKBM5KKJCbx0HwjdaZZ+ Q5MzA/vWna26iZwunhjRA2i6F2tOmOWRN0fFBpR8YPYqK4ryz29aMMGVR7/osJCwOx1+ jWl4pvN0q+Q028WZf42b/KEvo6PmlSLCNfxkYpA9RHFCDExU9e4XkZb6wx2k3NNhyP8Y CZYAWYNq1wU7dsRIa3AtwPGylJWmEWR7qxdPbKBabP6NoWe9IXFr4KFoJQFkvm6GvjAb w8P2nbrC/Fe/1VtG7Nit+mS+ZVlDsJGRs38FCVDj2AB3B21KKJhv4eihHrK0o0HJRdr/ bLYw== X-Gm-Message-State: APt69E0zX1Gi8zXzKLGJEdglxVBjy2iAmbG2ne3IuRkgyBYjE3LNcx9m sWQXyBikkwqt+Pvtk+fJ9ff2/w== X-Google-Smtp-Source: ADUXVKJjCVl25MQnPORrmX5PP4yjlnRxcrsILgYu42WS6FhlCwxMl6K9Ch+V5ZCZMoijGlrINhX8fQ== X-Received: by 2002:a1c:3fc2:: with SMTP id m185-v6mr1723650wma.37.1528843329978; Tue, 12 Jun 2018 15:42:09 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id s17-v6sm902563wmc.34.2018.06.12.15.42.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Jun 2018 15:42:08 -0700 (PDT) Date: Tue, 12 Jun 2018 23:42:07 +0100 From: Leif Lindholm To: Marcin Wojtas Cc: edk2-devel@lists.01.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, jinghua@marvell.com, jsd@semihalf.com, jaz@semihalf.com Message-ID: <20180612224207.24kulpiwslyegja4@bivouac.eciton.net> References: <1528472063-1660-1-git-send-email-mw@semihalf.com> <1528472063-1660-25-git-send-email-mw@semihalf.com> MIME-Version: 1.0 In-Reply-To: <1528472063-1660-25-git-send-email-mw@semihalf.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [platforms PATCH 24/25] Marvell/Drivers: MvI2cDxe: Switch driver to use MARVELL_BOARD_DESC 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: Tue, 12 Jun 2018 22:42:12 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jun 08, 2018 at 05:34:22PM +0200, Marcin Wojtas wrote: > MvI2cDxe driver used to get Armada7k8k controller description > from hardcoded values stored in the header file MvHwDescLib.h. > As a result it is very hard to support other > Armada SoC families with this driver. > > This patch updates the driver, so that it can obtain the > description from newly introduced MARVELL_BOARD_DESC protocol, > and removes the dependency on the hardcoded structures. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marcin Wojtas > Reviewed-by: Hua Jing > --- > Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c | 37 +++++++++----------- > Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf | 1 + > 2 files changed, 18 insertions(+), 20 deletions(-) > > diff --git a/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c > index d6f590d..8694198 100755 > --- a/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c > +++ b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.c > @@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > *******************************************************************************/ > > +#include > #include > #include > #include > @@ -43,13 +44,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > #include > #include > #include > -#include > #include > > #include "MvI2cDxe.h" > > -DECLARE_A7K8K_I2C_TEMPLATE; > - > STATIC MV_I2C_BAUD_RATE baud_rate; > > STATIC MV_I2C_DEVICE_PATH MvI2cDevicePathProtocol = { > @@ -174,38 +172,37 @@ MvI2cInitialise ( > IN EFI_SYSTEM_TABLE *SystemTable > ) > { > - MVHW_I2C_DESC *Desc = &mA7k8kI2cDescTemplate; > - UINT8 *I2cDeviceTable, Index; > + MARVELL_BOARD_DESC_PROTOCOL *BoardDescProtocol; > + MV_BOARD_I2C_DESC *Desc; > + UINT8 Index; UINTN. / Leif > EFI_STATUS Status; > > - /* Obtain table with enabled I2c devices */ > - I2cDeviceTable = (UINT8 *)PcdGetPtr (PcdI2cControllersEnabled); > - if (I2cDeviceTable == NULL) { > - DEBUG ((DEBUG_ERROR, "Missing PcdI2cControllersEnabled\n")); > - return EFI_INVALID_PARAMETER; > + /* Obtain list of available controllers */ > + Status = gBS->LocateProtocol (&gMarvellBoardDescProtocolGuid, > + NULL, > + (VOID **)&BoardDescProtocol); > + if (EFI_ERROR (Status)) { > + return Status; > } > > - if (PcdGetSize (PcdI2cControllersEnabled) > MVHW_MAX_I2C_DEVS) { > - DEBUG ((DEBUG_ERROR, "Wrong PcdI2cControllersEnabled format\n")); > - return EFI_INVALID_PARAMETER; > + Status = BoardDescProtocol->BoardDescI2cGet (BoardDescProtocol, &Desc); > + if (EFI_ERROR (Status)) { > + return Status; > } > > /* Initialize enabled chips */ > - for (Index = 0; Index < PcdGetSize (PcdI2cControllersEnabled); Index++) { > - if (!MVHW_DEV_ENABLED (I2c, Index)) { > - DEBUG ((DEBUG_ERROR, "Skip I2c chip %d\n", Index)); > - continue; > - } > - > + for (Index = 0; Index < Desc->I2cDevCount; Index++) { > Status = MvI2cInitialiseController( > ImageHandle, > SystemTable, > - Desc->I2cBaseAddresses[Index] > + Desc[Index].SoC->I2cBaseAddress > ); > if (EFI_ERROR(Status)) > return Status; > } > > + BoardDescProtocol->BoardDescFree (Desc); > + > return EFI_SUCCESS; > } > > diff --git a/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf > index a7cf52e..0eef350 100755 > --- a/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf > +++ b/Silicon/Marvell/Drivers/I2c/MvI2cDxe/MvI2cDxe.inf > @@ -61,6 +61,7 @@ > gEfiDevicePathProtocolGuid > gEfiI2cEnumerateProtocolGuid > gEfiI2cBusConfigurationManagementProtocolGuid > + gMarvellBoardDescProtocolGuid > > [Pcd] > gMarvellTokenSpaceGuid.PcdI2cSlaveAddresses > -- > 2.7.4 >