← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/block/onenand.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/block/onenand.c
34
34
/* Fixed */
35
35
#define BLOCK_SHIFT     (PAGE_SHIFT + 6)
36
36
 
37
 
typedef struct {
38
 
    SysBusDevice busdev;
 
37
#define TYPE_ONE_NAND "onenand"
 
38
#define ONE_NAND(obj) OBJECT_CHECK(OneNANDState, (obj), TYPE_ONE_NAND)
 
39
 
 
40
typedef struct OneNANDState {
 
41
    SysBusDevice parent_obj;
 
42
 
39
43
    struct {
40
44
        uint16_t man;
41
45
        uint16_t dev;
113
117
    /* XXX: We should use IO_MEM_ROMD but we broke it earlier...
114
118
     * Both 0x0000 ... 0x01ff and 0x8000 ... 0x800f can be used to
115
119
     * write boot commands.  Also take note of the BWPS bit.  */
116
 
    memory_region_init(&s->container, "onenand", 0x10000 << s->shift);
 
120
    memory_region_init(&s->container, OBJECT(s), "onenand",
 
121
                       0x10000 << s->shift);
117
122
    memory_region_add_subregion(&s->container, 0, &s->iomem);
118
 
    memory_region_init_alias(&s->mapped_ram, "onenand-mapped-ram",
 
123
    memory_region_init_alias(&s->mapped_ram, OBJECT(s), "onenand-mapped-ram",
119
124
                             &s->ram, 0x0200 << s->shift,
120
125
                             0xbe00 << s->shift);
121
126
    memory_region_add_subregion_overlap(&s->container,
225
230
 
226
231
static void onenand_system_reset(DeviceState *dev)
227
232
{
228
 
    onenand_reset(FROM_SYSBUS(OneNANDState, SYS_BUS_DEVICE(dev)), 1);
 
233
    OneNANDState *s = ONE_NAND(dev);
 
234
 
 
235
    onenand_reset(s, 1);
229
236
}
230
237
 
231
238
static inline int onenand_load_main(OneNANDState *s, int sec, int secn,
763
770
    .endianness = DEVICE_NATIVE_ENDIAN,
764
771
};
765
772
 
766
 
static int onenand_initfn(SysBusDevice *dev)
 
773
static int onenand_initfn(SysBusDevice *sbd)
767
774
{
768
 
    OneNANDState *s = (OneNANDState *)dev;
 
775
    DeviceState *dev = DEVICE(sbd);
 
776
    OneNANDState *s = ONE_NAND(dev);
769
777
    uint32_t size = 1 << (24 + ((s->id.dev >> 4) & 7));
770
778
    void *ram;
 
779
 
771
780
    s->base = (hwaddr)-1;
772
781
    s->rdy = NULL;
773
782
    s->blocks = size >> BLOCK_SHIFT;
775
784
    s->blockwp = g_malloc(s->blocks);
776
785
    s->density_mask = (s->id.dev & 0x08)
777
786
        ? (1 << (6 + ((s->id.dev >> 4) & 7))) : 0;
778
 
    memory_region_init_io(&s->iomem, &onenand_ops, s, "onenand",
 
787
    memory_region_init_io(&s->iomem, OBJECT(s), &onenand_ops, s, "onenand",
779
788
                          0x10000 << s->shift);
780
789
    if (!s->bdrv) {
781
790
        s->image = memset(g_malloc(size + (size >> 5)),
789
798
    }
790
799
    s->otp = memset(g_malloc((64 + 2) << PAGE_SHIFT),
791
800
                    0xff, (64 + 2) << PAGE_SHIFT);
792
 
    memory_region_init_ram(&s->ram, "onenand.ram", 0xc000 << s->shift);
 
801
    memory_region_init_ram(&s->ram, OBJECT(s), "onenand.ram",
 
802
                           0xc000 << s->shift);
793
803
    vmstate_register_ram_global(&s->ram);
794
804
    ram = memory_region_get_ram_ptr(&s->ram);
795
805
    s->boot[0] = ram + (0x0000 << s->shift);
799
809
    s->data[1][0] = ram + ((0x0200 + (1 << (PAGE_SHIFT - 1))) << s->shift);
800
810
    s->data[1][1] = ram + ((0x8010 + (1 << (PAGE_SHIFT - 6))) << s->shift);
801
811
    onenand_mem_setup(s);
802
 
    sysbus_init_irq(dev, &s->intr);
803
 
    sysbus_init_mmio(dev, &s->container);
804
 
    vmstate_register(&dev->qdev,
 
812
    sysbus_init_irq(sbd, &s->intr);
 
813
    sysbus_init_mmio(sbd, &s->container);
 
814
    vmstate_register(dev,
805
815
                     ((s->shift & 0x7f) << 24)
806
816
                     | ((s->id.man & 0xff) << 16)
807
817
                     | ((s->id.dev & 0xff) << 8)
830
840
}
831
841
 
832
842
static const TypeInfo onenand_info = {
833
 
    .name          = "onenand",
 
843
    .name          = TYPE_ONE_NAND,
834
844
    .parent        = TYPE_SYS_BUS_DEVICE,
835
845
    .instance_size = sizeof(OneNANDState),
836
846
    .class_init    = onenand_class_init,
843
853
 
844
854
void *onenand_raw_otp(DeviceState *onenand_device)
845
855
{
846
 
    return FROM_SYSBUS(OneNANDState, SYS_BUS_DEVICE(onenand_device))->otp;
 
856
    OneNANDState *s = ONE_NAND(onenand_device);
 
857
 
 
858
    return s->otp;
847
859
}
848
860
 
849
861
type_init(onenand_register_types)