BaseTools: Fixed the issue of Multiple Skus are always disables

When multiple skus are enabled, PCD database should record the supported SKUs.
This patch fixes PCD database to add the missing supported SKUs.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@Intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

5 files changed, 67 insertions, 35 deletions

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 63cda5a8ac..28e575d219 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1842,7 +1842,8 @@ class PlatformAutoGen(AutoGen):
                 for (SkuName,SkuId) in allskuset:

                     if type(SkuId) in (str,unicode) and eval(SkuId) == 0 or SkuId == 0:

                         continue

-                    pcd.SkuInfoList[SkuName] = pcd.SkuInfoList['DEFAULT']

+                    pcd.SkuInfoList[SkuName] = copy.deepcopy(pcd.SkuInfoList['DEFAULT'])

+                    pcd.SkuInfoList[SkuName].SkuId = SkuId

         self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList

 

     def FixVpdOffset(self,VpdFile ):

diff --git a/BaseTools/Source/Python/AutoGen/GenPcdDb.py b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
index b60d33526a..22283ef7fe 100644
--- a/BaseTools/Source/Python/AutoGen/GenPcdDb.py
+++ b/BaseTools/Source/Python/AutoGen/GenPcdDb.py
@@ -1083,9 +1083,8 @@ def CreatePcdDatabasePhaseSpecificAutoGen (Platform, DynamicPcdList, Phase):
         'SYSTEM_SKU_ID_VALUE'           : '0U'

     }

     

-   

-    SkuObj = SkuClass(Platform.Platform.SkuName, Platform.Platform.SkuIds)

-    Dict['SYSTEM_SKU_ID_VALUE'] = Platform.Platform.SkuIds[SkuObj.SystemSkuId][0]

+    SkuObj = Platform.Platform.SkuIdMgr

+    Dict['SYSTEM_SKU_ID_VALUE'] = 0 if SkuObj.SkuUsageType == SkuObj.SINGLE else Platform.Platform.SkuIds[SkuObj.SystemSkuId][0]

 

     Dict['PCD_INFO_FLAG'] = Platform.Platform.PcdInfoFlag

 

diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py b/BaseTools/Source/Python/Workspace/BuildClassObject.py
index acf33ab03a..e5f1f01556 100644
--- a/BaseTools/Source/Python/Workspace/BuildClassObject.py
+++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py
@@ -168,7 +168,7 @@ class StructurePcd(PcdClassObject):
             self.DefaultValues = PcdObject.DefaultValues if PcdObject.DefaultValues else self.DefaultValues

             self.PcdMode = PcdObject.PcdMode if PcdObject.PcdMode else self.PcdMode

             self.DefaultFromDSC=None

-            self.OverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues

+            self.SkuOverrideValues = PcdObject.SkuOverrideValues if PcdObject.SkuOverrideValues else self.SkuOverrideValues

             self.FlexibleFieldName = PcdObject.FlexibleFieldName if PcdObject.FlexibleFieldName else self.FlexibleFieldName

             self.StructName = PcdObject.DatumType if PcdObject.DatumType else self.StructName

 

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index a5fceb9e2b..a2979ce9ea 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -845,14 +845,14 @@ class DscBuildData(PlatformBuildClassObject):
             for pcdname in Pcds:

                 pcd = Pcds[pcdname]

                 Pcds[pcdname].SkuInfoList = {"DEFAULT":pcd.SkuInfoList[skuid] for skuid in pcd.SkuInfoList if skuid in available_sku}

-                if type(pcd) is StructurePcd and pcd.OverrideValues:

-                    Pcds[pcdname].OverrideValues = {"DEFAULT":pcd.OverrideValues[skuid] for skuid in pcd.OverrideValues if skuid in available_sku}

+                if type(pcd) is StructurePcd and pcd.SkuOverrideValues:

+                    Pcds[pcdname].SkuOverrideValues = {"DEFAULT":pcd.SkuOverrideValues[skuid] for skuid in pcd.SkuOverrideValues if skuid in available_sku}

         else:

             for pcdname in Pcds:

                 pcd = Pcds[pcdname]

                 Pcds[pcdname].SkuInfoList = {skuid:pcd.SkuInfoList[skuid] for skuid in pcd.SkuInfoList if skuid in available_sku}

