From nobody Mon Feb 9 18:44:01 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=1640912221; cv=none; d=zohomail.com; s=zohoarc; b=JzXkLmLNXGlvel34E0h85cCbIOCBsuJGrua/UuHOdBLgKysZDeGZxGPiFJ3mzqGEAH1cTQu/ibKDUnrPb+qV/cFJH1d9ZDKDYEu1mxQPTAUlnN8a2mQhXtey1rVG5JRE3r1FH2DL+CMprF80lnvGdaaUn03iL4DzKUUFtm/7EVo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1640912221; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=UcHZiN5CaxHZgNjiZBrsrm3Tzs52Oa+NswcKSWWvrHc=; b=EG0u+J2DcnqsZ5Uw636TA47y/pLDsGzw23u5n3K/3eDuUc1zMLe6G/N3IYMu+NLWeZ52u/9BYFTPurEeLH0JndPtoDUdzseOx+dMJO50sgaRms34u/6/QDpVURDCsmR9nFK7XWuu/MJ9+tftFhHkKNR9R1AfTvpOgZusYFbH5yo= 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 1640912221947218.42548244620423; Thu, 30 Dec 2021 16:57:01 -0800 (PST) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-447-QiJoFsBkMhSY4_FPq25-Eg-1; Thu, 30 Dec 2021 19:57:00 -0500 Received: by mail-ed1-f69.google.com with SMTP id ch27-20020a0564021bdb00b003f8389236f8so17861027edb.19 for ; Thu, 30 Dec 2021 16:57:00 -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 k19sm7977501ejv.38.2021.12.30.16.56.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 16:56:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640912221; 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=UcHZiN5CaxHZgNjiZBrsrm3Tzs52Oa+NswcKSWWvrHc=; b=LXGSf41b7ijKEBYM/qYzbynabw/2xLJXBWDbQ9Zfq6oZhNfb/56PiTcKaz1T+YPKj3lLSJ pr8Krt+dEdbVLwy3zP0N4Uh9KZtQ823r7cyVhPC9hPs3ck3eazmX4KsjM9/e0+/smCN9qI DM0VFjZ8HzJdPbc+73PbDDJH6k2xoC4= X-MC-Unique: QiJoFsBkMhSY4_FPq25-Eg-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=UcHZiN5CaxHZgNjiZBrsrm3Tzs52Oa+NswcKSWWvrHc=; b=X5S/Z0KU3w/KQE5OtP4Sm0xxoXtQ/GCOa+OhQd45OxUh42phKKFvpG/TNnnpmXDEFV ggibyFK5GKGK1N29WQCedaIcpd1U4SzoLDyw8xISDHmmpBRPlxEfrGqO2gles5qLGn5B eCWYaDH7yl6W0lumW/YzHOKzMvcTR9t+VSwOVdjvgajEVxHx/lAUOZSIp1cxvQ2dgHar qd5NOSAOqEsxPrNaTWRGYBy8FamUQXQ1cZVuH8+gW4vrlTHZVxqvGhLjlevwh7aTb+Lx o5eodvsvldQ6cm0NB/bB/anDZIjo4UE9Apa5M7hTcvuNrB0ey/6SGeWfd0VUSHtT6kdh tEKQ== X-Gm-Message-State: AOAM531z4QdU+UX6tSLNzHBehTB204QC/eWg2BKXZ+zh0Zi+viDsBCiN eyR/R7XaFvPnKV9HWccaFtyR0xJghSskGYkaHM4KANI+ZO5TqDuvv0YX3ED03pL70p6FQ0FZ0i8 SaFSi0rzoAtUspQ== X-Received: by 2002:aa7:c658:: with SMTP id z24mr32464654edr.187.1640912219055; Thu, 30 Dec 2021 16:56:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJy6iDktP8J83LSY8lWHItrwO+Rkz+MZdYf//4JrfZCsaYE9QpY7M7BGUlj9MY6mcfVo7ZdNJg== X-Received: by 2002:aa7:c658:: with SMTP id z24mr32464649edr.187.1640912218940; Thu, 30 Dec 2021 16:56:58 -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?= , Richard Henderson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= Subject: [PULL 15/22] dma: Let st*_dma() take MemTxAttrs argument Date: Fri, 31 Dec 2021 01:55:39 +0100 Message-Id: <20211231005546.723396-16-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: 1640912224045000001 Let devices specify transaction attributes when calling st*_dma(). Keep the default MEMTXATTRS_UNSPECIFIED in the few callers. Reviewed-by: Richard Henderson Reviewed-by: C=C3=A9dric Le Goater Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211223115554.3155328-16-philmd@redhat.com> --- include/hw/pci/pci.h | 3 ++- include/hw/ppc/spapr_vio.h | 12 ++++++++---- include/sysemu/dma.h | 10 ++++++---- hw/nvram/fw_cfg.c | 4 ++-- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h index a751ab5a75d..d07e9707b48 100644 --- a/include/hw/pci/pci.h +++ b/include/hw/pci/pci.h @@ -859,7 +859,8 @@ static inline MemTxResult pci_dma_write(PCIDevice *dev,= dma_addr_t addr, static inline void st##_s##_pci_dma(PCIDevice *dev, \ dma_addr_t addr, uint##_bits##_t v= al) \ { \ - st##_s##_dma(pci_get_address_space(dev), addr, val); \ + st##_s##_dma(pci_get_address_space(dev), addr, val, \ + MEMTXATTRS_UNSPECIFIED); \ } =20 PCI_DMA_DEFINE_LDST(ub, b, 8); diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h index 5d2ea8e6656..e87f8e6f596 100644 --- a/include/hw/ppc/spapr_vio.h +++ b/include/hw/ppc/spapr_vio.h @@ -118,10 +118,14 @@ static inline int spapr_vio_dma_set(SpaprVioDevice *d= ev, uint64_t taddr, H_DEST_PARM : H_SUCCESS; } =20 -#define vio_stb(_dev, _addr, _val) (stb_dma(&(_dev)->as, (_addr), (_val))) -#define vio_sth(_dev, _addr, _val) (stw_be_dma(&(_dev)->as, (_addr), (_val= ))) -#define vio_stl(_dev, _addr, _val) (stl_be_dma(&(_dev)->as, (_addr), (_val= ))) -#define vio_stq(_dev, _addr, _val) (stq_be_dma(&(_dev)->as, (_addr), (_val= ))) +#define vio_stb(_dev, _addr, _val) \ + (stb_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED)) +#define vio_sth(_dev, _addr, _val) \ + (stw_be_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED)) +#define vio_stl(_dev, _addr, _val) \ + (stl_be_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED)) +#define vio_stq(_dev, _addr, _val) \ + (stq_be_dma(&(_dev)->as, (_addr), (_val), MEMTXATTRS_UNSPECIFIED)) #define vio_ldq(_dev, _addr) (ldq_be_dma(&(_dev)->as, (_addr))) =20 int spapr_vio_send_crq(SpaprVioDevice *dev, uint8_t *crq); diff --git a/include/sysemu/dma.h b/include/sysemu/dma.h index fd8f16003dd..009dd3ca960 100644 --- a/include/sysemu/dma.h +++ b/include/sysemu/dma.h @@ -249,10 +249,11 @@ static inline void dma_memory_unmap(AddressSpace *as, } \ static inline void st##_sname##_##_end##_dma(AddressSpace *as, \ dma_addr_t addr, \ - uint##_bits##_t val) \ + uint##_bits##_t val, \ + MemTxAttrs attrs) \ { \ val =3D cpu_to_##_end##_bits(val); \ - dma_memory_write(as, addr, &val, (_bits) / 8, MEMTXATTRS_UNSPECIFI= ED); \ + dma_memory_write(as, addr, &val, (_bits) / 8, attrs); \ } =20 static inline uint8_t ldub_dma(AddressSpace *as, dma_addr_t addr) @@ -263,9 +264,10 @@ static inline uint8_t ldub_dma(AddressSpace *as, dma_a= ddr_t addr) return val; } =20 -static inline void stb_dma(AddressSpace *as, dma_addr_t addr, uint8_t val) +static inline void stb_dma(AddressSpace *as, dma_addr_t addr, + uint8_t val, MemTxAttrs attrs) { - dma_memory_write(as, addr, &val, 1, MEMTXATTRS_UNSPECIFIED); + dma_memory_write(as, addr, &val, 1, attrs); } =20 DEFINE_LDST_DMA(uw, w, 16, le); diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c index 9b91b15cb08..e5f3c981841 100644 --- a/hw/nvram/fw_cfg.c +++ b/hw/nvram/fw_cfg.c @@ -360,7 +360,7 @@ static void fw_cfg_dma_transfer(FWCfgState *s) if (dma_memory_read(s->dma_as, dma_addr, &dma, sizeof(dma), MEMTXATTRS_UNSPECIFIED)) { stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control), - FW_CFG_DMA_CTL_ERROR); + FW_CFG_DMA_CTL_ERROR, MEMTXATTRS_UNSPECIFIED); return; } =20 @@ -446,7 +446,7 @@ static void fw_cfg_dma_transfer(FWCfgState *s) } =20 stl_be_dma(s->dma_as, dma_addr + offsetof(FWCfgDmaAccess, control), - dma.control); + dma.control, MEMTXATTRS_UNSPECIFIED); =20 trace_fw_cfg_read(s, 0); } --=20 2.33.1