From nobody Tue Feb 10 01:15:32 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1640912199; cv=none; d=zohomail.com; s=zohoarc; b=cHyLEA8OeleHwHjqNb0Oob5vYPYfbRjHEZ7/xNAvXFNC7Iqrh1ShfRJ8wQLpRvIBaymSxp7bYsZu4a/At8OPCXYfGxBqehpwk1AsDMMPNygwCm2xxpjltSVQwTIkIli8C9SFCJ6DaM6HLQh2pZuWo5F5CYZUiX1dTlzal2D04Uw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640912199; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=z4OtSfjPggV0SCf5NnhwjZXBrLozwaJfQy6f5j8NafY=; b=eKOVGHosXWs35pD5Lp5dX/kxAGAw37aZcDzj13Ehh3NcVxTH50KpinSkx5KRfSm2VpGI+od0OR9zdmxJw3COB+7UBFiBT1p7AzCqIHO6//Ab+U5FHvZhUVTcF9GgxWRY215qhgOnPAcrFkUTtsCVtuT++ClB1F9rrIiAG5mskD4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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.133.124]) by mx.zohomail.com with SMTPS id 1640912199439804.9614976694315; Thu, 30 Dec 2021 16:56:39 -0800 (PST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-548-M4pMwLzpMgKwvnjPoDFdXA-1; Thu, 30 Dec 2021 19:56:37 -0500 Received: by mail-ed1-f70.google.com with SMTP id w6-20020a05640234c600b003f916e1b615so8835423edc.17 for ; Thu, 30 Dec 2021 16:56:37 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (26.red-83-50-86.dynamicip.rima-tde.net. [83.50.86.26]) by smtp.gmail.com with ESMTPSA id u21sm10054371eds.8.2021.12.30.16.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 16:56:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640912198; 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=z4OtSfjPggV0SCf5NnhwjZXBrLozwaJfQy6f5j8NafY=; b=dAlEt2odWshi0tMllegXZcQll2WHSmz4YsMYa3IUzYTNHXBVDqf1HgnypfN59EIqw6CZeR wQqhP9/Es3bAO8UL5tOJoBYgSligOWgGhgAylQmf+5L8ztnpfb0mtXcHpPBqxtFhtUhz5X nOsMu9nQLZxNGcwWefyE0IRhQBJNK/8= X-MC-Unique: M4pMwLzpMgKwvnjPoDFdXA-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=z4OtSfjPggV0SCf5NnhwjZXBrLozwaJfQy6f5j8NafY=; b=A/DK7BaHa+TjhTPOIRUUYPFYOC8NI7qC74X7BtGY64wr9VScyvTGO8Wvg+pAha3Uso RICp+6lGTAYSWvyEDiOIIzDAr+6MIw6i43Sq0k9VJ2Jc8dS9tJmkhkAoo9iMAlyzDS/q QlLRWSXoq7YzYwY4iEHbeMSOr2qiBHKda4c2axt4y9qnqadVSh5BdtjP1uSMVkqF2tYy SP+sZ17Vv7u/ENNBSsjLCp+I//s3RlFzRlwOxYXchriSA+nhNc3pQTrjageYECueRdrL yeF66GDlr+z75oXhh8osrqlOciLTham4Wmo9b2PJ4EKOd6NCCf3osapC8x5kq+iLr2pM JK5A== X-Gm-Message-State: AOAM532GXfq8YhY8UP6umnTPVG4BWAEgrGZ1OI4VjB18qk2aIB+ohdlz hyuuy/4j4YTi/+4sQSqEbLhPd6kVmAbHZUjVU2dkz4XNSZOC0nBOu9XNAemim80ydxRsVsUiIQs FheRLOqEg5DGxJQ== X-Received: by 2002:a17:906:e208:: with SMTP id gf8mr27494709ejb.11.1640912196459; Thu, 30 Dec 2021 16:56:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzzwm/MFkHrHxXFXDXVh5wiUwXrDGoQLkKEB2u+8BtoVlRyo3LVMmZr/dpH2brlpmEN/60DAQ== X-Received: by 2002:a17:906:e208:: with SMTP id gf8mr27494699ejb.11.1640912196305; Thu, 30 Dec 2021 16:56:36 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Klaus Jensen Subject: [PULL 10/22] pci: Let pci_dma_rw() take MemTxAttrs argument Date: Fri, 31 Dec 2021 01:55:34 +0100 Message-Id: <20211231005546.723396-11-philmd@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211231005546.723396-1-philmd@redhat.com> References: <20211231005546.723396-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: 1640912200482000001 Let devices specify transaction attributes when calling pci_dma_rw(). Keep the default MEMTXATTRS_UNSPECIFIED in the few callers. Reviewed-by: Klaus Jensen Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211223115554.3155328-10-philmd@redhat.com> --- 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