From nobody Sun Feb 8 12:38:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1585340200; cv=none; d=zohomail.com; s=zohoarc; b=GFLiQ3a5xSqmUuGgut21NEZkRcfzCX/9s24+YUPWDkKVlLqrBhxYMkusEGhRtZv6o/n4JI8dufg3yUVve6QwZ+HUQFYTwV78T3wGlDKFEmha4XoPYy3u17vFYmHkypsD+Th0V0Rvr86ALXkJNai7ocC/Q0DPOr04fsV0r0OAKuk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585340200; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LWjdcU0+UwWOy2uhLjizldByOPRYIeGKr/Jd6SGhlS4=; b=JDk0kS1wr7IofeANq7Jodb+HA6RB4X3ULn/g1dWbjnfY3BvOkIyqt2d7VhbJ9emVxHl/dXVUMRmBZbm66GIoHUB6P0n+MBick6aC5bTGaVEk0oz1tH89g2Re+2ahXS2xVmYsZEExxaU2ob0XDywGgY5pqFVMEfXDYL20CQdbxrE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1585340200482795.4089330942162; Fri, 27 Mar 2020 13:16:40 -0700 (PDT) Received: from localhost ([::1]:46482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHvPD-0003xs-50 for importer@patchew.org; Fri, 27 Mar 2020 16:16:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57728) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHvO2-00027j-Lg for qemu-devel@nongnu.org; Fri, 27 Mar 2020 16:15:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHvO1-0002yA-3A for qemu-devel@nongnu.org; Fri, 27 Mar 2020 16:15:26 -0400 Received: from us-smtp-delivery-74.mimecast.com ([63.128.21.74]:23055) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jHvO0-0002xe-Vd for qemu-devel@nongnu.org; Fri, 27 Mar 2020 16:15:25 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-340-srW0rZfPOVKNqb2ljTKN6A-1; Fri, 27 Mar 2020 16:15:22 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 60F6C107ACC7; Fri, 27 Mar 2020 20:15:18 +0000 (UTC) Received: from probe.redhat.com (ovpn-113-210.rdu2.redhat.com [10.10.113.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C47819C7F; Fri, 27 Mar 2020 20:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585340124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LWjdcU0+UwWOy2uhLjizldByOPRYIeGKr/Jd6SGhlS4=; b=CGClqOiQdpZddTPw8HkK/wipQ51M9V4xVldABNoEjhLmLawl1HZ6zVTiGOlS4EBHQhVqNM 0jgqgRSjS/+9zi1bHx1ksQT0vggSdsn2zYFOkr38aj+WzISKb6V/jLWGKS1JdjZDcMgi2k yuVhAfMMZDmKqSkhg38d+TT54ZY86/s= X-MC-Unique: srW0rZfPOVKNqb2ljTKN6A-1 From: John Snow To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 1/5] fdc/i8257: implement verify transfer mode Date: Fri, 27 Mar 2020 16:14:57 -0400 Message-Id: <20200327201501.1417-2-jsnow@redhat.com> In-Reply-To: <20200327201501.1417-1-jsnow@redhat.com> References: <20200327201501.1417-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 63.128.21.74 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , Mark Cave-Ayland , Sven Schnelle , qemu-block@nongnu.org, Helge Deller , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , David Gibson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Artyom Tarasenko , Laurent Vivier , Thomas Huth , Eduardo Habkost , John Snow , Richard Henderson , Kevin Wolf , Max Reitz , qemu-ppc@nongnu.org, Aleksandar Markovic , Paolo Bonzini , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Sven Schnelle While working on the Tulip driver i tried to write some Teledisk images to a floppy image which didn't work. Turned out that Teledisk checks the writt= en data by issuing a READ command to the FDC but running the DMA controller in VERIFY mode. As we ignored the DMA request in that case, the DMA transfer never finished, and Teledisk reported an error. The i8257 spec says about verify transfers: 3) DMA verify, which does not actually involve the transfer of data. When an 8257 channel is in the DMA verify mode, it will respond the same as describ= ed for transfer operations, except that no memory or I/O read/write control si= gnals will be generated. Herv=C3=A9 proposed to remove all the dma_mode_ok stuff from fdc to have a = more clear boundary between DMA and FDC, so this patch also does that. Suggested-by: Herv=C3=A9 Poussineau Signed-off-by: Sven Schnelle Reviewed-by: Herv=C3=A9 Poussineau Signed-off-by: John Snow --- include/hw/isa/isa.h | 1 - hw/block/fdc.c | 61 +++++++++++++------------------------------- hw/dma/i8257.c | 20 ++++++++++----- 3 files changed, 31 insertions(+), 51 deletions(-) diff --git a/include/hw/isa/isa.h b/include/hw/isa/isa.h index e9ac1f1205..59a4d4b50a 100644 --- a/include/hw/isa/isa.h +++ b/include/hw/isa/isa.h @@ -56,7 +56,6 @@ typedef int (*IsaDmaTransferHandler)(void *opaque, int nc= han, int pos, typedef struct IsaDmaClass { InterfaceClass parent; =20 - IsaDmaTransferMode (*get_transfer_mode)(IsaDma *obj, int nchan); bool (*has_autoinitialization)(IsaDma *obj, int nchan); int (*read_memory)(IsaDma *obj, int nchan, void *buf, int pos, int len= ); int (*write_memory)(IsaDma *obj, int nchan, void *buf, int pos, int le= n); diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 22e954e0dc..33bc9e2f92 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -1714,53 +1714,28 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, i= nt direction) } fdctrl->eot =3D fdctrl->fifo[6]; if (fdctrl->dor & FD_DOR_DMAEN) { - IsaDmaTransferMode dma_mode; + /* DMA transfer is enabled. */ IsaDmaClass *k =3D ISADMA_GET_CLASS(fdctrl->dma); - bool dma_mode_ok; - /* DMA transfer are enabled. Check if DMA channel is well programm= ed */ - dma_mode =3D k->get_transfer_mode(fdctrl->dma, fdctrl->dma_chann); - FLOPPY_DPRINTF("dma_mode=3D%d direction=3D%d (%d - %d)\n", - dma_mode, direction, - (128 << fdctrl->fifo[5]) * + + FLOPPY_DPRINTF("direction=3D%d (%d - %d)\n", + direction, (128 << fdctrl->fifo[5]) * (cur_drv->last_sect - ks + 1), fdctrl->data_len); - switch (direction) { - case FD_DIR_SCANE: - case FD_DIR_SCANL: - case FD_DIR_SCANH: - dma_mode_ok =3D (dma_mode =3D=3D ISADMA_TRANSFER_VERIFY); - break; - case FD_DIR_WRITE: - dma_mode_ok =3D (dma_mode =3D=3D ISADMA_TRANSFER_WRITE); - break; - case FD_DIR_READ: - dma_mode_ok =3D (dma_mode =3D=3D ISADMA_TRANSFER_READ); - break; - case FD_DIR_VERIFY: - dma_mode_ok =3D true; - break; - default: - dma_mode_ok =3D false; - break; - } - if (dma_mode_ok) { - /* No access is allowed until DMA transfer has completed */ - fdctrl->msr &=3D ~FD_MSR_RQM; - if (direction !=3D FD_DIR_VERIFY) { - /* Now, we just have to wait for the DMA controller to - * recall us... - */ - k->hold_DREQ(fdctrl->dma, fdctrl->dma_chann); - k->schedule(fdctrl->dma); - } else { - /* Start transfer */ - fdctrl_transfer_handler(fdctrl, fdctrl->dma_chann, 0, - fdctrl->data_len); - } - return; + + /* No access is allowed until DMA transfer has completed */ + fdctrl->msr &=3D ~FD_MSR_RQM; + if (direction !=3D FD_DIR_VERIFY) { + /* + * Now, we just have to wait for the DMA controller to + * recall us... + */ + k->hold_DREQ(fdctrl->dma, fdctrl->dma_chann); + k->schedule(fdctrl->dma); } else { - FLOPPY_DPRINTF("bad dma_mode=3D%d direction=3D%d\n", dma_mode, - direction); + /* Start transfer */ + fdctrl_transfer_handler(fdctrl, fdctrl->dma_chann, 0, + fdctrl->data_len); } + return; } FLOPPY_DPRINTF("start non-DMA transfer\n"); fdctrl->msr |=3D FD_MSR_NONDMA | FD_MSR_RQM; diff --git a/hw/dma/i8257.c b/hw/dma/i8257.c index ef15c06d77..1b3435ab58 100644 --- a/hw/dma/i8257.c +++ b/hw/dma/i8257.c @@ -292,12 +292,6 @@ static uint64_t i8257_read_cont(void *opaque, hwaddr n= port, unsigned size) return val; } =20 -static IsaDmaTransferMode i8257_dma_get_transfer_mode(IsaDma *obj, int nch= an) -{ - I8257State *d =3D I8257(obj); - return (d->regs[nchan & 3].mode >> 2) & 3; -} - static bool i8257_dma_has_autoinitialization(IsaDma *obj, int nchan) { I8257State *d =3D I8257(obj); @@ -400,6 +394,11 @@ static void i8257_dma_register_channel(IsaDma *obj, in= t nchan, r->opaque =3D opaque; } =20 +static bool i8257_is_verify_transfer(I8257Regs *r) +{ + return (r->mode & 0x0c) =3D=3D 0; +} + static int i8257_dma_read_memory(IsaDma *obj, int nchan, void *buf, int po= s, int len) { @@ -407,6 +406,10 @@ static int i8257_dma_read_memory(IsaDma *obj, int ncha= n, void *buf, int pos, I8257Regs *r =3D &d->regs[nchan & 3]; hwaddr addr =3D ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[A= DDR]; =20 + if (i8257_is_verify_transfer(r)) { + return len; + } + if (r->mode & 0x20) { int i; uint8_t *p =3D buf; @@ -431,6 +434,10 @@ static int i8257_dma_write_memory(IsaDma *obj, int nch= an, void *buf, int pos, I8257Regs *r =3D &s->regs[nchan & 3]; hwaddr addr =3D ((r->pageh & 0x7f) << 24) | (r->page << 16) | r->now[A= DDR]; =20 + if (i8257_is_verify_transfer(r)) { + return len; + } + if (r->mode & 0x20) { int i; uint8_t *p =3D buf; @@ -597,7 +604,6 @@ static void i8257_class_init(ObjectClass *klass, void *= data) dc->vmsd =3D &vmstate_i8257; device_class_set_props(dc, i8257_properties); =20 - idc->get_transfer_mode =3D i8257_dma_get_transfer_mode; idc->has_autoinitialization =3D i8257_dma_has_autoinitialization; idc->read_memory =3D i8257_dma_read_memory; idc->write_memory =3D i8257_dma_write_memory; --=20 2.21.1