ia64/linux-2.6.18-xen.hg

annotate drivers/pci/setup-res.c @ 815:f0dd7eb92bc9

Backport: PCI: remove unnecessary arg of pci_update_resource()

commit 14add80b5120966fe0659d61815b9e9b4b68fdc5
Author: Yu Zhao <yu.zhao@intel.com>
Date: Sat Nov 22 02:38:52 2008 +0800

PCI: remove unnecessary arg of pci_update_resource()

This cleanup removes unnecessary argument 'struct resource *res'
in
pci_update_resource(), so it takes same arguments as other
companion
functions (pci_assign_resource(), etc.).

Signed-off-by: Yu Zhao <yu.zhao@intel.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

Signed-off-by: Yu Zhao <yu.zhao@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Fri Mar 13 07:42:13 2009 +0000 (2009-03-13)
parents cfb171ddbb33
children 13a42de2f9c5
rev   line source
ian@0 1 /*
ian@0 2 * drivers/pci/setup-res.c
ian@0 3 *
ian@0 4 * Extruded from code written by
ian@0 5 * Dave Rusling (david.rusling@reo.mts.dec.com)
ian@0 6 * David Mosberger (davidm@cs.arizona.edu)
ian@0 7 * David Miller (davem@redhat.com)
ian@0 8 *
ian@0 9 * Support routines for initializing a PCI subsystem.
ian@0 10 */
ian@0 11
ian@0 12 /* fixed for multiple pci buses, 1999 Andrea Arcangeli <andrea@suse.de> */
ian@0 13
ian@0 14 /*
ian@0 15 * Nov 2000, Ivan Kokshaysky <ink@jurassic.park.msu.ru>
ian@0 16 * Resource sorting
ian@0 17 */
ian@0 18
ian@0 19 #include <linux/init.h>
ian@0 20 #include <linux/kernel.h>
ian@0 21 #include <linux/pci.h>
ian@0 22 #include <linux/errno.h>
ian@0 23 #include <linux/ioport.h>
ian@0 24 #include <linux/cache.h>
ian@0 25 #include <linux/slab.h>
ian@0 26 #include "pci.h"
ian@0 27
ian@0 28
ian@0 29 void
keir@815 30 pci_update_resource(struct pci_dev *dev, int resno)
ian@0 31 {
ian@0 32 struct pci_bus_region region;
ian@0 33 u32 new, check, mask;
ian@0 34 int reg;
keir@815 35 struct resource *res = dev->resource + resno;
ian@0 36
ian@0 37 /* Ignore resources for unimplemented BARs and unused resource slots
ian@0 38 for 64 bit BARs. */
ian@0 39 if (!res->flags)
ian@0 40 return;
ian@0 41
ian@0 42 pcibios_resource_to_bus(dev, &region, res);
ian@0 43
ian@0 44 pr_debug(" got res [%llx:%llx] bus [%lx:%lx] flags %lx for "
ian@0 45 "BAR %d of %s\n", (unsigned long long)res->start,
ian@0 46 (unsigned long long)res->end,
ian@0 47 region.start, region.end, res->flags, resno, pci_name(dev));
ian@0 48
ian@0 49 new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
ian@0 50 if (res->flags & IORESOURCE_IO)
ian@0 51 mask = (u32)PCI_BASE_ADDRESS_IO_MASK;
ian@0 52 else
ian@0 53 mask = (u32)PCI_BASE_ADDRESS_MEM_MASK;
ian@0 54
ian@0 55 if (resno < 6) {
ian@0 56 reg = PCI_BASE_ADDRESS_0 + 4 * resno;
ian@0 57 } else if (resno == PCI_ROM_RESOURCE) {
ian@0 58 if (!(res->flags & IORESOURCE_ROM_ENABLE))
ian@0 59 return;
ian@0 60 new |= PCI_ROM_ADDRESS_ENABLE;
ian@0 61 reg = dev->rom_base_reg;
ian@0 62 } else {
ian@0 63 /* Hmm, non-standard resource. */
ian@0 64
ian@0 65 return; /* kill uninitialised var warning */
ian@0 66 }
ian@0 67
ian@0 68 pci_write_config_dword(dev, reg, new);
ian@0 69 pci_read_config_dword(dev, reg, &check);
ian@0 70
ian@0 71 if ((new ^ check) & mask) {
ian@0 72 printk(KERN_ERR "PCI: Error while updating region "
ian@0 73 "%s/%d (%08x != %08x)\n", pci_name(dev), resno,
ian@0 74 new, check);
ian@0 75 }
ian@0 76
ian@0 77 if ((new & (PCI_BASE_ADDRESS_SPACE|PCI_BASE_ADDRESS_MEM_TYPE_MASK)) ==
ian@0 78 (PCI_BASE_ADDRESS_SPACE_MEMORY|PCI_BASE_ADDRESS_MEM_TYPE_64)) {
ian@0 79 new = region.start >> 16 >> 16;
ian@0 80 pci_write_config_dword(dev, reg + 4, new);
ian@0 81 pci_read_config_dword(dev, reg + 4, &check);
ian@0 82 if (check != new) {
ian@0 83 printk(KERN_ERR "PCI: Error updating region "
ian@0 84 "%s/%d (high %08x != %08x)\n",
ian@0 85 pci_name(dev), resno, new, check);
ian@0 86 }
ian@0 87 }
ian@0 88 res->flags &= ~IORESOURCE_UNSET;
ian@0 89 pr_debug("PCI: moved device %s resource %d (%lx) to %x\n",
ian@0 90 pci_name(dev), resno, res->flags,
ian@0 91 new & ~PCI_REGION_FLAG_MASK);
ian@0 92 }
ian@0 93
ian@0 94 int __devinit
ian@0 95 pci_claim_resource(struct pci_dev *dev, int resource)
ian@0 96 {
ian@0 97 struct resource *res = &dev->resource[resource];
ian@0 98 struct resource *root = NULL;
ian@0 99 char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
ian@0 100 int err;
ian@0 101
ian@0 102 root = pcibios_select_root(dev, res);
ian@0 103
ian@0 104 err = -EINVAL;
ian@0 105 if (root != NULL)
ian@0 106 err = insert_resource(root, res);
ian@0 107
ian@0 108 if (err) {
ian@0 109 printk(KERN_ERR "PCI: %s region %d of %s %s [%llx:%llx]\n",
ian@0 110 root ? "Address space collision on" :
ian@0 111 "No parent found for",
ian@0 112 resource, dtype, pci_name(dev),
ian@0 113 (unsigned long long)res->start,
ian@0 114 (unsigned long long)res->end);
ian@0 115 }
ian@0 116
ian@0 117 return err;
ian@0 118 }
ian@0 119 EXPORT_SYMBOL_GPL(pci_claim_resource);
ian@0 120
keir@701 121 #ifdef CONFIG_PCI_REASSIGN
keir@702 122 void pci_disable_bridge_window(struct pci_dev *dev)
keir@696 123 {
keir@702 124 printk(KERN_DEBUG "PCI: Disable bridge window on %s\n", pci_name(dev));
keir@702 125
keir@702 126 /* MMIO Base/Limit */
keir@702 127 pci_write_config_dword(dev, PCI_MEMORY_BASE, 0x0000fff0);
keir@702 128
keir@702 129 /* Prefetchable MMIO Base/Limit */
keir@702 130 pci_write_config_dword(dev, PCI_PREF_LIMIT_UPPER32, 0);
keir@702 131 pci_write_config_dword(dev, PCI_PREF_MEMORY_BASE, 0x0000fff0);
keir@702 132 pci_write_config_dword(dev, PCI_PREF_BASE_UPPER32, 0xffffffff);
keir@696 133 }
keir@701 134 #endif
keir@696 135
ian@0 136 int pci_assign_resource(struct pci_dev *dev, int resno)
ian@0 137 {
ian@0 138 struct pci_bus *bus = dev->bus;
ian@0 139 struct resource *res = dev->resource + resno;
ian@0 140 resource_size_t size, min, align;
ian@0 141 int ret;
keir@771 142 int reassigndev = pci_is_reassigndev(dev);
ian@0 143
ian@0 144 size = res->end - res->start + 1;
ian@0 145 min = (res->flags & IORESOURCE_IO) ? PCIBIOS_MIN_IO : PCIBIOS_MIN_MEM;
ian@0 146 /* The bridge resources are special, as their
ian@0 147 size != alignment. Sizing routines return
ian@0 148 required alignment in the "start" field. */
keir@696 149 if (resno < PCI_BRIDGE_RESOURCES) {
keir@696 150 align = size;
keir@696 151 if ((reassigndev) &&
keir@696 152 (res->flags & IORESOURCE_MEM)) {
keir@701 153 align = ALIGN(align, PAGE_SIZE);
keir@696 154 }
keir@696 155 } else {
keir@696 156 align = res->start;
keir@696 157 }
ian@0 158
ian@0 159 /* First, try exact prefetching match.. */
ian@0 160 ret = pci_bus_alloc_resource(bus, res, size, align, min,
ian@0 161 IORESOURCE_PREFETCH,
ian@0 162 pcibios_align_resource, dev);
ian@0 163
ian@0 164 if (ret < 0 && (res->flags & IORESOURCE_PREFETCH)) {
ian@0 165 /*
ian@0 166 * That failed.
ian@0 167 *
ian@0 168 * But a prefetching area can handle a non-prefetching
ian@0 169 * window (it will just not perform as well).
ian@0 170 */
ian@0 171 ret = pci_bus_alloc_resource(bus, res, size, align, min, 0,
ian@0 172 pcibios_align_resource, dev);
ian@0 173 }
ian@0 174
ian@0 175 if (ret) {
ian@0 176 printk(KERN_ERR "PCI: Failed to allocate %s resource "
ian@0 177 "#%d:%llx@%llx for %s\n",
ian@0 178 res->flags & IORESOURCE_IO ? "I/O" : "mem",
ian@0 179 resno, (unsigned long long)size,
ian@0 180 (unsigned long long)res->start, pci_name(dev));
ian@0 181 } else if (resno < PCI_BRIDGE_RESOURCES) {
keir@703 182 if (reassigndev)
keir@701 183 printk(KERN_DEBUG "PCI: Assign resource(%d) on %s "
keir@701 184 "%016llx - %016llx\n", resno, pci_name(dev),
keir@701 185 (unsigned long long)res->start,
keir@701 186 (unsigned long long)res->end);
keir@815 187 pci_update_resource(dev, resno);
ian@0 188 }
ian@0 189
ian@0 190 return ret;
ian@0 191 }
ian@0 192
ian@0 193 #ifdef CONFIG_EMBEDDED
ian@0 194 int pci_assign_resource_fixed(struct pci_dev *dev, int resno)
ian@0 195 {
ian@0 196 struct pci_bus *bus = dev->bus;
ian@0 197 struct resource *res = dev->resource + resno;
ian@0 198 unsigned int type_mask;
ian@0 199 int i, ret = -EBUSY;
ian@0 200
ian@0 201 type_mask = IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH;
ian@0 202
ian@0 203 for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) {
ian@0 204 struct resource *r = bus->resource[i];
ian@0 205 if (!r)
ian@0 206 continue;
ian@0 207
ian@0 208 /* type_mask must match */
ian@0 209 if ((res->flags ^ r->flags) & type_mask)
ian@0 210 continue;
ian@0 211
ian@0 212 ret = request_resource(r, res);
ian@0 213
ian@0 214 if (ret == 0)
ian@0 215 break;
ian@0 216 }
ian@0 217
ian@0 218 if (ret) {
ian@0 219 printk(KERN_ERR "PCI: Failed to allocate %s resource "
ian@0 220 "#%d:%llx@%llx for %s\n",
ian@0 221 res->flags & IORESOURCE_IO ? "I/O" : "mem",
ian@0 222 resno, (unsigned long long)(res->end - res->start + 1),
ian@0 223 (unsigned long long)res->start, pci_name(dev));
ian@0 224 } else if (resno < PCI_BRIDGE_RESOURCES) {
keir@815 225 pci_update_resource(dev, resno);
ian@0 226 }
ian@0 227
ian@0 228 return ret;
ian@0 229 }
ian@0 230 EXPORT_SYMBOL_GPL(pci_assign_resource_fixed);
ian@0 231 #endif
ian@0 232
ian@0 233 /* Sort resources by alignment */
ian@0 234 void __devinit
ian@0 235 pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
ian@0 236 {
ian@0 237 int i;
keir@771 238 int reassigndev = pci_is_reassigndev(dev);
ian@0 239
ian@0 240 for (i = 0; i < PCI_NUM_RESOURCES; i++) {
ian@0 241 struct resource *r;
ian@0 242 struct resource_list *list, *tmp;
ian@0 243 resource_size_t r_align;
ian@0 244
ian@0 245 r = &dev->resource[i];
ian@0 246 r_align = r->end - r->start;
ian@0 247
ian@0 248 if (!(r->flags) || r->parent)
ian@0 249 continue;
keir@746 250
keir@746 251 if (i < PCI_BRIDGE_RESOURCES && (r->flags & IORESOURCE_MEM) &&
keir@746 252 reassigndev)
keir@746 253 r_align = ALIGN(r_align, PAGE_SIZE);
keir@746 254
ian@0 255 if (!r_align) {
ian@0 256 printk(KERN_WARNING "PCI: Ignore bogus resource %d "
ian@0 257 "[%llx:%llx] of %s\n",
ian@0 258 i, (unsigned long long)r->start,
ian@0 259 (unsigned long long)r->end, pci_name(dev));
ian@0 260 continue;
ian@0 261 }
ian@0 262 r_align = (i < PCI_BRIDGE_RESOURCES) ? r_align + 1 : r->start;
ian@0 263 for (list = head; ; list = list->next) {
ian@0 264 resource_size_t align = 0;
ian@0 265 struct resource_list *ln = list->next;
ian@0 266 int idx;
ian@0 267
ian@0 268 if (ln) {
ian@0 269 idx = ln->res - &ln->dev->resource[0];
ian@0 270 align = (idx < PCI_BRIDGE_RESOURCES) ?
ian@0 271 ln->res->end - ln->res->start + 1 :
ian@0 272 ln->res->start;
keir@746 273 if ((idx < PCI_BRIDGE_RESOURCES) &&
keir@746 274 (ln->res->flags & IORESOURCE_MEM) &&
keir@771 275 pci_is_reassigndev(ln->dev))
keir@746 276 align = ALIGN(align, PAGE_SIZE);
ian@0 277 }
ian@0 278 if (r_align > align) {
ian@0 279 tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
ian@0 280 if (!tmp)
ian@0 281 panic("pdev_sort_resources(): "
ian@0 282 "kmalloc() failed!\n");
ian@0 283 tmp->next = ln;
ian@0 284 tmp->res = r;
ian@0 285 tmp->dev = dev;
ian@0 286 list->next = tmp;
ian@0 287 break;
ian@0 288 }
ian@0 289 }
ian@0 290 }
ian@0 291 }