Hello community, here is the log from the commit of package powerpc-utils for openSUSE:Factory checked in at 2014-09-10 17:02:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerpc-utils (Old) and /work/SRC/openSUSE:Factory/.powerpc-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "powerpc-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/powerpc-utils/powerpc-utils.changes 2014-07-18 14:03:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.powerpc-utils.new/powerpc-utils.changes 2014-09-10 17:02:39.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Sep 4 13:06:31 UTC 2014 - [email protected] + +- version update to 1.2.22 (BNC#894855) + - ppc64_cpu: Be verbose about inconsistant SMT state + - ppc64_cpu: Remove parameter from do_info + - nvram: Handle endianness in the nvram --unzip option + - drmgr/lsslot: increase number of max cpu threads + - lsslot/drmgr: little endian support for memory + - lsslot/drmgr: little endian support for cpu + +- removed patches: + * powerpc-utils.endianness_for_unzip_option.patch +------------------------------------------------------------------- +Wed Jul 16 13:58:42 UTC 2014 - [email protected] + +- fix for nvram --unzip option to handle endianness (BNC#887275) +- added patch: + * powerpc-utils.endianness_for_unzip_option.patch + + +------------------------------------------------------------------- @@ -4 +25 @@ -- Update to 1.2.21: +- Update to 1.2.21 (bnc#884709): Old: ---- powerpc-utils-1.2.21.tar.gz New: ---- powerpc-utils-1.2.22.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerpc-utils.spec ++++++ --- /var/tmp/diff_new_pack.8cjiRv/_old 2014-09-10 17:02:40.000000000 +0200 +++ /var/tmp/diff_new_pack.8cjiRv/_new 2014-09-10 17:02:40.000000000 +0200 @@ -33,7 +33,7 @@ Recommends: powerpc-utils-python BuildRequires: librtas-devel BuildRequires: zlib-devel -Version: 1.2.21 +Version: 1.2.22 Release: 0 Url: http://sourceforge.net/projects/powerpc-utils Summary: Utilities for PowerPC Hardware ++++++ powerpc-utils-1.2.21.tar.gz -> powerpc-utils-1.2.22.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/Changelog new/powerpc-utils-1.2.22/Changelog --- old/powerpc-utils-1.2.21/Changelog 2014-06-25 23:24:47.000000000 +0200 +++ new/powerpc-utils-1.2.22/Changelog 2014-08-13 16:44:05.000000000 +0200 @@ -1,3 +1,78 @@ +powerpc-utils-1.2.22 +===================================================================== +commit 0a67ffbb5d40c49347cd85a74921693457331f82 +Author: Joel Stanley <[email protected]> +Date: Wed Aug 13 09:38:20 2014 -0500 + + ppc64_cpu: Be verbose about inconsistant SMT state + + With the use of splitcore, users are more likely to end up in a strange + SMT state. Be kind and display what the online state of all our CPUs is, + and explain how to get out of this hole. + + Signed-off-by: Joel Stanley <[email protected]> + +commit d3e016e9e5683a565824b9ec185901ff7feb25ed +Author: Joel Stanley <[email protected]> +Date: Wed Aug 13 09:36:27 2014 -0500 + + ppc64_cpu: Remove parameter from do_info + + It is unused. + + Also add a forward declaration at the top so we can call do_info in other + interesting places. + + Signed-off-by: Joel Stanley <[email protected]> + +commit 2af3d960442be3d36d8aa8ac914928d4047a0f18 +Author: Aruna Balakrishnaiah <[email protected]> +Date: Wed Aug 13 08:39:17 2014 -0500 + + nvram: Handle endianness in the nvram --unzip option. + + Handle endianness of the oops log size in the --unzip + option. + + Signed-off-by: Aruna Balakrishnaiah <[email protected]> + Acked-by: Vasant Hegde <[email protected]> + +commit 48d45ca2ba2f098a4a565dac6e74cafe8db808f9 +Author: Thomas Falcon <[email protected]> +Date: Wed Aug 13 08:35:30 2014 -0500 + + drmgr/lsslot: increase number of max cpu threads. + + The Power8 cpu can support eight threads per cpu core. This + patch increases the maximum number of threads from four to eight. + + Signed-off-by: Thomas Falcon <[email protected]> + +commit 23872cbdce2107562b1b997cf306d6279ddf5d50 +Author: Thomas Falcon <[email protected]> +Date: Wed Aug 13 08:22:37 2014 -0500 + + lsslot/drmgr: little endian support for memory + + This patch adds some support in retrieving memory slot information + on little endian systems. These changes have only been tested using + lsslot. Adding or removing memory via drmgr has not been attempted. + + Signed-off-by: Thomas Falcon <[email protected]> + Signed-off-by: Nathan Fontenot <[email protected]> + +commit c0e6665d9da9797df4b7516f2ef14d7a45f5cb81 +Author: Thomas Falcon <[email protected]> +Date: Wed Aug 13 08:00:52 2014 -0500 + + lsslot/drmgr: little endian support for cpu + + This patch adds some support in retrieving cpu slot information + on little endian systems. These changes have only been tested using + lsslot. Adding or removing cpu's via drmgr has not been attempted. + + Signed-off-by: Thomas Falcon <[email protected]> + powerpc-utils-1.2.21 ===================================================================== commit a529515e6a78bc8d39b58122b99e009291048a78 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/configure new/powerpc-utils-1.2.22/configure --- old/powerpc-utils-1.2.21/configure 2014-06-25 23:26:04.000000000 +0200 +++ new/powerpc-utils-1.2.22/configure 2014-08-13 16:44:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for powerpc-utils 1.2.21. +# Generated by GNU Autoconf 2.63 for powerpc-utils 1.2.22. # # Report bugs to <[email protected]>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='powerpc-utils' PACKAGE_TARNAME='powerpc-utils' -PACKAGE_VERSION='1.2.21' -PACKAGE_STRING='powerpc-utils 1.2.21' +PACKAGE_VERSION='1.2.22' +PACKAGE_STRING='powerpc-utils 1.2.22' PACKAGE_BUGREPORT='[email protected]' ac_unique_file="src/rtas_ibm_get_vpd.c" @@ -1289,7 +1289,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures powerpc-utils 1.2.21 to adapt to many kinds of systems. +\`configure' configures powerpc-utils 1.2.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1355,7 +1355,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of powerpc-utils 1.2.21:";; + short | recursive ) echo "Configuration of powerpc-utils 1.2.22:";; esac cat <<\_ACEOF @@ -1447,7 +1447,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -powerpc-utils configure 1.2.21 +powerpc-utils configure 1.2.22 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1461,7 +1461,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by powerpc-utils $as_me 1.2.21, which was +It was created by powerpc-utils $as_me 1.2.22, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2182,7 +2182,7 @@ # Define the identity of the package. PACKAGE='powerpc-utils' - VERSION='1.2.21' + VERSION='1.2.22' cat >>confdefs.h <<_ACEOF @@ -8142,7 +8142,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by powerpc-utils $as_me 1.2.21, which was +This file was extended by powerpc-utils $as_me 1.2.22, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8196,7 +8196,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -powerpc-utils config.status 1.2.21 +powerpc-utils config.status 1.2.22 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/configure.ac new/powerpc-utils-1.2.22/configure.ac --- old/powerpc-utils-1.2.21/configure.ac 2014-06-25 23:25:34.000000000 +0200 +++ new/powerpc-utils-1.2.22/configure.ac 2014-08-13 16:44:14.000000000 +0200 @@ -1,6 +1,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -m4_define([ppu_version], 1.2.21) +m4_define([ppu_version], 1.2.22) AC_PREREQ([2.63]) AC_INIT([powerpc-utils], ppu_version, [[email protected]]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/drmgr/common_cpu.c new/powerpc-utils-1.2.22/src/drmgr/common_cpu.c --- old/powerpc-utils-1.2.21/src/drmgr/common_cpu.c 2014-05-28 01:51:48.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/drmgr/common_cpu.c 2014-08-13 15:00:02.000000000 +0200 @@ -205,7 +205,7 @@ { struct stat sb; char intserv_path[DR_PATH_MAX]; - int rc; + int rc, i; if (path) { snprintf(cpu->ofdt_path, DR_PATH_MAX, "%s", path); @@ -220,11 +220,15 @@ /* Skip past CPU_OFDT_BASE plus the '/' */ cpu->name = cpu->ofdt_path + strlen(CPU_OFDT_BASE) + 1; - memset(&cpu->cpu_intserv_nums, -1, sizeof(cpu->cpu_intserv_nums)); rc = get_property(cpu->ofdt_path, "ibm,ppc-interrupt-server#s", &cpu->cpu_intserv_nums, sizeof(cpu->cpu_intserv_nums)); + + /* Making sure the intserv_nums are in correct endian format */ + for (i = 0; i < MAX_CPU_INTSERV_NUMS; i++) + cpu->cpu_intserv_nums[i] = be32toh(cpu->cpu_intserv_nums[i]); + if (rc) { say(ERROR, "Could not retrieve ibm,ppc-interrupt-server#s " "property for %s\n", cpu->name); @@ -244,8 +248,7 @@ else cpu->cpu_nthreads = sb.st_size / 4; - rc = get_property(cpu->ofdt_path, "reg", &cpu->cpu_reg, - sizeof(cpu->cpu_reg)); + rc = get_ofdt_uint_property(cpu->ofdt_path, "reg", &cpu->cpu_reg); if (rc) { say(ERROR, "Could not retrieve reg property for %s\n", cpu->name); @@ -254,8 +257,7 @@ /* l2-cache may not exist */ cpu->cpu_l2cache = 0xffffffff; - get_property(cpu->ofdt_path, "l2-cache", &cpu->cpu_l2cache, - sizeof(cpu->cpu_l2cache)); + get_ofdt_uint_property(cpu->ofdt_path, "l2-cache", &cpu->cpu_l2cache); get_cpu_threads(cpu, dr_info->all_threads); cpu->is_owned = 1; @@ -543,9 +545,8 @@ cache->next = cache_list; cache_list = cache; - rc = get_property(cache->path, "ibm,phandle", - &cache->phandle, - sizeof(cache->phandle)); + rc = get_ofdt_uint_property(cache->path, "ibm,phandle", + &cache->phandle); if (rc) { say(ERROR, "Could not retreive ibm,phandle " "property for %s\n", cache->path); @@ -555,8 +556,8 @@ /* l3-caches do not have a l2-cache property */ cache->l2cache = 0xffffffff; - get_property(cache->path, "l2-cache", &cache->l2cache, - sizeof(cache->l2cache)); + get_ofdt_uint_property(cache->path, "l2-cache", + &cache->l2cache); say(DEBUG, "Found cache %s\n", cache->name); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/drmgr/drslot_chrp_mem.c new/powerpc-utils-1.2.22/src/drmgr/drslot_chrp_mem.c --- old/powerpc-utils-1.2.21/src/drmgr/drslot_chrp_mem.c 2014-06-25 22:03:21.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/drmgr/drslot_chrp_mem.c 2014-08-13 15:19:27.000000000 +0200 @@ -43,18 +43,15 @@ * @param int * pointer to phandle */ int -get_phandle(char *path, int *phandle) +get_phandle(char *path, uint *phandle) { int rc1,rc2; /* get "linux,phandle" property */ - rc1 = get_property(path, "linux,phandle", phandle, - sizeof(*phandle)); + rc1 = get_ofdt_uint_property(path, "linux,phandle", phandle); /* overwrite with "ibm,handle" if it exists */ - rc2 = get_property(path, "ibm,phandle", phandle, - sizeof(*phandle)); - + rc2 = get_ofdt_uint_property(path, "ibm,phandle", phandle); /* return bad if both gets failed */ if (rc1 && rc2) return rc1; @@ -158,7 +155,7 @@ return rc; } - lmb->lmb_size = regs[3]; + lmb->lmb_size = be32toh(regs[3]); return 0; } @@ -263,6 +260,10 @@ rc = get_property(DYNAMIC_RECONFIG_MEM, "ibm,lmb-size", &lmb_sz, sizeof(lmb_sz)); + + /* convert for LE systems */ + lmb_sz = be64toh(lmb_sz); + if (rc) { say(DEBUG, "Could not retrieve drconf LMB size\n"); return rc; @@ -288,12 +289,20 @@ /* The first integer of the buffer is the number of entries */ num_entries = *(int *)lmb_list->drconf_buf; + /* convert for LE systems */ + num_entries = be32toh(num_entries); + /* Followed by the actual entries */ drmem = (struct drconf_mem *) (lmb_list->drconf_buf + sizeof(num_entries)); for (i = 0; i < num_entries; i++) { struct dr_node *lmb; + /* convert for LE systems */ + drmem->address = be64toh(drmem->address); + drmem->drc_index = be32toh(drmem->drc_index); + drmem->flags = be32toh(drmem->flags); + for (lmb = lmb_list->lmbs; lmb; lmb = lmb->next) { if (lmb->drc_index == drmem->drc_index) break; @@ -553,16 +562,24 @@ size_t prop_buf_sz; char *tmp; struct drconf_mem *drmem; - int phandle; + uint phandle; int i, entries; int rc; /* The first int of the buffer is the number of entries */ entries = *(int *)lmb_list->drconf_buf; + /* convert for LE systems */ + entries = be32toh(entries); + drmem = (struct drconf_mem *)(lmb_list->drconf_buf + sizeof(entries)); for (i = 0; i < entries; i++) { + + /* convert for LE systems */ + drmem->drc_index = be32toh(drmem->drc_index); + drmem->flags = be32toh(drmem->flags); + if (drmem->drc_index != lmb->drc_index) { drmem++; continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/drmgr/ofdt.h new/powerpc-utils-1.2.22/src/drmgr/ofdt.h --- old/powerpc-utils-1.2.21/src/drmgr/ofdt.h 2014-05-28 01:51:48.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/drmgr/ofdt.h 2014-08-13 15:35:03.000000000 +0200 @@ -14,7 +14,7 @@ #define DR_PATH_MAX 1024 #define DR_STR_MAX 128 -#define MAX_CPU_INTSERV_NUMS 4 +#define MAX_CPU_INTSERV_NUMS 8 struct dr_connector { char name[DRC_STR_MAX]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/nvram.c new/powerpc-utils-1.2.22/src/nvram.c --- old/powerpc-utils-1.2.21/src/nvram.c 2014-06-25 23:05:24.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/nvram.c 2014-08-13 15:38:37.000000000 +0200 @@ -1113,7 +1113,7 @@ start = (char*) phead; next = start + sizeof(*phead); /* Skip partition header. */ next += sizeof(struct err_log_info); /* Skip sub-header. */ - zipped_length = *((unsigned short*) next); + zipped_length = be16toh(*((unsigned short*) next)); next += sizeof(unsigned short); /* New format oops header, zipped_length > OOPS_PARTITION_SZ @@ -1121,7 +1121,7 @@ * and from where the compressed data starts. */ if (zipped_length > OOPS_PARTITION_SZ) { - zipped_length = *((unsigned short*) next); + zipped_length = be16toh(*((unsigned short*) next)); next += sizeof(struct oops_log_info) - sizeof(unsigned short); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/ppc64_cpu.c new/powerpc-utils-1.2.22/src/ppc64_cpu.c --- old/powerpc-utils-1.2.21/src/ppc64_cpu.c 2014-06-25 22:31:29.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/ppc64_cpu.c 2014-08-13 16:37:51.000000000 +0200 @@ -57,6 +57,8 @@ static int cpus_in_system = 0; static int threads_in_system = 0; +static int do_info(void); + static int test_sysattr(char *attribute, int perms) { char path[SYSFS_PATH_MAX]; @@ -1068,7 +1070,9 @@ smt_state = get_smt_state(); if (smt_state == -1) { - printf("Bad or inconsistent SMT state\n"); + printf("Bad or inconsistent SMT state: use ppc64_cpu --smt=on|off to set all\n" + "cores to have the same number of online threads to continue.\n"); + do_info(); return -1; } @@ -1126,7 +1130,7 @@ return 0; } -static int do_info(char *arg) +static int do_info(void) { int i, j, thread_num; char online; @@ -1287,7 +1291,7 @@ else if (!strcmp(action, "threads-per-core")) do_threads_per_core(); else if (!strcmp(action, "info")) - rc = do_info(action_arg); + rc = do_info(); else if (!strcmp(action, "version")) printf("ppc64_cpu: version %s\n", PPC64_CPU_VERSION); else -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
