diff options
Diffstat (limited to 'usr/src/lib')
6 files changed, 568 insertions, 567 deletions
diff --git a/usr/src/lib/libprtdiag/common/cpu.c b/usr/src/lib/libprtdiag/common/cpu.c index b39479f254..50cd177050 100644 --- a/usr/src/lib/libprtdiag/common/cpu.c +++ b/usr/src/lib/libprtdiag/common/cpu.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -88,15 +88,15 @@ get_ecache_size(Prom_node *node) /* find the properties */ if (cache_size_p = (int *)get_prop_val(find_prop(node, - "ecache-size"))) { + "ecache-size"))) { return (*cache_size_p); } if (cache_size_p = (int *)get_prop_val(find_prop(node, - "l3-cache-size"))) { + "l3-cache-size"))) { return (*cache_size_p); } if (cache_size_p = (int *)get_prop_val(find_prop(node, - "l2-cache-size"))) { + "l2-cache-size"))) { return (*cache_size_p); } @@ -125,11 +125,11 @@ display_cpu_devices(Sys_tree *tree) log_printf("\n", 0); log_printf("\n", 0); log_printf(" Run Ecache " - " CPU CPU\n", 0); + " CPU CPU\n", 0); log_printf("Brd CPU Module MHz MB " - "Impl. Mask\n", 0); + "Impl. Mask\n", 0); log_printf("--- --- ------- ----- ------ " - "------ ----\n", 0); + "------ ----\n", 0); /* Now display all of the cpus on each board */ bnode = tree->bd_list; @@ -155,7 +155,7 @@ display_cpus(Board_node *board) */ for (cpu = dev_find_type(board->nodes, "cpu"); cpu != NULL; cpu = dev_next_type(cpu, "cpu")) { - int freq; /* CPU clock frequency */ + uint_t freq; /* CPU clock frequency */ int ecache_size; /* External cache size */ int *mid; int *impl; @@ -183,15 +183,15 @@ display_cpus(Board_node *board) display_mid(*mid); /* Running frequency */ - log_printf(" %3d ", freq, 0); + log_printf(" %3u ", freq, 0); /* Ecache size */ if (ecache_size == 0) log_printf(" %3s ", "N/A", 0); else log_printf(" %4.1f ", - (float)ecache_size / (float)(1<<20), - 0); + (float)ecache_size / (float)(1<<20), + 0); /* Implementation */ if (impl == NULL) { @@ -225,12 +225,12 @@ display_cpus(Board_node *board) } else { if ((impl) && IS_CHEETAH(*impl)) decoded_mask = - REMAP_CHEETAH_MASK(*mask); + REMAP_CHEETAH_MASK(*mask); else decoded_mask = *mask; log_printf(" %d.%d", (decoded_mask >> 4) & 0xf, - decoded_mask & 0xf, 0); + decoded_mask & 0xf, 0); } log_printf("\n", 0); diff --git a/usr/src/lib/libprtdiag_psr/sparc/cherrystone/common/cherrystone.c b/usr/src/lib/libprtdiag_psr/sparc/cherrystone/common/cherrystone.c index 270cee2225..74731ac662 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/cherrystone/common/cherrystone.c +++ b/usr/src/lib/libprtdiag_psr/sparc/cherrystone/common/cherrystone.c @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -115,7 +115,7 @@ void display_cpus(Board_node *board) { Prom_node *cpu; - int freq; + uint_t freq; int ecache_size; int *l3_shares; int *mid; @@ -192,7 +192,7 @@ display_cpus(Board_node *board) log_printf(" %2d ", *mid); /* Running frequency */ - log_printf("%4d", freq); + log_printf("%4u", freq); if (ecache_size == 0) log_printf(" N/A "); diff --git a/usr/src/lib/libprtdiag_psr/sparc/daktari/common/daktari.c b/usr/src/lib/libprtdiag_psr/sparc/daktari/common/daktari.c index 4139eec282..3798b9db8d 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/daktari/common/daktari.c +++ b/usr/src/lib/libprtdiag_psr/sparc/daktari/common/daktari.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -152,9 +151,9 @@ disp_fail_parts(Sys_tree *tree) } log_printf("\n"); log_printf(dgettext(TEXT_DOMAIN, "Failed Field " - "Replaceable Units (FRU) in System:\n")); + "Replaceable Units (FRU) in System:\n")); log_printf("==========================" - "====================\n"); + "====================\n"); } while (pnode != NULL) { void *value; @@ -179,14 +178,14 @@ disp_fail_parts(Sys_tree *tree) } log_printf(dgettext(TEXT_DOMAIN, "%s unavailable " - "on %s Board #%d\n"), name, board_type, - bnode->board_num); + "on %s Board #%d\n"), name, board_type, + bnode->board_num); log_printf(dgettext(TEXT_DOMAIN, - "\tPROM fault string: %s\n"), value); + "\tPROM fault string: %s\n"), value); log_printf(dgettext(TEXT_DOMAIN, - "\tFailed Field Replaceable Unit is ")); + "\tFailed Field Replaceable Unit is ")); /* * Determine whether FRU is CPU module, system @@ -195,27 +194,27 @@ disp_fail_parts(Sys_tree *tree) if ((name != NULL) && (strstr(name, "sbus"))) { log_printf(dgettext(TEXT_DOMAIN, - "SBus Card %d\n"), - get_sbus_slot(pnode)); + "SBus Card %d\n"), + get_sbus_slot(pnode)); } else if (((name = get_node_name(pnode->parent)) != NULL) && (strstr(name, "pci"))) { log_printf(dgettext(TEXT_DOMAIN, - "PCI Card %d"), - get_pci_device(pnode)); + "PCI Card %d"), + get_pci_device(pnode)); } else if (((type = get_node_type(pnode)) != NULL) && (strstr(type, "cpu"))) { log_printf(dgettext(TEXT_DOMAIN, "UltraSPARC " - "module Board %d Module %d\n"), 0, - get_id(pnode)); + "module Board %d Module %d\n"), 0, + get_id(pnode)); } else { log_printf(dgettext(TEXT_DOMAIN, - "%s board %d\n"), board_type, - bnode->board_num); + "%s board %d\n"), board_type, + bnode->board_num); } pnode = next_failed_node(pnode); } @@ -224,7 +223,7 @@ disp_fail_parts(Sys_tree *tree) if (!system_failed) { log_printf(dgettext(TEXT_DOMAIN, - "No failures found in System\n")); + "No failures found in System\n")); log_printf("===========================\n\n"); } @@ -249,23 +248,23 @@ display_memoryconf(Sys_tree *tree, struct grp_info *grps) Board_node *bnode = tree->bd_list; log_printf(dgettext(TEXT_DOMAIN, - "========================= Memory Configuration" - " ===============================\n" - "\n Logical Logical" - " Logical " - "\n MC Bank Bank Bank" - " DIMM Interleave Interleaved" - "\n Brd ID num size " - "Status Size " - "Factor with" - "\n---- --- ---- ------ " - "----------- ------ " - "---------- -----------")); + "========================= Memory Configuration" + " ===============================\n" + "\n Logical Logical" + " Logical " + "\n MC Bank Bank Bank" + " DIMM Interleave Interleaved" + "\n Brd ID num size " + "Status Size " + "Factor with" + "\n---- --- ---- ------ " + "----------- ------ " + "---------- -----------")); while (bnode != NULL) { if (get_us3_mem_regs(bnode)) { log_printf(dgettext(TEXT_DOMAIN, - "\nFailed to get memory information.\n")); + "\nFailed to get memory information.\n")); return; } bnode = bnode->next; @@ -285,21 +284,21 @@ display_cpu_devices(Sys_tree *tree) * frequency, cache size, and processor revision of all cpus. */ log_printf(dgettext(TEXT_DOMAIN, - "\n" - "=========================" - " CPUs " - "===============================================" - "\n" - "\n" - " Run E$ CPU CPU \n" - "Brd CPU MHz MB Impl. Mask \n" - "--- ----- ---- ---- ------- ---- \n")); + "\n" + "=========================" + " CPUs " + "===============================================" + "\n" + "\n" + " Run E$ CPU CPU \n" + "Brd CPU MHz MB Impl. Mask \n" + "--- ----- ---- ---- ------- ---- \n")); /* Now display all of the cpus on each board */ bnode = tree->bd_list; if (bnode == NULL) { log_printf(dgettext(TEXT_DOMAIN, - "CPU Board list was NULL\n")); + "CPU Board list was NULL\n")); } while (bnode != NULL) { display_cpus(bnode); @@ -316,7 +315,7 @@ void display_cpus(Board_node *board) { Prom_node *cpu; - int freq; /* CPU clock frequency */ + uint_t freq; /* CPU clock frequency */ int ecache_size; /* External cache size */ int *l3_shares; int *mid; @@ -342,8 +341,8 @@ display_cpus(Board_node *board) ecache_size = get_ecache_size(cpu); impl = (int *)get_prop_val(find_prop(cpu, "implementation#")); mask = (int *)get_prop_val(find_prop(cpu, "mask#")); - l3_shares = - (int *)get_prop_val(find_prop(cpu, "l3-cache-sharing")); + l3_shares = (int *)get_prop_val(find_prop(cpu, + "l3-cache-sharing")); /* Do not display a failed CPU node */ if ((impl == NULL) || (freq == 0) || (node_failed(cpu))) @@ -358,8 +357,8 @@ display_cpus(Board_node *board) continue; } if ((fru_prev == 'X') || - ((fru_prev != 'X') && - (fru_name != fru_prev))) { + ((fru_prev != 'X') && + (fru_name != fru_prev))) { fru_prev = fru_name; mid_prev = *mid; ecache_size_prev = ecache_size; @@ -376,8 +375,8 @@ display_cpus(Board_node *board) * total size is equal to the core size. */ if ((l3_shares == NULL) || - ((l3_shares != NULL) && - MULTIPLE_BITS_SET(*l3_shares))) { + ((l3_shares != NULL) && + MULTIPLE_BITS_SET(*l3_shares))) { ecache_size += ecache_size_prev; } ecache_size_prev = 0; @@ -394,7 +393,7 @@ display_cpus(Board_node *board) log_printf(" %d ", *mid); /* Running frequency */ - log_printf(" %4d ", freq); + log_printf(" %4u ", freq); /* Ecache size */ if (ecache_size == 0) @@ -402,7 +401,7 @@ display_cpus(Board_node *board) "N/A"); else log_printf("%4.1f ", - (float)ecache_size / (float)(1<<20)); + (float)ecache_size / (float)(1<<20)); /* Implementation */ if (impl == NULL) { @@ -465,16 +464,16 @@ display_pci(Board_node *board) * each instance node found. */ for (pci = dev_find_node_by_compat(board->nodes, SCHIZO_COMPAT_PROP); - pci != NULL; - pci = dev_next_node_by_compat(pci, SCHIZO_COMPAT_PROP)) { + pci != NULL; + pci = dev_next_node_by_compat(pci, SCHIZO_COMPAT_PROP)) { (void) snprintf(card.bus_type, MAXSTRLEN, - dgettext(TEXT_DOMAIN, "PCI")); + dgettext(TEXT_DOMAIN, "PCI")); /* * Get slot-name properties from parent node and * store them in an array. */ value = (char *)get_prop_val( - find_prop(pci, "slot-names")); + find_prop(pci, "slot-names")); if (value != NULL) { #ifdef DEBUG @@ -486,7 +485,7 @@ display_pci(Board_node *board) slot_name_arr[0] = (char *)value + sizeof (int); for (i = 1; i < DAK_MAX_SLOTS_PER_IO_BD; i++) { slot_name_arr[i] = (char *)slot_name_arr[i - 1] - + strlen(slot_name_arr[i - 1]) +1; + + strlen(slot_name_arr[i - 1]) +1; } } /* @@ -498,7 +497,7 @@ display_pci(Board_node *board) card_node = pci->child; /* Generate the list of pci cards on pci instance: pci */ fill_pci_card_list(pci, card_node, &card, &card_list, - slot_name_arr); + slot_name_arr); } /* end-for */ display_io_cards(card_list); @@ -521,17 +520,17 @@ display_io_cards(struct io_card *list) if (banner == FALSE) { log_printf(dgettext(TEXT_DOMAIN, - " Bus Max\n" - " IO Port Bus Freq Bus Dev," - "\n" - "Brd Type ID Side Slot MHz Freq " - "Func State Name " - "Model\n" + " Bus Max\n" + " IO Port Bus Freq Bus Dev," + "\n" + "Brd Type ID Side Slot MHz Freq " + "Func State Name " + "Model\n" /* ---------Brd IO Port Bus Slot Bus Max Dev Stat */ - "---- ---- ---- ---- ---- ---- ---- ----" - " ----- " - "-------------------------------- " - "----------------------\n")); + "---- ---- ---- ---- ---- ---- ---- ----" + " ----- " + "-------------------------------- " + "----------------------\n")); banner = TRUE; } @@ -637,29 +636,29 @@ disp_envc_status() err = picl_initialize(); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "picl_initialize failed\n" - "%s\nCannot display environmental status\n"), - picl_strerror(err)); + "picl_initialize failed\n" + "%s\nCannot display environmental status\n"), + picl_strerror(err)); return (err); } err = picl_get_root(&root); err = find_child_device(root, system, &system_node); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_node_by_path for the SYSTEM node " - "failed\n" - "%s\nCannot display environmental status\n"), - picl_strerror(err)); + "picl_get_node_by_path for the SYSTEM node " + "failed\n" + "%s\nCannot display environmental status\n"), + picl_strerror(err)); return (err); } log_printf(dgettext(TEXT_DOMAIN, - "\n" - "========================= " - "Environmental Status " - "=========================" - "\n" - "\n")); + "\n" + "========================= " + "Environmental Status " + "=========================" + "\n" + "\n")); dak_env_print_temps(system_node); dak_env_print_keyswitch(system_node); @@ -683,25 +682,25 @@ dak_env_print_ps(picl_nodehdl_t system_node) picl_nodehdl_t *ps_I_sensor[DAK_MAX_PS_VOLTAGE_SENSORS]; int32_t volts[DAK_MAX_PS_VOLTAGE_SENSORS]; char fault_state - [DAK_MAX_PS_FAULT_SENSORS][PICL_PROPNAMELEN_MAX]; + [DAK_MAX_PS_FAULT_SENSORS][PICL_PROPNAMELEN_MAX]; char ps_state[PICL_PROPNAMELEN_MAX]; /* Printing out the Power Supply Heading information */ log_printf(dgettext(TEXT_DOMAIN, - "Power Supplies:\n" - "---------------\n" - " " - "Current Drain:\n" - "Supply Status Fan Fail Temp Fail CS Fail " - "3.3V 5V 12V 48V\n" - "------ ------------ -------- --------- " - "------- ---- -- --- ---\n")); + "Power Supplies:\n" + "---------------\n" + " " + "Current Drain:\n" + "Supply Status Fan Fail Temp Fail CS Fail " + "3.3V 5V 12V 48V\n" + "------ ------------ -------- --------- " + "------- ---- -- --- ---\n")); err = fill_device_array_from_id(system_node, "PSVC_PS", &number, &ps); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "failed in fill_device_array_from_id for PS\n" - "%s\n"), picl_strerror(err)); + "failed in fill_device_array_from_id for PS\n" + "%s\n"), picl_strerror(err)); return (err); } /* Printing out the Power Supply Status information */ @@ -718,20 +717,20 @@ dak_env_print_ps(picl_nodehdl_t system_node) continue; } err = picl_get_propval_by_name(ps[i], "State", ps_state, - PICL_PROPNAMELEN_MAX); + PICL_PROPNAMELEN_MAX); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "Error getting ps[%d]'s state: %s"), - i, picl_strerror(err)); + "Error getting ps[%d]'s state: %s"), + i, picl_strerror(err)); } err = fill_device_array_from_id(ps[i], "PSVC_DEV_FAULT_SENSOR", - &number, &ps_fail[i]); + &number, &ps_fail[i]); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "failed to get present PS fault sensors\n" - "%s\n"), picl_strerror(err)); + "failed to get present PS fault sensors\n" + "%s\n"), picl_strerror(err)); return (err); } @@ -740,8 +739,8 @@ dak_env_print_ps(picl_nodehdl_t system_node) if ((err != PICL_SUCCESS) && (err != PICL_INVALIDHANDLE)) { log_printf(dgettext(TEXT_DOMAIN, - "failed to get present PS I sensors\n" - "%s\n"), picl_strerror(err)); + "failed to get present PS I sensors\n" + "%s\n"), picl_strerror(err)); } log_printf("%s", name); @@ -759,23 +758,23 @@ dak_env_print_ps(picl_nodehdl_t system_node) for (r = 0; r < DAK_MAX_PS_FAULT_SENSORS; r++) { err = picl_get_propval_by_name(ps_fail[i][r], "State", - fault_state[r], PICL_PROPNAMELEN_MAX); + fault_state[r], PICL_PROPNAMELEN_MAX); if (err == PICL_SUCCESS) { fail = strcmp(fault_state[r], "OFF") + fail; } else { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_propval_by_name for ps " - "fault state failed\n" - "%s\n"), picl_strerror(err)); + "picl_get_propval_by_name for ps " + "fault state failed\n" + "%s\n"), picl_strerror(err)); return (err); } } for (r = 0; r < DAK_MAX_PS_VOLTAGE_SENSORS; r++) { err = picl_get_propval_by_name(ps_I_sensor[i][r], - "AtoDSensorValue", &volts[r], - sizeof (int32_t)); + "AtoDSensorValue", &volts[r], + sizeof (int32_t)); } if (fail != 0) { @@ -783,7 +782,7 @@ dak_env_print_ps(picl_nodehdl_t system_node) " FAIL ")); for (r = 0; r < DAK_MAX_PS_FAULT_SENSORS; r++) { log_printf(dgettext(TEXT_DOMAIN, " %-4s"), - fault_state[r]); + fault_state[r]); } } else { log_printf(dgettext(TEXT_DOMAIN, " GOOD ")); @@ -813,25 +812,25 @@ dak_env_print_fans(picl_nodehdl_t system_node) &fans); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "failed in fill_device_array_from_id " - "for FAN\n" - "%s\n"), picl_strerror(err)); + "failed in fill_device_array_from_id " + "for FAN\n" + "%s\n"), picl_strerror(err)); return (err); } log_printf("\n"); log_printf(dgettext(TEXT_DOMAIN, - "=================================\n")); + "=================================\n")); log_printf("\n"); log_printf(dgettext(TEXT_DOMAIN, "Fan Bank :\n")); log_printf(dgettext(TEXT_DOMAIN, "----------\n")); log_printf("\n"); log_printf(dgettext(TEXT_DOMAIN, "Bank Speed " - " Status Fan State\n")); + " Status Fan State\n")); log_printf(dgettext(TEXT_DOMAIN, " ( RPMS )" - " \n")); + " \n")); log_printf(dgettext(TEXT_DOMAIN, "---- --------" - " --------- ---------\n")); + " --------- ---------\n")); for (i = 0; i < DAK_MAX_FANS; i++) { @@ -846,25 +845,25 @@ dak_env_print_fans(picl_nodehdl_t system_node) } err = picl_get_propval_by_name(fans[i], "Fan-speed", - &fan_speed, sizeof (int32_t)); + &fan_speed, sizeof (int32_t)); if ((err != PICL_SUCCESS) && (err != PICL_INVALIDHANDLE)) { log_printf(dgettext(TEXT_DOMAIN, - "failed in picl_get_propval_by_name for " - "fan speed\n" - "%s\n"), picl_strerror(err)); + "failed in picl_get_propval_by_name for " + "fan speed\n" + "%s\n"), picl_strerror(err)); return (err); } if ((strcmp(name, "CPU0_PRIM_FAN") != 0) && - (strcmp(name, "CPU1_PRIM_FAN") != 0)) { + (strcmp(name, "CPU1_PRIM_FAN") != 0)) { err = picl_get_propval_by_name(fans[i], "Fan-switch", - enabled, PICL_PROPNAMELEN_MAX); + enabled, PICL_PROPNAMELEN_MAX); if ((err != PICL_SUCCESS) && (err != PICL_INVALIDHANDLE)) { log_printf(dgettext(TEXT_DOMAIN, - "failed in picl_get_propval_by_name for" - " fan enabled/disabled\n" - "%s\n"), picl_strerror(err)); + "failed in picl_get_propval_by_name for" + " fan enabled/disabled\n" + "%s\n"), picl_strerror(err)); return (err); } /* @@ -873,34 +872,34 @@ dak_env_print_fans(picl_nodehdl_t system_node) */ if (strcmp(enabled, "ON") == 0) { log_printf(dgettext(TEXT_DOMAIN, - "\t %4d [ENABLED]"), - fan_speed); + "\t %4d [ENABLED]"), + fan_speed); } else { log_printf(dgettext(TEXT_DOMAIN, - "\t 0 [DISABLED]")); + "\t 0 [DISABLED]")); } } else { /* Display the fan's speed */ log_printf(dgettext(TEXT_DOMAIN, "\t %4d"), - fan_speed); + fan_speed); log_printf(dgettext(TEXT_DOMAIN, - " [ENABLED]")); + " [ENABLED]")); } err = picl_get_propval_by_name(fans[i], "State", fan_state, - PICL_PROPNAMELEN_MAX); + PICL_PROPNAMELEN_MAX); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_propval_by_name failed: %s"), - picl_strerror(err)); + "picl_get_propval_by_name failed: %s"), + picl_strerror(err)); return (err); } log_printf(dgettext(TEXT_DOMAIN, "\t %s\n"), fan_state); } log_printf("\n"); log_printf(dgettext(TEXT_DOMAIN, - "=================================\n")); + "=================================\n")); log_printf("\n"); return (err); @@ -919,18 +918,18 @@ dak_env_print_disk(picl_nodehdl_t system_node) char name[PICL_PROPNAMELEN_MAX]; err = fill_device_array_from_id(system_node, "PSVC_DISK", &number, - &disks); + &disks); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "failed in fill_device_array_from_id for " - "DISK\n" - "%s\n"), picl_strerror(err)); + "failed in fill_device_array_from_id for " + "DISK\n" + "%s\n"), picl_strerror(err)); return (err); } log_printf(dgettext(TEXT_DOMAIN, - "Disk Status:\n" - " Presence Fault LED Remove LED\n")); + "Disk Status:\n" + " Presence Fault LED Remove LED\n")); for (i = 0; i < DAK_MAX_DISKS; i++) { err = picl_get_propval_by_name(disks[i], PICL_PROP_NAME, name, @@ -938,22 +937,22 @@ dak_env_print_disk(picl_nodehdl_t system_node) switch (err) { case PICL_SUCCESS: log_printf(dgettext(TEXT_DOMAIN, "DISK %2d: [%7s]"), - i, "PRESENT"); + i, "PRESENT"); break; case PICL_INVALIDHANDLE: log_printf(dgettext(TEXT_DOMAIN, "DISK %2d: [%7s]"), - i, "EMPTY"); + i, "EMPTY"); log_printf("\n"); continue; default: log_printf(dgettext(TEXT_DOMAIN, - "Failed picl_get_propval_by_name for " - "disk %d with %s\n"), i, picl_strerror(err)); + "Failed picl_get_propval_by_name for " + "disk %d with %s\n"), i, picl_strerror(err)); return (err); } err = fill_device_from_id(disks[i], "PSVC_PARENT", - &(disk_slots[i])); + &(disk_slots[i])); switch (err) { case PICL_SUCCESS: break; @@ -961,9 +960,9 @@ dak_env_print_disk(picl_nodehdl_t system_node) continue; default: log_printf(dgettext(TEXT_DOMAIN, - "failed in fill_device_from_id for disk " - "slot\n" - "%s\n"), picl_strerror(err)); + "failed in fill_device_from_id for disk " + "slot\n" + "%s\n"), picl_strerror(err)); return (err); } @@ -971,43 +970,43 @@ dak_env_print_disk(picl_nodehdl_t system_node) &disk_fault_leds[i]); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "failed in fill_device_from_id for disk slot " - "fault led\n" - "%s\n"), picl_strerror(err)); + "failed in fill_device_from_id for disk slot " + "fault led\n" + "%s\n"), picl_strerror(err)); return (err); } err = picl_get_propval_by_name(disk_fault_leds[i], - "State", led_state, PICL_PROPNAMELEN_MAX); + "State", led_state, PICL_PROPNAMELEN_MAX); if (err == PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, " [%3s]"), - led_state); + led_state); } else { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_propval_by_name for fault led_state" - " failed\n" - "%s\n"), picl_strerror(err)); + "picl_get_propval_by_name for fault led_state" + " failed\n" + "%s\n"), picl_strerror(err)); return (err); } err = fill_device_from_id(disk_slots[i], "PSVC_SLOT_REMOVE_LED", &disk_remove_leds[i]); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "failed in fill_device_from_id for disk slot " - "remove led\n" - "%s\n"), picl_strerror(err)); + "failed in fill_device_from_id for disk slot " + "remove led\n" + "%s\n"), picl_strerror(err)); return (err); } err = picl_get_propval_by_name(disk_remove_leds[i], - "State", led_state, PICL_PROPNAMELEN_MAX); + "State", led_state, PICL_PROPNAMELEN_MAX); if (err == PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - " [%3s]"), led_state); + " [%3s]"), led_state); } else { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_propval_by_name for remove" - " led_state failed\n" - "%s\n"), picl_strerror(err)); + "picl_get_propval_by_name for remove" + " led_state failed\n" + "%s\n"), picl_strerror(err)); return (err); } log_printf("\n"); @@ -1027,41 +1026,41 @@ dak_env_print_FSP_LEDS(picl_nodehdl_t system_node) &fsp_leds); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "failed in fill_device_array_from_id for " - "FSP_LED\n" - "%s\n"), picl_strerror(err)); + "failed in fill_device_array_from_id for " + "FSP_LED\n" + "%s\n"), picl_strerror(err)); return (err); } log_printf(dgettext(TEXT_DOMAIN, - "System LED Status:\n" - " GEN FAULT REMOVE\n")); + "System LED Status:\n" + " GEN FAULT REMOVE\n")); for (i = 0; i < DAK_MAX_FSP_LEDS; i++) { err = picl_get_propval_by_name(fsp_leds[i], "State", - led_state, PICL_PROPNAMELEN_MAX); + led_state, PICL_PROPNAMELEN_MAX); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_propval_by_name for led_state" - " failed\n" - "%s\n"), picl_strerror(err)); + "picl_get_propval_by_name for led_state" + " failed\n" + "%s\n"), picl_strerror(err)); return (err); } log_printf(dgettext(TEXT_DOMAIN, - " [%3s]"), led_state); + " [%3s]"), led_state); } log_printf("\n\n"); log_printf(dgettext(TEXT_DOMAIN, - " DISK FAULT ")); + " DISK FAULT ")); log_printf(dgettext(TEXT_DOMAIN, "POWER FAULT\n")); for (i = 2; i < 4; i++) { err = picl_get_propval_by_name(fsp_leds[i], "State", - led_state, PICL_PROPNAMELEN_MAX); + led_state, PICL_PROPNAMELEN_MAX); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_propval_by_name for led_state" - " failed\n" - "%s\n"), picl_strerror(err)); + "picl_get_propval_by_name for led_state" + " failed\n" + "%s\n"), picl_strerror(err)); return (err); } log_printf(dgettext(TEXT_DOMAIN, " [%3s]"), @@ -1069,41 +1068,41 @@ dak_env_print_FSP_LEDS(picl_nodehdl_t system_node) } log_printf("\n\n"); log_printf(dgettext(TEXT_DOMAIN, - " LEFT THERMAL FAULT " - "RIGHT THERMAL FAULT\n")); + " LEFT THERMAL FAULT " + "RIGHT THERMAL FAULT\n")); for (i = 4; i < 6; i++) { err = picl_get_propval_by_name(fsp_leds[i], "State", led_state, PICL_PROPNAMELEN_MAX); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_propval_by_name for led_state " - "failed\n" - "%s\n"), picl_strerror(err)); + "picl_get_propval_by_name for led_state " + "failed\n" + "%s\n"), picl_strerror(err)); return (err); } log_printf(dgettext(TEXT_DOMAIN, " [%3s]"), - led_state); + led_state); } log_printf("\n\n"); log_printf(dgettext(TEXT_DOMAIN, - " LEFT DOOR " - "RIGHT DOOR\n")); + " LEFT DOOR " + "RIGHT DOOR\n")); for (i = 6; i < 8; i++) { err = picl_get_propval_by_name(fsp_leds[i], "State", led_state, PICL_PROPNAMELEN_MAX); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_propval_by_name for led_state" - " failed\n" - "%s\n"), picl_strerror(err)); + "picl_get_propval_by_name for led_state" + " failed\n" + "%s\n"), picl_strerror(err)); return (err); } log_printf(dgettext(TEXT_DOMAIN, " [%3s]"), - led_state); + led_state); } log_printf("\n\n"); log_printf(dgettext(TEXT_DOMAIN, - "=================================\n")); + "=================================\n")); log_printf("\n"); return (err); @@ -1121,27 +1120,27 @@ dak_env_print_keyswitch(picl_nodehdl_t system_node) &keyswitch); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "failed in fill_device_array_from_id for " - " PSVC_KEYSWITCH\n" - "%s\n"), picl_strerror(err)); + "failed in fill_device_array_from_id for " + " PSVC_KEYSWITCH\n" + "%s\n"), picl_strerror(err)); return (err); } err = picl_get_propval_by_name(keyswitch[0], "State", ks_pos, - PICL_PROPNAMELEN_MAX); + PICL_PROPNAMELEN_MAX); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "picl_get_propval_by_name for keyswitch state " - "failed\n" - "%s\n"), picl_strerror(err)); + "picl_get_propval_by_name for keyswitch state " + "failed\n" + "%s\n"), picl_strerror(err)); return (err); } log_printf(dgettext(TEXT_DOMAIN, - "Front Status Panel:\n" - "-------------------\n" - "Keyswitch position: " - "%s\n"), ks_pos); + "Front Status Panel:\n" + "-------------------\n" + "Keyswitch position: " + "%s\n"), ks_pos); log_printf("\n"); return (err); @@ -1166,10 +1165,10 @@ dak_env_print_temps(picl_nodehdl_t system_node) } log_printf(dgettext(TEXT_DOMAIN, - "System Temperatures (Celsius):\n" - "-------------------------------\n" - "Device\t\tTemperature\tStatus\n" - "---------------------------------------\n")); + "System Temperatures (Celsius):\n" + "-------------------------------\n" + "Device\t\tTemperature\tStatus\n" + "---------------------------------------\n")); for (i = 0; i < number; i++) { err = picl_get_propval_by_name(system_ts_nodes[i], @@ -1201,7 +1200,7 @@ dak_env_print_temps(picl_nodehdl_t system_node) *p = '\0'; err = picl_get_propval_by_name(system_ts_nodes[i], - "Temperature", &temp, sizeof (temp)); + "Temperature", &temp, sizeof (temp)); if (err != PICL_SUCCESS) { log_printf("%s\n", picl_strerror(err)); return (err); @@ -1210,7 +1209,7 @@ dak_env_print_temps(picl_nodehdl_t system_node) } log_printf(dgettext(TEXT_DOMAIN, - "\n=================================\n\n")); + "\n=================================\n\n")); return (PICL_SUCCESS); } @@ -1222,25 +1221,25 @@ dak_display_hw_revisions(Prom_node *root, Board_node *bdlist) char *value; log_printf(dgettext(TEXT_DOMAIN, "\n" - "========================= HW Revisions " - "=======================================\n\n")); + "========================= HW Revisions " + "=======================================\n\n")); log_printf(dgettext(TEXT_DOMAIN, - "System PROM revisions:\n" - "----------------------\n")); + "System PROM revisions:\n" + "----------------------\n")); pnode = dev_find_node(root, "openprom"); if (pnode != NULL) { - value = (char *)get_prop_val(find_prop(pnode, "version")); - log_printf(value); + value = (char *)get_prop_val(find_prop(pnode, "version")); + log_printf(value); } log_printf(dgettext(TEXT_DOMAIN, "\n\n" - "IO ASIC revisions:\n" - "------------------\n" - " Port\n" - "Model ID Status Version\n" - "-------- ---- ------ -------\n")); + "IO ASIC revisions:\n" + "------------------\n" + " Port\n" + "Model ID Status Version\n" + "-------- ---- ------ -------\n")); display_schizo_revisions(bdlist); } @@ -1267,16 +1266,16 @@ display_schizo_revisions(Board_node *bdlist) * search this board node for all Schizos */ for (pnode = dev_find_node_by_compat(bnode->nodes, - SCHIZO_COMPAT_PROP); pnode != NULL; - pnode = dev_next_node_by_compat(pnode, - SCHIZO_COMPAT_PROP)) { + SCHIZO_COMPAT_PROP); pnode != NULL; + pnode = dev_next_node_by_compat(pnode, + SCHIZO_COMPAT_PROP)) { /* * get the reg property to determine * whether we are looking at side A or B */ int_val = (int *)get_prop_val - (find_prop(pnode, "reg")); + (find_prop(pnode, "reg")); if (int_val != NULL) { int_val ++; /* second integer in array */ pci_bus = ((*int_val) & 0x7f0000); @@ -1284,7 +1283,7 @@ display_schizo_revisions(Board_node *bdlist) /* get portid */ int_val = (int *)get_prop_val - (find_prop(pnode, "portid")); + (find_prop(pnode, "portid")); if (int_val == NULL) continue; @@ -1316,14 +1315,14 @@ display_schizo_revisions(Board_node *bdlist) prev_portid = portid; int_val = (int *)get_prop_val - (find_prop(pnode, "version#")); + (find_prop(pnode, "version#")); if (int_val != NULL) revision = *int_val; else revision = -1; status_a = (char *)get_prop_val(find_prop - (pnode, "status")); + (pnode, "status")); log_printf(dgettext(TEXT_DOMAIN, "Schizo ")); @@ -1331,8 +1330,8 @@ display_schizo_revisions(Board_node *bdlist) log_printf((status_a == NULL && status_b == NULL) ? - dgettext(TEXT_DOMAIN, " ok ") : - dgettext(TEXT_DOMAIN, " fail ")); + dgettext(TEXT_DOMAIN, " ok ") : + dgettext(TEXT_DOMAIN, " fail ")); log_printf(dgettext(TEXT_DOMAIN, " %4d "), revision); diff --git a/usr/src/lib/libprtdiag_psr/sparc/littleneck/common/littleneck.c b/usr/src/lib/libprtdiag_psr/sparc/littleneck/common/littleneck.c index 5eb6c4f1e4..89321c0455 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/littleneck/common/littleneck.c +++ b/usr/src/lib/libprtdiag_psr/sparc/littleneck/common/littleneck.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * Littleneck Platform specific functions. @@ -127,14 +126,14 @@ display_cpu_devices(Sys_tree *tree) * frequency, cache size, and processor revision of all cpus. */ log_printf(dgettext(TEXT_DOMAIN, - "\n" - "========================= CPUs " - "===============================================" - "\n" - "\n" - " Run E$ CPU CPU \n" - "Brd CPU MHz MB Impl. Mask \n" - "--- --- ---- ---- ------- ---- \n")); + "\n" + "========================= CPUs " + "===============================================" + "\n" + "\n" + " Run E$ CPU CPU \n" + "Brd CPU MHz MB Impl. Mask \n" + "--- --- ---- ---- ------- ---- \n")); /* Now display all of the cpus on each board */ bnode = tree->bd_list; @@ -163,7 +162,7 @@ display_cpus(Board_node *board) for (cpu = dev_find_type(board->nodes, cpu_name); cpu != NULL; cpu = dev_next_type(cpu, cpu_name)) { - int freq; /* CPU clock frequency */ + uint_t freq; /* CPU clock frequency */ int ecache_size; /* External cache size */ int *mid; int *impl; @@ -197,14 +196,14 @@ display_cpus(Board_node *board) /* Module number */ /* Running frequency */ - log_printf("%4d ", freq); + log_printf("%4u ", freq); /* Ecache size */ if (ecache_size == 0) log_printf("N/A "); else log_printf("%4.1f ", - (float)ecache_size / (float)(1<<20)); + (float)ecache_size / (float)(1<<20)); /* Implementation */ if (impl == NULL) { @@ -239,15 +238,15 @@ display_memoryconf(Sys_tree *tree, struct grp_info *grps) Board_node *bnode = tree->bd_list; log_printf(dgettext(TEXT_DOMAIN, - "========================= Memory Configuration" - " ===============================\n" - "\n Logical Logical Logical " - "\n MC Bank Bank Bank DIMM " - "Interleave Interleaved" - "\n Brd ID num size Status Size " - "Factor with" - "\n---- --- ---- ------ ----------- ------ " - "---------- -----------")); + "========================= Memory Configuration" + " ===============================\n" + "\n Logical Logical Logical " + "\n MC Bank Bank Bank DIMM " + "Interleave Interleaved" + "\n Brd ID num size Status Size " + "Factor with" + "\n---- --- ---- ------ ----------- ------ " + "---------- -----------")); while (bnode != NULL) { if (get_us3_mem_regs(bnode)) { @@ -321,23 +320,23 @@ display_pci(Board_node *board) * each instance node found. */ for (pci = dev_find_node_by_compat(board->nodes, SCHIZO_COMPAT_PROP); - pci != NULL; - pci = dev_next_node_by_compat(pci, SCHIZO_COMPAT_PROP)) { + pci != NULL; + pci = dev_next_node_by_compat(pci, SCHIZO_COMPAT_PROP)) { (void) snprintf(card.bus_type, MAXSTRLEN, - dgettext(TEXT_DOMAIN, "PCI")); + dgettext(TEXT_DOMAIN, "PCI")); /* * Get slot-name properties from parent node and * store them in an array. */ value = (char *)get_prop_val( - find_prop(pci, "slot-names")); + find_prop(pci, "slot-names")); if (value != NULL) { /* array starts after first int */ slot_name_arr[0] = (char *)value + sizeof (int); for (i = 1; i < LNECK_MAX_SLOTS_PER_IO_BD; i++) { slot_name_arr[i] = (char *)slot_name_arr[i - 1] - + strlen(slot_name_arr[i - 1]) +1; + + strlen(slot_name_arr[i - 1]) +1; } } /* @@ -349,7 +348,7 @@ display_pci(Board_node *board) card_node = pci->child; /* Generate the list of pci cards on pci instance: pci */ fill_pci_card_list(pci, card_node, &card, &card_list, - slot_name_arr); + slot_name_arr); } /* end-for */ display_io_cards(card_list); @@ -373,23 +372,24 @@ display_io_cards(struct io_card *list) if (banner == FALSE) { log_printf(dgettext(TEXT_DOMAIN, - " Bus Max\n" - " IO Port Bus Freq Bus Dev,\n" - "Brd Type ID Side Slot MHz Freq Func State " - "Name " + " Bus Max\n" + " IO Port Bus Freq Bus Dev,\n" + "Brd Type ID Side Slot MHz Freq Func State " + "Name ")); #ifdef DEBUG - "Model Notes\n")); + log_printf(dgettext(TEXT_DOMAIN, + "Model Notes\n")); #else - "Model\n")); + log_printf(dgettext(TEXT_DOMAIN, "Model\n")); #endif /* ---------Node Brd IO Port Bus Slot Bus Max Dev Stat */ log_printf(dgettext(TEXT_DOMAIN, - "---- ---- ---- ---- ---- ---- ---- ---- ----- " - "-------------------------------- " + "---- ---- ---- ---- ---- ---- ---- ---- ----- " + "-------------------------------- " #ifdef DEBUG - "---------------------- " + "---------------------- " #endif - "----------------------\n")); + "----------------------\n")); banner = TRUE; } @@ -397,7 +397,7 @@ display_io_cards(struct io_card *list) log_printf(dgettext(TEXT_DOMAIN, "I/O ")); log_printf(dgettext(TEXT_DOMAIN, "%-4s "), p->bus_type); log_printf(dgettext(TEXT_DOMAIN, "%-3d "), - p->schizo_portid); + p->schizo_portid); log_printf(dgettext(TEXT_DOMAIN, "%c "), p->pci_bus); log_printf(dgettext(TEXT_DOMAIN, "%-1s "), p->slot_str); log_printf(dgettext(TEXT_DOMAIN, "%-3d "), p->freq); @@ -476,9 +476,9 @@ disp_fail_parts(Sys_tree *tree) } log_printf("\n"); log_printf(dgettext(TEXT_DOMAIN, "Failed Field " - "Replaceable Units (FRU) in System:\n")); + "Replaceable Units (FRU) in System:\n")); log_printf("==========================" - "====================\n"); + "====================\n"); } while (pnode != NULL) { void *value; @@ -503,14 +503,14 @@ disp_fail_parts(Sys_tree *tree) } log_printf(dgettext(TEXT_DOMAIN, "%s unavailable " - "on %s Board #%d\n"), name, board_type, - bnode->board_num); + "on %s Board #%d\n"), name, board_type, + bnode->board_num); log_printf(dgettext(TEXT_DOMAIN, - "\tPROM fault string: %s\n"), value); + "\tPROM fault string: %s\n"), value); log_printf(dgettext(TEXT_DOMAIN, - "\tFailed Field Replaceable Unit is ")); + "\tFailed Field Replaceable Unit is ")); /* * Determine whether FRU is CPU module, system @@ -519,27 +519,27 @@ disp_fail_parts(Sys_tree *tree) if ((name != NULL) && (strstr(name, "sbus"))) { log_printf(dgettext(TEXT_DOMAIN, - "SBus Card %d\n"), - get_sbus_slot(pnode)); + "SBus Card %d\n"), + get_sbus_slot(pnode)); } else if (((name = get_node_name(pnode->parent)) != - NULL) && (strstr(name, "pci"))) { + NULL) && (strstr(name, "pci"))) { log_printf(dgettext(TEXT_DOMAIN, - "PCI Card %d"), - get_pci_device(pnode)); + "PCI Card %d"), + get_pci_device(pnode)); } else if (((type = get_node_type(pnode)) != NULL) && - (strstr(type, "cpu"))) { + (strstr(type, "cpu"))) { log_printf(dgettext(TEXT_DOMAIN, "UltraSPARC " - "module Board %d Module %d\n"), 0, - get_id(pnode)); + "module Board %d Module %d\n"), 0, + get_id(pnode)); } else { log_printf(dgettext(TEXT_DOMAIN, - "%s board %d\n"), board_type, - bnode->board_num); + "%s board %d\n"), board_type, + bnode->board_num); } pnode = next_failed_node(pnode); } @@ -548,7 +548,7 @@ disp_fail_parts(Sys_tree *tree) if (!system_failed) { log_printf(dgettext(TEXT_DOMAIN, - "No failures found in System\n")); + "No failures found in System\n")); log_printf("===========================\n\n"); return (0); } else { @@ -573,14 +573,14 @@ disp_envc_status(void) log_printf("\n"); log_printf(dgettext(TEXT_DOMAIN, "=========================" - " Environmental Status =========================\n\n")); + " Environmental Status =========================\n\n")); err = picl_initialize(); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "Cannot print environmental information\n" - "picl_initialize failed\n" - "%s\n"), picl_strerror(err)); + "Cannot print environmental information\n" + "picl_initialize failed\n" + "%s\n"), picl_strerror(err)); } if (err == PICL_SUCCESS) { @@ -588,47 +588,47 @@ disp_envc_status(void) err = find_child_device(root, system, &system_node); if (err != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "Cannot print environmental information\n" - "find_child_device for the SYSTEM node " - "failed\n" - "%s\n"), picl_strerror(err)); + "Cannot print environmental information\n" + "find_child_device for the SYSTEM node " + "failed\n" + "%s\n"), picl_strerror(err)); } if ((err = lneck_env_print_temps(system_node)) != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "Temperature Checking failed: %s\n"), - picl_strerror(err)); + "Temperature Checking failed: %s\n"), + picl_strerror(err)); } if ((err = lneck_env_print_keyswitch(system_node)) != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "Keyswitch information checking failed: %s\n"), - picl_strerror(err)); + "Keyswitch information checking failed: %s\n"), + picl_strerror(err)); } if ((err = lneck_env_print_FSP_LEDS(system_node)) != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "FSP LED information checking failed: %s\n"), - picl_strerror(err)); + "FSP LED information checking failed: %s\n"), + picl_strerror(err)); } if ((err = lneck_env_print_disk(system_node)) != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "Disk information checking failed: %s\n"), - picl_strerror(err)); + "Disk information checking failed: %s\n"), + picl_strerror(err)); } if ((err = lneck_env_print_fans(system_node)) != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "Fan information checking failed: %s\n"), - picl_strerror(err)); + "Fan information checking failed: %s\n"), + picl_strerror(err)); } if ((err = lneck_env_print_ps(system_node)) != PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, - "Power Supply information checking failed: " - "%s\n"), picl_strerror(err)); + "Power Supply information checking failed: " + "%s\n"), picl_strerror(err)); } else if (ps_failure != 0) err = PICL_FAILURE; } @@ -647,28 +647,28 @@ lneck_env_print_ps(picl_nodehdl_t system_node) char fault_state[PICL_PROPNAMELEN_MAX]; log_printf(dgettext(TEXT_DOMAIN, - "Power Supplies:\n" - "---------------\n" - "Supply Status PS Type\n" - "------ ------ ---------------\n")); + "Power Supplies:\n" + "---------------\n" + "Supply Status PS Type\n" + "------ ------ ---------------\n")); err = fill_device_array_from_id(system_node, "PSVC_PS", &number, - &ps); + &ps); if (err != PICL_SUCCESS) { return (err); } for (i = 0; i < LNECK_MAX_PS; i++) { err = picl_get_propval_by_name(ps[i], PICL_PROP_NAME, name, - PICL_PROPNAMELEN_MAX); + PICL_PROPNAMELEN_MAX); if (err == PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, "%6-s"), name); } else continue; err = picl_get_propval_by_name(ps[i], "FaultInformation", - fault_state, PICL_PROPNAMELEN_MAX); + fault_state, PICL_PROPNAMELEN_MAX); if (err == PICL_SUCCESS) { if ((strlen(fault_state) == 0) || - (strcmp(fault_state, "NO_FAULT") == 0)) { + (strcmp(fault_state, "NO_FAULT") == 0)) { strcpy(fault_state, "OK"); } else /* @@ -677,30 +677,30 @@ lneck_env_print_ps(picl_nodehdl_t system_node) ps_failure++; log_printf(dgettext(TEXT_DOMAIN, " [%-6s] "), - fault_state); + fault_state); } else { return (err); } err = fill_device_from_id(ps[i], "PSVC_DEV_FAULT_SENSOR", - &ps_fail[i]); + &ps_fail[i]); if (err != PICL_SUCCESS) { return (err); } err = fill_device_from_id(ps[i], "PSVC_DEV_TYPE_SENSOR", - &ps_type[i]); + &ps_type[i]); if (err != PICL_SUCCESS) { return (err); } err = picl_get_propval_by_name(ps_type[i], "Gpio-value", &type, - sizeof (boolean_t)); + sizeof (boolean_t)); if (err == PICL_SUCCESS) { log_printf(dgettext(TEXT_DOMAIN, " [%13s]"), - type == 0 ? "Quahog/Razor" : "Sun-Fire-280R"); + type == 0 ? "Quahog/Razor" : "Sun-Fire-280R"); if (type == 0) { log_printf(dgettext(TEXT_DOMAIN, - "WARNING: PS is of the wrong type\n")); + "WARNING: PS is of the wrong type\n")); } else log_printf("\n"); } else { return (err); @@ -709,10 +709,10 @@ lneck_env_print_ps(picl_nodehdl_t system_node) } log_printf(dgettext(TEXT_DOMAIN, - "\n" - "=================================" - "\n" - "\n")); + "\n" + "=================================" + "\n" + "\n")); /* * Do not display an error message just because PS1 is @@ -946,25 +946,25 @@ lneck_display_hw_revisions(Prom_node *root, Board_node *bdlist) char *value; log_printf(dgettext(TEXT_DOMAIN, "\n" - "========================= HW Revisions " - "=======================================\n\n")); + "========================= HW Revisions " + "=======================================\n\n")); log_printf(dgettext(TEXT_DOMAIN, - "System PROM revisions:\n" - "----------------------\n")); + "System PROM revisions:\n" + "----------------------\n")); pnode = dev_find_node(root, "openprom"); if (pnode != NULL) { - value = (char *)get_prop_val(find_prop(pnode, "version")); - log_printf(value); + value = (char *)get_prop_val(find_prop(pnode, "version")); + log_printf(value); } log_printf(dgettext(TEXT_DOMAIN, "\n\n" - "IO ASIC revisions:\n" - "------------------\n" - " Port\n" - "Model ID Status Version\n" - "-------- ---- ------ -------\n")); + "IO ASIC revisions:\n" + "------------------\n" + " Port\n" + "Model ID Status Version\n" + "-------- ---- ------ -------\n")); display_schizo_revisions(bdlist); } @@ -992,9 +992,9 @@ display_schizo_revisions(Board_node *bdlist) */ for (pnode = dev_find_node_by_compat(bnode->nodes, - SCHIZO_COMPAT_PROP); pnode != NULL; - pnode = dev_next_node_by_compat(pnode, - SCHIZO_COMPAT_PROP)) { + SCHIZO_COMPAT_PROP); pnode != NULL; + pnode = dev_next_node_by_compat(pnode, + SCHIZO_COMPAT_PROP)) { /* * get the reg property to determine @@ -1002,7 +1002,7 @@ display_schizo_revisions(Board_node *bdlist) */ int_val = (int *)get_prop_val - (find_prop(pnode, "reg")); + (find_prop(pnode, "reg")); if (int_val != NULL) { int_val ++; /* second integer in array */ pci_bus = ((*int_val) & 0x7f0000); @@ -1010,7 +1010,7 @@ display_schizo_revisions(Board_node *bdlist) /* get portid */ int_val = (int *)get_prop_val - (find_prop(pnode, "portid")); + (find_prop(pnode, "portid")); if (int_val == NULL) continue; @@ -1042,14 +1042,14 @@ display_schizo_revisions(Board_node *bdlist) prev_portid = portid; int_val = (int *)get_prop_val - (find_prop(pnode, "version#")); + (find_prop(pnode, "version#")); if (int_val != NULL) revision = *int_val; else revision = -1; status_a = (char *)get_prop_val(find_prop - (pnode, "status")); + (pnode, "status")); log_printf(dgettext(TEXT_DOMAIN, "Schizo ")); @@ -1057,8 +1057,8 @@ display_schizo_revisions(Board_node *bdlist) log_printf((status_a == NULL && status_b == NULL) ? - dgettext(TEXT_DOMAIN, " ok ") : - dgettext(TEXT_DOMAIN, " fail ")); + dgettext(TEXT_DOMAIN, " ok ") : + dgettext(TEXT_DOMAIN, " fail ")); log_printf(dgettext(TEXT_DOMAIN, " %4d "), revision); diff --git a/usr/src/lib/libprtdiag_psr/sparc/serengeti/common/serengeti.c b/usr/src/lib/libprtdiag_psr/sparc/serengeti/common/serengeti.c index 63a8c36092..c1bee1b293 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/serengeti/common/serengeti.c +++ b/usr/src/lib/libprtdiag_psr/sparc/serengeti/common/serengeti.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * Serengeti Platform specific functions. @@ -239,8 +238,8 @@ display_pci(Board_node *board) * each schizo and xmits node found. */ for (pci = dev_find_node_by_compatible(board->nodes, SCHIZO_COMPATIBLE); - pci != NULL; - pci = dev_next_node_by_compatible(pci, SCHIZO_COMPATIBLE)) { + pci != NULL; + pci = dev_next_node_by_compatible(pci, SCHIZO_COMPATIBLE)) { /* set max freq for this board */ board_bus_max_freq = DEFAULT_MAX_FREQ; @@ -263,7 +262,7 @@ display_pci(Board_node *board) * can be higher than 66MHZ. */ value = (int *)get_prop_val - (find_prop(pci, "module-revision#")); + (find_prop(pci, "module-revision#")); if (value) { pversion = (int *)value; version = *pversion; @@ -294,7 +293,7 @@ display_pci(Board_node *board) for (i = 1; i < SG_MAX_SLOTS_PER_IO_BD; i++) { slot_name_arr[i] = (char *)slot_name_arr[i - 1] - + strlen(slot_name_arr[i - 1]) +1; + + strlen(slot_name_arr[i - 1]) +1; D_PRINTFINDENT(0, "slot_name_arr[%d] is [%s]\n", i, slot_name_arr[i]); @@ -322,7 +321,7 @@ display_pci(Board_node *board) /* If it doesn't have a name, skip it */ name = (char *)get_prop_val( - find_prop(card_node, "name")); + find_prop(card_node, "name")); if (name == NULL) { card_node = card_node->sibling; continue; @@ -330,14 +329,14 @@ display_pci(Board_node *board) D_PRINTFINDENT(level, "NAME is %s\n", name); type = (char *)get_prop_val( - find_prop(card_node, "device_type")); + find_prop(card_node, "device_type")); /* * get dev# and func# for this card from the * 'reg' property. */ int_val = (int *)get_prop_val( - find_prop(card_node, "reg")); + find_prop(card_node, "reg")); if (int_val != NULL) { card.dev_no = (((*int_val) & 0xF800) >> 11); card.func_no = (((*int_val) & 0x700) >> 8); @@ -365,23 +364,26 @@ display_pci(Board_node *board) * up the slot number of child nodes. */ if ((type != NULL) && - (strncmp(name, "pci", 3) == 0) && - (strcmp(type, "pci") == 0)) { + (strncmp(name, "pci", 3) == 0) && + (strcmp(type, "pci") == 0)) { if (level > 0) { - pname = (char *)get_prop_val( - find_prop(card_node->parent, "name")); - ptype = (char *)get_prop_val( - find_prop(card_node->parent, + pname = (char *)get_prop_val( + find_prop(card_node->parent, + "name")); + ptype = (char *)get_prop_val( + find_prop(card_node->parent, "device_type")); - if ((ptype != NULL) && (pname != NULL) && - (strncmp(pname, "pci", 3) == 0) && - (strcmp(ptype, "pci") == 0)) { - child_pci_bridge_node = card_node; - } else { - pci_bridge_dev_no = card.dev_no; - pci_bridge_node = card_node; - } + if ((ptype != NULL) && + (pname != NULL) && + (strncmp(pname, "pci", 3) == 0) && + (strcmp(ptype, "pci") == 0)) { + child_pci_bridge_node = + card_node; + } else { + pci_bridge_dev_no = card.dev_no; + pci_bridge_node = card_node; + } } else { pci_bridge_dev_no = card.dev_no; pci_bridge_node = card_node; @@ -454,11 +456,11 @@ display_pci(Board_node *board) #ifdef DEBUG (void) sprintf(card.notes, "%s portid [%d] dev_no[%d]" - " slot_name[%s] name_bits[%d]", - card.notes, - portid, - card.dev_no, slot_name, - slot_name_bits); + " slot_name[%s] name_bits[%d]", + card.notes, + portid, + card.dev_no, slot_name, + slot_name_bits); #endif /* @@ -466,7 +468,7 @@ display_pci(Board_node *board) * using the 'reg' property. */ int_val = (int *)get_prop_val - (find_prop(pci, "reg")); + (find_prop(pci, "reg")); if (int_val != NULL) { int_val ++; /* skip over first integer */ @@ -487,13 +489,13 @@ display_pci(Board_node *board) */ if (node_status(card_node, SG_FAIL)) strncpy(card.status, SG_FAIL, - sizeof (SG_FAIL)); + sizeof (SG_FAIL)); else if (node_status(card_node, SG_DISABLED)) strncpy(card.status, SG_DISABLED, - sizeof (SG_DISABLED)); + sizeof (SG_DISABLED)); else strncpy(card.status, SG_OK, - sizeof (SG_OK)); + sizeof (SG_OK)); /* Get the model of this card */ value = get_prop_val(find_prop(card_node, "model")); @@ -501,7 +503,7 @@ display_pci(Board_node *board) card.model[0] = '\0'; else { (void) sprintf(card.model, "%s", - (char *)value); + (char *)value); /* Skip sgsbbc nodes, they are not cards */ if (strcmp(card.model, "SUNW,sgsbbc") == 0) { card_node = card_node->sibling; @@ -525,7 +527,7 @@ display_pci(Board_node *board) * */ int_val = get_prop_val(find_prop(pci, - "clock-frequency")); + "clock-frequency")); if (int_val != NULL) { card.freq = SG_CLK_FREQ_TO_MHZ(*int_val); } else { @@ -536,11 +538,11 @@ display_pci(Board_node *board) * Figure out how we want to display the name */ value = get_prop_val(find_prop(card_node, - "compatible")); + "compatible")); if (value != NULL) { /* use 'name'-'compatible' */ (void) sprintf(buf, "%s-%s", name, - (char *)value); + (char *)value); } else { /* just use 'name' */ (void) sprintf(buf, "%s", name); @@ -553,18 +555,18 @@ display_pci(Board_node *board) */ child_name = (char *)get_node_name(card_node->child); if ((card_node->child != NULL) && - (child_name != NULL)) { + (child_name != NULL)) { value = get_prop_val(find_prop(card_node->child, - "device_type")); + "device_type")); if (value != NULL) { /* add device_type of child to name */ (void) sprintf(card.name, "%s/%s (%s)", - name, child_name, - (char *)value); + name, child_name, + (char *)value); } else { /* just add childs name */ (void) sprintf(card.name, "%s/%s", name, - child_name); + child_name); } } else { (void) sprintf(card.name, "%s", (char *)name); @@ -577,7 +579,7 @@ display_pci(Board_node *board) if (pci_bridge) { if (strlen(card.model) == 0) (void) sprintf(card.model, - "%s", "pci-bridge"); + "%s", "pci-bridge"); else (void) sprintf(card.model, "%s/pci-bridge", card.model); @@ -617,33 +619,34 @@ display_pci(Board_node *board) } else card_node = card_node->sibling; } else { - if ((card_node->parent == pci_bridge_node) && - (card_node->sibling == NULL)) { - card_node = pci_bridge_node->sibling; - if (level > 0) - level--; - } else if ((card_node->parent == - child_pci_bridge_node) && - (card_node->parent->parent == - pci_bridge_node)) { - if ((child_pci_bridge_node->sibling) && - (card_node->sibling == NULL)) { - card_node = - child_pci_bridge_node->sibling; + if ((card_node->parent == pci_bridge_node) && + (card_node->sibling == NULL)) { + card_node = pci_bridge_node->sibling; if (level > 0) - level--; - } else if ((pci_bridge_node->sibling) && - (card_node->sibling == NULL)) { - card_node = - pci_bridge_node->sibling; - if (level > 1) - level = level - 2; - else if (level > 0) level--; - } else - card_node = card_node->sibling; - } else - card_node = card_node->sibling; + } else if ((card_node->parent == + child_pci_bridge_node) && + (card_node->parent->parent == + pci_bridge_node)) { + if ((child_pci_bridge_node->sibling) && + (card_node->sibling == NULL)) { + card_node = + child_pci_bridge_node-> \ + sibling; + if (level > 0) + level--; + } else if ((pci_bridge_node->sibling) && + (card_node->sibling == NULL)) { + card_node = + pci_bridge_node->sibling; + if (level > 1) + level = level - 2; + else if (level > 0) + level--; + } else + card_node = card_node->sibling; + } else + card_node = card_node->sibling; } } /* end-while */ } /* end-for */ @@ -673,10 +676,10 @@ serengeti_display_board_info_header(int state) log_printf("=========================", 0); if (state == ACTIVE) log_printf(dgettext(TEXT_DOMAIN, - " Active Boards for Domain "), 0); + " Active Boards for Domain "), 0); else log_printf(dgettext(TEXT_DOMAIN, - " Available Boards/Slots for Domain "), 0); + " Available Boards/Slots for Domain "), 0); log_printf("===========================", 0); log_printf("\n", 0); log_printf("\n", 0); @@ -684,11 +687,11 @@ serengeti_display_board_info_header(int state) log_printf(fmt, "", "Board", "Receptacle", "Occupant", "", "", 0); log_printf(fmt, "FRU Name", "Type", "Status", "Status", - "Condition", "Info", 0); + "Condition", "Info", 0); log_printf(fmt, "---------", "-----------", "-----------", - "------------", "---------", - "----------------------------------------", 0); + "------------", "---------", + "----------------------------------------", 0); } static void @@ -706,8 +709,8 @@ serengeti_display_board_info(int state) cfga_flags_t flags = NULL; ret = config_list_ext(0, NULL, &board_cfg, &nlist, - NULL, listops, - &err_string, flags); + NULL, listops, + &err_string, flags); if (ret == CFGA_OK) { serengeti_display_board_info_header(state); @@ -718,7 +721,7 @@ serengeti_display_board_info(int state) (dat.ap_o_state == CFGA_STAT_CONFIGURED)) continue; else if ((state == ACTIVE) && - (dat.ap_o_state != CFGA_STAT_CONFIGURED)) + (dat.ap_o_state != CFGA_STAT_CONFIGURED)) continue; if (state == INACTIVE) available_board_count++; @@ -745,9 +748,9 @@ serengeti_display_board_info(int state) if ((state == INACTIVE) && (available_board_count == 0)) { log_printf(dgettext(TEXT_DOMAIN, - "There are currently no " - "Boards/Slots available " - "to this Domain\n"), 0); + "There are currently no " + "Boards/Slots available " + "to this Domain\n"), 0); } } if (board_cfg) @@ -824,13 +827,13 @@ display_io_cards(struct io_card *list) if (banner == FALSE) { log_printf(fmt, "", "", "", "", "", "Bus", "Max", - "", "", "", 0); + "", "", "", 0); log_printf("\n", 0); log_printf(fmt, "", "IO", "Port", "Bus", "", "Freq", "Bus", - "Dev,", "", "", 0); + "Dev,", "", "", 0); log_printf("\n", 0); log_printf(fmt, "FRU Name", "Type", " ID", "Side", "Slot", - "MHz", "Freq", "Func", "State", "Name", 0); + "MHz", "Freq", "Func", "State", "Name", 0); #ifdef DEBUG log_printf("Model Notes\n", 0); #else @@ -838,8 +841,8 @@ display_io_cards(struct io_card *list) #endif log_printf(fmt, "----------", "----", "----", "----", "----", - "----", "----", "----", "-----", - "--------------------------------", 0); + "----", "----", "----", "-----", + "--------------------------------", 0); #ifdef DEBUG log_printf("---------------------- ", 0); #endif @@ -904,9 +907,9 @@ display_io_max_bus_speed(struct io_card *p) log_printf("%-5s ", p->status, 0); log_printf("%-32.32s%c ", p->name, - ((strlen(p->name) > 32) ? '+' : ' '), 0); + ((strlen(p->name) > 32) ? '+' : ' '), 0); log_printf("%-22.22s%c", p->model, - ((strlen(p->model) > 22) ? '+' : ' '), 0); + ((strlen(p->model) > 22) ? '+' : ' '), 0); #ifdef DEBUG log_printf(" %s", p->notes, 0); #endif /* DEBUG */ @@ -935,10 +938,10 @@ display_cpu_devices(Sys_tree *tree) log_printf(fmt1, "", "CPU ", "Run", " E$", "CPU", "CPU", 0); log_printf(fmt1, "FRU Name", "ID ", "MHz", " MB", - "Impl.", "Mask", 0); + "Impl.", "Mask", 0); log_printf(fmt1, "----------", "-------", "----", "----", - "-------", "----", 0); + "-------", "----", 0); /* Now display all of the cpus on each board */ bnode = tree->bd_list; @@ -967,7 +970,7 @@ cpu_node_configured(char *const node) ap_args = &node; ret = config_list_ext(1, &node, &statlist, &nlist, - NULL, NULL, &err_string, flags); + NULL, NULL, &err_string, flags); if (ret == CFGA_OK) { dat = statlist[0]; @@ -993,7 +996,7 @@ void display_cpus(Board_node *board) { Prom_node *cpu; - int freq; /* CPU clock frequency */ + uint_t freq; /* CPU clock frequency */ int ecache_size; /* External cache size */ int board_num = board->board_num; int *mid; @@ -1119,15 +1122,15 @@ display_cpus(Board_node *board) log_printf("%3d ", *mid, 0); /* Running frequency */ - log_printf(" %4d ", freq, 0); + log_printf(" %4u ", freq, 0); /* Ecache size */ if (ecache_size == 0) log_printf("%3s ", "N/A", 0); else log_printf("%4.1f ", - (float)ecache_size / (float)(1<<20), - 0); + (float)ecache_size / (float)(1<<20), + 0); /* Implementation */ if (impl == NULL) { @@ -1254,9 +1257,9 @@ serengeti_display_hw_revisions(Prom_node *root, Board_node *bdlist) /* ---------FRU Name--Model-----------Port-Status */ log_printf("----------- --------------- ---- ---------- " #ifdef DEBUG - "------- " + "------- " #endif - "-------\n", 0); + "-------\n", 0); /* * Display SCHIZO version info */ @@ -1305,9 +1308,9 @@ display_schizo_revisions(Board_node *bdlist, int mode) * search this board node for all Schizos */ for (pnode = dev_find_node_by_compatible(bnode->nodes, - SCHIZO_COMPATIBLE); pnode != NULL; + SCHIZO_COMPATIBLE); pnode != NULL; pnode = dev_next_node_by_compatible(pnode, - SCHIZO_COMPATIBLE)) { + SCHIZO_COMPATIBLE)) { char fru_name[MAX_FRU_NAME_LEN] = ""; @@ -1316,7 +1319,7 @@ display_schizo_revisions(Board_node *bdlist, int mode) * whether we are looking at side A or B */ int_val = (int *)get_prop_val - (find_prop(pnode, "reg")); + (find_prop(pnode, "reg")); if (int_val != NULL) { int_val ++; /* second integer in array */ pci_bus = ((*int_val) & 0x7f0000); @@ -1324,7 +1327,7 @@ display_schizo_revisions(Board_node *bdlist, int mode) /* get portid */ int_val = (int *)get_prop_val - (find_prop(pnode, "portid")); + (find_prop(pnode, "portid")); if (int_val == NULL) continue; @@ -1361,17 +1364,17 @@ display_schizo_revisions(Board_node *bdlist, int mode) /* model */ model = (char *)get_prop_val - (find_prop(pnode, "model")); + (find_prop(pnode, "model")); /* version */ value = (int *)get_prop_val - (find_prop(pnode, "module-revision#")); + (find_prop(pnode, "module-revision#")); if (value) int_val = (int *)value; else int_val = (int *)get_prop_val - (find_prop(pnode, "version#")); + (find_prop(pnode, "version#")); if (int_val != NULL) version = *int_val; else @@ -1379,7 +1382,7 @@ display_schizo_revisions(Board_node *bdlist, int mode) /* status */ status_a = (char *)get_prop_val(find_prop - (pnode, "status")); + (pnode, "status")); /* * Display the data @@ -1387,7 +1390,7 @@ display_schizo_revisions(Board_node *bdlist, int mode) /* FRU Name */ SG_SET_FRU_NAME_NODE(fru_name, node_id); SG_SET_FRU_NAME_IO_BOARD(fru_name, - SG_IO_BD_PORTID_TO_BD_NUM(portid)); + SG_IO_BD_PORTID_TO_BD_NUM(portid)); SG_SET_FRU_NAME_MODULE(fru_name, portid % 2); if (mode == SG_SCHIZO_FAILED) { @@ -1396,11 +1399,11 @@ display_schizo_revisions(Board_node *bdlist, int mode) if ((strcmp (status_a, SG_DISABLED) == 0) && (strcmp(status_b, - SG_DISABLED) == 0)) { + SG_DISABLED) == 0)) { log_printf("\tFRU Type : %s\n ", - model, 0); + model, 0); log_printf("\tLocation : %s\n", - fru_name, 0); + fru_name, 0); log_printf ("\tPROM status: %s\n\n", SG_DISABLED, 0); @@ -1419,10 +1422,10 @@ display_schizo_revisions(Board_node *bdlist, int mode) ((status_b == (char *)NULL))) sprintf(status, " %s ", SG_OK); else if ((status_a == (char *)NULL) && - ((strcmp(status_b, SG_DISABLED) == 0))) + ((strcmp(status_b, SG_DISABLED) == 0))) sprintf(status, " %s", SG_DEGRADED); else if ((status_b == (char *)NULL) && - ((strcmp(status_a, SG_DISABLED) == 0))) + ((strcmp(status_a, SG_DISABLED) == 0))) sprintf(status, " %s", SG_DEGRADED); else continue; @@ -1479,9 +1482,9 @@ display_sgsbbc_revisions(Board_node *bdlist) * search this board node for all sgsbbc's */ for (pnode = dev_find_node_by_type(bnode->nodes, "model", - "SUNW,sgsbbc"); pnode != NULL; - pnode = dev_next_node_by_type(pnode, "model", - "SUNW,sgsbbc")) { + "SUNW,sgsbbc"); pnode != NULL; + pnode = dev_next_node_by_type(pnode, "model", + "SUNW,sgsbbc")) { char fru_name[MAX_FRU_NAME_LEN] = ""; @@ -1490,7 +1493,7 @@ display_sgsbbc_revisions(Board_node *bdlist) * get a portid to tell us what board it is on */ int_val = (int *)get_prop_val - (find_prop(pnode->parent, "portid")); + (find_prop(pnode->parent, "portid")); if (int_val == NULL) continue; @@ -1500,15 +1503,15 @@ display_sgsbbc_revisions(Board_node *bdlist) /* model */ model = (char *)get_prop_val - (find_prop(pnode, "model")); + (find_prop(pnode, "model")); /* status */ status = (char *)get_prop_val(find_prop - (pnode, "status")); + (pnode, "status")); /* revision */ int_val = (int *)get_prop_val - (find_prop(pnode, "revision-id")); + (find_prop(pnode, "revision-id")); if (int_val != NULL) revision = *int_val; else @@ -1516,7 +1519,7 @@ display_sgsbbc_revisions(Board_node *bdlist) #ifdef DEBUG value = (char *)get_prop_val( - find_prop(pnode->parent, "slot-names")); + find_prop(pnode->parent, "slot-names")); if (value != NULL) { /* Skip the 4 byte bitmask */ slot_name = (char *)value + sizeof (int); @@ -1524,7 +1527,7 @@ display_sgsbbc_revisions(Board_node *bdlist) strcpy(slot_name, "not_found"); } (void) sprintf(notes, "[%s] portid [%d]", slot_name, - portid); + portid); #endif /* * Display the data @@ -1532,7 +1535,7 @@ display_sgsbbc_revisions(Board_node *bdlist) /* FRU Name */ SG_SET_FRU_NAME_NODE(fru_name, node_id); SG_SET_FRU_NAME_IO_BOARD(fru_name, - SG_IO_BD_PORTID_TO_BD_NUM(portid)); + SG_IO_BD_PORTID_TO_BD_NUM(portid)); SG_SET_FRU_NAME_MODULE(fru_name, portid % 2); log_printf("%-12s", fru_name, 0); @@ -1597,10 +1600,10 @@ display_failed_parts(Sys_tree *tree) system_failed = TRUE; log_printf("\n", 0); log_printf(dgettext(TEXT_DOMAIN, - "Failed Field Replaceable Units (FRU) in " - "System:\n"), 0); + "Failed Field Replaceable Units (FRU) in " + "System:\n"), 0); log_printf("==========================" - "====================\n", 0); + "====================\n", 0); } while (pnode != NULL) { @@ -1640,7 +1643,7 @@ display_failed_parts(Sys_tree *tree) SG_SET_FRU_NAME_MODULE(fru_name, portid % 2); log_printf("\tFailed Device : %s (%s)\n", model, - name, 0); + name, 0); log_printf("\tLocation : %s\n", fru_name, 0); } else if (strstr(name, "pci") && (portid == -1)) { @@ -1733,14 +1736,14 @@ display_failed_parts(Sys_tree *tree) SG_SET_FRU_NAME_NODE(fru_name, nodeid); SG_SET_FRU_NAME_IO_BOARD(fru_name, - board); + board); SG_SET_FRU_NAME_MODULE(fru_name, - portid % 2); + portid % 2); log_printf("\tFRU type :", 0); log_printf(" PCI Card\n", 0); log_printf("\tLocation : %s\n", - fru_name, 0); + fru_name, 0); } } log_printf("\tPROM status: %s\n\n", status, 0); @@ -1753,7 +1756,7 @@ display_failed_parts(Sys_tree *tree) bank_failed = display_us3_failed_banks(system_failed); schizo_failed = display_schizo_revisions(tree->bd_list, - SG_SCHIZO_FAILED); + SG_SCHIZO_FAILED); if (system_failed || bank_failed || schizo_failed) return (1); else @@ -1772,14 +1775,14 @@ display_memoryconf(Sys_tree *tree, struct grp_info *grps) Board_node *bnode = tree->bd_list; log_printf("========================= Memory Configuration" - " ===============================\n", 0); + " ===============================\n", 0); log_printf("\n Logical Logical Logical ", 0); log_printf("\n Port Bank Bank Bank " - "DIMM Interleave Interleave", 0); + "DIMM Interleave Interleave", 0); log_printf("\nFRU Name ID Num Size Status " - "Size Factor Segment", 0); + "Size Factor Segment", 0); log_printf("\n------------- ---- ---- ------ ----------- " - "------ ---------- ----------", 0); + "------ ---------- ----------", 0); while (bnode != NULL) { if (get_us3_mem_regs(bnode)) { @@ -1817,10 +1820,10 @@ print_us3_memory_line(int portid, int bank_id, uint64_t bank_size, SG_SET_FRU_NAME_BANK(fru_name, (bank_id % 4) % 2); log_printf("\n%-13s %2d %2d %4lldMB %11-s %4lldMB " - " %2d-way %d", - fru_name, mcid, - (bank_id % 4), bank_size, bank_status, dimm_size, - intlv, seg_id, 0); + " %2d-way %d", + fru_name, mcid, + (bank_id % 4), bank_size, bank_status, dimm_size, + intlv, seg_id, 0); } void @@ -1841,7 +1844,7 @@ print_us3_failed_memory_line(int portid, int bank_id, char *bank_status) log_printf("\tFRU type : ", 0); log_printf("Physical Memory Bank\n", 0); log_printf("\tLocation : %s (Logical Bank %2d)\n", - fru_name, (bank_id %4), 0); + fru_name, (bank_id %4), 0); log_printf("\tPROM status: %s\n\n", bank_status, 0); } @@ -1859,7 +1862,7 @@ serengeti_find_board(Sys_tree *root, int board, int nodeid) Board_node *bnode = root->bd_list; while ((bnode != NULL) && - ((board != bnode->board_num) || (nodeid != bnode->node_id))) { + ((board != bnode->board_num) || (nodeid != bnode->node_id))) { bnode = bnode->next; } return (bnode); @@ -1896,8 +1899,8 @@ serengeti_insert_board(Sys_tree *root, int board, int nodeid) } else { while ((temp->next != NULL) && - ((board > temp->next->board_num) || - (nodeid > temp->node_id))) + ((board > temp->next->board_num) || + (nodeid > temp->node_id))) temp = temp->next; bnode->next = temp->next; @@ -2048,15 +2051,15 @@ get_failed_parts(void) if (promopen(O_RDONLY)) { (void) fprintf(stderr, "%s", - dgettext(TEXT_DOMAIN, "openprom device " - "open failed")); + dgettext(TEXT_DOMAIN, "openprom device " + "open failed")); return; } if ((is_openprom() == 0) || (next(0) == 0)) { (void) fprintf(stderr, "%s", - dgettext(TEXT_DOMAIN, "openprom device " - "error encountered.")); + dgettext(TEXT_DOMAIN, "openprom device " + "error encountered.")); return; } @@ -2068,7 +2071,7 @@ get_failed_parts(void) if (!system_failed) { log_printf(dgettext(TEXT_DOMAIN, - "No Hardware failures found in System\n"), 0); + "No Hardware failures found in System\n"), 0); } promclose(); tree = DEVINFO_TREE; /* Switch back to the DEVINFO tree */ @@ -2087,7 +2090,7 @@ get_slot_name(struct io_card *card, char *slot_name) if (strlen(slot_name) != 0) { if (strcmp(card->notes, XMITS_COMPATIBLE) == 0) { (void) sprintf(tmp_ptr, "%c", - slot_name[strlen(slot_name) -1]); + slot_name[strlen(slot_name) -1]); switch (tmp_ptr[0]) { case '2': (void) sprintf(card->slot_str, "%c", '3'); @@ -2103,11 +2106,11 @@ get_slot_name(struct io_card *card, char *slot_name) break; default: (void) sprintf(card->slot_str, "%c", - slot_name[strlen(slot_name) -1]); + slot_name[strlen(slot_name) -1]); } } else (void) sprintf(card->slot_str, "%c", - slot_name[strlen(slot_name) -1]); + slot_name[strlen(slot_name) -1]); } else (void) sprintf(card->slot_str, "-"); } diff --git a/usr/src/lib/libprtdiag_psr/sparc/starcat/common/starcat.c b/usr/src/lib/libprtdiag_psr/sparc/starcat/common/starcat.c index 2d33aa2fbe..0a053ccfd0 100644 --- a/usr/src/lib/libprtdiag_psr/sparc/starcat/common/starcat.c +++ b/usr/src/lib/libprtdiag_psr/sparc/starcat/common/starcat.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -20,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. * * Starcat Platform specific functions. @@ -162,14 +161,14 @@ display_pci(Board_node *board) } if (strstr((char *)get_prop_val( - find_prop(pci, "compatible")), XMITS_COMPATIBLE)) { - sprintf(card.notes, "%s", XMITS_COMPATIBLE); + find_prop(pci, "compatible")), XMITS_COMPATIBLE)) { + sprintf(card.notes, "%s", XMITS_COMPATIBLE); /* * With XMITS 3.X and PCI-X mode, the bus speed * can be higher than 66MHZ. */ value = (int *)get_prop_val - (find_prop(pci, "module-revision#")); + (find_prop(pci, "module-revision#")); if (value) { pversion = (int *)value; version = *pversion; @@ -177,7 +176,7 @@ display_pci(Board_node *board) board_bus_max_freq = PCIX_MAX_FREQ; } } else if (strstr((char *)get_prop_val( - find_prop(pci, "compatible")), SCHIZO_COMPATIBLE)) + find_prop(pci, "compatible")), SCHIZO_COMPATIBLE)) sprintf(card.notes, "%s", SCHIZO_COMPATIBLE); else sprintf(card.notes, " "); @@ -195,7 +194,7 @@ display_pci(Board_node *board) * card, so check the child node for slot-names property */ value = (char *)get_prop_val( - find_prop(pci->child, "slot-names")); + find_prop(pci->child, "slot-names")); } if (value != NULL) { @@ -234,7 +233,7 @@ display_pci(Board_node *board) /* If it doesn't have a name, skip it */ name = (char *)get_prop_val( - find_prop(card_node, "name")); + find_prop(card_node, "name")); if (name == NULL) { card_node = card_node->sibling; continue; @@ -245,7 +244,7 @@ display_pci(Board_node *board) * 'reg' property. */ int_val = (int *)get_prop_val( - find_prop(card_node, "reg")); + find_prop(card_node, "reg")); if (int_val != NULL) { card.dev_no = (((*int_val) & 0xF800) >> 11); card.func_no = (((*int_val) & 0x700) >> 8); @@ -267,10 +266,10 @@ display_pci(Board_node *board) * IO Boards using the name and type properties. */ type = (char *)get_prop_val( - find_prop(card_node, "device_type")); + find_prop(card_node, "device_type")); if ((type != NULL) && - (strncmp(name, "pci", 3) == 0) && - (strcmp(type, "pci") == 0)) { + (strncmp(name, "pci", 3) == 0) && + (strcmp(type, "pci") == 0)) { pci_bridge_dev_no = card.dev_no; pci_bridge_node = card_node; pci_bridge = TRUE; @@ -330,10 +329,10 @@ display_pci(Board_node *board) #ifdef DEBUG (void) sprintf(card.notes, "%s portid [%d]" - " dev_no [%d] slot_name[%s] name_bits[%#x]", - card.notes, portid, card.dev_no, - ((slot_name != NULL) ? slot_name : "NULL"), - slot_name_bits); + " dev_no [%d] slot_name[%s] name_bits[%#x]", + card.notes, portid, card.dev_no, + ((slot_name != NULL) ? slot_name : "NULL"), + slot_name_bits); #endif /* DEBUG */ /* @@ -341,7 +340,7 @@ display_pci(Board_node *board) * using the 'reg' property. */ int_val = (int *)get_prop_val - (find_prop(pci, "reg")); + (find_prop(pci, "reg")); if (int_val != NULL) { int_val ++; /* skip over first integer */ @@ -393,7 +392,7 @@ display_pci(Board_node *board) * */ int_val = get_prop_val(find_prop(pci, - "clock-frequency")); + "clock-frequency")); if (int_val != NULL) { card.freq = HZ_TO_MHZ(*int_val); } else { @@ -404,11 +403,11 @@ display_pci(Board_node *board) * Figure out how we want to display the name */ value = get_prop_val(find_prop(card_node, - "compatible")); + "compatible")); if (value != NULL) { /* use 'name'-'compatible' */ (void) sprintf(buf, "%s-%s", name, - (char *)value); + (char *)value); } else { /* just use 'name' */ (void) sprintf(buf, "%s", name); @@ -421,18 +420,18 @@ display_pci(Board_node *board) */ child_name = (char *)get_node_name(card_node->child); if ((card_node->child != NULL) && - (child_name != NULL)) { + (child_name != NULL)) { value = get_prop_val(find_prop(card_node->child, - "device_type")); + "device_type")); if (value != NULL) { /* add device_type of child to name */ (void) sprintf(card.name, "%s/%s (%s)", - name, child_name, - (char *)value); + name, child_name, + (char *)value); } else { /* just add child's name */ (void) sprintf(card.name, "%s/%s", - name, child_name); + name, child_name); } } else { /* childless, just the card's name */ @@ -446,10 +445,10 @@ display_pci(Board_node *board) if (pci_bridge) { if (card.model[0] == '\0') (void) sprintf(card.model, - "%s", "pci-bridge"); + "%s", "pci-bridge"); else (void) strcat(card.model, - "/pci-bridge"); + "/pci-bridge"); } /* insert this card in the list to be displayed later */ @@ -481,7 +480,7 @@ display_pci(Board_node *board) * otherwise we move onto our own sibling. */ if ((card_node->parent == pci_bridge_node) && - (card_node->sibling == NULL)) + (card_node->sibling == NULL)) card_node = pci_bridge_node->sibling; else @@ -567,11 +566,11 @@ void display_io_cards(struct io_card *list) { char *hdrfmt = "%-10.10s %-4.4s %-4.4s %-4.4s %-4.4s %-4.4s" - " %-4.4s %-5.5s %-32.32s %-22.22s" + " %-4.4s %-5.5s %-32.32s %-22.22s" #ifdef DEBUG - " %-22.22s" + " %-22.22s" #endif /* DEBUG */ - "\n"; + "\n"; static int banner = FALSE; /* Have we printed the column headings? */ struct io_card *p; @@ -656,15 +655,15 @@ display_io_slot_info(struct io_card *p) if (p->slot_str[0] == '-') { log_printf("/%-2s%02d ", - SC_BOARD_TYPE(p->board), - PORTID_TO_EXPANDER(p->board), 0); + SC_BOARD_TYPE(p->board), + PORTID_TO_EXPANDER(p->board), 0); } else { char c; if (strcmp(p->notes, XMITS_COMPATIBLE) == 0) { log_printf("/%-2s%02d/%s ", - SC_BOARD_TYPE(p->board), - PORTID_TO_EXPANDER(p->board), - p->slot_str, 0); + SC_BOARD_TYPE(p->board), + PORTID_TO_EXPANDER(p->board), + p->slot_str, 0); } else { if (p->pci_bus == 'A') c = '3'; @@ -673,10 +672,10 @@ display_io_slot_info(struct io_card *p) } else c = '-'; log_printf("/%-2s%02d/C%cV%1d ", - SC_BOARD_TYPE(p->board), - PORTID_TO_EXPANDER(p->board), c, - PORTID_TO_INSTANCE(p->schizo_portid), - 0); + SC_BOARD_TYPE(p->board), + PORTID_TO_EXPANDER(p->board), c, + PORTID_TO_INSTANCE(p->schizo_portid), + 0); } } log_printf("%-4.4s ", gettext(p->bus_type), 0); @@ -713,9 +712,9 @@ display_io_max_bus_speed(struct io_card *p) log_printf("%-1d,%-1d ", p->dev_no, p->func_no, 0); log_printf("%-5.5s ", gettext(p->status), 0); log_printf("%-32.32s%c ", p->name, - ((strlen(p->name) > 32) ? '+' : ' '), 0); + ((strlen(p->name) > 32) ? '+' : ' '), 0); log_printf("%-22.22s%c", p->model, - ((strlen(p->model) > 22) ? '+' : ' '), 0); + ((strlen(p->model) > 22) ? '+' : ' '), 0); #ifdef DEBUG log_printf(" %s", p->notes, 0); #endif /* DEBUG */ @@ -775,7 +774,7 @@ void display_cpus(Board_node *board) { Prom_node *cpu; - int freq; /* CPU clock frequency */ + uint_t freq; /* CPU clock frequency */ int ecache_size; /* External cache size */ int *impl; int *mask; @@ -807,7 +806,7 @@ display_cpus(Board_node *board) if (CPU_IMPL_IS_CMP(*impl)) { coreid = (int *)get_prop_val(find_prop(cpu, - "reg")); + "reg")); if (coreid == NULL) { continue; } @@ -857,33 +856,33 @@ display_cpus(Board_node *board) log_printf("%3d ", *cpuid, 0); /* Running frequency */ - log_printf("%4d ", freq, 0); + log_printf("%4u ", freq, 0); /* Ecache size */ if (ecache_size == 0) log_printf("%-4.4s ", gettext("N/A"), 0); else log_printf("%4.1f ", - (float)ecache_size / (float)(1<<20), - 0); + (float)ecache_size / (float)(1<<20), + 0); /* Implementation */ switch (*impl) { case CHEETAH_IMPL: log_printf("%-7.7s ", - gettext("US-III"), 0); + gettext("US-III"), 0); break; case CHEETAH_PLUS_IMPL: log_printf("%-7.7s ", - gettext("US-III+"), 0); + gettext("US-III+"), 0); break; case JAGUAR_IMPL: log_printf("%-7.7s ", - gettext("US-IV"), 0); + gettext("US-IV"), 0); break; case PANTHER_IMPL: log_printf("%-7.7s ", - gettext("US-IV+"), 0); + gettext("US-IV+"), 0); break; default: log_printf("%-7x ", *impl, 0); @@ -900,8 +899,8 @@ display_cpus(Board_node *board) decoded_mask = *mask; log_printf("%d.%d", - (decoded_mask >> 4) & 0xf, - decoded_mask & 0xf, 0); + (decoded_mask >> 4) & 0xf, + decoded_mask & 0xf, 0); } log_printf("\n", 0); @@ -915,7 +914,7 @@ display_memoryconf(Sys_tree *tree, struct grp_info *grps) { Board_node *bnode = tree->bd_list; char *hdrfmt = "\n%-11.11s %-4.4s %-7.7s %-7.7s %-8.8s %-6.6s" - " %-10.10s %-10.10s"; + " %-10.10s %-10.10s"; (void) textdomain(TEXT_DOMAIN); @@ -958,9 +957,9 @@ display_memoryconf(Sys_tree *tree, struct grp_info *grps) while (bnode != NULL) { if (get_us3_mem_regs(bnode)) { log_printf( - gettext( - "\nFailed to get memory information.\n"), - 0); + gettext( + "\nFailed to get memory information.\n"), + 0); return; } bnode = bnode->next; @@ -1034,8 +1033,8 @@ display_diaginfo(int flag, Prom_node *root, Sys_tree *tree, log_printf(gettext("For diagnostic information,"), 0); log_printf("\n", 0); log_printf(gettext( - "see /var/opt/SUNWSMS/adm/[A-R]/messages on the SC."), - 0); + "see /var/opt/SUNWSMS/adm/[A-R]/messages on the SC."), + 0); log_printf("\n", 0); /* Print the PROM revisions here */ |