From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4010:c07::244; helo=mail-lf0-x244.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x244.google.com (mail-lf0-x244.google.com [IPv6:2a00:1450:4010:c07::244]) (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 494A621109FFE for ; Mon, 18 Jun 2018 15:59:33 -0700 (PDT) Received: by mail-lf0-x244.google.com with SMTP id i15-v6so27174618lfc.2 for ; Mon, 18 Jun 2018 15:59:33 -0700 (PDT) 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=8a8idFuSEi/1mQFoRZV7gkYZt3eZJQlJAfvzyckuHRc=; b=TnvXjepYwf9nBmqyRSuHtQ3GKdRWWPJYc5R4OOrW3m7ov5jicaQKblDrbsxbct/GdH qNLivWL+z2ZJ8e+D5H7Ql5ZXiRllOa2X/XVDnZBNxyzFRvoHe2i4yq3oMzthAS7x3hTQ sXjSTkUGROdzTRtvqSCNCR10hstxy9c+8KdVa0eQ+f1XihGw8mrYn2BreNbiyrk3nuu6 waS4JPJDb04U2MZsywIp5IMO2h7ag06G35sDSDSXlBwgI1xE55hN6mP1aslKaSg0E1ou o2LcqbnZis9NrBeFVewvl8n5H5ZGeXFZoTAggsfvEB9ptIEB0V1jw7PiAwAoRqi8MYMa B/Lg== 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=8a8idFuSEi/1mQFoRZV7gkYZt3eZJQlJAfvzyckuHRc=; b=GWcJWgC1nvWVwuUtOP8E0/fr4Nzl/IRNv+7dRkjFBnVhteYubEPNBxgxapSX71wTsT jbbX4b+dEv51oxW5JLpI1vWSv+5jGiNEAY8PcdzcLQglMb86gdTtkMku2CmzufzHend5 zcWNzb2SJNHmC4dNMPLlZtX/cf87jdXV41vB70YafLl0/lrVxaw9fis0NMZl5b5AZ4LO qOT2nS1GWvEl+/5zyBJDibJCLthZTQ57F9Wtxg0OPT5p6JBCyoALU6S+AbVrW3xG7ezN gV/UdZ173/95TBHh6F845kXP89ZF+I6TXT2tiG3FxNu9OrU0kK5gSvPkP2cHKA17Vcha 4gxA== X-Gm-Message-State: APt69E0ccrE3fBo2G49TeoYMsw3kCFDOP0+nZz9NZ7WuIbZrFgvUxoLp FUC94Nuo58o4qp8W/TL26e4ASrhX39A= X-Google-Smtp-Source: ADUXVKIgCl7u7UVY6Erkubf82qWR7RmNu2zYBp/l9AqcFc9xNIsEBDeE4MhSLNCDPRE6puGi5uTRMA== X-Received: by 2002:a19:8f55:: with SMTP id r82-v6mr2614358lfd.67.1529362771218; Mon, 18 Jun 2018 15:59:31 -0700 (PDT) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id h136-v6sm3020754lfe.23.2018.06.18.15.59.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jun 2018 15:59:30 -0700 (PDT) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, jinghua@marvell.com, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com Date: Tue, 19 Jun 2018 00:58:44 +0200 Message-Id: <1529362724-9244-26-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529362724-9244-1-git-send-email-mw@semihalf.com> References: <1529362724-9244-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v3 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: Mon, 18 Jun 2018 22:59:33 -0000 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: Leif Lindholm --- Silicon/Marvell/Include/Library/MvHwDescLib.h | 70 -------------------- Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c | 4 +- 2 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 Silicon/Marvell/Include/Library/MvHwDescLib.h 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__ */ diff --git a/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c b/Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.c index dd2edae..9be0489 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,8 @@ 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)); return EFI_INVALID_PARAMETER; } -- 2.7.4