From patchwork Thu Feb 10 05:49:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 12741346 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EA410C433EF for ; Thu, 10 Feb 2022 05:52:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FznSt0ZjCfkzPH2OfHEqE/R+b+rb6mqmGx7qQcxmXXs=; b=E5zfXkWbG5ktl1 dWOctXJTxmJXAGLmRzm/g+hucNlF5jf0bVWY5MbZ7iRz9J2cWpGRAhpU9lt024Ou8hW8dG2sadKLb 5bcpcMzPLnvJwLgTlZEYHT6nkB2zbPEoUh5irKSVI/ou9Js5oVSkiDiFPZyYWA9Id09cKUzwfJIOw YC06L/4Eb3gb9oSHVjPW1n7TCqnqBITYtlRMpqvnVcdIJ7IgNx+T2S75YF+VeB9yMcT8UZfPEAUV2 z/XRswIWl3FKS4egvFgJOvN97fuWYp+Dn/yRAlTgvRylh+nB8VPh8YqBG89ENgfVSHAn07TjSmpxI oih3fbwRhmxoonB4zoeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nI2M1-002fJ4-2A; Thu, 10 Feb 2022 05:50:53 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nI2Lc-002f9W-4E for linux-arm-kernel@lists.infradead.org; Thu, 10 Feb 2022 05:50:30 +0000 Received: by mail-pl1-x630.google.com with SMTP id y7so933511plp.2 for ; Wed, 09 Feb 2022 21:50:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OtWwAgOtAe4D9GgVae0thKZfJlP6oFxQeQXK4rT/p2g=; b=mpvzlkh15vWsDQDPqVespvAUorDjv4P0sXqAc43zuY+p/gP1hjsGsumlseXedX5pv0 nD34zA7BaDB8xRV05FF+GrTx2SsucaTtpPcJaJVMfdjOLhb/MuvDOcClLikACX0k/kh9 MfVC1TAYC1ZWtaNp7F9URyQsfu8Lyxs6FKdvb3QvBhfH9pdoEu+aQ2IiPvQKwdQO1YrG T3K9CqUIfBVIsoXlZAL68OMChaNNhwqULFJxxqzbBEfgKPRfp2d0rLWrBoCafCseUggG UCIKPCCXLeD8tAu91hP/yLuhLgBKxD+9tmr5+n5hdv6jgz80NH3w8Sg1epBMSp7RzBmN MQrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OtWwAgOtAe4D9GgVae0thKZfJlP6oFxQeQXK4rT/p2g=; b=188hzlfXZ30bLbCa2KCeANu0IMGqUrK9rRTip0lg9BuWNDEisOG72WBlu1Wd6BMS4U 5kDI4snFXbWFFRdtHyc5apOXRJXYgUdJyNy2wtfHeRIW+QzFe1aN0BOmgTJ3bO2Ye2gg 8GUFoZ9IVBT1LV3WuBlKq/B0t8TcP/PTMy5lXr/evlSRuXiOe/HZzrtxN9V+mUwxPzj+ 8/e6g8pG4+OD6Fvx/B/ztWUWZU8tCGoC4DxAmFKyRZNM0Wle1XhcK3sEyqZ8zWHe7Jb1 0L23z5Eg6xW2Pz7ZRyvhWl8pHVovfAuqbRlHOjKDwG4Puksrl9/PZu1TBbqnEg7sIe8K IU6A== X-Gm-Message-State: AOAM533k1pUKYaI7hWKjZRRFUjoLBVytsQms3CdmRSAVguQK92PsZp9Q PcPBx7ohiK79hsmaAW7To8BD4g== X-Google-Smtp-Source: ABdhPJzqRRDvFDR4H4MEd+k7XfQs6k0bUDJ5/jafY6LedNgN4q2V6yM8zs8NkNapBPZlshIUFOqtJw== X-Received: by 2002:a17:902:7083:: with SMTP id z3mr5916460plk.133.1644472226931; Wed, 09 Feb 2022 21:50:26 -0800 (PST) Received: from localhost.localdomain ([122.179.114.46]) by smtp.gmail.com with ESMTPSA id s32sm15192270pfw.80.2022.02.09.21.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Feb 2022 21:50:26 -0800 (PST) From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Albert Ou , Daniel Lezcano , Ulf Hansson , "Rafael J . Wysocki" , Pavel Machek , Rob Herring Cc: Sandeep Tripathy , Atish Patra , Alistair Francis , Liush , Anup Patel , devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvm-riscv@lists.infradead.org, Guo Ren Subject: [PATCH v11 1/8] RISC-V: Enable CPU_IDLE drivers Date: Thu, 10 Feb 2022 11:19:40 +0530 Message-Id: <20220210054947.170134-2-apatel@ventanamicro.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220210054947.170134-1-apatel@ventanamicro.com> References: <20220210054947.170134-1-apatel@ventanamicro.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220209_215028_215066_F0F17476 X-CRM114-Status: GOOD ( 17.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Anup Patel We force select CPU_PM and provide asm/cpuidle.h so that we can use CPU IDLE drivers for Linux RISC-V kernel. Signed-off-by: Anup Patel Signed-off-by: Anup Patel Reviewed-by: Guo Ren Reviewed-by: Atish Patra --- arch/riscv/Kconfig | 7 +++++++ arch/riscv/configs/defconfig | 1 + arch/riscv/configs/rv32_defconfig | 1 + arch/riscv/include/asm/cpuidle.h | 24 ++++++++++++++++++++++++ arch/riscv/kernel/process.c | 3 ++- 5 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 arch/riscv/include/asm/cpuidle.h diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index 5adcbd9b5e88..76976d12b463 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig @@ -46,6 +46,7 @@ config RISCV select CLONE_BACKWARDS select CLINT_TIMER if !MMU select COMMON_CLK + select CPU_PM if CPU_IDLE select EDAC_SUPPORT select GENERIC_ARCH_TOPOLOGY if SMP select GENERIC_ATOMIC64 if !64BIT @@ -547,4 +548,10 @@ source "kernel/power/Kconfig" endmenu +menu "CPU Power Management" + +source "drivers/cpuidle/Kconfig" + +endmenu + source "arch/riscv/kvm/Kconfig" diff --git a/arch/riscv/configs/defconfig b/arch/riscv/configs/defconfig index f120fcc43d0a..a5e0482a4969 100644 --- a/arch/riscv/configs/defconfig +++ b/arch/riscv/configs/defconfig @@ -20,6 +20,7 @@ CONFIG_SOC_SIFIVE=y CONFIG_SOC_VIRT=y CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y +CONFIG_CPU_IDLE=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_JUMP_LABEL=y diff --git a/arch/riscv/configs/rv32_defconfig b/arch/riscv/configs/rv32_defconfig index 8b56a7f1eb06..d1b87db54d68 100644 --- a/arch/riscv/configs/rv32_defconfig +++ b/arch/riscv/configs/rv32_defconfig @@ -20,6 +20,7 @@ CONFIG_SOC_VIRT=y CONFIG_ARCH_RV32I=y CONFIG_SMP=y CONFIG_HOTPLUG_CPU=y +CONFIG_CPU_IDLE=y CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_JUMP_LABEL=y diff --git a/arch/riscv/include/asm/cpuidle.h b/arch/riscv/include/asm/cpuidle.h new file mode 100644 index 000000000000..71fdc607d4bc --- /dev/null +++ b/arch/riscv/include/asm/cpuidle.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (C) 2021 Allwinner Ltd + * Copyright (C) 2021 Western Digital Corporation or its affiliates. + */ + +#ifndef _ASM_RISCV_CPUIDLE_H +#define _ASM_RISCV_CPUIDLE_H + +#include +#include + +static inline void cpu_do_idle(void) +{ + /* + * Add mb() here to ensure that all + * IO/MEM accesses are completed prior + * to entering WFI. + */ + mb(); + wait_for_interrupt(); +} + +#endif diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 03ac3aa611f5..504b496787aa 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c @@ -23,6 +23,7 @@ #include #include #include +#include register unsigned long gp_in_global __asm__("gp"); @@ -37,7 +38,7 @@ extern asmlinkage void ret_from_kernel_thread(void); void arch_cpu_idle(void) { - wait_for_interrupt(); + cpu_do_idle(); raw_local_irq_enable(); }