From patchwork Thu Jun 13 01:34:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fea.Wang" X-Patchwork-Id: 1947206 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=sifive.com header.i=@sifive.com header.a=rsa-sha256 header.s=google header.b=mHRVZj3r; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4W04cg4Ll2z23tx for ; Thu, 13 Jun 2024 11:31:13 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHZHt-0001tP-3s; Wed, 12 Jun 2024 21:30:01 -0400 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 1sHZHs-0001sO-4z for qemu-devel@nongnu.org; Wed, 12 Jun 2024 21:30:00 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sHZHp-00089W-V9 for qemu-devel@nongnu.org; Wed, 12 Jun 2024 21:29:59 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1f70c457823so4167475ad.3 for ; Wed, 12 Jun 2024 18:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1718242196; x=1718846996; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pKkT300tlD3TQh5kFCyDOARg3WfWGx7ttZZNCCqlZ5k=; b=mHRVZj3rkDhzoSyr0ESZyHfBVR9QcI3Al7vW/DCpaL2/oSYSuBB9gwqummXQbGtgwH wn2a5fkBNdgUMbw3zly0sP62aPdQPAqu0waE+MbQ3IJye88DgigMhJEQ76DByn3/DJZc cQ8BSQICjhl77ULa7uYRGcGIv84eh53m668Cqe5mkNXxuNFtP1DSHEGPzjedHdsBYnp3 0VlVtlKvMX62yQS9d9djKIVNfB5f8TOOHxcawWEUWR+Cg2TlKiiwcTlG4BMHC3DPUgY/ cPg4RmvtV5iTmMpYj/rNNBCSzJNIryVQ1GtRbHi9W2NTrrGID4C+/ByIWJoDhhCosW+t UkjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718242196; x=1718846996; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pKkT300tlD3TQh5kFCyDOARg3WfWGx7ttZZNCCqlZ5k=; b=DlJ4Y/T371N7isr0OQRJ7ETrzPRCywwJlxA9lV+LGhDKv7Q7QoP8mmn252r9ncOoMU Civ9vPuLnkt18cTgrOTmqcsr+IDQcnb8ogfrUHS29rJ9YribqiRQ6JlTe/lo42Xx/G31 KM3kUvaSwsWPB9kRDTnN/bagtoKdbGMudTNwSskz2X6Fkvheci+w4WTrGNKu+RkYcyqs ueUR1m9UDOtVGU0OK/uaq5ApZjTveC4DJ2GkBOiXai+4mpPo0PTniP3KaLMicP33CpBN M7ecNSQC+S/IkUd4OdeFlsj2Dt9xRj17Lu94/PY1/8t4H4AxZI3sh8OkmujMZho2lt95 6PZQ== X-Gm-Message-State: AOJu0Yye0gvbNu9twTWLgFzuXkFVNi9xOHEzbMpAZ9Rx/7c1zAwzOqWf x8++981li0y5myDqAAv7B927Lqt+wDJykTPS5ovzPjm3XeUz5BMjAlKfMhSQqc6UH+sXIbp3H7x vxuLYfPDoLcLVcKGvQOCxJSqNnmXvunqjpLUurex8l46vrLofqvHzJ7FVyPCI777y425jgHmFet v/j3hVnw4HRKo+gQc+eecUrxuLv7H30gevRF8= X-Google-Smtp-Source: AGHT+IEi1HPMZ9NzQqEfmQPReCnDoxjnDejhtbIx8XTp5yJtqII1z4JIArhntGtUalSIAABAAYJRuQ== X-Received: by 2002:a17:902:d50b:b0:1f7:38a2:f1ec with SMTP id d9443c01a7336-1f83b67a940mr43752995ad.36.1718242196123; Wed, 12 Jun 2024 18:29:56 -0700 (PDT) Received: from hsinchu36-syssw02.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855e723fasm1264155ad.97.2024.06.12.18.29.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jun 2024 18:29:55 -0700 (PDT) From: "Fea.Wang" To: qemu-devel@nongnu.org, qemu-riscv@nongnu.org Cc: "Edgar E. Iglesias" , Alistair Francis , Peter Maydell , Jason Wang , qemu-arm@nongnu.org (open list:Xilinx Zynq), "Fea.Wang" , Frank Chang Subject: [PATCH v3 1/3] hw/dma: Enhance error handling in loading description Date: Thu, 13 Jun 2024 09:34:59 +0800 Message-Id: <20240613013501.426905-2-fea.wang@sifive.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240613013501.426905-1-fea.wang@sifive.com> References: <20240613013501.426905-1-fea.wang@sifive.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::634; envelope-from=fea.wang@sifive.com; helo=mail-pl1-x634.google.com 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Loading a description from memory may cause a bus-error. In this case, the DMA should stop working, set the error flag, and return the failure value. When calling the loading a description function, it should be noticed that the function may return a failure value. Breaking the loop in this case is one of the possible ways to handle it. Signed-off-by: Fea.Wang Reviewed-by: Frank Chang --- hw/dma/xilinx_axidma.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c index 0ae056ed06..ad307994c2 100644 --- a/hw/dma/xilinx_axidma.c +++ b/hw/dma/xilinx_axidma.c @@ -71,8 +71,11 @@ enum { enum { DMASR_HALTED = 1, DMASR_IDLE = 2, + DMASR_SLVERR = 1 << 5, + DMASR_DECERR = 1 << 6, DMASR_IOC_IRQ = 1 << 12, DMASR_DLY_IRQ = 1 << 13, + DMASR_ERR_IRQ = 1 << 14, DMASR_IRQ_MASK = 7 << 12 }; @@ -190,17 +193,32 @@ static inline int streamid_from_addr(hwaddr addr) return sid; } -static void stream_desc_load(struct Stream *s, hwaddr addr) +static MemTxResult stream_desc_load(struct Stream *s, hwaddr addr) { struct SDesc *d = &s->desc; - address_space_read(&s->dma->as, addr, MEMTXATTRS_UNSPECIFIED, d, sizeof *d); + MemTxResult result = address_space_read(&s->dma->as, + addr, MEMTXATTRS_UNSPECIFIED, + d, sizeof *d); + if (result != MEMTX_OK) { + if (result == MEMTX_DECODE_ERROR) { + s->regs[R_DMASR] |= DMASR_DECERR; + } else { + s->regs[R_DMASR] |= DMASR_SLVERR; + } + + s->regs[R_DMACR] &= ~DMACR_RUNSTOP; + s->regs[R_DMASR] |= DMASR_HALTED; + s->regs[R_DMASR] |= DMASR_ERR_IRQ; + return result; + } /* Convert from LE into host endianness. */ d->buffer_address = le64_to_cpu(d->buffer_address); d->nxtdesc = le64_to_cpu(d->nxtdesc); d->control = le32_to_cpu(d->control); d->status = le32_to_cpu(d->status); + return result; } static void stream_desc_store(struct Stream *s, hwaddr addr) @@ -279,7 +297,9 @@ static void stream_process_mem2s(struct Stream *s, StreamSink *tx_data_dev, } while (1) { - stream_desc_load(s, s->regs[R_CURDESC]); + if (MEMTX_OK != stream_desc_load(s, s->regs[R_CURDESC])) { + break; + } if (s->desc.status & SDESC_STATUS_COMPLETE) { s->regs[R_DMASR] |= DMASR_HALTED; @@ -336,7 +356,9 @@ static size_t stream_process_s2mem(struct Stream *s, unsigned char *buf, } while (len) { - stream_desc_load(s, s->regs[R_CURDESC]); + if (MEMTX_OK != stream_desc_load(s, s->regs[R_CURDESC])) { + break; + } if (s->desc.status & SDESC_STATUS_COMPLETE) { s->regs[R_DMASR] |= DMASR_HALTED;