diff options
41 files changed, 89 insertions, 5 deletions
diff --git a/sys/arm/arm/devmap.c b/sys/arm/arm/devmap.c index d9bdd9c..1c60a15 100644 --- a/sys/arm/arm/devmap.c +++ b/sys/arm/arm/devmap.c @@ -31,6 +31,8 @@ __FBSDID("$FreeBSD$"); * Routines for mapping device memory. */ +#include "opt_ddb.h" + #include <sys/param.h> #include <sys/systm.h> #include <vm/vm.h> @@ -54,6 +56,36 @@ static u_int akva_devmap_idx; static vm_offset_t akva_devmap_vaddr = ARM_VECTORS_HIGH; /* + * Print the contents of the static mapping table using the provided printf-like + * output function (which will be either printf or db_printf). + */ +static void +devmap_dump_table(int (*prfunc)(const char *, ...)) +{ + const struct arm_devmap_entry *pd; + + if (devmap_table == NULL || devmap_table[0].pd_size == 0) { + prfunc("No static device mappings.\n"); + return; + } + + prfunc("Static device mappings:\n"); + for (pd = devmap_table; pd->pd_size != 0; ++pd) { + prfunc(" 0x%08x - 0x%08x mapped at VA 0x%08x\n", + pd->pd_pa, pd->pd_pa + pd->pd_size - 1, pd->pd_va); + } +} + +/* + * Print the contents of the static mapping table. Used for bootverbose. + */ +void +arm_devmap_print_table() +{ + devmap_dump_table(printf); +} + +/* * Return the "last" kva address used by the registered devmap table. It's * actually the lowest address used by the static mappings, i.e., the address of * the first unusable byte of KVA. @@ -266,3 +298,13 @@ pmap_unmapdev(vm_offset_t va, vm_size_t size) kva_free(va, origsize); } +#ifdef DDB +#include <ddb/ddb.h> + +DB_SHOW_COMMAND(devmap, db_show_devmap) +{ + devmap_dump_table(db_printf); +} + +#endif /* DDB */ + diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index bb4caf1..08aa72a 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -379,10 +379,10 @@ cpu_startup(void *dummy) vm_paddr_t size; size = phys_avail[indx + 1] - phys_avail[indx]; - printf("%#08jx - %#08jx, %ju bytes (%ju pages)\n", + printf(" 0x%08jx - 0x%08jx, %ju KBytes (%ju pages)\n", (uintmax_t)phys_avail[indx], (uintmax_t)phys_avail[indx + 1] - 1, - (uintmax_t)size, (uintmax_t)size / PAGE_SIZE); + (uintmax_t)size / 1024, (uintmax_t)size / PAGE_SIZE); } } @@ -392,6 +392,9 @@ cpu_startup(void *dummy) (uintmax_t)ptoa(cnt.v_free_count), (uintmax_t)ptoa(cnt.v_free_count) / 1048576); + if (bootverbose) + arm_devmap_print_table(); + bufinit(); vm_pager_bufferinit(); pcb->un_32.pcb32_und_sp = (u_int)thread0.td_kstack + diff --git a/sys/arm/conf/AC100 b/sys/arm/conf/AC100 index d368bdf..f1141d5 100644 --- a/sys/arm/conf/AC100 +++ b/sys/arm/conf/AC100 @@ -66,6 +66,7 @@ device loop device md # USB +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs #device usb #device ehci diff --git a/sys/arm/conf/ARMADAXP b/sys/arm/conf/ARMADAXP index 2b49459..82041a2 100644 --- a/sys/arm/conf/ARMADAXP +++ b/sys/arm/conf/ARMADAXP @@ -67,6 +67,7 @@ device loop device md # USB +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci diff --git a/sys/arm/conf/ARNDALE b/sys/arm/conf/ARNDALE index f56d4de..06af367 100644 --- a/sys/arm/conf/ARNDALE +++ b/sys/arm/conf/ARNDALE @@ -94,6 +94,7 @@ device md device gpio # USB support +options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG diff --git a/sys/arm/conf/ATMEL b/sys/arm/conf/ATMEL index eb3dd7d..82bc9cc 100644 --- a/sys/arm/conf/ATMEL +++ b/sys/arm/conf/ATMEL @@ -157,6 +157,7 @@ device uart # Multi-uart driver options ALT_BREAK_TO_DEBUGGER # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ohci # OHCI USB interface device usb # USB Bus (required) diff --git a/sys/arm/conf/AVILA b/sys/arm/conf/AVILA index 4246462..7189e31 100644 --- a/sys/arm/conf/AVILA +++ b/sys/arm/conf/AVILA @@ -143,6 +143,7 @@ device ath_ar9160 device ath_ar9280 device usb +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG device ohci device ehci diff --git a/sys/arm/conf/BWCT b/sys/arm/conf/BWCT index 4c6a1f1..314ff90 100644 --- a/sys/arm/conf/BWCT +++ b/sys/arm/conf/BWCT @@ -104,6 +104,7 @@ device spibus device bpf # Berkeley packet filter #options USB_DEBUG +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #device ohci #device usb #device umass # Disks/Mass storage - Requires scbus and da diff --git a/sys/arm/conf/CAMBRIA b/sys/arm/conf/CAMBRIA index 377f45d..6c89dac 100644 --- a/sys/arm/conf/CAMBRIA +++ b/sys/arm/conf/CAMBRIA @@ -136,6 +136,7 @@ options AH_SUPPORT_AR5416 # NB: for 11n descriptor format device ath_hal # NB: 2 USB 2.0 ports standard +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb options USB_EHCI_BIG_ENDIAN_DESC # handle big-endian byte order #options USB_DEBUG diff --git a/sys/arm/conf/CNS11XXNAS b/sys/arm/conf/CNS11XXNAS index e66e2bb..cab0682 100644 --- a/sys/arm/conf/CNS11XXNAS +++ b/sys/arm/conf/CNS11XXNAS @@ -106,6 +106,7 @@ device random # Entropy device #options ARM_USE_SMALL_ALLOC device usb +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG device ohci device ehci diff --git a/sys/arm/conf/COSMIC b/sys/arm/conf/COSMIC index 409895c..27e028c 100644 --- a/sys/arm/conf/COSMIC +++ b/sys/arm/conf/COSMIC @@ -97,6 +97,7 @@ device md device gpio # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG diff --git a/sys/arm/conf/CUBIEBOARD b/sys/arm/conf/CUBIEBOARD index b2b486c..b3fe7c48 100644 --- a/sys/arm/conf/CUBIEBOARD +++ b/sys/arm/conf/CUBIEBOARD @@ -106,6 +106,7 @@ device da # Direct Access (disks) device pass # USB support +options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG diff --git a/sys/arm/conf/CUBIEBOARD2 b/sys/arm/conf/CUBIEBOARD2 index 4316728..1104f55 100644 --- a/sys/arm/conf/CUBIEBOARD2 +++ b/sys/arm/conf/CUBIEBOARD2 @@ -106,6 +106,7 @@ device da # Direct Access (disks) device pass # USB support +options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG diff --git a/sys/arm/conf/DB-78XXX b/sys/arm/conf/DB-78XXX index f3e62f5..00ebdcb 100644 --- a/sys/arm/conf/DB-78XXX +++ b/sys/arm/conf/DB-78XXX @@ -67,6 +67,7 @@ device e1000phy device bpf # USB +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci diff --git a/sys/arm/conf/DB-88F5XXX b/sys/arm/conf/DB-88F5XXX index 50ca24e..704feb7 100644 --- a/sys/arm/conf/DB-88F5XXX +++ b/sys/arm/conf/DB-88F5XXX @@ -73,6 +73,7 @@ device iicbus device ds133x # USB +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci diff --git a/sys/arm/conf/DB-88F6XXX b/sys/arm/conf/DB-88F6XXX index cf508ad..f446b24 100644 --- a/sys/arm/conf/DB-88F6XXX +++ b/sys/arm/conf/DB-88F6XXX @@ -71,6 +71,7 @@ device crypto device cryptodev # USB +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci diff --git a/sys/arm/conf/DIGI-CCWMX53 b/sys/arm/conf/DIGI-CCWMX53 index 8a44844..aa76903 100644 --- a/sys/arm/conf/DIGI-CCWMX53 +++ b/sys/arm/conf/DIGI-CCWMX53 @@ -134,6 +134,7 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ehci # OHCI USB interface device usb # USB Bus (required) diff --git a/sys/arm/conf/EA3250 b/sys/arm/conf/EA3250 index 89d9fa4..7b65435 100644 --- a/sys/arm/conf/EA3250 +++ b/sys/arm/conf/EA3250 @@ -65,6 +65,7 @@ device bpf device lpe # USB +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG device usb device ohci diff --git a/sys/arm/conf/EB9200 b/sys/arm/conf/EB9200 index 0570699..724910d 100644 --- a/sys/arm/conf/EB9200 +++ b/sys/arm/conf/EB9200 @@ -92,6 +92,7 @@ device icee device bpf # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ohci # OHCI localbus->USB interface device usb # USB Bus (required) diff --git a/sys/arm/conf/EFIKA_MX b/sys/arm/conf/EFIKA_MX index fdfcb81..d0b8cdd 100644 --- a/sys/arm/conf/EFIKA_MX +++ b/sys/arm/conf/EFIKA_MX @@ -130,6 +130,7 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs device ehci # OHCI USB interface device usb # USB Bus (required) diff --git a/sys/arm/conf/ETHERNUT5 b/sys/arm/conf/ETHERNUT5 index ef52bc6..0c76a59 100644 --- a/sys/arm/conf/ETHERNUT5 +++ b/sys/arm/conf/ETHERNUT5 @@ -149,6 +149,7 @@ device uart # Multi-uart driver options ALT_BREAK_TO_DEBUGGER # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs device ohci # OHCI USB interface device usb # USB Bus (required) diff --git a/sys/arm/conf/HL200 b/sys/arm/conf/HL200 index 415cbc9..43760d6 100644 --- a/sys/arm/conf/HL200 +++ b/sys/arm/conf/HL200 @@ -94,6 +94,7 @@ device icee device bpf # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ohci # OHCI localbus->USB interface device usb # USB Bus (required) diff --git a/sys/arm/conf/HL201 b/sys/arm/conf/HL201 index 1294f1a..a02d3df 100644 --- a/sys/arm/conf/HL201 +++ b/sys/arm/conf/HL201 @@ -96,6 +96,7 @@ device icee device bpf # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #device ohci # OHCI localbus->USB interface device usb # USB Bus (required) #device udbp # USB Double Bulk Pipe devices diff --git a/sys/arm/conf/IMX53-QSB b/sys/arm/conf/IMX53-QSB index ab226e8..cbe17e0 100644 --- a/sys/arm/conf/IMX53-QSB +++ b/sys/arm/conf/IMX53-QSB @@ -133,6 +133,7 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs device ehci # OHCI USB interface device usb # USB Bus (required) diff --git a/sys/arm/conf/KB920X b/sys/arm/conf/KB920X index 7cf56d8..0cdf9c3 100644 --- a/sys/arm/conf/KB920X +++ b/sys/arm/conf/KB920X @@ -95,6 +95,7 @@ device icee device bpf # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device ohci # OHCI localbus->USB interface device usb # USB Bus (required) diff --git a/sys/arm/conf/LN2410SBC b/sys/arm/conf/LN2410SBC index 8d2a585..ce02d46 100644 --- a/sys/arm/conf/LN2410SBC +++ b/sys/arm/conf/LN2410SBC @@ -77,6 +77,7 @@ options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed device md +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ohci diff --git a/sys/arm/conf/NSLU b/sys/arm/conf/NSLU index 0980e4d..e9b4e28 100644 --- a/sys/arm/conf/NSLU +++ b/sys/arm/conf/NSLU @@ -109,6 +109,7 @@ device random # Entropy device #options ARM_USE_SMALL_ALLOC device usb +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG device ohci device ehci diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD index 0ebcf52..3c61329 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -112,6 +112,7 @@ device md device random # Entropy device # USB support +options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG diff --git a/sys/arm/conf/QILA9G20 b/sys/arm/conf/QILA9G20 index 50d9a37..b399fcd 100644 --- a/sys/arm/conf/QILA9G20 +++ b/sys/arm/conf/QILA9G20 @@ -119,6 +119,7 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device ohci # OHCI localbus->USB interface device usb # USB Bus (required) device umass # Disks/Mass storage - Requires scbus and da diff --git a/sys/arm/conf/RADXA b/sys/arm/conf/RADXA index d62f155..0396c2f 100644 --- a/sys/arm/conf/RADXA +++ b/sys/arm/conf/RADXA @@ -93,6 +93,7 @@ device da # Direct Access (disks) device pass # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG diff --git a/sys/arm/conf/RPI-B b/sys/arm/conf/RPI-B index 5fe031b..9dce858 100644 --- a/sys/arm/conf/RPI-B +++ b/sys/arm/conf/RPI-B @@ -93,6 +93,7 @@ device md device random # Entropy device # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb options USB_DEBUG device dwcotg #DWC OTG controller diff --git a/sys/arm/conf/SAM9260EK b/sys/arm/conf/SAM9260EK index 08b308d..12b5c8a 100644 --- a/sys/arm/conf/SAM9260EK +++ b/sys/arm/conf/SAM9260EK @@ -157,6 +157,7 @@ device uart # Multi-uart driver options ALT_BREAK_TO_DEBUGGER # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #options USB_DEBUG # enable debug msgs device ohci # OHCI USB interface device usb # USB Bus (required) diff --git a/sys/arm/conf/SAM9G20EK b/sys/arm/conf/SAM9G20EK index e173f01..9a3921d 100644 --- a/sys/arm/conf/SAM9G20EK +++ b/sys/arm/conf/SAM9G20EK @@ -119,6 +119,7 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device ohci # OHCI localbus->USB interface device usb # USB Bus (required) device umass # Disks/Mass storage - Requires scbus and da diff --git a/sys/arm/conf/SAM9X25EK b/sys/arm/conf/SAM9X25EK index 6cdeac6..a9bf42c 100644 --- a/sys/arm/conf/SAM9X25EK +++ b/sys/arm/conf/SAM9X25EK @@ -121,6 +121,7 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. #device ohci # OHCI localbus->USB interface #device usb # USB Bus (required) #device umass # Disks/Mass storage - Requires scbus and da diff --git a/sys/arm/conf/SHEEVAPLUG b/sys/arm/conf/SHEEVAPLUG index c6bd901..7fe0b11 100644 --- a/sys/arm/conf/SHEEVAPLUG +++ b/sys/arm/conf/SHEEVAPLUG @@ -65,6 +65,7 @@ device crypto device cryptodev # USB +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. options USB_DEBUG # enable debug msgs device usb device ehci diff --git a/sys/arm/conf/SN9G45 b/sys/arm/conf/SN9G45 index 123136b..41338dd 100644 --- a/sys/arm/conf/SN9G45 +++ b/sys/arm/conf/SN9G45 @@ -97,6 +97,7 @@ device cd # CD device pass # Passthrough device (direct SCSI access) # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device ohci # OHCI localbus->USB interface device usb # USB Bus (required) device umass # Disks/Mass storage - Requires scbus and da diff --git a/sys/arm/conf/TS7800 b/sys/arm/conf/TS7800 index 79e9dba..d9b614f 100644 --- a/sys/arm/conf/TS7800 +++ b/sys/arm/conf/TS7800 @@ -61,6 +61,7 @@ device bpf options HZ=1000 # USB +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb device ehci device umass diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD index 464850a..05ea07b 100644 --- a/sys/arm/conf/ZEDBOARD +++ b/sys/arm/conf/ZEDBOARD @@ -81,6 +81,7 @@ device sdhci # generic sdhci device bpf # Berkeley packet filter # USB support +options USB_HOST_ALIGN=32 # Align usb buffers to cache line size. device usb options USB_DEBUG #options USB_REQ_DEBUG diff --git a/sys/arm/include/devmap.h b/sys/arm/include/devmap.h index 028f40d..e205d9b 100644 --- a/sys/arm/include/devmap.h +++ b/sys/arm/include/devmap.h @@ -87,4 +87,7 @@ void arm_devmap_bootstrap(vm_offset_t _l1pt, void * arm_devmap_ptov(vm_paddr_t _pa, vm_size_t _sz); vm_paddr_t arm_devmap_vtop(void * _va, vm_size_t _sz); +/* Print the static mapping table; used for bootverbose output. */ +void arm_devmap_print_table(void); + #endif diff --git a/sys/boot/fdt/dts/cubieboard.dts b/sys/boot/fdt/dts/cubieboard.dts index 181d5d4..81bce0c 100644 --- a/sys/boot/fdt/dts/cubieboard.dts +++ b/sys/boot/fdt/dts/cubieboard.dts @@ -38,7 +38,7 @@ memory { device_type = "memory"; - reg = < 0x40000000 0x20000000 >; /* 512MB RAM */ + reg = < 0x40000000 0x40000000 >; /* 1GB RAM */ }; aliases { diff --git a/sys/boot/fdt/dts/cubieboard2.dts b/sys/boot/fdt/dts/cubieboard2.dts index 0600ced..324ca26 100644 --- a/sys/boot/fdt/dts/cubieboard2.dts +++ b/sys/boot/fdt/dts/cubieboard2.dts @@ -38,7 +38,7 @@ memory { device_type = "memory"; - reg = < 0x40000000 0x20000000 >; /* 512MB RAM */ + reg = < 0x40000000 0x40000000 >; /* 1GB RAM */ }; aliases { @@ -61,7 +61,7 @@ #interrupt-cells = <1>; }; - cpu-cfg@01c20000 { + cpu-cfg@01c25c00 { compatible = "allwinner,sun7i-cpu-cfg"; #address-cells = <1>; #size-cells = <1>; |