-                if type(pcd) is StructurePcd and pcd.OverrideValues:

-                    Pcds[pcdname].OverrideValues = {skuid:pcd.OverrideValues[skuid] for skuid in pcd.OverrideValues if skuid in available_sku}

+                if type(pcd) is StructurePcd and pcd.SkuOverrideValues:

+                    Pcds[pcdname].SkuOverrideValues = {skuid:pcd.SkuOverrideValues[skuid] for skuid in pcd.SkuOverrideValues if skuid in available_sku}

         return Pcds

     def CompleteHiiPcdsDefaultStores(self,Pcds):

         HiiPcd = [Pcds[pcd] for pcd in Pcds if Pcds[pcd].Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]]

@@ -945,9 +945,18 @@ class DscBuildData(PlatformBuildClassObject):
         return structure_pcd_data

 

     def UpdateStructuredPcds(self, TypeList, AllPcds):

+

+        DynamicPcdType = [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_DEFAULT],

+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],

+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_VPD],

+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_DEFAULT],

+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII],

+                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_VPD]]

+

         Pcds = AllPcds

         DefaultStoreMgr = DefaultStore(self.DefaultStores)

-        SkuIds = set([skuid for pcdobj in AllPcds.values() for skuid in pcdobj.SkuInfoList.keys()])

+        SkuIds = self.SkuIdMgr.AvailableSkuIdSet

+        SkuIds.update({'DEFAULT':0})

         DefaultStores = set([storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict.keys()])

 

         S_PcdSet = []

@@ -1003,12 +1012,7 @@ class DscBuildData(PlatformBuildClassObject):
         if S_pcd_set:

             GlobalData.gStructurePcd[self.Arch] = S_pcd_set

         for stru_pcd in S_pcd_set.values():

-            if stru_pcd.Type not in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_DEFAULT],

-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII],

-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_VPD],

-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_DEFAULT],

-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII],

-                        self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_VPD]]:

+            if stru_pcd.Type not in DynamicPcdType:

                 continue

             if stru_pcd.Type in [self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_HII], self._PCD_TYPE_STRING_[MODEL_PCD_DYNAMIC_EX_HII]]:

                 for skuid in SkuIds:

@@ -1040,6 +1044,7 @@ class DscBuildData(PlatformBuildClassObject):
                         break

                     nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)

                 stru_pcd.SkuOverrideValues[skuid] = copy.deepcopy(stru_pcd.SkuOverrideValues[nextskuid]) if not NoDefault else copy.deepcopy({defaultstorename: stru_pcd.DefaultValues for defaultstorename in DefaultStores})

+

         Str_Pcd_Values = self.GenerateByteArrayValue(S_pcd_set)

         if Str_Pcd_Values:

             for (skuname,StoreName,PcdGuid,PcdName,PcdValue) in Str_Pcd_Values:

@@ -1059,7 +1064,16 @@ class DscBuildData(PlatformBuildClassObject):
                         str_pcd_obj.DefaultValue = PcdValue

                 else:

                     if skuname not in str_pcd_obj.SkuInfoList:

-                        str_pcd_obj.SkuInfoList[skuname] = SkuInfoClass(SkuIdName=skuname, SkuId=self.SkuIds[skuname][0], DefaultValue=PcdValue)

+                        nextskuid = self.SkuIdMgr.GetNextSkuId(skuname)

+                        NoDefault = False

+                        while nextskuid not in str_pcd_obj.SkuInfoList:

+                            if nextskuid == "DEFAULT":

+                                NoDefault = True

+                                break

+                            nextskuid = self.SkuIdMgr.GetNextSkuId(nextskuid)

+                        str_pcd_obj.SkuInfoList[skuname] = copy.deepcopy(str_pcd_obj.SkuInfoList[nextskuid]) if not NoDefault else SkuInfoClass(SkuIdName=skuname, SkuId=self.SkuIds[skuname][0], DefaultValue=PcdValue)

