From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=a0CF5Bvi; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.208.193, mailfrom: mw@semihalf.com) Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by groups.io with SMTP; Thu, 02 May 2019 16:50:36 -0700 Received: by mail-lj1-f193.google.com with SMTP id d15so3779201ljc.7 for ; Thu, 02 May 2019 16:50:36 -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=usPEXq6up5uqNgxC1QIqylP01evzEEMwdWS+Y/AKnj4=; b=a0CF5BvivKHD2itS0q2G6IZ2eUdPAF4K8Uh/T6GBrwRQLheiwZJKRSh8AAD87OVjiu kTm3h7HuQoMzB5PhiiuMHY0vDd4hQsy+76kbOk6tPXtMzOebx1VQyPE1KdzTM1L5twYh 6RFXhHDExGseaW9jZuQM/8c16FtdGhhJvJHhPcR4xKJBG1VSjEFxpUsp27GQO57yladf /rt+jKuBGJ9PTJIKXtprEieua3Dm1lMPQpry9earJT3bDHNH4P2J1a9ijFNG+VQcUMdT Ox13mghBAV6KTA+5XSLqRyH+or1RM6yiVDCcLyDkv25wNfnDox2g3JzgFgYGougwiM0F g2ZQ== 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=usPEXq6up5uqNgxC1QIqylP01evzEEMwdWS+Y/AKnj4=; b=WxmpaqXfVceYEKnPaxslevcSXLjXTOLi68uZxHRIsaNcicOdKllWoeLSietQEj9uiv t6emfD8dytaLEKuFZtc8NqCrp9dsWzlfQ0EDL1WZSD3Pyww/FTTTTTtzSeFCi2Y/6mwI RB1Ve11PH78F7CFSeXFK7mwr68I9mkvtV1uLqWij1EBTdI5Vce+PdDj9RocKJy1GupvB cpy6tibdFkjTc3uCKj91Umy3wlb4GElAxgty4XOdZuhs1C8UWXGZjYwRU0wVO4CmCuHm ZOzjjm7gKAKiijB+PdFDciqT/TBRhcG7pkjD1a4IaBljegnyVUIDWS5owxAYmW6aO+00 LdNw== X-Gm-Message-State: APjAAAVP1ob9ccU/7aX9mALLst05trRptDaLAWFU7vkAlsC0udv+Gl18 K9sbI4zG62kR4/fOzDounOS1CDtqqnnvoA== X-Google-Smtp-Source: APXvYqxMCsQY1EVbStTeks5ISyfuYwBlJI8DWrL5fh0Mi+yCzZx5vJw4fdT8dSwvjI5Qus1is0zKSw== X-Received: by 2002:a2e:9f44:: with SMTP id v4mr3417061ljk.72.1556841034243; Thu, 02 May 2019 16:50:34 -0700 (PDT) Return-Path: Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id o17sm74078lji.23.2019.05.02.16.50.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 May 2019 16:50:33 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com, Jici.Gao@arm.com, Tomasz Michalec Subject: [edk2-platforms: PATCH 1/4] Marvel/Drivers: Pp2Dxe: Basic support for Adapter Information Protocol Date: Fri, 3 May 2019 01:50:13 +0200 Message-Id: <1556841016-10342-2-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1556841016-10342-1-git-send-email-mw@semihalf.com> References: <1556841016-10342-1-git-send-email-mw@semihalf.com> From: Tomasz Michalec Add implementation of Adapter Information Protocol in Armada 7k8k PP2 NIC driver. Support retrieving information about media state which allows to use NetLibDetectMediaWaitTimeout on network interface. This patch fixes possible hangs when attempting to PXE boot on unconnected interfaces. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Tomasz Michalec --- Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf | 1 + Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h | 3 + Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c | 157 ++++++++++++++++++++ 3 files changed, 161 insertions(+) diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf index be536ab..73aa413 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf @@ -64,6 +64,7 @@ CacheMaintenanceLib [Protocols] + gEfiAdapterInformationProtocolGuid gEfiSimpleNetworkProtocolGuid gEfiDevicePathProtocolGuid gEfiCpuArchProtocolGuid diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h index b8a5dae..66bd46a 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.h @@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef __PP2_DXE_H__ #define __PP2_DXE_H__ +#include #include #include #include @@ -59,6 +60,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define MVPP2_MAX_PORT 3 #define PP2DXE_SIGNATURE SIGNATURE_32('P', 'P', '2', 'D') +#define INSTANCE_FROM_AIP(a) CR((a), PP2DXE_CONTEXT, Aip, PP2DXE_SIGNATURE) #define INSTANCE_FROM_SNP(a) CR((a), PP2DXE_CONTEXT, Snp, PP2DXE_SIGNATURE) /* OS API */ @@ -365,6 +367,7 @@ typedef struct { UINTN CompletionQueueTail; EFI_EVENT EfiExitBootServicesEvent; PP2_DEVICE_PATH *DevicePath; + EFI_ADAPTER_INFORMATION_PROTOCOL Aip; } PP2DXE_CONTEXT; /* Inline helpers */ diff --git a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c index 02b2798..473a2a1 100644 --- a/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c +++ b/Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.c @@ -1129,6 +1129,7 @@ Pp2DxeSnpInstall ( &Handle, &gEfiSimpleNetworkProtocolGuid, &Pp2Context->Snp, &gEfiDevicePathProtocolGuid, Pp2DevicePath, + &gEfiAdapterInformationProtocolGuid, &Pp2Context->Aip, NULL ); @@ -1139,6 +1140,157 @@ Pp2DxeSnpInstall ( return Status; } +/** + Returns the current state information for the adapter. + + This function returns information of type InformationType from the adapter. + If an adapter does not support the requested informational type, then + EFI_UNSUPPORTED is returned. + + @param[in] This A pointer to the EFI_ADAPTER_INFORMATION_PROTOCOL instance. + @param[in] InformationType A pointer to an EFI_GUID that defines the contents of InformationBlock. + @param[out] InforamtionBlock The service returns a pointer to the buffer with the InformationBlock + structure which contains details about the data specific to InformationType. + @param[out] InforamtionBlockSize The driver returns the size of the InformationBlock in bytes. + + @retval EFI_SUCCESS The InformationType information was retrieved. + @retval EFI_UNSUPPORTED The InformationType is not known. + @retval EFI_DEVICE_ERROR The device reported an error. + @retval EFI_OUT_OF_RESOURCES The request could not be completed due to a lack of resources. + @retval EFI_INVALID_PARAMETER This is NULL. + @retval EFI_INVALID_PARAMETER InformationBlock is NULL. + @retval EFI_INVALID_PARAMETER InformationBlockSize is NULL. + +**/ +EFI_STATUS +EFIAPI +Pp2AipGetInformation ( + IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, + IN EFI_GUID *InformationType, + OUT VOID **InformationBlock, + OUT UINTN *InformationBlockSize + ) +{ + EFI_ADAPTER_INFO_MEDIA_STATE *AdapterInfo; + PP2DXE_CONTEXT *Pp2Context; + EFI_STATUS Status; + + if (This == NULL || InformationBlock == NULL || InformationBlockSize == NULL) { + return EFI_INVALID_PARAMETER; + } + + if (!CompareGuid (InformationType, &gEfiAdapterInfoMediaStateGuid)) { + return EFI_UNSUPPORTED; + } + + AdapterInfo = AllocateZeroPool (sizeof (EFI_ADAPTER_INFO_MEDIA_STATE)); + if (AdapterInfo == NULL) { + return EFI_OUT_OF_RESOURCES; + } + + *InformationBlock = AdapterInfo; + *InformationBlockSize = sizeof (EFI_ADAPTER_INFO_MEDIA_STATE); + + Pp2Context = INSTANCE_FROM_AIP (This); + + Status = Pp2Context->Snp.GetStatus (&(Pp2Context->Snp), NULL, NULL); + if (Status == EFI_NOT_READY){ + AdapterInfo->MediaState = EFI_NOT_READY; + return EFI_SUCCESS; + } + + AdapterInfo->MediaState = (Pp2Context->Snp.Mode->MediaPresent ? + EFI_SUCCESS : EFI_NOT_READY); + + return EFI_SUCCESS; +} + +/** + Sets state information for an adapter. + + This function sends information of type InformationType for an adapter. + If an adapter does not support the requested information type, then EFI_UNSUPPORTED + is returned. + + @param[in] This A pointer to the EFI_ADAPTER_INFORMATION_PROTOCOL instance. + @param[in] InformationType A pointer to an EFI_GUID that defines the contents of InformationBlock. + @param[in] InforamtionBlock A pointer to the InformationBlock structure which contains details + about the data specific to InformationType. + @param[in] InforamtionBlockSize The size of the InformationBlock in bytes. + + @retval EFI_SUCCESS The information was received and interpreted successfully. + @retval EFI_UNSUPPORTED The InformationType is not known. + @retval EFI_DEVICE_ERROR The device reported an error. + @retval EFI_INVALID_PARAMETER This is NULL. + @retval EFI_INVALID_PARAMETER InformationBlock is NULL. + @retval EFI_WRITE_PROTECTED The InformationType cannot be modified using EFI_ADAPTER_INFO_SET_INFO(). + +**/ +EFI_STATUS +EFIAPI +Pp2AipSetInformation ( + IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, + IN EFI_GUID *InformationType, + IN VOID *InformationBlock, + IN UINTN InformationBlockSize + ) +{ + if (This == NULL || InformationBlock == NULL) { + return EFI_INVALID_PARAMETER; + } + + if (CompareGuid (InformationType, &gEfiAdapterInfoMediaStateGuid)) { + return EFI_WRITE_PROTECTED; + } + + return EFI_UNSUPPORTED; +} + +/** + Get a list of supported information types for this instance of the protocol. + + This function returns a list of InformationType GUIDs that are supported on an + adapter with this instance of EFI_ADAPTER_INFORMATION_PROTOCOL. The list is returned + in InfoTypesBuffer, and the number of GUID pointers in InfoTypesBuffer is returned in + InfoTypesBufferCount. + + @param[in] This A pointer to the EFI_ADAPTER_INFORMATION_PROTOCOL instance. + @param[out] InfoTypesBuffer A pointer to the array of InformationType GUIDs that are supported + by This. + @param[out] InfoTypesBufferCount A pointer to the number of GUIDs present in InfoTypesBuffer. + + @retval EFI_SUCCESS The list of information type GUIDs that are supported on this adapter was + returned in InfoTypesBuffer. The number of information type GUIDs was + returned in InfoTypesBufferCount. + @retval EFI_INVALID_PARAMETER This is NULL. + @retval EFI_INVALID_PARAMETER InfoTypesBuffer is NULL. + @retval EFI_INVALID_PARAMETER InfoTypesBufferCount is NULL. + @retval EFI_OUT_OF_RESOURCES There is not enough pool memory to store the results. + +**/ +EFI_STATUS +EFIAPI +Pp2AipGetSupportedTypes ( + IN EFI_ADAPTER_INFORMATION_PROTOCOL *This, + OUT EFI_GUID **InfoTypesBuffer, + OUT UINTN *InfoTypesBufferCount + ) +{ + if (This == NULL || InfoTypesBuffer == NULL || InfoTypesBufferCount == NULL) { + return EFI_INVALID_PARAMETER; + } + + *InfoTypesBuffer = AllocateZeroPool (sizeof (EFI_GUID)); + if (*InfoTypesBuffer == NULL) { + return EFI_OUT_OF_RESOURCES; + } + + *InfoTypesBufferCount = 1; + (*InfoTypesBuffer)[0] = gEfiAdapterInfoMediaStateGuid; + + return EFI_SUCCESS; +} + STATIC VOID Pp2DxeParsePortPcd ( @@ -1290,6 +1442,11 @@ Pp2DxeInitialiseController ( Pp2Context->Instance = DeviceInstance; DeviceInstance++; + /* Prepare AIP Protocol */ + Pp2Context->Aip.GetInformation = Pp2AipGetInformation; + Pp2Context->Aip.SetInformation = Pp2AipSetInformation; + Pp2Context->Aip.GetSupportedTypes = Pp2AipGetSupportedTypes; + /* Install SNP protocol */ Status = Pp2DxeSnpInstall(Pp2Context); if (EFI_ERROR(Status)) { -- 2.7.4