From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA76FC433E6 for ; Mon, 1 Mar 2021 21:51:43 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 61B8E60231 for ; Mon, 1 Mar 2021 21:51:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 61B8E60231 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=vivier.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGqS6-0000IK-AU for qemu-devel@archiver.kernel.org; Mon, 01 Mar 2021 16:51:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGqR5-000815-73 for qemu-devel@nongnu.org; Mon, 01 Mar 2021 16:50:39 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:36497) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGqR3-0004IE-2C for qemu-devel@nongnu.org; Mon, 01 Mar 2021 16:50:38 -0500 Received: from [192.168.100.1] ([82.252.139.98]) by mrelayeu.kundenserver.de (mreue010 [213.165.67.103]) with ESMTPSA (Nemesis) id 1MUpCz-1lPGUu3OTJ-00QlGV; Mon, 01 Mar 2021 22:50:30 +0100 Subject: Re: [PATCH v2 13/42] esp: remove dma_left from ESPState To: Mark Cave-Ayland , qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net References: <20210209193018.31339-1-mark.cave-ayland@ilande.co.uk> <20210209193018.31339-14-mark.cave-ayland@ilande.co.uk> From: Laurent Vivier Message-ID: Date: Mon, 1 Mar 2021 22:50:28 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210209193018.31339-14-mark.cave-ayland@ilande.co.uk> Content-Type: text/plain; charset=utf-8 Content-Language: fr Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K1:sz9EF+LlPu13HkhfAuwhDIUTcLEYdmeKCsbPPxjB8dCBEUPp2vo N/D4RJa7scAlVgQ6gH909sRIzfBTmO12lODjUh5eco5WBFEYy0MCqwORy5F1QS9qUZXP++5 FzgIzQr3vuvtc6pz9C9s4FKbkCxKXc5JX4vUWSl+QxWzknw1buKCyY2b7T3QnezYokgHhAp DBXlYjRqxyuai8ELqZS8w== X-UI-Out-Filterresults: notjunk:1;V03:K0:EFQRSfLKhKo=:3h6KHhjJjbtkWqhAgBCM+C XUVRdR+4xawFs4uDURetBEihx3IRJ10PpJRsalqebDzE8c+IlB6maA93IfFg2t+kRDjJAtbWE oP1KF3hWHMiqe47SA3JGAT9RGkFW0CHT4sNLrdZH2XeyUR8FoUMALx56R5CH7+KTJAOWxBRxC tZj9UalSBQ10hSDMLefPtj8AKhy6r/3+4qYp0USHYP3XuAYxALkSyeYQ6zn1fBprfdxiguUK8 FOCgHCDH1+cOHaqo/J36VZVzb4piuklmZOsAN/GfeaK/rI6+MDojKBn5Z9Ggy0OwKswGLsBuZ esOgdTrtYD4ckFvLnfm6dC9zxxPvbYpHdt9be3+x64TqwUm6/imDl8iZdg82AUFc0YX+mgnL2 g52dUR5olessLC4mTCxCx7QA4+UcmeT7xEgcBBe1xWEFGQBBBvMagXyA0zsL68R1nL4iWJoe5 OhtIBqMRXw== Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Le 09/02/2021 à 20:29, Mark Cave-Ayland a écrit : > The ESP device already keeps track of the remaining bytes left to transfer via > its TC (transfer counter) register which is decremented for each byte that > is transferred across the SCSI bus. > > Switch the transfer logic to use the value of TC instead of dma_left and then > remove dma_left completely, adding logic to the vmstate_esp post_load() function > to transfer the old dma_left value to the TC register during migration from > older versions. > > Signed-off-by: Mark Cave-Ayland > --- > hw/scsi/esp.c | 47 ++++++++++++++++++++++++++++--------------- > include/hw/scsi/esp.h | 5 +++-- > 2 files changed, 34 insertions(+), 18 deletions(-) > > diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c > index 6c495b29c0..fcc99f5fe4 100644 > --- a/hw/scsi/esp.c > +++ b/hw/scsi/esp.c > @@ -228,7 +228,7 @@ static void do_busid_cmd(ESPState *s, uint8_t *buf, uint8_t busid) > s->ti_size = datalen; > if (datalen != 0) { > s->rregs[ESP_RSTAT] = STAT_TC; > - s->dma_left = 0; > + esp_set_tc(s, 0); > if (datalen > 0) { > s->rregs[ESP_RSTAT] |= STAT_DI; > } else { > @@ -382,6 +382,7 @@ static void do_dma_pdma_cb(ESPState *s) > { > int to_device = ((s->rregs[ESP_RSTAT] & 7) == STAT_DO); > int len = s->pdma_cur - s->pdma_start; > + > if (s->do_cmd) { > s->ti_size = 0; > s->cmdlen = 0; > @@ -389,7 +390,6 @@ static void do_dma_pdma_cb(ESPState *s) > do_cmd(s, s->cmdbuf); > return; > } > - s->dma_left -= len; > s->async_buf += len; > s->async_len -= len; > if (to_device) { > @@ -404,7 +404,7 @@ static void do_dma_pdma_cb(ESPState *s) > * complete the DMA operation immediately. Otherwise defer > * until the scsi layer has completed. > */ > - if (to_device || s->dma_left != 0 || s->ti_size == 0) { > + if (to_device || esp_get_tc(s) != 0 || s->ti_size == 0) { > return; > } > } > @@ -418,7 +418,7 @@ static void esp_do_dma(ESPState *s) > uint32_t len; > int to_device = ((s->rregs[ESP_RSTAT] & 7) == STAT_DO); > > - len = s->dma_left; > + len = esp_get_tc(s); > if (s->do_cmd) { > /* > * handle_ti_cmd() case: esp_do_dma() is called only from > @@ -468,7 +468,7 @@ static void esp_do_dma(ESPState *s) > return; > } > } > - s->dma_left -= len; > + esp_set_tc(s, esp_get_tc(s) - len); > s->async_buf += len; > s->async_len -= len; > if (to_device) { > @@ -483,7 +483,7 @@ static void esp_do_dma(ESPState *s) > * complete the DMA operation immediately. Otherwise defer > * until the scsi layer has completed. > */ > - if (to_device || s->dma_left != 0 || s->ti_size == 0) { > + if (to_device || esp_get_tc(s) != 0 || s->ti_size == 0) { > return; > } > } > @@ -499,7 +499,6 @@ static void esp_report_command_complete(ESPState *s, uint32_t status) > trace_esp_command_complete_unexpected(); > } > s->ti_size = 0; > - s->dma_left = 0; > s->async_len = 0; > if (status) { > trace_esp_command_complete_fail(); > @@ -535,12 +534,13 @@ void esp_command_complete(SCSIRequest *req, uint32_t status, > void esp_transfer_data(SCSIRequest *req, uint32_t len) > { > ESPState *s = req->hba_private; > + uint32_t dmalen = esp_get_tc(s); > > assert(!s->do_cmd); > - trace_esp_transfer_data(s->dma_left, s->ti_size); > + trace_esp_transfer_data(dmalen, s->ti_size); > s->async_len = len; > s->async_buf = scsi_req_get_buf(req); > - if (s->dma_left) { > + if (dmalen) { > esp_do_dma(s); > } else if (s->ti_size <= 0) { > /* > @@ -571,7 +571,6 @@ static void handle_ti(ESPState *s) > } > trace_esp_handle_ti(minlen); > if (s->dma) { > - s->dma_left = minlen; > s->rregs[ESP_RSTAT] &= ~STAT_TC; > esp_do_dma(s); > } else if (s->do_cmd) { > @@ -824,6 +823,14 @@ static const VMStateDescription vmstate_esp_pdma = { > } > }; > > +static bool esp_is_before_version_5(void *opaque, int version_id) > +{ > + ESPState *s = ESP(opaque); > + > + version_id = MIN(version_id, s->mig_version_id); > + return version_id < 5; > +} > + > static int esp_pre_save(void *opaque) > { > ESPState *s = ESP(opaque); > @@ -836,6 +843,12 @@ static int esp_post_load(void *opaque, int version_id) > { > ESPState *s = ESP(opaque); > > + version_id = MIN(version_id, s->mig_version_id); > + > + if (version_id < 5) { > + esp_set_tc(s, s->mig_dma_left); > + } > + > s->mig_version_id = vmstate_esp.version_id; > return 0; > } > @@ -861,7 +874,7 @@ const VMStateDescription vmstate_esp = { > VMSTATE_BUFFER_START_MIDDLE_V(cmdbuf, ESPState, 16, 4), > VMSTATE_UINT32(cmdlen, ESPState), > VMSTATE_UINT32(do_cmd, ESPState), > - VMSTATE_UINT32(dma_left, ESPState), > + VMSTATE_UINT32_TEST(mig_dma_left, ESPState, esp_is_before_version_5), > VMSTATE_END_OF_LIST() > }, > .subsections = (const VMStateDescription * []) { > @@ -904,12 +917,11 @@ static void sysbus_esp_pdma_write(void *opaque, hwaddr addr, > { > SysBusESPState *sysbus = opaque; > ESPState *s = ESP(&sysbus->esp); > - uint32_t dmalen; > + uint32_t dmalen = esp_get_tc(s); > uint8_t *buf = get_pdma_buf(s); > > trace_esp_pdma_write(size); > > - dmalen = esp_get_tc(s); > if (dmalen == 0 || s->pdma_len == 0) { > return; > } > @@ -939,27 +951,30 @@ static uint64_t sysbus_esp_pdma_read(void *opaque, hwaddr addr, > { > SysBusESPState *sysbus = opaque; > ESPState *s = ESP(&sysbus->esp); > + uint32_t dmalen = esp_get_tc(s); > uint8_t *buf = get_pdma_buf(s); > uint64_t val = 0; > > trace_esp_pdma_read(size); > > - if (s->pdma_len == 0) { > + if (dmalen == 0 || s->pdma_len == 0) { > return 0; > } > switch (size) { > case 1: > val = buf[s->pdma_cur++]; > s->pdma_len--; > + dmalen--; > break; > case 2: > val = buf[s->pdma_cur++]; > val = (val << 8) | buf[s->pdma_cur++]; > s->pdma_len -= 2; > + dmalen -= 2; > break; > } > - > - if (s->pdma_len == 0 && s->pdma_cb) { > + esp_set_tc(s, dmalen); > + if (dmalen == 0 || (s->pdma_len == 0 && s->pdma_cb)) { > esp_lower_drq(s); > s->pdma_cb(s); > s->pdma_cb = NULL; > diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h > index b313ef27f2..9fad320513 100644 > --- a/include/hw/scsi/esp.h > +++ b/include/hw/scsi/esp.h > @@ -48,8 +48,6 @@ struct ESPState { > uint32_t cmdlen; > uint32_t do_cmd; > > - /* The amount of data left in the current DMA transfer. */ > - uint32_t dma_left; > int dma_enabled; > > uint32_t async_len; > @@ -67,6 +65,9 @@ struct ESPState { > void (*pdma_cb)(ESPState *s); > > uint8_t mig_version_id; > + > + /* Legacy fields for vmstate_esp version < 5 */ > + uint32_t mig_dma_left; > }; > > #define TYPE_SYSBUS_ESP "sysbus-esp" > Reviewed-by: Laurent Vivier