| Andrew Geissler | f14815a | 2014-12-14 18:54:10 -0600 | [diff] [blame] | 1 | From 61bc4c7ce14309165023389ba859163c1664b292 Mon Sep 17 00:00:00 2001 |
| 2 | From: Andrew Geissler <andrewg@us.ibm.com> |
| 3 | Date: Sun, 14 Dec 2014 18:42:00 -0600 |
| 4 | Subject: [PATCH] Revert "Base devtree model on vpd" |
| 5 | |
| 6 | This reverts commit 212a11e8f24dae439cf9189762546079bbf40fb1. |
| 7 | --- |
| 8 | src/usr/devtree/bld_devtree.C | 55 ++----------------------------------------- |
| 9 | 1 file changed, 2 insertions(+), 53 deletions(-) |
| 10 | |
| 11 | diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C |
| 12 | index ca6d6d2..b28033b 100644 |
| 13 | --- a/src/usr/devtree/bld_devtree.C |
| 14 | +++ b/src/usr/devtree/bld_devtree.C |
| 15 | @@ -44,9 +44,6 @@ |
| 16 | #include <vfs/vfs.H> |
| 17 | #include <fsi/fsiif.H> |
| 18 | #include <config.h> |
| 19 | -#include <devicefw/userif.H> |
| 20 | -#include <vpd/cvpdenums.H> |
| 21 | - |
| 22 | |
| 23 | trace_desc_t *g_trac_devtree = NULL; |
| 24 | TRAC_INIT(&g_trac_devtree, "DEVTREE", 4096); |
| 25 | @@ -606,56 +603,8 @@ errlHndl_t bld_fdt_system(devTree * i_dt, bool i_smallTree) |
| 26 | i_dt->addPropertyString(rootNode, "compatible", "ibm,powernv"); |
| 27 | |
| 28 | /* Add system model node */ |
| 29 | - // Based off of the DR field in the OPFR |
| 30 | - // TODO RTC 118373 -- update to account for firestone/memory riser |
| 31 | - TARGETING::TargetHandleList l_membTargetList; |
| 32 | - getAllChips(l_membTargetList, TYPE_MEMBUF); |
| 33 | - |
| 34 | - //if can't find a centaur for the CVPD, default to unknown |
| 35 | - if (l_membTargetList.size()) |
| 36 | - { |
| 37 | - TARGETING::Target * l_pMem = l_membTargetList[0]; |
| 38 | - size_t vpdSize = 0x0; |
| 39 | - |
| 40 | - // Note: First read with NULL for o_buffer sets vpdSize to the |
| 41 | - // correct length |
| 42 | - errhdl = deviceRead( l_pMem, |
| 43 | - NULL, |
| 44 | - vpdSize, |
| 45 | - DEVICE_CVPD_ADDRESS( CVPD::OPFR, |
| 46 | - CVPD::DR )); |
| 47 | - |
| 48 | - if(errhdl) |
| 49 | - { |
| 50 | - TRACFCOMP(g_trac_devtree,ERR_MRK" Couldn't get DR size for HUID=0x%.8X", |
| 51 | - TARGETING::get_huid(l_pMem)); |
| 52 | - } |
| 53 | - else |
| 54 | - { |
| 55 | - char drBuf[vpdSize+1]; |
| 56 | - memset(&drBuf, 0x0, (vpdSize+1)); //ensure null terminated str |
| 57 | - errhdl = deviceRead( l_pMem, |
| 58 | - reinterpret_cast<void*>( &drBuf ), |
| 59 | - vpdSize, |
| 60 | - DEVICE_CVPD_ADDRESS( CVPD::OPFR, |
| 61 | - CVPD::DR )); |
| 62 | - |
| 63 | - if(errhdl) |
| 64 | - { |
| 65 | - TRACFCOMP(g_trac_devtree,ERR_MRK" Couldn't read DR for HUID=0x%.8X", |
| 66 | - TARGETING::get_huid(l_pMem)); |
| 67 | - } |
| 68 | - else |
| 69 | - { |
| 70 | - i_dt->addPropertyString(rootNode, "model", drBuf); |
| 71 | - } |
| 72 | - } |
| 73 | - } |
| 74 | - else //chassis info not found, default to unknown |
| 75 | - { |
| 76 | - TRACFCOMP(g_trac_devtree,ERR_MRK" VPD not found, model defaulted to unknown"); |
| 77 | - i_dt->addPropertyString(rootNode, "model", "unknown"); |
| 78 | - } |
| 79 | + //TODO RTC:88056 - store model type in attributes? |
| 80 | + i_dt->addPropertyString(rootNode, "model", "palmetto"); |
| 81 | } |
| 82 | |
| 83 | return errhdl; |
| 84 | -- |
| 85 | 1.8.2.2 |
| 86 | |