summaryrefslogtreecommitdiffstats
path: root/hw
Commit message (Collapse)AuthorAgeFilesLines
* etrax-dma: Remove bogus if statementEdgar E. Iglesias2011-10-031-6/+4
| | | | | Reported-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
* ESP: convert to trace frameworkBlue Swirl2011-10-011-40/+30
| | | | Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* PPC: Drop initial ESCC mappingAlexander Graf2011-10-012-2/+2
| | | | | | | | | | | We are mapping ESCC to a static (incorrect) address on machine init. This overlaps with our vram, rendering the screen barely usable. Since openBIOS is clever enough to map ESCC to where it needs to be, we can just drop that invalid map and everyone's happy. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* mips_fulong2e: Reorder ISA bus and i8259 creationJan Kiszka2011-10-011-4/+4
| | | | | | | | Missed during memory region conversion: The i8259 now depends on the ISA bus being created first. Reorder the initialization. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* Merge remote-tracking branch 'aneesh/for-upstream-5' into stagingAnthony Liguori2011-09-2910-516/+1670
|\
| * hw/9pfs: Add handle based fs driverAneesh Kumar K.V2011-09-221-0/+611
| | | | | | | | Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
| * hw/9pfs: Implement TFLUSH operationAneesh Kumar K.V2011-09-228-265/+439
| | | | | | | | Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
| * hw/9pfs: Avoid unnecessary get_fid in v9fs_clunkAneesh Kumar K.V2011-09-221-10/+10
| | | | | | | | Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
| * hw/9pfs: Add fs driver specific details to fscontextAneesh Kumar K.V2011-09-228-52/+99
| | | | | | | | | | | | | | | | Add a new context flag PATHNAME_FSCONTEXT and indicate whether the fs driver track fid using path names. Also add a private pointer that help us to track fs driver specific values in there Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
| * hw/9pfs: Add init callback to fs driverAneesh Kumar K.V2011-09-222-2/+12
| | | | | | | | | | | | This call back can be used to do fs driver specific initialization. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
| * hw/9pfs: Move fid pathname tracking to seperate data type.Aneesh Kumar K.V2011-09-228-281/+520
| | | | | | | | | | | | | | This enables us to add handles to track fids later. The V9fsPath added is similar to V9fsString except that the size include the NULL byte also. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
| * hw/9pfs: Use read-write lock for protecting fid path.Aneesh Kumar K.V2011-09-228-87/+155
| | | | | | | | | | | | | | On rename we take the write lock and this ensure path doesn't change as we operate on them. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
| * hw/9pfs: Make v9fs_string* functions non-staticAneesh Kumar K.V2011-09-222-5/+10
| | | | | | | | | | | | We will use them later in other files Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
* | PPC: use memory API to construct the PCI holeBlue Swirl2011-09-274-7/+26
| | | | | | | | | | | | | | Avoid vga.chain4 mapping by constructing a PCI hole for upper 2G of the PCI space. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
* | Merge remote-tracking branch 'qemu-kvm-tmp/memory/urgent' into stagingAnthony Liguori2011-09-261-1/+1
|\ \
| * | ppc_prep: fix pci config space initializationAvi Kivity2011-09-251-1/+1
| | | | | | | | | | | | | | | | | | Use data_mem for the data mmio region, not conf_mem. Signed-off-by: Avi Kivity <avi@redhat.com>
* | | Merge remote-tracking branch 'qemu-kvm-tmp/memory/batch' into stagingAnthony Liguori2011-09-2620-122/+232
|\ \ \
| * | | fdc: Convert isabus_fdc_init1 to MemoryRegionRichard Henderson2011-09-251-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires some amount of hoop-jumping, so that we don't inadvertently claim port 0x3f6, which is used by ISA IDE. The sysbus initialization path is as yet unconverted. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | serial: Convert serial_isa_initfn to MemoryRegionRichard Henderson2011-09-251-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The serial_mm_init path is as yet unconverted. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | pckbd: Convert to MemoryRegionRichard Henderson2011-09-253-25/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slightly non-obvious with mips_jazz passing in the region structure to populate. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | i8259: Convert to MemoryRegionRichard Henderson2011-09-251-19/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only non-obvious part is pic_poll_read which used "addr1 >> 7" to detect whether one referred to either the master or slave PIC. Instead, test this directly. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | ppc_prep: initialize i8259 after the ISA busAvi Kivity2011-09-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Succeeding i8259 conversion to ISA requires this. Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | mips_r4k: initialize i8259 after the ISA busAvi Kivity2011-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Succeeding i8259 conversion to ISA requires this. Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | mips_jazz: initialize i8259 after the ISA busAvi Kivity2011-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Succeeding i8259 conversion to ISA requires this. Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | mips_malta: move i8259 initialization after piix4 initializationAvi Kivity2011-09-251-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i8259 is an ISA device (or at least, depends on the ISA infrastructure to register its ioport); and the ISA bus is supplied by piix4. Later patches make this dependency explicit. Use qemu_irq_proxy() to stop the cycle by adding an extra layer of indirection. Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | i8254: Convert to MemoryRegionRichard Henderson2011-09-251-3/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | cs4231a: Convert to MemoryRegionRichard Henderson2011-09-251-19/+19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | pc: Re-order pc_init1 to initialize the ISA bus before ISA devicesRichard Henderson2011-09-251-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In particular, the i8259 was being initialized before the ISA bus, leading to a crash. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | isa: add isa_register_ioport()Richard Henderson2011-09-252-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To replace isa_init_ioport and isa_init_ioport_range as the ISA devices are converted to the memory api. [avi: use memory_region_size()] Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | isa: Pass i/o address space to isa_bus_newRichard Henderson2011-09-2510-16/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Not used yet, but at least we're provided with the correct region. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
| * | | pci: add pci_address_space_io()Richard Henderson2011-09-252-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | Returns the I/O address space. Useful for implementing PCI-ISA bridge devices. Signed-off-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com>
* | | Merge remote-tracking branch 'pmaydell/omap-for-upstream' into stagingAnthony Liguori2011-09-265-190/+244
|\ \ \ | |/ / |/| |
| * | hw/omap1: Wire up GPIO clockPeter Maydell2011-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | Wire up the OMAP1 GPIO clock -- this fixes a hw_error() on startup with OMAP1 based machines (sx1, cheetah). Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| * | omap_intc: QdevifyPeter Maydell2011-09-235-163/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the omap_intc devices to qdev. This includes adding a 'revision' property which will be needed for omap3. The bulk of this patch is the replacement of "s->irq[x][y]" with "qdev_get_gpio_in(s->ih[x], y)" now that the interrupt controller exposes its input lines as qdev gpio inputs. The devices are named "omap-intc" and "omap2-intc", following the filename and the OMAP2/3 hardware names, although some internal functions are still named "omap_inth_*". Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| * | omap_intc: Use MemoryRegion APIPeter Maydell2011-09-231-34/+30
| | | | | | | | | | | | | | | | | | Convert omap_intc to use the MemoryRegion API Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* | | adlib: remove write-only variableHervé Poussineau2011-09-231-3/+2
| | | | | | | | | | | | | | | Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | | irq: introduce qemu_irq_proxy()Avi Kivity2011-09-232-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases we have a circular dependency involving irqs - the irq controller depends on a bus, which in turn depends on the irq controller. Add qemu_irq_proxy() which acts as a passthrough, except that the target irq may be set later on. Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Avi Kivity <avi@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | | virtio: Use global memory barrier macrosDavid Gibson2011-09-231-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The virtio code uses wmb() macros in several places, as required by the SMP-aware virtio protocol. However the wmb() macro is locally defined to be a compiler barrier only. This is probably sufficient on x86 due to its strong storage ordering model, but it certainly isn't on other platforms, such as ppc. In any case, qemu already has some globally defined memory barrier macros in qemu-barrier.h. This patch, therefore converts virtio.c to use those barrier macros. The macros in qemu-barrier.h are also wrong (or at least, safe for x86 only) but this way at least there's only one place to fix them. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | | pci-devfn: check that device/slot number is within rangeDonald Dutile2011-09-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to check that guest slot/device number is not > 31 or walk off the devfn table when checking if a devfn is available or not in a guest. before this fix, passing in an addr=abc or addr=34, can crash qemu, sometimes fail gracefully if data past end of devfn table fails the availability test. with this fix, get clean error: Property 'pci-assign.addr' doesn't take value '34' also tested when no addr= param passed for guest (pcicfg) address, and that worked as well. Signed-off-by: Don Dutile <ddutile@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | | isapc: give system address space when pci is disabledHervé Poussineau2011-09-231-1/+1
| | | | | | | | | | | | | | | | | | Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | | cirrus: Unbreak ISA supportJan Kiszka2011-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | Do not try to map against the PCI bar in the ISA version of the device. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | | vga: Unbreak ISA supportJan Kiszka2011-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | We need to initialize legacy_address_space during ISA VGA setup so that the chain-4 alias can be registered properly. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | | pc: Disable HPET for ISA machineJan Kiszka2011-09-231-0/+1
| | | | | | | | | | | | | | | | | | | | | There was no HPET on ISA boxes. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | | pc: Unbreak ROM mapping for ISA machineJan Kiszka2011-09-233-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is based on the original fix by Hervé Poussineau: pc_memory_init actually takes a memory region for mapping BIOS and extension ROMs. That equals the PCI memory region if PCI is available, but must be system memory in the ISA case. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | | e1000: Don't set the Capabilities List bitdann frazier2011-09-231-2/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Originally sent to qemu-kvm list, but I was redirected here] The Capabilities Pointer is NULL, so this bit shouldn't be set. The state of this bit doesn't appear to change any behavior on Linux/Windows versions we've tested, but it does cause Windows' PCI/PCI Express Compliance Test to balk. I happen to have a physical 82540EM controller, and it also sets the Capabilities Bit, but it actually has items on the capabilities list to go with it :) Signed-off-by: dann frazier <dann.frazier@canonical.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
* | hw/omap_gpmc: Modify correct field when writing IRQSTATUS registerPeter Maydell2011-09-231-1/+1
| | | | | | | | | | | | | | | | Writing to IRQSTATUS should affect irqst, not irqen -- error spotted by Andrzej Zaborowski. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
* | hw/omap_gpmc: Add comment about FIFOTHRESHOLDSTATUS bitPeter Maydell2011-09-231-0/+7
|/ | | | | | | | | Promote the remark about why we handle FIFOTHRESHOLDSTATUS the way we do from the commit message of de8af7fe0 to a comment in the code. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Andrzej Zaborowski <andrew.zaborowski@intel.com>
* Merge remote-tracking branch 'kwolf/for-anthony' into stagingAnthony Liguori2011-09-224-3/+76
|\
| * ahci: add port I/O index-data pairDaniel Verkamp2011-09-214-3/+76
| | | | | | | | | | | | | | | | | | | | | | | | Implement an I/O space index-data register pair as defined by the AHCI spec, including the corresponding SATA PCI capability and BAR. This allows real-mode code to access the AHCI registers; real-mode code cannot address the memory-mapped register space because it is beyond the first megabyte. Signed-off-by: Daniel Verkamp <daniel@drv.nu> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
* | Merge remote-tracking branch 'stefanha/trivial-patches' into stagingAnthony Liguori2011-09-222-3/+0
|\ \
OpenPOWER on IntegriCloud