From patchwork Tue Nov 12 06:40:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 179167 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7702365ilf; Mon, 11 Nov 2019 22:45:51 -0800 (PST) X-Google-Smtp-Source: APXvYqyKSP5GJiWgpacH2sCcVaNynF076/qmAxpVXMlMSPpQNMqHdWND/b8UmG0vh1Ybt4Jb0D77 X-Received: by 2002:a17:906:b24c:: with SMTP id ce12mr26846388ejb.282.1573541151661; Mon, 11 Nov 2019 22:45:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573541151; cv=none; d=google.com; s=arc-20160816; b=iDi6Te3VRSrmK9I/7WjYAwD1qlH02t5LkPbGrc465wnULPmPs080FB2aIjSyM9KxqQ tpRSYm6jOwkG39t9JS6XYuSIb/IMqith8b64Zhv2EZrLJ9vt7Od60wvk9E9vQx1SJx5s jfU1Tnw2uKTuETeXeZGxSyTHXP9HuTq3EBkHqLynImwJc5+R/+7Vd8Fob35NyhjAlDyD /TNC8R56Kqxn3HfWpqr0tcxHeF15QwcQsspQ3uluM+3xHFV+0KqvnxYvgT+2qgXnxSg4 jLG5+s341ucckgCSHOtxSeeT8IbIpumnLfIXmpDffvdi8DxWBZ6pz6HukN94ySzW9ZIS huTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=vr7OAtLxystNKN+NrjrWHkCNh0LuFiDiJrrJhFdZUC4=; b=RNMnBxzWzAWPi3S+j5oYCHHSpk3b4V8pPrEEiteza1H6D2MwpP4oAYmYNekUlr24n8 KJPCuEOjnIfhmZMAkoJls3wWLUAM4tf0h7w74JRYalH4eCac2KQFiWI3YtPyTYQ6Zon/ bw6y49hojnCy94sS5d4x+vm/d2OyERuchUPjI2pTdNWDTvkzRFILc7hXGa+ScgT+U1Pm ZhB6Jh4JHstDdJ4NHBOnIOt71LYNRH4sxxxhjv1MHaIM56kKEBSvmn92TUcHuyLfatYH IVknVf7bQRoEmTAninL2SN+9CTHogGat9f7uGzs/phbIUsep8nnSCDowFXKbVGQzR/hm 7GHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Y2s50m4X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w12si10626073edu.421.2019.11.11.22.45.51 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Nov 2019 22:45:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Y2s50m4X; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:59482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUPvy-0006yc-CF for patch@linaro.org; Tue, 12 Nov 2019 01:45:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57893) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUPrV-0003JC-5P for qemu-devel@nongnu.org; Tue, 12 Nov 2019 01:41:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUPrU-0007M0-6K for qemu-devel@nongnu.org; Tue, 12 Nov 2019 01:41:13 -0500 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]:44996) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUPrS-0007Kk-3B; Tue, 12 Nov 2019 01:41:10 -0500 Received: by mail-pl1-x643.google.com with SMTP id az9so8114328plb.11; Mon, 11 Nov 2019 22:41:10 -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=vr7OAtLxystNKN+NrjrWHkCNh0LuFiDiJrrJhFdZUC4=; b=Y2s50m4XrJwxyYZCwg/2AbvgQCUbirg5dt4UAGPRf8gcoYyGkAZatDg7Jd7koF5vfL 8ylFG/aB2RoXMg+3UIKdC9iad4ApxBLuWkf1aIfCoP15tAKa/3+5Y6kMAKjJQhAyj1Hk 604YQoKDzssLUMb/glsO8Av9GHyPF4u1xXvja3JUcas5+n74eg4UgKXiZH9yTLIhsJdL Zljnlw+sHVRiBxNN3wATc0cIwSn57CcsoxD70hVKeG/avKdbOGOKLOP6zponC+Ollwsy iyVq3z+I19zQjjE9zxCf7/pkktGyeznQbcrVLSxwy85QUE6iXBfM2Nv98r8p7+UPE6rC YAHQ== 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=vr7OAtLxystNKN+NrjrWHkCNh0LuFiDiJrrJhFdZUC4=; b=mpT8ff0FwDcFOViEmbuHx5aoPRJ74SUVleErykGCpzxpOCBuul/nDxPUAGZ4I6lLEz 1uJsgbW9BzFIoA3fL5JN6q96ubuFfME2a627QF911q2TSu26prw2Mtay5Hj642/krnzB nyLEhJqGOGfjUGvi51/j1YvPSvUQ/jhsKDd78lur3WCmsWvmi68bX8H93Ok3KSBf6RHZ 4yW2X4Dqqs2mtbdo8L5OFMc3F7Riq5Ys4t7Uq5Ek56mYk+7/+LKLgzvVLwd0WSDBynlJ I73bo5kTljSn2331iy5N549BrqgN71xrNMFeyo6mtrjcoGPB2Xk43TOCKhz3zjWB2XcX JGPw== X-Gm-Message-State: APjAAAUgNb+S0uBnWoXr+RnyqbdUUbOEmjGJbfR7jiiSuOR45SEKK+Gh saJg2/dTQhr+qgLDuyy1mqQ= X-Received: by 2002:a17:902:326:: with SMTP id 35mr6518256pld.248.1573540868881; Mon, 11 Nov 2019 22:41:08 -0800 (PST) Received: from voyager.ibm.com ([36.255.48.244]) by smtp.gmail.com with ESMTPSA id q8sm16375590pgg.15.2019.11.11.22.41.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 22:41:08 -0800 (PST) From: Joel Stanley To: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Andrew Jeffery Subject: [PATCH 1/4] aspeed/sdmc: Make ast2600 default 1G Date: Tue, 12 Nov 2019 17:10:55 +1030 Message-Id: <20191112064058.13275-2-joel@jms.id.au> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191112064058.13275-1-joel@jms.id.au> References: <20191112064058.13275-1-joel@jms.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::643 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Most boards have this much. Signed-off-by: Joel Stanley --- hw/misc/aspeed_sdmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.24.0 Reviewed-by: Cédric Le Goater diff --git a/hw/misc/aspeed_sdmc.c b/hw/misc/aspeed_sdmc.c index f3a63a2e01db..2df3244b53c8 100644 --- a/hw/misc/aspeed_sdmc.c +++ b/hw/misc/aspeed_sdmc.c @@ -208,10 +208,10 @@ static int ast2600_rambits(AspeedSDMCState *s) } /* use a common default */ - warn_report("Invalid RAM size 0x%" PRIx64 ". Using default 512M", + warn_report("Invalid RAM size 0x%" PRIx64 ". Using default 1024M", s->ram_size); - s->ram_size = 512 << 20; - return ASPEED_SDMC_AST2600_512MB; + s->ram_size = 1024 << 20; + return ASPEED_SDMC_AST2600_1024MB; } static void aspeed_sdmc_reset(DeviceState *dev) From patchwork Tue Nov 12 06:40:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 179170 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7702829ilf; Mon, 11 Nov 2019 22:46:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwUFVu1zbtnAtacPhnFV68FKCE00zDx1KinT4XDYevIXggdWs9aIjjJ9pfQAOqDSFu1RdzW X-Received: by 2002:a0c:d0fc:: with SMTP id b57mr26882435qvh.76.1573541182718; Mon, 11 Nov 2019 22:46:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573541182; cv=none; d=google.com; s=arc-20160816; b=kh9Ua3kgYPU9BLLz65jmXItG3gPee1ogddfXy9PL9SckHYQFTfWMmCDr8m3xRC1ADQ aFef2Ud8h+WBrKy6sRdy3hDeclFrMiXTsADIiGpZobaocSBdGTZMORJwfn/Eb1EAOj+T z9C/wHCQjlegmOz4MednEkOAxNtwm4PtwI+NSZiI7hwfvqCbTorQWxFNgjAX3zsTtAz4 RFNgUsFbBBa+q650uk7Q1DFYJZM4JQ8azky+GOniVaT/cxVrenBLqz+5CaMsj1KHMP18 V2OcyB889mpEyFfag/l+uxzWDP/0HXMOHmJm9Ngl2l6gTwWnQ/NpXxz9Ru3qXJlAtJGg IVnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=hyG32yXenzdMQwklj1Cf+goAGOB3P8VjL1+e16W2tTQ=; b=d75UA15VDdePs2yMb/NOAub0ryUk5g5ud0ak/H4W3ngtX1OqXetgS6apNTzeAr5ird X8yTYfKIerF5J84tzr5SRVb4zScg2RhbwfhxbSHos7XYZOCI85d+Spq0NM0IoKp49Lsu MrB0UNPzim4iRTgqdATdDq7TNFSEm1SNCWMzxeagdKGOfa7HeNvDx5c4xSm4UxGKTLi0 5p7nZqLdjQfXZGVeTy7wHusgP1VBg8ac/XOb+q9fiRzKEwUhIgajTiWxKIYwEz6cf5AU 8g9uAY46QJD5bnuOmE3Am0rDJa+2R/2C/Gsr4J8pedR/NTTVQ1WI2fvmtCjkwskzNV3y rV3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=T25XHkQu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w15si5165367qkb.75.2019.11.11.22.46.22 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Nov 2019 22:46:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=T25XHkQu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:59490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUPwU-0007VB-14 for patch@linaro.org; Tue, 12 Nov 2019 01:46:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57918) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUPrZ-0003LL-2o for qemu-devel@nongnu.org; Tue, 12 Nov 2019 01:41:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUPrX-0007Nm-9G for qemu-devel@nongnu.org; Tue, 12 Nov 2019 01:41:16 -0500 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]:42967) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUPrV-0007MQ-0u; Tue, 12 Nov 2019 01:41:13 -0500 Received: by mail-pl1-x642.google.com with SMTP id j12so8930771plt.9; Mon, 11 Nov 2019 22:41:12 -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=hyG32yXenzdMQwklj1Cf+goAGOB3P8VjL1+e16W2tTQ=; b=T25XHkQuMFS//SzEMcFFkzcPzeHMHwW+FKXOVP+xN0WKIFl8gO9B6p6hXKp+67ICUX R6v40fhNnvTS3addm2IwaiHazkqNHvD21omuB18oDhF+4oX2C3qudc1F6Qw4BCT75yTE tDHyLao8IRlCTproIzoc+VvOSclCnnNZyhXk9CwaVxezkMoZToeFUxxUg5fEwcZHpEO1 54GytjunDddPrvyDYnu/oLaRj8g9v0XJ3riXrSiu8oH+peyHu4R0S4dTIwzyyZsYh9Rn RDYdFwGlTQDC7hbmwFzbZbpMZOoORjL2GZOdklUfdmNqBqCgXjKtXytzUWS99mw4aXCI Ga2Q== 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=hyG32yXenzdMQwklj1Cf+goAGOB3P8VjL1+e16W2tTQ=; b=OGJArxSJPVoQyfXi5Tk4/zg87P5cZ/EBPFV1549FSusrpRH0ltFiXOxuB0olJTxKxA wKwjKbqlMbBwqTwQgqmsDktx2xg7o42d9SXDqUzqbZ6vr91JX2ofj072NZ4NPuSrH8mH MDmdaYCou12o4GAhQj+Py8tyMlpPXGu2gHXazG0ehSmlaGPhl8UQdCfcys/5RHj7GZ03 nLYf3PwSExdfaO+eUZTESsQOJB+LSlfZJ1k7xb1/xqPn7GqhUp8QnOYfmfA840mmHL3g 2tohzKUwoQlUGEIDn+w++cAh7/cfsL+Ub009PWBQLBMVfM7UbeI21kx2yBmsIBIKYUuu 8SYA== X-Gm-Message-State: APjAAAU2mdOcUiP+spkzwr2M98Aa42gcD05tHYhZWA2HF591ctitxWQu IBExbBDqUqnU4IXyP3lnvthsquSNmHg= X-Received: by 2002:a17:902:8208:: with SMTP id x8mr30463850pln.6.1573540871933; Mon, 11 Nov 2019 22:41:11 -0800 (PST) Received: from voyager.ibm.com ([36.255.48.244]) by smtp.gmail.com with ESMTPSA id q8sm16375590pgg.15.2019.11.11.22.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 22:41:11 -0800 (PST) From: Joel Stanley To: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Andrew Jeffery Subject: [PATCH 2/4] aspeed/scu: Fix W1C behavior Date: Tue, 12 Nov 2019 17:10:56 +1030 Message-Id: <20191112064058.13275-3-joel@jms.id.au> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191112064058.13275-1-joel@jms.id.au> References: <20191112064058.13275-1-joel@jms.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::642 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This models the clock write one to clear registers, and fixes up some incorrect behavior in all of the write to clear registers. There was also a typo in one of the register definitions. Signed-off-by: Joel Stanley --- hw/misc/aspeed_scu.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) -- 2.24.0 Reviewed-by: Cédric Le Goater diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c index 717509bc5460..aac4645f8c3c 100644 --- a/hw/misc/aspeed_scu.c +++ b/hw/misc/aspeed_scu.c @@ -98,7 +98,7 @@ #define AST2600_CLK_STOP_CTRL TO_REG(0x80) #define AST2600_CLK_STOP_CTRL_CLR TO_REG(0x84) #define AST2600_CLK_STOP_CTRL2 TO_REG(0x90) -#define AST2600_CLK_STOP_CTR2L_CLR TO_REG(0x94) +#define AST2600_CLK_STOP_CTRL2_CLR TO_REG(0x94) #define AST2600_SDRAM_HANDSHAKE TO_REG(0x100) #define AST2600_HPLL_PARAM TO_REG(0x200) #define AST2600_HPLL_EXT TO_REG(0x204) @@ -532,11 +532,12 @@ static uint64_t aspeed_ast2600_scu_read(void *opaque, hwaddr offset, return s->regs[reg]; } -static void aspeed_ast2600_scu_write(void *opaque, hwaddr offset, uint64_t data, +static void aspeed_ast2600_scu_write(void *opaque, hwaddr offset, uint64_t data64, unsigned size) { AspeedSCUState *s = ASPEED_SCU(opaque); int reg = TO_REG(offset); + uint32_t data = data64; if (reg >= ASPEED_AST2600_SCU_NR_REGS) { qemu_log_mask(LOG_GUEST_ERROR, @@ -563,15 +564,19 @@ static void aspeed_ast2600_scu_write(void *opaque, hwaddr offset, uint64_t data, /* fall through */ case AST2600_SYS_RST_CTRL: case AST2600_SYS_RST_CTRL2: + case AST2600_CLK_STOP_CTRL: + case AST2600_CLK_STOP_CTRL2: /* W1S (Write 1 to set) registers */ s->regs[reg] |= data; return; case AST2600_SYS_RST_CTRL_CLR: case AST2600_SYS_RST_CTRL2_CLR: + case AST2600_CLK_STOP_CTRL_CLR: + case AST2600_CLK_STOP_CTRL2_CLR: case AST2600_HW_STRAP1_CLR: case AST2600_HW_STRAP2_CLR: /* W1C (Write 1 to clear) registers */ - s->regs[reg] &= ~data; + s->regs[reg - 1] &= ~data; return; case AST2600_RNG_DATA: From patchwork Tue Nov 12 06:40:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 179169 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7702745ilf; Mon, 11 Nov 2019 22:46:18 -0800 (PST) X-Google-Smtp-Source: APXvYqzJbRiqvNz9L972VlP4XD7aObDpm3YQWzczGOkQ2gE8h2/KwJ0jntSeyg7+Pqv1M6dO6/c9 X-Received: by 2002:a37:ae05:: with SMTP id x5mr13952776qke.243.1573541177907; Mon, 11 Nov 2019 22:46:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573541177; cv=none; d=google.com; s=arc-20160816; b=Jmt0o2tRq2s2vyJUtl30nt/qGImf4pCZ0t8iu3UifL4LyiZ+rSpQU96ESvzP+qdcyr hQwbqXFAPKTz7kpLpS+kQckZ+3fpLU4XZJuwPxZtMOi/NjAy3rfZdS2E16/pbxu9sSSl sqV7hbxNxpPoDdLhnmBOAu7nJ1exLwTrsq0c65Floo7JpUzgtY4QzVesFDOSxy8jo3/O 7K8k1qB5mXdaPckiYLd+RdBI8shdWfxWAd+Ky6oKzJqBJX5ax86nx28n1UTmXZntLSso m1l3rqqtCJmFUKMAmXDAnx/ZXQuACW45cmXm3m9egdqr2mt69bvi1SQfA+1mEyhYVtw2 HZ0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=j37H1qa+h9fHDfjTASOPnrg2HuSkQw6LSGgwlJ4L1BI=; b=jR/xm+GNab2JgQV8MN1UO/wJJPCpPRYJl2nzs3UztyxzFsaj6ESfC7aWfh2ILi8sR4 gYirAkkWxP2XCnNgmDd+xfUc93eD/0uXulLTqo94xR+7F+/4I7ocfPk83ejfiaNfxclD jc1OrP5QjRqEW6bAXSN0SW0SSFuaQKxSEadxWN48E8P8deFz2qMzZb0tePDzl0G0yfGk MbxjuJSJpHuzNN/mlv0qjtSE1EG3YeOgn2brnsXvJUIZuAy5N345j85LL06TPdvmxfnB fDd7yx3H2yH/PkIz5x28aklQ6DRRVAjxgXCBtRymBs2T6jsQ0taiMfYEmFWX8KJRcdOD iuww== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=munbN8Jj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k18si5068482qkg.14.2019.11.11.22.46.17 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Nov 2019 22:46:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=munbN8Jj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:59488 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUPwP-0007Oo-9x for patch@linaro.org; Tue, 12 Nov 2019 01:46:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57951) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUPrd-0003Mc-Jg for qemu-devel@nongnu.org; Tue, 12 Nov 2019 01:41:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUPrc-0007QW-Iv for qemu-devel@nongnu.org; Tue, 12 Nov 2019 01:41:21 -0500 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:39035) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUPrY-0007O0-Ld; Tue, 12 Nov 2019 01:41:16 -0500 Received: by mail-pg1-x541.google.com with SMTP id 29so11180175pgm.6; Mon, 11 Nov 2019 22:41:16 -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=j37H1qa+h9fHDfjTASOPnrg2HuSkQw6LSGgwlJ4L1BI=; b=munbN8JjSqEXfb42+yBm1Gw05N9mU52wiSskJnU7YntaW5je8OsU3VO8GqzLdAT6ZA aar8hkWM0ILovvTGBbVHpMZXgQv5h8BrU3q5wCQEUb+aPXP60KUdc7VOTua2Z4wsXBGx n3ClqjyFNmfc9TbpJgDNj1YaS9J1KG3LVGxfxg5KZW6sg8+8bOGugsRWhZVoKJXpK8Th 5Fyc6bNKU4CO7wKDyGIfaMjQ7J5SqDsM2G2Ow5Idcp/yy5yVzLQ8Dc3XCmKETM4kHOzn 5LNWoZWa2G0aTdkeCFJY/SeRCC0WODRFkEaVJLmrvK8tMLV6vSDKiMpC6ezo8EEwzu0b n7GQ== 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=j37H1qa+h9fHDfjTASOPnrg2HuSkQw6LSGgwlJ4L1BI=; b=jdMzzQ2NstfTltWQSu0HaqK4LeQR/pPmgyV5RqDUepDsztnXypgdWRxBmlTUcixvTy OHy95CfQhfqLAym4u+iC3YwMAR9NdEFQ1nZL5Oatkz358bTwYqUNUnswcLYEI+O8vgAU h5lySxRZVHM0R87s3zDIdm4VgyqOgACu2VNEwGgowOKYgtwoW7a5FrpgYCEvcpILeXUh pzx6Vtc8Jv+INrcEQdPLMUSalpm/uaLAaLtPcBXXoxGJx18iBs9ueSsPEjzHJFqnlvbe u7FbtyU008D/bNNfBoPaWjijrv7CMcLpfcMQ7JoO0jXMCFKhhSYQo1evXQtzwuIB8d3e ds+w== X-Gm-Message-State: APjAAAWXd3ShUyKME6ltEtOxuKA4PU8rXsDYaBFOY4XYnzSh9woPCTNb sTvboyxz+Kkoou+Z8sq1O4o= X-Received: by 2002:a17:90a:e90:: with SMTP id 16mr4277177pjx.65.1573540875064; Mon, 11 Nov 2019 22:41:15 -0800 (PST) Received: from voyager.ibm.com ([36.255.48.244]) by smtp.gmail.com with ESMTPSA id q8sm16375590pgg.15.2019.11.11.22.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 22:41:14 -0800 (PST) From: Joel Stanley To: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Andrew Jeffery Subject: [PATCH 3/4] watchdog/aspeed: Improve watchdog timeout message Date: Tue, 12 Nov 2019 17:10:57 +1030 Message-Id: <20191112064058.13275-4-joel@jms.id.au> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191112064058.13275-1-joel@jms.id.au> References: <20191112064058.13275-1-joel@jms.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::541 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Users benefit from knowing which watchdog timer has expired. The address of the watchdog's registers unambiguously indicates which has expired, so log that. Signed-off-by: Joel Stanley --- hw/watchdog/wdt_aspeed.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.24.0 Reviewed-by: Cédric Le Goater diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 145be6f99ce2..5697ed83325a 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -219,7 +219,8 @@ static void aspeed_wdt_timer_expired(void *dev) return; } - qemu_log_mask(CPU_LOG_RESET, "Watchdog timer expired.\n"); + qemu_log_mask(CPU_LOG_RESET, "Watchdog timer %08lx expired.\n", + s->iomem.addr); watchdog_perform_action(); timer_del(s->timer); } From patchwork Tue Nov 12 06:40:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 179171 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7707683ilf; Mon, 11 Nov 2019 22:52:16 -0800 (PST) X-Google-Smtp-Source: APXvYqz3klV1rECB6RAYoTR+SUUFb5y4lfLhakMgNs81kLz5gwcAx8Q60B60Ul1DDCPZirSIAkfZ X-Received: by 2002:ae9:ed13:: with SMTP id c19mr14098735qkg.290.1573541536182; Mon, 11 Nov 2019 22:52:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573541536; cv=none; d=google.com; s=arc-20160816; b=M+Wqq5lGssyBx48o9LHhc+mD0rcL3Um0qv8CTNx2GtMTjJ4d3x5/u9JW4N1AjuhfXf G7785zzQf0A8NEvzZ0dxPWtbGTkGLDxrf8/HykcvnhEnjgzuXAHBqRN25hysv+Lm/uCJ OfZOLIdbQ5mJdXzC8YgkQ9p/jU0bHIFgwFqGGYuKeSzRYD4zV+YkwjMz4GcWhvzLELNG gHXFb+/RpxmA+n1/4P6HvL8DoaYpfma38Kq5SXA7qs1A5RGts2RzC2W2DZalLFgrtUgy twxjHBWKFbFx8/FWp7d5kYQ963NxKlxvJpwlBbV5WRLyf4tU9WbOxqnRvRz3lGV/SqqY onTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ViOcwrGNNJLxaLFTqLvWuJzL8hqpUFzYbRzOh1R/JSc=; b=qxbaeVXnYddMJaLWbZSbHarsO2r/N3rh969rbkIcONYqsrX0blvgy5jXK0ZRoLhV4d bOvmyLOEEcUvbvU2AS4mZmnLR/eaPIwiZh+Gwa/2AbsoEeHGAHU1bTWRYMHay+Y7Cku7 KuJ6ODt2tOblzXssQT15lNz74uGx/BBUXPdO7DqpeHKLV51pxXiUtNQFGJHnpncUnVAX L5ePof/ZEfuyM+fwkFYvInw7lFtOLctj9m7fb0PvNDIxo95annOfLu0Bd8QOVRLJJ4Qs BBHikSbH+JLfNRWDq6wWsudGKaeV118npiL6mUd+KHmp74jWgijVNx/JZVqN/tNN3xoi YAxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=dnD1fKL2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f4si5182761qkl.171.2019.11.11.22.52.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Nov 2019 22:52:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=dnD1fKL2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:59546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUQ2B-00066v-J0 for patch@linaro.org; Tue, 12 Nov 2019 01:52:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57979) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iUPri-0003P6-Ky for qemu-devel@nongnu.org; Tue, 12 Nov 2019 01:41:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iUPrh-0007Ur-AC for qemu-devel@nongnu.org; Tue, 12 Nov 2019 01:41:26 -0500 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:37861) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iUPrc-0007PL-3N; Tue, 12 Nov 2019 01:41:20 -0500 Received: by mail-pg1-x544.google.com with SMTP id z24so11189354pgu.4; Mon, 11 Nov 2019 22:41:19 -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=ViOcwrGNNJLxaLFTqLvWuJzL8hqpUFzYbRzOh1R/JSc=; b=dnD1fKL2tM9LQR9v2+PDwJjqCOdKqvguQL2/27vf/A0vw8z0ZTML8ib0yY8SMHEatk RBGJSC1Kv08ESNmJ9GsvUT4RucIk5i7O4M/2H9nZgZKgA4hAwFkrN9imHGnpJdA7SsC9 hZC7PM7EhSsyLsRqGbNOEKm6AXRgj+BvTZQmmS/K1vjwgnq3d7khBNNhXWjGW6RpXt+q 68zdZtsLwmC5tfnyd2jCIU7kEGsui9LSX4gNv8MUsYmHZsFh3ONNpgO4ZpCbtPltmg05 L5L+iV7Qgv61pKonjdAcBpIWuWgwOHvK54xGveX3Kg+MZMO85UGK4L1E60QI13+9ffMk ADSg== 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=ViOcwrGNNJLxaLFTqLvWuJzL8hqpUFzYbRzOh1R/JSc=; b=iPKD3ge1yOfFYvLTfp7tMApGf7AiBJtM5bJO4nalWUmEUgVAwqyMwS7OyG6L0OPgRc gQXgW4v9HT3OgsHORRBHkId0thgjyZkwd7vTnbUgP6gbWf2jxl9vk3NSzNpdegUM8VIn eUrLP0GCV3h2PAQoJfO94PMjRJw+R3SLA0hnL6ZsW8MyceregNoeGG2GJFGRZrqMyLqJ cIyW0XSTYGX5R2ZifbJtf5aauoH8ZQ8EFPy8pNsgCZ3uv4Pgkz2vhTTT83zkyZ6qRPCq NIv3fVqMDjzF8Pi+HYCM4EUFOi8pbY6JUwgUsVmkdO1eLua2QGFcEVsWebul8j7ZpXUx g6TQ== X-Gm-Message-State: APjAAAX3gBc2AcNhjA5mjF5uPACQBpCkzr9AbaYYVd95NheZZpJycv2V ai3iPufzGno9EvYs31pXIUY= X-Received: by 2002:aa7:9618:: with SMTP id q24mr6313479pfg.229.1573540878044; Mon, 11 Nov 2019 22:41:18 -0800 (PST) Received: from voyager.ibm.com ([36.255.48.244]) by smtp.gmail.com with ESMTPSA id q8sm16375590pgg.15.2019.11.11.22.41.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Nov 2019 22:41:17 -0800 (PST) From: Joel Stanley To: =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Andrew Jeffery Subject: [PATCH 4/4] watchdog/aspeed: Fix AST2600 frequency behaviour Date: Tue, 12 Nov 2019 17:10:58 +1030 Message-Id: <20191112064058.13275-5-joel@jms.id.au> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191112064058.13275-1-joel@jms.id.au> References: <20191112064058.13275-1-joel@jms.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The AST2600 control register sneakily changed the meaning of bit 4 without anyone noticing. It no longer controls the 1MHz vs APB clock select, and instead always runs at 1MHz. The AST2500 was always 1MHz too, but it retained bit 4, making it read only. We can model both using the same fixed 1MHz calculation. Fixes: ea29711f467f ("watchdog/aspeed: Fix AST2600 control reg behaviour") Signed-off-by: Joel Stanley --- hw/watchdog/wdt_aspeed.c | 21 +++++++++++++++++---- include/hw/watchdog/wdt_aspeed.h | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) -- 2.24.0 Reviewed-by: Cédric Le Goater diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 5697ed83325a..f43a3bc88976 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -93,11 +93,11 @@ static uint64_t aspeed_wdt_read(void *opaque, hwaddr offset, unsigned size) } -static void aspeed_wdt_reload(AspeedWDTState *s, bool pclk) +static void aspeed_wdt_reload(AspeedWDTState *s) { uint64_t reload; - if (pclk) { + if (!(s->regs[WDT_CTRL] & WDT_CTRL_1MHZ_CLK)) { reload = muldiv64(s->regs[WDT_RELOAD_VALUE], NANOSECONDS_PER_SECOND, s->pclk_freq); } else { @@ -109,6 +109,16 @@ static void aspeed_wdt_reload(AspeedWDTState *s, bool pclk) } } +static void aspeed_wdt_reload_1mhz(AspeedWDTState *s) +{ + uint64_t reload = s->regs[WDT_RELOAD_VALUE] * 1000ULL; + + if (aspeed_wdt_is_enabled(s)) { + timer_mod(s->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + reload); + } +} + + static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data, unsigned size) { @@ -130,13 +140,13 @@ static void aspeed_wdt_write(void *opaque, hwaddr offset, uint64_t data, case WDT_RESTART: if ((data & 0xFFFF) == WDT_RESTART_MAGIC) { s->regs[WDT_STATUS] = s->regs[WDT_RELOAD_VALUE]; - aspeed_wdt_reload(s, !(s->regs[WDT_CTRL] & WDT_CTRL_1MHZ_CLK)); + awc->wdt_reload(s); } break; case WDT_CTRL: if (enable && !aspeed_wdt_is_enabled(s)) { s->regs[WDT_CTRL] = data; - aspeed_wdt_reload(s, !(data & WDT_CTRL_1MHZ_CLK)); + awc->wdt_reload(s); } else if (!enable && aspeed_wdt_is_enabled(s)) { s->regs[WDT_CTRL] = data; timer_del(s->timer); @@ -283,6 +293,7 @@ static void aspeed_2400_wdt_class_init(ObjectClass *klass, void *data) awc->offset = 0x20; awc->ext_pulse_width_mask = 0xff; awc->reset_ctrl_reg = SCU_RESET_CONTROL1; + awc->wdt_reload = aspeed_wdt_reload; } static const TypeInfo aspeed_2400_wdt_info = { @@ -317,6 +328,7 @@ static void aspeed_2500_wdt_class_init(ObjectClass *klass, void *data) awc->ext_pulse_width_mask = 0xfffff; awc->reset_ctrl_reg = SCU_RESET_CONTROL1; awc->reset_pulse = aspeed_2500_wdt_reset_pulse; + awc->wdt_reload = aspeed_wdt_reload_1mhz; } static const TypeInfo aspeed_2500_wdt_info = { @@ -336,6 +348,7 @@ static void aspeed_2600_wdt_class_init(ObjectClass *klass, void *data) awc->ext_pulse_width_mask = 0xfffff; /* TODO */ awc->reset_ctrl_reg = AST2600_SCU_RESET_CONTROL1; awc->reset_pulse = aspeed_2500_wdt_reset_pulse; + awc->wdt_reload = aspeed_wdt_reload_1mhz; } static const TypeInfo aspeed_2600_wdt_info = { diff --git a/include/hw/watchdog/wdt_aspeed.h b/include/hw/watchdog/wdt_aspeed.h index dfedd7662dd1..819c22993a6e 100644 --- a/include/hw/watchdog/wdt_aspeed.h +++ b/include/hw/watchdog/wdt_aspeed.h @@ -47,6 +47,7 @@ typedef struct AspeedWDTClass { uint32_t ext_pulse_width_mask; uint32_t reset_ctrl_reg; void (*reset_pulse)(AspeedWDTState *s, uint32_t property); + void (*wdt_reload)(AspeedWDTState *s); } AspeedWDTClass; #endif /* WDT_ASPEED_H */