From patchwork Thu Oct 24 06:49:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lan,Tianyu" X-Patchwork-Id: 3090271 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 26A6C9F372 for ; Thu, 24 Oct 2013 07:02:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F195220439 for ; Thu, 24 Oct 2013 07:01:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D167B20176 for ; Thu, 24 Oct 2013 07:01:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753987Ab3JXHBG (ORCPT ); Thu, 24 Oct 2013 03:01:06 -0400 Received: from mga03.intel.com ([143.182.124.21]:39589 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751359Ab3JXHBF (ORCPT ); Thu, 24 Oct 2013 03:01:05 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by azsmga101.ch.intel.com with ESMTP; 24 Oct 2013 00:01:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,560,1378882800"; d="scan'208";a="416191202" Received: from lantianyu-ws.sh.intel.com (HELO localhost) ([10.239.37.18]) by fmsmga001.fm.intel.com with ESMTP; 24 Oct 2013 00:01:02 -0700 From: tianyu.lan@intel.com To: mingo@kernel.org, hpa@zytor.com, x86@kernel.org, holt@sgi.com, davej@fedoraproject.org, lenb@kernel.org, rjw@rjwysocki.net, awilliam@redhat.com Cc: Lan Tianyu , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] x86/ACPI: Make Sony Vaio Z1 series to use "reboot=pci" default Date: Thu, 24 Oct 2013 14:49:37 +0800 Message-Id: <1382597377-26797-1-git-send-email-tianyu.lan@intel.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Lan Tianyu Sony Vaio Z1 series require "reboot=pci" for reboot and power off. This patch is to add them machines to quirk table and set pci reboot default. Reference: https://bugzilla.kernel.org/show_bug.cgi?id=61721 Reported-and-tested-by: Adam Williamson Signed-off-by: Lan Tianyu --- arch/x86/kernel/reboot.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 7e920bf..083ade7 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -382,6 +382,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "C6100"), }, }, + { /* Handle problems with rebooting on Sony Vaio Z1 series*/ + .callback = set_pci_reboot, + .ident = "Sony Vaio Z1", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VPCZ1"), + }, + }, { } };