From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS1E2-0007hR-O3 for qemu-devel@nongnu.org; Wed, 19 Aug 2015 07:08:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZS1Dy-00015S-M8 for qemu-devel@nongnu.org; Wed, 19 Aug 2015 07:08:10 -0400 Received: from mx2.suse.de ([195.135.220.15]:56928) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZS1Dy-00014v-Ch for qemu-devel@nongnu.org; Wed, 19 Aug 2015 07:08:06 -0400 Message-ID: <55D46394.2030106@suse.de> Date: Wed, 19 Aug 2015 13:08:04 +0200 From: Hannes Reinecke MIME-Version: 1.0 References: <1439981843-2860-1-git-send-email-abezzubikov@ispras.ru> <1439981843-2860-5-git-send-email-abezzubikov@ispras.ru> In-Reply-To: <1439981843-2860-5-git-send-email-abezzubikov@ispras.ru> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH RFC v3 4/5] ATAPI-SCSI bridge functions created an can be used by bridge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alexander Bezzubikov , qemu-devel@nongnu.org Cc: jsnow@redhat.com, abezzubikov@ispras.ru On 08/19/2015 12:57 PM, Alexander Bezzubikov wrote: > ide: bridge functions created > ide: Makefile corrected due to bridge creation > scsi: added function to enable bridge send SCSI requests > ide: bridge can now forward requests to SCSI > ide: bridge functions assigned to SCSIBusInfo > Signed-off-by: Alexander Bezzubikov > --- > hw/ide/Makefile.objs | 2 +- > hw/ide/atapi.c | 16 +++++++ > hw/ide/bridge.c | 114 +++++++++++++++++++++++++++++++++++++++++= ++++++++ > hw/ide/bridge.h | 1 + > hw/ide/internal.h | 2 + > hw/ide/qdev.c | 4 +- > hw/scsi/scsi-disk.c | 43 +++++++++++++++++++ > include/hw/scsi/scsi.h | 3 ++ > 8 files changed, 182 insertions(+), 3 deletions(-) > create mode 100644 hw/ide/bridge.c >=20 > diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs > index 729e9bd..f54f275 100644 > --- a/hw/ide/Makefile.objs > +++ b/hw/ide/Makefile.objs > @@ -1,4 +1,4 @@ > -common-obj-$(CONFIG_IDE_CORE) +=3D core.o atapi.o > +common-obj-$(CONFIG_IDE_CORE) +=3D core.o atapi.o bridge.o > common-obj-$(CONFIG_IDE_QDEV) +=3D qdev.o > common-obj-$(CONFIG_IDE_PCI) +=3D pci.o > common-obj-$(CONFIG_IDE_ISA) +=3D isa.o > diff --git a/hw/ide/atapi.c b/hw/ide/atapi.c > index f6135e1..3eb56e2 100644 > --- a/hw/ide/atapi.c > +++ b/hw/ide/atapi.c > @@ -1253,6 +1253,22 @@ void ide_atapi_cmd(IDEState *s) > return; > } > =20 > + if (s->drive_kind =3D=3D IDE_BRIDGE) { > + IDEDevice *dev =3D s->bus->master; > + SCSIDevice *scsi_dev =3D scsi_device_find(&dev->scsi_bus, 0, 0= , 0); > + s->cur_req =3D scsi_new_request_from_bridge(scsi_dev, 0, 0, bu= f, NULL); > + > + /* Necessary to prevent ide from reading while data isn't read= y */ > + if (buf[0] =3D=3D READ_10) { > + s->status |=3D BUSY_STAT; > + } > + > + if (scsi_req_enqueue(s->cur_req)) { > + scsi_req_continue(s->cur_req); > + } > + return; > + } > + > /* Execute the command */ > if (atapi_cmd_table[s->io_buffer[0]].handler) { > atapi_cmd_table[s->io_buffer[0]].handler(s, buf); > diff --git a/hw/ide/bridge.c b/hw/ide/bridge.c > new file mode 100644 > index 0000000..2e93311 > --- /dev/null > +++ b/hw/ide/bridge.c > @@ -0,0 +1,114 @@ > +#include "hw/ide/bridge.h" > + > +void ide_bridge_do_transfer(IDEState *s) > +{ > + SCSIDiskReq *r =3D DO_UPCAST(SCSIDiskReq, req, s->cur_req); > + > + if (r->buflen > 0) { > + int size =3D r->buflen; > + > + int byte_count_limit =3D s->lcyl | (s->hcyl << 8); > + if (byte_count_limit =3D=3D 0xffff) { > + byte_count_limit--; > + } > + if (size > byte_count_limit) { > + /* byte count limit must be even if this case */ > + if (byte_count_limit & 1) { > + byte_count_limit--; > + } > + size =3D byte_count_limit; > + } > + s->lcyl =3D size; > + s->hcyl =3D size >> 8; > + s->nsector =3D (s->nsector & ~7) | ATAPI_INT_REASON_IO; > + > + int offset =3D (r->buflen =3D=3D r->qiov.size) ? 0 : r->qiov.s= ize - r->buflen; > + r->buflen -=3D size; > + > + ide_transfer_start(s, s->io_buffer + offset, size, > + ide_bridge_do_transfer); > + ide_set_irq(s->bus); > + } else { > + scsi_req_complete(s->cur_req, GOOD); > + } > +} > + > +static void ide_bridge_dma_complete(void *opaque, int ret) > +{ > + IDEState *s =3D opaque; > + > + s->io_buffer_size =3D s->bus->dma->iov.iov_len; > + s->nsector =3D (s->nsector & ~7) | ATAPI_INT_REASON_IO | ATAPI_INT= _REASON_CD; > + s->bus->dma->ops->rw_buf(s->bus->dma, 1); > + scsi_req_complete(s->cur_req, GOOD); > + > + s->status =3D READY_STAT | SEEK_STAT; > + > + ide_set_irq(s->bus); > + ide_set_inactive(s, false); > +} > + > +void ide_bridge_start_transfer(SCSIRequest *req, uint32_t len) > +{ > + IDEDevice *dev =3D IDE_DEVICE(req->bus->qbus.parent); > + IDEBus *bus =3D DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus); > + IDEState *s =3D bus->ifs; > + SCSIDiskReq *r =3D DO_UPCAST(SCSIDiskReq, req, req); > + > + int cmd =3D req->cmd.buf[0]; > + if (cmd =3D=3D READ_10) { > + if (s->feature & 1) { > + s->status =3D READY_STAT | SEEK_STAT | DRQ_STAT | BUSY_STA= T; > + qemu_iovec_clone(&s->bus->dma->qiov, &r->qiov, NULL); > + qemu_iovec_to_buf(&r->qiov, 0, s->io_buffer, r->qiov.size)= ; > + } else { > + qemu_iovec_to_buf(&r->qiov, 0, s->io_buffer, r->qiov.size)= ; > + } > + } else { > + if (cmd =3D=3D INQUIRY) { > + len =3D 36; > + } > + r->iov.iov_len =3D len; > + qemu_iovec_concat_iov(&r->qiov, &r->iov, len, 0, len); > + qemu_iovec_to_buf(&r->qiov, 0, s->io_buffer, r->qiov.size); > + } > + > + s->io_buffer_index =3D 0; > + s->status =3D READY_STAT | SEEK_STAT; > + > + if (cmd !=3D TEST_UNIT_READY && cmd !=3D ALLOW_MEDIUM_REMOVAL) { > + if (s->feature & 1) { > + s->io_buffer_index =3D 0; > + s->bus->retry_unit =3D s->unit; > + s->bus->retry_sector_num =3D ide_get_sector(s); > + s->bus->retry_nsector =3D s->nsector; > + > + s->bus->dma->iov.iov_base =3D (void *)(s->io_buffer); > + s->bus->dma->iov.iov_len =3D r->qiov.size; > + > + if (cmd !=3D READ_10) { > + s->status =3D READY_STAT | SEEK_STAT | DRQ_STAT; > + } > + > + if (s->bus->dma->ops->start_dma) { > + s->bus->dma->ops->start_dma(s->bus->dma, s, > + ide_bridge_dma_complete); > + } > + } else { > + r->buflen =3D r->qiov.size; > + ide_bridge_do_transfer(s); > + } > + } else { > + scsi_req_complete(req, GOOD); > + } > +} > + > +void ide_bridge_complete(SCSIRequest *req, uint32_t status, size_t res= id) > +{ > + IDEDevice *dev =3D IDE_DEVICE(req->bus->qbus.parent); > + IDEBus *bus =3D DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus); > + IDEState *s =3D bus->ifs; > + > + ide_atapi_cmd_ok(s); > + ide_set_irq(s->bus); > +} > diff --git a/hw/ide/bridge.h b/hw/ide/bridge.h > index dca5d73..59f2f25 100644 > --- a/hw/ide/bridge.h > +++ b/hw/ide/bridge.h > @@ -5,5 +5,6 @@ > =20 > void ide_bridge_start_transfer(SCSIRequest *req, uint32_t len); > void ide_bridge_complete(SCSIRequest *req, uint32_t status, size_t res= id); > +void ide_bridge_do_transfer(IDEState *s); > =20 > #endif > diff --git a/hw/ide/internal.h b/hw/ide/internal.h > index 79c85be..fd385bc 100644 > --- a/hw/ide/internal.h > +++ b/hw/ide/internal.h > @@ -429,6 +429,8 @@ struct IDEState { > uint8_t *smart_selftest_data; > /* AHCI */ > int ncq_queues; > + /* ATAPI-SCSI bridge */ > + SCSIRequest *cur_req; > }; > =20 > struct IDEDMAOps { As discussed on the list, can you rename 'cur_req' to 'scsi_req' ? Thanks. Cheers, Hannes --=20 Dr. Hannes Reinecke zSeries & Storage hare@suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N=FCrnberg GF: F. Imend=F6rffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG N=FCrnberg)