From nobody Mon Feb 9 01:02:05 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511733733935183.46539311982679; Sun, 26 Nov 2017 14:02:13 -0800 (PST) Received: from localhost ([::1]:58148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJ504-000057-7o for importer@patchew.org; Sun, 26 Nov 2017 17:02:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJ4xv-00078h-TW for qemu-devel@nongnu.org; Sun, 26 Nov 2017 16:59:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJ4xt-0002wZ-Lf for qemu-devel@nongnu.org; Sun, 26 Nov 2017 16:59:55 -0500 Received: from mail-io0-x242.google.com ([2607:f8b0:4001:c06::242]:39637) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eJ4xt-0002wP-Gu; Sun, 26 Nov 2017 16:59:53 -0500 Received: by mail-io0-x242.google.com with SMTP id x63so34260519ioe.6; Sun, 26 Nov 2017 13:59:53 -0800 (PST) Received: from localhost.localdomain (173-29-146-33.client.mchsi.com. [173.29.146.33]) by smtp.gmail.com with ESMTPSA id n184sm6517218itg.9.2017.11.26.13.59.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 26 Nov 2017 13:59:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=oKezPctU3LQi6+/453BroG72l7EyEra4H0189NQhJK8=; b=OkYai+a4TA2bzlyYlXE8iEI53c4SUa2MJUxHty6wwZS0UihiQhGEecHnJYh/DfW+gw 607oE2P95mrled0YGw2R183Nm0+7ar/cn8gWw2ne3oSfxVVGPOP3Wn1ZV1iwafMSb/73 jFo4Gg+1qLpJlFB97VFTouPXEE9eJk68DxmGnbVMavFF3kFtZyWstXnA1zqym7prDPFB vYxDkrc/bg7rRJOXKnEDmRhoVDMAnjKI4SB86Mr+P1Jiq9hIRShc3Wx5nXH/mFlGPPXS Efb6F8hYjtRlCfIpv1goczauUEvAsR0h3sKaThtlY38nYWN0q3cuQP6M538keV8P8iLH eB4g== 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:in-reply-to:references; bh=oKezPctU3LQi6+/453BroG72l7EyEra4H0189NQhJK8=; b=IY2M7iWYZbfN38up8tgodskUjXsIqfoq6HUyiCDJ59pfroVpCMa4ZaoBaqJRwAnsLk AIDIyf6/4hGrRqXNhJQ8yVnmL+kFAYKjtlmj3Tr7Xvni/YG+3zbnMgfEyUVBiPkQJhJ7 ogwrVvU/BCzyTyR2nXDkbsk11//3VIJ8Zqv3sCzEN+c088lOOCohbDUrHPRuQEGvUGhP tPwyRCUWtgEz0DdNuSRTgPFO2Q+rp++92hqOeX+rBEEkaNdvnKubQITQzgi0O5pUPmEJ JtnJQ1/M3hTvZX9SMHLYWVjemdmSoeUPsuu2rT/DCyQ+ok8EHlbd75WBbYYKrvk4vGZu k64w== X-Gm-Message-State: AJaThX4zPX9xkv17Isoro+Ry8+WfkNe25mczA2AwxN23OYHNdgSOR4lu S7meBupd2OhdCUmillDJYzk= X-Google-Smtp-Source: AGs4zMb+v1I+AlIsTptdtgfWmWQOG4e4VriGYmYor2b5PksYlCyWQFOGEqS+78WaHmyTzpmaaUfXUg== X-Received: by 10.107.12.212 with SMTP id 81mr38792274iom.75.1511733592862; Sun, 26 Nov 2017 13:59:52 -0800 (PST) From: Michael Davidsaver To: Alexander Graf , David Gibson Date: Sun, 26 Nov 2017 15:59:08 -0600 Message-Id: <5d63d645603b83d24187c3844bd0728bd4c4b682.1511731946.git.mdavidsaver@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::242 Subject: [Qemu-devel] [PATCH 10/17] e500: move uarts CCSR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Davidsaver , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Michael Davidsaver --- hw/ppc/e500.c | 13 ------------- hw/ppc/e500_ccsr.c | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index 1872bb8eaa..2d87d91582 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -22,7 +22,6 @@ #include "net/net.h" #include "qemu/config-file.h" #include "hw/hw.h" -#include "hw/char/serial.h" #include "hw/pci/pci.h" #include "hw/boards.h" #include "sysemu/sysemu.h" @@ -770,18 +769,6 @@ void ppce500_init(MachineState *machine, PPCE500Params= *params) mpicdev =3D DEVICE(object_resolve_path("/machine/pic", 0)); assert(mpicdev); =20 - /* Serial */ - if (serial_hds[0]) { - serial_mm_init(ccsr_addr_space, MPC8544_SERIAL0_REGS_OFFSET, - 0, qdev_get_gpio_in(mpicdev, 42), 399193, - serial_hds[0], DEVICE_BIG_ENDIAN); - } - - if (serial_hds[1]) { - serial_mm_init(ccsr_addr_space, MPC8544_SERIAL1_REGS_OFFSET, - 0, qdev_get_gpio_in(mpicdev, 42), 399193, - serial_hds[1], DEVICE_BIG_ENDIAN); - } =20 /* PCI */ dev =3D qdev_create(NULL, "e500-pcihost"); diff --git a/hw/ppc/e500_ccsr.c b/hw/ppc/e500_ccsr.c index 68d952794e..f1adba4e54 100644 --- a/hw/ppc/e500_ccsr.c +++ b/hw/ppc/e500_ccsr.c @@ -31,6 +31,7 @@ #include "sysemu/sysemu.h" #include "sysemu/kvm.h" #include "hw/sysbus.h" +#include "hw/char/serial.h" #include "hw/ppc/openpic.h" =20 /* E500_ denotes registers common to all */ @@ -45,6 +46,8 @@ #define E500_ERR_DETECT (0x2e40) #define E500_ERR_DISABLE (0x2e44) =20 +#define E500_DUART_OFFSET(N) (0x4500 + (N) * 0x100) + #define E500_PORPLLSR (0xE0000) #define E500_PVR (0xE00A0) #define E500_SVR (0xE00A4) @@ -266,6 +269,21 @@ static void e500_ccsr_realize(DeviceState *dev, Error = **errp) =20 memory_region_add_subregion(&ccsr->iomem, E500_MPIC_OFFSET, sysbus_mmio_get_region(pic, 0)); + /* Note: MPIC internal interrupts are offset by 16 */ + + /* DUARTS */ + if (serial_hds[0]) { + serial_mm_init(&ccsr->iomem, E500_DUART_OFFSET(0), + 0, qdev_get_gpio_in(ccsr->pic, 16 + 26), 399193, + serial_hds[0], DEVICE_BIG_ENDIAN); + } + + if (serial_hds[1]) { + serial_mm_init(&ccsr->iomem, E500_DUART_OFFSET(1), + 0, qdev_get_gpio_in(ccsr->pic, 16 + 26), 399193, + serial_hds[1], DEVICE_BIG_ENDIAN); + } + } =20 static Property e500_ccsr_props[] =3D { --=20 2.11.0