From nobody Fri Oct 25 19:38:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1614895974; cv=none; d=zohomail.com; s=zohoarc; b=lILdhSXY3rZzVCshkJKqbFhFoXytohmvOqRuk1WndCDfN9SIMyI2sZ3MVQ/UcQLVJffsaw60hCZfpATg86VBKZumNgHiD5Jo9lRybGxSJKt471VBFZsM54xuD0dmflhQKdyTGhTbtDCUDwyWr6kbybmbXfZbrA1XkBb5eC4+hOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614895974; h=Content-Type:Content-Transfer-Encoding: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=Xbk2qcvZKa5PkqTm++eA/m67Y583sdBPDwOd8Hc91kM=; b=KkbQzUXb4Dcc3g41NW/a/PAmoSW2bu5cls0XQfZyKYx3qfphrkrhEEP69gUuoC2dvq41JvJPie5Inz0QKncqPRiC4Zk8UQGepgosrU+8HUe1BfI9kNVtiyfPS8mx/x56bSwW/nWVK4I8Ewex2jyAzADfwpHRWTBMvJzxn+J+QVw= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161489597466265.32988531454293; Thu, 4 Mar 2021 14:12:54 -0800 (PST) Received: from localhost ([::1]:56694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHwDF-0005r7-4C for importer@patchew.org; Thu, 04 Mar 2021 17:12:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53122) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHwBr-0004Yz-NI for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:11:27 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:39902 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHwBl-0005Oq-MI for qemu-devel@nongnu.org; Thu, 04 Mar 2021 17:11:25 -0500 Received: from host86-148-34-47.range86-148.btcentralplus.com ([86.148.34.47] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lHwBf-0008MJ-0e; Thu, 04 Mar 2021 22:11:18 +0000 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu Date: Thu, 4 Mar 2021 22:10:22 +0000 Message-Id: <20210304221103.6369-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210304221103.6369-1-mark.cave-ayland@ilande.co.uk> References: <20210304221103.6369-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.34.47 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v3 01/42] esp: checkpatch fixes X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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; Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io 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, SPF_HELO_NONE=0.001, SPF_PASS=-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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- hw/scsi/esp.c | 52 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 93d9c9c7b9..6bb4025d2a 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -241,8 +241,9 @@ static void handle_satn(ESPState *s) } s->pdma_cb =3D satn_pdma_cb; len =3D get_cmd(s, buf, sizeof(buf)); - if (len) + if (len) { do_cmd(s, buf); + } } =20 static void s_without_satn_pdma_cb(ESPState *s) @@ -398,8 +399,8 @@ static void esp_do_dma(ESPState *s) * handle_ti_cmd() with do_cmd !=3D NULL (see the assert()) */ trace_esp_do_dma(s->cmdlen, len); - assert (s->cmdlen <=3D sizeof(s->cmdbuf) && - len <=3D sizeof(s->cmdbuf) - s->cmdlen); + assert(s->cmdlen <=3D sizeof(s->cmdbuf) && + len <=3D sizeof(s->cmdbuf) - s->cmdlen); if (s->dma_memory_read) { s->dma_memory_read(s->dma_opaque, &s->cmdbuf[s->cmdlen], len); } else { @@ -445,15 +446,18 @@ static void esp_do_dma(ESPState *s) s->dma_left -=3D len; s->async_buf +=3D len; s->async_len -=3D len; - if (to_device) + if (to_device) { s->ti_size +=3D len; - else + } else { s->ti_size -=3D len; + } if (s->async_len =3D=3D 0) { scsi_req_continue(s->current_req); - /* If there is still data to be read from the device then - complete the DMA operation immediately. Otherwise defer - until the scsi layer has completed. */ + /* + * If there is still data to be read from the device then + * complete the DMA operation immediately. Otherwise defer + * until the scsi layer has completed. + */ if (to_device || s->dma_left !=3D 0 || s->ti_size =3D=3D 0) { return; } @@ -490,7 +494,8 @@ void esp_command_complete(SCSIRequest *req, size_t resi= d) ESPState *s =3D req->hba_private; =20 if (s->rregs[ESP_RSTAT] & STAT_INT) { - /* Defer handling command complete until the previous + /* + * Defer handling command complete until the previous * interrupt has been handled. */ trace_esp_command_complete_deferred(); @@ -512,8 +517,10 @@ void esp_transfer_data(SCSIRequest *req, uint32_t len) if (s->dma_left) { esp_do_dma(s); } else if (s->dma_counter !=3D 0 && s->ti_size <=3D 0) { - /* If this was the last part of a DMA transfer then the - completion interrupt is deferred to here. */ + /* + * If this was the last part of a DMA transfer then the + * completion interrupt is deferred to here. + */ esp_dma_done(s); } } @@ -530,17 +537,18 @@ static void handle_ti(ESPState *s) dmalen =3D s->rregs[ESP_TCLO]; dmalen |=3D s->rregs[ESP_TCMID] << 8; dmalen |=3D s->rregs[ESP_TCHI] << 16; - if (dmalen=3D=3D0) { - dmalen=3D0x10000; + if (dmalen =3D=3D 0) { + dmalen =3D 0x10000; } s->dma_counter =3D dmalen; =20 - if (s->do_cmd) + if (s->do_cmd) { minlen =3D (dmalen < ESP_CMDBUF_SZ) ? dmalen : ESP_CMDBUF_SZ; - else if (s->ti_size < 0) + } else if (s->ti_size < 0) { minlen =3D (dmalen < -s->ti_size) ? dmalen : -s->ti_size; - else + } else { minlen =3D (dmalen < s->ti_size) ? dmalen : s->ti_size; + } trace_esp_handle_ti(minlen); if (s->dma) { s->dma_left =3D minlen; @@ -605,8 +613,10 @@ uint64_t esp_reg_read(ESPState *s, uint32_t saddr) } break; case ESP_RINTR: - /* Clear sequence step, interrupt register and all status bits - except TC */ + /* + * Clear sequence step, interrupt register and all status bits + * except TC + */ old_val =3D s->rregs[ESP_RINTR]; s->rregs[ESP_RINTR] =3D 0; s->rregs[ESP_RSTAT] &=3D ~STAT_TC; @@ -664,13 +674,13 @@ void esp_reg_write(ESPState *s, uint32_t saddr, uint6= 4_t val) } else { s->dma =3D 0; } - switch(val & CMD_CMD) { + switch (val & CMD_CMD) { case CMD_NOP: trace_esp_mem_writeb_cmd_nop(val); break; case CMD_FLUSH: trace_esp_mem_writeb_cmd_flush(val); - //s->ti_size =3D 0; + /*s->ti_size =3D 0;*/ s->rregs[ESP_RINTR] =3D INTR_FC; s->rregs[ESP_RSEQ] =3D 0; s->rregs[ESP_RFLAGS] =3D 0; @@ -786,7 +796,7 @@ static const VMStateDescription vmstate_esp_pdma =3D { }; =20 const VMStateDescription vmstate_esp =3D { - .name =3D"esp", + .name =3D "esp", .version_id =3D 4, .minimum_version_id =3D 3, .fields =3D (VMStateField[]) { --=20 2.20.1