fcbed0bcb2
Iterate through devices in a slot by using the upstream bridge's "bus->devices" list instead of assuming they are functions 0-7. It's possible there are several slots on the same pci_bus, so restrict it to only devices matching this slot's device number. ARI (which allows functions 0-255) is a PCIe-only feature, and this is a PCI hotplug driver, so we shouldn't find anything other than functions 0-7, but it's better to iterate the same way as other hotplug drivers. [bhelgaas: changelog, check PCI_SLOT, fix shpchp_unconfigure_device()] Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
113 lines
3.1 KiB
C
113 lines
3.1 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 controller *ctrl = p_slot->ctrl;
|
|
struct pci_dev *bridge = ctrl->pci_dev;
|
|
struct pci_bus *parent = bridge->subordinate;
|
|
int num;
|
|
|
|
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;
|
|
}
|
|
|
|
list_for_each_entry(dev, &parent->devices, bus_list) {
|
|
if (PCI_SLOT(dev->devfn) != p_slot->device)
|
|
continue;
|
|
if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
|
|
(dev->hdr_type == PCI_HEADER_TYPE_CARDBUS))
|
|
pci_hp_add_bridge(dev);
|
|
}
|
|
|
|
pci_assign_unassigned_bridge_resources(bridge);
|
|
|
|
list_for_each_entry(dev, &parent->devices, bus_list) {
|
|
if (PCI_SLOT(dev->devfn) != p_slot->device)
|
|
continue;
|
|
pci_configure_slot(dev);
|
|
}
|
|
|
|
pci_bus_add_devices(parent);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int shpchp_unconfigure_device(struct slot *p_slot)
|
|
{
|
|
int rc = 0;
|
|
u8 bctl = 0;
|
|
struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;
|
|
struct pci_dev *dev, *temp;
|
|
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);
|
|
|
|
list_for_each_entry_safe(dev, temp, &parent->devices, bus_list) {
|
|
if (PCI_SLOT(dev->devfn) != p_slot->device)
|
|
continue;
|
|
|
|
pci_dev_get(dev);
|
|
if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
|
|
pci_read_config_byte(dev, PCI_BRIDGE_CONTROL, &bctl);
|
|
if (bctl & PCI_BRIDGE_CTL_VGA) {
|
|
ctrl_err(ctrl,
|
|
"Cannot remove display device %s\n",
|
|
pci_name(dev));
|
|
pci_dev_put(dev);
|
|
rc = -EINVAL;
|
|
break;
|
|
}
|
|
}
|
|
pci_stop_and_remove_bus_device(dev);
|
|
pci_dev_put(dev);
|
|
}
|
|
return rc;
|
|
}
|
|
|