Re: [PATCH edk2-platforms v4 7/9] Platform/ARM/Sgi: add support for smsc91x ethernet controller

[Ard Biesheuvel <ard.biesheuvel@linaro.org>]

On 21 May 2018 at 10:25, Thomas Abraham <thomas.abraham@arm.com> wrote:
> From: Daniil Egranov <daniil.egranov@arm.com>
>
> SGI platforms include a SMSC9118 ethernet controller. Enable support
> for this controller.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Daniil Egranov <daniil.egranov@arm.com>
> Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>
> ---
>  Platform/ARM/SgiPkg/Include/SgiPlatform.h                |  4 ++++
>  Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c |  8 +++++++-
>  Platform/ARM/SgiPkg/SgiPlatform.dsc                      |  6 ++++++
>  Platform/ARM/SgiPkg/SgiPlatform.fdf                      | 16 ++++++++++++++++
>  4 files changed, 33 insertions(+), 1 deletion(-)
>
> diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
> index 441a467..00ca7e9 100644
> --- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h
> +++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
> @@ -27,6 +27,10 @@
>  #define SGI_EXP_SMC_CS1_BASE                      0x0C000000
>  #define SGI_EXP_SMC_CS1_SZ                        SIZE_64MB
>
> +// Expansion AXI - SMSC 91C111 (Ethernet)
> +#define SGI_EXP_SMSC91X_BASE                      0x18000000
> +#define SGI_EXP_SMSC91X_SZ                        SIZE_64MB
> +
>  // Expansion AXI - System peripherals
>  #define SGI_EXP_SYS_PERIPH_BASE                   0x1C000000
>  #define SGI_EXP_SYS_PERIPH_SZ                     SIZE_2MB
> diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c
> index 9be71fb..f038559 100644
> --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c
> +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c
> @@ -22,7 +22,7 @@
>  #include <SgiPlatform.h>
>
>  // Total number of descriptors, including the final "end-of-table" descriptor.
> -#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS  8
> +#define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS  9
>
>  /**
>    Returns the Virtual Memory Map of the platform.
> @@ -63,6 +63,12 @@ ArmPlatformGetVirtualMemoryMap (
>    VirtualMemoryTable[Index].Length          = SIZE_64MB;
>    VirtualMemoryTable[Index].Attributes      = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
>
> +  // Expansion AXI - SMSC 91X (Ethernet)
> +  VirtualMemoryTable[++Index].PhysicalBase  = SGI_EXP_SMSC91X_BASE;
> +  VirtualMemoryTable[Index].VirtualBase     = SGI_EXP_SMSC91X_BASE;
> +  VirtualMemoryTable[Index].Length          = SGI_EXP_SMSC91X_SZ;
> +  VirtualMemoryTable[Index].Attributes      = ARM_MEMORY_REGION_ATTRIBUTE_DEVICE;
> +
>    // Expansion AXI - System Peripherals
>    VirtualMemoryTable[++Index].PhysicalBase  = SGI_EXP_SYS_PERIPH_BASE;
>    VirtualMemoryTable[Index].VirtualBase     = SGI_EXP_SYS_PERIPH_BASE;
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc
> index c5f220e..f11c1f3 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc
> @@ -150,6 +150,9 @@
>    gArmPlatformTokenSpaceGuid.PcdCoreCount|4
>    gArmPlatformTokenSpaceGuid.PcdClusterCount|2
>
> +  # Ethernet
> +  gEmbeddedTokenSpaceGuid.PcdLan91xDxeBaseAddress|0x18000000
> +
>  ################################################################################
>  #
>  # Components Section - list of all EDK II Modules needed by this Platform
> @@ -249,3 +252,6 @@
>        NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
>        PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
>    }
> +
> +  # SMSC LAN 91C111
> +  EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
> diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> index d4fae50..6f6e6aa 100644
> --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
> +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
> @@ -155,6 +155,22 @@ READ_LOCK_STATUS   = TRUE
>    INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
>    INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
>
> +  #
> +  # Networking stack
> +  #
> +  INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> +  INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> +  INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> +  INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> +  INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> +  INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> +  INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> +  INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf
> +  INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> +  INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> +  INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
> +  INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.inf
> +


Don't you need to add these to the .DSC as well?

>  [FV.FVMAIN_COMPACT]
>  FvAlignment        = 16
>  BlockSize          = 0x1000
> --
> 2.7.4
>