From patchwork Fri Feb 16 21:06:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Cave-Ayland X-Patchwork-Id: 13560689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A6154C48260 for ; Fri, 16 Feb 2024 21:09:01 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rb5QQ-00069e-V2; Fri, 16 Feb 2024 16:07:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rb5QK-000657-VI for qemu-devel@nongnu.org; Fri, 16 Feb 2024 16:07:08 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rb5QE-0005LC-4L for qemu-devel@nongnu.org; Fri, 16 Feb 2024 16:07:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=+WHNdaOKHm7Ucu9jlXaFyhsYY37eka0uaRCKHKRa+UA=; b=RklaEEXYWSR+hKTSBFAGwZ1IdF L0B4I2F40W15oHU5sKrUheHnjeAYhIURry0JsDqL3Py8bBXA/7zzJuRkBpHmoOiUJN+bF5z24DpwF D0LtwsIlKTAHQZDhP5xP/FvEWmHpxn7XdNd/LGOohk/gyHeH3jG/DsYO0lueFYbIzvUtVZqo7umay 4yeLOxIGs5nGhRGvJoFYGMnyy2XDJoteL4Qe+8b/2uY38GcrBdQxyE4fMgSd3GK5DKDqqUFOahvqb upKeLMLqjuH0M72Y+IQNp6iLY7zGKOQjOfkFbs2Ey0S2AzlXQSNioHK72wqbLCGGjle8TYewdtqmh tadeuLF+oO6AWZldrGBlUs7IYCUgCBnQLemoaBtZ/F+hBLU9Bav4phCkKUnKKz4Re69BiIEwboLKY ASIRPrPJB3QGMvD9TZKJErLWyNrG8sTWI3/o37UDsGC0816uC7GHNkvsacJQu0UNQEa2Oobroabg9 uZRIJyV0ofQPZEzuQsJLEM7jGUMI2MocmZev5sYzDlnyZFnYAFyNxZ7IW3jRwqcWLkETmzyRqOytl EFXcCfqAxoKnYlyTX+xLKE6qxyyFCAOI56UD3UzyoDEMet+Sczuu/lC9U4hsOYpHoZyyAgnHXv4Ma HrYgzzjCsNRPXsudjBZrThKEyEo/fHv22IVY18lYk=; Received: from [2a00:23c4:8bb2:1300:b76e:9764:d1ca:4e3f] (helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rb5PM-0000vT-GE; Fri, 16 Feb 2024 21:06:12 +0000 From: Mark Cave-Ayland To: pbonzini@redhat.com, fam@euphon.net, laurent@vivier.eu, qemu-devel@nongnu.org Date: Fri, 16 Feb 2024 21:06:22 +0000 Message-Id: <20240216210633.1376066-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240216210633.1376066-1-mark.cave-ayland@ilande.co.uk> References: <20240216210633.1376066-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2a00:23c4:8bb2:1300:b76e:9764:d1ca:4e3f X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 02/13] esp.c: replace cmdfifo use of esp_fifo_pop_buf() in do_message_phase() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) Received-SPF: pass client-ip=2001:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+qemu-devel=archiver.kernel.org@nongnu.org The aim is to restrict the esp_fifo_*() functions so that they only operate on the hardware FIFO. When reading from cmdfifo in do_message_phase() use the underlying Fifo8 functions directly. Signed-off-by: Mark Cave-Ayland --- hw/scsi/esp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index f8230c74b3..100560244b 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -309,6 +309,8 @@ static void do_command_phase(ESPState *s) static void do_message_phase(ESPState *s) { + uint32_t n; + if (s->cmdfifo_cdb_offset) { uint8_t message = esp_fifo_pop(&s->cmdfifo); @@ -320,7 +322,10 @@ static void do_message_phase(ESPState *s) /* Ignore extended messages for now */ if (s->cmdfifo_cdb_offset) { int len = MIN(s->cmdfifo_cdb_offset, fifo8_num_used(&s->cmdfifo)); - esp_fifo_pop_buf(&s->cmdfifo, NULL, len); + + if (len) { + fifo8_pop_buf(&s->cmdfifo, len, &n); + } s->cmdfifo_cdb_offset = 0; } }