+                        str_pcd_obj.SkuInfoList[skuname].SkuId = self.SkuIds[skuname][0]

+                        str_pcd_obj.SkuInfoList[skuname].SkuIdName = skuname

                     else:

                         str_pcd_obj.SkuInfoList[skuname].DefaultValue = PcdValue

             for str_pcd_obj in S_pcd_set.values():

@@ -1076,6 +1090,15 @@ class DscBuildData(PlatformBuildClassObject):
                 str_pcd_obj.MaxDatumSize = self.GetStructurePcdMaxSize(str_pcd_obj)

                 Pcds[str_pcd_obj.TokenCName, str_pcd_obj.TokenSpaceGuidCName] = str_pcd_obj

 

+            for pcdkey in Pcds:

+                pcd = Pcds[pcdkey]

+                if 'DEFAULT' not in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():

+                    pcd.SkuInfoList['DEFAULT'] = pcd.SkuInfoList['COMMON']

+                    del(pcd.SkuInfoList['COMMON'])

+                elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():

+                    del(pcd.SkuInfoList['COMMON'])

+

+        map(self.FilterSkuSettings,[Pcds[pcdkey] for pcdkey in Pcds if Pcds[pcdkey].Type in DynamicPcdType])

         return Pcds

 

     ## Retrieve non-dynamic PCD settings

@@ -1553,13 +1576,26 @@ class DscBuildData(PlatformBuildClassObject):
                 del(pcd.SkuInfoList['COMMON'])

             elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():

                 del(pcd.SkuInfoList['COMMON'])

-            if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:

-                if 'DEFAULT' in pcd.SkuInfoList.keys() and self.SkuIdMgr.SystemSkuId not in pcd.SkuInfoList.keys():

-                    pcd.SkuInfoList[self.SkuIdMgr.SystemSkuId] = pcd.SkuInfoList['DEFAULT']

-                del(pcd.SkuInfoList['DEFAULT'])

+

+        map(self.FilterSkuSettings,Pcds.values())

 

         return Pcds

 

+    def FilterSkuSettings(self, PcdObj):

+

+        if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:

+            if 'DEFAULT' in PcdObj.SkuInfoList.keys() and self.SkuIdMgr.SystemSkuId not in PcdObj.SkuInfoList.keys():

+                PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId] = PcdObj.SkuInfoList['DEFAULT']

+            PcdObj.SkuInfoList = {'DEFAULT':PcdObj.SkuInfoList[self.SkuIdMgr.SystemSkuId]}

+            PcdObj.SkuInfoList['DEFAULT'].SkuIdName = 'DEFAULT'

+            PcdObj.SkuInfoList['DEFAULT'].SkuId = '0'

+

+        elif self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.DEFAULT:

+            PcdObj.SkuInfoList = {'DEFAULT':PcdObj.SkuInfoList['DEFAULT']}

+

+        return PcdObj

+

+

     def CompareVarAttr(self, Attr1, Attr2):

         if not Attr1 or not Attr2:  # for empty string

             return True

@@ -1731,11 +1767,6 @@ class DscBuildData(PlatformBuildClassObject):
             elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():

                 del(pcd.SkuInfoList['COMMON'])

 

-            if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:

-                if 'DEFAULT' in pcd.SkuInfoList.keys() and self.SkuIdMgr.SystemSkuId not in pcd.SkuInfoList.keys():

-                    pcd.SkuInfoList[self.SkuIdMgr.SystemSkuId] = pcd.SkuInfoList['DEFAULT']

-                del(pcd.SkuInfoList['DEFAULT'])

-

             if pcd.MaxDatumSize.strip():

                 MaxSize = int(pcd.MaxDatumSize, 0)

             else:

@@ -1755,6 +1786,9 @@ class DscBuildData(PlatformBuildClassObject):
         if not rt:

             invalidpcd = ",".join(invalidhii)

             EdkLogger.error('build', PCD_VARIABLE_INFO_ERROR, Message='The same HII PCD must map to the same EFI variable for all SKUs', File=self.MetaFile, ExtraData=invalidpcd)

+

+        map(self.FilterSkuSettings,Pcds.values())

