From nobody Mon Apr 29 01:11:13 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=fb.com ARC-Seal: i=1; a=rsa-sha256; t=1567734897; cv=none; d=zoho.com; s=zohoarc; b=Bz3oFJhheErgZ1PUsm9Lxs1/EOycHoBOgkV9Zi6Vu+bsymM7D9no1k5O/zpCJ0cZ2HiCuYbjGkY5nsXc0zwkh0AmrpUSUpnA6IkD9w14+bcKXiQo/HHQ5QgskJbILMq9LJpFQ6T0rVvnROD2R/k5Wae/G24Tdsd6GXIzkka+39c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567734897; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=mphrkCK8PHgknx4G4mNf76pijc2fJDXD3SASQAgFHkM=; b=OLsSIBar841twmD+VIGn2/PfORbLg9a5ELjp5OTBiQjo299W2GXngQeBZ/KxYfsiQ6jv8/8KpJ6hh7RpzXwkZpBQRbG6iOJh/q9H1Lh3nbB6amjDWGxnwQhZTnUe84dc27jB37I127VE3PsXRMr9VORlb0RgutKXUpbS1VgZWP8= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1567734897520867.1206655136544; Thu, 5 Sep 2019 18:54:57 -0700 (PDT) Received: from localhost ([::1]:51302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i63Sc-0000qC-Rj for importer@patchew.org; Thu, 05 Sep 2019 21:54:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53331) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i62lf-0002wq-Km for qemu-devel@nongnu.org; Thu, 05 Sep 2019 21:10:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i62le-00011b-EF for qemu-devel@nongnu.org; Thu, 05 Sep 2019 21:10:27 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:22314) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i62ld-0000xa-Lt for qemu-devel@nongnu.org; Thu, 05 Sep 2019 21:10:26 -0400 Received: from pps.filterd (m0109333.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id x861AJDa014230 for ; Thu, 5 Sep 2019 18:10:21 -0700 Received: from mail.thefacebook.com (mailout.thefacebook.com [199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2uu8mds8k7-6 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 05 Sep 2019 18:10:21 -0700 Received: from mx-out.facebook.com (2620:10d:c081:10::13) by mail.thefacebook.com (2620:10d:c081:35::126) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.1.1713.5; Thu, 5 Sep 2019 18:10:15 -0700 Received: by devvm1607.vll1.facebook.com (Postfix, from userid 122613) id F022F2A1CDDE; Thu, 5 Sep 2019 18:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : subject : date : message-id : mime-version : content-type; s=facebook; bh=mphrkCK8PHgknx4G4mNf76pijc2fJDXD3SASQAgFHkM=; b=Rl3UlQ6BHaP8kGuB4LStl4oOQKzQjIOmUNYcsvY5n7aekrl8U3znEZwlTAckRobwrJVz K4MWsHf7DAXhUhInn+lYuSKaG9uX50Mx1pijarVQBrBPJf4pBRowYIKMCK39kdIVwupV 2YcGeEellSMq28Eaz3PbDHbRay0mVgPkvqY= Smtp-Origin-Hostprefix: devvm From: Amithash Prasad Smtp-Origin-Hostname: devvm1607.vll1.facebook.com To: , , , , Smtp-Origin-Cluster: vll1c12 Date: Thu, 5 Sep 2019 18:10:10 -0700 Message-ID: <20190906011010.1135084-1-amithash@fb.com> X-Mailer: git-send-email 2.17.1 X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.70,1.0.8 definitions=2019-09-05_11:2019-09-04,2019-09-05 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 adultscore=0 spamscore=0 suspectscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 mlxlogscore=818 clxscore=1011 mlxscore=0 lowpriorityscore=0 phishscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-1906280000 definitions=main-1909060010 X-FB-Internal: deliver X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 67.231.145.42 X-Mailman-Approved-At: Thu, 05 Sep 2019 21:53:42 -0400 Subject: [Qemu-devel] [PATCH] Check correct register for clock source 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When WDT_RESTART is written, the data is not the contents of the WDT_CTRL register. Hence ensure we are looking at WDT_CTRL to check if bit WDT_CTRL_1MHZ_CLK is set or not. Signed-off-by: Amithash Prasad Reviewed-by: Joel Stanley --- hw/watchdog/wdt_aspeed.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/watchdog/wdt_aspeed.c b/hw/watchdog/wdt_aspeed.c index 9b93213417..f710036535 100644 --- a/hw/watchdog/wdt_aspeed.c +++ b/hw/watchdog/wdt_aspeed.c @@ -140,7 +140,7 @@ static void aspeed_wdt_write(void *opaque, hwaddr offse= t, uint64_t data, case WDT_RESTART: if ((data & 0xFFFF) =3D=3D WDT_RESTART_MAGIC) { s->regs[WDT_STATUS] =3D s->regs[WDT_RELOAD_VALUE]; - aspeed_wdt_reload(s, !(data & WDT_CTRL_1MHZ_CLK)); + aspeed_wdt_reload(s, !(s->regs[WDT_CTRL] & WDT_CTRL_1MHZ_CLK)); } break; case WDT_CTRL: --=20 2.21.0