From nobody Mon Feb 9 19:05:55 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=1639658188; cv=none; d=zohomail.com; s=zohoarc; b=gBqyBI0LKBSyppJF9N31jts/iEwzvxbFkom0X/IrXhofLhxB5Y96oJvNTK6YuDDLlw6bK0p4GCfmUOhvrzcM4ozhZWztPAXLAtTht+vwaqcaFAB/XDI2tqoflLnc+ZOtuxI6aA+6d6YVNCDt5b8yKh1y202qWG75XalnVoh+wuM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639658188; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=q3jfzfAWXoz2z5mwoL5Qi09iCpO4M7rxflJUJE8g74U=; b=JbBObYCewLlFgZ6wb14gMLOhaeIFenjCh3Q33dJGoY8+XIPwPAW3ZDdflAm/ovKjJteoefraeyO3T8OCN6Vh99jKEJG5EiLmColxh/89sjluN2dKhGqTiQWucMicjeB9B2Vz6rsl1nwq+DcLev5m/lkbkcaqgwlmMDZEFMx+BNU= 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 1639658188214201.0106339568348; Thu, 16 Dec 2021 04:36:28 -0800 (PST) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-79-YtyF4a_jN-qzRN6a2_8cCA-1; Thu, 16 Dec 2021 07:36:23 -0500 Received: by mail-wm1-f71.google.com with SMTP id b75-20020a1c804e000000b0034569bde713so1196581wmd.9 for ; Thu, 16 Dec 2021 04:36:23 -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 y11sm5960415wry.70.2021.12.16.04.36.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Dec 2021 04:36:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639658187; 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=q3jfzfAWXoz2z5mwoL5Qi09iCpO4M7rxflJUJE8g74U=; b=RbicoO0/ltdtS/8oggfmYPcON2nf1lfZUEVS20B31UQzP7uosGruESRqVh/QLkgfUpDKg8 Ye3beJvFVhwg0saC6UC6a4Q4NhgXaE9C0tevJ33P7M30ynCKLEHSDOYuy/1fWSFOG1MTYV 4n42paQwMR2A50fauCFmIjXvJFnrw0s= X-MC-Unique: YtyF4a_jN-qzRN6a2_8cCA-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=q3jfzfAWXoz2z5mwoL5Qi09iCpO4M7rxflJUJE8g74U=; b=rzxqGJef0VPrO8qk5djFeT0Qpy8DWn98CVpTlbtSAHlt01Xi5sZ7kFYx86AbT8FuFL 2J0RLH0TfTaHqdFFna06fLG4xNqJMRppn8GXJ7+QQ+ryXuY7i8Aw4w134qEND/5KIz18 JIhylWWw2bdyYpA4TTHhnerzOfpDxLnioAxvDOEYokNBeYaf3B2bK+iVC++PLOKTgsLl l5UW1hsSc9q7pQxNv4Gu85U+Rr/c1Sa0lIOQP44wn0CXvyVagiZvWDQ/2N1fUL9zkTOq 7SaherMH/g2g4bXv+vuRrMdpXinyygoY8zkju3QMsUfmPduik8NuY8IKwhs+qHOpq5kh DmEg== X-Gm-Message-State: AOAM530iSNIdTLlQiHmA29cTogQxQF+ZpLEbBtvH+5U2AnOo0APNqmww /ZoSOB5OEWGCylEM7mdXTzq0V3mrC4m1PuB5JflEybGl9poaAmuUvyfozVLP53dLoNvQx1luGId mTKfxyoJGquDjHA== X-Received: by 2002:a5d:6c67:: with SMTP id r7mr8738400wrz.286.1639658182831; Thu, 16 Dec 2021 04:36:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJzrbMToH/xA0DjntMIzdR8zMyWWz2Dh4GXWc9kRQZGRBQmf8ZHJ3aIiX0bVgHUkgBOu0tWY5w== X-Received: by 2002:a5d:6c67:: with SMTP id r7mr8738374wrz.286.1639658182687; Thu, 16 Dec 2021 04:36:22 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Xu , Alexander Bulekov , qemu-block@nongnu.org, Qiuhao Li , Hannes Reinecke , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen , Jason Wang , Li Qiang , Paolo Bonzini , David Hildenbrand , "Michael S. Tsirkin" , John Snow , Gerd Hoffmann , Marcel Apfelbaum , Keith Busch , Fam Zheng Subject: [PATCH 3/8] dma: Let pci_dma_rw() take MemTxAttrs argument Date: Thu, 16 Dec 2021 13:35:53 +0100 Message-Id: <20211216123558.799425-4-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211216123558.799425-1-philmd@redhat.com> References: <20211216123558.799425-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: 1639658190427100001 Let devices specify transaction attributes when calling pci_dma_rw(). Keep the default MEMTXATTRS_UNSPECIFIED in the few callers. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/pci/pci.h | 10 ++++++---- hw/audio/intel-hda.c | 3 ++- hw/scsi/esp-pci.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index 1acefc2a4c3..a751ab5a75d 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -806,10 +806,10 @@ static inline AddressSpace *pci_get_address_space(PCI= Device *dev) */ static inline MemTxResult pci_dma_rw(PCIDevice *dev, dma_addr_t addr, void *buf, dma_addr_t len, - DMADirection dir) + DMADirection dir, MemTxAttrs attrs) { return dma_memory_rw(pci_get_address_space(dev), addr, buf, len, - dir, MEMTXATTRS_UNSPECIFIED); + dir, attrs); } =20 /** @@ -827,7 +827,8 @@ static inline MemTxResult pci_dma_rw(PCIDevice *dev, dm= a_addr_t addr, static inline MemTxResult pci_dma_read(PCIDevice *dev, dma_addr_t addr, void *buf, dma_addr_t len) { - return pci_dma_rw(dev, addr, buf, len, DMA_DIRECTION_TO_DEVICE); + return pci_dma_rw(dev, addr, buf, len, + DMA_DIRECTION_TO_DEVICE, MEMTXATTRS_UNSPECIFIED); } =20 /** @@ -845,7 +846,8 @@ static inline MemTxResult pci_dma_read(PCIDevice *dev, = dma_addr_t addr, static inline MemTxResult pci_dma_write(PCIDevice *dev, dma_addr_t addr, const void *buf, dma_addr_t len) { - return pci_dma_rw(dev, addr, (void *) buf, len, DMA_DIRECTION_FROM_DEV= ICE); + return pci_dma_rw(dev, addr, (void *) buf, len, + DMA_DIRECTION_FROM_DEVICE, MEMTXATTRS_UNSPECIFIED); } =20 #define PCI_DMA_DEFINE_LDST(_l, _s, _bits) \ diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index 8ce9df64e3e..fb3d34a4a0c 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -427,7 +427,8 @@ static bool intel_hda_xfer(HDACodecDevice *dev, uint32_= t stnr, bool output, dprint(d, 3, "dma: entry %d, pos %d/%d, copy %d\n", st->be, st->bp, st->bpl[st->be].len, copy); =20 - pci_dma_rw(&d->pci, st->bpl[st->be].addr + st->bp, buf, copy, !out= put); + pci_dma_rw(&d->pci, st->bpl[st->be].addr + st->bp, buf, copy, !out= put, + MEMTXATTRS_UNSPECIFIED); st->lpib +=3D copy; st->bp +=3D copy; buf +=3D copy; diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c index dac054aeed4..1792f84cea6 100644 --- a/hw/scsi/esp-pci.c +++ b/hw/scsi/esp-pci.c @@ -280,7 +280,7 @@ static void esp_pci_dma_memory_rw(PCIESPState *pci, uin= t8_t *buf, int len, len =3D pci->dma_regs[DMA_WBC]; } =20 - pci_dma_rw(PCI_DEVICE(pci), addr, buf, len, dir); + pci_dma_rw(PCI_DEVICE(pci), addr, buf, len, dir, MEMTXATTRS_UNSPECIFIE= D); =20 /* update status registers */ pci->dma_regs[DMA_WBC] -=3D len; --=20 2.33.1