Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758955AbYCQUGl (ORCPT ); Mon, 17 Mar 2008 16:06:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758211AbYCQUE1 (ORCPT ); Mon, 17 Mar 2008 16:04:27 -0400 Received: from rtr.ca ([76.10.145.34]:4335 "EHLO mail.rtr.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758198AbYCQUEZ (ORCPT ); Mon, 17 Mar 2008 16:04:25 -0400 Message-ID: <47DECEC7.6070005@rtr.ca> Date: Mon, 17 Mar 2008 16:04:23 -0400 From: Mark Lord Organization: Real-Time Remedies Inc. User-Agent: Thunderbird 2.0.0.12 (X11/20080213) MIME-Version: 1.0 To: kristen.c.accardi@intel.com, linux-kernel@vger.kernel.org, Andrew Morton Cc: Alex Chiang , Linus Torvalds , Greg KH Subject: [PATCH] pciehp dont enable slot unless forced References: <20080312064755.GA31493@ldl.fc.hp.com> <47D8142E.6060305@pobox.com> <20080317195317.GE6808@ldl.fc.hp.com> In-Reply-To: <20080317195317.GE6808@ldl.fc.hp.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1508 Lines: 38 This fixes a 2.6.25 regression reported by Alex Chiang. Invoke pciehp_enable_slot() at startup only when pciehp_force=1. Some HP equipment apparently cannot cope with it otherwise. This restores the (previously working) 2.6.24 behaviour here, while allowing machines that need a kick to use pciehp_force=1. This was the original design back in October 2007, but Kristen suggested we try without it first: Kristen Carlson Accardi wrote: >I think it would be ok to try allowing the slot to be enabled when not >using pciehp_force mode. We can wrap it later if it proves to break things This ended up breaking one of Alex's setups, so it's time to put the wrapper back in now. Signed-off-by: Mark Lord Acked-by: Alex Chiang --- --- old/drivers/pci/hotplug/pciehp_core.c 2008-03-12 13:21:46.000000000 -0400 +++ linux/drivers/pci/hotplug/pciehp_core.c 2008-03-12 13:23:54.000000000 -0400 @@ -467,7 +467,7 @@ t_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset); t_slot->hpc_ops->get_adapter_status(t_slot, &value); /* Check if slot is occupied */ - if (value) { + if (value && pciehp_force) { rc = pciehp_enable_slot(t_slot); if (rc) /* -ENODEV: shouldn't happen, but deal with it */ value = 0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/