From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::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 783E7212735A7 for ; Tue, 12 Jun 2018 14:02:29 -0700 (PDT) Received: by mail-wm0-x242.google.com with SMTP id e16-v6so1176176wmd.0 for ; Tue, 12 Jun 2018 14:02:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=V9yEq1ZbgOJUanL9NgbED6RlhWzGkaxmcKTX0VQ9VVg=; b=ZCrwiNB/AcOHclhhpblVvvyPH9YjjkvD+OAyXE4XQucJjVwy4MDsXTWGYAxCUfAN3u t6W6y3NZwRZmhn//EjTlw0Pnkz8aehgUsmYLzaQLrqr6ROPx2fQ+fDu7jL0xHUxMzgs2 v8qmWweoJpPfJiJ6rIqmLSuRTprDERbQ32waQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=V9yEq1ZbgOJUanL9NgbED6RlhWzGkaxmcKTX0VQ9VVg=; b=Ruk/1KnMZg+c7uEsxj3ee4TonZZMTxvvGUcJTFQfpJOJCaOdMizvA5MQtieFNIf+2x QsUx+7fkNbgBSEHPCrSOYt1wqysP6eEC/Ft/WVsEHpScuOxPpzyV1nYlw+ToUNAnhXLL FnKSxLCHxANAgm1YPA06nNjIj0NDWugA1lqOj+bCIy6w4FQJ4elBOLtlRHBd3Cr/YI2h E2d2i/WyDLp/1HsDF+OUOAfrCN+0pZYU+shE8yo5tQ1U2F1t88GPwCsIP4jJK5byv/CG PU+z3rrD0PdUWKdyf0kykPnq0/GgdL4aPEgedN8HSX3foaHoV+EDWDTpHXEmr/oxxKtf mchw== X-Gm-Message-State: APt69E0QrRdM86Q0eiyiXI9e12k4+F60i4+BIIq4iNwiBG9EOsmTbO9f LHxJdVG+B6nbunkfcDUJYfYVvYKpRAE= X-Google-Smtp-Source: ADUXVKIMbAudraDC1xBjrN8JJ/i8LQy8Lbhk3pi8BrGXaymG90oLWMFFTuxzjq/FTCxc9kU1Pifdlg== X-Received: by 2002:a1c:aa12:: with SMTP id t18-v6mr1554887wme.54.1528837347696; Tue, 12 Jun 2018 14:02:27 -0700 (PDT) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id f133-v6sm1514968wme.42.2018.06.12.14.02.26 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Jun 2018 14:02:26 -0700 (PDT) Date: Tue, 12 Jun 2018 22:02:24 +0100 From: Leif Lindholm To: Marcin Wojtas Cc: edk2-devel@lists.01.org, ard.biesheuvel@linaro.org, nadavh@marvell.com, jinghua@marvell.com, jsd@semihalf.com, jaz@semihalf.com Message-ID: <20180612210224.wkzpbe7bvak7i5fq@bivouac.eciton.net> References: <1528472063-1660-1-git-send-email-mw@semihalf.com> <1528472063-1660-17-git-send-email-mw@semihalf.com> MIME-Version: 1.0 In-Reply-To: <1528472063-1660-17-git-send-email-mw@semihalf.com> User-Agent: NeoMutt/20170113 (1.7.2) Subject: Re: [platforms PATCH 16/25] Marvell/Drivers: MvBoardDesc: Extend protocol with COMPHY support 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: Tue, 12 Jun 2018 21:02:30 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jun 08, 2018 at 05:34:14PM +0200, Marcin Wojtas wrote: > Introduce new callback that can provide information > about COMPHY controllers to the ComPhyLib. > > Extend ArmadaBoardDescLib with new structure MV_BOARD_COMPHY_DESC, > for holding board specific data. In further steps it can > be extended and replace PCD SerDes lanes' representation with the > appropriate structures. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Marcin Wojtas > Reviewed-by: Hua Jing > --- > Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c | 60 ++++++++++++++++++++ > Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf | 1 + > Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h | 11 ++++ > Silicon/Marvell/Include/Protocol/BoardDesc.h | 8 +++ > 4 files changed, 80 insertions(+) > > diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c > index 44d159e..d580319 100644 > --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c > +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.c > @@ -37,6 +37,65 @@ MV_BOARD_DESC *mBoardDescInstance; > > STATIC > EFI_STATUS > +MvBoardDescComPhyGet ( > + IN MARVELL_BOARD_DESC_PROTOCOL *This, > + IN OUT MV_BOARD_COMPHY_DESC **ComPhyDesc > + ) > +{ > + UINT8 *ComPhyDeviceTable, ComPhyCount; UINTN for count please. > + UINTN ComPhyDeviceTableSize, ComPhyIndex, Index; > + MV_BOARD_COMPHY_DESC *BoardDesc; > + MV_SOC_COMPHY_DESC *SoCDesc; > + EFI_STATUS Status; > + > + /* Get SoC data about all available COMPHY controllers */ > + Status = ArmadaSoCDescComPhyGet (&SoCDesc, &ComPhyCount); > + if (EFI_ERROR (Status)) { > + return Status; > + } > + > + /* Obtain table with enabled COMPHY controllers */ > + ComPhyDeviceTable = (UINT8 *)PcdGetPtr (PcdComPhyDevices); > + if (ComPhyDeviceTable == NULL) { > + /* No COMPHY controllers declared */ > + return EFI_NOT_FOUND; > + } > + > + ComPhyDeviceTableSize = PcdGetSize (PcdComPhyDevices); > + > + /* Check if PCD with COMPHY NICs is correctly defined */ > + if (ComPhyDeviceTableSize > ComPhyCount) { > + DEBUG ((DEBUG_ERROR, "%a: Wrong PcdComPhyDevices format\n", __FUNCTION__)); > + return EFI_INVALID_PARAMETER; > + } > + > + /* Allocate and fill board description */ > + BoardDesc = AllocateZeroPool (ComPhyDeviceTableSize * sizeof (MV_BOARD_COMPHY_DESC)); > + if (BoardDesc == NULL) { > + DEBUG ((DEBUG_ERROR, "%a: Cannot allocate memory\n", __FUNCTION__)); > + return EFI_OUT_OF_RESOURCES; > + } > + > + ComPhyIndex = 0; > + for (Index = 0; Index < ComPhyDeviceTableSize; Index++) { > + if (!MVHW_DEV_ENABLED (ComPhy, Index)) { if (ComPhyDeviceTable[Index] != MVHW_DEV_ENABLED) { > + DEBUG ((DEBUG_ERROR, "%a: Skip ComPhy controller %d\n", __FUNCTION__, Index)); > + continue; > + } > + > + BoardDesc[ComPhyIndex].SoC = &SoCDesc[Index]; > + ComPhyIndex++; > + } > + > + BoardDesc->ComPhyDevCount = ComPhyIndex; > + > + *ComPhyDesc = BoardDesc; > + > + return EFI_SUCCESS; > +} > + > +STATIC > +EFI_STATUS > MvBoardDescAhciGet ( > IN MARVELL_BOARD_DESC_PROTOCOL *This, > IN OUT MV_BOARD_AHCI_DESC **AhciDesc > @@ -374,6 +433,7 @@ MvBoardDescInitProtocol ( > IN MARVELL_BOARD_DESC_PROTOCOL *BoardDescProtocol > ) > { > + BoardDescProtocol->BoardDescComPhyGet = MvBoardDescComPhyGet; Insert alphabetically? > BoardDescProtocol->BoardDescAhciGet = MvBoardDescAhciGet; > BoardDescProtocol->BoardDescSdMmcGet = MvBoardDescSdMmcGet; > BoardDescProtocol->BoardDescXhciGet = MvBoardDescXhciGet; > diff --git a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf > index fe819ac..71b7ebd 100644 > --- a/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf > +++ b/Silicon/Marvell/Drivers/BoardDesc/MvBoardDescDxe.inf > @@ -57,6 +57,7 @@ > gMarvellBoardDescProtocolGuid > > [Pcd] > + gMarvellTokenSpaceGuid.PcdComPhyDevices Insert alphabetically? > gMarvellTokenSpaceGuid.PcdPp2Controllers > gMarvellTokenSpaceGuid.PcdUtmiControllersEnabled > gMarvellTokenSpaceGuid.PcdUtmiPortType > diff --git a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h > index 938d283..1b56316 100644 > --- a/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h > +++ b/Silicon/Marvell/Include/Library/ArmadaBoardDescLib.h > @@ -17,6 +17,17 @@ > #include > > // > +// COMPHY NIC devices per-board description > +// > +// TODO - Extend structure with entire > +// ports description instead of PCDs. Drop the TODO please. > +// > +typedef struct { > + MV_SOC_COMPHY_DESC *SoC; > + UINT8 ComPhyDevCount; UINTN please. > +} MV_BOARD_COMPHY_DESC; > + > +// > // NonDiscoverableDevices per-board description > // > > diff --git a/Silicon/Marvell/Include/Protocol/BoardDesc.h b/Silicon/Marvell/Include/Protocol/BoardDesc.h > index a59ade5..27250db 100644 > --- a/Silicon/Marvell/Include/Protocol/BoardDesc.h > +++ b/Silicon/Marvell/Include/Protocol/BoardDesc.h > @@ -43,6 +43,13 @@ typedef struct _MARVELL_BOARD_DESC_PROTOCOL MARVELL_BOARD_DESC_PROTOCOL; > > typedef > EFI_STATUS > +(EFIAPI *MV_BOARD_DESC_COMPHY_GET) ( > + IN MARVELL_BOARD_DESC_PROTOCOL *This, > + IN OUT MV_BOARD_COMPHY_DESC **ComPhyDesc > + ); > + > +typedef > +EFI_STATUS > (EFIAPI *MV_BOARD_DESC_AHCI_GET) ( > IN MARVELL_BOARD_DESC_PROTOCOL *This, > IN OUT MV_BOARD_AHCI_DESC **AhciDesc > @@ -83,6 +90,7 @@ VOID > ); > > struct _MARVELL_BOARD_DESC_PROTOCOL { > + MV_BOARD_DESC_COMPHY_GET BoardDescComPhyGet; Insert alphabetically? / Leif > MV_BOARD_DESC_AHCI_GET BoardDescAhciGet; > MV_BOARD_DESC_SDMMC_GET BoardDescSdMmcGet; > MV_BOARD_DESC_XHCI_GET BoardDescXhciGet; > -- > 2.7.4 >