summaryrefslogtreecommitdiff
path: root/dev
AgeCommit message (Collapse)Author
2004-06-04MergeAli Saidi
dev/tsunami_pchip.cc: SCCS merged --HG-- extra : convert_revision : 064e3bab82aacf813d1f049d72429fd990608044
2004-06-04Updated copyright on Tsunami and kern/linux files.Ali Saidi
dev/baddev.cc: dev/baddev.hh: dev/ide_ctrl.cc: dev/ide_ctrl.hh: dev/ide_disk.cc: dev/ide_disk.hh: dev/ns_gige.cc: dev/ns_gige.hh: dev/pciconfigall.cc: dev/pciconfigall.hh: dev/pcidev.cc: dev/pcidev.hh: dev/pcireg.h: dev/platform.cc: dev/platform.hh: dev/tsunami.cc: dev/tsunami.hh: dev/tsunami_cchip.cc: dev/tsunami_cchip.hh: dev/tsunami_io.cc: dev/tsunami_io.hh: dev/tsunami_pchip.cc: dev/tsunami_pchip.hh: kern/linux/linux.hh: kern/linux/linux_syscalls.cc: kern/linux/linux_syscalls.hh: kern/linux/linux_system.cc: kern/linux/linux_system.hh: Updated copyright dev/tsunamireg.h: Updated copyright and fixed a ULL --HG-- extra : convert_revision : 4800bd227c7064044ee98169d6a91f74c791956f
2004-06-03Fixes in translation in PCI to DMA address to fix boot problems withAndrew Schultz
Linux 2.6 with DMA support dev/ide_disk.cc: Add debug infomation for DMA transfers and fix handling of PRD pointer values dev/ide_disk.hh: Reduce buffer (MAX_DMA) size to 64K dev/tsunami_pchip.cc: dev/tsunami_pchip.hh: Add handling of PCTL register and also fix the translate from PCI to DMA addresses which was incorrect --HG-- extra : convert_revision : 562f55fa1c7099ad0f5a23f59dec2c8ec7601d43
2004-06-01Removed dynamic cast to get interrupt frequency and replaced with aAli Saidi
virtual function in alphaaccess.cc dev/alpha_console.cc: dev/alpha_console.hh: dev/platform.hh: dev/tsunami.cc: dev/tsunami.hh: dev/tsunami_io.hh: Removed dynamic cast to get interrupt frequency and replaced with a virtual function --HG-- extra : convert_revision : 01f514a33d8f76c6527ab25a713d5c86f9fd646e
2004-06-01Merge zizzer:/bk/linuxAndrew Schultz
into zower.eecs.umich.edu:/z/alschult/DiskModel/linux --HG-- extra : convert_revision : 44678cd6aa2fa9e381d5d719d227013f5eb2a45c
2004-06-01Fixes to the state machine to properly support software reset and to fixAndrew Schultz
PIO writes. This was mainly related to not shadowing the status register properly, and also not setting some of the status bits expected by the operating system for the PIO write protocol. --HG-- extra : convert_revision : fcdfd588be6e4f237aa6057889f0b3bdf4ea7631
2004-05-31Added and cleaned up some commentsAli Saidi
dev/tsunami_cchip.hh: clean up some comments kern/linux/linux_syscalls.cc: Cleaned up spacing of syscall numbers kern/linux/linux_system.hh: Added doxygen comments --HG-- extra : convert_revision : 23ecdaa92a208458dd5c5d3c68ac9012ce2690da
2004-05-30Cleaned up and commented code. I think we are ready to merge with head.Ali Saidi
dev/baddev.hh: dev/pcidev.hh: dev/tsunami.hh: dev/tsunami_cchip.hh: dev/tsunami_io.hh: dev/tsunami_pchip.hh: Added doxygen comments dev/pciconfigall.hh: Added doxygen comments. Made the hlist of devices private and provided members to modify the data. dev/pcidev.cc: updated for change in pciconfigall dev/tsunami_pchip.cc: Deleted commented out code we don't need kern/linux/linux_syscalls.cc: Simplified the number -> name conversion. kern/linux/linux_syscalls.hh: Removed StandardNumber and replaced with Number. kern/linux/linux_system.cc: kern/linux/linux_system.hh: LinuxSkipIdeDelay50msEvent was simply the same as the SkipFunc event, so I removed it. Same with with LinuxSkipFuncEvent. --HG-- extra : convert_revision : 1508c335f87d90373f5772f3a0407ea13e858d7e
2004-05-26removal of bootloader from config file, mergedAli Saidi
--HG-- extra : convert_revision : 9168d939d4e707b00be6609368b592a0829a7226
2004-05-26Fixed serial support in 2.6 (too much work for...)Ali Saidi
Removed bootloader and just wrote command line into linux kernel base/inifile.cc: the forked process should not return, it should exit. dev/tsunami_uart.cc: dev/tsunami_uart.hh: The serial port in reality has some delay and linux expects it. This schedules an interrupt 300 cycles after the transmit instead of immediately kern/linux/linux_system.cc: kern/linux/linux_system.hh: removed boot loader and stuck boot command line in the kernel manually --HG-- extra : convert_revision : 68aa54f8ca4e8391789f7a4c1ae227e6f8b94e13
2004-05-26this now pings in single-user mode, so it should ping in other modes fine as ↵Lisa Hsu
well. dev/ns_gige.cc: remove some useless DPRINTF's and add some useful ones. fix the missing RXDESC interrupt. --HG-- extra : convert_revision : 17142480db1eaafa24f88640f8c7b8e7e077de1a
2004-05-25Merge zizzer:/bk/linuxAndrew Schultz
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux --HG-- extra : convert_revision : 67753db3defad3c44640df09a9465670f1667800
2004-05-25Varied fixes to get linux running. Allow for shutdown on linux.Andrew Schultz
dev/ide_disk.cc: Fix to PIO writes and also add command needed for shutdown dev/pcidev.cc: Change the panic on write to read-only registers to a debug print. The kernel tries to write back over all of the PCI registers to restore the saved SRM state, so we need to let it do this without panicing. sim/system.cc: Add back increment of number of running systems to allow trap of halt work correctly. --HG-- extra : convert_revision : 84aba4effbec14545f3610c19a8e321d7e7f7cf2
2004-05-25Changed name of lisa's device to NSgigE instead of Etherdev so itAli Saidi
doesn't conflict with the old ethernet driver name. Added config file to try to boot Tru64 with Tsunami Cleaned up kern/linux a bit more and fixed bug where we were using Tru64 system calls dev/ns_gige.cc: dev/ns_gige.hh: dev/tsunami.hh: Changed name of lisa's device to NSgigE instead of Etherdev so it doesn't conflict with the old ethernet driver name. kern/linux/linux_syscalls.hh: the Syscalls still used the Tru64 calls, oops.. fixed. --HG-- extra : convert_revision : dedd20686cc367ed37f31920f753566afbc69045
2004-05-24Fix to the PIO read state machine (write still needs fixes)Andrew Schultz
--HG-- extra : convert_revision : 2e8afcfe3448d921b26ebb76e65c0b237339e9b1
2004-05-21rename namespace Statistics to StatsNathan Binkert
--HG-- extra : convert_revision : 28f1703f8d7d8cf33fb952ae450f66bdba860fb7
2004-05-19Remove the uncacheable bit 39 check (needs to be merged in with head treeAndrew Schultz
if Tru64 is to continue to be supported on Turbolaser) and fixed translation of physical addresses by clearing PA<42:35> when the real uncachable bit (43) is set arch/alpha/ev5.hh: Change to support 256 ASNs and seperate VA_SPACE checks for EV5 and EV6 also add support proper translation of uncacheable physical addresses dev/ide_ctrl.cc: Fix to work with real address translation --HG-- extra : convert_revision : aa3d1c284b8271d4763a8da2509c91bbcf83189a
2004-05-18fix the indefinite interrupting of the ethernet device.Lisa Hsu
dev/ns_gige.cc: clear the device interrupts dev/ns_gige_reg.h: Add a new mask --HG-- extra : convert_revision : ce3617315677cbee577ed8893821a8abc5a1a10d
2004-05-14manual merge of linux_system and makefileAli Saidi
kern/linux/linux_system.cc: merged --HG-- extra : convert_revision : 81ef6a46f76968985f44c72f296a79ea77e73d12
2004-05-14Linux boots... various fixes to make console work correctlyAli Saidi
dev/console.cc: commented out code that checks if an interrupt is happening before issuing one because they can get lost when linux boots dev/console.hh: added a setPlatform function to set the platform to interrupt dev/platform.hh: dev/tsunami.cc: dev/tsunami.hh: Added virtual functions to post console interrupts dev/tsunami_io.cc: allowed a 64bit read of the PIC since we can't do a physical byte read dev/tsunami_uart.cc: moved TsunamiUart to PioDevice various little fixes to make linux work dev/tsunami_uart.hh: Made Tsunami_Uart a PIO device dev/tsunamireg.h: added some UART defines and used the ULL macros kern/linux/linux_system.cc: commented out waiting for gdb --HG-- extra : convert_revision : 8cfd0700f3812ab349a6d7f132f85f4f421c5c5e
2004-05-12Fixes to DMA writing (still unverified) and added serialize/unserializeAndrew Schultz
dev/ide_ctrl.cc: Added serialize/unserialize functions and move some inlined functions to regular functions dev/ide_ctrl.hh: Change inlined functions to regular functions dev/ide_disk.cc: Changes to dmaWrite and also add serialize/unserialize functions dev/ide_disk.hh: Support for serializing/unserializing --HG-- extra : convert_revision : 40e016dc7f6637b033fe33409338437c985a05f4
2004-05-11Merge zizzer.eecs.umich.edu:/bk/linuxLisa Hsu
into shizzle.(none):/home/hsul/work/linux --HG-- extra : convert_revision : 729b97489f990bffd23add762582b73d2eb2137d
2004-05-11Merge zizzer:/bk/linuxAndrew Schultz
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux --HG-- extra : convert_revision : 879834af81a124b1f1b546f1591713a8c36913e4
2004-05-11Changes to fix bad DMA handling by disk when using scatter gather pageAndrew Schultz
mappings (writes still unverified, and read could probably be looked over a bit more too) dev/ide_disk.cc: dev/ide_disk.hh: Major changes to fix bogus handling of dma transfers. The read seems to work pretty well, but the write is unverfied until we can get a disk image that actually tries to write. dev/tsunami_pchip.cc: Change mask to properly mask 13 bits not 12 --HG-- extra : convert_revision : 08fe9bc32970e449cd045de479553a96a4e389d6
2004-05-11first pass at merging m5 with linuxLisa Hsu
--HG-- extra : convert_revision : dfe23349b80ae3b34d3cb95c5734e01ef62f700e
2004-05-09Added ULL for 64bit intsAli Saidi
Added function to skip determine_cpu_caches(). We may have to update this in the future: see note below. arch/alpha/alpha_memory.cc: dev/ide_ctrl.cc: dev/tsunamireg.h: Added ULL for 64bit ints kern/linux/linux_system.cc: Added a function to skip determine_cpu_caches, right now it is only used for printing in proc, however in the future we may either want to implement the SC_CTL IPR register or manually set alpha_l1i_cacheshape, alpha_l1d_cacheshape, alpha_l2_cacheshape, alpha_l3_cacheshape to ((size << 10) | (linesize>>1)<<4 | way) kern/linux/linux_system.hh: added event to skip determine_cpu_caches() --HG-- extra : convert_revision : 1065f2091bbe6832b730af490f5b4672c2afedce
2004-05-06Whole mess'o'changes.. see individual filesAndrew Schultz
arch/alpha/vtophys.cc: Removed buggy code that tries to fix PAL addresses (may cause problems while trying to debug in PAL code, but that should do this fix outside of vtophys) base/loader/symtab.cc: base/loader/symtab.hh: cpu/exetrace.cc: Changed InstExec traces to always print a symbol name dev/ide_ctrl.cc: dev/ide_disk.cc: Tabs dev/ide_disk.hh: Change buffer size dev/tsunami_pchip.cc: Fix translatePciToDma to support scatter gather mapping kern/linux/linux_system.cc: Force simulator to wait until remote debugger attaches (should be removed or turned on/off with a flag) --HG-- extra : convert_revision : 1d08aebe3f448c87a963dd613de3e2e0cff0d48d
2004-05-03Merge zizzer:/bk/linuxAndrew Schultz
into zower.eecs.umich.edu:/.automount/zizzer/z/alschult/DiskModel/linux --HG-- extra : convert_revision : 8eca0fba9d96bffea7a24bce9b14f0284bd58c83
2004-05-03Checkin of latest IDE and some separation between platforms (Tsunami andAndrew Schultz
Turbolaser) base/range.hh: Change semantics of range to be inclusive of the end value, may need to check other users of range to make sure they are semantically correct. This was needed for access of last byte in range of address on IDE and makes sense for case of range from 0 to all f dev/ide_ctrl.cc: dev/ide_ctrl.hh: dev/ide_disk.cc: dev/ide_disk.hh: Whole mess of changes.. at current state simulator will boot and read partition table and then have a bunch of errors and panic dev/pciconfigall.cc: dev/pciconfigall.hh: dev/platform.hh: Changes to work with platform separation dev/tsunami.cc: dev/tsunami.hh: Change to work with platform separation --HG-- extra : convert_revision : e1de22b54df7fdcf391efc2a8555ada93f46beab
2004-04-21just comment ns_gige.cc a little moreLisa Hsu
dev/ns_gige.cc: add some comments --HG-- extra : convert_revision : 96ae82f1f48b8e2e2ba8a6a0e2f37d8f992d15b3
2004-04-21This is where I'm at for Linux Ethernet before I head to Mexico.Lisa Hsu
base/range.hh: andrew thought this might be a bug. dev/etherpkt.cc: don't need std:: since there is a using directive dev/ns_gige.cc: update to new PIO and PCI system dev/ns_gige.hh: update to deal with new PIO and PCI setup dev/ns_gige_reg.h: Add some new #defines that I ended up needing dev/pcidev.cc: some changes to the debugging printfs of pci device --HG-- extra : convert_revision : 955ba8e8e1c418cfe1c6549dc3451ea091541556
2004-04-06Beta version of Python configuration tool. Generates .ini files fromSteve Reinhardt
Python script description. arch/alpha/alpha_memory.cc: dev/io_device.cc: Add DEFINE_SIM_OBJECT_CLASS_NAME for intermediate SimObjects. test/paramtest.cc: Fix stupid spelling. --HG-- extra : convert_revision : dc020208cb6507c1afb1ed771a7218daba678e09
2004-04-02Basic cleanup pass to get rid of a few things that made the PythonSteve Reinhardt
configuration unnecessarily awkward. Biggest changes are: - External and internal object names now match in all cases. The macros still allow them to be different; the only reason I didn't get rid of that is that the macros themselves should be going away soon. In the few conflicting cases, I sometimes renamed the C++ object and sometimes renamed the config object. The latter sets of substitions are: s/BaseBus/Bus/; s/MemoryObject/FunctionalMemory/; s/MemoryControl/MemoryController/; s/FUPool/FuncUnitPool/; - SamplingCPU is temporarily broken... we need to change the model of how this works in the .ini file. Having it as a CPU proxy is really awkward. arch/alpha/alpha_memory.cc: arch/alpha/alpha_memory.hh: cpu/simple_cpu/simple_cpu.cc: sim/process.cc: Rename objects to match config name. cpu/base_cpu.cc: Uncomment SimObject define since SamplingCPU no longer does this for us. dev/ethertap.cc: Use unsigned instead of uint16_t for params. kern/tru64/tru64_system.cc: Use unsigned instead of uint64_t for init_param param. test/paramtest.cc: Fix old SimObjectParam. --HG-- extra : convert_revision : 378ebbc6a71ad0694501d09979a44d111a59e8dc
2004-03-23Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linuxLisa Hsu
--HG-- extra : convert_revision : 69440981a018ce8b7c1c8a73404da0a39faa3ac3
2004-03-23Add initial support for IDEAndrew Schultz
--HG-- extra : convert_revision : e07dc6c87b0b692d428b541d4032fcf82996ef15
2004-03-22Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linuxLisa Hsu
--HG-- extra : convert_revision : 7af5650ceae277ce838e778bba1fba86285d6dca
2004-03-22AutomergeAndrew Schultz
--HG-- extra : convert_revision : d79abea2623f31a27735640363dfbf655c226b62
2004-03-22Change member variable names to lower caseAndrew Schultz
--HG-- extra : convert_revision : 390c30b8313e7acbd7d77b106716f7147d181111
2004-03-22Changed to inherit from DmaDevice to avoid multiple inheritance (nowAndrew Schultz
assumes that all PCI devices are DmaDevices, and if not, they can just ignore the DMA stuff) --HG-- extra : convert_revision : aa58b658370696674ca4c32b265bc0400e5dda5a
2004-03-22Merge zizzer:/bk/linux into zower.eecs.umich.edu:/z/hsul/work/bk/linuxLisa Hsu
--HG-- extra : convert_revision : b4e2fc55ec9cd0caa7cdf02de8a61c66e8b35c67
2004-03-22forgot to check this in earlier - no confusion between types and member names!Lisa Hsu
dev/pcidev.cc: member variables should begin with lowercase so they don't get confused with types. dev/pcidev.hh: member variables must begin with lowercase so they don't get confused with types. --HG-- extra : convert_revision : f083baa60d0fbf64d858d684ff70ee06e7b7765d
2004-03-19Make it so that alpha_console can read the frequency from the correctRon Dreslinski
sim object(depends on which platform tsunami/tlaser is being used) dev/alpha_console.cc: Use dynamice casting once during build to get at the proper device to calculate the frequency. It is either a tsunami_IO or a tlaser_clock depending on platform (tsunami/tlaser). If the simobject is not of either of those types then panic dev/alpha_console.hh: Pass in a SimObject * that is to either a tlaser_clock or a tsunami_IO sim/sim_object.cc: Make it so that you can have a SimObjectParam of type SimObject: example: SimObjectParam<SimObject *> so; --HG-- extra : convert_revision : 08239ef23762b8ea11311630b73fe885d939402e
2004-03-12merge etherpkt and makefileLisa Hsu
--HG-- extra : convert_revision : 8f416468c7c239a4de6f8df2d632832921c1ced8
2004-03-12first pass at ns_ethernet device. more will come later as i merge in nate's ↵Lisa Hsu
new ether infrastructure. dev/etherpkt.hh: add some stuff for support of the NS ethernet device. --HG-- extra : convert_revision : 51f6508463b6394055e3428a42b7de490a9ae6c1
2004-03-11merge from head of m5. note: i did not bother to merge the PIO stuff with ↵Lisa Hsu
scsi since we're not going that route anymore anyway. esp because it was giving me an error i couldn't seem to fix. dev/alpha_console.cc: missed this >>>> after i merged kern/linux/linux_system.cc: get rid of FS_MEASURES and change FnEvent to LinuxFnEvent kern/linux/linux_system.hh: get rid of FS_MEASURE --HG-- extra : convert_revision : 210f46573bba0c772a224ce110af9a9230fabf6a
2004-03-11merge with m5 headLisa Hsu
--HG-- extra : convert_revision : c90339248d1ee74df1c6b90a77ec9ea41f646311
2004-03-11It was annoying me that there was PCIConfigAll and PciDev and PciConfigData. ↵Lisa Hsu
so for consistency I changed it. dev/pciconfigall.cc: dev/pciconfigall.hh: dev/pcidev.cc: dev/pcidev.hh: dev/tsunami.hh: change PCIConfigAll to PciConfigAll --HG-- extra : convert_revision : d2fa3f59b906c870fd9d46cfa94728c7587e3652
2004-03-05Add support for a propagation delay on the link. The electricalNathan Binkert
delay is more or less folded into the packet time, but an additional delay is possible representing crossing a long haul link, or some switches, etc. --HG-- extra : convert_revision : 8fd689c2a7e3051e77f47a4cd5f51c6999d92c8f
2004-02-29Fix dumping to work on the opteron. struct timeval canNathan Binkert
vary in size, so we're explicit about the fields. --HG-- extra : convert_revision : e5264849dafb878676b2bfd3a6e6f95f6f94ea48
2004-02-29Add support for multiple address ranges in memory interfaces.Erik Hallnor
dev/alpha_console.cc: setAddrRange -> addAddrRange --HG-- extra : convert_revision : 9dc853b80bea443b54a130ca4c110a68077cb336