From patchwork Sat Sep 26 07:27:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 11801165 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C12A112E for ; Sat, 26 Sep 2020 07:28:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 B1C202080A for ; Sat, 26 Sep 2020 07:28:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AFzVfniW"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=wdc.com header.i=@wdc.com header.b="FY1DE893"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=sharedspace.onmicrosoft.com header.i=@sharedspace.onmicrosoft.com header.b="KXpZfJtq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B1C202080A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=wdc.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=y4Lr6EABBpUDP361o0lzeVq/WpULm2JBG3/lJKyC1tI=; b=AFzVfniWLBc18a50fruw6B6jfi kfzgmvsr9aqupOA0QYUwE4dqa0lnh/y1SsKj3eBzwiUT1qcp5aPp1oDJAg5+FkGIQHTqyYhScvTRC DV0BWvXfkWMzMQvl/ezlATEZzMKGSiyHoLQ2gSMpDtAvCv3Byix8AsOwwbKpKq/u5oNX5tt4cqmWi wmdVXEXraxtQISWMxXjUoVxEnNYnz46ua47vmd3ONzWHoFdkpcbp83YoYB3rjoXJtb+EFo26ACLy6 qOTZnXn7lMo+PFR96KmMrL2bbx4ZFHVUC1lZU/nsEw3TdVn24LDPSJxzN3I3e0zrQ6VVjZsHbiWBr pXYCDU0A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kM4d1-0007Iu-7q; Sat, 26 Sep 2020 07:28:19 +0000 Received: from esa6.hgst.iphmx.com ([216.71.154.45]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kM4cy-0007IU-Qu for linux-riscv@lists.infradead.org; Sat, 26 Sep 2020 07:28:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1601105297; x=1632641297; h=from:to:cc:subject:date:message-id: content-transfer-encoding:mime-version; bh=VZzU2JljOb2+CPcK5tqaPbpOGFlM/u0H2Pjp3INIJ4E=; b=FY1DE893h3qjwaqUn4T1l4V9A4FZFriDTRteU3JxDxyqdSbOQ5QbOzWE Nx+mu9I9ubF1CziiIU14dQjzL8T+rwBzH8HRyQGwMz76xWESw3WEyPquS 64zG3KBVFgUj6Y23OSNUttWtaoNzluPgBYEEslvWMyvhJaUqyJFUcNivb 2KXOAdKxY3t/ytT1XkhH9Fj03PLUmRqNyaybY2ejIsb8GE4RD0RbVKAfa doAEMkY8fEvI25bb/ttF3TDcp7YTQp24jVDsuuIzMh4dupgjWdyn5f3h0 GxjuG+moKbtCD6p09s82zekjpQAgzjoTe7qbNNeD5MOLpHThr/Z9aOEWY A==; IronPort-SDR: J1bUl6bjZY/G5JNZlvEhLjaZXIFqOQZ7iV4LZtGcBoQCd74lpUThpivpbNiWEjvr1ZxU0IXiDy 13DlGzSknJyOqNy6uNI32DSRZzDf9qjhJ60QXqArcS6ofitv5p3TLXUluO54LbodHnIn2ZVn7X tDhN30Wkd7MesigvNu9vj2XGGKno2BAnK6POAITqY5bbKwzygYBLLmZ16ZZQK9FBHOvaVrgAzZ pH1TJX5XLjuz3fQzwX12ohzDPkUFgR43Lwb+iCftQ7zDi0cVgfeUujNf0oR+BgFickg+8yphJR nKw= X-IronPort-AV: E=Sophos;i="5.77,305,1596470400"; d="scan'208";a="149552964" Received: from mail-bn7nam10lp2105.outbound.protection.outlook.com (HELO NAM10-BN7-obe.outbound.protection.outlook.com) ([104.47.70.105]) by ob1.hgst.iphmx.com with ESMTP; 26 Sep 2020 15:28:15 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YmZPr/pDDFUX09UDfNDLUMXRPIxigqPI8Yrwyw1Ce5n3hW6aVwCYazaaSmHhFqgP6yhcAHWe5OTt4yKfCmwff1KYz2wN/E3FgED/ZK4QEIycBRJB3ZLSah5iouWWg1T0+v/Oa0kdC980nUr48Zv5D4NIfmWR99mv56HW1HNwoi2+gif0yTkiSwBx+XSeVZ0E/GgtKsfH0eniubznv01w6Gw/6fXo663aRuPugNZNqW1q67gsfeVlb3uBeLRszzQg0vdo9BSKDvIUuwjBreKsBL4I4NUEAzEVifHQwrp3iPH5MmRNfnszQBy2oeWARub5JcVYHvmwmcBDIT5v7TYVYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W3Zu2Ex45yAXc98YlTPW2vbFGpRgTS659XkEHOJbjCs=; b=jGXNTnmOdi+/Zs7eUDKRRzwnAqLbfIdey4d8L4G507JCJnBsDGVBbLeH9yEmsoOFcyoQ67+Xqt9JnKK5wZiF8S3Z33RuUdC9VamkAFBHYbGr8Q60tS4kgYLiRSFeoxywFJguMmjOTaxAL4ipdPcbxVl6+35zbeLzlM/RNvYehWG7IQpGQXmi5hmXcGhNaiHWPwCVAOu2H6TwCawFRgJ0UYG7bpCMI2Ir76aMI51NYxgO8oY+A39xa3aGNE3eXfx4rS1UY0LewI7epFhWysjwrE7AiMiW4H5ppgH0wWIeQ5Bev06/wyWuXuVGEWHDbfPKIhCdlgaqNvusuUYKFBNL1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=wdc.com; dmarc=pass action=none header.from=wdc.com; dkim=pass header.d=wdc.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=W3Zu2Ex45yAXc98YlTPW2vbFGpRgTS659XkEHOJbjCs=; b=KXpZfJtqB6wZuy8ab04DoIUDf0vfDBgwY3IuWh8wRBO+0T3CNzQEwR51oaruVxu71ePgSHCvFAVVEpSemXErMCM5g4cnWPN38zP5A2uj+YGwWypZvreujUO0iWq0EOjIXSI9HwHJshfPTyKpflKFwebYKsOjqTdXqCjwsOQSK7g= Authentication-Results: dabbelt.com; dkim=none (message not signed) header.d=none;dabbelt.com; dmarc=none action=none header.from=wdc.com; Received: from DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) by DM6PR04MB4812.namprd04.prod.outlook.com (2603:10b6:5:26::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.25; Sat, 26 Sep 2020 07:28:12 +0000 Received: from DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::607a:44ed:1477:83e]) by DM6PR04MB6201.namprd04.prod.outlook.com ([fe80::607a:44ed:1477:83e%7]) with mapi id 15.20.3391.020; Sat, 26 Sep 2020 07:28:12 +0000 From: Anup Patel To: Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Albert Ou Subject: [PATCH] RISC-V: Check clint_time_val before use Date: Sat, 26 Sep 2020 12:57:50 +0530 Message-Id: <20200926072750.807764-1-anup.patel@wdc.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: MA1PR01CA0166.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:71::36) To DM6PR04MB6201.namprd04.prod.outlook.com (2603:10b6:5:127::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from wdc.com (122.179.126.16) by MA1PR01CA0166.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:71::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.20 via Frontend Transport; Sat, 26 Sep 2020 07:28:09 +0000 X-Mailer: git-send-email 2.25.1 X-Originating-IP: [122.179.126.16] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 6a62fb04-3b1b-48ba-5384-08d861edb99c X-MS-TrafficTypeDiagnostic: DM6PR04MB4812: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: WDCIPOUTBOUND: EOP-TRUE X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AX1bBFMuuhXtYEaZkCfSJavq86CmMp9bFXgfmGcll3OIKBiIvJ4FmbCcO+HQBiYYP72we2jjXuBeHPvos6cXA198RzQrYygZPPOXelurX+HTdjTkLYK+KOaY1MulP60wMtUIZBNS0xFvZE8n8x/H5vbe5KGc+T9FBBKsct8jdO7cXxSOLIh6sQpi40Hi2LvsUEOjg8zhsooNvEOwq2uxJel9+2tZ6pXPQ5d8aPzK0L76q2Hb3fUpkxheqrQ2qSyNpgFAN1Ujg2wvmQSi7qVWpl5m7vqufX1QQY4eXWAaTaHqqzHv09EeSApF5YhNImbhg30qh8W8cjmdWhg6PwFDJqfV8iHcJezKaFnrkkmbNe4YQAH3gGMPJ1vCdaAgnJeX X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR04MB6201.namprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(366004)(396003)(346002)(376002)(136003)(83380400001)(54906003)(110136005)(36756003)(8936002)(55016002)(66476007)(2906002)(8886007)(5660300002)(66556008)(16526019)(186003)(26005)(66946007)(316002)(2616005)(6666004)(8676002)(86362001)(1076003)(478600001)(956004)(7696005)(52116002)(44832011)(4326008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: BRA7iDlqUDnXuNOhB5OZ2nQUumvlJ4sMIrA9qKeQP55NhbB2m907N+jY4yCDUgzUyfb1PK5L0Y/Syp3wHxx5W/FEN0lTP1YWxN0+LmeGPW3gccozhRu9eNsI7tht5E+h8p4ENKvUeLBn1Zhbhv+P35VM+1seqyROg6+r1b4e06fCHP3f7qwj8rzi/qNw/GaPUXK9LriJ56OEzLJQVbFrxo9IxVUXMWbRHEyrvQE8ZKbQTI6u77B5RnQlhd6O3XQc4IYP2laTMErj5Fjy80h8wUxv1b843juEawu/y48/0FZq7fDRLvNM2eqmQKuJhZgt3PCTYIEtW8nKw2QdXGMSRzzRv+xM7abuwnS50yaRZOwNWGX4TEeuIvkYRTjWX1dWNUsqVBrHOgRpgbV0ovNvSnnsnctIwIsD6RgB8fTmmvMDTR2IMLe4xPC8fn8E0qZbJzWqO/LlGWlakpwDIPMRlIgzAMxzKQfj4mB/LFrmCJK136KqivKNpX3XAk+fw/oGe6n5q2d0X5Mqe/3TsfzbmhkmCWDSO9lsoCZmWVkhgMfSy6SWEkx9MwSH24wIVSZxAdnsNK7WA8+Y/7+nnnq92JKPP/kTN6It8PPfHgw+AOa3MnBY/SsDlEfhOVVWLfYOfIIxMi8EBJPthi8kKICGTg== X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6a62fb04-3b1b-48ba-5384-08d861edb99c X-MS-Exchange-CrossTenant-AuthSource: DM6PR04MB6201.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2020 07:28:12.4377 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YaZyjEU5SFjTEpI8K7su5km5mV5p3JRuaqznOVAG2GNKeY17RqbPm+v57uwYKq4EvUV8EGBwtMzBUXC4LPaBSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB4812 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200926_032817_070509_0B20D71A X-CRM114-Status: GOOD ( 15.33 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [216.71.154.45 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Le Moal , Anup Patel , Anup Patel , linux-kernel@vger.kernel.org, Atish Patra , Alistair Francis , linux-riscv@lists.infradead.org Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org The NoMMU kernel is broken for QEMU virt machine from Linux-5.9-rc6 because the get_cycles() and friends are called very early from rand_initialize() before CLINT driver is probed. To fix this, we should check clint_time_val before use in get_cycles() and friends. Fixes: d5be89a8d118 ("RISC-V: Resurrect the MMIO timer implementation for M-mode systems") Signed-off-by: Anup Patel --- arch/riscv/include/asm/timex.h | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/riscv/include/asm/timex.h b/arch/riscv/include/asm/timex.h index 7f659dda0032..52b42bb1602c 100644 --- a/arch/riscv/include/asm/timex.h +++ b/arch/riscv/include/asm/timex.h @@ -17,18 +17,24 @@ typedef unsigned long cycles_t; #ifdef CONFIG_64BIT static inline cycles_t get_cycles(void) { - return readq_relaxed(clint_time_val); + if (clint_time_val) + return readq_relaxed(clint_time_val); + return 0; } #else /* !CONFIG_64BIT */ static inline u32 get_cycles(void) { - return readl_relaxed(((u32 *)clint_time_val)); + if (clint_time_val) + return readl_relaxed(((u32 *)clint_time_val)); + return 0; } #define get_cycles get_cycles static inline u32 get_cycles_hi(void) { - return readl_relaxed(((u32 *)clint_time_val) + 1); + if (clint_time_val) + return readl_relaxed(((u32 *)clint_time_val) + 1); + return 0 } #define get_cycles_hi get_cycles_hi #endif /* CONFIG_64BIT */