PCI: pciehp: cleanup flow in pciehp_configure_device
[linux-2.6/kvm.git] / drivers / pci / hotplug / pciehp_pci.c
blob0a16444c14c9d46d80ad391d5759cc27e0ab19f9
1 /*
2 * PCI Express Hot Plug Controller Driver
4 * Copyright (C) 1995,2001 Compaq Computer Corporation
5 * Copyright (C) 2001 Greg Kroah-Hartman (greg@kroah.com)
6 * Copyright (C) 2001 IBM Corp.
7 * Copyright (C) 2003-2004 Intel Corporation
9 * All rights reserved.
11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or (at
14 * your option) any later version.
16 * This program is distributed in the hope that it will be useful, but
17 * WITHOUT ANY WARRANTY; without even the implied warranty of
18 * MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
19 * NON INFRINGEMENT. See the GNU General Public License for more
20 * details.
22 * You should have received a copy of the GNU General Public License
23 * along with this program; if not, write to the Free Software
24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 * Send feedback to <greg@kroah.com>, <kristen.c.accardi@intel.com>
30 #include <linux/module.h>
31 #include <linux/kernel.h>
32 #include <linux/types.h>
33 #include <linux/pci.h>
34 #include "../pci.h"
35 #include "pciehp.h"
37 static int __ref pciehp_add_bridge(struct pci_dev *dev)
39 struct pci_bus *parent = dev->bus;
40 int pass, busnr, start = parent->secondary;
41 int end = parent->subordinate;
43 for (busnr = start; busnr <= end; busnr++) {
44 if (!pci_find_bus(pci_domain_nr(parent), busnr))
45 break;
47 if (busnr-- > end) {
48 err("No bus number available for hot-added bridge %s\n",
49 pci_name(dev));
50 return -1;
52 for (pass = 0; pass < 2; pass++)
53 busnr = pci_scan_bridge(parent, dev, busnr, pass);
54 if (!dev->subordinate)
55 return -1;
57 return 0;
60 int pciehp_configure_device(struct slot *p_slot)
62 struct pci_dev *dev;
63 struct pci_dev *bridge = p_slot->ctrl->pcie->port;
64 struct pci_bus *parent = bridge->subordinate;
65 int num, fn;
66 struct controller *ctrl = p_slot->ctrl;
68 dev = pci_get_slot(parent, PCI_DEVFN(0, 0));
69 if (dev) {
70 ctrl_err(ctrl, "Device %s already exists "
71 "at %04x:%02x:00, cannot hot-add\n", pci_name(dev),
72 pci_domain_nr(parent), parent->number);
73 pci_dev_put(dev);
74 return -EINVAL;
77 num = pci_scan_slot(parent, PCI_DEVFN(0, 0));
78 if (num == 0) {
79 ctrl_err(ctrl, "No new device found\n");
80 return -ENODEV;
83 for (fn = 0; fn < 8; fn++) {
84 dev = pci_get_slot(parent, PCI_DEVFN(0, fn));
85 if (!dev)
86 continue;
87 if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
88 ctrl_err(ctrl, "Cannot hot-add display device %s\n",
89 pci_name(dev));
90 pci_dev_put(dev);
91 continue;
93 if ((dev->hdr_type == PCI_HEADER_TYPE_BRIDGE) ||
94 (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)) {
95 pciehp_add_bridge(dev);
97 pci_dev_put(dev);
100 pci_assign_unassigned_bridge_resources(bridge);
102 for (fn = 0; fn < 8; fn++) {
103 dev = pci_get_slot(parent, PCI_DEVFN(0, fn));
104 if (!dev)
105 continue;
106 if ((dev->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
107 pci_dev_put(dev);
108 continue;
110 pci_configure_slot(dev);
111 pci_dev_put(dev);
114 pci_bus_add_devices(parent);
116 return 0;
119 int pciehp_unconfigure_device(struct slot *p_slot)
121 int ret, rc = 0;
122 int j;
123 u8 bctl = 0;
124 u8 presence = 0;
125 struct pci_bus *parent = p_slot->ctrl->pcie->port->subordinate;
126 u16 command;
127 struct controller *ctrl = p_slot->ctrl;
129 ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:00\n",
130 __func__, pci_domain_nr(parent), parent->number);
131 ret = pciehp_get_adapter_status(p_slot, &presence);
132 if (ret)
133 presence = 0;
135 for (j = 0; j < 8; j++) {
136 struct pci_dev* temp = pci_get_slot(parent, PCI_DEVFN(0, j));
137 if (!temp)
138 continue;
139 if ((temp->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
140 ctrl_err(ctrl, "Cannot remove display device %s\n",
141 pci_name(temp));
142 pci_dev_put(temp);
143 continue;
145 if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE && presence) {
146 pci_read_config_byte(temp, PCI_BRIDGE_CONTROL, &bctl);
147 if (bctl & PCI_BRIDGE_CTL_VGA) {
148 ctrl_err(ctrl,
149 "Cannot remove display device %s\n",
150 pci_name(temp));
151 pci_dev_put(temp);
152 continue;
155 pci_remove_bus_device(temp);
157 * Ensure that no new Requests will be generated from
158 * the device.
160 if (presence) {
161 pci_read_config_word(temp, PCI_COMMAND, &command);
162 command &= ~(PCI_COMMAND_MASTER | PCI_COMMAND_SERR);
163 command |= PCI_COMMAND_INTX_DISABLE;
164 pci_write_config_word(temp, PCI_COMMAND, command);
166 pci_dev_put(temp);
169 return rc;