diff options
Diffstat (limited to 'usr/src/uts/sun4u')
30 files changed, 121 insertions, 121 deletions
diff --git a/usr/src/uts/sun4u/cherrystone/os/cherrystone.c b/usr/src/uts/sun4u/cherrystone/os/cherrystone.c index 1a8d495213..01425c4030 100644 --- a/usr/src/uts/sun4u/cherrystone/os/cherrystone.c +++ b/usr/src/uts/sun4u/cherrystone/os/cherrystone.c @@ -336,7 +336,7 @@ update_mem_bounds(int boardid, int cpuid, int bankid, * the cpu memory decoder registers at boot time. */ void -plat_fill_mc(dnode_t nodeid) +plat_fill_mc(pnode_t nodeid) { uint64_t mc_addr, saf_addr; uint64_t mc_decode[CHERRYSTONE_BANKS_PER_MC]; diff --git a/usr/src/uts/sun4u/chicago/os/chicago.c b/usr/src/uts/sun4u/chicago/os/chicago.c index 6b6c396afc..8898e2f307 100644 --- a/usr/src/uts/sun4u/chicago/os/chicago.c +++ b/usr/src/uts/sun4u/chicago/os/chicago.c @@ -206,7 +206,7 @@ plat_lgrp_cpu_to_hand(processorid_t id) void plat_lgrp_init(void) { - dnode_t curnode; + pnode_t curnode; char tmp_name[MAXSYSNAME]; int portid; int cpucnt = 0; @@ -309,7 +309,7 @@ plat_pfn_to_mem_node(pfn_t pfn) * Assign memnode to lgroups */ void -plat_fill_mc(dnode_t nodeid) +plat_fill_mc(pnode_t nodeid) { int portid; @@ -396,7 +396,7 @@ plat_shared_i2c_exit(dev_info_t *i2cnexus_dip) static void get_ebus_rtc_vaddr() { - dnode_t node; + pnode_t node; int size; uint32_t eaddr; diff --git a/usr/src/uts/sun4u/cpu/mach_cpu_module.c b/usr/src/uts/sun4u/cpu/mach_cpu_module.c index c9dc47c061..6fb3b95d39 100644 --- a/usr/src/uts/sun4u/cpu/mach_cpu_module.c +++ b/usr/src/uts/sun4u/cpu/mach_cpu_module.c @@ -31,7 +31,7 @@ #include <vm/seg_map.h> void -cpu_fiximp(dnode_t dnode) +cpu_fiximp(pnode_t dnode) {} void diff --git a/usr/src/uts/sun4u/cpu/spitfire.c b/usr/src/uts/sun4u/cpu/spitfire.c index 79dc7f16f9..35d97e6b23 100644 --- a/usr/src/uts/sun4u/cpu/spitfire.c +++ b/usr/src/uts/sun4u/cpu/spitfire.c @@ -538,7 +538,7 @@ cpu_setup(void) } static int -getintprop(dnode_t node, char *name, int deflt) +getintprop(pnode_t node, char *name, int deflt) { int value; @@ -563,7 +563,7 @@ getintprop(dnode_t node, char *name, int deflt) * Set the magic constants of the implementation. */ void -cpu_fiximp(dnode_t dnode) +cpu_fiximp(pnode_t dnode) { extern int vac_size, vac_shift; extern uint_t vac_mask; diff --git a/usr/src/uts/sun4u/cpu/us3_cheetah.c b/usr/src/uts/sun4u/cpu/us3_cheetah.c index 6ff125f311..b530b6754d 100644 --- a/usr/src/uts/sun4u/cpu/us3_cheetah.c +++ b/usr/src/uts/sun4u/cpu/us3_cheetah.c @@ -83,7 +83,7 @@ cpu_init_trap(void) } static int -getintprop(dnode_t node, char *name, int deflt) +getintprop(pnode_t node, char *name, int deflt) { int value; @@ -105,7 +105,7 @@ getintprop(dnode_t node, char *name, int deflt) */ /*ARGSUSED*/ void -cpu_fiximp(dnode_t dnode) +cpu_fiximp(pnode_t dnode) { int i, a; diff --git a/usr/src/uts/sun4u/cpu/us3_cheetahplus.c b/usr/src/uts/sun4u/cpu/us3_cheetahplus.c index 7cf23b6098..c56b4952ce 100644 --- a/usr/src/uts/sun4u/cpu/us3_cheetahplus.c +++ b/usr/src/uts/sun4u/cpu/us3_cheetahplus.c @@ -109,7 +109,7 @@ cpu_init_trap(void) */ /*ARGSUSED*/ void -cpu_fiximp(dnode_t dnode) +cpu_fiximp(pnode_t dnode) { int i, a; extern int vac_size, vac_shift; diff --git a/usr/src/uts/sun4u/cpu/us3_jalapeno.c b/usr/src/uts/sun4u/cpu/us3_jalapeno.c index 016604efcd..cd71848200 100644 --- a/usr/src/uts/sun4u/cpu/us3_jalapeno.c +++ b/usr/src/uts/sun4u/cpu/us3_jalapeno.c @@ -120,7 +120,7 @@ cpu_init_trap(void) static int -getintprop(dnode_t node, char *name, int deflt) +getintprop(pnode_t node, char *name, int deflt) { int value; @@ -142,7 +142,7 @@ getintprop(dnode_t node, char *name, int deflt) */ /*ARGSUSED*/ void -cpu_fiximp(dnode_t dnode) +cpu_fiximp(pnode_t dnode) { int i, a; extern int vac_size, vac_shift; diff --git a/usr/src/uts/sun4u/daktari/os/daktari.c b/usr/src/uts/sun4u/daktari/os/daktari.c index 1dda0e4d5a..2f63f0be50 100644 --- a/usr/src/uts/sun4u/daktari/os/daktari.c +++ b/usr/src/uts/sun4u/daktari/os/daktari.c @@ -336,7 +336,7 @@ update_mem_bounds(int boardid, int cpuid, int bankid, * the cpu memory decoder registers at boot time. */ void -plat_fill_mc(dnode_t nodeid) +plat_fill_mc(pnode_t nodeid) { uint64_t mc_addr, saf_addr; uint64_t mc_decode[DAK_BANKS_PER_MC]; diff --git a/usr/src/uts/sun4u/enchilada/os/enchilada.c b/usr/src/uts/sun4u/enchilada/os/enchilada.c index 5f761e7908..7415e77807 100644 --- a/usr/src/uts/sun4u/enchilada/os/enchilada.c +++ b/usr/src/uts/sun4u/enchilada/os/enchilada.c @@ -253,7 +253,7 @@ plat_lgrp_cpu_to_hand(processorid_t id) void plat_lgrp_init(void) { - dnode_t curnode; + pnode_t curnode; char tmp_name[MAXSYSNAME]; int portid; int cpucnt = 0; @@ -353,7 +353,7 @@ plat_pfn_to_mem_node(pfn_t pfn) * Assign memnode to lgroups */ void -plat_fill_mc(dnode_t nodeid) +plat_fill_mc(pnode_t nodeid) { int portid; diff --git a/usr/src/uts/sun4u/io/pcicfg.e.c b/usr/src/uts/sun4u/io/pcicfg.e.c index 1109623f9e..3fb3f38717 100644 --- a/usr/src/uts/sun4u/io/pcicfg.e.c +++ b/usr/src/uts/sun4u/io/pcicfg.e.c @@ -745,7 +745,7 @@ pcicfg_configure_ntbridge(dev_info_t *new_device, uint_t bus, uint_t device) for (devno = pcicfg_start_devno; devno < max_devs; devno++) { if (ndi_devi_alloc(new_device, DEVI_PSEUDO_NEXNAME, - (dnode_t)DEVI_SID_NODEID, &new_ntbridgechild) + (pnode_t)DEVI_SID_NODEID, &new_ntbridgechild) != NDI_SUCCESS) { DEBUG0("pcicfg: Failed to alloc test node\n"); @@ -1082,7 +1082,7 @@ pcicfg_ntbridge_unconfigure_child(dev_info_t *new_device, uint_t devno) bus = pci_bus_range.lo; /* primary bus number of this bus node */ if (ndi_devi_alloc(new_device, DEVI_PSEUDO_NEXNAME, - (dnode_t)DEVI_SID_NODEID, &new_ntbridgechild) != NDI_SUCCESS) { + (pnode_t)DEVI_SID_NODEID, &new_ntbridgechild) != NDI_SUCCESS) { DEBUG0("pcicfg: Failed to alloc test node\n"); return (PCICFG_FAILURE); @@ -3240,7 +3240,7 @@ pcicfg_probe_children(dev_info_t *parent, uint_t bus, * ndi_devi_alloc() is called as ndi_devi_alloc_sleep() */ if (ndi_devi_alloc(parent, DEVI_PSEUDO_NEXNAME, - (dnode_t)DEVI_SID_NODEID, &new_child) + (pnode_t)DEVI_SID_NODEID, &new_child) != NDI_SUCCESS) { DEBUG0("pcicfg_probe_children(): Failed to alloc child node\n"); ndi_devi_exit(parent, circ); @@ -3485,7 +3485,7 @@ pcicfg_fcode_probe(dev_info_t *parent, uint_t bus, */ if (ndi_devi_alloc(parent, DEVI_PSEUDO_NEXNAME, - (dnode_t)DEVI_SID_NODEID, &new_child) + (pnode_t)DEVI_SID_NODEID, &new_child) != NDI_SUCCESS) { DEBUG0("pcicfg_fcode_probe(): Failed to alloc child node\n"); return (PCICFG_FAILURE); diff --git a/usr/src/uts/sun4u/io/px/px_tools_4u.c b/usr/src/uts/sun4u/io/px/px_tools_4u.c index 1270cea459..a0a9eb597a 100644 --- a/usr/src/uts/sun4u/io/px/px_tools_4u.c +++ b/usr/src/uts/sun4u/io/px/px_tools_4u.c @@ -314,7 +314,7 @@ pxtool_dev_reg_ops_platchk(dev_info_t *dip, pcitool_reg_t *prg_p) * Guard against checking a root nexus which is empty. * On some systems this will result in a Fatal Reset. */ - if ((int)prom_childnode((dnode_t)devi_nodeid) == OBP_NONODE) { + if ((int)prom_childnode((pnode_t)devi_nodeid) == OBP_NONODE) { DBG(DBG_TOOLS, dip, "pxtool_dev_reg_ops set/get reg: nexus has no devs!\n"); prg_p->status = PCITOOL_IO_ERROR; diff --git a/usr/src/uts/sun4u/io/todds1337.c b/usr/src/uts/sun4u/io/todds1337.c index 5c5ace9b3c..309c30010a 100644 --- a/usr/src/uts/sun4u/io/todds1337.c +++ b/usr/src/uts/sun4u/io/todds1337.c @@ -906,7 +906,7 @@ todds1337_getinfo(dev_info_t *dip, ddi_info_cmd_t infocmd, void *arg, static int todds1337_setup_prom() { - dnode_t todnode; + pnode_t todnode; char tod1337_devpath[MAXNAMELEN]; if ((todnode = prom_findnode_bydevtype(prom_rootnode(), diff --git a/usr/src/uts/sun4u/montecarlo/io/ttymux_dacf/ttymux_dacf.c b/usr/src/uts/sun4u/montecarlo/io/ttymux_dacf/ttymux_dacf.c index 2706bf0d7a..c02a9984e7 100644 --- a/usr/src/uts/sun4u/montecarlo/io/ttymux_dacf/ttymux_dacf.c +++ b/usr/src/uts/sun4u/montecarlo/io/ttymux_dacf/ttymux_dacf.c @@ -339,7 +339,7 @@ get_device_list(ihandle_t ihdl, ihandle_t *ihdls, size_t maxi) * The caller is responsible for freeing the memory. */ static int -read_prop(dnode_t node, char *propname, char **propval) +read_prop(pnode_t node, char *propname, char **propval) { int proplen = -1; @@ -744,7 +744,7 @@ find_consoles(sm_mux_state_t *ms, dev_info_t *dip, dev_t dev) int len; char *propval; char devtype[32]; - dnode_t node; + pnode_t node; uint_t flags; /* @@ -872,7 +872,7 @@ ttymux_config(dacf_infohdl_t info_hdl, dacf_arghdl_t arg_hdl, int flags) ms->sm_cons_stdout.sm_o_ihdl = prom_stdout_ihandle(); if (prom_is_openprom()) { - dnode_t node = prom_optionsnode(); + pnode_t node = prom_optionsnode(); if (prom_getproplen(node, INPUT_ALIAS) > 0) { ms->sm_ialias = kmem_alloc( diff --git a/usr/src/uts/sun4u/os/cpr_impl.c b/usr/src/uts/sun4u/os/cpr_impl.c index 3c585ee30a..a6c92fc076 100644 --- a/usr/src/uts/sun4u/os/cpr_impl.c +++ b/usr/src/uts/sun4u/os/cpr_impl.c @@ -1769,7 +1769,7 @@ int i_cpr_is_supported(void) { char es_prop[] = "energystar-v2"; - dnode_t node; + pnode_t node; int last; extern int cpr_supported_override; extern int cpr_platform_enable; diff --git a/usr/src/uts/sun4u/os/ecc.c b/usr/src/uts/sun4u/os/ecc.c index 773ae8033d..10b6cb523f 100644 --- a/usr/src/uts/sun4u/os/ecc.c +++ b/usr/src/uts/sun4u/os/ecc.c @@ -202,7 +202,7 @@ void error_init(void) { char tmp_name[MAXSYSNAME]; - dnode_t node; + pnode_t node; size_t size = cpu_aflt_size(); /* diff --git a/usr/src/uts/sun4u/os/fillsysinfo.c b/usr/src/uts/sun4u/os/fillsysinfo.c index 700a61c9eb..fcdfbf7fed 100644 --- a/usr/src/uts/sun4u/os/fillsysinfo.c +++ b/usr/src/uts/sun4u/os/fillsysinfo.c @@ -104,10 +104,10 @@ struct cpu_node cpunodes[NCPU]; static void check_cpus_ver(void); static void check_cpus_set(void); -void fill_cpu(dnode_t); +void fill_cpu(pnode_t); void fill_cpu_ddi(dev_info_t *); void empty_cpu(int); -void plat_fill_mc(dnode_t); +void plat_fill_mc(pnode_t); #pragma weak plat_fill_mc uint64_t system_clock_freq; @@ -132,7 +132,7 @@ uint_t niommu_tsbs = 0; */ #define CHOSEN_EEPROM "eeprom" #define WATCHDOG_ENABLE "watchdog-enable" -static dnode_t chosen_eeprom; +static pnode_t chosen_eeprom; /* * Appropriate tod module will be dynamically selected while booting @@ -162,17 +162,17 @@ int cpr_platform_enable = 0; /* * Some nodes have functions that need to be called when they're seen. */ -static void have_sbus(dnode_t); -static void have_pci(dnode_t); -static void have_eeprom(dnode_t); -static void have_auxio(dnode_t); -static void have_rtc(dnode_t); -static void have_tod(dnode_t); -static void have_pmc(dnode_t); +static void have_sbus(pnode_t); +static void have_pci(pnode_t); +static void have_eeprom(pnode_t); +static void have_auxio(pnode_t); +static void have_rtc(pnode_t); +static void have_tod(pnode_t); +static void have_pmc(pnode_t); static struct wkdevice { char *wk_namep; - void (*wk_func)(dnode_t); + void (*wk_func)(pnode_t); caddr_t *wk_vaddrp; ushort_t wk_flags; #define V_OPTIONAL 0x0000 @@ -189,14 +189,14 @@ static struct wkdevice { { 0, }, }; -static void map_wellknown(dnode_t); +static void map_wellknown(pnode_t); void map_wellknown_devices() { struct wkdevice *wkp; phandle_t ieeprom; - dnode_t root; + pnode_t root; uint_t stick_freq; /* @@ -205,16 +205,16 @@ map_wellknown_devices() if (GETPROPLEN(prom_chosennode(), CHOSEN_EEPROM) == sizeof (phandle_t) && GETPROP(prom_chosennode(), CHOSEN_EEPROM, (caddr_t)&ieeprom) != -1) - chosen_eeprom = (dnode_t)prom_decode_int(ieeprom); + chosen_eeprom = (pnode_t)prom_decode_int(ieeprom); - root = prom_nextnode((dnode_t)0); + root = prom_nextnode((pnode_t)0); /* * Get System clock frequency from root node if it exists. */ if (GETPROP(root, "stick-frequency", (caddr_t)&stick_freq) != -1) system_clock_freq = stick_freq; - map_wellknown(NEXT((dnode_t)0)); + map_wellknown(NEXT((pnode_t)0)); /* * See if it worked @@ -240,11 +240,11 @@ map_wellknown_devices() * map_wellknown - map known devices & registers */ static void -map_wellknown(dnode_t curnode) +map_wellknown(pnode_t curnode) { extern int status_okay(int, char *, int); char tmp_name[MAXSYSNAME]; - static void fill_address(dnode_t, char *); + static void fill_address(pnode_t, char *); int sok; #ifdef VPRINTF @@ -305,7 +305,7 @@ map_wellknown(dnode_t curnode) } static void -fill_address(dnode_t curnode, char *namep) +fill_address(pnode_t curnode, char *namep) { struct wkdevice *wkp; int size; @@ -354,7 +354,7 @@ fill_address(dnode_t curnode, char *namep) } int -get_portid(dnode_t node, dnode_t *cmpp) +get_portid(pnode_t node, pnode_t *cmpp) { int portid; char dev_type[OBP_MAXPROPNAME]; @@ -429,7 +429,7 @@ adj_ecache_setsize(int ecsetsize) } void -fill_cpu(dnode_t node) +fill_cpu(pnode_t node) { extern int cpu_get_cpu_unum(int, char *, int, int *); struct cpu_node *cpunode; @@ -438,7 +438,7 @@ fill_cpu(dnode_t node) int tlbsize; int size; uint_t clk_freq; - dnode_t cmpnode; + pnode_t cmpnode; char namebuf[OBP_MAXPROPNAME], unum[UNUM_NAMLEN]; char *namebufp; @@ -484,7 +484,7 @@ fill_cpu(dnode_t node) /* * If we didn't find it in the CPU node, look in the root node. */ - dnode_t root = prom_nextnode((dnode_t)0); + pnode_t root = prom_nextnode((pnode_t)0); if (GETPROP(root, "clock-frequency", (caddr_t)&clk_freq) == -1) clk_freq = 0; } @@ -962,7 +962,7 @@ check_cpus_set(void) * handling purposes, referenced by v_sysio_addr in machdep.c. */ static void -have_sbus(dnode_t node) +have_sbus(pnode_t node) { int size; uint_t portid; @@ -989,7 +989,7 @@ have_sbus(dnode_t node) * handling purposes. */ static void -have_pci(dnode_t node) +have_pci(pnode_t node) { int size; uint_t portid; @@ -1026,7 +1026,7 @@ have_pci(dnode_t node) * by v_eeprom_addr in locore.s. */ static void -have_eeprom(dnode_t node) +have_eeprom(pnode_t node) { int size; uint32_t eaddr; @@ -1085,7 +1085,7 @@ have_eeprom(dnode_t node) } static void -have_rtc(dnode_t node) +have_rtc(pnode_t node) { int size; uint32_t eaddr; @@ -1128,15 +1128,15 @@ have_rtc(dnode_t node) } static void -have_pmc(dnode_t node) +have_pmc(pnode_t node) { uint32_t vaddr; - dnode_t root; + pnode_t root; /* * Watchdog property is in the root node. */ - root = prom_nextnode((dnode_t)0); + root = prom_nextnode((pnode_t)0); if (GETPROPLEN(root, WATCHDOG_ENABLE) != -1) { /* * The hardware watchdog timer resides within logical @@ -1155,7 +1155,7 @@ have_pmc(dnode_t node) } static void -have_auxio(dnode_t node) +have_auxio(pnode_t node) { size_t size, n; uint32_t addr[5]; @@ -1189,7 +1189,7 @@ have_auxio(dnode_t node) } static void -have_tod(dnode_t node) +have_tod(pnode_t node) { static char tod_name[MAXSYSNAME]; diff --git a/usr/src/uts/sun4u/os/mach_ddi_impl.c b/usr/src/uts/sun4u/os/mach_ddi_impl.c index 6b90f9b432..05d18b5ca8 100644 --- a/usr/src/uts/sun4u/os/mach_ddi_impl.c +++ b/usr/src/uts/sun4u/os/mach_ddi_impl.c @@ -143,7 +143,7 @@ get_boardnum(int nid, dev_info_t *par) { int board_num; - if (prom_getprop((dnode_t)nid, OBP_BOARDNUM, + if (prom_getprop((pnode_t)nid, OBP_BOARDNUM, (caddr_t)&board_num) != -1) return (board_num); @@ -154,7 +154,7 @@ get_boardnum(int nid, dev_info_t *par) while (par) { nid = ddi_get_nodeid(par); - if (prom_getprop((dnode_t)nid, OBP_BOARDNUM, + if (prom_getprop((pnode_t)nid, OBP_BOARDNUM, (caddr_t)&board_num) != -1) return (board_num); @@ -172,11 +172,11 @@ getlongprop_buf(int id, char *name, char *buf, int maxlen) { int size; - size = prom_getproplen((dnode_t)id, name); + size = prom_getproplen((pnode_t)id, name); if (size <= 0 || (size > maxlen - 1)) return (-1); - if (-1 == prom_getprop((dnode_t)id, name, buf)) + if (-1 == prom_getprop((pnode_t)id, name, buf)) return (-1); /* @@ -385,10 +385,10 @@ pf_is_dmacapable(pfn_t pfn) int dip_to_cpu_id(dev_info_t *dip, processorid_t *cpu_id) { - dnode_t nodeid; + pnode_t nodeid; int i; - nodeid = (dnode_t)ddi_get_nodeid(dip); + nodeid = (pnode_t)ddi_get_nodeid(dip); for (i = 0; i < NCPU; i++) { if (cpunodes[i].nodeid == nodeid) { *cpu_id = i; @@ -434,7 +434,7 @@ ndi2errno(int n) * Prom tree node list */ struct ptnode { - dnode_t nodeid; + pnode_t nodeid; struct ptnode *next; }; @@ -450,10 +450,10 @@ struct pta { }; static void -visit_node(dnode_t nodeid, struct pta *ap) +visit_node(pnode_t nodeid, struct pta *ap) { struct ptnode **nextp; - int (*select)(dnode_t, void *, uint_t); + int (*select)(pnode_t, void *, uint_t); ASSERT(nodeid != OBP_NONODE && nodeid != OBP_BADNODE); @@ -501,7 +501,7 @@ create_prom_branch(void *arg, int has_changed) { int circ, c; int exists, rv; - dnode_t nodeid; + pnode_t nodeid; struct ptnode *tnp; dev_info_t *dip; struct pta *ap = arg; diff --git a/usr/src/uts/sun4u/os/mach_startup.c b/usr/src/uts/sun4u/os/mach_startup.c index a88f0c774e..a4b7bede3a 100644 --- a/usr/src/uts/sun4u/os/mach_startup.c +++ b/usr/src/uts/sun4u/os/mach_startup.c @@ -236,7 +236,7 @@ iam_positron(void) { char model[32]; const char proto_model[] = "SUNW,501-2732"; - dnode_t root = prom_rootnode(); + pnode_t root = prom_rootnode(); if (prom_getproplen(root, "model") != sizeof (proto_model)) return (0); diff --git a/usr/src/uts/sun4u/schumacher/os/schumacher.c b/usr/src/uts/sun4u/schumacher/os/schumacher.c index e6800cfd04..c8463c4226 100644 --- a/usr/src/uts/sun4u/schumacher/os/schumacher.c +++ b/usr/src/uts/sun4u/schumacher/os/schumacher.c @@ -236,7 +236,7 @@ plat_lgrp_cpu_to_hand(processorid_t id) void plat_lgrp_init(void) { - dnode_t curnode; + pnode_t curnode; char tmp_name[MAXSYSNAME]; int portid; int cpucnt = 0; @@ -336,7 +336,7 @@ plat_pfn_to_mem_node(pfn_t pfn) * Assign memnode to lgroups */ void -plat_fill_mc(dnode_t nodeid) +plat_fill_mc(pnode_t nodeid) { int portid; diff --git a/usr/src/uts/sun4u/snowbird/io/todds1307/todds1307.c b/usr/src/uts/sun4u/snowbird/io/todds1307/todds1307.c index 6eccb146e0..8f8bdfa278 100644 --- a/usr/src/uts/sun4u/snowbird/io/todds1307/todds1307.c +++ b/usr/src/uts/sun4u/snowbird/io/todds1307/todds1307.c @@ -676,7 +676,7 @@ bcd2int(unsigned char num) { static int todds1307_setup_prom() { - dnode_t todnode; + pnode_t todnode; char tod1307_devpath[MAXNAMELEN]; if ((todnode = prom_findnode_bydevtype(prom_rootnode(), diff --git a/usr/src/uts/sun4u/starfire/io/drmach.c b/usr/src/uts/sun4u/starfire/io/drmach.c index 8739fb0c83..7d7ba4346a 100644 --- a/usr/src/uts/sun4u/starfire/io/drmach.c +++ b/usr/src/uts/sun4u/starfire/io/drmach.c @@ -88,11 +88,11 @@ extern uint_t ldphysio_il(uint64_t physaddr); extern void stphysio_il(uint64_t physaddr, uint_t value); extern uint64_t mc_get_mem_alignment(void); -extern uint64_t mc_get_asr_addr(dnode_t); -extern uint64_t mc_get_idle_addr(dnode_t); -extern uint64_t mc_get_alignment_mask(dnode_t); -extern int mc_read_asr(dnode_t, uint_t *); -extern int mc_write_asr(dnode_t, uint_t); +extern uint64_t mc_get_asr_addr(pnode_t); +extern uint64_t mc_get_idle_addr(pnode_t); +extern uint64_t mc_get_alignment_mask(pnode_t); +extern int mc_read_asr(pnode_t, uint_t *); +extern int mc_write_asr(pnode_t, uint_t); extern uint64_t mc_asr_to_pa(uint_t); extern uint_t mc_pa_to_asr(uint_t, uint64_t); @@ -106,7 +106,7 @@ typedef struct { typedef struct drmach_node { void *here; - dnode_t (*get_dnode)(struct drmach_node *node); + pnode_t (*get_dnode)(struct drmach_node *node); int (*walk)(struct drmach_node *node, void *data, int (*cb)(drmach_node_walk_args_t *args)); } drmach_node_t; @@ -363,17 +363,17 @@ _info(struct modinfo *modinfop) return (mod_info(&modlinkage, modinfop)); } -static dnode_t +static pnode_t drmach_node_obp_get_dnode(drmach_node_t *np) { - return ((dnode_t)np->here); + return ((pnode_t)np->here); } static int drmach_node_obp_walk(drmach_node_t *np, void *data, int (*cb)(drmach_node_walk_args_t *args)) { - dnode_t nodeid; + pnode_t nodeid; int rv; drmach_node_walk_args_t args; @@ -423,7 +423,7 @@ drmach_node_dispose(drmach_node_t *np) static dev_info_t * drmach_node_get_dip(drmach_node_t *np) { - dnode_t nodeid; + pnode_t nodeid; nodeid = np->get_dnode(np); if (nodeid == OBP_NONODE) @@ -447,7 +447,7 @@ drmach_node_get_dip(drmach_node_t *np) /*NOTREACHED*/ } -static dnode_t +static pnode_t drmach_node_get_dnode(drmach_node_t *np) { return (np->get_dnode(np)); @@ -463,7 +463,7 @@ drmach_node_walk(drmach_node_t *np, void *param, static int drmach_node_get_prop(drmach_node_t *np, char *name, void *buf) { - dnode_t nodeid; + pnode_t nodeid; int rv; nodeid = np->get_dnode(np); @@ -482,7 +482,7 @@ drmach_node_get_prop(drmach_node_t *np, char *name, void *buf) static int drmach_node_get_proplen(drmach_node_t *np, char *name, int *len) { - dnode_t nodeid; + pnode_t nodeid; int rv; nodeid = np->get_dnode(np); @@ -599,10 +599,10 @@ drmach_array_dispose(drmach_array_t *arr, void (*disposer)(drmachid_t)) /*ARGSUSED*/ static int -drmach_prom_select(dnode_t nodeid, void *arg, uint_t flags) +drmach_prom_select(pnode_t nodeid, void *arg, uint_t flags) { int rprop[64]; - dnode_t saved; + pnode_t saved; drmach_config_args_t *ap = (drmach_config_args_t *)arg; drmach_device_t *dp = ap->dp; sbd_error_t *err; @@ -927,7 +927,7 @@ hold_rele_branch(dev_info_t *rdip, void *arg) static int drmach_init(void) { - dnode_t nodeid; + pnode_t nodeid; dev_info_t *rdip; int hold, circ; @@ -1057,7 +1057,7 @@ static sbd_error_t * drmach_get_mc_asr_addr(drmachid_t id, uint64_t *pa) { drmach_device_t *dp; - dnode_t nodeid; + pnode_t nodeid; uint64_t addr; if (!DRMACH_IS_MEM_ID(id)) @@ -1080,7 +1080,7 @@ static sbd_error_t * drmach_get_mc_idle_addr(drmachid_t id, uint64_t *pa) { drmach_device_t *dp; - dnode_t nodeid; + pnode_t nodeid; uint64_t addr; if (!DRMACH_IS_MEM_ID(id)) @@ -1103,7 +1103,7 @@ static sbd_error_t * drmach_read_mc_asr(drmachid_t id, uint_t *mcregp) { drmach_device_t *dp; - dnode_t nodeid; + pnode_t nodeid; sbd_error_t *err; if (!DRMACH_IS_MEM_ID(id)) @@ -1125,7 +1125,7 @@ static sbd_error_t * drmach_write_mc_asr(drmachid_t id, uint_t mcreg) { drmach_device_t *dp; - dnode_t nodeid; + pnode_t nodeid; sbd_error_t *err; if (!DRMACH_IS_MEM_ID(id)) @@ -1912,7 +1912,7 @@ drmach_remove_counter_nodes(drmachid_t id) { int num; char name[OBP_MAXDRVNAME]; - dnode_t child; + pnode_t child; dev_info_t *dip; sbd_error_t *err; drmach_status_t stat; @@ -2481,7 +2481,7 @@ drmach_cpu_start(struct cpu *cp) extern void restart_other_cpu(int); ASSERT(MUTEX_HELD(&cpu_lock)); - ASSERT(cpunodes[cpuid].nodeid != (dnode_t)0); + ASSERT(cpunodes[cpuid].nodeid != (pnode_t)0); cp->cpu_flags &= ~CPU_POWEROFF; @@ -3197,7 +3197,7 @@ drmach_mem_get_alignment(drmachid_t id, uint64_t *mask) { drmach_device_t *mem; sbd_error_t *err; - dnode_t nodeid; + pnode_t nodeid; if (!DRMACH_IS_MEM_ID(id)) return (drerr_new(0, ESTF_INAPPROP, NULL)); @@ -3695,7 +3695,7 @@ sbd_error_t * drmach_unconfigure(drmachid_t id, int flags) { drmach_device_t *dp; - dnode_t nodeid; + pnode_t nodeid; dev_info_t *dip, *fdip = NULL; uint_t ddi_flags; diff --git a/usr/src/uts/sun4u/starfire/io/idn.c b/usr/src/uts/sun4u/starfire/io/idn.c index 7d4e9edcf9..4aeb9a135a 100644 --- a/usr/src/uts/sun4u/starfire/io/idn.c +++ b/usr/src/uts/sun4u/starfire/io/idn.c @@ -5524,7 +5524,7 @@ idnxdc_broadcast(domainset_t domset, idn_msgtype_t *mtp, static int idn_prom_getsmr(uint_t *smrsz, uint64_t *paddrp, uint64_t *sizep) { - dnode_t nodeid; + pnode_t nodeid; int found = 0; int len; uint_t smrsize = 0; diff --git a/usr/src/uts/sun4u/starfire/io/memctrl.c b/usr/src/uts/sun4u/starfire/io/memctrl.c index 6826436aac..adc02672bd 100644 --- a/usr/src/uts/sun4u/starfire/io/memctrl.c +++ b/usr/src/uts/sun4u/starfire/io/memctrl.c @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1998, 2001 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" @@ -85,7 +85,7 @@ mc_get_mem_alignment() } uint64_t -mc_get_asr_addr(dnode_t nodeid) +mc_get_asr_addr(pnode_t nodeid) { int rlen; uint64_t psi_addr; @@ -105,7 +105,7 @@ mc_get_asr_addr(dnode_t nodeid) } uint64_t -mc_get_idle_addr(dnode_t nodeid) +mc_get_idle_addr(pnode_t nodeid) { int rlen; uint64_t psi_addr; @@ -125,7 +125,7 @@ mc_get_idle_addr(dnode_t nodeid) } int -mc_get_dimm_size(dnode_t nodeid) +mc_get_dimm_size(pnode_t nodeid) { uint64_t psi_addr; uint_t dimmtype; @@ -157,7 +157,7 @@ mc_get_dimm_size(dnode_t nodeid) } uint64_t -mc_get_alignment_mask(dnode_t nodeid) +mc_get_alignment_mask(pnode_t nodeid) { uint64_t psi_addr, seg_sz; uint_t mcreg, seg_sz_mask; @@ -199,7 +199,7 @@ mc_get_alignment_mask(dnode_t nodeid) } int -mc_read_asr(dnode_t nodeid, uint_t *mcregp) +mc_read_asr(pnode_t nodeid, uint_t *mcregp) { uint64_t psi_addr; @@ -215,7 +215,7 @@ mc_read_asr(dnode_t nodeid, uint_t *mcregp) } int -mc_write_asr(dnode_t nodeid, uint_t mcreg) +mc_write_asr(pnode_t nodeid, uint_t mcreg) { uint_t mcreg_rd; uint64_t psi_addr; diff --git a/usr/src/uts/sun4u/sys/cpr_impl.h b/usr/src/uts/sun4u/sys/cpr_impl.h index 37cb2b50fb..40d36129dd 100644 --- a/usr/src/uts/sun4u/sys/cpr_impl.h +++ b/usr/src/uts/sun4u/sys/cpr_impl.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -89,7 +89,7 @@ typedef struct sun4u_tlb sutlb_t; * processor info */ struct sun4u_cpu_info { - dnode_t node; + pnode_t node; processorid_t cpu_id; }; diff --git a/usr/src/uts/sun4u/sys/cpu_module.h b/usr/src/uts/sun4u/sys/cpu_module.h index d6e6ddf407..8cd0361d3f 100644 --- a/usr/src/uts/sun4u/sys/cpu_module.h +++ b/usr/src/uts/sun4u/sys/cpu_module.h @@ -65,7 +65,7 @@ void cpu_kdi_init(struct kdi *); * The default 4 page sizes to 6 page sizes for Panther-only domains, * and is called from fillsysinfo.c:check_cpus_set at early bootup time. */ -void cpu_fiximp(dnode_t dnode); +void cpu_fiximp(pnode_t dnode); #pragma weak cpu_fix_allpanther void cpu_fix_allpanther(void); #pragma weak mmu_init_mmu_page_sizes diff --git a/usr/src/uts/sun4u/sys/fc_plat.h b/usr/src/uts/sun4u/sys/fc_plat.h index 4cfd8de931..77211e30f3 100644 --- a/usr/src/uts/sun4u/sys/fc_plat.h +++ b/usr/src/uts/sun4u/sys/fc_plat.h @@ -20,8 +20,8 @@ * CDDL HEADER END */ /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ #ifndef _SYS_FC_PLAT_H @@ -71,7 +71,7 @@ typedef uint32_t fc_phandle_t; #define fc_size2cell(u) ((fc_cell_t)((size_t)(u))) #define fc_ssize2cell(i) ((fc_cell_t)((ssize_t)(i))) #define fc_phandle2cell(ph) ((fc_cell_t)((unsigned int)((phandle_t)(ph)))) -#define fc_dnode2cell(d) ((fc_cell_t)((unsigned int)((dnode_t)(d)))) +#define fc_dnode2cell(d) ((fc_cell_t)((unsigned int)((pnode_t)(d)))) #define fc_ull2cell_high(ll) (0LL) #define fc_ull2cell_low(ll) ((fc_cell_t)(ll)) #define fc_uintptr2cell(i) ((fc_cell_t)((uintptr_t)(i))) @@ -88,7 +88,7 @@ typedef uint32_t fc_phandle_t; #define fc_cell2size(u) ((size_t)((fc_cell_t)(u))) #define fc_cell2ssize(i) ((ssize_t)((fc_cell_t)(i))) #define fc_cell2phandle(ph) ((phandle_t)((fc_cell_t)(ph))) -#define fc_cell2dnode(d) ((dnode_t)((fc_cell_t)(d))) +#define fc_cell2dnode(d) ((pnode_t)((fc_cell_t)(d))) #define fc_cells2ull(h, l) ((unsigned long long)(fc_cell_t)(l)) #define fc_cell2uintptr(i) ((uintptr_t)((fc_cell_t)(i))) #define fc_cell2uchar(c) ((unsigned char)(fc_cell_t)(c)) diff --git a/usr/src/uts/sun4u/sys/machcpuvar.h b/usr/src/uts/sun4u/sys/machcpuvar.h index 1953374a65..ef0d98e8b5 100644 --- a/usr/src/uts/sun4u/sys/machcpuvar.h +++ b/usr/src/uts/sun4u/sys/machcpuvar.h @@ -166,7 +166,7 @@ struct cpu_node { int implementation; int version; int portid; - dnode_t nodeid; + pnode_t nodeid; uint64_t clock_freq; uint_t tick_nsec_scale; union { diff --git a/usr/src/uts/sun4u/sys/machsystm.h b/usr/src/uts/sun4u/sys/machsystm.h index f69d2a6f1e..2150c56334 100644 --- a/usr/src/uts/sun4u/sys/machsystm.h +++ b/usr/src/uts/sun4u/sys/machsystm.h @@ -374,7 +374,7 @@ typedef struct devi_branch { void (*devi_branch_callback)(dev_info_t *, void *, uint_t); int type; union { - int (*prom_branch_select)(dnode_t, void *, uint_t); + int (*prom_branch_select)(pnode_t, void *, uint_t); int (*sid_branch_create)(dev_info_t *, void *, uint_t); } create; } devi_branch_t; diff --git a/usr/src/uts/sun4u/sys/prom_plat.h b/usr/src/uts/sun4u/sys/prom_plat.h index 9a63803111..c557eee0a1 100644 --- a/usr/src/uts/sun4u/sys/prom_plat.h +++ b/usr/src/uts/sun4u/sys/prom_plat.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -204,17 +204,17 @@ extern int prom_getmacaddr(ihandle_t hd, caddr_t ea); /* * CPU Control Group: MP's only. */ -extern int prom_startcpu(dnode_t node, caddr_t pc, int arg); +extern int prom_startcpu(pnode_t node, caddr_t pc, int arg); extern int prom_startcpu_bycpuid(int cpuid, caddr_t pc, int arg); extern int prom_stopcpu_bycpuid(int); extern int prom_sunfire_cpu_off(void); /* SunFire only */ -extern int prom_wakeupcpu(dnode_t node); -extern int prom_serengeti_wakeupcpu(dnode_t node); +extern int prom_wakeupcpu(pnode_t node); +extern int prom_serengeti_wakeupcpu(pnode_t node); extern int prom_hotaddcpu(int cpuid); extern int prom_hotremovecpu(int cpuid); extern void promsafe_pause_cpus(void); extern void promsafe_xc_attention(cpuset_t cpuset); -extern int prom_serengeti_cpu_off(dnode_t node); +extern int prom_serengeti_cpu_off(pnode_t node); /* * Set trap table diff --git a/usr/src/uts/sun4u/sys/sbd.h b/usr/src/uts/sun4u/sys/sbd.h index 0ec8c2e5b8..44e075e4be 100644 --- a/usr/src/uts/sun4u/sys/sbd.h +++ b/usr/src/uts/sun4u/sys/sbd.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2002-2003 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -66,7 +66,7 @@ typedef struct { } sbd_devattr_t; typedef struct { - dnode_t dnodeid; + pnode_t dnodeid; uint64_t *basepa; } sbd_basephys_t; |