From nobody Tue Feb 10 01:19:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1639601834; cv=none; d=zohomail.com; s=zohoarc; b=G855HV6Idin1v5AyK6xRcn2C2BFRAFzTM8tbNPlGeA42SfMFp1bZCf54nOx2g1h31xhnvqC6Qw6k0wGV/pRl/zPb2V7qacpUX2+6Fk/RGSmfXfXfTTfHlt3spBLFXoVTubhMOKpaqYB9WrU5Ugs+HLvSXII56w1nZ1DC9aW19ns= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639601834; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=OOkRh2MZ/DBLfZ4HT9jmHJS4If0ihWIm6frAMrPlFV0=; b=NuosxGp7U05IE4LOU5EXYQZR4cz7i7rPLc/fVACSbT+AuMCTlFIjg4vsfTHitZSysAJ9rP4tqCe1PJvBNHxtksT1jL4yTWeYm1ZkbcOynGEZMBaNGS6JCjrvQ+6hz0bvNq104yWj89LYPICXwEPyim2hwxDUwbSPt5uWlmqE0BI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1639601834030775.1546493297715; Wed, 15 Dec 2021 12:57:14 -0800 (PST) Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-499-Lg7RkmNlODaCfGPcGhlN5A-1; Wed, 15 Dec 2021 15:57:11 -0500 Received: by mail-wm1-f70.google.com with SMTP id b75-20020a1c804e000000b0034569bde713so162188wmd.9 for ; Wed, 15 Dec 2021 12:57:11 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (174.red-83-50-185.dynamicip.rima-tde.net. [83.50.185.174]) by smtp.gmail.com with ESMTPSA id f15sm3521642wmg.30.2021.12.15.12.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 12:57:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639601833; 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=OOkRh2MZ/DBLfZ4HT9jmHJS4If0ihWIm6frAMrPlFV0=; b=eL83DB4m1h/zV+i9j2aTa2f3ZBZ/VHdKasYchAi305zxkIGmZVpZ7xGFbCqc6Rf9YV7gT9 4x8hI5El+HURHh9Vi/s2vKPkgDfrikH6GF47iA7dVRntWn3BQrxK8hv6D8gZPnR+z25Dlj eZKlsWzKaxOs1GFa/p3fBl3SULblenc= X-MC-Unique: Lg7RkmNlODaCfGPcGhlN5A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OOkRh2MZ/DBLfZ4HT9jmHJS4If0ihWIm6frAMrPlFV0=; b=cesEz77QtEhLArHpUgBXFTAzvF9eLryasUQbhHWvv0/9ZBbfBFLrZxYiMEz3vB/Z04 PzGwN++KCVRnIxsL1SUOc3TpkcG60EKViUqcOXtu+BSF9zctXkZt3Vs9HEhh3yxaRjOm mCXFYr0YGOpEmjtRCdhJnjVz3yEBMm0nn+4mx179BB/TnXBSSuvGsjrKo/QADJgtM/9B H29PlN02zooa4N61HtobX87oncHJev2lAObH4Q/fHdCe9/S6hru9Y/0aZRbP5K9yLesa SufFerV8JVLXLG1cBN6tgqixrQqR/gZnfndiRsQoKHdLyt6DUYEs+du6tNfUbDrynxDO rhag== X-Gm-Message-State: AOAM533+2LsyUcl1Roc7dEdokn4nwTtnrtYcqF639cnAHrirTkSGkF1F cEEVn9wUaVc/QqjTbZIgjjah6fPB4f64qwnrlV47YP/ZOZl/dBgJyHX6j2TWut/1u95ZOyzfpRy RNd151AkhT8eT3Q== X-Received: by 2002:adf:ec85:: with SMTP id z5mr1529829wrn.568.1639601830671; Wed, 15 Dec 2021 12:57:10 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgX1cpLtsgJ3wxILAQYLUhqa2o58p5r47g9Uo5MGHKubIQ/xUVRmrWJro6fBZy7QKMDdlylQ== X-Received: by 2002:adf:ec85:: with SMTP id z5mr1529806wrn.568.1639601830512; Wed, 15 Dec 2021 12:57:10 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Li Qiang , David Hildenbrand , Paolo Bonzini , qemu-block@nongnu.org, Gerd Hoffmann , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Darren Kenny , Peter Maydell , Peter Xu , Jason Wang , Qiuhao Li , Bandan Das , Laurent Vivier , "Edgar E . Iglesias" , Stefan Hajnoczi , Bin Meng , Alexander Bulekov Subject: [RFC PATCH 1/3] hw/sd/sdhci: Honor failed DMA transactions Date: Wed, 15 Dec 2021 21:56:54 +0100 Message-Id: <20211215205656.488940-2-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211215205656.488940-1-philmd@redhat.com> References: <20211215205656.488940-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639601834663100001 From: Philippe Mathieu-Daud=C3=A9 DMA transactions might fail. The DMA API returns a MemTxResult, indicating such failures. Do not ignore it. On failure, raise the ADMA error flag and eventually triggering an IRQ (see spec chapter 1.13.5: "ADMA2 States"). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- hw/sd/sdhci.c | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index e0bbc903446..fe2f21f0c37 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -742,6 +742,7 @@ static void sdhci_do_adma(SDHCIState *s) unsigned int begin, length; const uint16_t block_size =3D s->blksize & BLOCK_SIZE_MASK; ADMADescr dscr =3D {}; + MemTxResult res; int i; =20 if (s->trnmod & SDHC_TRNS_BLK_CNT_EN && !s->blkcnt) { @@ -790,10 +791,13 @@ static void sdhci_do_adma(SDHCIState *s) s->data_count =3D block_size; length -=3D block_size - begin; } - dma_memory_write(s->dma_as, dscr.addr, - &s->fifo_buffer[begin], - s->data_count - begin, - MEMTXATTRS_UNSPECIFIED); + res =3D dma_memory_write(s->dma_as, dscr.addr, + &s->fifo_buffer[begin], + s->data_count - begin, + MEMTXATTRS_UNSPECIFIED); + if (res !=3D MEMTX_OK) { + break; + } dscr.addr +=3D s->data_count - begin; if (s->data_count =3D=3D block_size) { s->data_count =3D 0; @@ -816,10 +820,13 @@ static void sdhci_do_adma(SDHCIState *s) s->data_count =3D block_size; length -=3D block_size - begin; } - dma_memory_read(s->dma_as, dscr.addr, - &s->fifo_buffer[begin], - s->data_count - begin, - MEMTXATTRS_UNSPECIFIED); + res =3D dma_memory_read(s->dma_as, dscr.addr, + &s->fifo_buffer[begin], + s->data_count - begin, + MEMTXATTRS_UNSPECIFIED); + if (res !=3D MEMTX_OK) { + break; + } dscr.addr +=3D s->data_count - begin; if (s->data_count =3D=3D block_size) { sdbus_write_data(&s->sdbus, s->fifo_buffer, block_= size); @@ -833,7 +840,16 @@ static void sdhci_do_adma(SDHCIState *s) } } } - s->admasysaddr +=3D dscr.incr; + if (res !=3D MEMTX_OK) { + if (s->errintstsen & SDHC_EISEN_ADMAERR) { + trace_sdhci_error("Set ADMA error flag"); + s->errintsts |=3D SDHC_EIS_ADMAERR; + s->norintsts |=3D SDHC_NIS_ERR; + } + sdhci_update_irq(s); + } else { + s->admasysaddr +=3D dscr.incr; + } break; case SDHC_ADMA_ATTR_ACT_LINK: /* link to next descriptor table */ s->admasysaddr =3D dscr.addr; --=20 2.33.1