From patchwork Fri Mar 25 19:56:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Lane X-Patchwork-Id: 1609553 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=GhcFsyvj; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KQCXp06tKz9sFt for ; Sat, 26 Mar 2022 06:56:56 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1nXq3A-0000o0-00; Fri, 25 Mar 2022 19:56:43 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1nXq38-0000nm-EO for kernel-team@lists.ubuntu.com; Fri, 25 Mar 2022 19:56:42 +0000 Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 8FD6A3F1E0 for ; Fri, 25 Mar 2022 19:56:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1648238201; bh=J1L02PZ53CpuR0rzw4UxjQvwav+QQLJ25bknB1pUeYs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=GhcFsyvjIcXYIHe7XoBjoJvkzZTUS+t+ZpRW5By9WYLA82zJDSc6fD+v2EGLmT6B6 AVt8PsEFtbnYmjXpagIFQ/UT71jWz6xkAv0eOHAVkwsEgCFowSFaeWGCExS6hXpWl5 b+EXdMLZz04X6sFRbJLQyPulYvqGpidCcAQ2T2Zz9+1l6B1QS461A4HOeKiJ6SGgcu Ir4Bhp9N6rlp7ZVJIM49BWgf7+tkpr7ZuIHQYmWMhA5npLUQm2ln9EYHARLykbU2PP IXJTPEVF2oGHD50skpBTVF/BrN0EkxzVz+KDt4jMC8eCpRx4viib6mWRstUCn8FyfQ V5Bgy5ZXw0egA== Received: by mail-qt1-f198.google.com with SMTP id y23-20020ac85257000000b002e06697f2ebso6835094qtn.16 for ; Fri, 25 Mar 2022 12:56:41 -0700 (PDT) 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=J1L02PZ53CpuR0rzw4UxjQvwav+QQLJ25bknB1pUeYs=; b=Dn6FAeyyiHxFMGNthsS71W0TTelsJf0EIgWPRykQBUnz7rXhgy5xqcpKN3mP1w8FuZ vtVe/CkA6HBxHCf4/zuJ+Q/3+5zmMM0EGLk44PXbwobNyGZYykfeZHnVebDCSZUB1ThZ iEiUPVTSMz0kPZd9EDHQxdH7PSpODRKiZJuPH2x8QIb7eQWaeTo4HcxsYqDcfsI7NRd4 gpO5Nj8Z97y2OqjFoUWhI1Hy0iwop4ctRf+8uAlJfyu7mOjT0W7F0PavZeUe2+7z4i4M Vx/jeAkvY0wQOUo90G8BO9qNLJOMjewA45mmtpOe7+YYGYLm9sIi5oTuUqM0jCDdDrwA K04A== X-Gm-Message-State: AOAM532JmGZU2I/GRGk/z7gdDewcOfeyPpiq+hvz3+hm16e+nQ92iqDy ReLEz2yH4CsciKNkU5Adyi3m+WpTdwCppuraVuw4vi6CjTtLf/oYvPiNRwEB3ieVGMgdmBfs5Gy HUFXjCobxok8rj+127pzKTDd95OhcSJ98CjM3CuPNrQ== X-Received: by 2002:ac8:5a95:0:b0:2e2:e4f:63c with SMTP id c21-20020ac85a95000000b002e20e4f063cmr11293448qtc.537.1648238200306; Fri, 25 Mar 2022 12:56:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMJKL8vg2E+s1lHGgjWvI9BcpX9hBYDZSEuj0NJICJpHgTsp2ywl7oVnHrEOMTpQbNXeZnbA== X-Received: by 2002:ac8:5a95:0:b0:2e2:e4f:63c with SMTP id c21-20020ac85a95000000b002e20e4f063cmr11293426qtc.537.1648238199999; Fri, 25 Mar 2022 12:56:39 -0700 (PDT) Received: from localhost.localdomain ([71.217.161.186]) by smtp.gmail.com with ESMTPSA id c17-20020ac85a91000000b002e1dd8ae44bsm5839582qtc.29.2022.03.25.12.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Mar 2022 12:56:39 -0700 (PDT) From: Jeff Lane To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/1] Revert "PM: ACPI: reboot: Use S5 for reboot" Date: Fri, 25 Mar 2022 15:56:34 -0400 Message-Id: <20220325195634.3817039-2-jeffrey.lane@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220325195634.3817039-1-jeffrey.lane@canonical.com> References: <20220325195634.3817039-1-jeffrey.lane@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jeff@ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Josef Bacik BugLink: https://bugs.launchpad.net/bugs/1917471 This reverts commit d60cd06331a3566d3305b3c7b566e79edf4e2095. This patch causes a panic when rebooting my Dell Poweredge r440. I do not have the full panic log as it's lost at that stage of the reboot and I do not have a serial console. Reverting this patch makes my system able to reboot again. Signed-off-by: Josef Bacik Signed-off-by: Rafael J. Wysocki (cherry picked from commit 9d3fcb28f9b9750b474811a2964ce022df56336e) Signed-off-by: Jeff Lane --- kernel/reboot.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/kernel/reboot.c b/kernel/reboot.c index 838e4310e01c..ac19159d7158 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c @@ -244,8 +244,6 @@ void migrate_to_reboot_cpu(void) void kernel_restart(char *cmd) { kernel_restart_prepare(cmd); - if (pm_power_off_prepare) - pm_power_off_prepare(); migrate_to_reboot_cpu(); syscore_shutdown(); if (!cmd)