From patchwork Fri Jul 23 17:03:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 484656 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1527650jao; Fri, 23 Jul 2021 10:19:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwk3fOiXNpYQAmRsrHtsGDIz4KLJWPx3d9icHlL8bwRH5wV+GOqypd0cpz8H5vswNd7jmyB X-Received: by 2002:a67:efd8:: with SMTP id s24mr2342277vsp.9.1627060769109; Fri, 23 Jul 2021 10:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627060769; cv=none; d=google.com; s=arc-20160816; b=x+cANmJOUHK88rmAz4u2T4hjXB3LDfhaj0oze2Yo4jghYOJELop9ODfjAxiJ8k0RUj PYZuaACF65Zfqy4OFZgxbgokV+B/Q1kVnGuiuFILXfyOOrkW8+PGCd87yHc049yB5XRC C1rRJY4FESUCKOtNmgaynM2wvnAOGkmz3TdQbnJT30ojlGhCRZ1UWLYhf5A8NDffejjf x0FI/qjqka3T4zdXygy46Gqcheioa69rlmXw2orQaQcdHNzX9Xm/0MlNXn8jPSL1A0r7 P1GxkMuT/WHncXW3OQqMNdq31ckBQMEgQF35wRXCEkjFyKian+eMFuDrLVWCFgEzAvsN FNbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=uS1pSxcrnef9Bi6E/um0jmW2U80D77g2Q5XIJv/shJM=; b=LnLeFKs9/wIR8W6MFwze3iPEhaEVecomlHmjC+wJT3254K6LcMyCIHHgayminD0WvH KCR+n4H6wL6qFOOm1X+ae/JGaOus4wogOaZB8a0MXCnD6R+STlJ6Anywjt19ixnc1xW2 5SRD6r2rEQz+tWlJrvFpHF/Hib+PiNV/wR7hq8lJ9yb5jVtMVv47LeqxvDXdkiuHjAiU W5N3dpISBIvhPMjT1WopbqqSe6hQIuqTwCpk0hEurozmsZFCp74Sh5m2ll/mdHrzkjHc zlwkAlBP31+SM1QkULYntED7JVpDDaZ7VItpmAhG7527xtzmsZ4Jok0E17Zrrwlfg6/B FB1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kEr55ruf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u5si24643634uae.108.2021.07.23.10.19.29 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jul 2021 10:19:29 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=kEr55ruf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58862 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6ypc-0001ev-HC for patch@linaro.org; Fri, 23 Jul 2021 13:19:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6yg7-0005ft-JV for qemu-devel@nongnu.org; Fri, 23 Jul 2021 13:09:39 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:36382) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6yg5-0008Df-Tk for qemu-devel@nongnu.org; Fri, 23 Jul 2021 13:09:39 -0400 Received: by mail-wr1-x42a.google.com with SMTP id g15so3128956wrd.3 for ; Fri, 23 Jul 2021 10:09:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uS1pSxcrnef9Bi6E/um0jmW2U80D77g2Q5XIJv/shJM=; b=kEr55rufDlLnSGjL9H2TVkP5kY/XcpJRlY8KUhlyqH+DqbdYIftsCmYCluzRrFlDLT kQg7d4KuapxfVj6PfHFsnuswZOmLZ2V2odbD2Fp4hlqCdAhc/PsSUgVI/t/f0Mly2ZrD HnjDXhoYMncJTA0wU2HoQhDCPlCTWUxjq1B2QZ6ElR3LNRnn+r/b+GC2DbwkYoARTpNC 9pulf3UYLnytkK7fD7adXLUZ1WWqp7la1aOqJyf0bu559mt5kX7pV7Txkf2BInu9qyNZ slUZ0VQRGgKt0o5cu26AxPg4rdulsU2RyJm0ZwyNmxEaquzpFp+QzHWC/Sd6ukRcKe+F 5dPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uS1pSxcrnef9Bi6E/um0jmW2U80D77g2Q5XIJv/shJM=; b=GdddSRa60UUgUKHuHOJwBgS7ER2NgCaD9JTvA0siNV8tjUhhTGXfOdtENfXosgD2/c in637B8+ixsh+/yt17H4Ege+bnhyfSvX/0px8FCi1vT9+mXG2u0ktrZ2vnP56H+OkGcx fSRzdEPmvNU/pgiE0RmygK5TSucY6mH6Ze9uBYYhOSRUrLaEizIXNZ+aePdI6R+Q3MqK Q4tKPX7MMmiwtdjscVqb2pTm4YjdNzB+MkGQ9dAAwSFBj3rNsXbwfr7mHMlOh6p/kdRS 6JzyvuBRVZWjyFDBdJ8sec7cczyPhlXTzuwv/bcpScNNVZ6lhm6IjyfPD+yMsOPVi8Yx 5pJw== X-Gm-Message-State: AOAM531GR1nyM0vXZF+2xE9mb1I1ex/7HO7X2igNu31uLcERy8Q1lyHl xfmdHz7eP0ZHamW+4ojhFd8qTQ== X-Received: by 2002:adf:ffc3:: with SMTP id x3mr2813169wrs.136.1627060176592; Fri, 23 Jul 2021 10:09:36 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r11sm16276173wma.24.2021.07.23.10.09.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jul 2021 10:09:30 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6864B1FFAF; Fri, 23 Jul 2021 18:03:56 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 24/28] plugins: Fix physical address calculation for IO regions Date: Fri, 23 Jul 2021 18:03:50 +0100 Message-Id: <20210723170354.18975-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210723170354.18975-1-alex.bennee@linaro.org> References: <20210723170354.18975-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, Aaron Lindsay , Alexandre Iooss , Mahmoud Mandour , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Aaron Lindsay The address calculation for IO regions introduced by commit 787148bf928a54b5cc86f5b434f9399e9737679c Author: Aaron Lindsay plugins: Expose physical addresses instead of device offsets is not always accurate. Use the more correct MemoryRegionSection.offset_within_address_space. Signed-off-by: Aaron Lindsay Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20210720195735.3934473-1-aaron@os.amperecomputing.com> Message-Id: <20210720232703.10650-25-alex.bennee@linaro.org> -- 2.20.1 diff --git a/plugins/api.c b/plugins/api.c index 78b563c5c5..2d521e6ba8 100644 --- a/plugins/api.c +++ b/plugins/api.c @@ -319,7 +319,7 @@ uint64_t qemu_plugin_hwaddr_phys_addr(const struct qemu_plugin_hwaddr *haddr) return block->offset + offset + block->mr->addr; } else { MemoryRegionSection *mrs = haddr->v.io.section; - return haddr->v.io.offset + mrs->mr->addr; + return mrs->offset_within_address_space + haddr->v.io.offset; } } #endif