From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.10349.1608300472480333498 for ; Fri, 18 Dec 2020 06:07:52 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: aditya.angadi@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 24989101E; Fri, 18 Dec 2020 06:07:52 -0800 (PST) Received: from usa.arm.com (a073440-lin.blr.arm.com [10.162.16.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DF2113F66B; Fri, 18 Dec 2020 06:07:49 -0800 (PST) From: "Aditya Angadi" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sami Mujawar , Thomas Abraham , Vijayenthiran Subramaniam , Aditya Angadi Subject: [PATCH][edk2-platforms 2/5] Platform/ARM/SgiPkg: remove the use of SMSC Lan91x controller Date: Fri, 18 Dec 2020 19:37:23 +0530 Message-Id: <20201218140726.23670-3-aditya.angadi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201218140726.23670-1-aditya.angadi@arm.com> References: <20201218140726.23670-1-aditya.angadi@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Virtio network is supported for all the platforms in SgiPkg and so remove the use of SMSC Lan91x controller from all the platforms. Signed-off-by: Aditya Angadi --- Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl | 17 ----------= ------- Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf | 3 --- Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c | 10 +--------- Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc | 3 --- Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 5 +---- Platform/ARM/SgiPkg/SgiPlatform.fdf | 4 ---- 6 files changed, 2 insertions(+), 40 deletions(-) diff --git a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl b/Platform/ARM/Sg= iPkg/AcpiTables/SsdtRos.asl index 55a8ed04d5aa..785f426fc29b 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/SsdtRos.asl @@ -29,23 +29,6 @@ DefinitionBlock ("SsdtRosTable.aml", "SSDT", 1, "ARMLT= D", "ARMSGI", }) } =20 - // SMSC 91C111 - Device (ETH0) { - Name (_HID, "LNRO0003") - Name (_UID, Zero) - Name (_STA, 0xF) - Name (_CRS, ResourceTemplate () { - Memory32Fixed (ReadWrite, 0x18000000, 0x1000) - Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive) { 111= } - }) - Name (_DSD, Package() { - ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), - Package() { - Package(2) {"reg-io-width", 4 }, - } - }) - } - // VIRTIO DISK Device (VR00) { Name (_HID, "LNRO0005") diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf b/Pl= atform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf index 2ed0ff1fb62e..333247d0d808 100644 --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.inf @@ -19,7 +19,6 @@ [Packages] MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec Platform/ARM/SgiPkg/SgiPlatform.dec - Platform/ARM/VExpressPkg/ArmVExpressPkg.dec StandaloneMmPkg/StandaloneMmPkg.dec =20 [LibraryClasses] @@ -69,8 +68,6 @@ [FixedPcd] gArmSgiTokenSpaceGuid.PcdSmcCs1Base gArmSgiTokenSpaceGuid.PcdSysPeriphBase =20 - gArmVExpressTokenSpaceGuid.PcdLan91xDxeBaseAddress - gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64 gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c b/P= latform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c index ecca91e0f51b..9bdc63b9e3d4 100644 --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLibMem.c @@ -17,7 +17,7 @@ =20 // Total number of descriptors, including the final "end-of-table" descr= iptor. #define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS \ - (11 + (FixedPcdGet32 (PcdChipCount) * 2)) + (10 + (FixedPcdGet32 (PcdChipCount) * 2)) =20 /** Returns the Virtual Memory Map of the platform. @@ -117,14 +117,6 @@ ArmPlatformGetVirtualMemoryMap ( VirtualMemoryTable[Index].Length =3D SIZE_64MB; VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIB= UTE_DEVICE; =20 -#if defined (EDK2_ENABLE_SMSC_91X) - // Expansion AXI - SMSC 91X (Ethernet) - VirtualMemoryTable[++Index].PhysicalBase =3D FixedPcdGet32 (PcdLan91x= DxeBaseAddress); - VirtualMemoryTable[Index].VirtualBase =3D FixedPcdGet32 (PcdLan91x= DxeBaseAddress); - VirtualMemoryTable[Index].Length =3D SIZE_64MB; - VirtualMemoryTable[Index].Attributes =3D ARM_MEMORY_REGION_ATTRIB= UTE_DEVICE; -#endif - // Expansion AXI - System Peripherals VirtualMemoryTable[++Index].PhysicalBase =3D FixedPcdGet64 (PcdSysPer= iphBase); VirtualMemoryTable[Index].VirtualBase =3D FixedPcdGet64 (PcdSysPer= iphBase); diff --git a/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc b/Platform/ARM/SgiP= kg/SgiMemoryMap.dsc.inc index 2549c3129b0f..e423a6b50c91 100644 --- a/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiMemoryMap.dsc.inc @@ -35,9 +35,6 @@ [PcdsFixedAtBuild.common] gArmSgiTokenSpaceGuid.PcdVirtioBlkInterrupt|202 =20 # Ethernet -!ifdef EDK2_ENABLE_SMSC_91X - gArmVExpressTokenSpaceGuid.PcdLan91xDxeBaseAddress|0x18000000 -!endif gArmSgiTokenSpaceGuid.PcdVirtioNetBaseAddress|0x1C150000 gArmSgiTokenSpaceGuid.PcdVirtioNetInterrupt|204 =20 diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc b/Platform/ARM/SgiPk= g/SgiPlatform.dsc.inc index 2beab1f07278..ed7c7d6c4581 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc @@ -262,10 +262,7 @@ [Components.common] PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf } =20 - # SMSC LAN 91C111 / Virtio Network -!ifdef EDK2_ENABLE_SMSC_91X - Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf -!endif + # Virtio Network OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 # diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/Sg= iPlatform.fdf index 546021a8bf33..da23804828e5 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf @@ -182,10 +182,6 @@ [FV.FvMain] # Networking stack # !include NetworkPkg/Network.fdf.inc - -!ifdef EDK2_ENABLE_SMSC_91X - INF Platform/ARM/VExpressPkg/Drivers/Lan91xDxe/Lan91xDxe.inf -!endif INF OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 [FV.FVMAIN_COMPACT] --=20 2.17.1