+

         return Pcds

 

     def CheckVariableNameAssignment(self,Pcds):

@@ -1854,11 +1888,9 @@ class DscBuildData(PlatformBuildClassObject):
                 del(pcd.SkuInfoList['COMMON'])

             elif 'DEFAULT' in pcd.SkuInfoList.keys() and 'COMMON' in pcd.SkuInfoList.keys():

                 del(pcd.SkuInfoList['COMMON'])

-            if self.SkuIdMgr.SkuUsageType == self.SkuIdMgr.SINGLE:

-                if 'DEFAULT' in pcd.SkuInfoList.keys() and self.SkuIdMgr.SystemSkuId not in pcd.SkuInfoList.keys():

-                    pcd.SkuInfoList[self.SkuIdMgr.SystemSkuId] = pcd.SkuInfoList['DEFAULT']

-                del(pcd.SkuInfoList['DEFAULT'])

 

+

+        map(self.FilterSkuSettings,Pcds.values())

         return Pcds

 

     ## Add external modules

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index e1adaabe0c..75e8ec97ab 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1014,7 +1014,7 @@ class PcdReport(object):
                         Pcd.DatumType = Pcd.StructName

                         if TypeName in ('DYNVPD', 'DEXVPD'):

                             Pcd.SkuInfoList = SkuInfoList

-                        if Pcd.OverrideValues:

+                        if Pcd.SkuOverrideValues:

                             DscMatch = True

                             DecMatch = False

                     #

@@ -1107,7 +1107,7 @@ class PcdReport(object):
             else:

                 FileWrite(File, ' %-*s   : %6s %10s = %s' % (self.MaxLen, Flag + ' ' + PcdTokenCName, TypeName, '(' + Pcd.DatumType + ')', Value))

             if IsStructure:

-                OverrideValues = Pcd.OverrideValues

+                OverrideValues = Pcd.SkuOverrideValues

                 if OverrideValues:

                     Keys = OverrideValues.keys()

                     Data = OverrideValues[Keys[0]]

@@ -1142,7 +1142,7 @@ class PcdReport(object):
                                     FileWrite(File, ' %-*s   : %6s %10s %10s %10s = %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', '(' + DefaultStore + ')', Value))

                             FileWrite(File, '%*s: %s: %s' % (self.MaxLen + 4, SkuInfo.VariableGuid, SkuInfo.VariableName, SkuInfo.VariableOffset))

                             if IsStructure:

-                                OverrideValues = Pcd.OverrideValues[Sku]

+                                OverrideValues = Pcd.SkuOverrideValues[Sku]

                                 Struct = OverrideValues[DefaultStore]

                                 self.PrintStructureInfo(File, Struct)

                             self.PrintPcdDefault(File, Pcd, IsStructure, DscMatch, DscDefaultValue, InfMatch, InfDefaultValue, DecMatch, DecDefaultValue)

@@ -1166,7 +1166,7 @@ class PcdReport(object):
                             FileWrite(File, ' %-*s   : %6s %10s %10s = %s' % (self.MaxLen, ' ' , TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', Value))

                     FileWrite(File, '%*s' % (self.MaxLen + 4, SkuInfo.VpdOffset))

                     if IsStructure:

-                        OverrideValues = Pcd.OverrideValues[Sku]

+                        OverrideValues = Pcd.SkuOverrideValues[Sku]

                         if OverrideValues:

                             Keys = OverrideValues.keys()

                             Struct = OverrideValues[Keys[0]]

@@ -1191,7 +1191,7 @@ class PcdReport(object):
                         else:

                             FileWrite(File, ' %-*s   : %6s %10s %10s = %s' % (self.MaxLen, ' ', TypeName, '(' + Pcd.DatumType + ')', '(' + SkuInfo.SkuIdName + ')', Value))

                     if IsStructure:

-                        OverrideValues = Pcd.OverrideValues[Sku]

+                        OverrideValues = Pcd.SkuOverrideValues[Sku]

                         if OverrideValues:

                             Keys = OverrideValues.keys()

                             Struct = OverrideValues[Keys[0]]