← Back to branch summary

~ubuntu-branches/ubuntu/trusty/qemu/trusty

« back to all changes in this revision

Viewing changes to hw/arm/omap1.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2013-10-22 22:47:07 UTC
  • mfrom: (1.8.3) (10.1.42 sid)
  • Revision ID: package-import@ubuntu.com-20131022224707-1lya34fw3k3f24tv
Tags: 1.6.0+dfsg-2ubuntu1
http://bugs.debian.org/709241
* Merge 1.6.0~rc0+dfsg-2exp from debian experimental.  Remaining changes:
  - debian/control
    * update maintainer
    * remove libiscsi, usb-redir, vde, vnc-jpeg, and libssh2-1-dev
      from build-deps
    * enable rbd
    * add qemu-system and qemu-common B/R to qemu-keymaps
    * add D:udev, R:qemu, R:qemu-common and B:qemu-common to
      qemu-system-common
    * qemu-system-arm, qemu-system-ppc, qemu-system-sparc:
      - add qemu-kvm to Provides
      - add qemu-common, qemu-kvm, kvm to B/R
      - remove openbios-sparc from qemu-system-sparc D
      - drop openbios-ppc and openhackware Depends to Suggests (for now)
    * qemu-system-x86:
      - add qemu-common to Breaks/Replaces.
      - add cpu-checker to Recommends.
    * qemu-user: add B/R:qemu-kvm
    * qemu-kvm:
      - add armhf armel powerpc sparc to Architecture
      - C/R/P: qemu-kvm-spice
    * add qemu-common package
    * drop qemu-slof which is not packaged in ubuntu
  - add qemu-system-common.links for tap ifup/down scripts and OVMF link.
  - qemu-system-x86.links:
    * remove pxe rom links which are in kvm-ipxe
    * add symlink for kvm.1 manpage
  - debian/rules
    * add kvm-spice symlink to qemu-kvm
    * call dh_installmodules for qemu-system-x86
    * update dh_installinit to install upstart script
    * run dh_installman (Closes: #709241) (cherrypicked from 1.5.0+dfsg-2)
  - Add qemu-utils.links for kvm-* symlinks.
  - Add qemu-system-x86.qemu-kvm.upstart and .default
  - Add qemu-system-x86.modprobe to set nesting=1
  - Add qemu-system-common.preinst to add kvm group
  - qemu-system-common.postinst: remove bad group acl if there, then have
    udev relabel /dev/kvm.
  - New linaro patches from qemu-linaro rebasing branch
  - Dropped patches:
    * xen-simplify-xen_enabled.patch
    * sparc-linux-user-fix-missing-symbols-in-.rel-.rela.plt-sections.patch
    * main_loop-do-not-set-nonblocking-if-xen_enabled.patch
    * xen_machine_pv-do-not-create-a-dummy-CPU-in-machine-.patch
    * virtio-rng-fix-crash
  - Kept patches:
    * expose_vms_qemu64cpu.patch - updated
    * linaro arm patches from qemu-linaro rebasing branch
  - New patches:
    * fix-pci-add: change CONFIG variable in ifdef to make sure that
      pci_add is defined.
* Add linaro patches
* Add experimental mach-virt patches for arm virtualization.
* qemu-system-common.install: add debian/tmp/usr/lib to install the
  qemu-bridge-helper

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/arm/omap1.c
264
264
    omap_mpu_timer_reset(s);
265
265
    omap_timer_clk_setup(s);
266
266
 
267
 
    memory_region_init_io(&s->iomem, &omap_mpu_timer_ops, s,
 
267
    memory_region_init_io(&s->iomem, NULL, &omap_mpu_timer_ops, s,
268
268
                          "omap-mpu-timer", 0x100);
269
269
 
270
270
    memory_region_add_subregion(system_memory, base, &s->iomem);
392
392
    omap_wd_timer_reset(s);
393
393
    omap_timer_clk_setup(&s->timer);
394
394
 
395
 
    memory_region_init_io(&s->iomem, &omap_wd_timer_ops, s,
 
395
    memory_region_init_io(&s->iomem, NULL, &omap_wd_timer_ops, s,
396
396
                          "omap-wd-timer", 0x100);
397
397
    memory_region_add_subregion(memory, base, &s->iomem);
398
398
 
498
498
    omap_os_timer_reset(s);
499
499
    omap_timer_clk_setup(&s->timer);
500
500
 
501
 
    memory_region_init_io(&s->iomem, &omap_os_timer_ops, s,
 
501
    memory_region_init_io(&s->iomem, NULL, &omap_os_timer_ops, s,
502
502
                          "omap-os-timer", 0x800);
503
503
    memory_region_add_subregion(memory, base, &s->iomem);
504
504
 
731
731
                hwaddr base,
732
732
                struct omap_mpu_state_s *mpu)
733
733
{
734
 
    memory_region_init_io(&mpu->ulpd_pm_iomem, &omap_ulpd_pm_ops, mpu,
 
734
    memory_region_init_io(&mpu->ulpd_pm_iomem, NULL, &omap_ulpd_pm_ops, mpu,
735
735
                          "omap-ulpd-pm", 0x800);
736
736
    memory_region_add_subregion(system_memory, base, &mpu->ulpd_pm_iomem);
737
737
    omap_ulpd_pm_reset(mpu);
949
949
                hwaddr base,
950
950
                struct omap_mpu_state_s *mpu)
951
951
{
952
 
    memory_region_init_io(&mpu->pin_cfg_iomem, &omap_pin_cfg_ops, mpu,
 
952
    memory_region_init_io(&mpu->pin_cfg_iomem, NULL, &omap_pin_cfg_ops, mpu,
953
953
                          "omap-pin-cfg", 0x800);
954
954
    memory_region_add_subregion(system_memory, base, &mpu->pin_cfg_iomem);
955
955
    omap_pin_cfg_reset(mpu);
1021
1021
 
1022
1022
static void omap_id_init(MemoryRegion *memory, struct omap_mpu_state_s *mpu)
1023
1023
{
1024
 
    memory_region_init_io(&mpu->id_iomem, &omap_id_ops, mpu,
 
1024
    memory_region_init_io(&mpu->id_iomem, NULL, &omap_id_ops, mpu,
1025
1025
                          "omap-id", 0x100000000ULL);
1026
 
    memory_region_init_alias(&mpu->id_iomem_e18, "omap-id-e18", &mpu->id_iomem,
 
1026
    memory_region_init_alias(&mpu->id_iomem_e18, NULL, "omap-id-e18", &mpu->id_iomem,
1027
1027
                             0xfffe1800, 0x800);
1028
1028
    memory_region_add_subregion(memory, 0xfffe1800, &mpu->id_iomem_e18);
1029
 
    memory_region_init_alias(&mpu->id_iomem_ed4, "omap-id-ed4", &mpu->id_iomem,
 
1029
    memory_region_init_alias(&mpu->id_iomem_ed4, NULL, "omap-id-ed4", &mpu->id_iomem,
1030
1030
                             0xfffed400, 0x100);
1031
1031
    memory_region_add_subregion(memory, 0xfffed400, &mpu->id_iomem_ed4);
1032
1032
    if (!cpu_is_omap15xx(mpu)) {
1033
 
        memory_region_init_alias(&mpu->id_iomem_ed4, "omap-id-e20",
 
1033
        memory_region_init_alias(&mpu->id_iomem_ed4, NULL, "omap-id-e20",
1034
1034
                                 &mpu->id_iomem, 0xfffe2000, 0x800);
1035
1035
        memory_region_add_subregion(memory, 0xfffe2000, &mpu->id_iomem_e20);
1036
1036
    }
1115
1115
static void omap_mpui_init(MemoryRegion *memory, hwaddr base,
1116
1116
                struct omap_mpu_state_s *mpu)
1117
1117
{
1118
 
    memory_region_init_io(&mpu->mpui_iomem, &omap_mpui_ops, mpu,
 
1118
    memory_region_init_io(&mpu->mpui_iomem, NULL, &omap_mpui_ops, mpu,
1119
1119
                          "omap-mpui", 0x100);
1120
1120
    memory_region_add_subregion(memory, base, &mpu->mpui_iomem);
1121
1121
 
1227
1227
    s->abort = abort_irq;
1228
1228
    omap_tipb_bridge_reset(s);
1229
1229
 
1230
 
    memory_region_init_io(&s->iomem, &omap_tipb_bridge_ops, s,
 
1230
    memory_region_init_io(&s->iomem, NULL, &omap_tipb_bridge_ops, s,
1231
1231
                          "omap-tipb-bridge", 0x100);
1232
1232
    memory_region_add_subregion(memory, base, &s->iomem);
1233
1233
 
1336
1336
static void omap_tcmi_init(MemoryRegion *memory, hwaddr base,
1337
1337
                struct omap_mpu_state_s *mpu)
1338
1338
{
1339
 
    memory_region_init_io(&mpu->tcmi_iomem, &omap_tcmi_ops, mpu,
 
1339
    memory_region_init_io(&mpu->tcmi_iomem, NULL, &omap_tcmi_ops, mpu,
1340
1340
                          "omap-tcmi", 0x100);
1341
1341
    memory_region_add_subregion(memory, base, &mpu->tcmi_iomem);
1342
1342
    omap_tcmi_reset(mpu);
1418
1418
                           hwaddr base, omap_clk clk)
1419
1419
{
1420
1420
    struct dpll_ctl_s *s = g_malloc0(sizeof(*s));
1421
 
    memory_region_init_io(&s->iomem, &omap_dpll_ops, s, "omap-dpll", 0x100);
 
1421
    memory_region_init_io(&s->iomem, NULL, &omap_dpll_ops, s, "omap-dpll", 0x100);
1422
1422
 
1423
1423
    s->dpll = clk;
1424
1424
    omap_dpll_reset(s);
1831
1831
static void omap_clkm_init(MemoryRegion *memory, hwaddr mpu_base,
1832
1832
                hwaddr dsp_base, struct omap_mpu_state_s *s)
1833
1833
{
1834
 
    memory_region_init_io(&s->clkm_iomem, &omap_clkm_ops, s,
 
1834
    memory_region_init_io(&s->clkm_iomem, NULL, &omap_clkm_ops, s,
1835
1835
                          "omap-clkm", 0x100);
1836
 
    memory_region_init_io(&s->clkdsp_iomem, &omap_clkdsp_ops, s,
 
1836
    memory_region_init_io(&s->clkdsp_iomem, NULL, &omap_clkdsp_ops, s,
1837
1837
                          "omap-clkdsp", 0x1000);
1838
1838
 
1839
1839
    s->clkm.arm_idlect1 = 0x03ff;
2090
2090
    s->in = qemu_allocate_irqs(omap_mpuio_set, s, 16);
2091
2091
    omap_mpuio_reset(s);
2092
2092
 
2093
 
    memory_region_init_io(&s->iomem, &omap_mpuio_ops, s,
 
2093
    memory_region_init_io(&s->iomem, NULL, &omap_mpuio_ops, s,
2094
2094
                          "omap-mpuio", 0x800);
2095
2095
    memory_region_add_subregion(memory, base, &s->iomem);
2096
2096
 
2281
2281
    s->txdrq = dma;
2282
2282
    omap_uwire_reset(s);
2283
2283
 
2284
 
    memory_region_init_io(&s->iomem, &omap_uwire_ops, s, "omap-uwire", 0x800);
 
2284
    memory_region_init_io(&s->iomem, NULL, &omap_uwire_ops, s, "omap-uwire", 0x800);
2285
2285
    memory_region_add_subregion(system_memory, base, &s->iomem);
2286
2286
 
2287
2287
    return s;
2393
2393
 
2394
2394
    omap_pwl_reset(s);
2395
2395
 
2396
 
    memory_region_init_io(&s->iomem, &omap_pwl_ops, s,
 
2396
    memory_region_init_io(&s->iomem, NULL, &omap_pwl_ops, s,
2397
2397
                          "omap-pwl", 0x800);
2398
2398
    memory_region_add_subregion(system_memory, base, &s->iomem);
2399
2399
 
2500
2500
    s->clk = clk;
2501
2501
    omap_pwt_reset(s);
2502
2502
 
2503
 
    memory_region_init_io(&s->iomem, &omap_pwt_ops, s,
 
2503
    memory_region_init_io(&s->iomem, NULL, &omap_pwt_ops, s,
2504
2504
                          "omap-pwt", 0x800);
2505
2505
    memory_region_add_subregion(system_memory, base, &s->iomem);
2506
2506
    return s;
2919
2919
 
2920
2920
    omap_rtc_reset(s);
2921
2921
 
2922
 
    memory_region_init_io(&s->iomem, &omap_rtc_ops, s,
 
2922
    memory_region_init_io(&s->iomem, NULL, &omap_rtc_ops, s,
2923
2923
                          "omap-rtc", 0x800);
2924
2924
    memory_region_add_subregion(system_memory, base, &s->iomem);
2925
2925
 
3452
3452
    s->source_timer = qemu_new_timer_ns(vm_clock, omap_mcbsp_source_tick, s);
3453
3453
    omap_mcbsp_reset(s);
3454
3454
 
3455
 
    memory_region_init_io(&s->iomem, &omap_mcbsp_ops, s, "omap-mcbsp", 0x800);
 
3455
    memory_region_init_io(&s->iomem, NULL, &omap_mcbsp_ops, s, "omap-mcbsp", 0x800);
3456
3456
    memory_region_add_subregion(system_memory, base, &s->iomem);
3457
3457
 
3458
3458
    return s;
3627
3627
 
3628
3628
    omap_lpg_reset(s);
3629
3629
 
3630
 
    memory_region_init_io(&s->iomem, &omap_lpg_ops, s, "omap-lpg", 0x800);
 
3630
    memory_region_init_io(&s->iomem, NULL, &omap_lpg_ops, s, "omap-lpg", 0x800);
3631
3631
    memory_region_add_subregion(system_memory, base, &s->iomem);
3632
3632
 
3633
3633
    omap_clk_adduser(clk, qemu_allocate_irqs(omap_lpg_clk_update, s, 1)[0]);
3666
3666
static void omap_setup_mpui_io(MemoryRegion *system_memory,
3667
3667
                               struct omap_mpu_state_s *mpu)
3668
3668
{
3669
 
    memory_region_init_io(&mpu->mpui_io_iomem, &omap_mpui_io_ops, mpu,
 
3669
    memory_region_init_io(&mpu->mpui_io_iomem, NULL, &omap_mpui_io_ops, mpu,
3670
3670
                          "omap-mpui-io", 0x7fff);
3671
3671
    memory_region_add_subregion(system_memory, OMAP_MPUI_BASE,
3672
3672
                                &mpu->mpui_io_iomem);
3744
3744
 
3745
3745
    for (; map->phys_dsp; map ++) {
3746
3746
        io = g_new(MemoryRegion, 1);
3747
 
        memory_region_init_alias(io, map->name,
 
3747
        memory_region_init_alias(io, NULL, map->name,
3748
3748
                                 system_memory, map->phys_mpu, map->size);
3749
3749
        memory_region_add_subregion(system_memory, map->phys_dsp, io);
3750
3750
    }
3848
3848
    omap_clk_init(s);
3849
3849
 
3850
3850
    /* Memory-mapped stuff */
3851
 
    memory_region_init_ram(&s->emiff_ram, "omap1.dram", s->sdram_size);
 
3851
    memory_region_init_ram(&s->emiff_ram, NULL, "omap1.dram", s->sdram_size);
3852
3852
    vmstate_register_ram_global(&s->emiff_ram);
3853
3853
    memory_region_add_subregion(system_memory, OMAP_EMIFF_BASE, &s->emiff_ram);
3854
 
    memory_region_init_ram(&s->imif_ram, "omap1.sram", s->sram_size);
 
3854
    memory_region_init_ram(&s->imif_ram, NULL, "omap1.sram", s->sram_size);
3855
3855
    vmstate_register_ram_global(&s->imif_ram);
3856
3856
    memory_region_add_subregion(system_memory, OMAP_IMIF_BASE, &s->imif_ram);
3857
3857