Message ID | 20210305120850.050003627@linuxfoundation.org |
---|---|
State | Superseded |
Headers | show
Return-Path: <stable-owner@kernel.org> 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,DKIMWL_WL_HIGH, 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 194FBC4332B for <stable@archiver.kernel.org>; Fri, 5 Mar 2021 12:43:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D855C6504F for <stable@archiver.kernel.org>; Fri, 5 Mar 2021 12:43:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233811AbhCEMnY (ORCPT <rfc822;stable@archiver.kernel.org>); Fri, 5 Mar 2021 07:43:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:59826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233226AbhCEMmz (ORCPT <rfc822;stable@vger.kernel.org>); Fri, 5 Mar 2021 07:42:55 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0A6096501E; Fri, 5 Mar 2021 12:42:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1614948175; bh=tFkfdwxQSzBRUpSSD3kWovOB+FE2A9uvB/+Zzy2oG4s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JupqNueuV8y8DqEsHD4xaSNfwhXxMy49Yq8VuT3ou1BuNJDknrr5GIT6uXiiZvHck es32Qw4B3aHCqS0YF9L5ttORZtaYLgIGIyzDsAMU9V7tGsj2wEAiGnwSylDA1Jq90m mWdCSCW+G5EQT4eFVJA2PoQjdXhicQxkH192krqA= From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Heiner Kallweit <hkallweit1@gmail.com>, Borislav Petkov <bp@suse.de>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.4 13/30] x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk Date: Fri, 5 Mar 2021 13:22:42 +0100 Message-Id: <20210305120850.050003627@linuxfoundation.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305120849.381261651@linuxfoundation.org> References: <20210305120849.381261651@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: <stable.vger.kernel.org> X-Mailing-List: stable@vger.kernel.org |
Series |
None
|
expand
|
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index cbe14f7c2826..1c2451107e49 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -418,6 +418,15 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { }, }, + { /* PCIe Wifi card isn't detected after reboot otherwise */ + .callback = set_pci_reboot, + .ident = "Zotac ZBOX CI327 nano", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "NA"), + DMI_MATCH(DMI_PRODUCT_NAME, "ZBOX-CI327NANO-GS-01"), + }, + }, + /* Sony */ { /* Handle problems with rebooting on Sony VGN-Z540N */ .callback = set_bios_reboot,