From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:4864:20::243; helo=mail-lj1-x243.google.com; envelope-from=mw@semihalf.com; receiver=edk2-devel@lists.01.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) (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 08DC821A07A82 for ; Wed, 7 Nov 2018 17:59:17 -0800 (PST) Received: by mail-lj1-x243.google.com with SMTP id s15-v6so16565907lji.3 for ; Wed, 07 Nov 2018 17:59:16 -0800 (PST) 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=thvZPDAgRImJ2Q6mq0W2Jp1EHVCjH6iD3Ctgd68jUYI=; b=UyaP85VYIJdLfuTArgFFavpbDIEt+8g5/5tA9wSgSKsjyMmxGSqBkQUvxziD4QC8YZ GV+7Ani8dOy9VSu6S0ZUm9Vg5TRugdBne2WBl/5cc8tjVvq/ET67GhSzp+12adJazAb5 c+HsxM75+jmEIL6wpnUMy5d7HcS5LVvyqzZxPYDB87uJzQYCb2NGyNrhk2HHF8hSASf3 OmwJqOXq7peIf+fv8IIXeE8IN4Js7mb2wfFtpkFQVXC7J595UlSUGl8jY3K2KrzkKXmS 6NQL/aLuG3DQp1nXL2cX82zz688sYIzjBt+zr0uY5QNuEw8XBdaqn/NzF7hlc+Xs6S2H Vuvw== 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=thvZPDAgRImJ2Q6mq0W2Jp1EHVCjH6iD3Ctgd68jUYI=; b=ZS7u6/XoUj8xFerFG2Nrm3JHrZc6O85aVv36E/f6wJQ/MyeAUzZqO+4tMV7vY2wes7 Hc6Vq6Ozm4otVEHOcnJrIe4VzM9R+4ZDTg6Bi0FmHtJ6OxQHDUJNwaMR2HlnkdLB7TZc RkDZBhV7cjKvRadhxRrvd4pP+WNAGg0huWbzJFl3NhYXZnBRJyR7cHI39LReb/Z5owXv M0ss7BJ1HNchbbvRpavxwMaoqrcYlxf79nPQO8MwR6uLKWN8t+lWoL8hG+mbQL9X4sRP hKtsq7G0fOCcE7chIiEn88FkMnm2nYfvQcSDlpvf17joyXlPk0DZ18ruwu2OpFo696Dh pYGQ== X-Gm-Message-State: AGRZ1gLu9AxPrrEQvHLts8zJfXO6e001HfqzkOPzvBo9zK9Ylm+B+J+L kYYf/83GCC0zKxt58on2A40q/IlOotI= X-Google-Smtp-Source: AJdET5dc0spvLPhpdY2Zvmke1bfysxUVqxqZymdNtQDTY8PT8oR3cyQk7l76zzsY8HTwZNFBlBZcqQ== X-Received: by 2002:a2e:8187:: with SMTP id e7-v6mr1611931ljg.50.1541642355079; Wed, 07 Nov 2018 17:59:15 -0800 (PST) Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id f8sm427174lfb.2.2018.11.07.17.59.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Nov 2018 17:59:14 -0800 (PST) From: Marcin Wojtas To: edk2-devel@lists.01.org Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, hao.a.wu@intel.com, nadavh@marvell.com, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com, tm@semihalf.com Date: Thu, 8 Nov 2018 02:57:45 +0100 Message-Id: <1541642266-15643-7-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1541642266-15643-1-git-send-email-mw@semihalf.com> References: <1541642266-15643-1-git-send-email-mw@semihalf.com> Subject: [platforms: PATCH v3 6/7] Marvell/Drivers: MvBoardDesc: Extend information for SdMmc X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Nov 2018 01:59:17 -0000 X-List-Received-Date: Thu, 08 Nov 2018 01:59:17 -0000 X-List-Received-Date: Thu, 08 Nov 2018 01:59:17 -0000 X-List-Received-Date: Thu, 08 Nov 2018 01:59:17 -0000 From: Tomasz Michalec Extend MvBoardDescSdMmcGet function to fill MV_BOARD_SDMMC_DESC with Xenon specific info obtained from ArmadaBoardDescLib. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas --- Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf | 1 + Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c | 24 +++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf index 41f72d6..0b93948 100644 --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf @@ -47,6 +47,7 @@ Silicon/Marvell/Marvell.dec [LibraryClasses] + ArmadaBoardDescLib ArmadaSoCDescLib DebugLib MemoryAllocationLib diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c index 39dc06c..f71bfc4 100644 --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c @@ -270,6 +270,7 @@ MvBoardDescSdMmcGet ( { UINT8 *SdMmcDeviceEnabled; UINTN SdMmcCount, SdMmcDeviceTableSize, SdMmcIndex, Index; + UINTN SdMmcDevCount; MV_BOARD_SDMMC_DESC *BoardDesc; MV_SOC_SDMMC_DESC *SoCDesc; EFI_STATUS Status; @@ -280,6 +281,13 @@ MvBoardDescSdMmcGet ( return Status; } + /* Get per-board configuration of the controllers */ + Status = ArmadaBoardDescSdMmcGet (&SdMmcDevCount, &BoardDesc); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "%a: ArmadaBoardDescSdMmcGet filed\n", __FUNCTION__)); + return Status; + } + /* * Obtain table with enabled SDMMC controllers * which is represented as an array of UINT8 values @@ -294,18 +302,12 @@ MvBoardDescSdMmcGet ( SdMmcDeviceTableSize = PcdGetSize (PcdPciESdhci); /* Check if PCD with SDMMC controllers is correctly defined */ - if (SdMmcDeviceTableSize > SdMmcCount) { + if ((SdMmcDeviceTableSize > SdMmcCount) || + (SdMmcDeviceTableSize < SdMmcDevCount)) { DEBUG ((DEBUG_ERROR, "%a: Wrong PcdPciESdhci format\n", __FUNCTION__)); return EFI_INVALID_PARAMETER; } - /* Allocate and fill board description */ - BoardDesc = AllocateZeroPool (SdMmcDeviceTableSize * sizeof (MV_BOARD_SDMMC_DESC)); - if (BoardDesc == NULL) { - DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); - return EFI_OUT_OF_RESOURCES; - } - SdMmcIndex = 0; for (Index = 0; Index < SdMmcDeviceTableSize; Index++) { if (!SdMmcDeviceEnabled[Index]) { @@ -313,6 +315,12 @@ MvBoardDescSdMmcGet ( continue; } + if (SdMmcIndex >= SdMmcDevCount) { + DEBUG ((DEBUG_ERROR, + "%a: More enabled devices than returned by ArmadaBoardDescSdMmcGet\n", + __FUNCTION__)); + return EFI_INVALID_PARAMETER; + } BoardDesc[SdMmcIndex].SoC = &SoCDesc[Index]; SdMmcIndex++; } -- 2.7.4