diff options
| -rw-r--r-- | QcomModulePkg/Include/Library/PartialGoods.h | 52 | ||||
| -rw-r--r-- | QcomModulePkg/Include/Library/UpdateDeviceTree.h | 52 | ||||
| -rw-r--r-- | QcomModulePkg/Library/BootLib/BootLib.inf | 1 | ||||
| -rw-r--r-- | QcomModulePkg/Library/BootLib/BootLinux.c | 9 | ||||
| -rw-r--r-- | QcomModulePkg/Library/BootLib/PartialGoods.c | 254 |
5 files changed, 316 insertions, 52 deletions
diff --git a/QcomModulePkg/Include/Library/PartialGoods.h b/QcomModulePkg/Include/Library/PartialGoods.h new file mode 100644 index 0000000000..3064efa057 --- /dev/null +++ b/QcomModulePkg/Include/Library/PartialGoods.h @@ -0,0 +1,52 @@ +/* Copyright (c) 2017, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef __PARTIALGOODS_H__ +#define __PARTIALGOODS_H__ + +#include <Library/Board.h> +#define MAX_CPU_CLUSTER 2 + +struct SubNodeListNew +{ + CONST CHAR8 *SubNodeName; /* Subnode name */ + CONST CHAR8 *PropertyName; /* Property name */ + CONST CHAR8 *PropertyStr; /* Property string value */ + CONST CHAR8 *ReplaceStr; /* Replace string */ +}; + +struct PartialGoods +{ + UINT32 Val; /* Value for the defect */ + CONST CHAR8 *ParentNode; /* Parent Node name*/ + struct SubNodeListNew SubNode; /* Sub node name list*/ +}; + +EFI_STATUS UpdatePartialGoodsNode(VOID *fdt); + +#endif diff --git a/QcomModulePkg/Include/Library/UpdateDeviceTree.h b/QcomModulePkg/Include/Library/UpdateDeviceTree.h index 06e55d6847..c1a2a8f72c 100644 --- a/QcomModulePkg/Include/Library/UpdateDeviceTree.h +++ b/QcomModulePkg/Include/Library/UpdateDeviceTree.h @@ -52,58 +52,6 @@ /* Return True if integer overflow will occur */ #define CHECK_ADD64(a, b) ((MAX_UINT64 - b < a) ? TRUE : FALSE) -enum property_type -{ - DEVICE_TYPE = 1, - STATUS_TYPE, -}; - -/* Sub node name, property pair */ -struct SubNodeList -{ - CONST CHAR8 *SubNode; /* Subnode name */ - CONST CHAR8 *Property; /* Property name */ - UINT32 SubBinVersion; /* version to maintain backward compatibility */ - UINT32 SubBinValue; /* SubBinning defect value */ -}; - -/* Look up table for partial goods */ -struct PartialGoods -{ - UINT32 Val; /* Value for the defect */ - CONST CHAR8 *ParentNode; /* Parent Node name*/ - struct SubNodeList SubNode[DTB_MAX_SUBNODE]; /* Sub node name list*/ -}; - -static struct PartialGoods MsmCobaltTable[] = -{ - {0x1, "/cpus", {{"cpu@100", "device_type", 1, 0x1}, - {"cpu@101", "device_type", 1, 0x2}, - {"cpu@102", "device_type", 1, 0x4}, - {"cpu@103", "device_type", 1, 0x8},}}, - /* If CPU4 is disabled, disable memlat_cpu4 dt property */ - {0x1, "/soc", {{"qcom,memlat-cpu4", "status", 2, 0x1},}}, - {0x2, "/soc", {{"qcom,kgsl-3d0", "status", 1, 0x10}, - {"qcom,vidc", "status", 1, 0x20}, - {"qcom,msm-cam", "status", 2, 0x20}, - {"qcom,csiphy", "status", 2, 0x20}, - {"qcom,csid", "status", 2, 0x20}, - {"qcom,cam_smmu", "status", 2, 0x20}, - {"qcom,fd", "status", 2, 0x20}, - {"qcom,cpp", "status", 2, 0x20}, - {"qcom,ispif", "status", 2, 0x20}, - {"qcom,vfe0", "status", 2, 0x20}, - {"qcom,vfe1", "status", 2, 0x20}, - {"qcom,cci", "status", 2, 0x20}, - {"qcom,jpeg", "status", 2, 0x20}, - {"qcom,camera-flash", "status", 2, 0x20}, - {"qcom,mdss_mdp", "status", 2, 0x40}, - {"qcom,mdss_dsi_pll", "status", 2, 0x40}, - {"qcom,mdss_dp_pll", "status", 2, 0x40}, - {"qcom,msm-adsp-loader", "status", 1, 0x80},}}, - {0x4, "/soc", {{"qcom,mss", "status", 1, 0x0},}}, -}; - /* Look up table for fstab node */ struct FstabNode { diff --git a/QcomModulePkg/Library/BootLib/BootLib.inf b/QcomModulePkg/Library/BootLib/BootLib.inf index c48a12bde7..1328f99d8c 100644 --- a/QcomModulePkg/Library/BootLib/BootLib.inf +++ b/QcomModulePkg/Library/BootLib/BootLib.inf @@ -63,6 +63,7 @@ PartitionTableUpdate.c DeviceInfo.c Rtic.c + PartialGoods.c [Packages] ArmPkg/ArmPkg.dec diff --git a/QcomModulePkg/Library/BootLib/BootLinux.c b/QcomModulePkg/Library/BootLib/BootLinux.c index a425683ec7..f47a9a40c5 100644 --- a/QcomModulePkg/Library/BootLib/BootLinux.c +++ b/QcomModulePkg/Library/BootLib/BootLinux.c @@ -38,6 +38,7 @@ #include <Protocol/EFIMdtp.h> #include <libufdt_sysdeps.h> #include <Library/ShutdownServices.h> +#include <Library/PartialGoods.h> #include "BootLinux.h" #include "BootStats.h" @@ -387,6 +388,14 @@ EFI_STATUS BootLinux (BootInfo *Info) gBS->CopyMem((CHAR8*)KernelLoadAddr, ImageBuffer + PageSize, KernelSizeActual); } + if (FixedPcdGetBool(EnablePartialGoods)) { + Status = UpdatePartialGoodsNode((VOID*)DeviceTreeLoadAddr); + if (Status != EFI_SUCCESS){ + DEBUG((EFI_D_ERROR, "Failed to update device tree for partial goods, Status=%r\n", Status)); + return Status; + } + } + UnicodeStrToAsciiStr(PartitionName, PartitionNameAscii); PartitionNameLen = AsciiStrLen(PartitionNameAscii); if (Info->MultiSlotBoot) diff --git a/QcomModulePkg/Library/BootLib/PartialGoods.c b/QcomModulePkg/Library/BootLib/PartialGoods.c new file mode 100644 index 0000000000..89ec1ccf83 --- /dev/null +++ b/QcomModulePkg/Library/BootLib/PartialGoods.c @@ -0,0 +1,254 @@ +/* Copyright (c) 2017, The Linux Foundation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * * Neither the name of The Linux Foundation nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE + * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN + * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include <Uefi/UefiBaseType.h> +#include <Protocol/EFIChipInfo.h> +#include <Protocol/EFIChipInfoTypes.h> +#include <Library/DebugLib.h> +#include <Library/PartialGoods.h> +#include <Library/LinuxLoaderLib.h> +#include "libfdt.h" + +/* Look up table for cpu partial goods */ +static struct PartialGoods PartialGoodsCpuType0[] = { + {0x1, "/cpus", {"cpu@0", "device_type", "cpu", "nak"}}, + {0x2, "/cpus", {"cpu@100", "device_type", "cpu", "nak"}}, + {0x4, "/cpus", {"cpu@200", "device_type", "cpu", "nak"}}, + {0x8, "/cpus", {"cpu@300", "device_type", "cpu", "nak"}}, + {0x10, "/cpus", {"cpu@400", "device_type", "cpu", "nak"}}, + {0x20, "/cpus", {"cpu@500", "device_type", "cpu", "nak"}}, + {0x40, "/cpus", {"cpu@600", "device_type", "cpu", "nak"}}, + {0x80, "/cpus", {"cpu@700", "device_type", "cpu", "nak"}}, +}; + +/* Look up table for cpu partial goods */ +static struct PartialGoods PartialGoodsCpuType1[] = { + {0x1, "/cpus", {"cpu@101", "device_type", "cpu", "nak"}}, + {0x2, "/cpus", {"cpu@102", "device_type", "cpu", "nak"}}, + {0x4, "/cpus", {"cpu@103", "device_type", "cpu", "nak"}}, + {0x8, "/cpus", {"cpu@104", "device_type", "cpu", "nak"}}, + {0x10, "/cpus", {"cpu@105", "device_type", "cpu", "nak"}}, + {0x20, "/cpus", {"cpu@106", "device_type", "cpu", "nak"}}, + {0x40, "/cpus", {"cpu@107", "device_type", "cpu", "nak"}}, + {0x80, "/cpus", {"cpu@108", "device_type", "cpu", "nak"}}, +}; + +static struct PartialGoods *PartialGoodsCpuType[] = {PartialGoodsCpuType0, PartialGoodsCpuType1}; + +/* Look up table for multimedia partial goods */ +static struct PartialGoods PartialGoodsMmType[] = { + {BIT(EFICHIPINFO_PART_GPU), "/soc", {"qcom,kgsl-3d0", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_GPU), "/soc", {"qcom,kgsl-3d0", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_VIDEO), "/soc", {"qcom,vidc", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_VIDEO), "/soc", {"qcom,vidc", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,msm-cam", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,msm-cam", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,csiphy", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,csiphy", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,csid", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,csid", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,cam_smmu", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,cam_smmu", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,fd", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,fd", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,cpp", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,cpp", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,ispif", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,ispif", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,vfe0", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,vfe0", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,vfe1", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,vfe1", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,cci", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,cci", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,jpeg", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,jpeg", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,camera-flash", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_CAMERA), "/soc", {"qcom,camera-flash", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_DISPLAY), "/soc", {"qcom,mdss_mdp", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_DISPLAY), "/soc", {"qcom,mdss_mdp", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_DISPLAY), "/soc", {"qcom,mdss_dsi_pll", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_DISPLAY), "/soc", {"qcom,mdss_dsi_pll", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_DISPLAY), "/soc", {"qcom,mdss_dp_pll", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_DISPLAY), "/soc", {"qcom,mdss_dp_pll", "status", "ok", "no"}}, + {BIT(EFICHIPINFO_PART_AUDIO), "/soc", {"qcom,msm-adsp-loader", "status", "okay", "dsbl"}}, + {BIT(EFICHIPINFO_PART_AUDIO), "/soc", {"qcom,msm-adsp-loader", "status", "ok", "no"}}, +}; + +STATIC VOID FindNodeAndUpdateProperty(VOID *fdt, UINT32 TableSz, struct PartialGoods *Table, UINT32 Value) +{ + struct SubNodeListNew *SNode = NULL; + CONST struct fdt_property *Prop = NULL; + INT32 PropLen = 0; + INT32 SubNodeOffset = 0; + INT32 ParentOffset = 0; + INT32 Ret = 0; + UINT32 i; + + for (i = 0; i < TableSz; i++, Table++) { + if (!(Value & Table->Val)) + continue; + + /* Find the parent node */ + ParentOffset = fdt_path_offset(fdt, Table->ParentNode); + if (ParentOffset < 0) { + DEBUG((EFI_D_ERROR, "Failed to Get parent node: %a\terror: %d\n", Table->ParentNode, ParentOffset)); + continue; + } + + /* Find the subnode */ + SNode = &(Table->SubNode); + SubNodeOffset = fdt_subnode_offset(fdt, ParentOffset, SNode->SubNodeName); + if (SubNodeOffset < 0) { + DEBUG((EFI_D_INFO, "Subnode : %a is not present, ignore\n", SNode->SubNodeName)); + continue; + } + + /* Find the property node and its length */ + Prop = fdt_get_property(fdt, SubNodeOffset, SNode->PropertyName, &PropLen); + if (!Prop) { + /* Need to continue with next SubNode List instead of bailing out*/ + DEBUG((EFI_D_INFO, "Property: %a not found for (%a)\tLen:%d, continue with next subnode\n", + SNode->PropertyName,SNode->SubNodeName, PropLen)); + continue; + + } + + /* Replace the property value based on the property */ + if (AsciiStrnCmp(SNode->PropertyStr, Prop->data, AsciiStrLen(SNode->PropertyStr))) { + DEBUG((EFI_D_VERBOSE, "Property string mismatch (%a) with (%a)\n", SNode->PropertyStr, Prop->data)); + continue; + + } + + /* Replace the property with Replace string value */ + Ret = fdt_setprop_inplace(fdt, SubNodeOffset, SNode->PropertyName, (CONST VOID *)SNode->ReplaceStr, PropLen); + if (!Ret) { + DEBUG((EFI_D_INFO, "Partial goods (%a) status property disabled\n", SNode->SubNodeName)); + } else { + DEBUG((EFI_D_ERROR, "Failed to update property: %a, ret =%d \n", SNode->PropertyName, Ret)); + } + } +} + +STATIC EFI_STATUS ReadCpuPartialGoods(EFI_CHIPINFO_PROTOCOL *pChipInfoProtocol, UINT32* Value) +{ + UINT32 i; + EFI_STATUS Status = EFI_SUCCESS; + UINT32 DefectVal; + + for(i = 0; i < MAX_CPU_CLUSTER; i++){ + /* Ensure to reset the Value before checking CPU part for defect */ + DefectVal = 0; + Value[i] = 0; + + Status = pChipInfoProtocol->GetDefectiveCPUs(pChipInfoProtocol, i, &DefectVal); + if (EFI_ERROR(Status)) { + DEBUG((EFI_D_VERBOSE, "Failed to get CPU defective[%d] part. %r\n", i, Status)); + continue; + } + + Value[i] = DefectVal; + + } + + if (Status == EFI_NOT_FOUND) + Status = EFI_SUCCESS; + + return Status; +} + +STATIC EFI_STATUS ReadMMPartialGoods(EFI_CHIPINFO_PROTOCOL *pChipInfoProtocol, UINT32* Value) +{ + UINT32 i; + EFI_STATUS Status = EFI_SUCCESS; + UINT32 DefectVal; + + for(i = 1; i < EFICHIPINFO_NUM_PARTS; i++){ + /* Ensure to reset the Value before checking for defect Part*/ + DefectVal = 0; + + Status = pChipInfoProtocol->GetDefectivePart(pChipInfoProtocol, i, &DefectVal); + if (EFI_ERROR(Status)) { + DEBUG((EFI_D_VERBOSE, "Failed to get MM defective[%d] part. %r\n", i, Status)); + continue; + } + + *Value |= (DefectVal << i); + } + + if (Status == EFI_NOT_FOUND) + Status = EFI_SUCCESS; + + return Status; +} + +EFI_STATUS UpdatePartialGoodsNode(VOID *fdt) +{ + UINT32 i; + UINT32 PartialGoodsMMValue = 0; + UINT32 PartialGoodsCpuValue[MAX_CPU_CLUSTER]; + EFI_CHIPINFO_PROTOCOL *pChipInfoProtocol; + EFI_STATUS Status = EFI_SUCCESS; + + Status = gBS->LocateProtocol (&gEfiChipInfoProtocolGuid, NULL,(VOID **) &pChipInfoProtocol); + if (EFI_ERROR(Status)) + return Status; + + + if (pChipInfoProtocol->Revision < EFI_CHIPINFO_PROTOCOL_REVISION) + return Status; + + /* Read and update Multimedia Partial Goods Nodes */ + Status = ReadMMPartialGoods(pChipInfoProtocol, &PartialGoodsMMValue); + if (Status != EFI_SUCCESS) + goto out; /* NOT a critical failure and need not error out.*/ + + if (PartialGoodsMMValue) + DEBUG((EFI_D_INFO, "PartialGoods for Multimedia: 0x%x\n", PartialGoodsMMValue)); + + FindNodeAndUpdateProperty(fdt, ARRAY_SIZE(PartialGoodsMmType), &PartialGoodsMmType[0], PartialGoodsMMValue); + + /* Read and update CPU Partial Goods nodes */ + Status = ReadCpuPartialGoods(pChipInfoProtocol, PartialGoodsCpuValue); + if (Status != EFI_SUCCESS) + goto out; + + for (i = 0; i < MAX_CPU_CLUSTER; i++) { + if (PartialGoodsCpuValue[i]) { + DEBUG((EFI_D_INFO, "PartialGoods for Cluster[%d]: 0x%x\n", i, PartialGoodsCpuValue[i])); + FindNodeAndUpdateProperty(fdt, ARRAY_SIZE(&PartialGoodsCpuType[i]), &PartialGoodsCpuType[i][0], PartialGoodsCpuValue[i]); + } + } + + return Status; +out: + DEBUG((EFI_D_VERBOSE, "Continue to boot...\n")); + return EFI_SUCCESS; + +} |