MdeModulePkg/PartitionDxe: Add partition type guid to installed handle

[mirror_edk2.git] / MdeModulePkg / Universal / Disk / PartitionDxe / ElTorito.c

diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
index 9264ef311917dd26a0821d34418646fcec2a710f..a7b5434a08e7cf844b05e8d197f5d9e795c2fc39 100644 (file)
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/ElTorito.c
@@ -1,7 +1,8 @@
 /** @file\r
   Decode an El Torito formatted CD-ROM\r
 \r
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2018 Qualcomm Datacenter Technologies, Inc.\r
+Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -44,22 +45,23 @@ PartitionInstallElToritoChildHandles (
   IN  EFI_DEVICE_PATH_PROTOCOL     *DevicePath\r
   )\r
 {\r
-  EFI_STATUS              Status;\r
-  UINT64                  VolDescriptorOffset;\r
-  UINT32                  Lba2KB;\r
-  EFI_BLOCK_IO_MEDIA      *Media;\r
-  CDROM_VOLUME_DESCRIPTOR *VolDescriptor;\r
-  ELTORITO_CATALOG        *Catalog;\r
-  UINTN                   Check;\r
-  UINTN                   Index;\r
-  UINTN                   BootEntry;\r
-  UINTN                   MaxIndex;\r
-  UINT16                  *CheckBuffer;\r
-  CDROM_DEVICE_PATH       CdDev;\r
-  UINT32                  SubBlockSize;\r
-  UINT32                  SectorCount;\r
-  EFI_STATUS              Found;\r
-  UINT32                  VolSpaceSize;\r
+  EFI_STATUS                   Status;\r
+  UINT64                       VolDescriptorOffset;\r
+  UINT32                       Lba2KB;\r
+  EFI_BLOCK_IO_MEDIA           *Media;\r
+  CDROM_VOLUME_DESCRIPTOR      *VolDescriptor;\r
+  ELTORITO_CATALOG             *Catalog;\r
+  UINTN                        Check;\r
+  UINTN                        Index;\r
+  UINTN                        BootEntry;\r
+  UINTN                        MaxIndex;\r
+  UINT16                       *CheckBuffer;\r
+  CDROM_DEVICE_PATH            CdDev;\r
+  UINT32                       SubBlockSize;\r
+  UINT32                       SectorCount;\r
+  EFI_STATUS                   Found;\r
+  UINT32                       VolSpaceSize;\r
+  EFI_PARTITION_INFO_PROTOCOL  PartitionInfo;\r
 \r
   Found         = EFI_NOT_FOUND;\r
   Media         = BlockIo->Media;\r
@@ -183,7 +185,7 @@ PartitionInstallElToritoChildHandles (
       }\r
 \r
       SubBlockSize  = 512;\r
-      SectorCount   = Catalog->Boot.SectorCount * (SIZE_2KB / Media->BlockSize);\r
+      SectorCount   = Catalog->Boot.SectorCount;\r
 \r
       switch (Catalog->Boot.MediaType) {\r
 \r
@@ -233,21 +235,25 @@ PartitionInstallElToritoChildHandles (
         //\r
         // When the SectorCount < 2, set the Partition as the whole CD.\r
         //\r
-        if (VolSpaceSize > (Media->LastBlock + 1)) {\r
-          CdDev.PartitionSize = (UINT32)(Media->LastBlock - Catalog->Boot.Lba + 1);\r
+        if (VolSpaceSize * (SIZE_2KB / Media->BlockSize) > (Media->LastBlock + 1)) {\r
+          CdDev.PartitionSize = (UINT32)(Media->LastBlock - Catalog->Boot.Lba * (SIZE_2KB / Media->BlockSize) + 1);\r
         } else {\r
-          CdDev.PartitionSize = (UINT32)(VolSpaceSize - Catalog->Boot.Lba);\r
+          CdDev.PartitionSize = (UINT32)(VolSpaceSize - Catalog->Boot.Lba) * (SIZE_2KB / Media->BlockSize);\r
         }\r
       } else {\r
         CdDev.PartitionSize = DivU64x32 (\r
                                 MultU64x32 (\r
-                                  SectorCount,\r
+                                  SectorCount * (SIZE_2KB / Media->BlockSize),\r
                                   SubBlockSize\r
                                   ) + Media->BlockSize - 1,\r
                                 Media->BlockSize\r
                                 );\r
       }\r
 \r
+      ZeroMem (&PartitionInfo, sizeof (EFI_PARTITION_INFO_PROTOCOL));\r
+      PartitionInfo.Revision = EFI_PARTITION_INFO_PROTOCOL_REVISION;\r
+      PartitionInfo.Type     = PARTITION_TYPE_OTHER;\r
+\r
       Status = PartitionInstallChildHandle (\r
                 This,\r
                 Handle,\r
@@ -257,10 +263,11 @@ PartitionInstallElToritoChildHandles (
                 BlockIo2,\r
                 DevicePath,\r
                 (EFI_DEVICE_PATH_PROTOCOL *) &CdDev,\r
+                &PartitionInfo,\r
                 Catalog->Boot.Lba * (SIZE_2KB / Media->BlockSize),\r
-                (Catalog->Boot.Lba + CdDev.PartitionSize - 1) * (SIZE_2KB / Media->BlockSize),\r
+                Catalog->Boot.Lba * (SIZE_2KB / Media->BlockSize) + CdDev.PartitionSize - 1,\r
                 SubBlockSize,\r
-                FALSE\r
+                NULL\r
                 );\r
       if (!EFI_ERROR (Status)) {\r
         Found = EFI_SUCCESS;\r