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::242; helo=mail-wm0-x242.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (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 8247C21306CC6 for ; Tue, 12 Jun 2018 15:44:39 -0700 (PDT) Received: by mail-wm0-x242.google.com with SMTP id j15-v6so1722661wme.0 for ; Tue, 12 Jun 2018 15:44:39 -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=hDEdDdxxjk8q4UG3tkAYCdFaVyBpd2XQPVw5CpDG7jE=; b=T/yBfpNyJXYqC73ugjwlxEGcXdSQUCBd6Rr3UNBSpxhCeNwjcnb/600Hjv19MJdcpi juHKAk9Nk9ngUtW2uYzcLLdkoM2NIzuohnFLiaIrBtkJHtkg0C07qn3VqB/aeEAMJdzF POfzRqKYCzhk4gp2t8P2t/phBc4ebJuE0yMy4= 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=hDEdDdxxjk8q4UG3tkAYCdFaVyBpd2XQPVw5CpDG7jE=; b=Wd7ZDSmrkKPKAfbs+UVodX17PINhS38modFoL6nsAffS2vslk2K0HkjgUyFxp01ylo foqgft3mBp2ivzdZBTs4MKZBBG6cWTuzkCLZiUS49j1V/2NiL4bczzB4U2JqWP/LnGJk xQ4ydDg/MfL0RwVrdh8O2LoHI3iaxbYGefX4D5Vry9UQkKwlHeiOUaRxGtTgioFaTHTj gZf7pn72g6SJyAt/utsiesY2yLUTion2t+BV0/mNGDwJcT9BOBNS1Mr+nKCcxiIXe1ol nSPVbomRx1eENYxl4hERKTZN5pIuPGqS4g2vDpIRmWwUbbjJKVhpO3s6fiGAvs5TqS84 9nhg== X-Gm-Message-State: APt69E271MISkVMsSmkLOpY72xjX8jEUNl3xlUmVz+/RAYtOnRE+icoa tkvmUeszdwAGIsOBYB3KFQXt/w== X-Google-Smtp-Source: ADUXVKLB2KoGeiRhNNDQvDel3BOG+1tnvXsfIzVwrwwJKiHLjss3VtBLuX1+i5RI6BDCJw9r5JoxXw== X-Received: by 2002:a1c:43c5:: with SMTP id q188-v6mr1845559wma.69.1528843478093; Tue, 12 Jun 2018 15:44:38 -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 l41-v6sm2100861wre.87.2018.06.12.15.44.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Jun 2018 15:44:36 -0700 (PDT) Date: Tue, 12 Jun 2018 23:44:35 +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: <20180612224435.l2az3yxyooqh4jmm@bivouac.eciton.net> References: <1528472063-1660-1-git-send-email-mw@semihalf.com> <1528472063-1660-26-git-send-email-mw@semihalf.com> MIME-Version: 1.0 In-Reply-To: <1528472063-1660-26-git-send-email-mw@semihalf.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [platforms PATCH 25/25] Marvell/Drivers: MvPhyDxe: Remove MvHwDescLib.h dependency 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:44:39 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jun 08, 2018 at 05:34:23PM +0200, Marcin Wojtas wrote: > Finally, after switching to new MV_BOARD_DESC solution > in all drivers, stop using MvHwDescLib.h by its last user > and safely remove this header. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marcin Wojtas > Reviewed-by: Hua Jing > --- > Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c | 3 +- > Silicon/Marvell/Include/Library/MvHwDescLib.h | 70 -------------------- > 2 files changed, 1 insertion(+), 72 deletions(-) > > diff --git a/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c b/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c > index dd2edae..3deb286 100644 > --- a/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c > +++ b/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c > @@ -41,7 +41,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > #include > #include > #include > -#include > #include > #include > #include > @@ -380,7 +379,7 @@ MvPhyInit ( > MdioIndex = Phy2MdioController[PhyIndex]; > > /* Verify correctness of PHY <-> MDIO assignment */ > - if (!MVHW_DEV_ENABLED (Mdio, MdioIndex) || MdioIndex >= Mdio->ControllerCount) { > + if (MdioDeviceTable[MdioIndex] == 0 || MdioIndex >= Mdio->ControllerCount) { > DEBUG ((DEBUG_ERROR, "MvPhyDxe: Incorrect Mdio controller assignment for PHY#%d", PhyIndex)); I think I already commented on lack of parentheses - just keep those added ones. / Leif > return EFI_INVALID_PARAMETER; > } > diff --git a/Silicon/Marvell/Include/Library/MvHwDescLib.h b/Silicon/Marvell/Include/Library/MvHwDescLib.h > deleted file mode 100644 > index 0de435d..0000000 > --- a/Silicon/Marvell/Include/Library/MvHwDescLib.h > +++ /dev/null > @@ -1,70 +0,0 @@ > -/******************************************************************************** > -Copyright (C) 2017 Marvell International Ltd. > - > -Marvell BSD License Option > - > -If you received this File from Marvell, you may opt to use, redistribute and/or > -modify this File under the following licensing terms. > -Redistribution and use in source and binary forms, with or without modification, > -are permitted provided that the following conditions are met: > - > -* Redistributions of source code must retain the above copyright notice, > - this list of conditions and the following disclaimer. > - > -* Redistributions in binary form must reproduce the above copyright > - notice, this list of conditions and the following disclaimer in the > - documentation and/or other materials provided with the distribution. > - > -* Neither the name of Marvell nor the names of its contributors may be > - used to endorse or promote products derived from this software without > - specific prior written permission. > - > -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND > -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED > -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE > -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR > -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; > -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON > -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > - > -*******************************************************************************/ > - > -#ifndef __MVHWDESCLIB_H__ > -#define __MVHWDESCLIB_H__ > - > -// > -// Helper macros > -// > - > -// Check if device is enabled - it expects PCD to be read to 'DeviceTable' array > -#define MVHW_DEV_ENABLED(type, index) (type ## DeviceTable[index]) > - > -// > -// I2C devices description template definition > -// > -#define MVHW_MAX_I2C_DEVS 4 > - > -typedef struct { > - UINT8 I2cDevCount; > - UINTN I2cBaseAddresses[MVHW_MAX_I2C_DEVS]; > -} MVHW_I2C_DESC; > - > -// > -// Platform description of I2C devices > -// > -#define MVHW_CP0_I2C0_BASE 0xF2701000 > -#define MVHW_CP0_I2C1_BASE 0xF2701100 > -#define MVHW_CP1_I2C0_BASE 0xF4701000 > -#define MVHW_CP1_I2C1_BASE 0xF4701100 > - > -#define DECLARE_A7K8K_I2C_TEMPLATE \ > -STATIC \ > -MVHW_I2C_DESC mA7k8kI2cDescTemplate = {\ > - 4,\ > - { MVHW_CP0_I2C0_BASE, MVHW_CP0_I2C1_BASE, MVHW_CP1_I2C0_BASE, MVHW_CP1_I2C1_BASE }\ > -} > - > -#endif /* __MVHWDESCLIB_H__ */ > -- > 2.7.4 >