Received: by 2002:a05:6520:4d:b0:139:a872:a4c9 with SMTP id i13csp2564002lkm; Mon, 20 Sep 2021 18:49:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyU4+IlKgdu2x3oF/3QsROxfSd65equ7YGrvpbQu+6TkYzY+pgOBblILYCdEoNKUKmSXPTh X-Received: by 2002:a17:906:520b:: with SMTP id g11mr32006092ejm.502.1632188901598; Mon, 20 Sep 2021 18:48:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632188901; cv=none; d=google.com; s=arc-20160816; b=mc5GzuaUOMWTi8wTwgAeVKUIy7j8ibYqLoUmSOM9PoHKOLjaPeI1siZv8puAlu3vaM ig/3ZeVfZBYDIwcI8fJJwqA0sQsz8DPyDGIJdOFKpUcvAAdeRs8IAJUkKCpNi9PnubFC LUs9Eu3LI79vSBtRq+Qw04JCNbNwyLgxdXE9jIsx+b/Z3K5t6JjRv20VV0SGo4uBcEx/ 4j6iYygmskcSlYyiUteOHxp/pknaD1gb78hVhP5RiqcTx+SGU6//We+AV9Qp4lV04Q0W /r99bWdEdYyirdfKJHZJJgXYr5QXE37bzUDTr1Xv3Nad8W0YAtPVL8F+Or0WNsO/c5d0 qb8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IL0gwcquawSTyjmhCTIFdp8XSsKCWnkXBat3mK5jV5Q=; b=l1NwHprFqpytTfVIeoIEshENB84xfVMuoofw2aFmAB9cNH09xBvL7DYtLLJj4h81SX DIaGdTFXGU6uHZAGhnN9jaJfyZXTndJn5mJbPIiLIpzMNr94RNYptofKznD67SUTo52u fFW/B7ZR+wps1Cm+iZPf98WXE5gE85x5NNVud0TxM4E3zcutspvUF0sBL8cq0ZL0xB3J diuaZZIv2Sd32pmD7vC1ngTKRGWKoWJYuegotRD3OUsuZouQRH5e4Z28uZzSWZJXwRhG x1t9vfjzhXsoSJnyOvzKgOJgM0iHXOGC8Dz0WciuG3E6/7pSXRYIFoou/EsrrKLs4zqc x1Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mRG8QgWA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j18si16252423ejo.373.2021.09.20.18.47.58; Mon, 20 Sep 2021 18:48:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mRG8QgWA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347679AbhITRft (ORCPT + 99 others); Mon, 20 Sep 2021 13:35:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:35392 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347948AbhITRdy (ORCPT ); Mon, 20 Sep 2021 13:33:54 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4C8CC6152B; Mon, 20 Sep 2021 17:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632157526; bh=ScMyRx5hzzycEeIp806gQ990mz42kGL2xozFShREGxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mRG8QgWA9Wn8JYbMf/7snK/PO2B9SXB/X5knp1ZE0izRT7IkFz8EJPImNuEpSKUFn SxFSl70byJTze5riAyxzVThVepU4/7wVxwGnmEt0amaWrHiIrxJdZTLS33rLZuQMQt QB2srDjnZyPGjmcWJOyptImkN5MvERKp03mKLgW0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Gortmaker , Thomas Gleixner Subject: [PATCH 4.19 030/293] x86/reboot: Limit Dell Optiplex 990 quirk to early BIOS versions Date: Mon, 20 Sep 2021 18:39:52 +0200 Message-Id: <20210920163934.298999354@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163933.258815435@linuxfoundation.org> References: <20210920163933.258815435@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Paul Gortmaker commit a729691b541f6e63043beae72e635635abe5dc09 upstream. When this platform was relatively new in November 2011, with early BIOS revisions, a reboot quirk was added in commit 6be30bb7d750 ("x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot") However, this quirk (and several others) are open-ended to all BIOS versions and left no automatic expiry if/when the system BIOS fixed the issue, meaning that nobody is likely to come along and re-test. What is really problematic with using PCI reboot as this quirk does, is that it causes this platform to do a full power down, wait one second, and then power back on. This is less than ideal if one is using it for boot testing and/or bisecting kernels when legacy rotating hard disks are installed. It was only by chance that the quirk was noticed in dmesg - and when disabled it turned out that it wasn't required anymore (BIOS A24), and a default reboot would work fine without the "harshness" of power cycling the machine (and disks) down and up like the PCI reboot does. Doing a bit more research, it seems that the "newest" BIOS for which the issue was reported[1] was version A06, however Dell[2] seemed to suggest only up to and including version A05, with the A06 having a large number of fixes[3] listed. As is typical with a new platform, the initial BIOS updates come frequently and then taper off (and in this case, with a revival for CPU CVEs); a search for O990-A.exe reveals the following dates: A02 16 Mar 2011 A03 11 May 2011 A06 14 Sep 2011 A07 24 Oct 2011 A10 08 Dec 2011 A14 06 Sep 2012 A16 15 Oct 2012 A18 30 Sep 2013 A19 23 Sep 2015 A20 02 Jun 2017 A23 07 Mar 2018 A24 21 Aug 2018 While it's overkill to flash and test each of the above, it would seem likely that the issue was contained within A0x BIOS versions, given the dates above and the dates of issue reports[4] from distros. So rather than just throw out the quirk entirely, limit the scope to just those early BIOS versions, in case people are still running systems from 2011 with the original as-shipped early A0x BIOS versions. [1] https://lore.kernel.org/lkml/1320373471-3942-1-git-send-email-trenn@suse.de/ [2] https://www.dell.com/support/kbdoc/en-ca/000131908/linux-based-operating-systems-stall-upon-reboot-on-optiplex-390-790-990-systems [3] https://www.dell.com/support/home/en-ca/drivers/driversdetails?driverid=85j10 [4] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/768039 Fixes: 6be30bb7d750 ("x86/reboot: Blacklist Dell OptiPlex 990 known to require PCI reboot") Signed-off-by: Paul Gortmaker Signed-off-by: Thomas Gleixner Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20210530162447.996461-4-paul.gortmaker@windriver.com Signed-off-by: Greg Kroah-Hartman --- arch/x86/kernel/reboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -388,10 +388,11 @@ static const struct dmi_system_id reboot }, { /* Handle problems with rebooting on the OptiPlex 990. */ .callback = set_pci_reboot, - .ident = "Dell OptiPlex 990", + .ident = "Dell OptiPlex 990 BIOS A0x", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "OptiPlex 990"), + DMI_MATCH(DMI_BIOS_VERSION, "A0"), }, }, { /* Handle problems with rebooting on Dell 300's */