Permalink
Browse files

6820480 unified wanboot loader needed

6903594 Unreferenced files and out-of-date comments in usr/src/psm

--HG--
rename : usr/src/psm/promif/ieee1275/sun4u/prom_heartbeat.c => usr/src/psm/promif/ieee1275/sun4/prom_heartbeat.c
rename : usr/src/psm/promif/ieee1275/sun4u/prom_mmu.c => usr/src/psm/promif/ieee1275/sun4/prom_mmu.c
rename : usr/src/psm/promif/ieee1275/sun4u/prom_vercheck.c => usr/src/psm/promif/ieee1275/sun4/prom_vercheck.c
rename : usr/src/psm/stand/boot/sparcv9/sun4u/machdep.c => usr/src/psm/stand/boot/sparc/common/sun4u_machdep.c
rename : usr/src/psm/stand/boot/sparcv9/sun4v/machdep.c => usr/src/psm/stand/boot/sparc/common/sun4v_machdep.c
  • Loading branch information...
1 parent d41c437 commit d24234c24aeaca4ca56ee3ac2794507968f274c4 Jerry Gilliam committed Jan 14, 2010
Showing with 1,009 additions and 737 deletions.
  1. +2 −2 usr/src/Makefile.psm.targ
  2. +5 −9 usr/src/psm/promif/ieee1275/README.promif
  3. +4 −7 usr/src/psm/promif/ieee1275/{sun4u → sun4}/prom_heartbeat.c
  4. +1 −71 usr/src/psm/promif/ieee1275/{sun4u → sun4}/prom_mmu.c
  5. +3 −6 usr/src/psm/promif/ieee1275/{sun4u → sun4}/prom_vercheck.c
  6. +2 −3 usr/src/psm/promif/ieee1275/sun4u/Makefile.files
  7. +95 −0 usr/src/psm/promif/ieee1275/sun4u/prom_tlb.c
  8. +4 −6 usr/src/psm/stand/boot/Makefile
  9. +1 −16 usr/src/psm/stand/boot/Makefile.boot
  10. +3 −7 usr/src/psm/stand/boot/Makefile.rules
  11. +2 −5 usr/src/psm/stand/boot/Makefile.targ
  12. +56 −6 usr/src/psm/stand/boot/sparc/common/boot_plat.c
  13. +9 −1 usr/src/psm/stand/boot/sparc/common/boot_plat.h
  14. +15 −14 usr/src/psm/stand/boot/{sparcv9/sun4u → sparc/common}/machdep.c
  15. +17 −9 usr/src/psm/stand/{lib/names/sparcv9/sun4v/modpath.c → boot/sparc/common/sun4u_machdep.c}
  16. +18 −10 usr/src/psm/stand/{lib/names/sparcv9/sun4u/modpath.c → boot/sparc/common/sun4v_machdep.c}
  17. +93 −0 usr/src/psm/stand/boot/sparc/sun4/sys/machparam.h
  18. +219 −0 usr/src/psm/stand/boot/sparc/sun4/sys/prom_plat.h
  19. +8 −19 usr/src/psm/stand/boot/sparcv9/Makefile
  20. +34 −148 usr/src/psm/stand/boot/sparcv9/Makefile.com
  21. +230 −0 usr/src/psm/stand/boot/sparcv9/sun4/Makefile
  22. +11 −50 usr/src/psm/stand/boot/sparcv9/sun4u/Makefile
  23. +10 −53 usr/src/psm/stand/boot/sparcv9/sun4v/Makefile
  24. +0 −80 usr/src/psm/stand/boot/sparcv9/sun4v/machdep.c
  25. +1 −30 usr/src/psm/stand/bootblks/Makefile.com
  26. +4 −7 usr/src/psm/stand/lib/names/sparcv9/Makefile
  27. +6 −12 usr/src/psm/stand/lib/names/sparcv9/{sun4v → sun4}/Makefile
  28. +0 −41 usr/src/psm/stand/lib/names/sparcv9/sun4u/Makefile
  29. +4 −8 usr/src/psm/stand/lib/promif/sparcv9/ieee1275/Makefile
  30. +141 −0 usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4/Makefile
  31. +5 −6 usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4u/Makefile
  32. +6 −8 usr/src/psm/stand/lib/promif/sparcv9/ieee1275/sun4v/Makefile
  33. +0 −60 usr/src/psm/stand/old/bootblks/common/goforth.s
  34. +0 −43 usr/src/psm/stand/old/bootblks/common/process.c
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# Makefile.psm.targ, global targets for platform specific modules
@@ -79,7 +79,7 @@ $(ROOT_PSM_SCHED_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_SCHED_DIR) FRC
$(ROOT_PSM_STRMOD_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_STRMOD_DIR) FRC
$(INS.file)
-$(ROOT_PSM_SYS_DIR)/%: $(OBJS_DIR)% $(ROOT_PSM_SYS_DIR) FRC
+$(ROOT_PSM_SYS_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_SYS_DIR) FRC
$(INS.file)
$(ROOT_PSM_MISC_DIR)/%: $(OBJS_DIR)/% $(ROOT_PSM_MISC_DIR) FRC
@@ -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,11 +19,9 @@
# CDDL HEADER END
#
-# Copyright 1991-1994, 2003 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
-#pragma ident "%Z%%M% %I% %E% SMI"
-
This directory contains the IEEE 1275-1994 implementation
of the promif interfaces.
@@ -33,8 +30,7 @@ independent implementation of common promif interfaces.
ISA and platform dependent implementations of promif
interfaces (including platform and/or ISA defined interfaces)
-should be placed in appropriately named subdirectories:
-(e.g.: sparc/v9, sun4u, ... ).
+should be placed in appropriately named subdirectories.
The "sun4" directory contains common implementations of promif
-interfaces which are used by sun4u and sun4r.
+interfaces which are used by sun4u and sun4v.
@@ -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,12 +19,10 @@
* CDDL HEADER END
*/
/*
- * Copyright (c) 1994, by Sun Microsystems, Inc.
- * All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/promif.h>
#include <sys/promimpl.h>
@@ -19,12 +19,10 @@
* CDDL HEADER END
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
/*
* This file contains platform-dependent MMU support routines,
* suitable for mmu methods with 2-cell physical addresses.
@@ -291,71 +289,3 @@ prom_translate_virt(caddr_t virt, int *valid,
*valid = -1; /* Indicate valid result */
return (0);
}
-
-/*
- * prom_itlb_load, prom_dtlb_load:
- *
- * Manage the Spitfire TLB. Returns 0 if successful, -1 otherwise.
- * Flush the address in context zero mapped by tte_data and virt,
- * and load the {i,d} tlb entry index with tte_data and virt.
- */
-
-int
-prom_itlb_load(int index, unsigned long long tte_data, caddr_t virt)
-{
- cell_t ci[9];
- int rv;
- ihandle_t immu = prom_mmu_ihandle();
-
- if ((immu == (ihandle_t)-1))
- return (-1);
-
- ci[0] = p1275_ptr2cell("call-method"); /* Service name */
- ci[1] = (cell_t)5; /* #argument cells */
- ci[2] = (cell_t)1; /* #result cells */
- ci[3] = p1275_ptr2cell("SUNW,itlb-load"); /* Arg1: method name */
- ci[4] = p1275_ihandle2cell(immu); /* Arg2: mmu ihandle */
- ci[5] = p1275_ptr2cell(virt); /* Arg3: SA1: virt */
- ci[6] = (cell_t)tte_data; /* Arg4: SA2: tte_data */
- ci[7] = p1275_int2cell(index); /* Arg5: SA3: index */
-
- promif_preprom();
- rv = p1275_cif_handler(&ci);
- promif_postprom();
-
- if (rv != 0)
- return (-1);
- if (ci[8] != 0) /* Res1: Catch result */
- return (-1);
- return (0);
-}
-
-int
-prom_dtlb_load(int index, unsigned long long tte_data, caddr_t virt)
-{
- cell_t ci[9];
- int rv;
- ihandle_t immu = prom_mmu_ihandle();
-
- if ((immu == (ihandle_t)-1))
- return (-1);
-
- ci[0] = p1275_ptr2cell("call-method"); /* Service name */
- ci[1] = (cell_t)5; /* #argument cells */
- ci[2] = (cell_t)1; /* #result cells */
- ci[3] = p1275_ptr2cell("SUNW,dtlb-load"); /* Arg1: method name */
- ci[4] = p1275_ihandle2cell(immu); /* Arg2: mmu ihandle */
- ci[5] = p1275_ptr2cell(virt); /* Arg3: SA1: virt */
- ci[6] = (cell_t)tte_data; /* Arg4: SA2: tte_data */
- ci[7] = p1275_int2cell(index); /* Arg5: SA3: index */
-
- promif_preprom();
- rv = p1275_cif_handler(&ci);
- promif_postprom();
-
- if (rv != 0)
- return (-1);
- if (ci[8] != 0) /* Res1: Catch result */
- return (-1);
- return (0);
-}
@@ -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,12 +19,10 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/promif.h>
#include <sys/promimpl.h>
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
# psm/promif/ieee1275/sun4u/Makefile.files
#
# This Makefile defines all the promif file modules for the
@@ -57,6 +55,7 @@ CORE_OBJS += \
prom_starcat.o \
prom_starfire.o \
prom_sunfire.o \
+ prom_tlb.o \
prom_vercheck.o \
prom_vername.o \
prom_opl.o
@@ -0,0 +1,95 @@
+/*
+ * CDDL HEADER START
+ *
+ * The contents of this file are subject to the terms of the
+ * 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.
+ * See the License for the specific language governing permissions
+ * and limitations under the License.
+ *
+ * When distributing Covered Code, include this CDDL HEADER in each
+ * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+ * If applicable, add the following below this CDDL HEADER, with the
+ * fields enclosed by brackets "[]" replaced with your own identifying
+ * information: Portions Copyright [yyyy] [name of copyright owner]
+ *
+ * CDDL HEADER END
+ */
+/*
+ * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
+ * Use is subject to license terms.
+ */
+
+#include <sys/promif.h>
+#include <sys/promimpl.h>
+
+/*
+ * prom_itlb_load, prom_dtlb_load:
+ *
+ * Manage the Spitfire TLB. Returns 0 if successful, -1 otherwise.
+ * Flush the address in context zero mapped by tte_data and virt,
+ * and load the {i,d} tlb entry index with tte_data and virt.
+ */
+
+int
+prom_itlb_load(int index, unsigned long long tte_data, caddr_t virt)
+{
+ cell_t ci[9];
+ int rv;
+ ihandle_t immu = prom_mmu_ihandle();
+
+ if ((immu == (ihandle_t)-1))
+ return (-1);
+
+ ci[0] = p1275_ptr2cell("call-method"); /* Service name */
+ ci[1] = (cell_t)5; /* #argument cells */
+ ci[2] = (cell_t)1; /* #result cells */
+ ci[3] = p1275_ptr2cell("SUNW,itlb-load"); /* Arg1: method name */
+ ci[4] = p1275_ihandle2cell(immu); /* Arg2: mmu ihandle */
+ ci[5] = p1275_ptr2cell(virt); /* Arg3: SA1: virt */
+ ci[6] = (cell_t)tte_data; /* Arg4: SA2: tte_data */
+ ci[7] = p1275_int2cell(index); /* Arg5: SA3: index */
+
+ promif_preprom();
+ rv = p1275_cif_handler(&ci);
+ promif_postprom();
+
+ if (rv != 0)
+ return (-1);
+ if (ci[8] != 0) /* Res1: Catch result */
+ return (-1);
+ return (0);
+}
+
+int
+prom_dtlb_load(int index, unsigned long long tte_data, caddr_t virt)
+{
+ cell_t ci[9];
+ int rv;
+ ihandle_t immu = prom_mmu_ihandle();
+
+ if ((immu == (ihandle_t)-1))
+ return (-1);
+
+ ci[0] = p1275_ptr2cell("call-method"); /* Service name */
+ ci[1] = (cell_t)5; /* #argument cells */
+ ci[2] = (cell_t)1; /* #result cells */
+ ci[3] = p1275_ptr2cell("SUNW,dtlb-load"); /* Arg1: method name */
+ ci[4] = p1275_ihandle2cell(immu); /* Arg2: mmu ihandle */
+ ci[5] = p1275_ptr2cell(virt); /* Arg3: SA1: virt */
+ ci[6] = (cell_t)tte_data; /* Arg4: SA2: tte_data */
+ ci[7] = p1275_int2cell(index); /* Arg5: SA3: index */
+
+ promif_preprom();
+ rv = p1275_cif_handler(&ci);
+ promif_postprom();
+
+ if (rv != 0)
+ return (-1);
+ if (ci[8] != 0) /* Res1: Catch result */
+ return (-1);
+ return (0);
+}
@@ -19,11 +19,9 @@
# CDDL HEADER END
#
#
-# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "%Z%%M% %I% %E% SMI"
-#
include ../../../Makefile.master
@@ -93,9 +91,9 @@ EXPORT_SRC:
$(CHMOD) 444 sparc/common/ramdisk.c
$(RM) sparcv9/Makefile.com+
sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \
- < sparcv9/Makefile.com > sparcv9/Makefile.com+
- $(MV) sparcv9/Makefile.com+ sparcv9/Makefile.com
- $(CHMOD) 444 sparcv9/Makefile.com
+ < sparcv9/sun4/Makefile > sparcv9/sun4/Makefile+
+ $(MV) sparcv9/sun4/Makefile+ sparcv9/sun4/Makefile
+ $(CHMOD) 444 sparcv9/sun4/Makefile
$(RM) Makefile+
sed -e "/^# EXPORT DELETE START/,/^# EXPORT DELETE END/d" \
< Makefile > Makefile+
@@ -19,7 +19,7 @@
# CDDL HEADER END
#
#
-# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
# psm/stand/boot/Makefile.boot
@@ -45,27 +45,12 @@ PSMPROMLIBDIR = $(PSMSTANDDIR)/lib/promif/$(MACH)
PSMPROMLIBDIR64 = $(PSMSTANDDIR)/lib/promif/$(MACH64)
#
-# XXX one day we should just be able to set PROG to 'cfsboot'..
-# and everything will become a lot easier.
-#
-UNIBOOT = multiboot
-WANBOOT = wanboot
-NFSBOOT = inetboot
-
-#
# Common install modes and owners
#
FILEMODE = 644
DIRMODE = 755
#
-# Install locations
-#
-ROOT_PSM_UNIBOOT= $(ROOT_PSM_DIR)/$(UNIBOOT)
-ROOT_PSM_WANBOOT= $(ROOT_PSM_DIR)/$(WANBOOT)
-USR_PSM_NFSBOOT = $(USR_PSM_LIB_NFS_DIR)/$(NFSBOOT)
-
-#
# While things are pretty much 32-bit lint-clean, there are a ton of
# suspect pointer casts. Since these may be serious problems (especially
# on SPARC), this really needs to be investigated thoroughly one day.
@@ -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.
@@ -19,12 +18,9 @@
#
# CDDL HEADER END
#
-#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+# Copyright 2010 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-#pragma ident "%Z%%M% %I% %E% SMI"
-#
# psm/stand/boot/Makefile.rules
#CPPFLAGS += -DDEBUG=1
Oops, something went wrong.

0 comments on commit d24234c

Please sign in to comment.