Message ID | 20190312085502.8203-32-david@gibson.dropbear.id.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A63741850 for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 12 Mar 2019 09:08:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F5C229416 for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 12 Mar 2019 09:08:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82A232948F; Tue, 12 Mar 2019 09:08:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 662E429416 for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 12 Mar 2019 09:08:32 +0000 (UTC) Received: from localhost ([127.0.0.1]:47755 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1h3dOh-0003oE-3b for patchwork-qemu-devel@patchwork.kernel.org; Tue, 12 Mar 2019 05:08:31 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1h3dCh-0002Ad-UO for qemu-devel@nongnu.org; Tue, 12 Mar 2019 04:56:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1h3dCg-0001zG-Sk for qemu-devel@nongnu.org; Tue, 12 Mar 2019 04:56:07 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:51585) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <dgibson@ozlabs.org>) id 1h3dCg-0001xG-E0; Tue, 12 Mar 2019 04:56:06 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 44JTMW4bb9z9sPd; Tue, 12 Mar 2019 19:55:29 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1552380935; bh=dgTpVd1xtOPl2wAzFapWU6j2Abxb/+l4cstcBEND5BQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MM2Nzw9lN02He/o7gDGUhuIVe9L2nvqjrBOCvSdR17xhJU4ZQ5+8SGmgOqvquxSK/ ECOWRCyFARwoHTqiEMJ5/D4A9Fj7J+ncTub0lAxPp6mKWYSSuBp31dtHY2VqAkLany qepBvTzd3rx6EuQKiZdTN3SxzKvm7oEzR9YpwlRk= From: David Gibson <david@gibson.dropbear.id.au> To: peter.maydell@linaro.org Date: Tue, 12 Mar 2019 19:54:31 +1100 Message-Id: <20190312085502.8203-32-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312085502.8203-1-david@gibson.dropbear.id.au> References: <20190312085502.8203-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 31/62] ppc/pnv: psi: add a PSIHB_REG macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: lvivier@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, David Gibson <david@gibson.dropbear.id.au> Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
[PULL,01/62] vfio/spapr: Fix indirect levels calculation
|
expand
|
diff --git a/hw/ppc/pnv_psi.c b/hw/ppc/pnv_psi.c index c872be0b9c..a2f8d0dece 100644 --- a/hw/ppc/pnv_psi.c +++ b/hw/ppc/pnv_psi.c @@ -114,6 +114,8 @@ #define PSIHB_BAR_MASK 0x0003fffffff00000ull #define PSIHB_FSPBAR_MASK 0x0003ffff00000000ull +#define PSIHB_REG(addr) (((addr) >> 3) + PSIHB_XSCOM_BAR) + static void pnv_psi_set_bar(PnvPsi *psi, uint64_t bar) { MemoryRegion *sysmem = get_system_memory(); @@ -392,13 +394,13 @@ static void pnv_psi_reg_write(PnvPsi *psi, uint32_t offset, uint64_t val, */ static uint64_t pnv_psi_mmio_read(void *opaque, hwaddr addr, unsigned size) { - return pnv_psi_reg_read(opaque, (addr >> 3) + PSIHB_XSCOM_BAR, true); + return pnv_psi_reg_read(opaque, PSIHB_REG(addr), true); } static void pnv_psi_mmio_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - pnv_psi_reg_write(opaque, (addr >> 3) + PSIHB_XSCOM_BAR, val, true); + pnv_psi_reg_write(opaque, PSIHB_REG(addr), val, true); } static const MemoryRegionOps psi_mmio_ops = {