From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dmitry Osipenko Subject: [PATCH v7 2/7] ARM: trusted_foundations: Make prepare_idle call to take mode argument Date: Thu, 28 Feb 2019 16:17:02 +0300 Message-ID: <20190228131707.2592-3-digetx@gmail.com> References: <20190228131707.2592-1-digetx@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190228131707.2592-1-digetx@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Russell King , Thierry Reding , Jonathan Hunter , Robert Yang , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Cc: linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org List-Id: linux-tegra@vger.kernel.org VGhlIFRydXN0ZWQgRm91bmRhdGlvbnMgZmlybXdhcmUgY2FsbCB2YXJpZXMgZGVwZW5kaW5nIG9u IHRoZSByZXF1aXJlZApzdXNwZW5kLW1vZGUuIE1ha2UgdGhlIGZpcm13YXJlIEFQSSB0byB0YWtl IHRoZSBtb2RlIGFyZ3VtZW50IGluIG9yZGVyCnRvIGV4cG9zZSBhbGwgb2YgdGhlIG1vZGVzIHRv IGZpcm13YXJlIHVzZXIuCgpUZXN0ZWQtYnk6IFJvYmVydCBZYW5nIDxkZWNhdGZAZ21haWwuY29t PgpUZXN0ZWQtYnk6IE1pY2hhxYIgTWlyb3PFgmF3IDxtaXJxLWxpbnV4QHJlcmUucW1xbS5wbD4K U2lnbmVkLW9mZi1ieTogRG1pdHJ5IE9zaXBlbmtvIDxkaWdldHhAZ21haWwuY29tPgotLS0KIGFy Y2gvYXJtL2Zpcm13YXJlL3RydXN0ZWRfZm91bmRhdGlvbnMuYyAgICB8IDI5ICsrKysrKysrKysr KysrKysrKysrLS0KIGFyY2gvYXJtL2luY2x1ZGUvYXNtL2Zpcm13YXJlLmggICAgICAgICAgICB8 ICAyICstCiBhcmNoL2FybS9pbmNsdWRlL2FzbS90cnVzdGVkX2ZvdW5kYXRpb25zLmggfCAgNiAr KysrKwogYXJjaC9hcm0vbWFjaC10ZWdyYS9jcHVpZGxlLXRlZ3JhMTE0LmMgICAgIHwgIDMgKyst CiA0IGZpbGVzIGNoYW5nZWQsIDM2IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEvYXJjaC9hcm0vZmlybXdhcmUvdHJ1c3RlZF9mb3VuZGF0aW9ucy5jIGIvYXJjaC9h cm0vZmlybXdhcmUvdHJ1c3RlZF9mb3VuZGF0aW9ucy5jCmluZGV4IDQwMjgxMDRjZjdiMi4uMTg4 YjlhMzNmNzJiIDEwMDY0NAotLS0gYS9hcmNoL2FybS9maXJtd2FyZS90cnVzdGVkX2ZvdW5kYXRp b25zLmMKKysrIGIvYXJjaC9hcm0vZmlybXdhcmUvdHJ1c3RlZF9mb3VuZGF0aW9ucy5jCkBAIC02 Nyw5ICs2NywzNCBAQCBzdGF0aWMgaW50IHRmX3NldF9jcHVfYm9vdF9hZGRyKGludCBjcHUsIHVu c2lnbmVkIGxvbmcgYm9vdF9hZGRyKQogCXJldHVybiAwOwogfQogCi1zdGF0aWMgaW50IHRmX3By ZXBhcmVfaWRsZSh2b2lkKQorc3RhdGljIGludCB0Zl9wcmVwYXJlX2lkbGUodW5zaWduZWQgbG9u ZyBtb2RlKQogewotCXRmX2dlbmVyaWNfc21jKFRGX0NQVV9QTSwgVEZfQ1BVX1BNX1MxX05PRkxV U0hfTDIsIGNwdV9ib290X2FkZHIpOworCXN3aXRjaCAobW9kZSkgeworCWNhc2UgVEZfUE1fTU9E RV9MUDA6CisJCXRmX2dlbmVyaWNfc21jKFRGX0NQVV9QTSwgVEZfQ1BVX1BNX1MzLCBjcHVfYm9v dF9hZGRyKTsKKwkJYnJlYWs7CisKKwljYXNlIFRGX1BNX01PREVfTFAxOgorCQl0Zl9nZW5lcmlj X3NtYyhURl9DUFVfUE0sIFRGX0NQVV9QTV9TMiwgY3B1X2Jvb3RfYWRkcik7CisJCWJyZWFrOwor CisJY2FzZSBURl9QTV9NT0RFX0xQMV9OT19NQ19DTEs6CisJCXRmX2dlbmVyaWNfc21jKFRGX0NQ VV9QTSwgVEZfQ1BVX1BNX1MyX05PX01DX0NMSywKKwkJCSAgICAgICBjcHVfYm9vdF9hZGRyKTsK KwkJYnJlYWs7CisKKwljYXNlIFRGX1BNX01PREVfTFAyOgorCQl0Zl9nZW5lcmljX3NtYyhURl9D UFVfUE0sIFRGX0NQVV9QTV9TMSwgY3B1X2Jvb3RfYWRkcik7CisJCWJyZWFrOworCisJY2FzZSBU Rl9QTV9NT0RFX0xQMl9OT0ZMVVNIX0wyOgorCQl0Zl9nZW5lcmljX3NtYyhURl9DUFVfUE0sIFRG X0NQVV9QTV9TMV9OT0ZMVVNIX0wyLAorCQkJICAgICAgIGNwdV9ib290X2FkZHIpOworCQlicmVh azsKKworCWRlZmF1bHQ6CisJCXJldHVybiAtRUlOVkFMOworCX0KIAogCXJldHVybiAwOwogfQpk aWZmIC0tZ2l0IGEvYXJjaC9hcm0vaW5jbHVkZS9hc20vZmlybXdhcmUuaCBiL2FyY2gvYXJtL2lu Y2x1ZGUvYXNtL2Zpcm13YXJlLmgKaW5kZXggMzRjMWQ5NmVmNDZkLi42Njk4MjcyYmJjYmYgMTAw NjQ0Ci0tLSBhL2FyY2gvYXJtL2luY2x1ZGUvYXNtL2Zpcm13YXJlLmgKKysrIGIvYXJjaC9hcm0v aW5jbHVkZS9hc20vZmlybXdhcmUuaApAQCAtMjQsNyArMjQsNyBAQCBzdHJ1Y3QgZmlybXdhcmVf b3BzIHsKIAkvKgogCSAqIEluZm9ybSB0aGUgZmlybXdhcmUgd2UgaW50ZW5kIHRvIGVudGVyIENQ VSBpZGxlIG1vZGUKIAkgKi8KLQlpbnQgKCpwcmVwYXJlX2lkbGUpKHZvaWQpOworCWludCAoKnBy ZXBhcmVfaWRsZSkodW5zaWduZWQgbG9uZyBtb2RlKTsKIAkvKgogCSAqIEVudGVycyBDUFUgaWRs ZSBtb2RlCiAJICovCmRpZmYgLS1naXQgYS9hcmNoL2FybS9pbmNsdWRlL2FzbS90cnVzdGVkX2Zv dW5kYXRpb25zLmggYi9hcmNoL2FybS9pbmNsdWRlL2FzbS90cnVzdGVkX2ZvdW5kYXRpb25zLmgK aW5kZXggMDcxODNjYTQzYjI1Li42NTBjY2E3NDM1ZjQgMTAwNjQ0Ci0tLSBhL2FyY2gvYXJtL2lu Y2x1ZGUvYXNtL3RydXN0ZWRfZm91bmRhdGlvbnMuaAorKysgYi9hcmNoL2FybS9pbmNsdWRlL2Fz bS90cnVzdGVkX2ZvdW5kYXRpb25zLmgKQEAgLTM1LDYgKzM1LDEyIEBACiAjaW5jbHVkZSA8YXNt L2hhcmR3YXJlL2NhY2hlLWwyeDAuaD4KICNpbmNsdWRlIDxhc20vb3V0ZXJjYWNoZS5oPgogCisj ZGVmaW5lIFRGX1BNX01PREVfTFAwCQkJMAorI2RlZmluZSBURl9QTV9NT0RFX0xQMQkJCTEKKyNk ZWZpbmUgVEZfUE1fTU9ERV9MUDFfTk9fTUNfQ0xLCTIKKyNkZWZpbmUgVEZfUE1fTU9ERV9MUDIJ CQkzCisjZGVmaW5lIFRGX1BNX01PREVfTFAyX05PRkxVU0hfTDIJNAorCiBzdHJ1Y3QgdHJ1c3Rl ZF9mb3VuZGF0aW9uc19wbGF0Zm9ybV9kYXRhIHsKIAl1bnNpZ25lZCBpbnQgdmVyc2lvbl9tYWpv cjsKIAl1bnNpZ25lZCBpbnQgdmVyc2lvbl9taW5vcjsKZGlmZiAtLWdpdCBhL2FyY2gvYXJtL21h Y2gtdGVncmEvY3B1aWRsZS10ZWdyYTExNC5jIGIvYXJjaC9hcm0vbWFjaC10ZWdyYS9jcHVpZGxl LXRlZ3JhMTE0LmMKaW5kZXggZTNmYmNmZWRmODQ1Li4zYjlhZjQ3NjZjZGYgMTAwNjQ0Ci0tLSBh L2FyY2gvYXJtL21hY2gtdGVncmEvY3B1aWRsZS10ZWdyYTExNC5jCisrKyBiL2FyY2gvYXJtL21h Y2gtdGVncmEvY3B1aWRsZS10ZWdyYTExNC5jCkBAIC0yNCw2ICsyNCw3IEBACiAjaW5jbHVkZSA8 YXNtL2NwdWlkbGUuaD4KICNpbmNsdWRlIDxhc20vc21wX3BsYXQuaD4KICNpbmNsdWRlIDxhc20v c3VzcGVuZC5oPgorI2luY2x1ZGUgPGFzbS90cnVzdGVkX2ZvdW5kYXRpb25zLmg+CiAjaW5jbHVk ZSA8YXNtL3BzY2kuaD4KIAogI2luY2x1ZGUgImNwdWlkbGUuaCIKQEAgLTQ2LDcgKzQ3LDcgQEAg c3RhdGljIGludCB0ZWdyYTExNF9pZGxlX3Bvd2VyX2Rvd24oc3RydWN0IGNwdWlkbGVfZGV2aWNl ICpkZXYsCiAJdGVncmFfc2V0X2NwdV9pbl9scDIoKTsKIAljcHVfcG1fZW50ZXIoKTsKIAotCWNh bGxfZmlybXdhcmVfb3AocHJlcGFyZV9pZGxlKTsKKwljYWxsX2Zpcm13YXJlX29wKHByZXBhcmVf aWRsZSwgVEZfUE1fTU9ERV9MUDJfTk9GTFVTSF9MMik7CiAKIAkvKiBEbyBzdXNwZW5kIGJ5IG91 cnNlbHZlcyBpZiB0aGUgZmlybXdhcmUgZG9lcyBub3QgaW1wbGVtZW50IGl0ICovCiAJaWYgKGNh bGxfZmlybXdhcmVfb3AoZG9faWRsZSwgMCkgPT0gLUVOT1NZUykKLS0gCjIuMjAuMQoKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJu ZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRw Oi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK 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 X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4D17C43381 for ; Thu, 28 Feb 2019 13:19:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 75DC920C01 for ; Thu, 28 Feb 2019 13:19:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Hy2A5rbh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732757AbfB1NTV (ORCPT ); Thu, 28 Feb 2019 08:19:21 -0500 Received: from mail-lj1-f195.google.com ([209.85.208.195]:34639 "EHLO mail-lj1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726913AbfB1NSr (ORCPT ); Thu, 28 Feb 2019 08:18:47 -0500 Received: by mail-lj1-f195.google.com with SMTP id l5so17113670lje.1; Thu, 28 Feb 2019 05:18:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JPHqguOp/7QU9S+J0U9TetxPLGIvYKymEwgwMO29Kd8=; b=Hy2A5rbhklLatywHq1T53j3uQilomncH0DHlXBYQzUpAllgu0nRHHPgdcZrFIVrrlN 4WV47kXrLAGS4XHo8dTxuAxCOnQuCBObcX4QUsaW3cdEq3Ye+Kl0ogmzfTBSDtzduJOr x2XAegq11xz2MfMwm8346hRD08vVJBLYnbW+LCnu9ai8k9aZiIO/N9XNDVQrD3c6K27E 5DLX03mbss/cvPwsFrb0ri+LZ4WiDuSkwho4sHj0Vddqt8OBHmbZFWWzGSxYjqCCKgnu mOJUhZlyttXYTE/uEh0A1JIAdraUQOo2QsI6AYgISWqYsF9Obz76dL7XcQrkrCi7nPrw eD+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JPHqguOp/7QU9S+J0U9TetxPLGIvYKymEwgwMO29Kd8=; b=ZrHFs41E4XOdAPno5+crcB8+0X7vGcCKk5Vpys+a8DKP49NtWkEZwkfZEKaN0+QK1j wjn2ZnS8MWN238Cs8utfhRefOVwqub5Ijdd6bDj8I/rNujffTD3Bkv/lUWBQNCyN5q+W zRANk8o00JIblSJyuIyhJp3Yo/ADHjSQU/xqUbtdypqCr2mgBmGAn3H8oI+hFY0l418L BWcEc1XEJmg+3B7ePZybLZOeFIoHBCvGfEV9rkocTBXEKwuXIRy4GJEY/doWRUVLP7WR VJ0r4cqtERhoTTlMNt+fCq5Ub3ljoQrRuUBoi2W1Q+5VVWaYJhz3k9N31TzGAmhiM4oj KyGw== X-Gm-Message-State: APjAAAW+Ux1U/OG9RVLiQQ5HBZcO9SfQ/PCf6VbmvsZtTrNChLgD49Xu UtemSmwinI4zEreQ46/ZTW0= X-Google-Smtp-Source: APXvYqyZdbQXIKMbxFPOdC4unYY3ldojfzXhSZxMau+ZDAeizEAApK5yt3nMe0RZXWKejMQVBNurHg== X-Received: by 2002:a2e:6a18:: with SMTP id f24mr4862460ljc.97.1551359925090; Thu, 28 Feb 2019 05:18:45 -0800 (PST) Received: from localhost.localdomain (ppp91-79-175-49.pppoe.mtu-net.ru. [91.79.175.49]) by smtp.gmail.com with ESMTPSA id l26sm4600069lfc.37.2019.02.28.05.18.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Feb 2019 05:18:44 -0800 (PST) From: Dmitry Osipenko To: Russell King , Thierry Reding , Jonathan Hunter , Robert Yang , =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= Cc: linux-arm-kernel@lists.infradead.org, linux-tegra@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 2/7] ARM: trusted_foundations: Make prepare_idle call to take mode argument Date: Thu, 28 Feb 2019 16:17:02 +0300 Message-Id: <20190228131707.2592-3-digetx@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228131707.2592-1-digetx@gmail.com> References: <20190228131707.2592-1-digetx@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Trusted Foundations firmware call varies depending on the required suspend-mode. Make the firmware API to take the mode argument in order to expose all of the modes to firmware user. Tested-by: Robert Yang Tested-by: Michał Mirosław Signed-off-by: Dmitry Osipenko --- arch/arm/firmware/trusted_foundations.c | 29 ++++++++++++++++++++-- arch/arm/include/asm/firmware.h | 2 +- arch/arm/include/asm/trusted_foundations.h | 6 +++++ arch/arm/mach-tegra/cpuidle-tegra114.c | 3 ++- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/arch/arm/firmware/trusted_foundations.c b/arch/arm/firmware/trusted_foundations.c index 4028104cf7b2..188b9a33f72b 100644 --- a/arch/arm/firmware/trusted_foundations.c +++ b/arch/arm/firmware/trusted_foundations.c @@ -67,9 +67,34 @@ static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr) return 0; } -static int tf_prepare_idle(void) +static int tf_prepare_idle(unsigned long mode) { - tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S1_NOFLUSH_L2, cpu_boot_addr); + switch (mode) { + case TF_PM_MODE_LP0: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S3, cpu_boot_addr); + break; + + case TF_PM_MODE_LP1: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S2, cpu_boot_addr); + break; + + case TF_PM_MODE_LP1_NO_MC_CLK: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S2_NO_MC_CLK, + cpu_boot_addr); + break; + + case TF_PM_MODE_LP2: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S1, cpu_boot_addr); + break; + + case TF_PM_MODE_LP2_NOFLUSH_L2: + tf_generic_smc(TF_CPU_PM, TF_CPU_PM_S1_NOFLUSH_L2, + cpu_boot_addr); + break; + + default: + return -EINVAL; + } return 0; } diff --git a/arch/arm/include/asm/firmware.h b/arch/arm/include/asm/firmware.h index 34c1d96ef46d..6698272bbcbf 100644 --- a/arch/arm/include/asm/firmware.h +++ b/arch/arm/include/asm/firmware.h @@ -24,7 +24,7 @@ struct firmware_ops { /* * Inform the firmware we intend to enter CPU idle mode */ - int (*prepare_idle)(void); + int (*prepare_idle)(unsigned long mode); /* * Enters CPU idle mode */ diff --git a/arch/arm/include/asm/trusted_foundations.h b/arch/arm/include/asm/trusted_foundations.h index 07183ca43b25..650cca7435f4 100644 --- a/arch/arm/include/asm/trusted_foundations.h +++ b/arch/arm/include/asm/trusted_foundations.h @@ -35,6 +35,12 @@ #include #include +#define TF_PM_MODE_LP0 0 +#define TF_PM_MODE_LP1 1 +#define TF_PM_MODE_LP1_NO_MC_CLK 2 +#define TF_PM_MODE_LP2 3 +#define TF_PM_MODE_LP2_NOFLUSH_L2 4 + struct trusted_foundations_platform_data { unsigned int version_major; unsigned int version_minor; diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c index e3fbcfedf845..3b9af4766cdf 100644 --- a/arch/arm/mach-tegra/cpuidle-tegra114.c +++ b/arch/arm/mach-tegra/cpuidle-tegra114.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "cpuidle.h" @@ -46,7 +47,7 @@ static int tegra114_idle_power_down(struct cpuidle_device *dev, tegra_set_cpu_in_lp2(); cpu_pm_enter(); - call_firmware_op(prepare_idle); + call_firmware_op(prepare_idle, TF_PM_MODE_LP2_NOFLUSH_L2); /* Do suspend by ourselves if the firmware does not implement it */ if (call_firmware_op(do_idle, 0) == -ENOSYS) -- 2.20.1