0ba10bc752
Removed check to prevent hotplug of display devices within shpchp. Originally this was thought to have been required within the PCI Hotplug specification for some legacy devices. However there is no such requirement in the most recent revision. The check prevents hotplug of not only display devices but also computational GPUs which require serviceability. Signed-off-by: Praveen Kalamegham <praveen@nextio.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
133 lines
3.6 KiB
C
133 lines
3.6 KiB
C
/*
|
|
* Standard Hot Plug Controller Driver
|
|
*
|
|
* Copyright (C) 1995,2001 Compaq Computer Corporation
|
|
* Copyright (C) 2001 Greg Kroah-Hartman (greg@kroah.com)
|
|
* Copyright (C) 2001 IBM Corp.
|
|
* Copyright (C) 2003-2004 Intel Corporation
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
* Send feedback to <greg@kroah.com>, <kristen.c.accardi@intel.com>
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/types.h>
|
|
#include <linux/pci.h>
|
|
#include "../pci.h"
|
|
#include "shpchp.h"
|
|
|
|
int __ref shpchp_configure_device(struct slot *p_slot)
|
|
{
|
|
struct pci_dev *dev;
|
|
struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;
|
|
int num, fn;
|
|
struct controller *ctrl = p_slot->ctrl;
|
|
|
|
dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0));
|
|
if (dev) {
|
|
ctrl_err(ctrl, "Device %s already exists "
|
|
"at %04x:%02x:%02x, cannot hot-add\n", pci_name(dev),
|
|
pci_domain_nr(parent), p_slot->bus, p_slot->device);
|
|
pci_dev_put(dev);
|
|
return -EINVAL;
|
|
}
|
|
|
|
num = pci_scan_slot(parent, PCI_DEVFN(p_slot->device, 0));
|
|
if (num == 0) {
|
|
ctrl_err(ctrl, "No new device found\n");
|
|
return -ENODEV;
|
|
}
|
|
|
|
for (fn = 0; fn < 8; fn++) {
|
|
dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, fn));
|
|
if (!dev)
|
|
continue;
|
|
if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
|
|
(dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
|
|
/* Find an unused bus number for the new bridge */
|
|
struct pci_bus *child;
|
|
unsigned char busnr, start = parent->secondary;
|
|
unsigned char end = parent->subordinate;
|
|
for (busnr = start; busnr <= end; busnr++) {
|
|
if (!pci_find_bus(pci_domain_nr(parent),
|
|
busnr))
|
|
break;
|
|
}
|
|
if (busnr > end) {
|
|
ctrl_err(ctrl,
|
|
"No free bus for hot-added bridge\n");
|
|
pci_dev_put(dev);
|
|
continue;
|
|
}
|
|
child = pci_add_new_bus(parent, dev, busnr);
|
|
if (!child) {
|
|
ctrl_err(ctrl, "Cannot add new bus for %s\n",
|
|
pci_name(dev));
|
|
pci_dev_put(dev);
|
|
continue;
|
|
}
|
|
child->subordinate = pci_do_scan_bus(child);
|
|
pci_bus_size_bridges(child);
|
|
}
|
|
pci_configure_slot(dev);
|
|
pci_dev_put(dev);
|
|
}
|
|
|
|
pci_bus_assign_resources(parent);
|
|
pci_bus_add_devices(parent);
|
|
pci_enable_bridges(parent);
|
|
return 0;
|
|
}
|
|
|
|
int shpchp_unconfigure_device(struct slot *p_slot)
|
|
{
|
|
int rc = 0;
|
|
int j;
|
|
u8 bctl = 0;
|
|
struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;
|
|
struct controller *ctrl = p_slot->ctrl;
|
|
|
|
ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:%02x\n",
|
|
__func__, pci_domain_nr(parent), p_slot->bus, p_slot->device);
|
|
|
|
for (j = 0; j < 8 ; j++) {
|
|
struct pci_dev *temp = pci_get_slot(parent,
|
|
(p_slot->device << 3) | j);
|
|
if (!temp)
|
|
continue;
|
|
if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
|
|
pci_read_config_byte(temp, PCI_BRIDGE_CONTROL, &bctl);
|
|
if (bctl & PCI_BRIDGE_CTL_VGA) {
|
|
ctrl_err(ctrl,
|
|
"Cannot remove display device %s\n",
|
|
pci_name(temp));
|
|
pci_dev_put(temp);
|
|
rc = -EINVAL;
|
|
break;
|
|
}
|
|
}
|
|
pci_remove_bus_device(temp);
|
|
pci_dev_put(temp);
|
|
}
|
|
return rc;
|
|
}
|
|
|