linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "tip-bot2 for Paul Gortmaker" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/misc] x86/reboot: Document the "reboot=pci" option
Date: Thu, 12 Aug 2021 10:09:43 -0000	[thread overview]
Message-ID: <162876298363.395.15945425696843293640.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210530162447.996461-2-paul.gortmaker@windriver.com>

The following commit has been merged into the x86/misc branch of tip:

Commit-ID:     162a5284faf41b2441b8f686f9ac4771c7a8f669
Gitweb:        https://git.kernel.org/tip/162a5284faf41b2441b8f686f9ac4771c7a8f669
Author:        Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate:    Sun, 30 May 2021 12:24:45 -04:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 12 Aug 2021 12:06:58 +02:00

x86/reboot: Document the "reboot=pci" option

It is mentioned in the top level non-arch specific file but it was
overlooked here for x86.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20210530162447.996461-2-paul.gortmaker@windriver.com

---
 Documentation/x86/x86_64/boot-options.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Documentation/x86/x86_64/boot-options.rst b/Documentation/x86/x86_64/boot-options.rst
index 5f62b3b..482f3b2 100644
--- a/Documentation/x86/x86_64/boot-options.rst
+++ b/Documentation/x86/x86_64/boot-options.rst
@@ -126,7 +126,7 @@ Idle loop
 Rebooting
 =========
 
-   reboot=b[ios] | t[riple] | k[bd] | a[cpi] | e[fi] [, [w]arm | [c]old]
+   reboot=b[ios] | t[riple] | k[bd] | a[cpi] | e[fi] | p[ci] [, [w]arm | [c]old]
       bios
         Use the CPU reboot vector for warm reset
       warm
@@ -145,6 +145,8 @@ Rebooting
         Use efi reset_system runtime service. If EFI is not configured or
         the EFI reset does not work, the reboot path attempts the reset using
         the keyboard controller.
+      pci
+        Use a write to the PCI config space register 0xcf9 to trigger reboot.
 
    Using warm reset will be much faster especially on big memory
    systems because the BIOS will not go through the memory check.

  reply	other threads:[~2021-08-12 10:11 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-30 16:24 [PATCH 0/3] x86/reboot: update docs and limit O990 quirk scope Paul Gortmaker
2021-05-30 16:24 ` [PATCH 1/3] x86/reboot: document the "reboot=pci" option Paul Gortmaker
2021-08-12 10:09   ` tip-bot2 for Paul Gortmaker [this message]
2021-05-30 16:24 ` [PATCH 2/3] x86/reboot: document how to override DMI platform quirks Paul Gortmaker
2021-08-12 10:09   ` [tip: x86/misc] x86/reboot: Document " tip-bot2 for Paul Gortmaker
2021-05-30 16:24 ` [PATCH 3/3] x86/reboot: Limit Dell Optiplex 990 quirk to early BIOS versions Paul Gortmaker
2021-08-12 10:09   ` [tip: x86/misc] " tip-bot2 for Paul Gortmaker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=162876298363.395.15945425696843293640.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=paul.gortmaker@windriver.com \
    --cc=tglx@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).