Hello community, here is the log from the commit of package powerpc-utils checked in at Mon Oct 27 17:09:26 CET 2008. -------- --- arch/ppc/powerpc-utils/powerpc-utils.changes 2008-10-15 17:29:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/powerpc-utils/powerpc-utils.changes 2008-10-27 13:46:47.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Oct 27 13:45:58 CET 2008 - olh@suse.de + +- use linux,phandle for memory add when ibm,phandle is not available. + (bnc#438685 - LTC49075) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- powerpc-utils-papr.drmgr-phandle.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerpc-utils.spec ++++++ --- /var/tmp/diff_new_pack.X14506/_old 2008-10-27 17:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.X14506/_new 2008-10-27 17:09:11.000000000 +0100 @@ -28,7 +28,7 @@ Obsoletes: ppc64-utils Provides: ppc64-utils Version: 1.1.1 -Release: 7 +Release: 8 License: IBM Public License Url: http://powerpc-utils.ozlabs.org/ Group: System/Management @@ -46,6 +46,7 @@ Patch101: powerpc-utils-papr.insserv-ibmvscsis.patch Patch102: powerpc-utils-papr.drmgs_mem_rm.patch Patch103: powerpc-utils-papr.drmgr-symlinks.patch +Patch104: powerpc-utils-papr.drmgr-phandle.patch ExclusiveArch: ppc ppc64 %description @@ -71,6 +72,7 @@ %patch101 -p1 %patch102 -p1 %patch103 -p1 +%patch104 -p1 %build make CFLAGS="$RPM_OPT_FLAGS" %{?jobs:-j%jobs} @@ -106,6 +108,9 @@ %config %attr (755,root,root) /etc/init.d/ibmvscsis.sh %changelog +* Mon Oct 27 2008 olh@suse.de +- use linux,phandle for memory add when ibm,phandle is not available. + (bnc#438685 - LTC49075) * Wed Oct 15 2008 olh@suse.de - fix memory hotplug remove (bnc#435181 - LTC48640) - provide compat symlinks (bnc#435543 - LTC49095) ++++++ powerpc-utils-papr.drmgr-phandle.patch ++++++ # Bug 438685 - UPT:LTE: clashlp1: Memory add fails, responds with HSCL297A message # - Use linux,phandle for memory add when ibm,phandle is not available. --- cmds/drmgr/drslot_chrp_mem.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) --- a/cmds/drmgr/drslot_chrp_mem.c +++ b/cmds/drmgr/drslot_chrp_mem.c @@ -34,6 +34,29 @@ mem_usage(char **pusage) } /** + * get_phandle + * + * @param char * device tree node pointer + * @param int * pointer to phandle + */ +int get_phandle(char *path, int *phandle) +{ + int rc1, rc2; + + /* get "linux,phandle" property */ + rc1 = get_property(path, "linux,phandle", phandle, sizeof(*phandle)); + + /* overwrite with "ibm,handle" if it exists */ + rc2 = get_property(path, "ibm,phandle", phandle, sizeof(*phandle)); + + /* return bad if both gets failed */ + if (rc1 && rc2) + return rc1; + else + return 0; +} + +/** * free_lmbs * @brief Free any allocated memory referenced from the list head * @@ -520,10 +543,11 @@ update_drconf_node(struct lmb *lmb, stru if (prop_buf == NULL) return -1; - rc = get_property(lmb->ofdt_path, "ibm,phandle", &phandle, - sizeof(phandle)); - if (rc) + rc = get_phandle(lmb->ofdt_path, &phandle); + if (rc) { + dbg("Failed to get phandle: %d\n", rc); return rc; + } memset(prop_buf, 0, prop_buf_sz); tmp = prop_buf; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org