Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart - openslx/kernel-qcow2-linux.git

diff options

author	Linus Torvalds	2006-06-29 22:49:29 +0200
committer	Linus Torvalds	2006-06-29 22:49:29 +0200
commit	82991c6f2c361acc17279b8124d9bf1878973435 (patch)
tree	6c74acf89f3c5f3c9b7f8817e56675bca818c5d3 /arch/cris
parent	Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
parent	Merge ../linus (diff)
download	kernel-qcow2-linux-82991c6f2c361acc17279b8124d9bf1878973435.tar.gz kernel-qcow2-linux-82991c6f2c361acc17279b8124d9bf1878973435.tar.xz kernel-qcow2-linux-82991c6f2c361acc17279b8124d9bf1878973435.zip

Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart

* master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] Make AGP depend on PCI [AGPGART] remove unused variable [AGPGART] Fix pci_register_driver checking in amd64-agp [AGPGART] Compile fix for ati-agp [AGPGART] Suspend/Resume support for nVidia nForce AGP. [AGPGART] Suspend/Resume improvements for ATI AGP [AGPGART] Whitespace cleanups for ati-agp

Diffstat (limited to 'arch/cris')

0 files changed, 0 insertions, 0 deletions

/* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. * * Copyright (C) 2005-2006 Silicon Graphics, Inc. All rights reserved. * * This work was based on the 2.4/2.6 kernel development by Dick Reigner. * Work to add BIOS PROM support was completed by Mike Habeck. */ #include <linux/acpi.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/pci.h> #include <linux/pci_hotplug.h> #include <linux/proc_fs.h> #include <linux/slab.h> #include <linux/types.h> #include <linux/mutex.h> #include <asm/sn/addrs.h> #include <asm/sn/geo.h> #include <asm/sn/l1.h> #include <asm/sn/module.h> #include <asm/sn/pcibr_provider.h> #include <asm/sn/pcibus_provider_defs.h> #include <asm/sn/pcidev.h> #include <asm/sn/sn_feature_sets.h> #include <asm/sn/sn_sal.h> #include <asm/sn/types.h> #include <asm/sn/acpi.h> #include "../pci.h" MODULE_LICENSE("GPL"); MODULE_AUTHOR("SGI (prarit@sgi.com, dickie@sgi.com, habeck@sgi.com)"); MODULE_DESCRIPTION("SGI Altix Hot Plug PCI Controller Driver"); /* SAL call error codes. Keep in sync with prom header io/include/pcibr.h */ #define PCI_SLOT_ALREADY_UP 2 /* slot already up */ #define PCI_SLOT_ALREADY_DOWN 3 /* slot already down */ #define PCI_L1_ERR 7 /* L1 console command error */ #define PCI_EMPTY_33MHZ 15 /* empty 33 MHz bus */ #define PCIIO_ASIC_TYPE_TIOCA 4 #define PCI_L1_QSIZE 128 /* our L1 message buffer size */ #define SN_MAX_HP_SLOTS 32 /* max hotplug slots */ #define SN_SLOT_NAME_SIZE 33 /* size of name string */ /* internal list head */ static struct list_head sn_hp_list; /* hotplug_slot struct's private pointer */ struct slot { int device_num; struct pci_bus *pci_bus; /* this struct for glue internal only */ struct hotplug_slot *hotplug_slot; struct list_head hp_list; char physical_path[SN_SLOT_NAME_SIZE]; }; struct pcibr_slot_enable_resp { int resp_sub_errno; char resp_l1_msg[PCI_L1_QSIZE + 1]; }; struct pcibr_slot_disable_resp { int resp_sub_errno; char resp_l1_msg[PCI_L1_QSIZE + 1]; }; enum sn_pci_req_e { PCI_REQ_SLOT_ELIGIBLE, PCI_REQ_SLOT_DISABLE }; static int enable_slot(struct hotplug_slot *slot); static int disable_slot(struct hotplug_slot *slot); static inline int get_power_status(struct hotplug_slot *slot, u8 *value); static struct hotplug_slot_ops sn_hotplug_slot_ops = { .enable_slot = enable_slot, .disable_slot = disable_slot, .get_power_status = get_power_status, }; static DEFINE_MUTEX(sn_hotplug_mutex); static ssize_t path_show(struct pci_slot *pci_slot, char *buf) { int retval = -ENOENT; struct slot *slot = pci_slot->hotplug->private; if (!slot) return retval; retval = sprintf (buf, "%s\n", slot->physical_path); return retval; } static struct pci_slot_attribute sn_slot_path_attr = __ATTR_RO(path); static int sn_pci_slot_valid(struct pci_bus *pci_bus, int device) { struct pcibus_info *pcibus_info; u16 busnum, segment, ioboard_type; pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus); /* Check to see if this is a valid slot on 'pci_bus' */ if (!(pcibus_info->pbi_valid_devices & (1 << device))) return -EPERM; ioboard_type = sn_ioboard_to_pci_bus(pci_bus); busnum = pcibus_info->pbi_buscommon.bs_persist_busnum; segment = pci_domain_nr(pci_bus) & 0xf; /* Do not allow hotplug operations on base I/O cards */ if ((ioboard_type == L1_BRICKTYPE_IX || ioboard_type == L1_BRICKTYPE_IA) && (segment == 1 && busnum == 0 && device != 1)) return -EPERM; return 1; } static int sn_pci_bus_valid(struct pci_bus *pci_bus) { struct pcibus_info *pcibus_info; u32 asic_type; u16 ioboard_type; /* Don't register slots hanging off the TIOCA bus */ pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus); asic_type = pcibus_info->pbi_buscommon.bs_asic_type; if (asic_type == PCIIO_ASIC_TYPE_TIOCA) return -EPERM; /* Only register slots in I/O Bricks that support hotplug */ ioboard_type = sn_ioboard_to_pci_bus(pci_bus); switch (ioboard_type) { case L1_BRICKTYPE_IX: case L1_BRICKTYPE_PX: case L1_BRICKTYPE_IA: case L1_BRICKTYPE_PA: case L1_BOARDTYPE_PCIX3SLOT: return 1; break; default: return -EPERM; break; } return -EIO; } static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot, struct pci_bus *pci_bus, int device, char *name) { struct pcibus_info *pcibus_info; struct slot *slot; pcibus_info = SN_PCIBUS_BUSSOFT_INFO(pci_bus); slot = kzalloc(sizeof(*slot), GFP_KERNEL); if (!slot) return -ENOMEM; bss_hotplug_slot->private = slot; slot->device_num = device; slot->pci_bus = pci_bus; sprintf(name, "%04x:%02x:%02x", pci_domain_nr(pci_bus), ((u16)pcibus_info->pbi_buscommon.bs_persist_busnum), device + 1); sn_generate_path(pci_bus, slot->physical_path); slot->hotplug_slot = bss_hotplug_slot; list_add(&slot->hp_list, &sn_hp_list); return 0; } static struct hotplug_slot *sn_hp_destroy(void) { struct slot *slot; struct pci_slot *pci_slot; struct hotplug_slot *bss_hotplug_slot = NULL; list_for_each_entry(slot, &sn_hp_list, hp_list) { bss_hotplug_slot = slot->hotplug_slot; pci_slot = bss_hotplug_slot->pci_slot; list_del(&((struct slot *)bss_hotplug_slot->private)-> hp_list); sysfs_remove_file(&pci_slot->kobj, &sn_slot_path_attr.attr); break; } return bss_hotplug_slot; } static void sn_bus_free_data(struct pci_dev *dev) { struct pci_bus *subordinate_bus; struct pci_dev *child; /* Recursively clean up sn_irq_info structs */ if (dev->subordinate) { subordinate_bus = dev->subordinate; list_for_each_entry(child, &subordinate_bus->devices, bus_list) sn_bus_free_data(child); } /* * Some drivers may use dma accesses during the * driver remove function. We release the sysdata * areas after the driver remove functions have


context:
space:
mode: