From patchwork Thu Oct 15 16:34:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shashi Mallela X-Patchwork-Id: 302802 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B6D6BC43457 for ; Thu, 15 Oct 2020 16:39:09 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2685F22210 for ; Thu, 15 Oct 2020 16:39:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="SSEW3TyK" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2685F22210 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:42142 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kT6HT-0001xB-SZ for qemu-devel@archiver.kernel.org; Thu, 15 Oct 2020 12:39:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kT6Da-0006to-Dg for qemu-devel@nongnu.org; Thu, 15 Oct 2020 12:35:09 -0400 Received: from mail-qt1-x843.google.com ([2607:f8b0:4864:20::843]:38829) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kT6DY-0007bg-3c for qemu-devel@nongnu.org; Thu, 15 Oct 2020 12:35:06 -0400 Received: by mail-qt1-x843.google.com with SMTP id q26so2017731qtb.5 for ; Thu, 15 Oct 2020 09:35:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=1UmYEvhyZgK1qIGwpSsJJHOwQVTxNS3Tja5Dv+YNeUw=; b=SSEW3TyKjqcOXcst/XQvPeLDNqcRVwS4Z5rM0Jpgl/a+HNU4NVy5uqL0R1K7WcKX+i hJ6EWdgAmGrEUsaLxdnVCtBm3ie3iMFyKhRhlxTrZLOmArEXGAW9Y+bLlypq29RoUHw3 lhQqQY98Q+Tw7e7SWcgWi8cfxbSR2+mtvbKoel+2vGgE3fPTA3+YhIQHp73MZM8VMWKV SUviy2VyA/IJRBF0siHoMlDI1ClaPxGYKoCFA77Uqny9FvkpVwLDFYuiXHbrlTbbuh/3 KOa00Xu2SbCF4jNCCQOpIbLP+v4k2GWQQzxlEjZcU/HxuHHvr8hlkOpX8hLp00DA6OZO plNg== 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; bh=1UmYEvhyZgK1qIGwpSsJJHOwQVTxNS3Tja5Dv+YNeUw=; b=AMMXFyrBqIXATI9xUOcBoRNHoqfzZmAJopPakQosMkT61hT9cXIUoQyYlS5OQfLw9E D4G3V/BCGbzDxMLCLsEyZo+rl5cVH+lZV/TBNWSa9oeH9oNjdsp0oQ4s9IFbWWe0cBxs ha2d4HRwhBQbHwFyrymycAeMvsmnT2cfz/YdYZHi0PNBM7yxPKJ0iwafUqjNFScyI6kw enTLJCJeHUINbrrD2jTTfYRPG1Wo0KQa6F0uGq3ndPtIBywmBKMba4gUQcFgEwYBdx49 mxWP4KNWEQb9Vu5UorpVL4gRQmBqU8jV+ZnF5+dJsJEXtK3BsMrVUd/oPPRaJ8X5XXaS jksQ== X-Gm-Message-State: AOAM533XOODqttYJcXOSLPckca2pNQzb71ePQs0vi12uFB72Y/QtNTza ym0pv3Fov8b76ihHiQEdxyWWtQ== X-Google-Smtp-Source: ABdhPJyZwBP1eiyoXa7NXcxhu5YYW8mEJWPYEWCg5BKBbsBoKxE0V3VdO6fdYmKsfXreq0hPW4Z/CA== X-Received: by 2002:ac8:2bdd:: with SMTP id n29mr4852500qtn.369.1602779703292; Thu, 15 Oct 2020 09:35:03 -0700 (PDT) Received: from localhost.localdomain (stsvon1503w-lp130-06-174-91-97-36.dsl.bell.ca. [174.91.97.36]) by smtp.googlemail.com with ESMTPSA id s73sm1338373qke.71.2020.10.15.09.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 09:35:02 -0700 (PDT) From: Shashi Mallela To: peter.maydell@linaro.org, leif@nuviainc.com, rad@semihalf.com Subject: [PATCH v6 2/2] hw/arm/sbsa-ref: add SBSA watchdog device Date: Thu, 15 Oct 2020 12:34:59 -0400 Message-Id: <20201015163459.32298-3-shashi.mallela@linaro.org> X-Mailer: git-send-email 2.18.4 In-Reply-To: <20201015163459.32298-1-shashi.mallela@linaro.org> References: <20201015163459.32298-1-shashi.mallela@linaro.org> Received-SPF: pass client-ip=2607:f8b0:4864:20::843; envelope-from=shashi.mallela@linaro.org; helo=mail-qt1-x843.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Included the newly implemented SBSA generic watchdog device model into SBSA platform Signed-off-by: Shashi Mallela Reviewed-by: Peter Maydell --- hw/arm/sbsa-ref.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/hw/arm/sbsa-ref.c b/hw/arm/sbsa-ref.c index 01863510d0f5..671859ec9711 100644 --- a/hw/arm/sbsa-ref.c +++ b/hw/arm/sbsa-ref.c @@ -30,6 +30,7 @@ #include "exec/hwaddr.h" #include "kvm_arm.h" #include "hw/arm/boot.h" +#include "hw/arm/fdt.h" #include "hw/block/flash.h" #include "hw/boards.h" #include "hw/ide/internal.h" @@ -40,6 +41,7 @@ #include "hw/qdev-properties.h" #include "hw/usb.h" #include "hw/char/pl011.h" +#include "hw/watchdog/wdt_sbsa_gwdt.h" #include "net/net.h" #include "qom/object.h" @@ -64,6 +66,9 @@ enum { SBSA_GIC_DIST, SBSA_GIC_REDIST, SBSA_SECURE_EC, + SBSA_GWDT, + SBSA_GWDT_REFRESH, + SBSA_GWDT_CONTROL, SBSA_SMMU, SBSA_UART, SBSA_RTC, @@ -104,6 +109,8 @@ static const MemMapEntry sbsa_ref_memmap[] = { [SBSA_GIC_DIST] = { 0x40060000, 0x00010000 }, [SBSA_GIC_REDIST] = { 0x40080000, 0x04000000 }, [SBSA_SECURE_EC] = { 0x50000000, 0x00001000 }, + [SBSA_GWDT_REFRESH] = { 0x50010000, 0x00001000 }, + [SBSA_GWDT_CONTROL] = { 0x50011000, 0x00001000 }, [SBSA_UART] = { 0x60000000, 0x00001000 }, [SBSA_RTC] = { 0x60010000, 0x00001000 }, [SBSA_GPIO] = { 0x60020000, 0x00001000 }, @@ -134,6 +141,7 @@ static const int sbsa_ref_irqmap[] = { [SBSA_AHCI] = 10, [SBSA_EHCI] = 11, [SBSA_SMMU] = 12, /* ... to 15 */ + [SBSA_GWDT] = 16, }; static uint64_t sbsa_ref_cpu_mp_affinity(SBSAMachineState *sms, int idx) @@ -448,6 +456,20 @@ static void create_rtc(const SBSAMachineState *sms) sysbus_create_simple("pl031", base, qdev_get_gpio_in(sms->gic, irq)); } +static void create_wdt(const SBSAMachineState *sms) +{ + hwaddr rbase = sbsa_ref_memmap[SBSA_GWDT_REFRESH].base; + hwaddr cbase = sbsa_ref_memmap[SBSA_GWDT_CONTROL].base; + DeviceState *dev = qdev_new(TYPE_WDT_SBSA_GWDT); + SysBusDevice *s = SYS_BUS_DEVICE(dev); + int irq = sbsa_ref_irqmap[SBSA_GWDT]; + + sysbus_realize_and_unref(s, &error_fatal); + sysbus_mmio_map(s, 0, rbase); + sysbus_mmio_map(s, 1, cbase); + sysbus_connect_irq(s, 0, qdev_get_gpio_in(sms->gic, irq)); +} + static DeviceState *gpio_key_dev; static void sbsa_ref_powerdown_req(Notifier *n, void *opaque) { @@ -731,6 +753,8 @@ static void sbsa_ref_init(MachineState *machine) create_rtc(sms); + create_wdt(sms); + create_gpio(sms); create_ahci(sms);