From mboxrd@z Thu Jan 1 00:00:00 1970 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 C00D9C04A68 for ; Wed, 27 Jul 2022 20:56:38 +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-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FPV49QOlXWFIJI//snh63l5OcUDYtoZYXev4Mu4a5jk=; b=VCczmc5XdxcKkK FoYWwF5zsCpJQKsHoigT/6u2WWfloXLlyYn9a3qNWYkdwq8Fhb38boZYfD9wmlDBPLZuy6Liy5d+n 6QJMs49IUayZoGwW4JonyrwtdgyoyYGFpU34dM7IoIEJDrBs8el7sdq8EMHDO2yEzVRl8Dz/YxPiK F3RQiFYQxozUGFG4Wijtr9rhaOzXycXgoaazlAmroI+IbrDt+snaScwXdz2PAd9zYhxrIujXk4EB3 yF629shr4XiHWsCls6lNEYWrbbP9+mUxHcZVi7QM74aAi2Oj1Jt9NBLrqoiNro7ovTY8v4cFEbGSL zdtR0RehUlOlER+RDkcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGo46-000Bz5-BC; Wed, 27 Jul 2022 20:55:34 +0000 Received: from mail-pf1-x42c.google.com ([2607:f8b0:4864:20::42c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGo42-000Bw9-75 for linux-arm-kernel@lists.infradead.org; Wed, 27 Jul 2022 20:55:31 +0000 Received: by mail-pf1-x42c.google.com with SMTP id c3so143704pfb.13 for ; Wed, 27 Jul 2022 13:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc; bh=PDfD/w3laZVtm3bdlWNfkVLMgSxeQ3l5Woo4I57mmI8=; b=TYqUl7+MEOvi9iWyjthTQq4wcELIQNLgRZCCTvLtygNWR9hdUV4DCXyMI4lmbfT8gl B67UwtO88ok73f1dRBOQEg9FAC2VHhx1ve4OFsLCRsruCae9h+Mvtk+8qn4TKpyrcfqR Vokjpnp0i5balJplOUqF9i5XgVFcOu5HO4LRhvPdcAf3H1urVc/BDnoLVfNW3DOQZhJz wsD3MDi38qKp8PHApA0AAlJe1Wv88gR5bTZHvb3AVuPO+i7I0bfvuwbclK0R1UNcg6f1 Q6OdLAOAzuv0nRm4j9FKVuRDt0YRftioeUEGRU2n7Pup+WDNhTuNAj+smkUFrjDO+znG rOkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc; bh=PDfD/w3laZVtm3bdlWNfkVLMgSxeQ3l5Woo4I57mmI8=; b=lvBXyU0hV4s8PO9pMQWansupSHbj9h69ND4c62asrKAV2kDaL3rB08DiYGRaKFzign XVQojkrRqeNSgp/j52ALuJ9zqQHAG8wExqjAg2vAekJpcyRBrVvnHnXk038b/xc1+doZ kBgVrPF9ROX/JkqVVdNOTrL/kBXxO6ghNiT+XVXcQ5/zv17iLifFxt8rZKMP+nj95+/P dgPMY0aORyrh4+0Rk0ewNkKVObh15GX/YM91J4V1goq6rhgolyv0nnPXmKwAxZYnBbMx qVsoMlFYYOCP76jHoV6BALGt9vgCmbcuyyo3Opn0oeEvjxJQxqdYSmQTkkhptIZDvCMC +I4g== X-Gm-Message-State: AJIora/BQTiCZnIq6TR2Q9tukhkhA9/REL11qJRbV3fr3NJN/qbhKpJx ugEeZFxu/GIuRjw54/6mkdMk1g== X-Google-Smtp-Source: AGRyM1u5baVzFCvSFtHbjqm/wL4aQWerHvIsyeWSs4o4rfcKOZIP8VoAmWHT/1A9Y+FKW1X0i34uBw== X-Received: by 2002:a63:1766:0:b0:41b:3478:a880 with SMTP id 38-20020a631766000000b0041b3478a880mr6577387pgx.399.1658955327325; Wed, 27 Jul 2022 13:55:27 -0700 (PDT) Received: from ?IPV6:2401:4900:1f3a:5a45:a9cd:d7dd:fd01:73c0? ([2401:4900:1f3a:5a45:a9cd:d7dd:fd01:73c0]) by smtp.gmail.com with ESMTPSA id w2-20020a1709026f0200b0016be681f008sm14078480plk.290.2022.07.27.13.55.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 Jul 2022 13:55:26 -0700 (PDT) Message-ID: Date: Thu, 28 Jul 2022 02:25:20 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH] firmware/psci: Add debugfs support to ease debugging Content-Language: en-US To: Dmitry Baryshkov Cc: Mark Rutland , Lorenzo Pieralisi , linux-arm-kernel@lists.infradead.org, linux-pm@vger.kernel.org, linux-arm-msm@vger.kernel.org References: <20220727200901.1142557-1-dmitry.baryshkov@linaro.org> From: Bhupesh Sharma In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220727_135530_306167_9E8E50E5 X-CRM114-Status: GOOD ( 28.60 ) 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 7/28/22 2:23 AM, Dmitry Baryshkov wrote: > On Wed, 27 Jul 2022 at 23:15, Bhupesh Sharma wrote: >> >> Hi Dmitry, >> >> On 7/28/22 1:39 AM, Dmitry Baryshkov wrote: >>> To ease debugging of PSCI supported features, add debugfs file called >>> 'psci' describing PSCI and SMC CC versions, enabled features and >>> options. >>> >>> Signed-off-by: Dmitry Baryshkov >>> --- >>> drivers/firmware/psci/psci.c | 112 ++++++++++++++++++++++++++++++++++- >>> include/uapi/linux/psci.h | 9 +++ >>> 2 files changed, 120 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/firmware/psci/psci.c b/drivers/firmware/psci/psci.c >>> index b907768eea01..6595cc964635 100644 >>> --- a/drivers/firmware/psci/psci.c >>> +++ b/drivers/firmware/psci/psci.c >>> @@ -9,6 +9,7 @@ >>> #include >>> #include >>> #include >>> +#include >>> #include >>> #include >>> #include >>> @@ -324,12 +325,121 @@ static void psci_sys_poweroff(void) >>> invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); >>> } >>> >>> -static int __init psci_features(u32 psci_func_id) >>> +static int psci_features(u32 psci_func_id) >> >> This change doesn't seem related to the patch $SUBJECT. >> Also is it really needed? If yes, probably this should be a separate patch. > > It is related and I don't think it should be moved to a separate > patch. Removing the __init annotation from psci_features() is > necessary to allow using psci_features() from psci_debufs_read(), > which is definitely not an __init code. Otherwise reading from > debugfs/psci would cause null pointer exceptions. Ok, and what is the behavior with CONFIG_DEBUG_FS = n? Does your patch work well in that case? Thanks. >> >>> { >>> return invoke_psci_fn(PSCI_1_0_FN_PSCI_FEATURES, >>> psci_func_id, 0, 0); >>> } >>> >>> +#ifdef CONFIG_DEBUG_FS >>> + >>> +#define PSCI_ID(ver, _name) \ >>> + { .fn = PSCI_##ver##_FN_##_name, .name = #_name, } >>> +#define PSCI_ID_NATIVE(ver, _name) \ >>> + { .fn = PSCI_FN_NATIVE(ver, _name), .name = #_name, } >>> + >>> +/* A table of all optional functions */ >>> +static const struct { >>> + u32 fn; >>> + const char *name; >>> +} psci_fn_ids[] = { >>> + PSCI_ID_NATIVE(0_2, MIGRATE), >>> + PSCI_ID(0_2, MIGRATE_INFO_TYPE), >>> + PSCI_ID_NATIVE(0_2, MIGRATE_INFO_UP_CPU), >>> + PSCI_ID(1_0, CPU_FREEZE), >>> + PSCI_ID_NATIVE(1_0, CPU_DEFAULT_SUSPEND), >>> + PSCI_ID_NATIVE(1_0, NODE_HW_STATE), >>> + PSCI_ID_NATIVE(1_0, SYSTEM_SUSPEND), >>> + PSCI_ID(1_0, SET_SUSPEND_MODE), >>> + PSCI_ID_NATIVE(1_0, STAT_RESIDENCY), >>> + PSCI_ID_NATIVE(1_0, STAT_COUNT), >>> + PSCI_ID_NATIVE(1_1, SYSTEM_RESET2), >>> +}; >>> + >>> +static int psci_debugfs_read(struct seq_file *s, void *data) >>> +{ >>> + int feature, type, i; >>> + u32 ver; >>> + >>> + ver = psci_ops.get_version(); >>> + seq_printf(s, "PSCIv%d.%d\n", >>> + PSCI_VERSION_MAJOR(ver), >>> + PSCI_VERSION_MINOR(ver)); >>> + >>> + /* PSCI_FEATURES is available only starting from 1.0 */ >>> + if (PSCI_VERSION_MAJOR(ver) < 1) >>> + return 0; >>> + >>> + feature = psci_features(ARM_SMCCC_VERSION_FUNC_ID); >>> + if (feature != PSCI_RET_NOT_SUPPORTED) { >>> + ver = invoke_psci_fn(ARM_SMCCC_VERSION_FUNC_ID, 0, 0, 0); >>> + seq_printf(s, "SMC Calling Convention v%d.%d\n", >>> + PSCI_VERSION_MAJOR(ver), >>> + PSCI_VERSION_MINOR(ver)); >>> + } else { >>> + seq_printf(s, "SMC Calling Convention v1.0 is assumed\n"); >>> + } >>> + >>> + feature = psci_features(PSCI_FN_NATIVE(0_2, CPU_SUSPEND)); >>> + if (feature < 0) { >>> + seq_printf(s, "PSCI_FEATURES(CPU_SUSPEND) error (%d)\n", feature); >>> + } else { >>> + seq_printf(s, "OSI is %ssupported\n", >>> + (feature & BIT(0)) ? "" : "not "); >>> + seq_printf(s, "%s StateID format is used\n", >>> + (feature & BIT(1)) ? "Extended" : "Original"); >>> + } >>> + >>> + type = psci_ops.migrate_info_type(); >>> + if (type == PSCI_0_2_TOS_UP_MIGRATE || >>> + type == PSCI_0_2_TOS_UP_NO_MIGRATE) { >>> + unsigned long cpuid; >>> + >>> + seq_printf(s, "Trusted OS %smigrate capable\n", >>> + type == PSCI_0_2_TOS_UP_NO_MIGRATE ? "not " : ""); >>> + cpuid = psci_migrate_info_up_cpu(); >>> + seq_printf(s, "Trusted OS resident on physical CPU 0x%lx (#%d)\n", cpuid, resident_cpu); >>> + } else if (type == PSCI_0_2_TOS_MP) { >>> + seq_printf(s, "Trusted OS migration not required\n"); >>> + } else { >>> + if (type != PSCI_RET_NOT_SUPPORTED) >>> + seq_printf(s, "MIGRATE_INFO_TYPE returned unknown type (%d)\n", type); >>> + } >>> + >>> + for (i = 0; i < ARRAY_SIZE(psci_fn_ids); i++) { >>> + feature = psci_features(psci_fn_ids[i].fn); >>> + if (feature == PSCI_RET_NOT_SUPPORTED) >>> + continue; >>> + if (feature < 0) >>> + seq_printf(s, "PSCI_FEATURES(%s) error (%d)\n", psci_fn_ids[i].name, feature); >>> + else >>> + seq_printf(s, "%s is supported\n", psci_fn_ids[i].name); >>> + } >>> + >>> + return 0; >>> +} >>> + >>> +static int psci_debugfs_open(struct inode *inode, struct file *f) >>> +{ >>> + return single_open(f, psci_debugfs_read, NULL); >>> +} >>> + >>> +static const struct file_operations psci_debugfs_ops = { >>> + .owner = THIS_MODULE, >>> + .open = psci_debugfs_open, >>> + .release = single_release, >>> + .read = seq_read, >>> + .llseek = seq_lseek >>> +}; >>> + >>> +static int __init psci_debugfs_init(void) >>> +{ >>> + return PTR_ERR_OR_ZERO(debugfs_create_file("psci", S_IRUGO, NULL, NULL, >>> + &psci_debugfs_ops)); >>> +} >>> +late_initcall(psci_debugfs_init) >>> +#endif >>> + >>> #ifdef CONFIG_CPU_IDLE >>> static int psci_suspend_finisher(unsigned long state) >>> { >>> diff --git a/include/uapi/linux/psci.h b/include/uapi/linux/psci.h >>> index 2bf93c0d6354..f6f0bad5858b 100644 >>> --- a/include/uapi/linux/psci.h >>> +++ b/include/uapi/linux/psci.h >>> @@ -48,11 +48,20 @@ >>> #define PSCI_0_2_FN64_MIGRATE_INFO_UP_CPU PSCI_0_2_FN64(7) >>> >>> #define PSCI_1_0_FN_PSCI_FEATURES PSCI_0_2_FN(10) >>> +#define PSCI_1_0_FN_CPU_FREEZE PSCI_0_2_FN(11) >>> +#define PSCI_1_0_FN_CPU_DEFAULT_SUSPEND PSCI_0_2_FN(12) >>> +#define PSCI_1_0_FN_NODE_HW_STATE PSCI_0_2_FN(13) >>> #define PSCI_1_0_FN_SYSTEM_SUSPEND PSCI_0_2_FN(14) >>> #define PSCI_1_0_FN_SET_SUSPEND_MODE PSCI_0_2_FN(15) >>> +#define PSCI_1_0_FN_STAT_RESIDENCY PSCI_0_2_FN(16) >>> +#define PSCI_1_0_FN_STAT_COUNT PSCI_0_2_FN(17) >>> #define PSCI_1_1_FN_SYSTEM_RESET2 PSCI_0_2_FN(18) >>> >>> +#define PSCI_1_0_FN64_CPU_DEFAULT_SUSPEND PSCI_0_2_FN64(12) >>> +#define PSCI_1_0_FN64_NODE_HW_STATE PSCI_0_2_FN64(13) >>> #define PSCI_1_0_FN64_SYSTEM_SUSPEND PSCI_0_2_FN64(14) >>> +#define PSCI_1_0_FN64_STAT_RESIDENCY PSCI_0_2_FN64(16) >>> +#define PSCI_1_0_FN64_STAT_COUNT PSCI_0_2_FN64(17) >>> #define PSCI_1_1_FN64_SYSTEM_RESET2 PSCI_0_2_FN64(18) >>> >>> /* PSCI v0.2 power state encoding for CPU_SUSPEND function */ > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel