Home | History | Annotate | Line # | Download | only in efiboot
exec.c revision 1.12.2.1
      1  1.12.2.1        ad /* $NetBSD: exec.c,v 1.12.2.1 2020/01/25 22:38:52 ad Exp $ */
      2       1.1  jmcneill 
      3       1.1  jmcneill /*-
      4      1.10   thorpej  * Copyright (c) 2019 Jason R. Thorpe
      5       1.1  jmcneill  * Copyright (c) 2018 Jared McNeill <jmcneill (at) invisible.ca>
      6       1.1  jmcneill  * All rights reserved.
      7       1.1  jmcneill  *
      8       1.1  jmcneill  * Redistribution and use in source and binary forms, with or without
      9       1.1  jmcneill  * modification, are permitted provided that the following conditions
     10       1.1  jmcneill  * are met:
     11       1.1  jmcneill  * 1. Redistributions of source code must retain the above copyright
     12       1.1  jmcneill  *    notice, this list of conditions and the following disclaimer.
     13       1.1  jmcneill  * 2. Redistributions in binary form must reproduce the above copyright
     14       1.1  jmcneill  *    notice, this list of conditions and the following disclaimer in the
     15       1.1  jmcneill  *    documentation and/or other materials provided with the distribution.
     16       1.1  jmcneill  *
     17       1.1  jmcneill  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
     18       1.1  jmcneill  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     19       1.1  jmcneill  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     20       1.1  jmcneill  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
     21       1.1  jmcneill  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
     22       1.1  jmcneill  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
     23       1.1  jmcneill  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
     24       1.1  jmcneill  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
     25       1.1  jmcneill  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
     26       1.1  jmcneill  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
     27       1.1  jmcneill  * SUCH DAMAGE.
     28       1.1  jmcneill  */
     29       1.1  jmcneill 
     30       1.1  jmcneill #include "efiboot.h"
     31      1.10   thorpej #include "efienv.h"
     32       1.1  jmcneill #include "efifdt.h"
     33       1.7  jmcneill #include "efiacpi.h"
     34       1.1  jmcneill 
     35       1.6  jmcneill #include <sys/reboot.h>
     36       1.1  jmcneill 
     37  1.12.2.1        ad extern char twiddle_toggle;
     38  1.12.2.1        ad 
     39       1.3  jmcneill u_long load_offset = 0;
     40       1.3  jmcneill 
     41       1.4  jmcneill #define	FDT_SPACE	(4 * 1024 * 1024)
     42       1.4  jmcneill #define	FDT_ALIGN	((2 * 1024 * 1024) - 1)
     43       1.4  jmcneill 
     44      1.12  riastrad static EFI_PHYSICAL_ADDRESS initrd_addr, dtb_addr, rndseed_addr;
     45      1.12  riastrad static u_long initrd_size = 0, dtb_size = 0, rndseed_size = 0;
     46       1.4  jmcneill 
     47       1.4  jmcneill static int
     48      1.10   thorpej load_file(const char *path, u_long extra, bool quiet_errors,
     49      1.10   thorpej     EFI_PHYSICAL_ADDRESS *paddr, u_long *psize)
     50       1.4  jmcneill {
     51       1.4  jmcneill 	EFI_STATUS status;
     52       1.4  jmcneill 	struct stat st;
     53       1.4  jmcneill 	ssize_t len;
     54      1.10   thorpej 	ssize_t expectedlen;
     55       1.4  jmcneill 	int fd;
     56       1.4  jmcneill 
     57       1.4  jmcneill 	if (strlen(path) == 0)
     58       1.4  jmcneill 		return 0;
     59       1.4  jmcneill 
     60       1.4  jmcneill 	fd = open(path, 0);
     61       1.4  jmcneill 	if (fd < 0) {
     62      1.10   thorpej 		if (!quiet_errors) {
     63      1.10   thorpej 			printf("boot: failed to open %s: %s\n", path,
     64      1.10   thorpej 			    strerror(errno));
     65      1.10   thorpej 		}
     66       1.4  jmcneill 		return errno;
     67       1.4  jmcneill 	}
     68       1.4  jmcneill 	if (fstat(fd, &st) < 0) {
     69       1.4  jmcneill 		printf("boot: failed to fstat %s: %s\n", path, strerror(errno));
     70       1.4  jmcneill 		close(fd);
     71       1.4  jmcneill 		return errno;
     72       1.4  jmcneill 	}
     73       1.4  jmcneill 	if (st.st_size == 0) {
     74      1.10   thorpej 		if (!quiet_errors) {
     75      1.10   thorpej 			printf("boot: empty file %s\n", path);
     76      1.10   thorpej 		}
     77       1.4  jmcneill 		close(fd);
     78       1.4  jmcneill 		return EINVAL;
     79       1.4  jmcneill 	}
     80       1.4  jmcneill 
     81      1.10   thorpej 	expectedlen = st.st_size;
     82      1.10   thorpej 	*psize = st.st_size + extra;
     83       1.4  jmcneill 
     84       1.4  jmcneill #ifdef EFIBOOT_ALLOCATE_MAX_ADDRESS
     85       1.5  jmcneill 	*paddr = EFIBOOT_ALLOCATE_MAX_ADDRESS;
     86       1.4  jmcneill 	status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateMaxAddress, EfiLoaderData,
     87       1.5  jmcneill 	    EFI_SIZE_TO_PAGES(*psize), paddr);
     88       1.4  jmcneill #else
     89       1.5  jmcneill 	*paddr = 0;
     90       1.4  jmcneill 	status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateAnyPages, EfiLoaderData,
     91       1.5  jmcneill 	    EFI_SIZE_TO_PAGES(*psize), paddr);
     92       1.4  jmcneill #endif
     93       1.4  jmcneill 	if (EFI_ERROR(status)) {
     94       1.5  jmcneill 		printf("Failed to allocate %lu bytes for %s (error %lu)\n",
     95       1.9  jmcneill 		    *psize, path, (u_long)status);
     96       1.4  jmcneill 		close(fd);
     97      1.10   thorpej 		*paddr = 0;
     98       1.4  jmcneill 		return ENOMEM;
     99       1.4  jmcneill 	}
    100       1.4  jmcneill 
    101       1.4  jmcneill 	printf("boot: loading %s ", path);
    102      1.10   thorpej 	len = read(fd, (void *)(uintptr_t)*paddr, expectedlen);
    103       1.4  jmcneill 	close(fd);
    104       1.4  jmcneill 
    105      1.10   thorpej 	if (len != expectedlen) {
    106      1.10   thorpej 		if (len < 0) {
    107       1.4  jmcneill 			printf(": %s\n", strerror(errno));
    108      1.10   thorpej 		} else {
    109      1.10   thorpej 			printf(": returned %ld (expected %ld)\n", len,
    110      1.10   thorpej 			    expectedlen);
    111      1.10   thorpej 		}
    112       1.4  jmcneill 		return EIO;
    113       1.4  jmcneill 	}
    114       1.4  jmcneill 
    115       1.4  jmcneill 	printf("done.\n");
    116       1.4  jmcneill 
    117       1.5  jmcneill 	efi_dcache_flush(*paddr, *psize);
    118       1.4  jmcneill 
    119       1.4  jmcneill 	return 0;
    120       1.4  jmcneill }
    121       1.4  jmcneill 
    122      1.10   thorpej static const char default_efibootplist_path[] = "/etc/efiboot.plist";
    123      1.10   thorpej 
    124      1.10   thorpej /* This is here because load_file() is here. */
    125      1.10   thorpej void
    126      1.10   thorpej load_efibootplist(bool default_fallback)
    127      1.10   thorpej {
    128      1.10   thorpej 	EFI_PHYSICAL_ADDRESS plist_addr = 0;
    129      1.10   thorpej 	u_long plist_size = 0;
    130      1.10   thorpej 	prop_dictionary_t plist = NULL, oplist = NULL;
    131      1.10   thorpej 	bool load_quietly = false;
    132  1.12.2.1        ad 	bool old_twiddle_toggle = twiddle_toggle;
    133      1.10   thorpej 
    134      1.10   thorpej 	const char *path = get_efibootplist_path();
    135      1.10   thorpej 	if (path == NULL || strlen(path) == 0) {
    136      1.10   thorpej 		if (!default_fallback)
    137      1.10   thorpej 			return;
    138      1.10   thorpej 		path = default_efibootplist_path;
    139      1.10   thorpej 		load_quietly = true;
    140      1.10   thorpej 	}
    141      1.10   thorpej 
    142  1.12.2.1        ad 	twiddle_toggle = load_quietly;
    143  1.12.2.1        ad 
    144      1.10   thorpej 	/*
    145      1.10   thorpej 	 * Fudge the size so we can ensure the resulting buffer
    146      1.10   thorpej 	 * is NUL-terminated for convenience.
    147      1.10   thorpej 	 */
    148      1.10   thorpej 	if (load_file(path, 1, load_quietly, &plist_addr, &plist_size) != 0 ||
    149      1.10   thorpej 	    plist_addr == 0) {
    150      1.10   thorpej 		/* Error messages have already been displayed. */
    151      1.10   thorpej 		goto out;
    152      1.10   thorpej 	}
    153      1.10   thorpej 	char *plist_buf = (char *)((uintptr_t)plist_addr);
    154      1.10   thorpej 	plist_buf[plist_size - 1] = '\0';
    155      1.10   thorpej 
    156      1.10   thorpej 	plist = prop_dictionary_internalize(plist_buf);
    157      1.10   thorpej 	if (plist == NULL) {
    158      1.10   thorpej 		printf("boot: unable to parse plist '%s'\n", path);
    159      1.10   thorpej 		goto out;
    160      1.10   thorpej 	}
    161      1.10   thorpej 
    162      1.10   thorpej out:
    163      1.10   thorpej 	oplist = efibootplist;
    164      1.10   thorpej 
    165  1.12.2.1        ad 	twiddle_toggle = old_twiddle_toggle;
    166  1.12.2.1        ad 
    167      1.10   thorpej 	/*
    168      1.10   thorpej 	 * If we had a failure, create an empty one for
    169      1.10   thorpej 	 * convenience.  But a failure should not clobber
    170      1.10   thorpej 	 * an in-memory plist we already have.
    171      1.10   thorpej 	 */
    172      1.10   thorpej 	if (plist == NULL &&
    173      1.10   thorpej 	    (oplist == NULL || prop_dictionary_count(oplist) == 0))
    174      1.10   thorpej 		plist = prop_dictionary_create();
    175      1.10   thorpej 
    176      1.10   thorpej #ifdef EFIBOOT_DEBUG
    177      1.10   thorpej 	printf(">> load_efibootplist: oplist = 0x%lx, plist = 0x%lx\n",
    178      1.10   thorpej 	    (u_long)oplist, (u_long)plist);
    179      1.10   thorpej #endif
    180      1.10   thorpej 
    181      1.10   thorpej 	if (plist_addr) {
    182      1.10   thorpej 		uefi_call_wrapper(BS->FreePages, 2, plist_addr,
    183      1.10   thorpej 		    EFI_SIZE_TO_PAGES(plist_size));
    184      1.10   thorpej 	}
    185      1.10   thorpej 
    186      1.10   thorpej 	if (plist) {
    187      1.10   thorpej 		efibootplist = plist;
    188      1.10   thorpej 		efi_env_from_efibootplist();
    189      1.10   thorpej 
    190      1.10   thorpej 		if (oplist)
    191      1.10   thorpej 			prop_object_release(oplist);
    192      1.10   thorpej 	}
    193      1.10   thorpej }
    194      1.10   thorpej 
    195      1.10   thorpej static void
    196      1.10   thorpej apply_overlay(void *dtbo)
    197      1.10   thorpej {
    198      1.10   thorpej 
    199      1.10   thorpej 	if (!efi_fdt_overlay_is_compatible(dtbo)) {
    200      1.10   thorpej 		printf("boot: incompatible overlay\n");
    201      1.10   thorpej 	}
    202      1.10   thorpej 
    203      1.10   thorpej 	int fdterr;
    204      1.10   thorpej 
    205      1.10   thorpej 	if (efi_fdt_overlay_apply(dtbo, &fdterr) != 0) {
    206      1.10   thorpej 		printf("boot: error %d applying overlay\n", fdterr);
    207      1.10   thorpej 	}
    208      1.10   thorpej }
    209      1.10   thorpej 
    210      1.10   thorpej static void
    211      1.10   thorpej apply_overlay_file(const char *path)
    212      1.10   thorpej {
    213      1.10   thorpej 	EFI_PHYSICAL_ADDRESS dtbo_addr;
    214      1.10   thorpej 	u_long dtbo_size;
    215      1.10   thorpej 
    216      1.10   thorpej 	if (strlen(path) == 0)
    217      1.10   thorpej 		return;
    218      1.10   thorpej 
    219      1.10   thorpej 	if (load_file(path, 0, false, &dtbo_addr, &dtbo_size) != 0 ||
    220      1.10   thorpej 	    dtbo_addr == 0) {
    221      1.10   thorpej 		/* Error messages have already been displayed. */
    222      1.10   thorpej 		goto out;
    223      1.10   thorpej 	}
    224      1.10   thorpej 
    225      1.10   thorpej 	apply_overlay((void *)(uintptr_t)dtbo_addr);
    226      1.10   thorpej 
    227      1.10   thorpej out:
    228      1.10   thorpej 	if (dtbo_addr) {
    229      1.10   thorpej 		uefi_call_wrapper(BS->FreePages, 2, dtbo_addr,
    230      1.10   thorpej 		    EFI_SIZE_TO_PAGES(dtbo_size));
    231      1.10   thorpej 	}
    232      1.10   thorpej }
    233      1.10   thorpej 
    234      1.10   thorpej #define	DT_OVERLAYS_PROP	"device-tree-overlays"
    235      1.10   thorpej 
    236      1.10   thorpej static void
    237      1.10   thorpej load_fdt_overlays(void)
    238      1.10   thorpej {
    239      1.10   thorpej 	/*
    240      1.10   thorpej 	 * We support loading device tree overlays specified in efiboot.plist
    241      1.10   thorpej 	 * using the following schema:
    242      1.10   thorpej 	 *
    243      1.10   thorpej 	 *	<key>device-tree-overlays</key>
    244      1.10   thorpej 	 *	<array>
    245      1.10   thorpej 	 *		<string>/path/to/some/overlay.dtbo</string>
    246      1.10   thorpej 	 *		<string>hd0e:/some/other/overlay.dtbo</string>
    247      1.10   thorpej 	 *	</array>
    248      1.10   thorpej 	 *
    249      1.10   thorpej 	 * The overlays are loaded in array order.
    250      1.10   thorpej 	 */
    251      1.10   thorpej 	prop_array_t overlays = prop_dictionary_get(efibootplist,
    252      1.10   thorpej 	    DT_OVERLAYS_PROP);
    253      1.10   thorpej 	if (overlays == NULL) {
    254      1.10   thorpej #ifdef EFIBOOT_DEBUG
    255      1.10   thorpej 		printf("boot: no device-tree-overlays\n");
    256      1.10   thorpej #endif
    257      1.10   thorpej 		return;
    258      1.10   thorpej 	}
    259      1.10   thorpej 	if (prop_object_type(overlays) != PROP_TYPE_ARRAY) {
    260      1.10   thorpej 		printf("boot: invalid %s\n", DT_OVERLAYS_PROP);
    261      1.10   thorpej 		return;
    262      1.10   thorpej 	}
    263      1.10   thorpej 
    264      1.10   thorpej 	prop_object_iterator_t iter = prop_array_iterator(overlays);
    265      1.10   thorpej 	prop_string_t pathobj;
    266      1.10   thorpej 	while ((pathobj = prop_object_iterator_next(iter)) != NULL) {
    267      1.10   thorpej 		if (prop_object_type(pathobj) != PROP_TYPE_STRING) {
    268      1.10   thorpej 			printf("boot: invalid %s entry\n", DT_OVERLAYS_PROP);
    269      1.10   thorpej 			continue;
    270      1.10   thorpej 		}
    271      1.10   thorpej 		apply_overlay_file(prop_string_cstring_nocopy(pathobj));
    272      1.10   thorpej 	}
    273      1.10   thorpej 	prop_object_iterator_release(iter);
    274      1.10   thorpej }
    275      1.10   thorpej 
    276       1.1  jmcneill int
    277       1.1  jmcneill exec_netbsd(const char *fname, const char *args)
    278       1.1  jmcneill {
    279       1.1  jmcneill 	EFI_PHYSICAL_ADDRESS addr;
    280       1.1  jmcneill 	u_long marks[MARK_MAX], alloc_size;
    281       1.1  jmcneill 	EFI_STATUS status;
    282       1.6  jmcneill 	int fd, ohowto;
    283       1.1  jmcneill 
    284      1.10   thorpej 	load_file(get_initrd_path(), 0, false, &initrd_addr, &initrd_size);
    285      1.10   thorpej 	load_file(get_dtb_path(), 0, false, &dtb_addr, &dtb_size);
    286       1.4  jmcneill 
    287       1.1  jmcneill 	memset(marks, 0, sizeof(marks));
    288       1.6  jmcneill 	ohowto = howto;
    289       1.6  jmcneill 	howto |= AB_SILENT;
    290       1.1  jmcneill 	fd = loadfile(fname, marks, COUNT_KERNEL | LOAD_NOTE);
    291       1.6  jmcneill 	howto = ohowto;
    292       1.1  jmcneill 	if (fd < 0) {
    293       1.1  jmcneill 		printf("boot: %s: %s\n", fname, strerror(errno));
    294       1.1  jmcneill 		return EIO;
    295       1.1  jmcneill 	}
    296       1.1  jmcneill 	close(fd);
    297       1.1  jmcneill 	marks[MARK_END] = (((u_long) marks[MARK_END] + sizeof(int) - 1)) & (-sizeof(int));
    298       1.4  jmcneill 	alloc_size = marks[MARK_END] - marks[MARK_START] + FDT_SPACE + EFIBOOT_ALIGN;
    299       1.1  jmcneill 
    300       1.1  jmcneill #ifdef EFIBOOT_ALLOCATE_MAX_ADDRESS
    301       1.1  jmcneill 	addr = EFIBOOT_ALLOCATE_MAX_ADDRESS;
    302       1.1  jmcneill 	status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateMaxAddress, EfiLoaderData,
    303       1.1  jmcneill 	    EFI_SIZE_TO_PAGES(alloc_size), &addr);
    304       1.1  jmcneill #else
    305       1.1  jmcneill 	addr = 0;
    306       1.1  jmcneill 	status = uefi_call_wrapper(BS->AllocatePages, 4, AllocateAnyPages, EfiLoaderData,
    307       1.1  jmcneill 	    EFI_SIZE_TO_PAGES(alloc_size), &addr);
    308       1.1  jmcneill #endif
    309       1.1  jmcneill 	if (EFI_ERROR(status)) {
    310       1.1  jmcneill 		printf("Failed to allocate %lu bytes for kernel image (error %lu)\n",
    311       1.9  jmcneill 		    alloc_size, (u_long)status);
    312       1.1  jmcneill 		return ENOMEM;
    313       1.1  jmcneill 	}
    314       1.1  jmcneill 
    315       1.1  jmcneill 	memset(marks, 0, sizeof(marks));
    316       1.3  jmcneill 	load_offset = (addr + EFIBOOT_ALIGN) & ~(EFIBOOT_ALIGN - 1);
    317       1.1  jmcneill 	fd = loadfile(fname, marks, LOAD_KERNEL);
    318       1.1  jmcneill 	if (fd < 0) {
    319       1.1  jmcneill 		printf("boot: %s: %s\n", fname, strerror(errno));
    320       1.1  jmcneill 		goto cleanup;
    321       1.1  jmcneill 	}
    322       1.1  jmcneill 	close(fd);
    323       1.3  jmcneill 	load_offset = 0;
    324       1.1  jmcneill 
    325       1.7  jmcneill #ifdef EFIBOOT_ACPI
    326       1.7  jmcneill 	if (efi_acpi_available()) {
    327       1.7  jmcneill 		efi_acpi_create_fdt();
    328       1.7  jmcneill 	} else
    329       1.7  jmcneill #endif
    330       1.9  jmcneill 	if (dtb_addr && efi_fdt_set_data((void *)(uintptr_t)dtb_addr) != 0) {
    331       1.5  jmcneill 		printf("boot: invalid DTB data\n");
    332       1.5  jmcneill 		goto cleanup;
    333       1.5  jmcneill 	}
    334       1.5  jmcneill 
    335       1.1  jmcneill 	if (efi_fdt_size() > 0) {
    336      1.12  riastrad 		/*
    337      1.12  riastrad 		 * Load the rndseed as late as possible -- after we
    338      1.12  riastrad 		 * have committed to using fdt and executing this
    339      1.12  riastrad 		 * kernel -- so that it doesn't hang around in memory
    340      1.12  riastrad 		 * if we have to bail or the kernel won't use it.
    341      1.12  riastrad 		 */
    342      1.12  riastrad 		load_file(get_rndseed_path(), 0, false,
    343      1.12  riastrad 		    &rndseed_addr, &rndseed_size);
    344      1.12  riastrad 
    345       1.4  jmcneill 		efi_fdt_init((marks[MARK_END] + FDT_ALIGN) & ~FDT_ALIGN, FDT_ALIGN + 1);
    346      1.10   thorpej 		load_fdt_overlays();
    347       1.4  jmcneill 		efi_fdt_initrd(initrd_addr, initrd_size);
    348      1.12  riastrad 		efi_fdt_rndseed(rndseed_addr, rndseed_size);
    349       1.2  jmcneill 		efi_fdt_bootargs(args);
    350      1.11  jmcneill #ifdef EFIBOOT_ACPI
    351      1.11  jmcneill 		if (efi_acpi_available())
    352      1.11  jmcneill 			efi_fdt_gop();
    353      1.11  jmcneill #endif
    354       1.4  jmcneill 		efi_fdt_memory_map();
    355       1.8  jmcneill 	}
    356       1.8  jmcneill 
    357       1.8  jmcneill 	efi_cleanup();
    358       1.8  jmcneill 
    359       1.8  jmcneill 	if (efi_fdt_size() > 0) {
    360       1.4  jmcneill 		efi_fdt_fini();
    361       1.1  jmcneill 	}
    362       1.1  jmcneill 
    363       1.1  jmcneill 	efi_boot_kernel(marks);
    364       1.1  jmcneill 
    365       1.1  jmcneill 	/* This should not happen.. */
    366       1.1  jmcneill 	printf("boot returned\n");
    367       1.1  jmcneill 
    368       1.1  jmcneill cleanup:
    369       1.1  jmcneill 	uefi_call_wrapper(BS->FreePages, 2, addr, EFI_SIZE_TO_PAGES(alloc_size));
    370       1.4  jmcneill 	if (initrd_addr) {
    371       1.4  jmcneill 		uefi_call_wrapper(BS->FreePages, 2, initrd_addr, EFI_SIZE_TO_PAGES(initrd_size));
    372       1.4  jmcneill 		initrd_addr = 0;
    373       1.4  jmcneill 		initrd_size = 0;
    374       1.4  jmcneill 	}
    375       1.5  jmcneill 	if (dtb_addr) {
    376       1.5  jmcneill 		uefi_call_wrapper(BS->FreePages, 2, dtb_addr, EFI_SIZE_TO_PAGES(dtb_size));
    377       1.5  jmcneill 		dtb_addr = 0;
    378       1.5  jmcneill 		dtb_size = 0;
    379       1.5  jmcneill 	}
    380       1.1  jmcneill 	return EIO;
    381       1.1  jmcneill }
    382