From nobody Tue Feb 10 20:06:57 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1618655443; cv=none; d=zohomail.com; s=zohoarc; b=h4cIM5v6H8Kh/DOLEtcqYYqQxXMaUejC5kGHWiNzrWbGMwm4dV+VNglZ468AjjfX36Ppm7TiErNPKW9RpiJgQWeq1L3+XlCIBXKVS+l2sOCbrf0dV600tpIP5DrZu38Rvav4j1WehqmufGWdpRva+ebSkmi6Pnatg97APWDMnP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618655443; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kF/aV6qxhEEC7EHoDNvMenC0A38A0IZfHiqIOjgg71A=; b=bRK3/KviAtPRlXPt454EcgE0gEfAw3t7m4H6Uzih7ahbIJX9e9vxyEIOnDX8Qpr/QC8twvblwEZW8DKqZssZ1iK8QrngyOBHNahpjBHMD9XGKlsILYYf0SUt3Fg8Epir8sHmdja65m0pL+EHfRyHXSz0COqAciXJ3gqCOh8uktg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1618655443383621.0703643437746; Sat, 17 Apr 2021 03:30:43 -0700 (PDT) Received: by mail-wm1-f44.google.com with SMTP id w186so11013144wmg.3 for ; Sat, 17 Apr 2021 03:30:42 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id b15sm3794006wrt.57.2021.04.17.03.30.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Apr 2021 03:30:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kF/aV6qxhEEC7EHoDNvMenC0A38A0IZfHiqIOjgg71A=; b=DobbvUqA35+9kB1+MeSnWxw7nXURePdOwwkPQQA4JSO2GGux7pJHOVn5wp7nVsfIbk MZo7gt6QtAFh3OfuTD+n8G5vGx5/pe3yUULKtj5n++ZjZzxU1hB5BLxvwiLsRg52tm2/ d/B/pDKY9dMq39w7yWxVNyx2Gz7f2w4ZR9rXLWbED/yopVd7m1/Zt+Ooto0EkH2yxYyE V1MN0b9J9Df3p76lizDy9ZI0mqjb9FRmSKKpMwsFI5xotEyB2nHASZN6yld2YQFNBU0s o1cZ/rv8bO7Uls/fnG7eMzXfQi4O8+njSKf/VtcoX0ykSWP7OyFNL3VH9KaBabtiyn26 y0yQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kF/aV6qxhEEC7EHoDNvMenC0A38A0IZfHiqIOjgg71A=; b=EDNcij/MLxZAD8EHYAiPO4HIWJQsBxgxD1cPy/wyp/bJdR5gOhH5CLWzXq1IjAxwRs c9suVbP30D/DBzkTNt7NpykLBKrSZPYIQL4t6QzK08NVa2avlHh8sS7IIh9yRSuJTklu Q7B1J2a9bTQB/+cA30xWyoV+Vwj1v7S/UzJfpgfS5LVJMS5ddWkvp1O7FLHJXQyQwhsV d/Vs9GyPI/OISQRHH07Y2q1N/gjlvlv7ItTop/Voj2jSr6OCSIJu8jQptYYr0AhDKWyX +1js7j9NReSZx15bgJ+vYV9/2gIc0vsFmbOk5IMz66qPaVPAZVJLCCuuDQ93bpr+squH X0Vw== X-Gm-Message-State: AOAM532Hmll1TOjMRVeBYcKc2f+676ECe69AnnRFjkVVU3U0+LSDFLXL f2vjkpyGk1z1onC25xTZJA0= X-Google-Smtp-Source: ABdhPJw18Y79CyTqdwhK3G8j+fklRqnjpDS7m3jTSAVnOIq1dGLlZ4s9Zb88OlasQ352TjHTnNeihA== X-Received: by 2002:a1c:f305:: with SMTP id q5mr12212974wmq.96.1618655441662; Sat, 17 Apr 2021 03:30:41 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Peter Maydell , Peter Xu , David Gibson , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Andrew Jeffery , Joel Stanley , Alistair Francis Subject: [PATCH v2 02/11] hw/aspeed/smc: Use the RAM memory region for DMAs Date: Sat, 17 Apr 2021 12:30:19 +0200 Message-Id: <20210417103028.601124-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210417103028.601124-1-f4bug@amsat.org> References: <20210417103028.601124-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: C=C3=A9dric Le Goater Instead of passing the memory address space region, simply use the RAM memory region instead. This simplifies RAM accesses. This patch breaks migration compatibility. Fixes: c4e1f0b48322 ("aspeed/smc: Add support for DMAs") Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: C=C3=A9dric Le Goater Message-Id: <20210407171637.777743-2-clg@kaod.org> Signed-off-by: C=C3=A9dric Le Goater --- hw/arm/aspeed.c | 2 +- hw/ssi/aspeed_smc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index daeef5b32a2..4033ffd314c 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -328,7 +328,7 @@ static void aspeed_machine_init(MachineState *machine) object_property_set_int(OBJECT(&bmc->soc), "num-cs", amc->num_cs, &error_abort); object_property_set_link(OBJECT(&bmc->soc), "dram", - OBJECT(&bmc->ram_container), &error_abort); + OBJECT(machine->ram), &error_abort); if (machine->kernel_filename) { /* * When booting with a -kernel command line there is no u-boot diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 16addee4dc8..6f72fb028e5 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -178,8 +178,7 @@ * 0: 4 bytes * 0x7FFFFF: 32M bytes */ -#define DMA_DRAM_ADDR(s, val) ((s)->sdram_base | \ - ((val) & (s)->ctrl->dma_dram_mask)) +#define DMA_DRAM_ADDR(s, val) ((val) & (s)->ctrl->dma_dram_mask) #define DMA_FLASH_ADDR(s, val) ((s)->ctrl->flash_window_base | \ ((val) & (s)->ctrl->dma_flash_mask)) #define DMA_LENGTH(val) ((val) & 0x01FFFFFC) --=20 2.26.3