From patchwork Wed Jul 14 09:58:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 12376533 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,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 A9888C11F67 for ; Wed, 14 Jul 2021 09:59:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9920761358 for ; Wed, 14 Jul 2021 09:59:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239021AbhGNKCA (ORCPT ); Wed, 14 Jul 2021 06:02:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239022AbhGNKB7 (ORCPT ); Wed, 14 Jul 2021 06:01:59 -0400 Received: from mail-pj1-x102c.google.com (mail-pj1-x102c.google.com [IPv6:2607:f8b0:4864:20::102c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE8ADC061760 for ; Wed, 14 Jul 2021 02:59:07 -0700 (PDT) Received: by mail-pj1-x102c.google.com with SMTP id b8-20020a17090a4888b02901725eedd346so1371664pjh.4 for ; Wed, 14 Jul 2021 02:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ToADbup+MfTcTpglli3NLkX2Wd5wYfKIe/K2kf6rNBQ=; b=Bm0nGwXC1+3vIZuFsqmqFFkDVyv4H+yw/oCyHEFUNrjUwzDfFhEinIq6VEJHhumP8q 8YBEt3k77xz7rNVpBszjuY1GRRmlGGrhe3exOvxWRAPLCPqSTRFvjYqRAibBQ+3eGaCC ZlULeS6pAbg0adnyqaTjgGlKt2hfzwPDTM4EozrdgDTcPF1yUFQqiR7TdvsOTsAaUKjm lk9Lvfzpimn4v2LVUPsayU8Gbjhh8dWeFNYleEKdZ2lIrJAQCaYsVXzwObZjmJN6ZzoY QMVbl5Hj4/n8344XpSP65M8nMT5OmUBLSyPvNUFCjK/ayPZCFX40Vrv3T1KwMxf/qAoY RFhA== 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; bh=ToADbup+MfTcTpglli3NLkX2Wd5wYfKIe/K2kf6rNBQ=; b=ckLMlKVzs7DKt6j5f9t0/1ZJxUxPNDmLVMM2Obzam+04DeadYr5AjOA6LnBHySYp83 uCb8fXHuUmWZ+znwdtFEDe3SbY56rbkgoszCzRrrE5eCOW1vjagFE317t1eWKifJLVts uu5QDDc63zFbOXzh9hc7zEoxKElJ1irdjBWxOIvNHBe1UJCJAncKjdLFj/YLFTgeuMFf 1WNryGTs+SftBSo5MhxfZMl9bc3GNmIEADfER6W4tRHV6U2Jt7FF2SpxKDdbqp7o5ZIx Ne5slafkAZM00b2V6UxorfM1sZTOHHt/3LkUYrXFUN4q3Ce1JQJAqpIlcYukT5X8tYte UptA== X-Gm-Message-State: AOAM531e34UlEzbkp2Jq/erD+a81VJmFBZKTRftcPT9Vb8AG+7sVexJI RmgK15FzzkYh4q37VmZoMKnryw== X-Google-Smtp-Source: ABdhPJyaZ05UA4Nk36Abw5RVyDDb1ciSkKP0wmY3pLKxX2qeHryYINSqgme8/521alXputJLQ+2AEQ== X-Received: by 2002:a17:902:7042:b029:12b:2b94:30 with SMTP id h2-20020a1709027042b029012b2b940030mr7210927plt.9.1626256747422; Wed, 14 Jul 2021 02:59:07 -0700 (PDT) Received: from localhost.localdomain (80.251.214.228.16clouds.com. [80.251.214.228]) by smtp.gmail.com with ESMTPSA id g1sm2283304pgs.23.2021.07.14.02.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 02:59:07 -0700 (PDT) From: Shawn Guo To: Dmitry Torokhov Cc: Luca Weiss , Bjorn Andersson , Matteo Croce , Andrew Morton , Petr Mladek , "Rafael J . Wysocki" , linux-arm-msm@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo Subject: [PATCH v2 1/2] reboot: Export symbol 'reboot_mode' Date: Wed, 14 Jul 2021 17:58:48 +0800 Message-Id: <20210714095850.27185-2-shawn.guo@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210714095850.27185-1-shawn.guo@linaro.org> References: <20210714095850.27185-1-shawn.guo@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Some drivers like Qualcomm pm8941-pwrkey need to access 'reboot_mode' for triggering reboot between cold and warm mode. Export the symbol, so that drivers built as module can still access the symbol. Signed-off-by: Shawn Guo --- kernel/reboot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/reboot.c b/kernel/reboot.c index a6ad5eb2fa73..31bf2611ee12 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c @@ -32,6 +32,7 @@ EXPORT_SYMBOL(cad_pid); #define DEFAULT_REBOOT_MODE #endif enum reboot_mode reboot_mode DEFAULT_REBOOT_MODE; +EXPORT_SYMBOL_GPL(reboot_mode); enum reboot_mode panic_reboot_mode = REBOOT_UNDEFINED; /* From patchwork Wed Jul 14 09:58:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 12376535 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable 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 4DEBFC11F66 for ; Wed, 14 Jul 2021 09:59:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3967561358 for ; Wed, 14 Jul 2021 09:59:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239036AbhGNKCE (ORCPT ); Wed, 14 Jul 2021 06:02:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239031AbhGNKCC (ORCPT ); Wed, 14 Jul 2021 06:02:02 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F31DCC061762 for ; Wed, 14 Jul 2021 02:59:10 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id n11so1243965plc.2 for ; Wed, 14 Jul 2021 02:59:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=l1bjuoaTVbYtnhNI71QZX5Bx6fnm6uPZuv4M80rHUjI=; b=EM4ks1xnAhxy/oyMPK+YmsxsS8bDIyg6oX+je8bM1orlDBciQn00YRtWkJ0vI93Prn U8/+BVyPocLBJLw91waPql/4SmUgMaS5kDcPbxb9Pqb56PehJDlipv5vKTuglcl4oYUB BY/uh9Gt3fJZDwJL3gVTrRsLNyQoTaI3jKQxgiaUy54G3AeuLrdn8Qf931iK5E1atSz7 qNHHsRAmujlZBUVJfgVhXfUv9e9xKxY79+WaKIxRqyBNFZxkPFG8pmsVUXptDTdlI1o7 swi/NTWbePwxQwz7qTU/7E1Sqpb/Awqp8F+b9t+etHf/aiZ/PTLqyCrm9y7HhlCGp++s sToQ== 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; bh=l1bjuoaTVbYtnhNI71QZX5Bx6fnm6uPZuv4M80rHUjI=; b=cQiFeK/+Yifs3YGXNZUb8+O/Y5AghrWNN7g4f24g9dUbSM2Q1XBSkaxGuAAzo04YoT hPatpL02lM/fS++JIqArtrTUVE6fRajiRgoP3qRUD4xPJpR+8kzQBV3rh4Kuh6RuzguW ealTifjAIABapFdmeLfs3xSQu74Z2jNUuMXK4CsZlF65TbisIoK6yfYKxBI/dEJyxRMi sZjjwVe57fze0C7MuKoNuDSONIsxdMKrYoCRL6USbyGQg2WmJ1zJy6NSnajv6FvxPHpP ObcUbB73K2A++SLLY97XHZjZDX7VOUAGdZK8scVsI2/IgoCCKYecX08rj2QKezMdeqJD uWGQ== X-Gm-Message-State: AOAM531gaD866NyEuEZRvE+VoEXd+bed5qfjlbWeHgZZ7hkNZuCHaoG+ UW+JjYvAB23bX3UzJhF20KBCtw== X-Google-Smtp-Source: ABdhPJxzCVfEsbc0mVDVQlW7BG7ySqnlExnHTBB9BPUghBKax4eq63LO/nDMtA6PqW46DrcO1K6xTA== X-Received: by 2002:a17:902:d217:b029:105:e265:65c7 with SMTP id t23-20020a170902d217b0290105e26565c7mr7203320ply.16.1626256750527; Wed, 14 Jul 2021 02:59:10 -0700 (PDT) Received: from localhost.localdomain (80.251.214.228.16clouds.com. [80.251.214.228]) by smtp.gmail.com with ESMTPSA id g1sm2283304pgs.23.2021.07.14.02.59.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 02:59:10 -0700 (PDT) From: Shawn Guo To: Dmitry Torokhov Cc: Luca Weiss , Bjorn Andersson , Matteo Croce , Andrew Morton , Petr Mladek , "Rafael J . Wysocki" , linux-arm-msm@vger.kernel.org, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Shawn Guo Subject: [PATCH v2 2/2] Input: pm8941-pwrkey - Respect reboot_mode for warm reset Date: Wed, 14 Jul 2021 17:58:49 +0800 Message-Id: <20210714095850.27185-3-shawn.guo@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210714095850.27185-1-shawn.guo@linaro.org> References: <20210714095850.27185-1-shawn.guo@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On some devices, e.g. Sony Xperia M4 Aqua, warm reset is used to reboot device into bootloader and recovery mode. Instead of always doing hard reset, add a check on reboot_mode for possible warm reset. Signed-off-by: Shawn Guo Tested-by: Luca Weiss --- drivers/input/misc/pm8941-pwrkey.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/input/misc/pm8941-pwrkey.c b/drivers/input/misc/pm8941-pwrkey.c index cf8104454e74..9b14d6eb1918 100644 --- a/drivers/input/misc/pm8941-pwrkey.c +++ b/drivers/input/misc/pm8941-pwrkey.c @@ -27,6 +27,7 @@ #define PON_PS_HOLD_RST_CTL2 0x5b #define PON_PS_HOLD_ENABLE BIT(7) #define PON_PS_HOLD_TYPE_MASK 0x0f +#define PON_PS_HOLD_TYPE_WARM_RESET 1 #define PON_PS_HOLD_TYPE_SHUTDOWN 4 #define PON_PS_HOLD_TYPE_HARD_RESET 7 @@ -93,7 +94,10 @@ static int pm8941_reboot_notify(struct notifier_block *nb, break; case SYS_RESTART: default: - reset_type = PON_PS_HOLD_TYPE_HARD_RESET; + if (reboot_mode == REBOOT_WARM) + reset_type = PON_PS_HOLD_TYPE_WARM_RESET; + else + reset_type = PON_PS_HOLD_TYPE_HARD_RESET; break; }