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::242; helo=mail-lf0-x242.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lf0-x242.google.com (mail-lf0-x242.google.com [IPv6:2a00:1450:4010:c07::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 3D6A22110A3C6 for ; Mon, 18 Jun 2018 15:59:28 -0700 (PDT) Received: by mail-lf0-x242.google.com with SMTP id u5-v6so5932994lff.13 for ; Mon, 18 Jun 2018 15:59:28 -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=BAq84YYEkMg9IyqVTYYQYMT7uguTedJSNFEVqD4TwHE=; b=SCEFfqvajtoExE1sevQR+Z81S7+BW4quThhQoUBWgnaW4AgOMJWM54Vr+WPVkkuCH8 V+NJ/mUA5kQ360HyLFPC3Nzae/keIPPATVvZa2RmIAEHMAhHZ5fwDLVlEpPjsCaNu313 TA3TVrGTGgJ6at4co2SQcCkj72rXERcHpKbqEu1Tlbsc2/DEn99wavDMOQIssHGFaJ0d 1/SGCPiW9/Onar/u+OGD8by20S57Ec/cnVhb8IWncWLm2zy79uJxN/GdPch6PSuWnKIF AhxI4sadEXbQaeldl7sSxYrJR4ehDGkhxVOpPro2hux4PHk7l94HmNRo0NGYC87rVx02 ghHA== 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=BAq84YYEkMg9IyqVTYYQYMT7uguTedJSNFEVqD4TwHE=; b=md0OSvAfGxmKI49IqDBBKhpMv/BgNp+ZTDmsc3tLYybUS1OirZe9gv5Xj8acBBnOJZ 6OaO2gaYXNfuqAgBe6rknlizmreFvmGZWGV7Uw/vl2L5nyCzpnTcW0piqqrsOzWPPbJg 7IGK6oDT5a583Z+/tTV3qaW1ImUcwpTfpUIU9cxcXCywW2ilhJ955TbEzc6T2WA8OGCR tWyRuWQ5TnaRMoVvkEYhVRCqWxD/5N1XjbVSNCkRSFP/kavLxcm0wVYqXPuHZjCPSnD+ DRbJW0w+4en2NE8hZrNWJp+zKFCoZhdQjwJsdI8noCCIxtiZ+mEEvQ+o9M5YqjZLP4GW xdGA== X-Gm-Message-State: APt69E0V5NCSU+CrBIrCh6g4SkVgUrTaIhNpwqNoeN5z0RXvkEZz3R5c n3fn4jv7zbewOLliq96HHbHLQUWvVJ0= X-Google-Smtp-Source: ADUXVKLsU93lmM0Pq/Ph7b85eJ8ryzPuF3BtGqEoZ2a1eOv/6AUgPmy0pJF3nN5My5VH3tUajZONIQ== X-Received: by 2002:a2e:c52:: with SMTP id o18-v6mr9374106ljd.72.1529362766273; Mon, 18 Jun 2018 15:59:26 -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.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jun 2018 15:59:25 -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:40 +0200 Message-Id: <1529362724-9244-22-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 21/25] Marvell/Drivers: MvMdioDxe: 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: Mon, 18 Jun 2018 22:59:28 -0000 MvMdioDxe 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: Leif Lindholm --- Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf | 1 + Silicon/Marvell/Include/Library/MvHwDescLib.h | 23 ------------- Silicon/Marvell/Include/Protocol/Mdio.h | 4 +-- Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c | 35 ++++++++++++++++---- 4 files changed, 31 insertions(+), 32 deletions(-) diff --git a/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf index c070785..739576f 100644 --- a/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf +++ b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf @@ -60,6 +60,7 @@ UefiLib [Protocols] + gMarvellBoardDescProtocolGuid gMarvellMdioProtocolGuid [Depex] diff --git a/Silicon/Marvell/Include/Library/MvHwDescLib.h b/Silicon/Marvell/Include/Library/MvHwDescLib.h index 423ca17..0de435d 100644 --- a/Silicon/Marvell/Include/Library/MvHwDescLib.h +++ b/Silicon/Marvell/Include/Library/MvHwDescLib.h @@ -53,16 +53,6 @@ typedef struct { } MVHW_I2C_DESC; // -// MDIO devices description template definition -// -#define MVHW_MAX_MDIO_DEVS 2 - -typedef struct { - UINT8 MdioDevCount; - UINTN MdioBaseAddresses[MVHW_MAX_MDIO_DEVS]; -} MVHW_MDIO_DESC; - -// // Platform description of I2C devices // #define MVHW_CP0_I2C0_BASE 0xF2701000 @@ -77,17 +67,4 @@ MVHW_I2C_DESC mA7k8kI2cDescTemplate = {\ { MVHW_CP0_I2C0_BASE, MVHW_CP0_I2C1_BASE, MVHW_CP1_I2C0_BASE, MVHW_CP1_I2C1_BASE }\ } -// -// Platform description of MDIO devices -// -#define MVHW_CP0_MDIO_BASE 0xF212A200 -#define MVHW_CP1_MDIO_BASE 0xF412A200 - -#define DECLARE_A7K8K_MDIO_TEMPLATE \ -STATIC \ -MVHW_MDIO_DESC mA7k8kMdioDescTemplate = {\ - 2,\ - { MVHW_CP0_MDIO_BASE, MVHW_CP1_MDIO_BASE }\ -} - #endif /* __MVHWDESCLIB_H__ */ diff --git a/Silicon/Marvell/Include/Protocol/Mdio.h b/Silicon/Marvell/Include/Protocol/Mdio.h index d077a8f..076ea26 100644 --- a/Silicon/Marvell/Include/Protocol/Mdio.h +++ b/Silicon/Marvell/Include/Protocol/Mdio.h @@ -35,8 +35,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef __MDIO_H__ #define __MDIO_H__ -#include - #define MARVELL_MDIO_PROTOCOL_GUID { 0x40010b03, 0x5f08, 0x496a, { 0xa2, 0x64, 0x10, 0x5e, 0x72, 0xd3, 0x71, 0xaa }} typedef struct _MARVELL_MDIO_PROTOCOL MARVELL_MDIO_PROTOCOL; @@ -64,7 +62,7 @@ EFI_STATUS struct _MARVELL_MDIO_PROTOCOL { MARVELL_MDIO_READ Read; MARVELL_MDIO_WRITE Write; - UINTN BaseAddresses[MVHW_MAX_MDIO_DEVS]; + UINTN *BaseAddresses; UINTN ControllerCount; }; diff --git a/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c index 6c0a129..72e88bd 100644 --- a/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c +++ b/Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.c @@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. *******************************************************************************/ +#include #include #include @@ -46,8 +47,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "MvMdioDxe.h" -DECLARE_A7K8K_MDIO_TEMPLATE; - STATIC EFI_STATUS MdioCheckParam ( @@ -216,24 +215,46 @@ MvMdioDxeInitialise ( IN EFI_SYSTEM_TABLE *SystemTable ) { - MVHW_MDIO_DESC *Desc = &mA7k8kMdioDescTemplate; + MARVELL_BOARD_DESC_PROTOCOL *BoardDescProtocol; + MV_BOARD_MDIO_DESC *MdioBoardDesc; UINT8 Index; MARVELL_MDIO_PROTOCOL *Mdio; EFI_STATUS Status; EFI_HANDLE Handle = NULL; + /* Obtain list of available controllers */ + Status = gBS->LocateProtocol (&gMarvellBoardDescProtocolGuid, + NULL, + (VOID **)&BoardDescProtocol); + if (EFI_ERROR (Status)) { + return Status; + } + + Status = BoardDescProtocol->BoardDescMdioGet (BoardDescProtocol, + &MdioBoardDesc); + if (EFI_ERROR (Status)) { + return Status; + } + Mdio = AllocateZeroPool (sizeof (MARVELL_MDIO_PROTOCOL)); if (Mdio == NULL) { DEBUG ((DEBUG_ERROR, "MdioDxe: Protocol allocation failed\n")); return EFI_OUT_OF_RESOURCES; } + Mdio->BaseAddresses = AllocateZeroPool (MdioBoardDesc->MdioDevCount * + sizeof (UINTN)); + if (Mdio->BaseAddresses == NULL) { + DEBUG ((DEBUG_ERROR, "MdioDxe: Protocol allocation failed\n")); + return EFI_OUT_OF_RESOURCES; + } + /* Obtain base addresses of all possible controllers */ - for (Index = 0; Index < Desc->MdioDevCount; Index++) { - Mdio->BaseAddresses[Index] = Desc->MdioBaseAddresses[Index]; + for (Index = 0; Index < MdioBoardDesc->MdioDevCount; Index++) { + Mdio->BaseAddresses[Index] = MdioBoardDesc[Index].SoC->MdioBaseAddress; } - Mdio->ControllerCount = Desc->MdioDevCount; + Mdio->ControllerCount = MdioBoardDesc->MdioDevCount; Mdio->Read = MvMdioRead; Mdio->Write = MvMdioWrite; @@ -248,5 +269,7 @@ MvMdioDxeInitialise ( return Status; } + BoardDescProtocol->BoardDescFree (MdioBoardDesc); + return EFI_SUCCESS; } -- 2.7.4