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::241; helo=mail-lf0-x241.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x241.google.com (mail-lf0-x241.google.com [IPv6:2a00:1450:4010:c07::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 6262120972840 for ; Sun, 17 Jun 2018 13:12:59 -0700 (PDT) Received: by mail-lf0-x241.google.com with SMTP id n24-v6so5818185lfh.3 for ; Sun, 17 Jun 2018 13:12:59 -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=0feOdrq7dn5ZqdPT5VLE+R+2QganUy0gyXPohr/KRPA=; b=RFB56RVgzeB13ONV5EZ2ytRBjubhBTq94GXOSwpaAVn7NZdaAWbguvhwztCP2nxI7R 82WzF1N7fGX3WDo7T6LNxH5oSEnn/LXDDTJ8wn1GzJ1qFVyBeQ7PY9H2eT5KFzdH74h2 JlNh4DosMIlPpIOwDSRRXRc+5K4TUUnD7utfWKLKn/5AIiTBO3GUpoCImegfYAL5g3iP A7cxawTyrzgHnQA1T9b+aKxX5tBMKuEBnva4w1HpPYuAqjsLpIjLg4lQyOkrYphuf+vK gT6jsyX5qP5HOqNEBL+jqGFnna9hjJrdTfJnvL0Y+HYAUqtuyNXM1YkR851/ENmbHFz1 q8lw== 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=0feOdrq7dn5ZqdPT5VLE+R+2QganUy0gyXPohr/KRPA=; b=DaePOQBn4qIqjctqKF1NsyUQ33bUPHOqQ2ICuz4Tu3lNenv6/H2fiOgaEeaZAHh20Z Omeb5YLHir/N6naHAJKI/1XeHx9w0upalO6jiRhXqyCJTUHvd4d7ugER2jypkXFBUJvQ 4o2vSe1pvkujyDtb5vn/v4FNTJ4BS8WnwL9zpjGoAScnCKt7mdiczQJvEcs7mgAZ77OW +e+oueJkrQQZ7PCy9vERVjrvpG0NFNFQ8pl02dFAyMQyvb4KEDYPlNO5HqKHi75A5REx TQ39M5QrexGMeBKL5pM3yaDbLH15dnM9MOmxx13Jnmhy8DL0pP4kN1T2J5bWFVx9RrkJ 1Smg== X-Gm-Message-State: APt69E2eKeBDNasJL51xX86uQ5yaUiP73ddRHbS5R1LmFN+OrYT3Qlzs KMz41bx+cRxumKFqShS8DFCGz3/1hbc= X-Google-Smtp-Source: ADUXVKLFjWzmxsOqKzRBgGdrpAv3r1RMHigJD6RCPNCxgdVj+0XSOZacJpmu7Jl2DkcFLeyQ1K2J9A== X-Received: by 2002:a2e:7a0f:: with SMTP id v15-v6mr6609954ljc.68.1529266377480; Sun, 17 Jun 2018 13:12:57 -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 q75-v6sm387272lfq.47.2018.06.17.13.12.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Jun 2018 13:12:56 -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: Sun, 17 Jun 2018 22:12:05 +0200 Message-Id: <1529266325-18371-26-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529266325-18371-1-git-send-email-mw@semihalf.com> References: <1529266325-18371-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v2 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: Sun, 17 Jun 2018 20:13:00 -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 --- 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