| From 61bc4c7ce14309165023389ba859163c1664b292 Mon Sep 17 00:00:00 2001 |
| From: Andrew Geissler <andrewg@us.ibm.com> |
| Date: Sun, 14 Dec 2014 18:42:00 -0600 |
| Subject: [PATCH] Revert "Base devtree model on vpd" |
| |
| This reverts commit 212a11e8f24dae439cf9189762546079bbf40fb1. |
| --- |
| src/usr/devtree/bld_devtree.C | 55 ++----------------------------------------- |
| 1 file changed, 2 insertions(+), 53 deletions(-) |
| |
| diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C |
| index ca6d6d2..b28033b 100644 |
| --- a/src/usr/devtree/bld_devtree.C |
| +++ b/src/usr/devtree/bld_devtree.C |
| @@ -44,9 +44,6 @@ |
| #include <vfs/vfs.H> |
| #include <fsi/fsiif.H> |
| #include <config.h> |
| -#include <devicefw/userif.H> |
| -#include <vpd/cvpdenums.H> |
| - |
| |
| trace_desc_t *g_trac_devtree = NULL; |
| TRAC_INIT(&g_trac_devtree, "DEVTREE", 4096); |
| @@ -606,56 +603,8 @@ errlHndl_t bld_fdt_system(devTree * i_dt, bool i_smallTree) |
| i_dt->addPropertyString(rootNode, "compatible", "ibm,powernv"); |
| |
| /* Add system model node */ |
| - // Based off of the DR field in the OPFR |
| - // TODO RTC 118373 -- update to account for firestone/memory riser |
| - TARGETING::TargetHandleList l_membTargetList; |
| - getAllChips(l_membTargetList, TYPE_MEMBUF); |
| - |
| - //if can't find a centaur for the CVPD, default to unknown |
| - if (l_membTargetList.size()) |
| - { |
| - TARGETING::Target * l_pMem = l_membTargetList[0]; |
| - size_t vpdSize = 0x0; |
| - |
| - // Note: First read with NULL for o_buffer sets vpdSize to the |
| - // correct length |
| - errhdl = deviceRead( l_pMem, |
| - NULL, |
| - vpdSize, |
| - DEVICE_CVPD_ADDRESS( CVPD::OPFR, |
| - CVPD::DR )); |
| - |
| - if(errhdl) |
| - { |
| - TRACFCOMP(g_trac_devtree,ERR_MRK" Couldn't get DR size for HUID=0x%.8X", |
| - TARGETING::get_huid(l_pMem)); |
| - } |
| - else |
| - { |
| - char drBuf[vpdSize+1]; |
| - memset(&drBuf, 0x0, (vpdSize+1)); //ensure null terminated str |
| - errhdl = deviceRead( l_pMem, |
| - reinterpret_cast<void*>( &drBuf ), |
| - vpdSize, |
| - DEVICE_CVPD_ADDRESS( CVPD::OPFR, |
| - CVPD::DR )); |
| - |
| - if(errhdl) |
| - { |
| - TRACFCOMP(g_trac_devtree,ERR_MRK" Couldn't read DR for HUID=0x%.8X", |
| - TARGETING::get_huid(l_pMem)); |
| - } |
| - else |
| - { |
| - i_dt->addPropertyString(rootNode, "model", drBuf); |
| - } |
| - } |
| - } |
| - else //chassis info not found, default to unknown |
| - { |
| - TRACFCOMP(g_trac_devtree,ERR_MRK" VPD not found, model defaulted to unknown"); |
| - i_dt->addPropertyString(rootNode, "model", "unknown"); |
| - } |
| + //TODO RTC:88056 - store model type in attributes? |
| + i_dt->addPropertyString(rootNode, "model", "palmetto"); |
| } |
| |
| return errhdl; |
| -- |
| 1.8.2.2 |
| |