From nobody Thu May 2 13:24:46 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516650599001279.52711145233684; Mon, 22 Jan 2018 11:49:59 -0800 (PST) Received: from localhost ([::1]:33699 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi6Q-000821-3i for importer@patchew.org; Mon, 22 Jan 2018 14:49:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47814) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi4F-0006li-AO for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:47:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edi4E-0005kQ-Dp for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:47:43 -0500 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:33537) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edi4E-0005j0-8T; Mon, 22 Jan 2018 14:47:42 -0500 Received: by mail-pg0-x241.google.com with SMTP id u1so7889315pgr.0; Mon, 22 Jan 2018 11:47:42 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id 8sm2435995pfh.170.2018.01.22.11.47.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jan 2018 11:47:39 -0800 (PST) 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=BDDG8Xz03COM+89QzfPV0TQGkFrkjTbvo09xeOTyOnY=; b=C0pmQglxd2Cz8/epOtRA+Go38XyWgBEWymbq8xiL8Z5gMoHPMeQcVPSr70fsADd06p pGr+D/ApvRYNqq5qYmUjI4eaSezCkuMLpOp48i2QrBIom5LjxqrxAiBYHNtvvLZfMJoM 6URwNess1MVaEV9LyD/v8zYDRKSdfzce5It+HpDpQ9tCXKFb/9eJ6GrGbmNANxrZVrQ6 vUlLtZQWQmULl/O7E0DnsE2dpSCfHA9SdPkGM/7jnzwdVC/pjaHW0A4aOW39P2Irffrw ilG2GmmrghFoj08tkLa+bb3TB1Q3vP4uR9jmDh4/a4XP54Hwk5+4MrHE6gMYVLOHZI16 mm4w== 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=BDDG8Xz03COM+89QzfPV0TQGkFrkjTbvo09xeOTyOnY=; b=Q+7rDoiw97/EnJvE9Z1Fs4VPuy37vtQvYdZWLssCjOeXQy2zh+OWwmG0Q9IUa/+9+l eGxdAOKgYDppPiTNiV2X3Vi9kd868v+/51zvvYM6M0kscbQi/lzk8/cRlqWtwCHUWDRj 0tqGN7uNVpGFJqJgDRtAF8b+JVz4FWZ6Vt0hLHR/im0nXpV3fic0ulb2hReZtWlPycM0 B4twOee4jCQdGe8Vsosj6pYPOsmrBr6CqHt0ImqhOvBtHffiEYon1/PFL0UfMdzJwZ7K qjWnowLYm/WXF4MYes8qJZIW/5ljjZ9X/ouPMkWDBjoKLkzjGJKc2XbxbVkZy9h/bpxw lUpQ== X-Gm-Message-State: AKwxytcALnWrOurbYNcM4ks1qQpFUCb4fhTEBs7bpdAhDHzNlr82/beU 6aCtUyf1n0F0oa66Odc8H4GAu6fT X-Google-Smtp-Source: AH8x224tsIXEK2T7NNZXBWPflDDDimCWIJh2q9LhetZpgHgABBLc0Rt4BIcBjKeJubVK4pcuVlrisg== X-Received: by 10.98.141.199 with SMTP id p68mr8650908pfk.25.1516650460725; Mon, 22 Jan 2018 11:47:40 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com Date: Mon, 22 Jan 2018 11:43:16 -0800 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: 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: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH v7 1/9] microblaze: boot.c: Don't try to find NULL file 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com 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 Previously if no device tree was passed to microblaze_load_kernel() then qemu_find_file() would try to find a NULL pointer. To avoid this put a check around qemu_find_file(). Signed-off-by: Alistair Francis Reported-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/microblaze/boot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index 457a08a2fe..35bfeda7aa 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -124,7 +124,7 @@ void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr = ddr_base, kernel_cmdline =3D qemu_opt_get(machine_opts, "append"); dtb_arg =3D qemu_opt_get(machine_opts, "dtb"); /* default to pcbios dtb as passed by machine_init */ - if (!dtb_arg) { + if (!dtb_arg && dtb_filename) { filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, dtb_filename); } =20 --=20 2.14.1 From nobody Thu May 2 13:24:46 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516650786794628.5319944292013; Mon, 22 Jan 2018 11:53:06 -0800 (PST) Received: from localhost ([::1]:33733 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi9R-000279-VR for importer@patchew.org; Mon, 22 Jan 2018 14:53:06 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi4J-0006ou-Uz for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:47:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edi4I-0005sV-UV for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:47:48 -0500 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:38105) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edi4I-0005rd-Nj; Mon, 22 Jan 2018 14:47:46 -0500 Received: by mail-pf0-x241.google.com with SMTP id k19so7886042pfj.5; Mon, 22 Jan 2018 11:47:46 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id o25sm32163866pgc.75.2018.01.22.11.47.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jan 2018 11:47:43 -0800 (PST) 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; bh=4PD0rX+ehRqeGVEgZCEmzpG5PrlM5EKNAZ23K4vpNvQ=; b=R5XaInUI5AqeShPSD+oXkhR3AdEKoclaQQf2rJ0ZwLZvS3EO7DWe423VkNC7sFIpQd VTg8h6lLCu5YlS5X0THYkT5vbJWFfb/SeSDcRbZmA522T6LxV1uLO1Qku/PP1099DraN xgpd4iGscnR0IPYK3zNRsMeRZ6wk+l4cCGpY7k73ouyCd2HPLZW83ZITP+4uFIIRLS1i HfCisjudDPlXKPD/+GRUkpKyCQe/kEeFjYOqh7WeCipnoim7XTH6aRK6LJsLRm9+9Hw3 HQo79MzzOx9CI2J7WO+pzMtiQrBPCoaD4wDVW0Qj3eU0txVgOkxPUyKohBJ/0EaFPFxY jAZQ== 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; bh=4PD0rX+ehRqeGVEgZCEmzpG5PrlM5EKNAZ23K4vpNvQ=; b=ActeiUBqdgjYMSnktVlBefUdq3GK51sVruCQvOfa5RgvOSXaKeJOt2jXAHTXHx1KUH NpDn9WWb+4x35gqxyIzwrbXgOvwY1BlFfbtymuG/LBRTqNznHKjK0L9jbTptRAwnB3K0 QxdiKcVTqicLdRy/TVc+qHc5DdA9zH6jyziRcvDZkAkd2bl4FBRMuX7XTa+O5o5ro+xV EjaoENh5MGBPVdSGqRcU+DiDhGxFqJ5qFfn4RGpDZck2xaKqcIbZ6wuiJ4PTPeo5EfrB 2K/OECi3F1SG8I12wZJQzoUjlaJ6ZXyyn5m2EhdRlpcM9lCNmeMEKYcBtxSJk/5PgPpL /dcg== X-Gm-Message-State: AKwxytfvd4ltlENNG2yj3w8LEM1pw0ANk9s8m4cUUy8u9obmI5GQH/Cf GnyrYQr8AoeXtg3jjXAYznSN9cVx X-Google-Smtp-Source: AH8x227K7B6W7J48Ti4kF3yY8kjcT1iI/ahnyyiOlVdm9fAG7ONtuvkV0Av2vqUypXyT9FQV/pY6BQ== X-Received: by 10.99.107.129 with SMTP id g123mr7466528pgc.356.1516650465243; Mon, 22 Jan 2018 11:47:45 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com Date: Mon, 22 Jan 2018 11:43:20 -0800 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH v7 2/9] xlnx-zynqmp-pmu: Initial commit of the ZynqMP PMU 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com 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" The Xilinx ZynqMP SoC has two main processing systems in it. The ARM processing system (which is already modeled in QEMU) and the MicroBlaze Power Management Unit (PMU). This is the inital work for adding support for the PMU. The PMU susbsystem runs along side the ARM system on hardware, but due to architecture limitations in QEMU the two instances are seperate for the time being. Let's follow the same setup we do with the ARM system, where there is an SoC device and a ZCU102 board. Although the PMU is less board specific we are still going to follow the same split as maybe in future we can connect the PMU device to the ARM ZCU102 board. As the machine will be fairly small let's keep them both together in one file. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias --- V4: - Rename to remove ZCU102 name hw/microblaze/xlnx-zynqmp-pmu.c | 83 +++++++++++++++++++++++++++++++++++++= ++++ hw/microblaze/Makefile.objs | 1 + 2 files changed, 84 insertions(+) create mode 100644 hw/microblaze/xlnx-zynqmp-pmu.c diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pm= u.c new file mode 100644 index 0000000000..ac0f78928a --- /dev/null +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -0,0 +1,83 @@ +/* + * Xilinx Zynq MPSoC PMU (Power Management Unit) emulation + * + * Copyright (C) 2017 Xilinx Inc + * Written by Alistair Francis + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WIT= HOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * for more details. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qemu-common.h" +#include "hw/boards.h" +#include "cpu.h" + +/* Define the PMU device */ + +#define TYPE_XLNX_ZYNQMP_PMU_SOC "xlnx,zynqmp-pmu-soc" +#define XLNX_ZYNQMP_PMU_SOC(obj) OBJECT_CHECK(XlnxZynqMPPMUSoCState, (obj)= , \ + TYPE_XLNX_ZYNQMP_PMU_SOC) + +typedef struct XlnxZynqMPPMUSoCState { + /*< private >*/ + DeviceState parent_obj; + + /*< public >*/ +} XlnxZynqMPPMUSoCState; + +static void xlnx_zynqmp_pmu_soc_init(Object *obj) +{ + +} + +static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) +{ + +} + +static void xlnx_zynqmp_pmu_soc_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + + dc->realize =3D xlnx_zynqmp_pmu_soc_realize; +} + +static const TypeInfo xlnx_zynqmp_pmu_soc_type_info =3D { + .name =3D TYPE_XLNX_ZYNQMP_PMU_SOC, + .parent =3D TYPE_DEVICE, + .instance_size =3D sizeof(XlnxZynqMPPMUSoCState), + .instance_init =3D xlnx_zynqmp_pmu_soc_init, + .class_init =3D xlnx_zynqmp_pmu_soc_class_init, +}; + +static void xlnx_zynqmp_pmu_soc_register_types(void) +{ + type_register_static(&xlnx_zynqmp_pmu_soc_type_info); +} + +type_init(xlnx_zynqmp_pmu_soc_register_types) + +/* Define the PMU Machine */ + +static void xlnx_zynqmp_pmu_init(MachineState *machine) +{ + +} + +static void xlnx_zynqmp_pmu_machine_init(MachineClass *mc) +{ + mc->desc =3D "Xilinx ZynqMP PMU machine"; + mc->init =3D xlnx_zynqmp_pmu_init; +} + +DEFINE_MACHINE("xlnx-zynqmp-pmu", xlnx_zynqmp_pmu_machine_init) + diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index b2517d87fe..ae9fd40de7 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -1,3 +1,4 @@ obj-y +=3D petalogix_s3adsp1800_mmu.o obj-y +=3D petalogix_ml605_mmu.o +obj-y +=3D xlnx-zynqmp-pmu.o obj-y +=3D boot.o --=20 2.14.1 From nobody Thu May 2 13:24:46 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516650705722206.2515621226347; Mon, 22 Jan 2018 11:51:45 -0800 (PST) Received: from localhost ([::1]:33724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi88-00017U-Mb for importer@patchew.org; Mon, 22 Jan 2018 14:51:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi4O-0006qw-68 for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:47:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edi4N-0005v3-6x for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:47:52 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:46266) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edi4M-0005uW-Um; Mon, 22 Jan 2018 14:47:51 -0500 Received: by mail-pg0-x242.google.com with SMTP id s9so7867336pgq.13; Mon, 22 Jan 2018 11:47:50 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id q2sm16863370pgf.10.2018.01.22.11.47.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jan 2018 11:47:48 -0800 (PST) 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; bh=DVWFHJPUwgQ+3kgB3q991tAQNhIal3fXQX2kPrJ22SU=; b=Yb1dqPvNCUX16XXvesogWHMrOZHAflF4HDzK1O1ZsAPJTXtKMrBSdDKXC3W08AEMsV Nmmc/jtAXwA1zqmRygFQ18nG9tWKBAXWJCgoXU9b+OQo5QEijuBYsqZKcL2A01iK22/Y tFd8yJ8FcO/lpGTtw3NqbtiFmP4rJpbdJgiwzeNgB0IR3pR2vCSsgO6f/lck2cyS6UtY Dm7hW7HUHqjS0sGr/iMNgo/XL9LvA6GqRfvn1PIGbmEkgSVLLgUDBFVLyNavWFsoPWe9 uLGYA4sUnP5dJ8+j+friwNawBGNAWE+z2gq7M5TpEMrBojs+LpTpAIOjy1efw1gzajOw nEPA== 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; bh=DVWFHJPUwgQ+3kgB3q991tAQNhIal3fXQX2kPrJ22SU=; b=ZpSXd4p69AiLfm5n4MRm82IlwNgip9HenZOCflO4ltz2SF6R79a6wrHjN/ozbOnl9J ekB2J93S+nMLosWQTXK0dn9zNF47cgvC98U3yu7xUuxkdtv4qwwoRm0ZsT75av2fCvzS GiyS3bWC7eXhrBccNCV4ISQoKL2AgYe3KWMtEedVKBr+xfBxRCvHqo7vvYu9YxkQ1O3W bIocZtdfpwSeYgrY299M9ZDKJi4JU8dMv+ngQdVikpjEpe9Ljn8fJsuwZrWwZfleJJvJ KhjVXOr67YNMHDED2PZ0uO77g1/2stJqU7uQm2OpqoBClSKaCselcClAM7s9I5DeL9Q8 rknA== X-Gm-Message-State: AKwxytf65Hj9DW8Lk5XBShnB3u6gpKig9qVtMCgnfd7KWp+Ve0fbK+Yx s4c6m/NpBzzTxwo/kfDllgHWzBm2 X-Google-Smtp-Source: AH8x224yXrxIFkQjdtTYxMvrhQcFg4VDk7zYKnNxwAXU8U/Idwxn0XNPmIrDrGeDIkZmBNVz09cR7w== X-Received: by 10.99.142.76 with SMTP id k73mr7629479pge.89.1516650469623; Mon, 22 Jan 2018 11:47:49 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com Date: Mon, 22 Jan 2018 11:43:25 -0800 Message-Id: <3a974495bbab40c66cf3f1edc9fbfcee31f3a178.1516650109.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH v7 3/9] xlnx-zynqmp-pmu: Add the CPU and memory 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com 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" Connect the MicroBlaze CPU and the ROM and RAM memory regions. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias --- V6: - Pass initrd instead of kernel to microblaze_load_kernel() V4: - Remove the ZCU102 name V2: - Fix the pmu-cpu name - Use err and errp for CPU realise instead of error_fatal hw/microblaze/xlnx-zynqmp-pmu.c | 70 +++++++++++++++++++++++++++++++++++++= ++-- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pm= u.c index ac0f78928a..145837b372 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -18,8 +18,11 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "qemu-common.h" +#include "exec/address-spaces.h" #include "hw/boards.h" +#include "hw/qdev-properties.h" #include "cpu.h" +#include "boot.h" =20 /* Define the PMU device */ =20 @@ -27,21 +30,56 @@ #define XLNX_ZYNQMP_PMU_SOC(obj) OBJECT_CHECK(XlnxZynqMPPMUSoCState, (obj)= , \ TYPE_XLNX_ZYNQMP_PMU_SOC) =20 +#define XLNX_ZYNQMP_PMU_ROM_SIZE 0x8000 +#define XLNX_ZYNQMP_PMU_ROM_ADDR 0xFFD00000 +#define XLNX_ZYNQMP_PMU_RAM_ADDR 0xFFDC0000 + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj; =20 /*< public >*/ + MicroBlazeCPU cpu; } XlnxZynqMPPMUSoCState; =20 static void xlnx_zynqmp_pmu_soc_init(Object *obj) { + XlnxZynqMPPMUSoCState *s =3D XLNX_ZYNQMP_PMU_SOC(obj); =20 + object_initialize(&s->cpu, sizeof(s->cpu), + TYPE_MICROBLAZE_CPU); + object_property_add_child(obj, "pmu-cpu", OBJECT(&s->cpu), + &error_abort); } =20 static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) { - + XlnxZynqMPPMUSoCState *s =3D XLNX_ZYNQMP_PMU_SOC(dev); + Error *err =3D NULL; + + object_property_set_uint(OBJECT(&s->cpu), XLNX_ZYNQMP_PMU_ROM_ADDR, + "base-vectors", &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "use-stack-protection", + &error_abort); + object_property_set_uint(OBJECT(&s->cpu), 0, "use-fpu", &error_abort); + object_property_set_uint(OBJECT(&s->cpu), 0, "use-hw-mul", &error_abor= t); + object_property_set_bool(OBJECT(&s->cpu), true, "use-barrel", + &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "use-msr-instr", + &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "use-pcmp-instr", + &error_abort); + object_property_set_bool(OBJECT(&s->cpu), false, "use-mmu", &error_abo= rt); + object_property_set_bool(OBJECT(&s->cpu), true, "endianness", + &error_abort); + object_property_set_str(OBJECT(&s->cpu), "8.40.b", "version", + &error_abort); + object_property_set_uint(OBJECT(&s->cpu), 0, "pvr", &error_abort); + object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } } =20 static void xlnx_zynqmp_pmu_soc_class_init(ObjectClass *oc, void *data) @@ -70,7 +108,35 @@ type_init(xlnx_zynqmp_pmu_soc_register_types) =20 static void xlnx_zynqmp_pmu_init(MachineState *machine) { - + XlnxZynqMPPMUSoCState *pmu =3D g_new0(XlnxZynqMPPMUSoCState, 1); + MemoryRegion *address_space_mem =3D get_system_memory(); + MemoryRegion *pmu_rom =3D g_new(MemoryRegion, 1); + MemoryRegion *pmu_ram =3D g_new(MemoryRegion, 1); + + /* Create the ROM */ + memory_region_init_rom(pmu_rom, NULL, "xlnx-zynqmp-pmu.rom", + XLNX_ZYNQMP_PMU_ROM_SIZE, &error_fatal); + memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_ROM_ADD= R, + pmu_rom); + + /* Create the RAM */ + memory_region_init_ram(pmu_ram, NULL, "xlnx-zynqmp-pmu.ram", + machine->ram_size, &error_fatal); + memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_RAM_ADD= R, + pmu_ram); + + /* Create the PMU device */ + object_initialize(pmu, sizeof(XlnxZynqMPPMUSoCState), TYPE_XLNX_ZYNQMP= _PMU_SOC); + object_property_add_child(OBJECT(machine), "pmu", OBJECT(pmu), + &error_abort); + object_property_set_bool(OBJECT(pmu), true, "realized", &error_fatal); + + /* Load the kernel */ + microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR, + machine->ram_size, + machine->initrd_filename, + machine->dtb, + NULL); } =20 static void xlnx_zynqmp_pmu_machine_init(MachineClass *mc) --=20 2.14.1 From nobody Thu May 2 13:24:46 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516650803318819.4379876983681; Mon, 22 Jan 2018 11:53:23 -0800 (PST) Received: from localhost ([::1]:33741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi9i-0002Ll-AC for importer@patchew.org; Mon, 22 Jan 2018 14:53:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi4S-0006ut-Ce for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:47:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edi4R-0005zD-DB for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:47:56 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:42244) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edi4R-0005yl-8F; Mon, 22 Jan 2018 14:47:55 -0500 Received: by mail-pg0-x242.google.com with SMTP id q67so7877432pga.9; Mon, 22 Jan 2018 11:47:55 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id n80sm2531071pfj.79.2018.01.22.11.47.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jan 2018 11:47:52 -0800 (PST) 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; bh=OBT7+pH2U8mBUpWCPM3SKVbCh05ITnpvaHenoZ45z6U=; b=S49rRT43mU/ysPhmjUpnMOF+YFXgxLRs08PAQT563z0nyYVIRbcPlWKRm/Y9e2wsVW WGBOX3x4KJYKXRIzFQ3gXRH8hMK8NmkVRMhimUZkHXYcWiv9d4yxNPSRBEdQtAqJUeQJ GU0XYgQk4/JXV3ENjSoQmKqkKxmdGzX/fss+Ib/+SqaU5kO12TgeMZEnZ5vgB8nV5D41 Vcayfd6LYix9XJsrC9PVxgRv53Z7WU7EGzw1MrkPs94ZJDAQMMaa0ooPMLU2Me8oKdJe 3xwimcxJDkYqQXouLuOoson1r4wxLtTbLaEPtWAaTvegzqKwPu/1UqVkz7d5A7VAGJ9H 9oWA== 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; bh=OBT7+pH2U8mBUpWCPM3SKVbCh05ITnpvaHenoZ45z6U=; b=X0sJVVJn8LkR6VMOzS8nKFaQZX+qUrAbxQpHMWtLWvtDZReIMD+ePkK0b7uZfsnVzy +JaEcm2hYLucyQwyyAMQqIqI0UpfSdUYUUhE++8qYG2hSVDy7j0TxgI1OwnrONMmMMQA KzHfIrcUdsz+++A8aUeDVtDy6qk4jdTau4aDTyq9EnaD8wjYudWlE8t+Td++znF+bymQ /FVbBupIySRHPsYW6EzHaGZ+xGAaZel8tPIdGMtMgJXtIhIWzBGfCfLTLK7hBo+Synwr Ip9MV1+2oOb8fw/RgUe8W4+ZTKmOYJTT17jBZJd6pGeQXfPT2G9NBGVfBFgQBpPG+G+z tGUA== X-Gm-Message-State: AKwxytfiIXRcYJQY9wyxPI1E/Uavx01Tt4h/m6nJMqkMDs011ueciurO vG0lE8a8WMaUb1dlUJcXiyQOQRSV X-Google-Smtp-Source: AH8x224nZBaVxMP4M+ocflOr7hZPn7SN81MONyJbzFBsaFBam7dgW+ORZ8EMK+9bvpfO4XNsfVRxwg== X-Received: by 10.101.72.11 with SMTP id h11mr7600937pgs.386.1516650473982; Mon, 22 Jan 2018 11:47:53 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com Date: Mon, 22 Jan 2018 11:43:29 -0800 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH v7 4/9] aarch64-softmmu.mak: Use an ARM specific config 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com 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" In preperation for having an ARM and MicroBlaze ZynqMP machine let's split out the current ARM specific config options. Signed-off-by: Alistair Francis Acked-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/aarch64-softmmu.mak | 1 + hw/arm/Makefile.objs | 2 +- hw/display/Makefile.objs | 2 +- hw/dma/Makefile.objs | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-= softmmu.mak index 24494832cf..9ddccf855e 100644 --- a/default-configs/aarch64-softmmu.mak +++ b/default-configs/aarch64-softmmu.mak @@ -7,3 +7,4 @@ CONFIG_AUX=3Dy CONFIG_DDC=3Dy CONFIG_DPCD=3Dy CONFIG_XLNX_ZYNQMP=3Dy +CONFIG_XLNX_ZYNQMP_ARM=3Dy diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 2794e086d6..1c896bafb4 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -13,7 +13,7 @@ obj-y +=3D omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) +=3D allwinner-a10.o cubieboard.o obj-$(CONFIG_RASPI) +=3D bcm2835_peripherals.o bcm2836.o raspi.o obj-$(CONFIG_STM32F205_SOC) +=3D stm32f205_soc.o -obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp.o xlnx-zcu102.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx-zynqmp.o xlnx-zcu102.o obj-$(CONFIG_FSL_IMX25) +=3D fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) +=3D fsl-imx31.o kzm.o obj-$(CONFIG_FSL_IMX6) +=3D fsl-imx6.o sabrelite.o diff --git a/hw/display/Makefile.objs b/hw/display/Makefile.objs index 551c050a6a..d3a4cb396e 100644 --- a/hw/display/Makefile.objs +++ b/hw/display/Makefile.objs @@ -40,4 +40,4 @@ virtio-gpu.o-libs +=3D $(VIRGL_LIBS) virtio-gpu-3d.o-cflags :=3D $(VIRGL_CFLAGS) virtio-gpu-3d.o-libs +=3D $(VIRGL_LIBS) obj-$(CONFIG_DPCD) +=3D dpcd.o -obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx_dp.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx_dp.o diff --git a/hw/dma/Makefile.objs b/hw/dma/Makefile.objs index 0b3a009b87..c2afecbf73 100644 --- a/hw/dma/Makefile.objs +++ b/hw/dma/Makefile.objs @@ -9,6 +9,7 @@ common-obj-$(CONFIG_ZYNQ_DEVCFG) +=3D xlnx-zynq-devcfg.o common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_dma.o common-obj-$(CONFIG_STP2000) +=3D sparc32_dma.o obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx_dpdma.o +obj-$(CONFIG_XLNX_ZYNQMP_ARM) +=3D xlnx_dpdma.o =20 obj-$(CONFIG_OMAP) +=3D omap_dma.o soc_dma.o obj-$(CONFIG_PXA2XX) +=3D pxa2xx_dma.o --=20 2.14.1 From nobody Thu May 2 13:24:46 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516650987324151.72925103968612; Mon, 22 Jan 2018 11:56:27 -0800 (PST) Received: from localhost ([::1]:33818 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ediCg-0004yL-Eu for importer@patchew.org; Mon, 22 Jan 2018 14:56:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47935) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi4Z-00071P-N6 for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edi4W-00062J-Q8 for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:03 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:35866) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edi4W-00061f-Gj; Mon, 22 Jan 2018 14:48:00 -0500 Received: by mail-pg0-x242.google.com with SMTP id k68so7887950pga.3; Mon, 22 Jan 2018 11:48:00 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id s80sm2182099pfj.179.2018.01.22.11.47.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jan 2018 11:47:57 -0800 (PST) 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=oAa4y2aApfQZ2Ym4VKRSqSZIIyjdrbj0cykcQzYxvc4=; b=IFJFTx/1KoIHNPJ54XasqnymGFeFRCHz64hAX7OVLkVZpg9cq6vYlwpc/WjSDwtPrU jUx0X9poGXT4FvBlTOd80fmw7f6VqvbHMDbJ11SvOhdIAvtl5HLhLxBEFdQaa6CKJP5r 3/0gpp8hKrHAxuz5p1yNt8vthY9bj+NLBL7XVc1rBWcbVwu71JLd2YA6sFZHptvXWVXB 8OlehmbDKa1wYvluVlbhPFs0jhsF1PyTjG+CR9ScZ74682Yxce2e+st6quQMoRF0EN1B 183xZHTMNz6m1ITg+wOWPI58K+bCIY8vccRz7182Z2EM667aXmW+sXOL9BkTfQYa4g9F ZogA== 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=oAa4y2aApfQZ2Ym4VKRSqSZIIyjdrbj0cykcQzYxvc4=; b=BncCnSju4TsgFgJsgefNCnvtqKXO8Avh8sE4PkFdtSVKq+qvA9+QY6W5H+Vy3Tvh5v VOXPgeo597Xfa+58sdpcfA3WPovuv1nqeCXyucTBIb0Jtr/Xp8gH1IggxdbitvYQw5EA VmzJB7/gBCcwvihzgv+F3U1AFMzG8RdCwlVaLwxpu3jT01Yq5JpEzkkf1P9kA2Kpac65 ehGPy3789U8EFARCLLwOYwJHQvKAzJeKkwYnkIjkBxwa0LbIm1pTQu85JuhP+HNDAg9z x0AC5kvxbwgOgPXVy7MeCfn0usCCyAeax02L7m6Cro7Pn6URjGw/5GiDTYp8xUiaqbol B9Vw== X-Gm-Message-State: AKwxytdu2+rSyfJJpAs222drpBoUh/CmQQUNhsNP7/iKXxSBZEhyV38S Vw6gvqI7atuNb4rqjt/gg8Bd93qh X-Google-Smtp-Source: AH8x226w86YsnSXzLWHuFJAA5I32uhOdHjr4l9AHtL1HDO9Vfck5pBg6NQBnpwbe/AWo5noItCVU2Q== X-Received: by 10.99.152.84 with SMTP id l20mr7642538pgo.382.1516650478904; Mon, 22 Jan 2018 11:47:58 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com Date: Mon, 22 Jan 2018 11:43:34 -0800 Message-Id: <3ee6ceb185a5d55980f70cdd96b6a6a2963da135.1516650109.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: 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: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH v7 5/9] xlnx-pmu-iomod-intc: Add the PMU Interrupt controller 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com 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 Add the PMU IO Module Interrupt controller device. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- default-configs/microblaze-softmmu.mak | 1 + include/hw/intc/xlnx-pmu-iomod-intc.h | 58 ++++ hw/intc/xlnx-pmu-iomod-intc.c | 554 +++++++++++++++++++++++++++++= ++++ hw/intc/Makefile.objs | 1 + 4 files changed, 614 insertions(+) create mode 100644 include/hw/intc/xlnx-pmu-iomod-intc.h create mode 100644 hw/intc/xlnx-pmu-iomod-intc.c diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/micro= blaze-softmmu.mak index ce2630818a..7fca8e4c99 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -9,3 +9,4 @@ CONFIG_XILINX_SPI=3Dy CONFIG_XILINX_ETHLITE=3Dy CONFIG_SSI=3Dy CONFIG_SSI_M25P80=3Dy +CONFIG_XLNX_ZYNQMP=3Dy diff --git a/include/hw/intc/xlnx-pmu-iomod-intc.h b/include/hw/intc/xlnx-p= mu-iomod-intc.h new file mode 100644 index 0000000000..1fdba73b9f --- /dev/null +++ b/include/hw/intc/xlnx-pmu-iomod-intc.h @@ -0,0 +1,58 @@ +/* + * QEMU model of Xilinx I/O Module Interrupt Controller + * + * Copyright (c) 2014 Xilinx Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#ifndef XLNX_PMU_IO_INTC_H +#define XLNX_PMU_IO_INTC_H + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" + +#define TYPE_XLNX_PMU_IO_INTC "xlnx.pmu_io_intc" + +#define XLNX_PMU_IO_INTC(obj) \ + OBJECT_CHECK(XlnxPMUIOIntc, (obj), TYPE_XLNX_PMU_IO_INTC) + +/* This is R_PIT3_CONTROL + 1 */ +#define XLNXPMUIOINTC_R_MAX (0x78 + 1) + +typedef struct XlnxPMUIOIntc { + SysBusDevice parent_obj; + MemoryRegion iomem; + + qemu_irq parent_irq; + + struct { + uint32_t intr_size; + uint32_t level_edge; + uint32_t positive; + } cfg; + + uint32_t irq_raw; + + uint32_t regs[XLNXPMUIOINTC_R_MAX]; + RegisterInfo regs_info[XLNXPMUIOINTC_R_MAX]; +} XlnxPMUIOIntc; + +#endif /* XLNX_PMU_IO_INTC_H */ diff --git a/hw/intc/xlnx-pmu-iomod-intc.c b/hw/intc/xlnx-pmu-iomod-intc.c new file mode 100644 index 0000000000..59235351ba --- /dev/null +++ b/hw/intc/xlnx-pmu-iomod-intc.c @@ -0,0 +1,554 @@ +/* + * QEMU model of Xilinx I/O Module Interrupt Controller + * + * Copyright (c) 2013 Xilinx Inc + * Written by Edgar E. Iglesias + * Written by Alistair Francis + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "hw/intc/xlnx-pmu-iomod-intc.h" + +#ifndef XLNX_PMU_IO_INTC_ERR_DEBUG +#define XLNX_PMU_IO_INTC_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do {\ + if (XLNX_PMU_IO_INTC_ERR_DEBUG >=3D lvl) {\ + qemu_log(TYPE_XLNX_PMU_IO_INTC ": %s:" fmt, __func__, ## args);\ + } \ +} while (0) + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +REG32(IRQ_MODE, 0xc) +REG32(GPO0, 0x10) + FIELD(GPO0, MAGIC_WORD_1, 24, 8) + FIELD(GPO0, MAGIC_WORD_2, 16, 8) + FIELD(GPO0, FT_INJECT_FAILURE, 13, 3) + FIELD(GPO0, DISABLE_RST_FTSM, 12, 1) + FIELD(GPO0, RST_FTSM, 11, 1) + FIELD(GPO0, CLR_FTSTS, 10, 1) + FIELD(GPO0, RST_ON_SLEEP, 9, 1) + FIELD(GPO0, DISABLE_TRACE_COMP, 8, 1) + FIELD(GPO0, PIT3_PRESCALE, 7, 1) + FIELD(GPO0, PIT2_PRESCALE, 5, 2) + FIELD(GPO0, PIT1_PRESCALE, 3, 2) + FIELD(GPO0, PIT0_PRESCALE, 1, 2) + FIELD(GPO0, DEBUG_REMAP, 0, 1) +REG32(GPO1, 0x14) + FIELD(GPO1, MIO_5, 5, 1) + FIELD(GPO1, MIO_4, 4, 1) + FIELD(GPO1, MIO_3, 3, 1) + FIELD(GPO1, MIO_2, 2, 1) + FIELD(GPO1, MIO_1, 1, 1) + FIELD(GPO1, MIO_0, 0, 1) +REG32(GPO2, 0x18) + FIELD(GPO2, DAP_RPU_WAKE_ACK, 9, 1) + FIELD(GPO2, DAP_FP_WAKE_ACK, 8, 1) + FIELD(GPO2, PS_STATUS, 7, 1) + FIELD(GPO2, PCAP_EN, 6, 1) +REG32(GPO3, 0x1c) + FIELD(GPO3, PL_GPO_31, 31, 1) + FIELD(GPO3, PL_GPO_30, 30, 1) + FIELD(GPO3, PL_GPO_29, 29, 1) + FIELD(GPO3, PL_GPO_28, 28, 1) + FIELD(GPO3, PL_GPO_27, 27, 1) + FIELD(GPO3, PL_GPO_26, 26, 1) + FIELD(GPO3, PL_GPO_25, 25, 1) + FIELD(GPO3, PL_GPO_24, 24, 1) + FIELD(GPO3, PL_GPO_23, 23, 1) + FIELD(GPO3, PL_GPO_22, 22, 1) + FIELD(GPO3, PL_GPO_21, 21, 1) + FIELD(GPO3, PL_GPO_20, 20, 1) + FIELD(GPO3, PL_GPO_19, 19, 1) + FIELD(GPO3, PL_GPO_18, 18, 1) + FIELD(GPO3, PL_GPO_17, 17, 1) + FIELD(GPO3, PL_GPO_16, 16, 1) + FIELD(GPO3, PL_GPO_15, 15, 1) + FIELD(GPO3, PL_GPO_14, 14, 1) + FIELD(GPO3, PL_GPO_13, 13, 1) + FIELD(GPO3, PL_GPO_12, 12, 1) + FIELD(GPO3, PL_GPO_11, 11, 1) + FIELD(GPO3, PL_GPO_10, 10, 1) + FIELD(GPO3, PL_GPO_9, 9, 1) + FIELD(GPO3, PL_GPO_8, 8, 1) + FIELD(GPO3, PL_GPO_7, 7, 1) + FIELD(GPO3, PL_GPO_6, 6, 1) + FIELD(GPO3, PL_GPO_5, 5, 1) + FIELD(GPO3, PL_GPO_4, 4, 1) + FIELD(GPO3, PL_GPO_3, 3, 1) + FIELD(GPO3, PL_GPO_2, 2, 1) + FIELD(GPO3, PL_GPO_1, 1, 1) + FIELD(GPO3, PL_GPO_0, 0, 1) +REG32(GPI0, 0x20) + FIELD(GPI0, RFT_ECC_FATAL_ERR, 31, 1) + FIELD(GPI0, RFT_VOTER_ERR, 30, 1) + FIELD(GPI0, RFT_COMPARE_ERR_23, 29, 1) + FIELD(GPI0, RFT_COMPARE_ERR_13, 28, 1) + FIELD(GPI0, RFT_COMPARE_ERR_12, 27, 1) + FIELD(GPI0, RFT_LS_MISMATCH_23_B, 26, 1) + FIELD(GPI0, RFT_LS_MISMATCH_13_B, 25, 1) + FIELD(GPI0, RFT_LS_MISMATCH_12_B, 24, 1) + FIELD(GPI0, RFT_MISMATCH_STATE, 23, 1) + FIELD(GPI0, RFT_MISMATCH_CPU, 22, 1) + FIELD(GPI0, RFT_SLEEP_RESET, 19, 1) + FIELD(GPI0, RFT_LS_MISMATCH_23_A, 18, 1) + FIELD(GPI0, RFT_LS_MISMATCH_13_A, 17, 1) + FIELD(GPI0, RFT_LS_MISMATCH_12_A, 16, 1) + FIELD(GPI0, NFT_ECC_FATAL_ERR, 15, 1) + FIELD(GPI0, NFT_VOTER_ERR, 14, 1) + FIELD(GPI0, NFT_COMPARE_ERR_23, 13, 1) + FIELD(GPI0, NFT_COMPARE_ERR_13, 12, 1) + FIELD(GPI0, NFT_COMPARE_ERR_12, 11, 1) + FIELD(GPI0, NFT_LS_MISMATCH_23_B, 10, 1) + FIELD(GPI0, NFT_LS_MISMATCH_13_B, 9, 1) + FIELD(GPI0, NFT_LS_MISMATCH_12_B, 8, 1) + FIELD(GPI0, NFT_MISMATCH_STATE, 7, 1) + FIELD(GPI0, NFT_MISMATCH_CPU, 6, 1) + FIELD(GPI0, NFT_SLEEP_RESET, 3, 1) + FIELD(GPI0, NFT_LS_MISMATCH_23_A, 2, 1) + FIELD(GPI0, NFT_LS_MISMATCH_13_A, 1, 1) + FIELD(GPI0, NFT_LS_MISMATCH_12_A, 0, 1) +REG32(GPI1, 0x24) + FIELD(GPI1, APB_AIB_ERROR, 31, 1) + FIELD(GPI1, AXI_AIB_ERROR, 30, 1) + FIELD(GPI1, ERROR_2, 29, 1) + FIELD(GPI1, ERROR_1, 28, 1) + FIELD(GPI1, ACPU_3_DBG_PWRUP, 23, 1) + FIELD(GPI1, ACPU_2_DBG_PWRUP, 22, 1) + FIELD(GPI1, ACPU_1_DBG_PWRUP, 21, 1) + FIELD(GPI1, ACPU_0_DBG_PWRUP, 20, 1) + FIELD(GPI1, FPD_WAKE_GIC_PROXY, 16, 1) + FIELD(GPI1, MIO_WAKE_5, 15, 1) + FIELD(GPI1, MIO_WAKE_4, 14, 1) + FIELD(GPI1, MIO_WAKE_3, 13, 1) + FIELD(GPI1, MIO_WAKE_2, 12, 1) + FIELD(GPI1, MIO_WAKE_1, 11, 1) + FIELD(GPI1, MIO_WAKE_0, 10, 1) + FIELD(GPI1, DAP_RPU_WAKE, 9, 1) + FIELD(GPI1, DAP_FPD_WAKE, 8, 1) + FIELD(GPI1, USB_1_WAKE, 7, 1) + FIELD(GPI1, USB_0_WAKE, 6, 1) + FIELD(GPI1, R5_1_WAKE, 5, 1) + FIELD(GPI1, R5_0_WAKE, 4, 1) + FIELD(GPI1, ACPU_3_WAKE, 3, 1) + FIELD(GPI1, ACPU_2_WAKE, 2, 1) + FIELD(GPI1, ACPU_1_WAKE, 1, 1) + FIELD(GPI1, ACPU_0_WAKE, 0, 1) +REG32(GPI2, 0x28) + FIELD(GPI2, VCC_INT_FP_DISCONNECT, 31, 1) + FIELD(GPI2, VCC_INT_DISCONNECT, 30, 1) + FIELD(GPI2, VCC_AUX_DISCONNECT, 29, 1) + FIELD(GPI2, DBG_ACPU3_RST_REQ, 23, 1) + FIELD(GPI2, DBG_ACPU2_RST_REQ, 22, 1) + FIELD(GPI2, DBG_ACPU1_RST_REQ, 21, 1) + FIELD(GPI2, DBG_ACPU0_RST_REQ, 20, 1) + FIELD(GPI2, CP_ACPU3_RST_REQ, 19, 1) + FIELD(GPI2, CP_ACPU2_RST_REQ, 18, 1) + FIELD(GPI2, CP_ACPU1_RST_REQ, 17, 1) + FIELD(GPI2, CP_ACPU0_RST_REQ, 16, 1) + FIELD(GPI2, DBG_RCPU1_RST_REQ, 9, 1) + FIELD(GPI2, DBG_RCPU0_RST_REQ, 8, 1) + FIELD(GPI2, R5_1_SLEEP, 5, 1) + FIELD(GPI2, R5_0_SLEEP, 4, 1) + FIELD(GPI2, ACPU_3_SLEEP, 3, 1) + FIELD(GPI2, ACPU_2_SLEEP, 2, 1) + FIELD(GPI2, ACPU_1_SLEEP, 1, 1) + FIELD(GPI2, ACPU_0_SLEEP, 0, 1) +REG32(GPI3, 0x2c) + FIELD(GPI3, PL_GPI_31, 31, 1) + FIELD(GPI3, PL_GPI_30, 30, 1) + FIELD(GPI3, PL_GPI_29, 29, 1) + FIELD(GPI3, PL_GPI_28, 28, 1) + FIELD(GPI3, PL_GPI_27, 27, 1) + FIELD(GPI3, PL_GPI_26, 26, 1) + FIELD(GPI3, PL_GPI_25, 25, 1) + FIELD(GPI3, PL_GPI_24, 24, 1) + FIELD(GPI3, PL_GPI_23, 23, 1) + FIELD(GPI3, PL_GPI_22, 22, 1) + FIELD(GPI3, PL_GPI_21, 21, 1) + FIELD(GPI3, PL_GPI_20, 20, 1) + FIELD(GPI3, PL_GPI_19, 19, 1) + FIELD(GPI3, PL_GPI_18, 18, 1) + FIELD(GPI3, PL_GPI_17, 17, 1) + FIELD(GPI3, PL_GPI_16, 16, 1) + FIELD(GPI3, PL_GPI_15, 15, 1) + FIELD(GPI3, PL_GPI_14, 14, 1) + FIELD(GPI3, PL_GPI_13, 13, 1) + FIELD(GPI3, PL_GPI_12, 12, 1) + FIELD(GPI3, PL_GPI_11, 11, 1) + FIELD(GPI3, PL_GPI_10, 10, 1) + FIELD(GPI3, PL_GPI_9, 9, 1) + FIELD(GPI3, PL_GPI_8, 8, 1) + FIELD(GPI3, PL_GPI_7, 7, 1) + FIELD(GPI3, PL_GPI_6, 6, 1) + FIELD(GPI3, PL_GPI_5, 5, 1) + FIELD(GPI3, PL_GPI_4, 4, 1) + FIELD(GPI3, PL_GPI_3, 3, 1) + FIELD(GPI3, PL_GPI_2, 2, 1) + FIELD(GPI3, PL_GPI_1, 1, 1) + FIELD(GPI3, PL_GPI_0, 0, 1) +REG32(IRQ_STATUS, 0x30) + FIELD(IRQ_STATUS, CSU_PMU_SEC_LOCK, 31, 1) + FIELD(IRQ_STATUS, INV_ADDR, 29, 1) + FIELD(IRQ_STATUS, PWR_DN_REQ, 28, 1) + FIELD(IRQ_STATUS, PWR_UP_REQ, 27, 1) + FIELD(IRQ_STATUS, SW_RST_REQ, 26, 1) + FIELD(IRQ_STATUS, HW_RST_REQ, 25, 1) + FIELD(IRQ_STATUS, ISO_REQ, 24, 1) + FIELD(IRQ_STATUS, FW_REQ, 23, 1) + FIELD(IRQ_STATUS, IPI3, 22, 1) + FIELD(IRQ_STATUS, IPI2, 21, 1) + FIELD(IRQ_STATUS, IPI1, 20, 1) + FIELD(IRQ_STATUS, IPI0, 19, 1) + FIELD(IRQ_STATUS, RTC_ALARM, 18, 1) + FIELD(IRQ_STATUS, RTC_EVERY_SECOND, 17, 1) + FIELD(IRQ_STATUS, CORRECTABLE_ECC, 16, 1) + FIELD(IRQ_STATUS, GPI3, 14, 1) + FIELD(IRQ_STATUS, GPI2, 13, 1) + FIELD(IRQ_STATUS, GPI1, 12, 1) + FIELD(IRQ_STATUS, GPI0, 11, 1) + FIELD(IRQ_STATUS, PIT3, 6, 1) + FIELD(IRQ_STATUS, PIT2, 5, 1) + FIELD(IRQ_STATUS, PIT1, 4, 1) + FIELD(IRQ_STATUS, PIT0, 3, 1) +REG32(IRQ_PENDING, 0x34) + FIELD(IRQ_PENDING, CSU_PMU_SEC_LOCK, 31, 1) + FIELD(IRQ_PENDING, INV_ADDR, 29, 1) + FIELD(IRQ_PENDING, PWR_DN_REQ, 28, 1) + FIELD(IRQ_PENDING, PWR_UP_REQ, 27, 1) + FIELD(IRQ_PENDING, SW_RST_REQ, 26, 1) + FIELD(IRQ_PENDING, HW_RST_REQ, 25, 1) + FIELD(IRQ_PENDING, ISO_REQ, 24, 1) + FIELD(IRQ_PENDING, FW_REQ, 23, 1) + FIELD(IRQ_PENDING, IPI3, 22, 1) + FIELD(IRQ_PENDING, IPI2, 21, 1) + FIELD(IRQ_PENDING, IPI1, 20, 1) + FIELD(IRQ_PENDING, IPI0, 19, 1) + FIELD(IRQ_PENDING, RTC_ALARM, 18, 1) + FIELD(IRQ_PENDING, RTC_EVERY_SECOND, 17, 1) + FIELD(IRQ_PENDING, CORRECTABLE_ECC, 16, 1) + FIELD(IRQ_PENDING, GPI3, 14, 1) + FIELD(IRQ_PENDING, GPI2, 13, 1) + FIELD(IRQ_PENDING, GPI1, 12, 1) + FIELD(IRQ_PENDING, GPI0, 11, 1) + FIELD(IRQ_PENDING, PIT3, 6, 1) + FIELD(IRQ_PENDING, PIT2, 5, 1) + FIELD(IRQ_PENDING, PIT1, 4, 1) + FIELD(IRQ_PENDING, PIT0, 3, 1) +REG32(IRQ_ENABLE, 0x38) + FIELD(IRQ_ENABLE, CSU_PMU_SEC_LOCK, 31, 1) + FIELD(IRQ_ENABLE, INV_ADDR, 29, 1) + FIELD(IRQ_ENABLE, PWR_DN_REQ, 28, 1) + FIELD(IRQ_ENABLE, PWR_UP_REQ, 27, 1) + FIELD(IRQ_ENABLE, SW_RST_REQ, 26, 1) + FIELD(IRQ_ENABLE, HW_RST_REQ, 25, 1) + FIELD(IRQ_ENABLE, ISO_REQ, 24, 1) + FIELD(IRQ_ENABLE, FW_REQ, 23, 1) + FIELD(IRQ_ENABLE, IPI3, 22, 1) + FIELD(IRQ_ENABLE, IPI2, 21, 1) + FIELD(IRQ_ENABLE, IPI1, 20, 1) + FIELD(IRQ_ENABLE, IPI0, 19, 1) + FIELD(IRQ_ENABLE, RTC_ALARM, 18, 1) + FIELD(IRQ_ENABLE, RTC_EVERY_SECOND, 17, 1) + FIELD(IRQ_ENABLE, CORRECTABLE_ECC, 16, 1) + FIELD(IRQ_ENABLE, GPI3, 14, 1) + FIELD(IRQ_ENABLE, GPI2, 13, 1) + FIELD(IRQ_ENABLE, GPI1, 12, 1) + FIELD(IRQ_ENABLE, GPI0, 11, 1) + FIELD(IRQ_ENABLE, PIT3, 6, 1) + FIELD(IRQ_ENABLE, PIT2, 5, 1) + FIELD(IRQ_ENABLE, PIT1, 4, 1) + FIELD(IRQ_ENABLE, PIT0, 3, 1) +REG32(IRQ_ACK, 0x3c) + FIELD(IRQ_ACK, CSU_PMU_SEC_LOCK, 31, 1) + FIELD(IRQ_ACK, INV_ADDR, 29, 1) + FIELD(IRQ_ACK, PWR_DN_REQ, 28, 1) + FIELD(IRQ_ACK, PWR_UP_REQ, 27, 1) + FIELD(IRQ_ACK, SW_RST_REQ, 26, 1) + FIELD(IRQ_ACK, HW_RST_REQ, 25, 1) + FIELD(IRQ_ACK, ISO_REQ, 24, 1) + FIELD(IRQ_ACK, FW_REQ, 23, 1) + FIELD(IRQ_ACK, IPI3, 22, 1) + FIELD(IRQ_ACK, IPI2, 21, 1) + FIELD(IRQ_ACK, IPI1, 20, 1) + FIELD(IRQ_ACK, IPI0, 19, 1) + FIELD(IRQ_ACK, RTC_ALARM, 18, 1) + FIELD(IRQ_ACK, RTC_EVERY_SECOND, 17, 1) + FIELD(IRQ_ACK, CORRECTABLE_ECC, 16, 1) + FIELD(IRQ_ACK, GPI3, 14, 1) + FIELD(IRQ_ACK, GPI2, 13, 1) + FIELD(IRQ_ACK, GPI1, 12, 1) + FIELD(IRQ_ACK, GPI0, 11, 1) + FIELD(IRQ_ACK, PIT3, 6, 1) + FIELD(IRQ_ACK, PIT2, 5, 1) + FIELD(IRQ_ACK, PIT1, 4, 1) + FIELD(IRQ_ACK, PIT0, 3, 1) +REG32(PIT0_PRELOAD, 0x40) +REG32(PIT0_COUNTER, 0x44) +REG32(PIT0_CONTROL, 0x48) + FIELD(PIT0_CONTROL, PRELOAD, 1, 1) + FIELD(PIT0_CONTROL, EN, 0, 1) +REG32(PIT1_PRELOAD, 0x50) +REG32(PIT1_COUNTER, 0x54) +REG32(PIT1_CONTROL, 0x58) + FIELD(PIT1_CONTROL, PRELOAD, 1, 1) + FIELD(PIT1_CONTROL, EN, 0, 1) +REG32(PIT2_PRELOAD, 0x60) +REG32(PIT2_COUNTER, 0x64) +REG32(PIT2_CONTROL, 0x68) + FIELD(PIT2_CONTROL, PRELOAD, 1, 1) + FIELD(PIT2_CONTROL, EN, 0, 1) +REG32(PIT3_PRELOAD, 0x70) +REG32(PIT3_COUNTER, 0x74) +REG32(PIT3_CONTROL, 0x78) + FIELD(PIT3_CONTROL, PRELOAD, 1, 1) + FIELD(PIT3_CONTROL, EN, 0, 1) + +static void xlnx_pmu_io_irq_update(XlnxPMUIOIntc *s) +{ + bool irq_out; + + s->regs[R_IRQ_PENDING] =3D s->regs[R_IRQ_STATUS] & s->regs[R_IRQ_ENABL= E]; + irq_out =3D !!s->regs[R_IRQ_PENDING]; + + DB_PRINT("Setting IRQ output =3D %d\n", irq_out); + + qemu_set_irq(s->parent_irq, irq_out); +} + +static void xlnx_pmu_io_irq_enable_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxPMUIOIntc *s =3D XLNX_PMU_IO_INTC(reg->opaque); + + xlnx_pmu_io_irq_update(s); +} + +static void xlnx_pmu_io_irq_ack_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxPMUIOIntc *s =3D XLNX_PMU_IO_INTC(reg->opaque); + uint32_t val =3D val64; + + /* Only clear */ + val &=3D s->regs[R_IRQ_STATUS]; + s->regs[R_IRQ_STATUS] ^=3D val; + + /* Active level triggered interrupts stay high. */ + s->regs[R_IRQ_STATUS] |=3D s->irq_raw & ~s->cfg.level_edge; + + xlnx_pmu_io_irq_update(s); +} + +static const RegisterAccessInfo xlnx_pmu_io_intc_regs_info[] =3D { + { .name =3D "IRQ_MODE", .addr =3D A_IRQ_MODE, + .rsvd =3D 0xffffffff, + },{ .name =3D "GPO0", .addr =3D A_GPO0, + },{ .name =3D "GPO1", .addr =3D A_GPO1, + .rsvd =3D 0xffffffc0, + },{ .name =3D "GPO2", .addr =3D A_GPO2, + .rsvd =3D 0xfffffc3f, + },{ .name =3D "GPO3", .addr =3D A_GPO3, + },{ .name =3D "GPI0", .addr =3D A_GPI0, + .rsvd =3D 0x300030, + .ro =3D 0xffcfffcf, + },{ .name =3D "GPI1", .addr =3D A_GPI1, + .rsvd =3D 0xf0e0000, + .ro =3D 0xf0f1ffff, + },{ .name =3D "GPI2", .addr =3D A_GPI2, + .rsvd =3D 0x1f00fcc0, + .ro =3D 0xe0ff033f, + },{ .name =3D "GPI3", .addr =3D A_GPI3, + .ro =3D 0xffffffff, + },{ .name =3D "IRQ_STATUS", .addr =3D A_IRQ_STATUS, + .rsvd =3D 0x40008787, + .ro =3D 0xbfff7878, + },{ .name =3D "IRQ_PENDING", .addr =3D A_IRQ_PENDING, + .rsvd =3D 0x40008787, + .ro =3D 0xdfff7ff8, + },{ .name =3D "IRQ_ENABLE", .addr =3D A_IRQ_ENABLE, + .rsvd =3D 0x40008787, + .ro =3D 0x7800, + .post_write =3D xlnx_pmu_io_irq_enable_postw, + },{ .name =3D "IRQ_ACK", .addr =3D A_IRQ_ACK, + .rsvd =3D 0x40008787, + .post_write =3D xlnx_pmu_io_irq_ack_postw, + },{ .name =3D "PIT0_PRELOAD", .addr =3D A_PIT0_PRELOAD, + .ro =3D 0xffffffff, + },{ .name =3D "PIT0_COUNTER", .addr =3D A_PIT0_COUNTER, + .ro =3D 0xffffffff, + },{ .name =3D "PIT0_CONTROL", .addr =3D A_PIT0_CONTROL, + .rsvd =3D 0xfffffffc, + },{ .name =3D "PIT1_PRELOAD", .addr =3D A_PIT1_PRELOAD, + .ro =3D 0xffffffff, + },{ .name =3D "PIT1_COUNTER", .addr =3D A_PIT1_COUNTER, + .ro =3D 0xffffffff, + },{ .name =3D "PIT1_CONTROL", .addr =3D A_PIT1_CONTROL, + .rsvd =3D 0xfffffffc, + },{ .name =3D "PIT2_PRELOAD", .addr =3D A_PIT2_PRELOAD, + .ro =3D 0xffffffff, + },{ .name =3D "PIT2_COUNTER", .addr =3D A_PIT2_COUNTER, + .ro =3D 0xffffffff, + },{ .name =3D "PIT2_CONTROL", .addr =3D A_PIT2_CONTROL, + .rsvd =3D 0xfffffffc, + },{ .name =3D "PIT3_PRELOAD", .addr =3D A_PIT3_PRELOAD, + .ro =3D 0xffffffff, + },{ .name =3D "PIT3_COUNTER", .addr =3D A_PIT3_COUNTER, + .ro =3D 0xffffffff, + },{ .name =3D "PIT3_CONTROL", .addr =3D A_PIT3_CONTROL, + .rsvd =3D 0xfffffffc, + } +}; + +static void irq_handler(void *opaque, int irq, int level) +{ + XlnxPMUIOIntc *s =3D XLNX_PMU_IO_INTC(opaque); + uint32_t mask =3D 1 << irq; + uint32_t prev =3D s->irq_raw; + uint32_t temp; + + s->irq_raw &=3D ~mask; + s->irq_raw |=3D (!!level) << irq; + + /* Turn active-low into active-high. */ + s->irq_raw ^=3D (~s->cfg.positive); + s->irq_raw &=3D mask; + + if (s->cfg.level_edge & mask) { + /* Edge triggered. */ + temp =3D (prev ^ s->irq_raw) & s->irq_raw; + } else { + /* Level triggered. */ + temp =3D s->irq_raw; + } + s->regs[R_IRQ_STATUS] |=3D temp; + + xlnx_pmu_io_irq_update(s); +} + +static void xlnx_pmu_io_intc_reset(DeviceState *dev) +{ + XlnxPMUIOIntc *s =3D XLNX_PMU_IO_INTC(dev); + unsigned int i; + + for (i =3D 0; i < ARRAY_SIZE(s->regs_info); ++i) { + register_reset(&s->regs_info[i]); + } + + xlnx_pmu_io_irq_update(s); +} + +static const MemoryRegionOps xlnx_pmu_io_intc_ops =3D { + .read =3D register_read_memory, + .write =3D register_write_memory, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + +static Property xlnx_pmu_io_intc_properties[] =3D { + DEFINE_PROP_UINT32("intc-intr-size", XlnxPMUIOIntc, cfg.intr_size, 0), + DEFINE_PROP_UINT32("intc-level-edge", XlnxPMUIOIntc, cfg.level_edge, 0= ), + DEFINE_PROP_UINT32("intc-positive", XlnxPMUIOIntc, cfg.positive, 0), + DEFINE_PROP_END_OF_LIST(), +}; + +static void xlnx_pmu_io_intc_realize(DeviceState *dev, Error **errp) +{ + XlnxPMUIOIntc *s =3D XLNX_PMU_IO_INTC(dev); + + /* Internal interrupts are edge triggered */ + s->cfg.level_edge <<=3D 16; + s->cfg.level_edge |=3D 0xffff; + + /* Internal interrupts are positive. */ + s->cfg.positive <<=3D 16; + s->cfg.positive |=3D 0xffff; + + /* Max 16 external interrupts. */ + assert(s->cfg.intr_size <=3D 16); + + qdev_init_gpio_in(dev, irq_handler, 16 + s->cfg.intr_size); +} + +static void xlnx_pmu_io_intc_init(Object *obj) +{ + XlnxPMUIOIntc *s =3D XLNX_PMU_IO_INTC(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; + + memory_region_init(&s->iomem, obj, TYPE_XLNX_PMU_IO_INTC, + XLNXPMUIOINTC_R_MAX * 4); + reg_array =3D + register_init_block32(DEVICE(obj), xlnx_pmu_io_intc_regs_info, + ARRAY_SIZE(xlnx_pmu_io_intc_regs_info), + s->regs_info, s->regs, + &xlnx_pmu_io_intc_ops, + XLNX_PMU_IO_INTC_ERR_DEBUG, + XLNXPMUIOINTC_R_MAX * 4); + memory_region_add_subregion(&s->iomem, + 0x0, + ®_array->mem); + sysbus_init_mmio(sbd, &s->iomem); + + sysbus_init_irq(sbd, &s->parent_irq); +} + +static const VMStateDescription vmstate_xlnx_pmu_io_intc =3D { + .name =3D TYPE_XLNX_PMU_IO_INTC, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, XlnxPMUIOIntc, XLNXPMUIOINTC_R_MAX), + VMSTATE_END_OF_LIST(), + } +}; + +static void xlnx_pmu_io_intc_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D xlnx_pmu_io_intc_reset; + dc->realize =3D xlnx_pmu_io_intc_realize; + dc->vmsd =3D &vmstate_xlnx_pmu_io_intc; + dc->props =3D xlnx_pmu_io_intc_properties; +} + +static const TypeInfo xlnx_pmu_io_intc_info =3D { + .name =3D TYPE_XLNX_PMU_IO_INTC, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(XlnxPMUIOIntc), + .class_init =3D xlnx_pmu_io_intc_class_init, + .instance_init =3D xlnx_pmu_io_intc_init, +}; + +static void xlnx_pmu_io_intc_register_types(void) +{ + type_register_static(&xlnx_pmu_io_intc_info); +} + +type_init(xlnx_pmu_io_intc_register_types) diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index ae358569a1..211655023e 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -3,6 +3,7 @@ common-obj-$(CONFIG_I8259) +=3D i8259_common.o i8259.o common-obj-$(CONFIG_PL190) +=3D pl190.o common-obj-$(CONFIG_PUV3) +=3D puv3_intc.o common-obj-$(CONFIG_XILINX) +=3D xilinx_intc.o +common-obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-pmu-iomod-intc.o common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_pic.o common-obj-$(CONFIG_IMX) +=3D imx_avic.o common-obj-$(CONFIG_LM32) +=3D lm32_pic.o --=20 2.14.1 From nobody Thu May 2 13:24:46 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516650624802169.50080209000055; Mon, 22 Jan 2018 11:50:24 -0800 (PST) Received: from localhost ([::1]:33705 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi6p-0008Mu-Ui for importer@patchew.org; Mon, 22 Jan 2018 14:50:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi4b-00073O-LU for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edi4a-00064k-PL for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:05 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:36489) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edi4a-00064S-Iv; Mon, 22 Jan 2018 14:48:04 -0500 Received: by mail-pf0-x242.google.com with SMTP id 23so7885369pfp.3; Mon, 22 Jan 2018 11:48:04 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id b6sm1726868pfe.85.2018.01.22.11.48.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jan 2018 11:48:02 -0800 (PST) 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=k0KmNmMODx5Ym5kXsMD6qEv83KQfi2d6Ux1hffjiIqM=; b=fxhsj3730G3yTgvLACETPixumJmZCpfeB7YhznhToRjcR5zZ75bYPb+eEIOcQuN2yn iENdyJzvJupa2FrpFj7/C9vj2voMuzOuwgiD3L3NXtpxB9uY9KoBwXq3uV50k24PQNFY hLRw4zXq4MjvyfOy6pZryzQrsNpRV3SGxNxfmMFWL831pw7pqR/D2IHDNLDPs0QnxD5X Z7fPGKm8uHOqgVA3184xIW0PoUSRK/9CiKPIV7LOtKNcSoN/wo8LILxsA/gHcUHheaXX SjF9hX7uGM65Iu1+gUqdOAiZMCvdWOkwfGFdrajRo47FqPOhJmo7chSmyUFClIzYjrWs C/Mw== 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=k0KmNmMODx5Ym5kXsMD6qEv83KQfi2d6Ux1hffjiIqM=; b=Poimv4aUuRfQaw1o3Uf0ElJBEXzni4QU85qoRSiGYRoRdZAVLFjboffFvHDOecBKmL 1pUs/uenBJbb+q5FCLY31EHZvxaOGXsQafIYrJA/wA4J1Xgdits3T16QItnFKajzwDnj uxWgsACD/efiWTVBz4F1Xnq4A8jk6xeZRdM9EasLrQVbKaqL91hgtJQFrkc1xAc+z1dd ZuxHws27P54XWolhVJunU5yFU3QUTqbCxa8O1xGBXCsPLKriS8QlnWsfbFPIlkP6byd8 CB3yjbwJJgWLRd8if4/+FgYPT1fAc2ZOoe7GwZOn8/EIIn1Os7UUklFya8l+/+dKPeba Wm8Q== X-Gm-Message-State: AKwxyteNf+QOXn3IEPl5ZgF/6B+4bahRsJMB6hZAxCiTP1HLEHZNqWme lHnVqiVUZhxX4dCOjjRmAAwsFhcr X-Google-Smtp-Source: AH8x226zDr8OJfQuQnROHJqexfWTTTrsb0q99TwWjBPEi+bCZd2e9UK3W9tikExhzIvT4NoKJrOzEg== X-Received: by 10.98.228.5 with SMTP id r5mr9154922pfh.193.1516650483306; Mon, 22 Jan 2018 11:48:03 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com Date: Mon, 22 Jan 2018 11:43:38 -0800 Message-Id: <3bea46b94313557c66c45b2400ca10cec0480fec.1516650109.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: 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: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PATCH v7 6/9] xlnx-zynqmp-pmu: Connect the PMU interrupt controller 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com 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 Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/microblaze/xlnx-zynqmp-pmu.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pm= u.c index 145837b372..7312bfe23e 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -24,6 +24,8 @@ #include "cpu.h" #include "boot.h" =20 +#include "hw/intc/xlnx-pmu-iomod-intc.h" + /* Define the PMU device */ =20 #define TYPE_XLNX_ZYNQMP_PMU_SOC "xlnx,zynqmp-pmu-soc" @@ -34,14 +36,18 @@ #define XLNX_ZYNQMP_PMU_ROM_ADDR 0xFFD00000 #define XLNX_ZYNQMP_PMU_RAM_ADDR 0xFFDC0000 =20 +#define XLNX_ZYNQMP_PMU_INTC_ADDR 0xFFD40000 + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj; =20 /*< public >*/ MicroBlazeCPU cpu; + XlnxPMUIOIntc intc; } XlnxZynqMPPMUSoCState; =20 + static void xlnx_zynqmp_pmu_soc_init(Object *obj) { XlnxZynqMPPMUSoCState *s =3D XLNX_ZYNQMP_PMU_SOC(obj); @@ -50,6 +56,9 @@ static void xlnx_zynqmp_pmu_soc_init(Object *obj) TYPE_MICROBLAZE_CPU); object_property_add_child(obj, "pmu-cpu", OBJECT(&s->cpu), &error_abort); + + object_initialize(&s->intc, sizeof(s->intc), TYPE_XLNX_PMU_IO_INTC); + qdev_set_parent_bus(DEVICE(&s->intc), sysbus_get_default()); } =20 static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev, Error **errp) @@ -80,6 +89,21 @@ static void xlnx_zynqmp_pmu_soc_realize(DeviceState *dev= , Error **errp) error_propagate(errp, err); return; } + + object_property_set_uint(OBJECT(&s->intc), 0x10, "intc-intr-size", + &error_abort); + object_property_set_uint(OBJECT(&s->intc), 0x0, "intc-level-edge", + &error_abort); + object_property_set_uint(OBJECT(&s->intc), 0xffff, "intc-positive", + &error_abort); + object_property_set_bool(OBJECT(&s->intc), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + sysbus_mmio_map(SYS_BUS_DEVICE(&s->intc), 0, XLNX_ZYNQMP_PMU_INTC_ADDR= ); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->intc), 0, + qdev_get_gpio_in(DEVICE(&s->cpu), MB_CPU_IRQ)); } =20 static void xlnx_zynqmp_pmu_soc_class_init(ObjectClass *oc, void *data) --=20 2.14.1 From nobody Thu May 2 13:24:46 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516651001970345.9550376473587; Mon, 22 Jan 2018 11:56:41 -0800 (PST) Received: from localhost ([::1]:33819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ediCt-0005Cu-2h for importer@patchew.org; Mon, 22 Jan 2018 14:56:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi4h-00079F-Vf for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edi4f-00067E-T5 for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:12 -0500 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:43874) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edi4f-00066o-Iw; Mon, 22 Jan 2018 14:48:09 -0500 Received: by mail-pg0-x244.google.com with SMTP id n17so7871289pgf.10; Mon, 22 Jan 2018 11:48:09 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id i128sm1986723pfg.83.2018.01.22.11.48.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jan 2018 11:48:06 -0800 (PST) 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; bh=LZExAnHuD9UO91hl3+GRfjj4KVoiJmGUzRQw18SqirQ=; b=QdMd/lvlesNsvxcQzh8YiVVuqAxV8G8Nm+K5f3yicduD1KcQMY1TmfCkr3uCY5gJ2j 6ZUInPMzW1j9moG+DIeLE1sVljp6pOqw+AMxX952KXwA42U46ZuxvPKgYSIbg+bDxC1E x5CfJgEg7WmudraXXgLGHyEHHWQXUjBuP+aKWXWkCKlc6KgxRUHjaaLoWMFjTG66ltc6 rQ5FxlK1HD7LwIBaAYVPcL8jcgjXYFbZXKJgulJaP5CGNI7haK/GEW+fpjWnxHL75Y7k 9y15F4AhaUXdrpQXJFiOV3wMTxE1rp/RujCjMwe4+/q0ne5Ok0dNGLcal6EQiFe3pej2 mHZw== 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; bh=LZExAnHuD9UO91hl3+GRfjj4KVoiJmGUzRQw18SqirQ=; b=aFFKcXVYsaa5r5Ao+RRz/mtFXVi9NVdkrAoihU0MGt9ao+FsfoPkL6DxKd5x8r7kjP ZX+vtzJOG0RL+FSUaBfqKTZ+mE1G76og40mjBxjdMni0iUwfSycFplq/IRgXBM+ekZV/ nzzFVb/LsWVQ7iMZT8KNeUru7seCAxJMFIJQZjo2XVELt61nuW96Ie7YmswAOasFkozS Epe1sbdxm9JKltJBO0vLEPYaE2+Fv0DV3OIe3wD4RZ50k2Zv3fvaE+6id2QQzwy4C4RS 1E9z7jEjmtrXmIy39NRD6xi6yxpt2wX7UIX+ldPAeGBwVNDtZ/V0Imr+hNQWBMZatidu vzHw== X-Gm-Message-State: AKwxytcElLQAQ1121IgFe9lml3wWa3TZrTppdb5PvjgiKvdn08tbl7HV lbSwZqOvyPhQ2T/J0Yzv6se6J4Ll X-Google-Smtp-Source: AH8x227G8ClU5Z/ZZiK4PA98X58V2PC3JYDEEDH+crJBpQ+Un4vTiCP15LyIQ24YYEuJ5i0+r2OBNQ== X-Received: by 10.98.237.6 with SMTP id u6mr9060927pfh.190.1516650488079; Mon, 22 Jan 2018 11:48:08 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com Date: Mon, 22 Jan 2018 11:43:43 -0800 Message-Id: X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::244 Subject: [Qemu-devel] [PATCH v7 7/9] xlnx-zynqmp-ipi: Initial version of the Xilinx IPI device 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com 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" This is the initial version of the Inter Processor Interrupt device. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias --- include/hw/intc/xlnx-zynqmp-ipi.h | 57 ++++++ hw/intc/xlnx-zynqmp-ipi.c | 377 ++++++++++++++++++++++++++++++++++= ++++ hw/intc/Makefile.objs | 1 + 3 files changed, 435 insertions(+) create mode 100644 include/hw/intc/xlnx-zynqmp-ipi.h create mode 100644 hw/intc/xlnx-zynqmp-ipi.c diff --git a/include/hw/intc/xlnx-zynqmp-ipi.h b/include/hw/intc/xlnx-zynqm= p-ipi.h new file mode 100644 index 0000000000..4afa4ff313 --- /dev/null +++ b/include/hw/intc/xlnx-zynqmp-ipi.h @@ -0,0 +1,57 @@ +/* + * QEMU model of the IPI Inter Processor Interrupt block + * + * Copyright (c) 2014 Xilinx Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#ifndef XLNX_ZYNQMP_IPI_H +#define XLNX_ZYNQMP_IPI_H + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" + +#define TYPE_XLNX_ZYNQMP_IPI "xlnx.zynqmp_ipi" + +#define XLNX_ZYNQMP_IPI(obj) \ + OBJECT_CHECK(XlnxZynqMPIPI, (obj), TYPE_XLNX_ZYNQMP_IPI) + +/* This is R_IPI_IDR + 1 */ +#define R_XLNX_ZYNQMP_IPI_MAX ((0x1c / 4) + 1) + +#define NUM_IPIS 11 + +typedef struct XlnxZynqMPIPI { + /* Private */ + SysBusDevice parent_obj; + + /* Public */ + MemoryRegion iomem; + qemu_irq irq; + + qemu_irq irq_trig_out[NUM_IPIS]; + qemu_irq irq_obs_out[NUM_IPIS]; + + uint32_t regs[R_XLNX_ZYNQMP_IPI_MAX]; + RegisterInfo regs_info[R_XLNX_ZYNQMP_IPI_MAX]; +} XlnxZynqMPIPI; + +#endif /* XLNX_ZYNQMP_IPI_H */ diff --git a/hw/intc/xlnx-zynqmp-ipi.c b/hw/intc/xlnx-zynqmp-ipi.c new file mode 100644 index 0000000000..aa50a8ac08 --- /dev/null +++ b/hw/intc/xlnx-zynqmp-ipi.c @@ -0,0 +1,377 @@ +/* + * QEMU model of the IPI Inter Processor Interrupt block + * + * Copyright (c) 2014 Xilinx Inc. + * + * Written by Edgar E. Iglesias + * Written by Alistair Francis + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "hw/sysbus.h" +#include "hw/register.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "hw/intc/xlnx-zynqmp-ipi.h" + +#ifndef XLNX_ZYNQMP_IPI_ERR_DEBUG +#define XLNX_ZYNQMP_IPI_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do {\ + if (XLNX_ZYNQMP_IPI_ERR_DEBUG >=3D lvl) {\ + qemu_log(TYPE_XLNX_ZYNQMP_IPI ": %s:" fmt, __func__, ## args);\ + } \ +} while (0) + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +REG32(IPI_TRIG, 0x0) + FIELD(IPI_TRIG, PL_3, 27, 1) + FIELD(IPI_TRIG, PL_2, 26, 1) + FIELD(IPI_TRIG, PL_1, 25, 1) + FIELD(IPI_TRIG, PL_0, 24, 1) + FIELD(IPI_TRIG, PMU_3, 19, 1) + FIELD(IPI_TRIG, PMU_2, 18, 1) + FIELD(IPI_TRIG, PMU_1, 17, 1) + FIELD(IPI_TRIG, PMU_0, 16, 1) + FIELD(IPI_TRIG, RPU_1, 9, 1) + FIELD(IPI_TRIG, RPU_0, 8, 1) + FIELD(IPI_TRIG, APU, 0, 1) +REG32(IPI_OBS, 0x4) + FIELD(IPI_OBS, PL_3, 27, 1) + FIELD(IPI_OBS, PL_2, 26, 1) + FIELD(IPI_OBS, PL_1, 25, 1) + FIELD(IPI_OBS, PL_0, 24, 1) + FIELD(IPI_OBS, PMU_3, 19, 1) + FIELD(IPI_OBS, PMU_2, 18, 1) + FIELD(IPI_OBS, PMU_1, 17, 1) + FIELD(IPI_OBS, PMU_0, 16, 1) + FIELD(IPI_OBS, RPU_1, 9, 1) + FIELD(IPI_OBS, RPU_0, 8, 1) + FIELD(IPI_OBS, APU, 0, 1) +REG32(IPI_ISR, 0x10) + FIELD(IPI_ISR, PL_3, 27, 1) + FIELD(IPI_ISR, PL_2, 26, 1) + FIELD(IPI_ISR, PL_1, 25, 1) + FIELD(IPI_ISR, PL_0, 24, 1) + FIELD(IPI_ISR, PMU_3, 19, 1) + FIELD(IPI_ISR, PMU_2, 18, 1) + FIELD(IPI_ISR, PMU_1, 17, 1) + FIELD(IPI_ISR, PMU_0, 16, 1) + FIELD(IPI_ISR, RPU_1, 9, 1) + FIELD(IPI_ISR, RPU_0, 8, 1) + FIELD(IPI_ISR, APU, 0, 1) +REG32(IPI_IMR, 0x14) + FIELD(IPI_IMR, PL_3, 27, 1) + FIELD(IPI_IMR, PL_2, 26, 1) + FIELD(IPI_IMR, PL_1, 25, 1) + FIELD(IPI_IMR, PL_0, 24, 1) + FIELD(IPI_IMR, PMU_3, 19, 1) + FIELD(IPI_IMR, PMU_2, 18, 1) + FIELD(IPI_IMR, PMU_1, 17, 1) + FIELD(IPI_IMR, PMU_0, 16, 1) + FIELD(IPI_IMR, RPU_1, 9, 1) + FIELD(IPI_IMR, RPU_0, 8, 1) + FIELD(IPI_IMR, APU, 0, 1) +REG32(IPI_IER, 0x18) + FIELD(IPI_IER, PL_3, 27, 1) + FIELD(IPI_IER, PL_2, 26, 1) + FIELD(IPI_IER, PL_1, 25, 1) + FIELD(IPI_IER, PL_0, 24, 1) + FIELD(IPI_IER, PMU_3, 19, 1) + FIELD(IPI_IER, PMU_2, 18, 1) + FIELD(IPI_IER, PMU_1, 17, 1) + FIELD(IPI_IER, PMU_0, 16, 1) + FIELD(IPI_IER, RPU_1, 9, 1) + FIELD(IPI_IER, RPU_0, 8, 1) + FIELD(IPI_IER, APU, 0, 1) +REG32(IPI_IDR, 0x1c) + FIELD(IPI_IDR, PL_3, 27, 1) + FIELD(IPI_IDR, PL_2, 26, 1) + FIELD(IPI_IDR, PL_1, 25, 1) + FIELD(IPI_IDR, PL_0, 24, 1) + FIELD(IPI_IDR, PMU_3, 19, 1) + FIELD(IPI_IDR, PMU_2, 18, 1) + FIELD(IPI_IDR, PMU_1, 17, 1) + FIELD(IPI_IDR, PMU_0, 16, 1) + FIELD(IPI_IDR, RPU_1, 9, 1) + FIELD(IPI_IDR, RPU_0, 8, 1) + FIELD(IPI_IDR, APU, 0, 1) + +/* APU + * RPU_0 + * RPU_1 + * PMU_0 + * PMU_1 + * PMU_2 + * PMU_3 + * PL_0 + * PL_1 + * PL_2 + * PL_3 + */ +int index_array[NUM_IPIS] =3D {0, 8, 9, 16, 17, 18, 19, 24, 25, 26, 27}; +static const char *index_array_names[NUM_IPIS] =3D {"APU", "RPU_0", "RPU_1= ", + "PMU_0", "PMU_1", "PMU_2= ", + "PMU_3", "PL_0", "PL_1", + "PL_2", "PL_3"}; + +static void xlnx_zynqmp_ipi_set_trig(XlnxZynqMPIPI *s, uint32_t val) +{ + int i, ipi_index, ipi_mask; + + for (i =3D 0; i < NUM_IPIS; i++) { + ipi_index =3D index_array[i]; + ipi_mask =3D (1 << ipi_index); + DB_PRINT("Setting %s=3D%d\n", index_array_names[i], + !!(val & ipi_mask)); + qemu_set_irq(s->irq_trig_out[i], !!(val & ipi_mask)); + } +} + +static void xlnx_zynqmp_ipi_set_obs(XlnxZynqMPIPI *s, uint32_t val) +{ + int i, ipi_index, ipi_mask; + + for (i =3D 0; i < NUM_IPIS; i++) { + ipi_index =3D index_array[i]; + ipi_mask =3D (1 << ipi_index); + DB_PRINT("Setting %s=3D%d\n", index_array_names[i], + !!(val & ipi_mask)); + qemu_set_irq(s->irq_obs_out[i], !!(val & ipi_mask)); + } +} + +static void xlnx_zynqmp_ipi_update_irq(XlnxZynqMPIPI *s) +{ + bool pending =3D s->regs[R_IPI_ISR] & ~s->regs[R_IPI_IMR]; + + DB_PRINT("irq=3D%d isr=3D%x mask=3D%x\n", + pending, s->regs[R_IPI_ISR], s->regs[R_IPI_IMR]); + qemu_set_irq(s->irq, pending); +} + +static uint64_t xlnx_zynqmp_ipi_trig_prew(RegisterInfo *reg, uint64_t val6= 4) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(reg->opaque); + + xlnx_zynqmp_ipi_set_trig(s, val64); + + return val64; +} + +static void xlnx_zynqmp_ipi_trig_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(reg->opaque); + + /* TRIG generates a pulse on the outbound signals. We use the + * post-write callback to bring the signal back-down. + */ + s->regs[R_IPI_TRIG] =3D 0; + + xlnx_zynqmp_ipi_set_trig(s, 0); +} + +static uint64_t xlnx_zynqmp_ipi_isr_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(reg->opaque); + + xlnx_zynqmp_ipi_set_obs(s, val64); + + return val64; +} + +static void xlnx_zynqmp_ipi_isr_postw(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(reg->opaque); + + xlnx_zynqmp_ipi_update_irq(s); +} + +static uint64_t xlnx_zynqmp_ipi_ier_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(reg->opaque); + uint32_t val =3D val64; + + s->regs[R_IPI_IMR] &=3D ~val; + xlnx_zynqmp_ipi_update_irq(s); + return 0; +} + +static uint64_t xlnx_zynqmp_ipi_idr_prew(RegisterInfo *reg, uint64_t val64) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(reg->opaque); + uint32_t val =3D val64; + + s->regs[R_IPI_IMR] |=3D val; + xlnx_zynqmp_ipi_update_irq(s); + return 0; +} + +static const RegisterAccessInfo xlnx_zynqmp_ipi_regs_info[] =3D { + { .name =3D "IPI_TRIG", .addr =3D A_IPI_TRIG, + .rsvd =3D 0xf0f0fcfe, + .ro =3D 0xf0f0fcfe, + .pre_write =3D xlnx_zynqmp_ipi_trig_prew, + .post_write =3D xlnx_zynqmp_ipi_trig_postw, + },{ .name =3D "IPI_OBS", .addr =3D A_IPI_OBS, + .rsvd =3D 0xf0f0fcfe, + .ro =3D 0xffffffff, + },{ .name =3D "IPI_ISR", .addr =3D A_IPI_ISR, + .rsvd =3D 0xf0f0fcfe, + .ro =3D 0xf0f0fcfe, + .w1c =3D 0xf0f0301, + .pre_write =3D xlnx_zynqmp_ipi_isr_prew, + .post_write =3D xlnx_zynqmp_ipi_isr_postw, + },{ .name =3D "IPI_IMR", .addr =3D A_IPI_IMR, + .reset =3D 0xf0f0301, + .rsvd =3D 0xf0f0fcfe, + .ro =3D 0xffffffff, + },{ .name =3D "IPI_IER", .addr =3D A_IPI_IER, + .rsvd =3D 0xf0f0fcfe, + .ro =3D 0xf0f0fcfe, + .pre_write =3D xlnx_zynqmp_ipi_ier_prew, + },{ .name =3D "IPI_IDR", .addr =3D A_IPI_IDR, + .rsvd =3D 0xf0f0fcfe, + .ro =3D 0xf0f0fcfe, + .pre_write =3D xlnx_zynqmp_ipi_idr_prew, + } +}; + +static void xlnx_zynqmp_ipi_reset(DeviceState *dev) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(dev); + int i; + + for (i =3D 0; i < ARRAY_SIZE(s->regs_info); ++i) { + register_reset(&s->regs_info[i]); + } + + xlnx_zynqmp_ipi_update_irq(s); +} + +static void xlnx_zynqmp_ipi_handler(void *opaque, int n, int level) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(opaque); + uint32_t val =3D (!!level) << n; + + DB_PRINT("IPI input irq[%d]=3D%d\n", n, level); + + s->regs[R_IPI_ISR] |=3D val; + xlnx_zynqmp_ipi_set_obs(s, s->regs[R_IPI_ISR]); + xlnx_zynqmp_ipi_update_irq(s); +} + +static void xlnx_zynqmp_obs_handler(void *opaque, int n, int level) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(opaque); + + DB_PRINT("OBS input irq[%d]=3D%d\n", n, level); + + s->regs[R_IPI_OBS] &=3D ~(1ULL << n); + s->regs[R_IPI_OBS] |=3D (level << n); +} + +static const MemoryRegionOps xlnx_zynqmp_ipi_ops =3D { + .read =3D register_read_memory, + .write =3D register_write_memory, + .endianness =3D DEVICE_LITTLE_ENDIAN, + .valid =3D { + .min_access_size =3D 4, + .max_access_size =3D 4, + }, +}; + +static void xlnx_zynqmp_ipi_realize(DeviceState *dev, Error **errp) +{ + qdev_init_gpio_in_named(dev, xlnx_zynqmp_ipi_handler, "IPI_INPUTS", 32= ); + qdev_init_gpio_in_named(dev, xlnx_zynqmp_obs_handler, "OBS_INPUTS", 32= ); +} + +static void xlnx_zynqmp_ipi_init(Object *obj) +{ + XlnxZynqMPIPI *s =3D XLNX_ZYNQMP_IPI(obj); + DeviceState *dev =3D DEVICE(obj); + SysBusDevice *sbd =3D SYS_BUS_DEVICE(obj); + RegisterInfoArray *reg_array; + char *irq_name; + int i; + + memory_region_init(&s->iomem, obj, TYPE_XLNX_ZYNQMP_IPI, + R_XLNX_ZYNQMP_IPI_MAX * 4); + reg_array =3D + register_init_block32(DEVICE(obj), xlnx_zynqmp_ipi_regs_info, + ARRAY_SIZE(xlnx_zynqmp_ipi_regs_info), + s->regs_info, s->regs, + &xlnx_zynqmp_ipi_ops, + XLNX_ZYNQMP_IPI_ERR_DEBUG, + R_XLNX_ZYNQMP_IPI_MAX * 4); + memory_region_add_subregion(&s->iomem, + 0x0, + ®_array->mem); + sysbus_init_mmio(sbd, &s->iomem); + sysbus_init_irq(sbd, &s->irq); + + for (i =3D 0; i < NUM_IPIS; i++) { + qdev_init_gpio_out_named(dev, &s->irq_trig_out[i], + index_array_names[i], 1); + + irq_name =3D g_strdup_printf("OBS_%s", index_array_names[i]); + qdev_init_gpio_out_named(dev, &s->irq_obs_out[i], + irq_name, 1); + g_free(irq_name); + } +} + +static const VMStateDescription vmstate_zynqmp_pmu_ipi =3D { + .name =3D TYPE_XLNX_ZYNQMP_IPI, + .version_id =3D 1, + .minimum_version_id =3D 1, + .fields =3D (VMStateField[]) { + VMSTATE_UINT32_ARRAY(regs, XlnxZynqMPIPI, R_XLNX_ZYNQMP_IPI_MAX), + VMSTATE_END_OF_LIST(), + } +}; + +static void xlnx_zynqmp_ipi_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + dc->reset =3D xlnx_zynqmp_ipi_reset; + dc->realize =3D xlnx_zynqmp_ipi_realize; + dc->vmsd =3D &vmstate_zynqmp_pmu_ipi; +} + +static const TypeInfo xlnx_zynqmp_ipi_info =3D { + .name =3D TYPE_XLNX_ZYNQMP_IPI, + .parent =3D TYPE_SYS_BUS_DEVICE, + .instance_size =3D sizeof(XlnxZynqMPIPI), + .class_init =3D xlnx_zynqmp_ipi_class_init, + .instance_init =3D xlnx_zynqmp_ipi_init, +}; + +static void xlnx_zynqmp_ipi_register_types(void) +{ + type_register_static(&xlnx_zynqmp_ipi_info); +} + +type_init(xlnx_zynqmp_ipi_register_types) diff --git a/hw/intc/Makefile.objs b/hw/intc/Makefile.objs index 211655023e..571e094a14 100644 --- a/hw/intc/Makefile.objs +++ b/hw/intc/Makefile.objs @@ -4,6 +4,7 @@ common-obj-$(CONFIG_PL190) +=3D pl190.o common-obj-$(CONFIG_PUV3) +=3D puv3_intc.o common-obj-$(CONFIG_XILINX) +=3D xilinx_intc.o common-obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-pmu-iomod-intc.o +common-obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp-ipi.o common-obj-$(CONFIG_ETRAXFS) +=3D etraxfs_pic.o common-obj-$(CONFIG_IMX) +=3D imx_avic.o common-obj-$(CONFIG_LM32) +=3D lm32_pic.o --=20 2.14.1 From nobody Thu May 2 13:24:46 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516650833289111.91348340598688; Mon, 22 Jan 2018 11:53:53 -0800 (PST) Received: from localhost ([::1]:33744 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ediAC-0002mr-D3 for importer@patchew.org; Mon, 22 Jan 2018 14:53:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48034) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi4k-0007Ae-QI for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edi4j-00069C-VP for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:14 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:45792) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edi4j-00068s-Pb; Mon, 22 Jan 2018 14:48:13 -0500 Received: by mail-pf0-x243.google.com with SMTP id a88so7871877pfe.12; Mon, 22 Jan 2018 11:48:13 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id v186sm1497364pfb.5.2018.01.22.11.48.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jan 2018 11:48:11 -0800 (PST) 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; bh=ziPNeaNVZJqh7F/X7tlD2WjijnRpnQIxmXMcOPgStBE=; b=mf77HWsBGE78JUe5DbNg0lPUnrh9ZNlhV2cEpMwy9z7FTNCo3weVkpDsUKqjw1SU/f BnztjK5E3EfePCF13VBtAp6DftimM1KkpE5DPafkQS+r7sV/67+bYNRLvTF813GnZ4RA EQMpwlJQUoXaPASxzU4niVL8qg8id1iuHbtaXJd9JqL8/tbcWJ7xF1A5yD9fmN1BwEz9 46r1Qrl2DtPa3yS4H1PBg2Wi1+GYInK/rkEkDyifLlLkC96U2uZO04Ynos1GotHHV3NV mjSlPdEgu4lFo+GePmniSaMsuTvC9t2XhXZ7qJOkK7ssuySbiPOIZSKUunzJXM1nOYtv me3w== 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; bh=ziPNeaNVZJqh7F/X7tlD2WjijnRpnQIxmXMcOPgStBE=; b=hsrawQUcCUdBKcKb6O1P/nY1NHuqhbyZ1ASeB3Phx4z72Yonlvbdk35ESouMScNWwF wAtTnnF0jeXdnvvhRwkwfA5cNRIlk2XPyG+Wg+dUxOj2qxLKgylIn4dkLtjSPCmS5L0F XyyZWOqgShiYevO3bIhtbxGKB7u0nsEdWwTka7TE+puwJi6Ci4XR5bMIUo7ktZeFEOs0 SiicoerKXjoa2m2bE83TjuOEH00RjQvDkMR32X4U1sm75J3fLIe65MmwTcFsbbfVR2cA EirkkNg2e4hGm01F5YtVv0uLrivslv1qZldTtR9ntMIXJKHA4yoKpAoK2FJdAG7wLNEp CRsg== X-Gm-Message-State: AKwxytdq3FlbApSIO+njQynjAMVZKevJk5UkRdBIy4KHOyyTKZize3l6 E+ci2v29w0Ivp+oWRcLey268BEjz X-Google-Smtp-Source: AH8x225nN6f+IFe0C7EcPnQRt9bQzIXNzIiKRe3GKFeblj2Xl8rAfGHFVjtsegRsTJhbqXPpl7IS7Q== X-Received: by 10.99.125.78 with SMTP id m14mr7773814pgn.383.1516650492505; Mon, 22 Jan 2018 11:48:12 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com Date: Mon, 22 Jan 2018 11:43:48 -0800 Message-Id: <227c152baf1df5dbc1218279c6d3c542dde5b4c3.1516650109.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PATCH v7 8/9] xlnx-zynqmp-pmu: Connect the IPI device to the PMU 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com 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: Alistair Francis Reviewed-by: Edgar E. Iglesias --- V4: - Move the IPI to the machine instead of the SoC hw/microblaze/xlnx-zynqmp-pmu.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pm= u.c index 7312bfe23e..999a5657cf 100644 --- a/hw/microblaze/xlnx-zynqmp-pmu.c +++ b/hw/microblaze/xlnx-zynqmp-pmu.c @@ -24,6 +24,7 @@ #include "cpu.h" #include "boot.h" =20 +#include "hw/intc/xlnx-zynqmp-ipi.h" #include "hw/intc/xlnx-pmu-iomod-intc.h" =20 /* Define the PMU device */ @@ -38,6 +39,15 @@ =20 #define XLNX_ZYNQMP_PMU_INTC_ADDR 0xFFD40000 =20 +#define XLNX_ZYNQMP_PMU_NUM_IPIS 4 + +static const uint64_t ipi_addr[XLNX_ZYNQMP_PMU_NUM_IPIS] =3D { + 0xFF340000, 0xFF350000, 0xFF360000, 0xFF370000, +}; +static const uint64_t ipi_irq[XLNX_ZYNQMP_PMU_NUM_IPIS] =3D { + 19, 20, 21, 22, +}; + typedef struct XlnxZynqMPPMUSoCState { /*< private >*/ DeviceState parent_obj; @@ -136,6 +146,9 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) MemoryRegion *address_space_mem =3D get_system_memory(); MemoryRegion *pmu_rom =3D g_new(MemoryRegion, 1); MemoryRegion *pmu_ram =3D g_new(MemoryRegion, 1); + XlnxZynqMPIPI *ipi[XLNX_ZYNQMP_PMU_NUM_IPIS]; + qemu_irq irq[32]; + int i; =20 /* Create the ROM */ memory_region_init_rom(pmu_rom, NULL, "xlnx-zynqmp-pmu.rom", @@ -155,6 +168,24 @@ static void xlnx_zynqmp_pmu_init(MachineState *machine) &error_abort); object_property_set_bool(OBJECT(pmu), true, "realized", &error_fatal); =20 + for (i =3D 0; i < 32; i++) { + irq[i] =3D qdev_get_gpio_in(DEVICE(&pmu->intc), i); + } + + /* Create and connect the IPI device */ + for (i =3D 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) { + ipi[i] =3D g_new0(XlnxZynqMPIPI, 1); + object_initialize(ipi[i], sizeof(XlnxZynqMPIPI), TYPE_XLNX_ZYNQMP_= IPI); + qdev_set_parent_bus(DEVICE(ipi[i]), sysbus_get_default()); + } + + for (i =3D 0; i < XLNX_ZYNQMP_PMU_NUM_IPIS; i++) { + object_property_set_bool(OBJECT(ipi[i]), true, "realized", + &error_abort); + sysbus_mmio_map(SYS_BUS_DEVICE(ipi[i]), 0, ipi_addr[i]); + sysbus_connect_irq(SYS_BUS_DEVICE(ipi[i]), 0, irq[ipi_irq[i]]); + } + /* Load the kernel */ microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR, machine->ram_size, --=20 2.14.1 From nobody Thu May 2 13:24:46 2024 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516650927934787.8465884881456; Mon, 22 Jan 2018 11:55:27 -0800 (PST) Received: from localhost ([::1]:33762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ediBd-0003zq-DL for importer@patchew.org; Mon, 22 Jan 2018 14:55:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edi4q-0007Gx-Ub for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edi4o-0006BF-HN for qemu-devel@nongnu.org; Mon, 22 Jan 2018 14:48:21 -0500 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:45313) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1edi4o-0006B4-Br; Mon, 22 Jan 2018 14:48:18 -0500 Received: by mail-pg0-x242.google.com with SMTP id m136so942274pga.12; Mon, 22 Jan 2018 11:48:18 -0800 (PST) Received: from localhost ([149.199.62.254]) by smtp.gmail.com with ESMTPSA id a28sm1831765pfe.70.2018.01.22.11.48.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Jan 2018 11:48:15 -0800 (PST) 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; bh=XVG4lqZ7R/tEhbk9R4mcG5eexBa3PfuLZywpMZ9rz6w=; b=H3rHGG0uL6Wz014oX0/XimP+4kniZ9hla3qBAxRGjCtizJH7E8WR8oQy1UWnosYiID +8BDXPe5KiYBTjI/h/Gmt+IfxSo6Du/mlh3XnodD+K1YiSZoViqNElXKNhriEuawcb2K AjrPH3kfMLk9nh4gV/3PE2wIU0Siof7hAkOVqvsZlo+w40JEby5Qf7DrjLqHENNuMk7O nFa1MJAodAqFrK1+nO7Y3Yuy1vvlFvlC8eVkw6DnhUOUe/Fs3EkMHUupMh11hyvBWjqs hP73wrAYA1NQYIDVSz4zHbpe9ZPubLmK2zOPPqFCSXoIMwSLnCILN8/8WbTFRslwBJYs O58w== 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; bh=XVG4lqZ7R/tEhbk9R4mcG5eexBa3PfuLZywpMZ9rz6w=; b=iiUdaYDI6cd+Ck3oiBDktNV86Ww5aBCieR19/ey7PnnMVGHeKkctXDJhZYVVJ+vhPu 31FVgbQqbYgRxwjJE2I2WCDTbjPUSyrYVZe5WCIUq5yohBSbmGgXDRRlbIYINm86rfYr S3aAtRGZMobaE16EPLDZZinmV6mh4JQcafFWEbh8D1qVJ5t8myjbChFNP/0Im5LZiXb7 xQcYA2o/rE216KXo4WCJkU3TNDJmJpGKHkp3+cFVYze4G6z6PaCdQknfINM49CoNUS+6 iO635t1yGpXVYOoJaVwJez1VBKMSNk3MqXwg9pnEY0t1Ii+OOK4tk4PMaOfMzjZs97VO xw1Q== X-Gm-Message-State: AKwxytdpklKIhe92Q/71dyfSRRro9EmltZFPTPLktz6TITvh1/4Hsrai zAvUigRUpp9VQdtt/lqrR+l8smPS X-Google-Smtp-Source: AH8x224/XVdL0UhjryOiD6MUriO/4EgIkIFTnekE54AvBqMnnSBSrKcVELopLGCb3ugY5vqS8/H6Ug== X-Received: by 2002:a17:902:1681:: with SMTP id h1-v6mr3952094plh.369.1516650497073; Mon, 22 Jan 2018 11:48:17 -0800 (PST) From: Alistair Francis To: qemu-devel@nongnu.org, edgar.iglesias@xilinx.com, edgar.iglesias@gmail.com Date: Mon, 22 Jan 2018 11:43:52 -0800 Message-Id: <7b176d7bc8271aebdaacb4635f7f31d8fc41c078.1516650109.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::242 Subject: [Qemu-devel] [PATCH v7 9/9] xlnx-zynqmp: Connect the IPI device to the ZynqMP SoC 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: alistair23@gmail.com, qemu-arm@nongnu.org, alistair.francis@xilinx.com 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: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/arm/xlnx-zynqmp.h | 2 ++ hw/arm/xlnx-zynqmp.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h index 3e6fb9b7bd..0a2b037c6b 100644 --- a/include/hw/arm/xlnx-zynqmp.h +++ b/include/hw/arm/xlnx-zynqmp.h @@ -28,6 +28,7 @@ #include "hw/ssi/xilinx_spips.h" #include "hw/dma/xlnx_dpdma.h" #include "hw/display/xlnx_dp.h" +#include "hw/intc/xlnx-zynqmp-ipi.h" =20 #define TYPE_XLNX_ZYNQMP "xlnx,zynqmp" #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ @@ -90,6 +91,7 @@ typedef struct XlnxZynqMPState { XlnxZynqMPQSPIPS qspi; XlnxDPState dp; XlnxDPDMAState dpdma; + XlnxZynqMPIPI ipi; =20 char *boot_cpu; ARMCPU *boot_cpu_ptr; diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 325642058b..ca398c4159 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -50,6 +50,9 @@ #define DPDMA_ADDR 0xfd4c0000 #define DPDMA_IRQ 116 =20 +#define IPI_ADDR 0xFF300000 +#define IPI_IRQ 64 + static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] =3D { 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, }; @@ -183,6 +186,9 @@ static void xlnx_zynqmp_init(Object *obj) =20 object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA); qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default()); + + object_initialize(&s->ipi, sizeof(s->ipi), TYPE_XLNX_ZYNQMP_IPI); + qdev_set_parent_bus(DEVICE(&s->ipi), sysbus_get_default()); } =20 static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) @@ -454,6 +460,14 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Erro= r **errp) &error_abort); sysbus_mmio_map(SYS_BUS_DEVICE(&s->dpdma), 0, DPDMA_ADDR); sysbus_connect_irq(SYS_BUS_DEVICE(&s->dpdma), 0, gic_spi[DPDMA_IRQ]); + + object_property_set_bool(OBJECT(&s->ipi), true, "realized", &err); + if (err) { + error_propagate(errp, err); + return; + } + sysbus_mmio_map(SYS_BUS_DEVICE(&s->ipi), 0, IPI_ADDR); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ipi), 0, gic_spi[IPI_IRQ]); } =20 static Property xlnx_zynqmp_props[] =3D { --=20 2.14.1