Date: Mon, 15 Jun 2015 12:08:52 GMT From: mihai@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r287114 - in soc2015/mihai/bhyve-on-arm-head/sys: arm/arm dev/fdt Message-ID: <201506151208.t5FC8qoq023828@socsvn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mihai Date: Mon Jun 15 12:08:52 2015 New Revision: 287114 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=287114 Log: sys: arm: remove debug printfs Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/physmem.c soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/vfp.c soc2015/mihai/bhyve-on-arm-head/sys/dev/fdt/fdt_common.c Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/physmem.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/physmem.c Mon Jun 15 11:56:08 2015 (r287113) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/physmem.c Mon Jun 15 12:08:52 2015 (r287114) @@ -311,7 +311,7 @@ adj = pa - trunc_page(pa); pa = trunc_page(pa); sz = round_page(sz + adj); - printf("%s pa: %p sz: %p\n",__func__,(void*)pa, (void*)sz); + if (excnt < nitems(exregions)) insert_region(exregions, excnt++, pa, sz, exflags); } Modified: soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/vfp.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/vfp.c Mon Jun 15 11:56:08 2015 (r287113) +++ soc2015/mihai/bhyve-on-arm-head/sys/arm/arm/vfp.c Mon Jun 15 12:08:52 2015 (r287114) @@ -103,6 +103,7 @@ { u_int fpsid, fpexc, tmp; u_int coproc, vfp_arch; + coproc = get_coprocessorACR(); coproc |= COPROC10 | COPROC11; set_coprocessorACR(coproc); Modified: soc2015/mihai/bhyve-on-arm-head/sys/dev/fdt/fdt_common.c ============================================================================== --- soc2015/mihai/bhyve-on-arm-head/sys/dev/fdt/fdt_common.c Mon Jun 15 11:56:08 2015 (r287113) +++ soc2015/mihai/bhyve-on-arm-head/sys/dev/fdt/fdt_common.c Mon Jun 15 12:08:52 2015 (r287114) @@ -117,32 +117,22 @@ rangesptr = &ranges[i * tuple_size]; bus_addr = fdt_data_get((void *)rangesptr, addr_cells); - printf("%s %d %d %p %p\n",__func__,i, tuples, (void*) bus_addr, (void*) addr); if (bus_addr != addr) continue; rangesptr += addr_cells; - printf("%s 2 %d %d %p %p\n",__func__,i, tuples, (void*) bus_addr, (void*) addr); par_bus_addr = fdt_data_get((void *)rangesptr, par_addr_cells); rangesptr += par_addr_cells; err = fdt_get_range_by_busaddr(OF_parent(node), par_bus_addr, &pbase, &psize); - printf("%s %d %d %p %p; %p %p\n",__func__,i, tuples, (void*) bus_addr, (void*) addr, (void*)pbase,(void*) psize); - if (err > 0) return (err); - printf("%s %d %d %p %p; %p %p\n",__func__,i, tuples, (void*) bus_addr, (void*) addr, (void*)pbase,(void*) psize); - - if (err == 0) *base = pbase; else *base = par_bus_addr; - printf("%s %d %d %p %p;;;;; %p %p; par_bus_addr: %p; base:%p\n",__func__,i, tuples, (void*) bus_addr, (void*) addr, (void*)pbase,(void*) psize, (void*)par_bus_addr, (void*)*base); - - *size = fdt_data_get((void *)rangesptr, size_cells); return (0); @@ -165,7 +155,6 @@ * Process 'ranges' property. */ par_addr_cells = fdt_parent_addr_cells(node); - printf("%s par_addr_cells: %p\n",__func__,(void*)par_addr_cells); if (par_addr_cells > 2) return (ERANGE); @@ -196,22 +185,17 @@ rangesptr = &ranges[range_id]; *base = fdt_data_get((void *)rangesptr, addr_cells); - printf("%s 1 %p, range_id:%u %p\n",__func__,(void*)*base, range_id, (void*)rangesptr); rangesptr += addr_cells; par_bus_addr = fdt_data_get((void *)rangesptr, par_addr_cells); - printf("%s ----- par_bus_addr: %d; par_bus_addr2: %d\n",__func__,*((uint32_t*)rangesptr), *(((uint32_t*)rangesptr) + 1)); rangesptr += par_addr_cells; err = fdt_get_range_by_busaddr(OF_parent(node), par_bus_addr, &pbase, &psize); - printf("%s 2 %p, pbase:%p, par_bus_addr:%lu\n",__func__,(void*)*base, (void*)pbase, par_bus_addr); - if (err == 0) *base += pbase; else *base += par_bus_addr; - printf("%s 3 %p\n",__func__,(void*)*base); *size = fdt_data_get((void *)rangesptr, size_cells); return (0); @@ -611,7 +595,6 @@ uint32_t memory_size; int addr_cells, size_cells; int i, max_size, res_len, rv, tuple_size, tuples; - printf("%s 1 \n",__func__); max_size = sizeof(reserve); root = OF_finddevice("/"); @@ -620,35 +603,28 @@ rv = ENXIO; goto out; } - printf("%s 2 \n",__func__); if ((rv = fdt_addrsize_cells(OF_parent(memory), &addr_cells, &size_cells)) != 0) goto out; - printf("%s 3 \n",__func__); if (addr_cells > 2) { rv = ERANGE; goto out; } - printf("%s 33 \n",__func__); tuple_size = sizeof(pcell_t) * (addr_cells + size_cells); - printf("%s 4 \n",__func__); res_len = OF_getproplen(root, "memreserve"); if (res_len <= 0 || res_len > sizeof(reserve)) { - printf("%s 5 \n",__func__); - rv = ERANGE; goto out; } - printf("%s res_len %d\n",__func__,res_len); + if (OF_getprop(root, "memreserve", reserve, res_len) <= 0) { rv = ENXIO; goto out; } - printf("%s res_len %d 2222222\n",__func__,res_len); memory_size = 0; tuples = res_len / tuple_size; @@ -657,11 +633,9 @@ rv = fdt_data_to_res(reservep, addr_cells, size_cells, (u_long *)&mr[i].mr_start, (u_long *)&mr[i].mr_size); - printf("%s res_len %d for: %d\n",__func__,res_len, i); if (rv != 0) goto out; - printf("%s res_len %d for after rv: %d\n",__func__,res_len, i); reservep += addr_cells + size_cells; } @@ -669,7 +643,6 @@ *mrcnt = i; rv = 0; out: - printf("%s out rv: %d\n",__func__,rv); return (rv); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506151208.t5FC8qoq023828>