From: Artyom Tarasenko <atar4qemu@gmail.com> To: qemu-devel@nongnu.org, hpoussin@reactos.org Cc: qemu-ppc@nongnu.org, Artyom Tarasenko <atar4qemu@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Fam Zheng <fam@euphon.net> Subject: [Qemu-devel] [PATCH 1/4] lsi53c895a: hide 53c895a registers in 53c810 Date: Fri, 12 Apr 2019 23:06:15 +0200 [thread overview] Message-ID: <1555103178-21894-2-git-send-email-atar4qemu@gmail.com> (raw) In-Reply-To: <1555103178-21894-1-git-send-email-atar4qemu@gmail.com> AIX/PReP does access to the aliased IO registers of 53810. Implement aliasing to make the AIX driver work. Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com> --- hw/scsi/lsi53c895a.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index da7239d..08841e0 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -2266,11 +2266,13 @@ static const struct SCSIBusInfo lsi_scsi_info = { .cancel = lsi_request_cancelled }; -static void lsi_scsi_realize(PCIDevice *dev, Error **errp) +static void lsi_scsi_realize_8xx(PCIDevice *dev, Error **errp, uint16_t type) { LSIState *s = LSI53C895A(dev); DeviceState *d = DEVICE(dev); uint8_t *pci_conf; + uint64_t mmio_size; + MemoryRegion *mr; pci_conf = dev->config; @@ -2279,13 +2281,21 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp) /* Interrupt pin A */ pci_conf[PCI_INTERRUPT_PIN] = 0x01; - memory_region_init_io(&s->mmio_io, OBJECT(s), &lsi_mmio_ops, s, - "lsi-mmio", 0x400); memory_region_init_io(&s->ram_io, OBJECT(s), &lsi_ram_ops, s, "lsi-ram", 0x2000); memory_region_init_io(&s->io_io, OBJECT(s), &lsi_io_ops, s, "lsi-io", 256); - + if (type == PCI_DEVICE_ID_LSI_53C895A) { + mmio_size = 0x400; + } else { + mr = g_new(MemoryRegion, 1); + memory_region_init_alias(mr, OBJECT(d), "lsi-io-alias", &s->io_io, + 0, 0x80); + memory_region_add_subregion_overlap(&s->io_io, 0x80, mr, -1); + mmio_size = 0x80; + } + memory_region_init_io(&s->mmio_io, OBJECT(s), &lsi_mmio_ops, s, + "lsi-mmio", mmio_size); address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io"); qdev_init_gpio_out(d, &s->ext_irq, 1); @@ -2297,6 +2307,16 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp) scsi_bus_new(&s->bus, sizeof(s->bus), d, &lsi_scsi_info, NULL); } +static void lsi_scsi_realize_895A(PCIDevice *dev, Error **errp) +{ + lsi_scsi_realize_8xx(dev, errp, PCI_DEVICE_ID_LSI_53C895A); +} + +static void lsi_scsi_realize_810(PCIDevice *dev, Error **errp) +{ + lsi_scsi_realize_8xx(dev, errp, PCI_DEVICE_ID_LSI_53C810); +} + static void lsi_scsi_unrealize(DeviceState *dev, Error **errp) { LSIState *s = LSI53C895A(dev); @@ -2309,7 +2329,7 @@ static void lsi_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - k->realize = lsi_scsi_realize; + k->realize = lsi_scsi_realize_895A; k->vendor_id = PCI_VENDOR_ID_LSI_LOGIC; k->device_id = PCI_DEVICE_ID_LSI_53C895A; k->class_id = PCI_CLASS_STORAGE_SCSI; @@ -2335,6 +2355,7 @@ static void lsi53c810_class_init(ObjectClass *klass, void *data) { PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + k->realize = lsi_scsi_realize_810; k->device_id = PCI_DEVICE_ID_LSI_53C810; } -- 2.7.2
WARNING: multiple messages have this Message-ID (diff)
From: Artyom Tarasenko <atar4qemu@gmail.com> To: qemu-devel@nongnu.org, hpoussin@reactos.org Cc: Fam Zheng <fam@euphon.net>, Paolo Bonzini <pbonzini@redhat.com>, qemu-ppc@nongnu.org, Artyom Tarasenko <atar4qemu@gmail.com> Subject: [Qemu-devel] [PATCH 1/4] lsi53c895a: hide 53c895a registers in 53c810 Date: Fri, 12 Apr 2019 23:06:15 +0200 [thread overview] Message-ID: <1555103178-21894-2-git-send-email-atar4qemu@gmail.com> (raw) Message-ID: <20190412210615.-bEBWt2oxcANd9kaGW7wInjO9mkiq2Uo3vsOaYraXUI@z> (raw) In-Reply-To: <1555103178-21894-1-git-send-email-atar4qemu@gmail.com> AIX/PReP does access to the aliased IO registers of 53810. Implement aliasing to make the AIX driver work. Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com> --- hw/scsi/lsi53c895a.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index da7239d..08841e0 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -2266,11 +2266,13 @@ static const struct SCSIBusInfo lsi_scsi_info = { .cancel = lsi_request_cancelled }; -static void lsi_scsi_realize(PCIDevice *dev, Error **errp) +static void lsi_scsi_realize_8xx(PCIDevice *dev, Error **errp, uint16_t type) { LSIState *s = LSI53C895A(dev); DeviceState *d = DEVICE(dev); uint8_t *pci_conf; + uint64_t mmio_size; + MemoryRegion *mr; pci_conf = dev->config; @@ -2279,13 +2281,21 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp) /* Interrupt pin A */ pci_conf[PCI_INTERRUPT_PIN] = 0x01; - memory_region_init_io(&s->mmio_io, OBJECT(s), &lsi_mmio_ops, s, - "lsi-mmio", 0x400); memory_region_init_io(&s->ram_io, OBJECT(s), &lsi_ram_ops, s, "lsi-ram", 0x2000); memory_region_init_io(&s->io_io, OBJECT(s), &lsi_io_ops, s, "lsi-io", 256); - + if (type == PCI_DEVICE_ID_LSI_53C895A) { + mmio_size = 0x400; + } else { + mr = g_new(MemoryRegion, 1); + memory_region_init_alias(mr, OBJECT(d), "lsi-io-alias", &s->io_io, + 0, 0x80); + memory_region_add_subregion_overlap(&s->io_io, 0x80, mr, -1); + mmio_size = 0x80; + } + memory_region_init_io(&s->mmio_io, OBJECT(s), &lsi_mmio_ops, s, + "lsi-mmio", mmio_size); address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io"); qdev_init_gpio_out(d, &s->ext_irq, 1); @@ -2297,6 +2307,16 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp) scsi_bus_new(&s->bus, sizeof(s->bus), d, &lsi_scsi_info, NULL); } +static void lsi_scsi_realize_895A(PCIDevice *dev, Error **errp) +{ + lsi_scsi_realize_8xx(dev, errp, PCI_DEVICE_ID_LSI_53C895A); +} + +static void lsi_scsi_realize_810(PCIDevice *dev, Error **errp) +{ + lsi_scsi_realize_8xx(dev, errp, PCI_DEVICE_ID_LSI_53C810); +} + static void lsi_scsi_unrealize(DeviceState *dev, Error **errp) { LSIState *s = LSI53C895A(dev); @@ -2309,7 +2329,7 @@ static void lsi_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); - k->realize = lsi_scsi_realize; + k->realize = lsi_scsi_realize_895A; k->vendor_id = PCI_VENDOR_ID_LSI_LOGIC; k->device_id = PCI_DEVICE_ID_LSI_53C895A; k->class_id = PCI_CLASS_STORAGE_SCSI; @@ -2335,6 +2355,7 @@ static void lsi53c810_class_init(ObjectClass *klass, void *data) { PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); + k->realize = lsi_scsi_realize_810; k->device_id = PCI_DEVICE_ID_LSI_53C810; } -- 2.7.2
next prev parent reply other threads:[~2019-04-12 21:06 UTC|newest] Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-12 21:06 [Qemu-devel] [PATCH 0/4] Improve 40p, make AIX 5.1 boot Artyom Tarasenko 2019-04-12 21:06 ` Artyom Tarasenko [this message] 2019-04-12 21:06 ` [Qemu-devel] [PATCH 1/4] lsi53c895a: hide 53c895a registers in 53c810 Artyom Tarasenko 2019-04-14 15:43 ` Hervé Poussineau 2019-04-14 15:43 ` Hervé Poussineau 2019-04-14 18:36 ` Artyom Tarasenko 2019-04-14 18:36 ` Artyom Tarasenko 2019-04-15 9:21 ` Paolo Bonzini 2019-04-15 9:21 ` Paolo Bonzini 2019-04-12 21:06 ` [Qemu-devel] [PATCH 2/4] 40p and prep: implement PCI bus mastering Artyom Tarasenko 2019-04-14 15:43 ` Hervé Poussineau 2019-04-12 21:06 ` [Qemu-devel] [PATCH 3/4] target/ppc: improve performance of large BAT invalidations Artyom Tarasenko 2019-04-14 15:43 ` Hervé Poussineau 2019-04-15 0:20 ` David Gibson 2019-04-15 0:20 ` David Gibson 2019-04-12 21:06 ` [Qemu-devel] [PATCH 4/4] hw/isa/i82378.c: use 1900 as a base year Artyom Tarasenko 2019-04-14 17:01 ` Hervé Poussineau 2019-04-14 18:53 ` Artyom Tarasenko 2019-04-14 18:53 ` Artyom Tarasenko 2019-04-14 21:24 ` Hervé Poussineau 2019-04-14 21:24 ` Hervé Poussineau 2019-04-15 10:36 ` Philippe Mathieu-Daudé 2019-04-15 10:45 ` Artyom Tarasenko 2019-04-15 10:45 ` Artyom Tarasenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1555103178-21894-2-git-send-email-atar4qemu@gmail.com \ --to=atar4qemu@gmail.com \ --cc=fam@euphon.net \ --cc=hpoussin@reactos.org \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.