Skip to content

L
linux
Commit 38a61482 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files
Options

Merge branches 'pci/msi', 'pci/iommu' and 'pci/cleanup' into next 

* pci/msi:
  PCI/MSI: Fix memory leak in free_msi_irqs()

* pci/iommu:
  PCI: Add function 1 DMA alias quirk for HighPoint RocketRaid 642L
  PCI: Add bridge DMA alias quirk for ITE bridge

* pci/cleanup:
  PCI: Merge multi-line quoted strings
  PCI: Whitespace cleanup
  PCI: Move EXPORT_SYMBOL so it immediately follows function/variable
parents 843a85ce b701c0b1 c2e0fb96 227f0647
Expand all Show whitespace changes
Inline Side-by-side
Showing with 780 additions and 951 deletions
drivers/pci/access.c
View file @ 38a61482
...@@ -231,10 +231,7 @@ static int pci_vpd_pci22_wait(struct pci_dev *dev) ...@@ -231,10 +231,7 @@ static int pci_vpd_pci22_wait(struct pci_dev *dev)
} }
if (time_after(jiffies, timeout)) { if (time_after(jiffies, timeout)) {
dev_printk(KERN_DEBUG, &dev->dev, dev_printk(KERN_DEBUG, &dev->dev, "vpd r/w failed. This is likely a firmware bug on this device. Contact the card vendor for a firmware update\n");
"vpd r/w failed. This is likely a firmware "
"bug on this device. Contact the card "
"vendor for a firmware update.");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
if (fatal_signal_pending(current)) if (fatal_signal_pending(current))
......
drivers/pci/bus.c
View file @ 38a61482
...@@ -226,6 +226,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res, ...@@ -226,6 +226,7 @@ int pci_bus_alloc_resource(struct pci_bus *bus, struct resource *res,
type_mask, alignf, alignf_data, type_mask, alignf, alignf_data,
&pci_32_bit); &pci_32_bit);
} }
EXPORT_SYMBOL(pci_bus_alloc_resource);
void __weak pcibios_resource_survey_bus(struct pci_bus *bus) { } void __weak pcibios_resource_survey_bus(struct pci_bus *bus) { }
...@@ -253,6 +254,7 @@ void pci_bus_add_device(struct pci_dev *dev) ...@@ -253,6 +254,7 @@ void pci_bus_add_device(struct pci_dev *dev)
dev->is_added = 1; dev->is_added = 1;
} }
EXPORT_SYMBOL_GPL(pci_bus_add_device);
/** /**
* pci_bus_add_devices - start driver for PCI devices * pci_bus_add_devices - start driver for PCI devices
...@@ -279,6 +281,7 @@ void pci_bus_add_devices(const struct pci_bus *bus) ...@@ -279,6 +281,7 @@ void pci_bus_add_devices(const struct pci_bus *bus)
pci_bus_add_devices(child); pci_bus_add_devices(child);
} }
} }
EXPORT_SYMBOL(pci_bus_add_devices);
/** pci_walk_bus - walk devices on/under bus, calling callback. /** pci_walk_bus - walk devices on/under bus, calling callback.
* @top bus whose devices should be walked * @top bus whose devices should be walked
...@@ -344,6 +347,3 @@ void pci_bus_put(struct pci_bus *bus) ...@@ -344,6 +347,3 @@ void pci_bus_put(struct pci_bus *bus)
} }
EXPORT_SYMBOL(pci_bus_put); EXPORT_SYMBOL(pci_bus_put);
EXPORT_SYMBOL(pci_bus_alloc_resource);
EXPORT_SYMBOL_GPL(pci_bus_add_device);
EXPORT_SYMBOL(pci_bus_add_devices);
drivers/pci/host/pci-mvebu.c
View file @ 38a61482
...@@ -614,8 +614,8 @@ static inline struct mvebu_pcie *sys_to_pcie(struct pci_sys_data *sys) ...@@ -614,8 +614,8 @@ static inline struct mvebu_pcie *sys_to_pcie(struct pci_sys_data *sys)
return sys->private_data; return sys->private_data;
} }
static struct mvebu_pcie_port * static struct mvebu_pcie_port *mvebu_pcie_find_port(struct mvebu_pcie *pcie,
mvebu_pcie_find_port(struct mvebu_pcie *pcie, struct pci_bus *bus, struct pci_bus *bus,
int devfn) int devfn)
{ {
int i; int i;
...@@ -834,7 +834,8 @@ static void mvebu_pcie_enable(struct mvebu_pcie *pcie) ...@@ -834,7 +834,8 @@ static void mvebu_pcie_enable(struct mvebu_pcie *pcie)
* found, maps it. * found, maps it.
*/ */
static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev, static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev,
struct device_node *np, struct mvebu_pcie_port *port) struct device_node *np,
struct mvebu_pcie_port *port)
{ {
struct resource regs; struct resource regs;
int ret = 0; int ret = 0;
......
drivers/pci/host/pcie-rcar.c
View file @ 38a61482
...@@ -277,9 +277,8 @@ static int rcar_pcie_read_conf(struct pci_bus *bus, unsigned int devfn, ...@@ -277,9 +277,8 @@ static int rcar_pcie_read_conf(struct pci_bus *bus, unsigned int devfn,
else if (size == 2) else if (size == 2)
*val = (*val >> (8 * (where & 2))) & 0xffff; *val = (*val >> (8 * (where & 2))) & 0xffff;
dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x " dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n",
"where=0x%04x size=%d val=0x%08lx\n", bus->number, bus->number, devfn, where, size, (unsigned long)*val);
devfn, where, size, (unsigned long)*val);
return ret; return ret;
} }
...@@ -302,9 +301,8 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn, ...@@ -302,9 +301,8 @@ static int rcar_pcie_write_conf(struct pci_bus *bus, unsigned int devfn,
if (ret != PCIBIOS_SUCCESSFUL) if (ret != PCIBIOS_SUCCESSFUL)
return ret; return ret;
dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x " dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n",
"where=0x%04x size=%d val=0x%08lx\n", bus->number, bus->number, devfn, where, size, (unsigned long)val);
devfn, where, size, (unsigned long)val);
if (size == 1) { if (size == 1) {
shift = 8 * (where & 3); shift = 8 * (where & 3);
......
drivers/pci/hotplug/acpiphp_core.c
View file @ 38a61482
...@@ -63,10 +63,6 @@ MODULE_LICENSE("GPL"); ...@@ -63,10 +63,6 @@ MODULE_LICENSE("GPL");
MODULE_PARM_DESC(disable, "disable acpiphp driver"); MODULE_PARM_DESC(disable, "disable acpiphp driver");
module_param_named(disable, acpiphp_disabled, bool, 0444); module_param_named(disable, acpiphp_disabled, bool, 0444);
/* export the attention callback registration methods */
EXPORT_SYMBOL_GPL(acpiphp_register_attention);
EXPORT_SYMBOL_GPL(acpiphp_unregister_attention);
static int enable_slot (struct hotplug_slot *slot); static int enable_slot (struct hotplug_slot *slot);
static int disable_slot (struct hotplug_slot *slot); static int disable_slot (struct hotplug_slot *slot);
static int set_attention_status (struct hotplug_slot *slot, u8 value); static int set_attention_status (struct hotplug_slot *slot, u8 value);
...@@ -104,6 +100,7 @@ int acpiphp_register_attention(struct acpiphp_attention_info *info) ...@@ -104,6 +100,7 @@ int acpiphp_register_attention(struct acpiphp_attention_info *info)
} }
return retval; return retval;
} }
EXPORT_SYMBOL_GPL(acpiphp_register_attention);
/** /**
...@@ -124,6 +121,7 @@ int acpiphp_unregister_attention(struct acpiphp_attention_info *info) ...@@ -124,6 +121,7 @@ int acpiphp_unregister_attention(struct acpiphp_attention_info *info)
} }
return retval; return retval;
} }
EXPORT_SYMBOL_GPL(acpiphp_unregister_attention);
/** /**
......
drivers/pci/hotplug/acpiphp_glue.c
View file @ 38a61482
...@@ -351,11 +351,9 @@ static acpi_status acpiphp_add_context(acpi_handle handle, u32 lvl, void *data, ...@@ -351,11 +351,9 @@ static acpi_status acpiphp_add_context(acpi_handle handle, u32 lvl, void *data,
slot->slot = NULL; slot->slot = NULL;
bridge->nr_slots--; bridge->nr_slots--;
if (retval == -EBUSY) if (retval == -EBUSY)
pr_warn("Slot %llu already registered by another " pr_warn("Slot %llu already registered by another hotplug driver\n", sun);
"hotplug driver\n", sun);
else else
pr_warn("acpiphp_register_hotplug_slot failed " pr_warn("acpiphp_register_hotplug_slot failed (err code = 0x%x)\n", retval);
"(err code = 0x%x)\n", retval);
} }
/* Even if the slot registration fails, we can still use it. */ /* Even if the slot registration fails, we can still use it. */
} }
......
drivers/pci/hotplug/cpci_hotplug.h
View file @ 38a61482
...@@ -56,9 +56,9 @@ struct cpci_hp_controller_ops { ...@@ -56,9 +56,9 @@ struct cpci_hp_controller_ops {
int (*enable_irq) (void); int (*enable_irq) (void);
int (*disable_irq) (void); int (*disable_irq) (void);
int (*check_irq) (void *dev_id); int (*check_irq) (void *dev_id);
int (*hardware_test) (struct slot* slot, u32 value); int (*hardware_test) (struct slot *slot, u32 value);
u8 (*get_power) (struct slot* slot); u8 (*get_power) (struct slot *slot);
int (*set_power) (struct slot* slot, int value); int (*set_power) (struct slot *slot, int value);
}; };
struct cpci_hp_controller { struct cpci_hp_controller {
...@@ -89,13 +89,13 @@ int cpci_hp_stop(void); ...@@ -89,13 +89,13 @@ int cpci_hp_stop(void);
u8 cpci_get_attention_status(struct slot *slot); u8 cpci_get_attention_status(struct slot *slot);
u8 cpci_get_latch_status(struct slot *slot); u8 cpci_get_latch_status(struct slot *slot);
u8 cpci_get_adapter_status(struct slot *slot); u8 cpci_get_adapter_status(struct slot *slot);
u16 cpci_get_hs_csr(struct slot * slot); u16 cpci_get_hs_csr(struct slot *slot);
int cpci_set_attention_status(struct slot *slot, int status); int cpci_set_attention_status(struct slot *slot, int status);
int cpci_check_and_clear_ins(struct slot * slot); int cpci_check_and_clear_ins(struct slot *slot);
int cpci_check_ext(struct slot * slot); int cpci_check_ext(struct slot *slot);
int cpci_clear_ext(struct slot * slot); int cpci_clear_ext(struct slot *slot);
int cpci_led_on(struct slot * slot); int cpci_led_on(struct slot *slot);
int cpci_led_off(struct slot * slot); int cpci_led_off(struct slot *slot);
int cpci_configure_slot(struct slot *slot); int cpci_configure_slot(struct slot *slot);
int cpci_unconfigure_slot(struct slot *slot); int cpci_unconfigure_slot(struct slot *slot);
......
drivers/pci/hotplug/cpci_hotplug_core.c
View file @ 38a61482
...@@ -65,10 +65,10 @@ static int thread_finished; ...@@ -65,10 +65,10 @@ static int thread_finished;
static int enable_slot(struct hotplug_slot *slot); static int enable_slot(struct hotplug_slot *slot);
static int disable_slot(struct hotplug_slot *slot); static int disable_slot(struct hotplug_slot *slot);
static int set_attention_status(struct hotplug_slot *slot, u8 value); static int set_attention_status(struct hotplug_slot *slot, u8 value);
static int get_power_status(struct hotplug_slot *slot, u8 * value); static int get_power_status(struct hotplug_slot *slot, u8 *value);
static int get_attention_status(struct hotplug_slot *slot, u8 * value); static int get_attention_status(struct hotplug_slot *slot, u8 *value);
static int get_adapter_status(struct hotplug_slot *slot, u8 * value); static int get_adapter_status(struct hotplug_slot *slot, u8 *value);
static int get_latch_status(struct hotplug_slot *slot, u8 * value); static int get_latch_status(struct hotplug_slot *slot, u8 *value);
static struct hotplug_slot_ops cpci_hotplug_slot_ops = { static struct hotplug_slot_ops cpci_hotplug_slot_ops = {
.enable_slot = enable_slot, .enable_slot = enable_slot,
...@@ -168,7 +168,7 @@ cpci_get_power_status(struct slot *slot) ...@@ -168,7 +168,7 @@ cpci_get_power_status(struct slot *slot)
} }
static int static int
get_power_status(struct hotplug_slot *hotplug_slot, u8 * value) get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
...@@ -177,7 +177,7 @@ get_power_status(struct hotplug_slot *hotplug_slot, u8 * value) ...@@ -177,7 +177,7 @@ get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
} }
static int static int
get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value) get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
struct slot *slot = hotplug_slot->private; struct slot *slot = hotplug_slot->private;
...@@ -192,14 +192,14 @@ set_attention_status(struct hotplug_slot *hotplug_slot, u8 status) ...@@ -192,14 +192,14 @@ set_attention_status(struct hotplug_slot *hotplug_slot, u8 status)
} }
static int static int
get_adapter_status(struct hotplug_slot *hotplug_slot, u8 * value) get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
*value = hotplug_slot->info->adapter_status; *value = hotplug_slot->info->adapter_status;
return 0; return 0;
} }
static int static int
get_latch_status(struct hotplug_slot *hotplug_slot, u8 * value) get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
*value = hotplug_slot->info->latch_status; *value = hotplug_slot->info->latch_status;
return 0; return 0;
...@@ -299,6 +299,7 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last) ...@@ -299,6 +299,7 @@ cpci_hp_register_bus(struct pci_bus *bus, u8 first, u8 last)
error: error:
return status; return status;
} }
EXPORT_SYMBOL_GPL(cpci_hp_register_bus);
int int
cpci_hp_unregister_bus(struct pci_bus *bus) cpci_hp_unregister_bus(struct pci_bus *bus)
...@@ -329,6 +330,7 @@ cpci_hp_unregister_bus(struct pci_bus *bus) ...@@ -329,6 +330,7 @@ cpci_hp_unregister_bus(struct pci_bus *bus)
up_write(&list_rwsem); up_write(&list_rwsem);
return status; return status;
} }
EXPORT_SYMBOL_GPL(cpci_hp_unregister_bus);
/* This is the interrupt mode interrupt handler */ /* This is the interrupt mode interrupt handler */
static irqreturn_t static irqreturn_t
...@@ -360,7 +362,7 @@ static int ...@@ -360,7 +362,7 @@ static int
init_slots(int clear_ins) init_slots(int clear_ins)
{ {
struct slot *slot; struct slot *slot;
struct pci_dev* dev; struct pci_dev *dev;
dbg("%s - enter", __func__); dbg("%s - enter", __func__);
down_read(&list_rwsem); down_read(&list_rwsem);
...@@ -614,6 +616,7 @@ cpci_hp_register_controller(struct cpci_hp_controller *new_controller) ...@@ -614,6 +616,7 @@ cpci_hp_register_controller(struct cpci_hp_controller *new_controller)
controller = new_controller; controller = new_controller;
return status; return status;
} }
EXPORT_SYMBOL_GPL(cpci_hp_register_controller);
static void static void
cleanup_slots(void) cleanup_slots(void)
...@@ -653,6 +656,7 @@ cpci_hp_unregister_controller(struct cpci_hp_controller *old_controller) ...@@ -653,6 +656,7 @@ cpci_hp_unregister_controller(struct cpci_hp_controller *old_controller)
status = -ENODEV; status = -ENODEV;
return status; return status;
} }
EXPORT_SYMBOL_GPL(cpci_hp_unregister_controller);
int int
cpci_hp_start(void) cpci_hp_start(void)
...@@ -690,6 +694,7 @@ cpci_hp_start(void) ...@@ -690,6 +694,7 @@ cpci_hp_start(void)
dbg("%s - exit", __func__); dbg("%s - exit", __func__);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(cpci_hp_start);
int int
cpci_hp_stop(void) cpci_hp_stop(void)
...@@ -704,6 +709,7 @@ cpci_hp_stop(void) ...@@ -704,6 +709,7 @@ cpci_hp_stop(void)
cpci_stop_thread(); cpci_stop_thread();
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(cpci_hp_stop);
int __init int __init
cpci_hotplug_init(int debug) cpci_hotplug_init(int debug)
...@@ -721,10 +727,3 @@ cpci_hotplug_exit(void) ...@@ -721,10 +727,3 @@ cpci_hotplug_exit(void)
cpci_hp_stop(); cpci_hp_stop();
cpci_hp_unregister_controller(controller); cpci_hp_unregister_controller(controller);
} }
EXPORT_SYMBOL_GPL(cpci_hp_register_controller);
EXPORT_SYMBOL_GPL(cpci_hp_unregister_controller);
EXPORT_SYMBOL_GPL(cpci_hp_register_bus);
EXPORT_SYMBOL_GPL(cpci_hp_unregister_bus);
EXPORT_SYMBOL_GPL(cpci_hp_start);
EXPORT_SYMBOL_GPL(cpci_hp_stop);
drivers/pci/hotplug/cpci_hotplug_pci.c
View file @ 38a61482
...@@ -46,7 +46,7 @@ extern int cpci_debug; ...@@ -46,7 +46,7 @@ extern int cpci_debug;
#define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg) #define warn(format, arg...) printk(KERN_WARNING "%s: " format "\n", MY_NAME , ## arg)
u8 cpci_get_attention_status(struct slot* slot) u8 cpci_get_attention_status(struct slot *slot)
{ {
int hs_cap; int hs_cap;
u16 hs_csr; u16 hs_csr;
...@@ -66,7 +66,7 @@ u8 cpci_get_attention_status(struct slot* slot) ...@@ -66,7 +66,7 @@ u8 cpci_get_attention_status(struct slot* slot)
return hs_csr & 0x0008 ? 1 : 0; return hs_csr & 0x0008 ? 1 : 0;
} }
int cpci_set_attention_status(struct slot* slot, int status) int cpci_set_attention_status(struct slot *slot, int status)
{ {
int hs_cap; int hs_cap;
u16 hs_csr; u16 hs_csr;
...@@ -93,7 +93,7 @@ int cpci_set_attention_status(struct slot* slot, int status) ...@@ -93,7 +93,7 @@ int cpci_set_attention_status(struct slot* slot, int status)
return 1; return 1;
} }
u16 cpci_get_hs_csr(struct slot* slot) u16 cpci_get_hs_csr(struct slot *slot)
{ {
int hs_cap; int hs_cap;
u16 hs_csr; u16 hs_csr;
...@@ -111,7 +111,7 @@ u16 cpci_get_hs_csr(struct slot* slot) ...@@ -111,7 +111,7 @@ u16 cpci_get_hs_csr(struct slot* slot)
return hs_csr; return hs_csr;
} }
int cpci_check_and_clear_ins(struct slot* slot) int cpci_check_and_clear_ins(struct slot *slot)
{ {
int hs_cap; int hs_cap;
u16 hs_csr; u16 hs_csr;
...@@ -140,7 +140,7 @@ int cpci_check_and_clear_ins(struct slot* slot) ...@@ -140,7 +140,7 @@ int cpci_check_and_clear_ins(struct slot* slot)
return ins; return ins;
} }
int cpci_check_ext(struct slot* slot) int cpci_check_ext(struct slot *slot)
{ {
int hs_cap; int hs_cap;
u16 hs_csr; u16 hs_csr;
...@@ -161,7 +161,7 @@ int cpci_check_ext(struct slot* slot) ...@@ -161,7 +161,7 @@ int cpci_check_ext(struct slot* slot)
return ext; return ext;
} }
int cpci_clear_ext(struct slot* slot) int cpci_clear_ext(struct slot *slot)
{ {
int hs_cap; int hs_cap;
u16 hs_csr; u16 hs_csr;
...@@ -187,7 +187,7 @@ int cpci_clear_ext(struct slot* slot) ...@@ -187,7 +187,7 @@ int cpci_clear_ext(struct slot* slot)
return 0; return 0;
} }
int cpci_led_on(struct slot* slot) int cpci_led_on(struct slot *slot)
{ {
int hs_cap; int hs_cap;
u16 hs_csr; u16 hs_csr;
...@@ -216,7 +216,7 @@ int cpci_led_on(struct slot* slot) ...@@ -216,7 +216,7 @@ int cpci_led_on(struct slot* slot)
return 0; return 0;
} }
int cpci_led_off(struct slot* slot) int cpci_led_off(struct slot *slot)
{ {
int hs_cap; int hs_cap;
u16 hs_csr; u16 hs_csr;
...@@ -303,7 +303,7 @@ int cpci_configure_slot(struct slot *slot) ...@@ -303,7 +303,7 @@ int cpci_configure_slot(struct slot *slot)
return ret; return ret;
} }
int cpci_unconfigure_slot(struct slot* slot) int cpci_unconfigure_slot(struct slot *slot)
{ {
struct pci_dev *dev, *temp; struct pci_dev *dev, *temp;
......
drivers/pci/hotplug/cpcihp_generic.c
View file @ 38a61482
...@@ -78,8 +78,8 @@ static struct cpci_hp_controller generic_hpc; ...@@ -78,8 +78,8 @@ static struct cpci_hp_controller generic_hpc;
static int __init validate_parameters(void) static int __init validate_parameters(void)
{ {
char* str; char *str;
char* p; char *p;
unsigned long tmp; unsigned long tmp;
if(!bridge) { if(!bridge) {
...@@ -142,8 +142,8 @@ static int query_enum(void) ...@@ -142,8 +142,8 @@ static int query_enum(void)
static int __init cpcihp_generic_init(void) static int __init cpcihp_generic_init(void)
{ {
int status; int status;
struct resource* r; struct resource *r;
struct pci_dev* dev; struct pci_dev *dev;
info(DRIVER_DESC " version: " DRIVER_VERSION); info(DRIVER_DESC " version: " DRIVER_VERSION);
status = validate_parameters(); status = validate_parameters();
......
drivers/pci/hotplug/cpcihp_zt5550.c
View file @ 38a61482
...@@ -295,7 +295,7 @@ static struct pci_driver zt5550_hc_driver = { ...@@ -295,7 +295,7 @@ static struct pci_driver zt5550_hc_driver = {
static int __init zt5550_init(void) static int __init zt5550_init(void)
{ {
struct resource* r; struct resource *r;
int rc; int rc;
info(DRIVER_DESC " version: " DRIVER_VERSION); info(DRIVER_DESC " version: " DRIVER_VERSION);
......
drivers/pci/hotplug/cpqphp.h
View file @ 38a61482
...@@ -255,7 +255,7 @@ struct pci_func { ...@@ -255,7 +255,7 @@ struct pci_func {
struct pci_resource *io_head; struct pci_resource *io_head;
struct pci_resource *bus_head; struct pci_resource *bus_head;
struct timer_list *p_task_event; struct timer_list *p_task_event;
struct pci_dev* pci_dev; struct pci_dev *pci_dev;
}; };
struct slot { struct slot {
...@@ -278,7 +278,7 @@ struct slot { ...@@ -278,7 +278,7 @@ struct slot {
}; };
struct pci_resource { struct pci_resource {
struct pci_resource * next; struct pci_resource *next;
u32 base; u32 base;
u32 length; u32 length;
}; };
......
drivers/pci/hotplug/cpqphp_core.c
View file @ 38a61482
...@@ -94,7 +94,7 @@ static inline int is_slot66mhz(struct slot *slot) ...@@ -94,7 +94,7 @@ static inline int is_slot66mhz(struct slot *slot)
* *
* Returns pointer to the head of the SMBIOS tables (or %NULL). * Returns pointer to the head of the SMBIOS tables (or %NULL).
*/ */
static void __iomem * detect_SMBIOS_pointer(void __iomem *begin, void __iomem *end) static void __iomem *detect_SMBIOS_pointer(void __iomem *begin, void __iomem *end)
{ {
void __iomem *fp; void __iomem *fp;
void __iomem *endp; void __iomem *endp;
...@@ -131,7 +131,7 @@ static void __iomem * detect_SMBIOS_pointer(void __iomem *begin, void __iomem *e ...@@ -131,7 +131,7 @@ static void __iomem * detect_SMBIOS_pointer(void __iomem *begin, void __iomem *e
* *
* For unexpected switch opens * For unexpected switch opens
*/ */
static int init_SERR(struct controller * ctrl) static int init_SERR(struct controller *ctrl)
{ {
u32 tempdword; u32 tempdword;
u32 number_of_slots; u32 number_of_slots;
...@@ -291,7 +291,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot) ...@@ -291,7 +291,7 @@ static void release_slot(struct hotplug_slot *hotplug_slot)
kfree(slot); kfree(slot);
} }
static int ctrl_slot_cleanup (struct controller * ctrl) static int ctrl_slot_cleanup (struct controller *ctrl)
{ {
struct slot *old_slot, *next_slot; struct slot *old_slot, *next_slot;
...@@ -706,8 +706,7 @@ static int ctrl_slot_setup(struct controller *ctrl, ...@@ -706,8 +706,7 @@ static int ctrl_slot_setup(struct controller *ctrl,
hotplug_slot_info->adapter_status = hotplug_slot_info->adapter_status =
get_presence_status(ctrl, slot); get_presence_status(ctrl, slot);
dbg("registering bus %d, dev %d, number %d, " dbg("registering bus %d, dev %d, number %d, ctrl->slot_device_offset %d, slot %d\n",
"ctrl->slot_device_offset %d, slot %d\n",
slot->bus, slot->device, slot->bus, slot->device,
slot->number, ctrl->slot_device_offset, slot->number, ctrl->slot_device_offset,
slot_number); slot_number);
...@@ -837,8 +836,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -837,8 +836,7 @@ static int cpqhpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
bus = pdev->subordinate; bus = pdev->subordinate;
if (!bus) { if (!bus) {
dev_notice(&pdev->dev, "the device is not a bridge, " dev_notice(&pdev->dev, "the device is not a bridge, skipping\n");
"skipping\n");
rc = -ENODEV; rc = -ENODEV;
goto err_disable_device; goto err_disable_device;
} }
......
drivers/pci/hotplug/cpqphp_ctrl.c
View file @ 38a61482
...@@ -39,9 +39,9 @@ ...@@ -39,9 +39,9 @@
#include <linux/kthread.h> #include <linux/kthread.h>
#include "cpqphp.h" #include "cpqphp.h"
static u32 configure_new_device(struct controller* ctrl, struct pci_func *func, static u32 configure_new_device(struct controller *ctrl, struct pci_func *func,
u8 behind_bridge, struct resource_lists *resources); u8 behind_bridge, struct resource_lists *resources);
static int configure_new_function(struct controller* ctrl, struct pci_func *func, static int configure_new_function(struct controller *ctrl, struct pci_func *func,
u8 behind_bridge, struct resource_lists *resources); u8 behind_bridge, struct resource_lists *resources);
static void interrupt_event_handler(struct controller *ctrl); static void interrupt_event_handler(struct controller *ctrl);
...@@ -64,7 +64,7 @@ static void long_delay(int delay) ...@@ -64,7 +64,7 @@ static void long_delay(int delay)
/* FIXME: The following line needs to be somewhere else... */ /* FIXME: The following line needs to be somewhere else... */
#define WRONG_BUS_FREQUENCY 0x07 #define WRONG_BUS_FREQUENCY 0x07
static u8 handle_switch_change(u8 change, struct controller * ctrl) static u8 handle_switch_change(u8 change, struct controller *ctrl)
{ {
int hp_slot; int hp_slot;
u8 rc = 0; u8 rc = 0;
...@@ -138,7 +138,7 @@ static struct slot *cpqhp_find_slot(struct controller *ctrl, u8 device) ...@@ -138,7 +138,7 @@ static struct slot *cpqhp_find_slot(struct controller *ctrl, u8 device)
} }
static u8 handle_presence_change(u16 change, struct controller * ctrl) static u8 handle_presence_change(u16 change, struct controller *ctrl)
{ {
int hp_slot; int hp_slot;
u8 rc = 0; u8 rc = 0;
...@@ -232,7 +232,7 @@ static u8 handle_presence_change(u16 change, struct controller * ctrl) ...@@ -232,7 +232,7 @@ static u8 handle_presence_change(u16 change, struct controller * ctrl)
} }
static u8 handle_power_fault(u8 change, struct controller * ctrl) static u8 handle_power_fault(u8 change, struct controller *ctrl)
{ {
int hp_slot; int hp_slot;
u8 rc = 0; u8 rc = 0;
...@@ -997,7 +997,7 @@ struct pci_func *cpqhp_slot_create(u8 busnumber) ...@@ -997,7 +997,7 @@ struct pci_func *cpqhp_slot_create(u8 busnumber)
* *
* Returns %0 if successful, !0 otherwise. * Returns %0 if successful, !0 otherwise.
*/ */
static int slot_remove(struct pci_func * old_slot) static int slot_remove(struct pci_func *old_slot)
{ {
struct pci_func *next; struct pci_func *next;
...@@ -1109,7 +1109,7 @@ struct pci_func *cpqhp_slot_find(u8 bus, u8 device, u8 index) ...@@ -1109,7 +1109,7 @@ struct pci_func *cpqhp_slot_find(u8 bus, u8 device, u8 index)
/* DJZ: I don't think is_bridge will work as is. /* DJZ: I don't think is_bridge will work as is.
* FIXME */ * FIXME */
static int is_bridge(struct pci_func * func) static int is_bridge(struct pci_func *func)
{ {
/* Check the header type */ /* Check the header type */
if (((func->config_space[0x03] >> 16) & 0xFF) == 0x01) if (((func->config_space[0x03] >> 16) & 0xFF) == 0x01)
...@@ -1625,7 +1625,7 @@ static u32 board_added(struct pci_func *func, struct controller *ctrl) ...@@ -1625,7 +1625,7 @@ static u32 board_added(struct pci_func *func, struct controller *ctrl)
* @replace_flag: whether replacing or adding a new device * @replace_flag: whether replacing or adding a new device
* @ctrl: target controller * @ctrl: target controller
*/ */
static u32 remove_board(struct pci_func * func, u32 replace_flag, struct controller * ctrl) static u32 remove_board(struct pci_func *func, u32 replace_flag, struct controller *ctrl)
{ {
int index; int index;
u8 skip = 0; u8 skip = 0;
...@@ -1742,7 +1742,7 @@ static void pushbutton_helper_thread(unsigned long data) ...@@ -1742,7 +1742,7 @@ static void pushbutton_helper_thread(unsigned long data)
/* this is the main worker thread */ /* this is the main worker thread */
static int event_thread(void* data) static int event_thread(void *data)
{ {
struct controller *ctrl; struct controller *ctrl;
...@@ -1992,7 +1992,7 @@ int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func) ...@@ -1992,7 +1992,7 @@ int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func)
u16 temp_word; u16 temp_word;
u32 tempdword; u32 tempdword;
int rc; int rc;
struct slot* p_slot; struct slot *p_slot;
int physical_slot = 0; int physical_slot = 0;
tempdword = 0; tempdword = 0;
...@@ -2088,7 +2088,7 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func) ...@@ -2088,7 +2088,7 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func)
u8 replace_flag; u8 replace_flag;
u32 rc = 0; u32 rc = 0;
unsigned int devfn; unsigned int devfn;
struct slot* p_slot; struct slot *p_slot;
struct pci_bus *pci_bus = ctrl->pci_bus; struct pci_bus *pci_bus = ctrl->pci_bus;
int physical_slot=0; int physical_slot=0;
...@@ -2270,8 +2270,8 @@ int cpqhp_hardware_test(struct controller *ctrl, int test_num) ...@@ -2270,8 +2270,8 @@ int cpqhp_hardware_test(struct controller *ctrl, int test_num)
* *
* Returns 0 if success. * Returns 0 if success.
*/ */
static u32 configure_new_device(struct controller * ctrl, struct pci_func * func, static u32 configure_new_device(struct controller *ctrl, struct pci_func *func,
u8 behind_bridge, struct resource_lists * resources) u8 behind_bridge, struct resource_lists *resources)
{ {
u8 temp_byte, function, max_functions, stop_it; u8 temp_byte, function, max_functions, stop_it;
int rc; int rc;
......
drivers/pci/hotplug/cpqphp_nvram.c
View file @ 38a61482
...@@ -107,7 +107,7 @@ static spinlock_t int15_lock; ...@@ -107,7 +107,7 @@ static spinlock_t int15_lock;
*/ */
static u32 add_byte( u32 **p_buffer, u8 value, u32 *used, u32 *avail) static u32 add_byte(u32 **p_buffer, u8 value, u32 *used, u32 *avail)
{ {
u8 **tByte; u8 **tByte;
...@@ -122,7 +122,7 @@ static u32 add_byte( u32 **p_buffer, u8 value, u32 *used, u32 *avail) ...@@ -122,7 +122,7 @@ static u32 add_byte( u32 **p_buffer, u8 value, u32 *used, u32 *avail)
} }
static u32 add_dword( u32 **p_buffer, u32 value, u32 *used, u32 *avail) static u32 add_dword(u32 **p_buffer, u32 value, u32 *used, u32 *avail)
{ {
if ((*used + 4) > *avail) if ((*used + 4) > *avail)
return(1); return(1);
...@@ -267,12 +267,12 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -267,12 +267,12 @@ static u32 store_HRT (void __iomem *rom_start)
ctrl = cpqhp_ctrl_list; ctrl = cpqhp_ctrl_list;
/* The revision of this structure */ /* The revision of this structure */
rc = add_byte( &pFill, 1 + ctrl->push_flag, &usedbytes, &available); rc = add_byte(&pFill, 1 + ctrl->push_flag, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
/* The number of controllers */ /* The number of controllers */
rc = add_byte( &pFill, 1, &usedbytes, &available); rc = add_byte(&pFill, 1, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
...@@ -282,22 +282,22 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -282,22 +282,22 @@ static u32 store_HRT (void __iomem *rom_start)
numCtrl++; numCtrl++;
/* The bus number */ /* The bus number */
rc = add_byte( &pFill, ctrl->bus, &usedbytes, &available); rc = add_byte(&pFill, ctrl->bus, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
/* The device Number */ /* The device Number */
rc = add_byte( &pFill, PCI_SLOT(ctrl->pci_dev->devfn), &usedbytes, &available); rc = add_byte(&pFill, PCI_SLOT(ctrl->pci_dev->devfn), &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
/* The function Number */ /* The function Number */
rc = add_byte( &pFill, PCI_FUNC(ctrl->pci_dev->devfn), &usedbytes, &available); rc = add_byte(&pFill, PCI_FUNC(ctrl->pci_dev->devfn), &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
/* Skip the number of available entries */ /* Skip the number of available entries */
rc = add_dword( &pFill, 0, &usedbytes, &available); rc = add_dword(&pFill, 0, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
...@@ -311,12 +311,12 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -311,12 +311,12 @@ static u32 store_HRT (void __iomem *rom_start)
loop ++; loop ++;
/* base */ /* base */
rc = add_dword( &pFill, resNode->base, &usedbytes, &available); rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
/* length */ /* length */
rc = add_dword( &pFill, resNode->length, &usedbytes, &available); rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
...@@ -336,12 +336,12 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -336,12 +336,12 @@ static u32 store_HRT (void __iomem *rom_start)
loop ++; loop ++;
/* base */ /* base */
rc = add_dword( &pFill, resNode->base, &usedbytes, &available); rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
/* length */ /* length */
rc = add_dword( &pFill, resNode->length, &usedbytes, &available); rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
...@@ -361,12 +361,12 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -361,12 +361,12 @@ static u32 store_HRT (void __iomem *rom_start)
loop ++; loop ++;
/* base */ /* base */
rc = add_dword( &pFill, resNode->base, &usedbytes, &available); rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
/* length */ /* length */
rc = add_dword( &pFill, resNode->length, &usedbytes, &available); rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
...@@ -386,12 +386,12 @@ static u32 store_HRT (void __iomem *rom_start) ...@@ -386,12 +386,12 @@ static u32 store_HRT (void __iomem *rom_start)
loop ++; loop ++;
/* base */ /* base */
rc = add_dword( &pFill, resNode->base, &usedbytes, &available); rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
/* length */ /* length */
rc = add_dword( &pFill, resNode->length, &usedbytes, &available); rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
if (rc) if (rc)
return(rc); return(rc);
......
drivers/pci/hotplug/cpqphp_pci.c
View file @ 38a61482
...@@ -81,7 +81,7 @@ static void __iomem *detect_HRT_floating_pointer(void __iomem *begin, void __iom ...@@ -81,7 +81,7 @@ static void __iomem *detect_HRT_floating_pointer(void __iomem *begin, void __iom
} }
int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func) int cpqhp_configure_device (struct controller *ctrl, struct pci_func *func)
{ {
struct pci_bus *child; struct pci_bus *child;
int num; int num;
...@@ -121,7 +121,7 @@ int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func) ...@@ -121,7 +121,7 @@ int cpqhp_configure_device (struct controller* ctrl, struct pci_func* func)
} }
int cpqhp_unconfigure_device(struct pci_func* func) int cpqhp_unconfigure_device(struct pci_func *func)
{ {
int j; int j;
...@@ -129,7 +129,7 @@ int cpqhp_unconfigure_device(struct pci_func* func) ...@@ -129,7 +129,7 @@ int cpqhp_unconfigure_device(struct pci_func* func)
pci_lock_rescan_remove(); pci_lock_rescan_remove();
for (j=0; j<8 ; j++) { for (j=0; j<8 ; j++) {
struct pci_dev* temp = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, j)); struct pci_dev *temp = pci_get_bus_and_slot(func->bus, PCI_DEVFN(func->device, j));
if (temp) { if (temp) {
pci_dev_put(temp); pci_dev_put(temp);
pci_stop_and_remove_bus_device(temp); pci_stop_and_remove_bus_device(temp);
...@@ -203,7 +203,7 @@ int cpqhp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num) ...@@ -203,7 +203,7 @@ int cpqhp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num)
} }
static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 * dev_num) static int PCI_ScanBusForNonBridge(struct controller *ctrl, u8 bus_num, u8 *dev_num)
{ {
u16 tdevice; u16 tdevice;
u32 work; u32 work;
...@@ -280,7 +280,7 @@ static int PCI_GetBusDevHelper(struct controller *ctrl, u8 *bus_num, u8 *dev_num ...@@ -280,7 +280,7 @@ static int PCI_GetBusDevHelper(struct controller *ctrl, u8 *bus_num, u8 *dev_num
} }
int cpqhp_get_bus_dev (struct controller *ctrl, u8 * bus_num, u8 * dev_num, u8 slot) int cpqhp_get_bus_dev (struct controller *ctrl, u8 *bus_num, u8 *dev_num, u8 slot)
{ {
/* plain (bridges allowed) */ /* plain (bridges allowed) */
return PCI_GetBusDevHelper(ctrl, bus_num, dev_num, slot, 0); return PCI_GetBusDevHelper(ctrl, bus_num, dev_num, slot, 0);
...@@ -465,7 +465,7 @@ int cpqhp_save_config(struct controller *ctrl, int busnumber, int is_hot_plug) ...@@ -465,7 +465,7 @@ int cpqhp_save_config(struct controller *ctrl, int busnumber, int is_hot_plug)
* *
* returns 0 if success * returns 0 if success
*/ */
int cpqhp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot) int cpqhp_save_slot_config (struct controller *ctrl, struct pci_func *new_slot)
{ {
long rc; long rc;
u8 class_code; u8 class_code;
...@@ -549,7 +549,7 @@ int cpqhp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot) ...@@ -549,7 +549,7 @@ int cpqhp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot)
* *
* returns 0 if success * returns 0 if success
*/ */
int cpqhp_save_base_addr_length(struct controller *ctrl, struct pci_func * func) int cpqhp_save_base_addr_length(struct controller *ctrl, struct pci_func *func)
{ {
u8 cloop; u8 cloop;
u8 header_type; u8 header_type;
...@@ -686,7 +686,7 @@ int cpqhp_save_base_addr_length(struct controller *ctrl, struct pci_func * func) ...@@ -686,7 +686,7 @@ int cpqhp_save_base_addr_length(struct controller *ctrl, struct pci_func * func)
* *
* returns 0 if success * returns 0 if success
*/ */
int cpqhp_save_used_resources (struct controller *ctrl, struct pci_func * func) int cpqhp_save_used_resources (struct controller *ctrl, struct pci_func *func)
{ {
u8 cloop; u8 cloop;
u8 header_type; u8 header_type;
...@@ -949,7 +949,7 @@ int cpqhp_save_used_resources (struct controller *ctrl, struct pci_func * func) ...@@ -949,7 +949,7 @@ int cpqhp_save_used_resources (struct controller *ctrl, struct pci_func * func)
* *
* returns 0 if success * returns 0 if success
*/ */
int cpqhp_configure_board(struct controller *ctrl, struct pci_func * func) int cpqhp_configure_board(struct controller *ctrl, struct pci_func *func)
{ {
int cloop; int cloop;
u8 header_type; u8 header_type;
...@@ -1027,7 +1027,7 @@ int cpqhp_configure_board(struct controller *ctrl, struct pci_func * func) ...@@ -1027,7 +1027,7 @@ int cpqhp_configure_board(struct controller *ctrl, struct pci_func * func)
* *
* returns 0 if the board is the same nonzero otherwise * returns 0 if the board is the same nonzero otherwise
*/ */
int cpqhp_valid_replace(struct controller *ctrl, struct pci_func * func) int cpqhp_valid_replace(struct controller *ctrl, struct pci_func *func)
{ {
u8 cloop; u8 cloop;
u8 header_type; u8 header_type;
...@@ -1419,7 +1419,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st ...@@ -1419,7 +1419,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
* *
* returns 0 if success * returns 0 if success
*/ */
int cpqhp_return_board_resources(struct pci_func * func, struct resource_lists * resources) int cpqhp_return_board_resources(struct pci_func *func, struct resource_lists *resources)
{ {
int rc = 0; int rc = 0;
struct pci_resource *node; struct pci_resource *node;
...@@ -1475,7 +1475,7 @@ int cpqhp_return_board_resources(struct pci_func * func, struct resource_lists * ...@@ -1475,7 +1475,7 @@ int cpqhp_return_board_resources(struct pci_func * func, struct resource_lists *
* *
* Puts node back in the resource list pointed to by head * Puts node back in the resource list pointed to by head
*/ */
void cpqhp_destroy_resource_list (struct resource_lists * resources) void cpqhp_destroy_resource_list (struct resource_lists *resources)
{ {
struct pci_resource *res, *tres; struct pci_resource *res, *tres;
...@@ -1522,7 +1522,7 @@ void cpqhp_destroy_resource_list (struct resource_lists * resources) ...@@ -1522,7 +1522,7 @@ void cpqhp_destroy_resource_list (struct resource_lists * resources)
* *
* Puts node back in the resource list pointed to by head * Puts node back in the resource list pointed to by head
*/ */
void cpqhp_destroy_board_resources (struct pci_func * func) void cpqhp_destroy_board_resources (struct pci_func *func)
{ {
struct pci_resource *res, *tres; struct pci_resource *res, *tres;
......
drivers/pci/hotplug/cpqphp_sysfs.c
View file @ 38a61482
...@@ -79,7 +79,7 @@ static int show_ctrl (struct controller *ctrl, char *buf) ...@@ -79,7 +79,7 @@ static int show_ctrl (struct controller *ctrl, char *buf)
static int show_dev (struct controller *ctrl, char *buf) static int show_dev (struct controller *ctrl, char *buf)
{ {
char * out = buf; char *out = buf;
int index; int index;
struct pci_resource *res; struct pci_resource *res;
struct pci_func *new_slot; struct pci_func *new_slot;
......
drivers/pci/hotplug/ibmphp_core.c
View file @ 38a61482
...@@ -74,7 +74,7 @@ static inline int get_max_adapter_speed (struct hotplug_slot *hs, u8 *value) ...@@ -74,7 +74,7 @@ static inline int get_max_adapter_speed (struct hotplug_slot *hs, u8 *value)
static inline int get_cur_bus_info(struct slot **sl) static inline int get_cur_bus_info(struct slot **sl)
{ {
int rc = 1; int rc = 1;
struct slot * slot_cur = *sl; struct slot *slot_cur = *sl;
debug("options = %x\n", slot_cur->ctrl->options); debug("options = %x\n", slot_cur->ctrl->options);
debug("revision = %x\n", slot_cur->ctrl->revision); debug("revision = %x\n", slot_cur->ctrl->revision);
...@@ -114,8 +114,8 @@ static inline int slot_update(struct slot **sl) ...@@ -114,8 +114,8 @@ static inline int slot_update(struct slot **sl)
static int __init get_max_slots (void) static int __init get_max_slots (void)
{ {
struct slot * slot_cur; struct slot *slot_cur;
struct list_head * tmp; struct list_head *tmp;
u8 slot_count = 0; u8 slot_count = 0;
list_for_each(tmp, &ibmphp_slot_head) { list_for_each(tmp, &ibmphp_slot_head) {
...@@ -280,7 +280,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value) ...@@ -280,7 +280,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
return rc; return rc;
} }
static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value) static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
int rc = -ENODEV; int rc = -ENODEV;
struct slot *pslot; struct slot *pslot;
...@@ -311,7 +311,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value) ...@@ -311,7 +311,7 @@ static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value)
return rc; return rc;
} }
static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 * value) static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
int rc = -ENODEV; int rc = -ENODEV;
struct slot *pslot; struct slot *pslot;
...@@ -338,7 +338,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 * value) ...@@ -338,7 +338,7 @@ static int get_latch_status(struct hotplug_slot *hotplug_slot, u8 * value)
} }
static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value) static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
int rc = -ENODEV; int rc = -ENODEV;
struct slot *pslot; struct slot *pslot;
...@@ -364,7 +364,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value) ...@@ -364,7 +364,7 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
return rc; return rc;
} }
static int get_adapter_present(struct hotplug_slot *hotplug_slot, u8 * value) static int get_adapter_present(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
int rc = -ENODEV; int rc = -ENODEV;
struct slot *pslot; struct slot *pslot;
...@@ -433,7 +433,7 @@ static int get_max_bus_speed(struct slot *slot) ...@@ -433,7 +433,7 @@ static int get_max_bus_speed(struct slot *slot)
} }
/* /*
static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 * value, u8 flag) static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 *value, u8 flag)
{ {
int rc = -ENODEV; int rc = -ENODEV;
struct slot *pslot; struct slot *pslot;
...@@ -471,7 +471,7 @@ static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 * value ...@@ -471,7 +471,7 @@ static int get_max_adapter_speed_1(struct hotplug_slot *hotplug_slot, u8 * value
return rc; return rc;
} }
static int get_bus_name(struct hotplug_slot *hotplug_slot, char * value) static int get_bus_name(struct hotplug_slot *hotplug_slot, char *value)
{ {
int rc = -ENODEV; int rc = -ENODEV;
struct slot *pslot = NULL; struct slot *pslot = NULL;
...@@ -671,7 +671,7 @@ static struct pci_func *ibm_slot_find(u8 busno, u8 device, u8 function) ...@@ -671,7 +671,7 @@ static struct pci_func *ibm_slot_find(u8 busno, u8 device, u8 function)
{ {
struct pci_func *func_cur; struct pci_func *func_cur;
struct slot *slot_cur; struct slot *slot_cur;
struct list_head * tmp; struct list_head *tmp;
list_for_each(tmp, &ibmphp_slot_head) { list_for_each(tmp, &ibmphp_slot_head) {
slot_cur = list_entry(tmp, struct slot, ibm_slot_list); slot_cur = list_entry(tmp, struct slot, ibm_slot_list);
if (slot_cur->func) { if (slot_cur->func) {
...@@ -696,8 +696,8 @@ static struct pci_func *ibm_slot_find(u8 busno, u8 device, u8 function) ...@@ -696,8 +696,8 @@ static struct pci_func *ibm_slot_find(u8 busno, u8 device, u8 function)
static void free_slots(void) static void free_slots(void)
{ {
struct slot *slot_cur; struct slot *slot_cur;
struct list_head * tmp; struct list_head *tmp;
struct list_head * next; struct list_head *next;
debug("%s -- enter\n", __func__); debug("%s -- enter\n", __func__);
...@@ -825,10 +825,10 @@ static int ibm_configure_device(struct pci_func *func) ...@@ -825,10 +825,10 @@ static int ibm_configure_device(struct pci_func *func)
/******************************************************* /*******************************************************
* Returns whether the bus is empty or not * Returns whether the bus is empty or not
*******************************************************/ *******************************************************/
static int is_bus_empty(struct slot * slot_cur) static int is_bus_empty(struct slot *slot_cur)
{ {
int rc; int rc;
struct slot * tmp_slot; struct slot *tmp_slot;
u8 i = slot_cur->bus_on->slot_min; u8 i = slot_cur->bus_on->slot_min;
while (i <= slot_cur->bus_on->slot_max) { while (i <= slot_cur->bus_on->slot_max) {
...@@ -856,7 +856,7 @@ static int is_bus_empty(struct slot * slot_cur) ...@@ -856,7 +856,7 @@ static int is_bus_empty(struct slot * slot_cur)
* Parameters: slot * Parameters: slot
* Returns: bus is set (0) or error code * Returns: bus is set (0) or error code
***********************************************************/ ***********************************************************/
static int set_bus(struct slot * slot_cur) static int set_bus(struct slot *slot_cur)
{ {
int rc; int rc;
u8 speed; u8 speed;
...@@ -956,7 +956,7 @@ static int set_bus(struct slot * slot_cur) ...@@ -956,7 +956,7 @@ static int set_bus(struct slot * slot_cur)
static int check_limitations(struct slot *slot_cur) static int check_limitations(struct slot *slot_cur)
{ {
u8 i; u8 i;
struct slot * tmp_slot; struct slot *tmp_slot;
u8 count = 0; u8 count = 0;
u8 limitation = 0; u8 limitation = 0;
...@@ -1045,8 +1045,7 @@ static int enable_slot(struct hotplug_slot *hs) ...@@ -1045,8 +1045,7 @@ static int enable_slot(struct hotplug_slot *hs)
rc = check_limitations(slot_cur); rc = check_limitations(slot_cur);
if (rc) { if (rc) {
err("Adding this card exceeds the limitations of this bus.\n"); err("Adding this card exceeds the limitations of this bus.\n");
err("(i.e., >1 133MHz cards running on same bus, or " err("(i.e., >1 133MHz cards running on same bus, or >2 66 PCI cards running on same bus.\n");
">2 66 PCI cards running on same bus.\n");
err("Try hot-adding into another bus\n"); err("Try hot-adding into another bus\n");
rc = -EINVAL; rc = -EINVAL;
goto error_nopower; goto error_nopower;
...@@ -1070,12 +1069,10 @@ static int enable_slot(struct hotplug_slot *hs) ...@@ -1070,12 +1069,10 @@ static int enable_slot(struct hotplug_slot *hs)
!(SLOT_PWRGD(slot_cur->status))) !(SLOT_PWRGD(slot_cur->status)))
err("power fault occurred trying to power up\n"); err("power fault occurred trying to power up\n");
else if (SLOT_BUS_SPEED(slot_cur->status)) { else if (SLOT_BUS_SPEED(slot_cur->status)) {
err("bus speed mismatch occurred. please check " err("bus speed mismatch occurred. please check current bus speed and card capability\n");
"current bus speed and card capability\n");
print_card_capability(slot_cur); print_card_capability(slot_cur);
} else if (SLOT_BUS_MODE(slot_cur->ext_status)) { } else if (SLOT_BUS_MODE(slot_cur->ext_status)) {
err("bus mode mismatch occurred. please check " err("bus mode mismatch occurred. please check current bus mode and card capability\n");
"current bus mode and card capability\n");
print_card_capability(slot_cur); print_card_capability(slot_cur);
} }
ibmphp_update_slot_info(slot_cur); ibmphp_update_slot_info(slot_cur);
...@@ -1098,8 +1095,7 @@ static int enable_slot(struct hotplug_slot *hs) ...@@ -1098,8 +1095,7 @@ static int enable_slot(struct hotplug_slot *hs)
goto error_power; goto error_power;
} }
if (SLOT_POWER(slot_cur->status) && (SLOT_BUS_SPEED(slot_cur->status))) { if (SLOT_POWER(slot_cur->status) && (SLOT_BUS_SPEED(slot_cur->status))) {
err("bus speed mismatch occurred. please check current bus " err("bus speed mismatch occurred. please check current bus speed and card capability\n");
"speed and card capability\n");
print_card_capability(slot_cur); print_card_capability(slot_cur);
goto error_power; goto error_power;
} }
......
drivers/pci/hotplug/ibmphp_ebda.c
View file @ 38a61482
...@@ -563,7 +563,7 @@ static int first_slot_num (u8 slot_num, u8 first_slot, u8 var) ...@@ -563,7 +563,7 @@ static int first_slot_num (u8 slot_num, u8 first_slot, u8 var)
return rc; return rc;
} }
static struct opt_rio_lo * find_rxe_num (u8 slot_num) static struct opt_rio_lo *find_rxe_num (u8 slot_num)
{ {
struct opt_rio_lo *opt_lo_ptr; struct opt_rio_lo *opt_lo_ptr;
...@@ -575,7 +575,7 @@ static struct opt_rio_lo * find_rxe_num (u8 slot_num) ...@@ -575,7 +575,7 @@ static struct opt_rio_lo * find_rxe_num (u8 slot_num)
return NULL; return NULL;
} }
static struct opt_rio * find_chassis_num (u8 slot_num) static struct opt_rio *find_chassis_num (u8 slot_num)
{ {
struct opt_rio *opt_vg_ptr; struct opt_rio *opt_vg_ptr;
...@@ -593,7 +593,7 @@ static struct opt_rio * find_chassis_num (u8 slot_num) ...@@ -593,7 +593,7 @@ static struct opt_rio * find_chassis_num (u8 slot_num)
static u8 calculate_first_slot (u8 slot_num) static u8 calculate_first_slot (u8 slot_num)
{ {
u8 first_slot = 1; u8 first_slot = 1;
struct slot * slot_cur; struct slot *slot_cur;
list_for_each_entry(slot_cur, &ibmphp_slot_head, ibm_slot_list) { list_for_each_entry(slot_cur, &ibmphp_slot_head, ibm_slot_list) {
if (slot_cur->ctrl) { if (slot_cur->ctrl) {
...@@ -607,7 +607,7 @@ static u8 calculate_first_slot (u8 slot_num) ...@@ -607,7 +607,7 @@ static u8 calculate_first_slot (u8 slot_num)
#define SLOT_NAME_SIZE 30 #define SLOT_NAME_SIZE 30
static char *create_file_name (struct slot * slot_cur) static char *create_file_name (struct slot *slot_cur)
{ {
struct opt_rio *opt_vg_ptr = NULL; struct opt_rio *opt_vg_ptr = NULL;
struct opt_rio_lo *opt_lo_ptr = NULL; struct opt_rio_lo *opt_lo_ptr = NULL;
...@@ -1192,7 +1192,7 @@ int ibmphp_register_pci (void) ...@@ -1192,7 +1192,7 @@ int ibmphp_register_pci (void)
} }
return rc; return rc;
} }
static int ibmphp_probe (struct pci_dev * dev, const struct pci_device_id *ids) static int ibmphp_probe (struct pci_dev *dev, const struct pci_device_id *ids)
{ {
struct controller *ctrl; struct controller *ctrl;
......
drivers/pci/hotplug/ibmphp_hpc.c
View file @ 38a61482
...@@ -533,7 +533,7 @@ static u8 hpc_readcmdtoindex (u8 cmd, u8 index) ...@@ -533,7 +533,7 @@ static u8 hpc_readcmdtoindex (u8 cmd, u8 index)
* *
* Return 0 or error codes * Return 0 or error codes
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus) int ibmphp_hpc_readslot (struct slot *pslot, u8 cmd, u8 *pstatus)
{ {
void __iomem *wpg_bbar = NULL; void __iomem *wpg_bbar = NULL;
struct controller *ctlr_ptr; struct controller *ctlr_ptr;
...@@ -672,7 +672,7 @@ int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus) ...@@ -672,7 +672,7 @@ int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus)
* *
* Action: issue a WRITE command to HPC * Action: issue a WRITE command to HPC
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
int ibmphp_hpc_writeslot (struct slot * pslot, u8 cmd) int ibmphp_hpc_writeslot (struct slot *pslot, u8 cmd)
{ {
void __iomem *wpg_bbar = NULL; void __iomem *wpg_bbar = NULL;
struct controller *ctlr_ptr; struct controller *ctlr_ptr;
...@@ -1102,7 +1102,7 @@ void __exit ibmphp_hpc_stop_poll_thread (void) ...@@ -1102,7 +1102,7 @@ void __exit ibmphp_hpc_stop_poll_thread (void)
* Value: * Value:
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static int hpc_wait_ctlr_notworking (int timeout, struct controller *ctlr_ptr, void __iomem *wpg_bbar, static int hpc_wait_ctlr_notworking (int timeout, struct controller *ctlr_ptr, void __iomem *wpg_bbar,
u8 * pstatus) u8 *pstatus)
{ {
int rc = 0; int rc = 0;
u8 done = 0; u8 done = 0;
......
drivers/pci/hotplug/ibmphp_pci.c
View file @ 38a61482
...@@ -47,7 +47,7 @@ static u8 find_sec_number (u8 primary_busno, u8 slotno); ...@@ -47,7 +47,7 @@ static u8 find_sec_number (u8 primary_busno, u8 slotno);
* We also assign the same irq numbers for multi function devices. * We also assign the same irq numbers for multi function devices.
* These are PIC mode, so shouldn't matter n.e.ways (hopefully) * These are PIC mode, so shouldn't matter n.e.ways (hopefully)
*/ */
static void assign_alt_irq (struct pci_func * cur_func, u8 class_code) static void assign_alt_irq (struct pci_func *cur_func, u8 class_code)
{ {
int j; int j;
for (j = 0; j < 4; j++) { for (j = 0; j < 4; j++) {
...@@ -137,8 +137,8 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno) ...@@ -137,8 +137,8 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno)
"Please choose another device.\n", cur_func->device); "Please choose another device.\n", cur_func->device);
return -ENODEV; return -ENODEV;
} else if (class == PCI_CLASS_DISPLAY_VGA) { } else if (class == PCI_CLASS_DISPLAY_VGA) {
err ("The device %x is not supported for hot plugging. " err ("The device %x is not supported for hot plugging. Please choose another device.\n",
"Please choose another device.\n", cur_func->device); cur_func->device);
return -ENODEV; return -ENODEV;
} }
switch (hdr_type) { switch (hdr_type) {
...@@ -179,8 +179,8 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno) ...@@ -179,8 +179,8 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno)
case PCI_HEADER_TYPE_MULTIBRIDGE: case PCI_HEADER_TYPE_MULTIBRIDGE:
class >>= 8; class >>= 8;
if (class != PCI_CLASS_BRIDGE_PCI) { if (class != PCI_CLASS_BRIDGE_PCI) {
err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. " err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. Please insert another card.\n",
"Please insert another card.\n", cur_func->device); cur_func->device);
return -ENODEV; return -ENODEV;
} }
assign_alt_irq (cur_func, class_code); assign_alt_irq (cur_func, class_code);
...@@ -247,8 +247,8 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno) ...@@ -247,8 +247,8 @@ int ibmphp_configure_card (struct pci_func *func, u8 slotno)
class >>= 8; class >>= 8;
debug ("class now is %x\n", class); debug ("class now is %x\n", class);
if (class != PCI_CLASS_BRIDGE_PCI) { if (class != PCI_CLASS_BRIDGE_PCI) {
err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. " err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. Please insert another card.\n",
"Please insert another card.\n", cur_func->device); cur_func->device);
return -ENODEV; return -ENODEV;
} }
...@@ -1073,7 +1073,7 @@ static int configure_bridge (struct pci_func **func_passed, u8 slotno) ...@@ -1073,7 +1073,7 @@ static int configure_bridge (struct pci_func **func_passed, u8 slotno)
* Input: bridge function * Input: bridge function
* Output: amount of resources needed * Output: amount of resources needed
*****************************************************************************/ *****************************************************************************/
static struct res_needed *scan_behind_bridge (struct pci_func * func, u8 busno) static struct res_needed *scan_behind_bridge (struct pci_func *func, u8 busno)
{ {
int count, len[6]; int count, len[6];
u16 vendor_id; u16 vendor_id;
...@@ -1125,13 +1125,11 @@ static struct res_needed *scan_behind_bridge (struct pci_func * func, u8 busno) ...@@ -1125,13 +1125,11 @@ static struct res_needed *scan_behind_bridge (struct pci_func * func, u8 busno)
class >>= 8; /* to take revision out, class = class.subclass.prog i/f */ class >>= 8; /* to take revision out, class = class.subclass.prog i/f */
if (class == PCI_CLASS_NOT_DEFINED_VGA) { if (class == PCI_CLASS_NOT_DEFINED_VGA) {
err ("The device %x is VGA compatible and as is not supported for hot plugging. " err ("The device %x is VGA compatible and as is not supported for hot plugging. Please choose another device.\n", device);
"Please choose another device.\n", device);
amount->not_correct = 1; amount->not_correct = 1;
return amount; return amount;
} else if (class == PCI_CLASS_DISPLAY_VGA) { } else if (class == PCI_CLASS_DISPLAY_VGA) {
err ("The device %x is not supported for hot plugging. " err ("The device %x is not supported for hot plugging. Please choose another device.\n", device);
"Please choose another device.\n", device);
amount->not_correct = 1; amount->not_correct = 1;
return amount; return amount;
} }
...@@ -1483,12 +1481,10 @@ static int unconfigure_boot_card (struct slot *slot_cur) ...@@ -1483,12 +1481,10 @@ static int unconfigure_boot_card (struct slot *slot_cur)
debug ("hdr_type %x, class %x\n", hdr_type, class); debug ("hdr_type %x, class %x\n", hdr_type, class);
class >>= 8; /* to take revision out, class = class.subclass.prog i/f */ class >>= 8; /* to take revision out, class = class.subclass.prog i/f */
if (class == PCI_CLASS_NOT_DEFINED_VGA) { if (class == PCI_CLASS_NOT_DEFINED_VGA) {
err ("The device %x function %x is VGA compatible and is not supported for hot removing. " err ("The device %x function %x is VGA compatible and is not supported for hot removing. Please choose another device.\n", device, function);
"Please choose another device.\n", device, function);
return -ENODEV; return -ENODEV;
} else if (class == PCI_CLASS_DISPLAY_VGA) { } else if (class == PCI_CLASS_DISPLAY_VGA) {
err ("The device %x function %x is not supported for hot removing. " err ("The device %x function %x is not supported for hot removing. Please choose another device.\n", device, function);
"Please choose another device.\n", device, function);
return -ENODEV; return -ENODEV;
} }
...@@ -1513,9 +1509,7 @@ static int unconfigure_boot_card (struct slot *slot_cur) ...@@ -1513,9 +1509,7 @@ static int unconfigure_boot_card (struct slot *slot_cur)
case PCI_HEADER_TYPE_BRIDGE: case PCI_HEADER_TYPE_BRIDGE:
class >>= 8; class >>= 8;
if (class != PCI_CLASS_BRIDGE_PCI) { if (class != PCI_CLASS_BRIDGE_PCI) {
err ("This device %x function %x is not PCI-to-PCI bridge, " err ("This device %x function %x is not PCI-to-PCI bridge, and is not supported for hot-removing. Please try another card.\n", device, function);
"and is not supported for hot-removing. "
"Please try another card.\n", device, function);
return -ENODEV; return -ENODEV;
} }
rc = unconfigure_boot_bridge (busno, device, function); rc = unconfigure_boot_bridge (busno, device, function);
...@@ -1529,9 +1523,7 @@ static int unconfigure_boot_card (struct slot *slot_cur) ...@@ -1529,9 +1523,7 @@ static int unconfigure_boot_card (struct slot *slot_cur)
case PCI_HEADER_TYPE_MULTIBRIDGE: case PCI_HEADER_TYPE_MULTIBRIDGE:
class >>= 8; class >>= 8;
if (class != PCI_CLASS_BRIDGE_PCI) { if (class != PCI_CLASS_BRIDGE_PCI) {
err ("This device %x function %x is not PCI-to-PCI bridge, " err ("This device %x function %x is not PCI-to-PCI bridge, and is not supported for hot-removing. Please try another card.\n", device, function);
"and is not supported for hot-removing. "
"Please try another card.\n", device, function);
return -ENODEV; return -ENODEV;
} }
rc = unconfigure_boot_bridge (busno, device, function); rc = unconfigure_boot_bridge (busno, device, function);
......
drivers/pci/hotplug/ibmphp_res.c
View file @ 38a61482
...@@ -46,9 +46,9 @@ static struct bus_node *find_bus_wprev (u8, struct bus_node **, u8); ...@@ -46,9 +46,9 @@ static struct bus_node *find_bus_wprev (u8, struct bus_node **, u8);
static LIST_HEAD(gbuses); static LIST_HEAD(gbuses);
static struct bus_node * __init alloc_error_bus (struct ebda_pci_rsrc * curr, u8 busno, int flag) static struct bus_node * __init alloc_error_bus (struct ebda_pci_rsrc *curr, u8 busno, int flag)
{ {
struct bus_node * newbus; struct bus_node *newbus;
if (!(curr) && !(flag)) { if (!(curr) && !(flag)) {
err ("NULL pointer passed\n"); err ("NULL pointer passed\n");
...@@ -69,7 +69,7 @@ static struct bus_node * __init alloc_error_bus (struct ebda_pci_rsrc * curr, u8 ...@@ -69,7 +69,7 @@ static struct bus_node * __init alloc_error_bus (struct ebda_pci_rsrc * curr, u8
return newbus; return newbus;
} }
static struct resource_node * __init alloc_resources (struct ebda_pci_rsrc * curr) static struct resource_node * __init alloc_resources (struct ebda_pci_rsrc *curr)
{ {
struct resource_node *rs; struct resource_node *rs;
...@@ -93,7 +93,7 @@ static struct resource_node * __init alloc_resources (struct ebda_pci_rsrc * cur ...@@ -93,7 +93,7 @@ static struct resource_node * __init alloc_resources (struct ebda_pci_rsrc * cur
static int __init alloc_bus_range (struct bus_node **new_bus, struct range_node **new_range, struct ebda_pci_rsrc *curr, int flag, u8 first_bus) static int __init alloc_bus_range (struct bus_node **new_bus, struct range_node **new_range, struct ebda_pci_rsrc *curr, int flag, u8 first_bus)
{ {
struct bus_node * newbus; struct bus_node *newbus;
struct range_node *newrange; struct range_node *newrange;
u8 num_ranges = 0; u8 num_ranges = 0;
...@@ -789,8 +789,7 @@ int ibmphp_remove_resource (struct resource_node *res) ...@@ -789,8 +789,7 @@ int ibmphp_remove_resource (struct resource_node *res)
bus_cur = find_bus_wprev (res->busno, NULL, 0); bus_cur = find_bus_wprev (res->busno, NULL, 0);
if (!bus_cur) { if (!bus_cur) {
err ("cannot find corresponding bus of the io resource to remove " err ("cannot find corresponding bus of the io resource to remove bailing out...\n");
"bailing out...\n");
return -ENODEV; return -ENODEV;
} }
...@@ -934,9 +933,9 @@ int ibmphp_remove_resource (struct resource_node *res) ...@@ -934,9 +933,9 @@ int ibmphp_remove_resource (struct resource_node *res)
return 0; return 0;
} }
static struct range_node * find_range (struct bus_node *bus_cur, struct resource_node * res) static struct range_node *find_range (struct bus_node *bus_cur, struct resource_node *res)
{ {
struct range_node * range = NULL; struct range_node *range = NULL;
switch (res->type) { switch (res->type) {
case IO: case IO:
......
drivers/pci/hotplug/pci_hotplug_core.c
View file @ 38a61482
...@@ -59,14 +59,12 @@ static bool debug; ...@@ -59,14 +59,12 @@ static bool debug;
#define DRIVER_DESC "PCI Hot Plug PCI Core" #define DRIVER_DESC "PCI Hot Plug PCI Core"
//////////////////////////////////////////////////////////////////
static LIST_HEAD(pci_hotplug_slot_list); static LIST_HEAD(pci_hotplug_slot_list);
static DEFINE_MUTEX(pci_hp_mutex); static DEFINE_MUTEX(pci_hp_mutex);
/* Weee, fun with macros... */ /* Weee, fun with macros... */
#define GET_STATUS(name,type) \ #define GET_STATUS(name, type) \
static int get_##name (struct hotplug_slot *slot, type *value) \ static int get_##name(struct hotplug_slot *slot, type *value) \
{ \ { \
struct hotplug_slot_ops *ops = slot->ops; \ struct hotplug_slot_ops *ops = slot->ops; \
int retval = 0; \ int retval = 0; \
...@@ -92,10 +90,9 @@ static ssize_t power_read_file(struct pci_slot *slot, char *buf) ...@@ -92,10 +90,9 @@ static ssize_t power_read_file(struct pci_slot *slot, char *buf)
retval = get_power_status(slot->hotplug, &value); retval = get_power_status(slot->hotplug, &value);
if (retval) if (retval)
goto exit;
retval = sprintf (buf, "%d\n", value);
exit:
return retval; return retval;
return sprintf(buf, "%d\n", value);
} }
static ssize_t power_write_file(struct pci_slot *pci_slot, const char *buf, static ssize_t power_write_file(struct pci_slot *pci_slot, const char *buf,
...@@ -106,9 +103,9 @@ static ssize_t power_write_file(struct pci_slot *pci_slot, const char *buf, ...@@ -106,9 +103,9 @@ static ssize_t power_write_file(struct pci_slot *pci_slot, const char *buf,
u8 power; u8 power;
int retval = 0; int retval = 0;
lpower = simple_strtoul (buf, NULL, 10); lpower = simple_strtoul(buf, NULL, 10);
power = (u8)(lpower & 0xff); power = (u8)(lpower & 0xff);
dbg ("power = %d\n", power); dbg("power = %d\n", power);
if (!try_module_get(slot->ops->owner)) { if (!try_module_get(slot->ops->owner)) {
retval = -ENODEV; retval = -ENODEV;
...@@ -126,7 +123,7 @@ static ssize_t power_write_file(struct pci_slot *pci_slot, const char *buf, ...@@ -126,7 +123,7 @@ static ssize_t power_write_file(struct pci_slot *pci_slot, const char *buf,
break; break;
default: default:
err ("Illegal value specified for power\n"); err("Illegal value specified for power\n");
retval = -EINVAL; retval = -EINVAL;
} }
module_put(slot->ops->owner); module_put(slot->ops->owner);
...@@ -150,11 +147,9 @@ static ssize_t attention_read_file(struct pci_slot *slot, char *buf) ...@@ -150,11 +147,9 @@ static ssize_t attention_read_file(struct pci_slot *slot, char *buf)
retval = get_attention_status(slot->hotplug, &value); retval = get_attention_status(slot->hotplug, &value);
if (retval) if (retval)
goto exit;
retval = sprintf(buf, "%d\n", value);
exit:
return retval; return retval;
return sprintf(buf, "%d\n", value);
} }
static ssize_t attention_write_file(struct pci_slot *slot, const char *buf, static ssize_t attention_write_file(struct pci_slot *slot, const char *buf,
...@@ -165,9 +160,9 @@ static ssize_t attention_write_file(struct pci_slot *slot, const char *buf, ...@@ -165,9 +160,9 @@ static ssize_t attention_write_file(struct pci_slot *slot, const char *buf,
u8 attention; u8 attention;
int retval = 0; int retval = 0;
lattention = simple_strtoul (buf, NULL, 10); lattention = simple_strtoul(buf, NULL, 10);
attention = (u8)(lattention & 0xff); attention = (u8)(lattention & 0xff);
dbg (" - attention = %d\n", attention); dbg(" - attention = %d\n", attention);
if (!try_module_get(ops->owner)) { if (!try_module_get(ops->owner)) {
retval = -ENODEV; retval = -ENODEV;
...@@ -196,11 +191,9 @@ static ssize_t latch_read_file(struct pci_slot *slot, char *buf) ...@@ -196,11 +191,9 @@ static ssize_t latch_read_file(struct pci_slot *slot, char *buf)
retval = get_latch_status(slot->hotplug, &value); retval = get_latch_status(slot->hotplug, &value);
if (retval) if (retval)
goto exit;
retval = sprintf (buf, "%d\n", value);
exit:
return retval; return retval;
return sprintf(buf, "%d\n", value);
} }
static struct pci_slot_attribute hotplug_slot_attr_latch = { static struct pci_slot_attribute hotplug_slot_attr_latch = {
...@@ -215,11 +208,9 @@ static ssize_t presence_read_file(struct pci_slot *slot, char *buf) ...@@ -215,11 +208,9 @@ static ssize_t presence_read_file(struct pci_slot *slot, char *buf)
retval = get_adapter_status(slot->hotplug, &value); retval = get_adapter_status(slot->hotplug, &value);
if (retval) if (retval)
goto exit;
retval = sprintf (buf, "%d\n", value);
exit:
return retval; return retval;
return sprintf(buf, "%d\n", value);
} }
static struct pci_slot_attribute hotplug_slot_attr_presence = { static struct pci_slot_attribute hotplug_slot_attr_presence = {
...@@ -237,7 +228,7 @@ static ssize_t test_write_file(struct pci_slot *pci_slot, const char *buf, ...@@ -237,7 +228,7 @@ static ssize_t test_write_file(struct pci_slot *pci_slot, const char *buf,
ltest = simple_strtoul (buf, NULL, 10); ltest = simple_strtoul (buf, NULL, 10);
test = (u32)(ltest & 0xffffffff); test = (u32)(ltest & 0xffffffff);
dbg ("test = %d\n", test); dbg("test = %d\n", test);
if (!try_module_get(slot->ops->owner)) { if (!try_module_get(slot->ops->owner)) {
retval = -ENODEV; retval = -ENODEV;
...@@ -261,6 +252,7 @@ static struct pci_slot_attribute hotplug_slot_attr_test = { ...@@ -261,6 +252,7 @@ static struct pci_slot_attribute hotplug_slot_attr_test = {
static bool has_power_file(struct pci_slot *pci_slot) static bool has_power_file(struct pci_slot *pci_slot)
{ {
struct hotplug_slot *slot = pci_slot->hotplug; struct hotplug_slot *slot = pci_slot->hotplug;
if ((!slot) || (!slot->ops)) if ((!slot) || (!slot->ops))
return false; return false;
if ((slot->ops->enable_slot) || if ((slot->ops->enable_slot) ||
...@@ -273,6 +265,7 @@ static bool has_power_file(struct pci_slot *pci_slot) ...@@ -273,6 +265,7 @@ static bool has_power_file(struct pci_slot *pci_slot)
static bool has_attention_file(struct pci_slot *pci_slot) static bool has_attention_file(struct pci_slot *pci_slot)
{ {
struct hotplug_slot *slot = pci_slot->hotplug; struct hotplug_slot *slot = pci_slot->hotplug;
if ((!slot) || (!slot->ops)) if ((!slot) || (!slot->ops))
return false; return false;
if ((slot->ops->set_attention_status) || if ((slot->ops->set_attention_status) ||
...@@ -284,6 +277,7 @@ static bool has_attention_file(struct pci_slot *pci_slot) ...@@ -284,6 +277,7 @@ static bool has_attention_file(struct pci_slot *pci_slot)
static bool has_latch_file(struct pci_slot *pci_slot) static bool has_latch_file(struct pci_slot *pci_slot)
{ {
struct hotplug_slot *slot = pci_slot->hotplug; struct hotplug_slot *slot = pci_slot->hotplug;
if ((!slot) || (!slot->ops)) if ((!slot) || (!slot->ops))
return false; return false;
if (slot->ops->get_latch_status) if (slot->ops->get_latch_status)
...@@ -294,6 +288,7 @@ static bool has_latch_file(struct pci_slot *pci_slot) ...@@ -294,6 +288,7 @@ static bool has_latch_file(struct pci_slot *pci_slot)
static bool has_adapter_file(struct pci_slot *pci_slot) static bool has_adapter_file(struct pci_slot *pci_slot)
{ {
struct hotplug_slot *slot = pci_slot->hotplug; struct hotplug_slot *slot = pci_slot->hotplug;
if ((!slot) || (!slot->ops)) if ((!slot) || (!slot->ops))
return false; return false;
if (slot->ops->get_adapter_status) if (slot->ops->get_adapter_status)
...@@ -304,6 +299,7 @@ static bool has_adapter_file(struct pci_slot *pci_slot) ...@@ -304,6 +299,7 @@ static bool has_adapter_file(struct pci_slot *pci_slot)
static bool has_test_file(struct pci_slot *pci_slot) static bool has_test_file(struct pci_slot *pci_slot)
{ {
struct hotplug_slot *slot = pci_slot->hotplug; struct hotplug_slot *slot = pci_slot->hotplug;
if ((!slot) || (!slot->ops)) if ((!slot) || (!slot->ops))
return false; return false;
if (slot->ops->hardware_test) if (slot->ops->hardware_test)
...@@ -397,13 +393,13 @@ static void fs_remove_slot(struct pci_slot *slot) ...@@ -397,13 +393,13 @@ static void fs_remove_slot(struct pci_slot *slot)
pci_hp_remove_module_link(slot); pci_hp_remove_module_link(slot);
} }
static struct hotplug_slot *get_slot_from_name (const char *name) static struct hotplug_slot *get_slot_from_name(const char *name)
{ {
struct hotplug_slot *slot; struct hotplug_slot *slot;
struct list_head *tmp; struct list_head *tmp;
list_for_each (tmp, &pci_hotplug_slot_list) { list_for_each(tmp, &pci_hotplug_slot_list) {
slot = list_entry (tmp, struct hotplug_slot, slot_list); slot = list_entry(tmp, struct hotplug_slot, slot_list);
if (strcmp(hotplug_slot_name(slot), name) == 0) if (strcmp(hotplug_slot_name(slot), name) == 0)
return slot; return slot;
} }
...@@ -436,8 +432,7 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, ...@@ -436,8 +432,7 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
if ((slot->info == NULL) || (slot->ops == NULL)) if ((slot->info == NULL) || (slot->ops == NULL))
return -EINVAL; return -EINVAL;
if (slot->release == NULL) { if (slot->release == NULL) {
dbg("Why are you trying to register a hotplug slot " dbg("Why are you trying to register a hotplug slot without a proper release function?\n");
"without a proper release function?\n");
return -EINVAL; return -EINVAL;
} }
...@@ -468,6 +463,7 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus, ...@@ -468,6 +463,7 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
mutex_unlock(&pci_hp_mutex); mutex_unlock(&pci_hp_mutex);
return result; return result;
} }
EXPORT_SYMBOL_GPL(__pci_hp_register);
/** /**
* pci_hp_deregister - deregister a hotplug_slot with the PCI hotplug subsystem * pci_hp_deregister - deregister a hotplug_slot with the PCI hotplug subsystem
...@@ -506,6 +502,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug) ...@@ -506,6 +502,7 @@ int pci_hp_deregister(struct hotplug_slot *hotplug)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(pci_hp_deregister);
/** /**
* pci_hp_change_slot_info - changes the slot's information structure in the core * pci_hp_change_slot_info - changes the slot's information structure in the core
...@@ -527,24 +524,23 @@ int pci_hp_change_slot_info(struct hotplug_slot *hotplug, ...@@ -527,24 +524,23 @@ int pci_hp_change_slot_info(struct hotplug_slot *hotplug,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);
static int __init pci_hotplug_init (void) static int __init pci_hotplug_init(void)
{ {
int result; int result;
result = cpci_hotplug_init(debug); result = cpci_hotplug_init(debug);
if (result) { if (result) {
err ("cpci_hotplug_init with error %d\n", result); err("cpci_hotplug_init with error %d\n", result);
goto err_cpci; return result;
} }
info (DRIVER_DESC " version: " DRIVER_VERSION "\n"); info(DRIVER_DESC " version: " DRIVER_VERSION "\n");
err_cpci:
return result; return result;
} }
static void __exit pci_hotplug_exit (void) static void __exit pci_hotplug_exit(void)
{ {
cpci_hotplug_exit(); cpci_hotplug_exit();
} }
...@@ -557,7 +553,3 @@ MODULE_DESCRIPTION(DRIVER_DESC); ...@@ -557,7 +553,3 @@ MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
module_param(debug, bool, 0644); module_param(debug, bool, 0644);
MODULE_PARM_DESC(debug, "Debugging mode enabled or not"); MODULE_PARM_DESC(debug, "Debugging mode enabled or not");
EXPORT_SYMBOL_GPL(__pci_hp_register);
EXPORT_SYMBOL_GPL(pci_hp_deregister);
EXPORT_SYMBOL_GPL(pci_hp_change_slot_info);
drivers/pci/hotplug/pciehp_core.c
View file @ 38a61482
...@@ -266,8 +266,7 @@ static int pciehp_probe(struct pcie_device *dev) ...@@ -266,8 +266,7 @@ static int pciehp_probe(struct pcie_device *dev)
rc = init_slot(ctrl); rc = init_slot(ctrl);
if (rc) { if (rc) {
if (rc == -EBUSY) if (rc == -EBUSY)
ctrl_warn(ctrl, "Slot already registered by another " ctrl_warn(ctrl, "Slot already registered by another hotplug driver\n");
"hotplug driver\n");
else else
ctrl_err(ctrl, "Slot initialization failed\n"); ctrl_err(ctrl, "Slot initialization failed\n");
goto err_out_release_ctlr; goto err_out_release_ctlr;
...@@ -312,12 +311,12 @@ static void pciehp_remove(struct pcie_device *dev) ...@@ -312,12 +311,12 @@ static void pciehp_remove(struct pcie_device *dev)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pciehp_suspend (struct pcie_device *dev) static int pciehp_suspend(struct pcie_device *dev)
{ {
return 0; return 0;
} }
static int pciehp_resume (struct pcie_device *dev) static int pciehp_resume(struct pcie_device *dev)
{ {
struct controller *ctrl; struct controller *ctrl;
struct slot *slot; struct slot *slot;
......
drivers/pci/hotplug/pciehp_ctrl.c
View file @ 38a61482
...@@ -175,7 +175,7 @@ void pciehp_handle_linkstate_change(struct slot *p_slot) ...@@ -175,7 +175,7 @@ void pciehp_handle_linkstate_change(struct slot *p_slot)
hotplug controller logic hotplug controller logic
*/ */
static void set_slot_off(struct controller *ctrl, struct slot * pslot) static void set_slot_off(struct controller *ctrl, struct slot *pslot)
{ {
/* turn off slot, turn on Amber LED, turn off Green LED if supported*/ /* turn off slot, turn on Amber LED, turn off Green LED if supported*/
if (POWER_CTRL(ctrl)) { if (POWER_CTRL(ctrl)) {
...@@ -376,14 +376,12 @@ static void handle_button_press_event(struct slot *p_slot) ...@@ -376,14 +376,12 @@ static void handle_button_press_event(struct slot *p_slot)
pciehp_get_power_status(p_slot, &getstatus); pciehp_get_power_status(p_slot, &getstatus);
if (getstatus) { if (getstatus) {
p_slot->state = BLINKINGOFF_STATE; p_slot->state = BLINKINGOFF_STATE;
ctrl_info(ctrl, ctrl_info(ctrl, "PCI slot #%s - powering off due to button press\n",
"PCI slot #%s - powering off due to button " slot_name(p_slot));
"press.\n", slot_name(p_slot));
} else { } else {
p_slot->state = BLINKINGON_STATE; p_slot->state = BLINKINGON_STATE;
ctrl_info(ctrl, ctrl_info(ctrl, "PCI slot #%s - powering on due to button press\n",
"PCI slot #%s - powering on due to button " slot_name(p_slot));
"press.\n", slot_name(p_slot));
} }
/* blink green LED and turn off amber */ /* blink green LED and turn off amber */
pciehp_green_led_blink(p_slot); pciehp_green_led_blink(p_slot);
...@@ -404,8 +402,8 @@ static void handle_button_press_event(struct slot *p_slot) ...@@ -404,8 +402,8 @@ static void handle_button_press_event(struct slot *p_slot)
else else
pciehp_green_led_off(p_slot); pciehp_green_led_off(p_slot);
pciehp_set_attention_status(p_slot, 0); pciehp_set_attention_status(p_slot, 0);
ctrl_info(ctrl, "PCI slot #%s - action canceled " ctrl_info(ctrl, "PCI slot #%s - action canceled due to button press\n",
"due to button press\n", slot_name(p_slot)); slot_name(p_slot));
p_slot->state = STATIC_STATE; p_slot->state = STATIC_STATE;
break; break;
case POWEROFF_STATE: case POWEROFF_STATE:
......
drivers/pci/hotplug/pciehp_hpc.c
View file @ 38a61482
...@@ -174,12 +174,10 @@ static void pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask) ...@@ -174,12 +174,10 @@ static void pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
* event even though it supports none of power * event even though it supports none of power
* controller, attention led, power led and EMI. * controller, attention led, power led and EMI.
*/ */
ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Need to " ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Need to wait for command completed event\n");
"wait for command completed event.\n");
ctrl->no_cmd_complete = 0; ctrl->no_cmd_complete = 0;
} else { } else {
ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Maybe " ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Maybe the controller is broken\n");
"the controller is broken.\n");
} }
} }
...@@ -295,7 +293,7 @@ int pciehp_check_link_status(struct controller *ctrl) ...@@ -295,7 +293,7 @@ int pciehp_check_link_status(struct controller *ctrl)
ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status); ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status);
if ((lnk_status & PCI_EXP_LNKSTA_LT) || if ((lnk_status & PCI_EXP_LNKSTA_LT) ||
!(lnk_status & PCI_EXP_LNKSTA_NLW)) { !(lnk_status & PCI_EXP_LNKSTA_NLW)) {
ctrl_err(ctrl, "Link Training Error occurs \n"); ctrl_err(ctrl, "Link Training Error occurs\n");
return -1; return -1;
} }
...@@ -414,7 +412,7 @@ void pciehp_set_attention_status(struct slot *slot, u8 value) ...@@ -414,7 +412,7 @@ void pciehp_set_attention_status(struct slot *slot, u8 value)
return; return;
switch (value) { switch (value) {
case 0 : /* turn off */ case 0: /* turn off */
slot_cmd = PCI_EXP_SLTCTL_ATTN_IND_OFF; slot_cmd = PCI_EXP_SLTCTL_ATTN_IND_OFF;
break; break;
case 1: /* turn on */ case 1: /* turn on */
...@@ -470,7 +468,7 @@ void pciehp_green_led_blink(struct slot *slot) ...@@ -470,7 +468,7 @@ void pciehp_green_led_blink(struct slot *slot)
PCI_EXP_SLTCTL_PWR_IND_BLINK); PCI_EXP_SLTCTL_PWR_IND_BLINK);
} }
int pciehp_power_on_slot(struct slot * slot) int pciehp_power_on_slot(struct slot *slot)
{ {
struct controller *ctrl = slot->ctrl; struct controller *ctrl = slot->ctrl;
struct pci_dev *pdev = ctrl_dev(ctrl); struct pci_dev *pdev = ctrl_dev(ctrl);
...@@ -496,7 +494,7 @@ int pciehp_power_on_slot(struct slot * slot) ...@@ -496,7 +494,7 @@ int pciehp_power_on_slot(struct slot * slot)
return retval; return retval;
} }
void pciehp_power_off_slot(struct slot * slot) void pciehp_power_off_slot(struct slot *slot)
{ {
struct controller *ctrl = slot->ctrl; struct controller *ctrl = slot->ctrl;
...@@ -756,7 +754,7 @@ static inline void dbg_ctrl(struct controller *ctrl) ...@@ -756,7 +754,7 @@ static inline void dbg_ctrl(struct controller *ctrl)
ctrl_info(ctrl, "Slot Control : 0x%04x\n", reg16); ctrl_info(ctrl, "Slot Control : 0x%04x\n", reg16);
} }
#define FLAG(x,y) (((x) & (y)) ? '+' : '-') #define FLAG(x, y) (((x) & (y)) ? '+' : '-')
struct controller *pcie_init(struct pcie_device *dev) struct controller *pcie_init(struct pcie_device *dev)
{ {
......
drivers/pci/hotplug/pciehp_pci.c
View file @ 38a61482
...@@ -46,9 +46,8 @@ int pciehp_configure_device(struct slot *p_slot) ...@@ -46,9 +46,8 @@ int pciehp_configure_device(struct slot *p_slot)
dev = pci_get_slot(parent, PCI_DEVFN(0, 0)); dev = pci_get_slot(parent, PCI_DEVFN(0, 0));
if (dev) { if (dev) {
ctrl_err(ctrl, "Device %s already exists " ctrl_err(ctrl, "Device %s already exists at %04x:%02x:00, cannot hot-add\n",
"at %04x:%02x:00, cannot hot-add\n", pci_name(dev), pci_name(dev), pci_domain_nr(parent), parent->number);
pci_domain_nr(parent), parent->number);
pci_dev_put(dev); pci_dev_put(dev);
ret = -EEXIST; ret = -EEXIST;
goto out; goto out;
......
drivers/pci/hotplug/pcihp_skeleton.c
View file @ 38a61482
...@@ -51,7 +51,7 @@ static LIST_HEAD(slot_list); ...@@ -51,7 +51,7 @@ static LIST_HEAD(slot_list);
#define dbg(format, arg...) \ #define dbg(format, arg...) \
do { \ do { \
if (debug) \ if (debug) \
printk (KERN_DEBUG "%s: " format "\n", \ printk(KERN_DEBUG "%s: " format "\n", \
MY_NAME , ## arg); \ MY_NAME , ## arg); \
} while (0) } while (0)
#define err(format, arg...) printk(KERN_ERR "%s: " format "\n", MY_NAME , ## arg) #define err(format, arg...) printk(KERN_ERR "%s: " format "\n", MY_NAME , ## arg)
......
drivers/pci/hotplug/rpaphp_core.c
View file @ 38a61482
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
bool rpaphp_debug; bool rpaphp_debug;
LIST_HEAD(rpaphp_slot_head); LIST_HEAD(rpaphp_slot_head);
EXPORT_SYMBOL_GPL(rpaphp_slot_head);
#define DRIVER_VERSION "0.1" #define DRIVER_VERSION "0.1"
#define DRIVER_AUTHOR "Linda Xie <lxie@us.ibm.com>" #define DRIVER_AUTHOR "Linda Xie <lxie@us.ibm.com>"
...@@ -88,7 +89,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value) ...@@ -88,7 +89,7 @@ static int set_attention_status(struct hotplug_slot *hotplug_slot, u8 value)
* @hotplug_slot: slot to get status * @hotplug_slot: slot to get status
* @value: pointer to store status * @value: pointer to store status
*/ */
static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value) static int get_power_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
int retval, level; int retval, level;
struct slot *slot = (struct slot *)hotplug_slot->private; struct slot *slot = (struct slot *)hotplug_slot->private;
...@@ -104,14 +105,14 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value) ...@@ -104,14 +105,14 @@ static int get_power_status(struct hotplug_slot *hotplug_slot, u8 * value)
* @hotplug_slot: slot to get status * @hotplug_slot: slot to get status
* @value: pointer to store status * @value: pointer to store status
*/ */
static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 * value) static int get_attention_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
struct slot *slot = (struct slot *)hotplug_slot->private; struct slot *slot = (struct slot *)hotplug_slot->private;
*value = slot->hotplug_slot->info->attention_status; *value = slot->hotplug_slot->info->attention_status;
return 0; return 0;
} }
static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 * value) static int get_adapter_status(struct hotplug_slot *hotplug_slot, u8 *value)
{ {
struct slot *slot = (struct slot *)hotplug_slot->private; struct slot *slot = (struct slot *)hotplug_slot->private;
int rc, state; int rc, state;
...@@ -241,6 +242,7 @@ int rpaphp_get_drc_props(struct device_node *dn, int *drc_index, ...@@ -241,6 +242,7 @@ int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
return -EINVAL; return -EINVAL;
} }
EXPORT_SYMBOL_GPL(rpaphp_get_drc_props);
static int is_php_type(char *drc_type) static int is_php_type(char *drc_type)
{ {
...@@ -350,6 +352,7 @@ int rpaphp_add_slot(struct device_node *dn) ...@@ -350,6 +352,7 @@ int rpaphp_add_slot(struct device_node *dn)
/* XXX FIXME: reports a failure only if last entry in loop failed */ /* XXX FIXME: reports a failure only if last entry in loop failed */
return retval; return retval;
} }
EXPORT_SYMBOL_GPL(rpaphp_add_slot);
static void __exit cleanup_slots(void) static void __exit cleanup_slots(void)
{ {
...@@ -443,7 +446,3 @@ struct hotplug_slot_ops rpaphp_hotplug_slot_ops = { ...@@ -443,7 +446,3 @@ struct hotplug_slot_ops rpaphp_hotplug_slot_ops = {
module_init(rpaphp_init); module_init(rpaphp_init);
module_exit(rpaphp_exit); module_exit(rpaphp_exit);
EXPORT_SYMBOL_GPL(rpaphp_add_slot);
EXPORT_SYMBOL_GPL(rpaphp_slot_head);
EXPORT_SYMBOL_GPL(rpaphp_get_drc_props);
drivers/pci/hotplug/sgi_hotplug.c
View file @ 38a61482
...@@ -188,7 +188,7 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot, ...@@ -188,7 +188,7 @@ static int sn_hp_slot_private_alloc(struct hotplug_slot *bss_hotplug_slot,
return 0; return 0;
} }
static struct hotplug_slot * sn_hp_destroy(void) static struct hotplug_slot *sn_hp_destroy(void)
{ {
struct slot *slot; struct slot *slot;
struct pci_slot *pci_slot; struct pci_slot *pci_slot;
...@@ -250,15 +250,13 @@ static int sn_slot_enable(struct hotplug_slot *bss_hotplug_slot, ...@@ -250,15 +250,13 @@ static int sn_slot_enable(struct hotplug_slot *bss_hotplug_slot,
} }
if (rc == PCI_L1_ERR) { if (rc == PCI_L1_ERR) {
dev_dbg(&slot->pci_bus->self->dev, dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message: %s",
"L1 failure %d with message: %s",
resp.resp_sub_errno, resp.resp_l1_msg); resp.resp_sub_errno, resp.resp_l1_msg);
return -EPERM; return -EPERM;
} }
if (rc) { if (rc) {
dev_dbg(&slot->pci_bus->self->dev, dev_dbg(&slot->pci_bus->self->dev, "insert failed with error %d sub-error %d\n",
"insert failed with error %d sub-error %d\n",
rc, resp.resp_sub_errno); rc, resp.resp_sub_errno);
return -EIO; return -EIO;
} }
...@@ -288,21 +286,18 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot, ...@@ -288,21 +286,18 @@ static int sn_slot_disable(struct hotplug_slot *bss_hotplug_slot,
} }
if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_EMPTY_33MHZ)) { if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_EMPTY_33MHZ)) {
dev_dbg(&slot->pci_bus->self->dev, dev_dbg(&slot->pci_bus->self->dev, "Cannot remove last 33MHz card\n");
"Cannot remove last 33MHz card\n");
return -EPERM; return -EPERM;
} }
if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_L1_ERR)) { if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_L1_ERR)) {
dev_dbg(&slot->pci_bus->self->dev, dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message \n%s\n",
"L1 failure %d with message \n%s\n",
resp.resp_sub_errno, resp.resp_l1_msg); resp.resp_sub_errno, resp.resp_l1_msg);
return -EPERM; return -EPERM;
} }
if ((action == PCI_REQ_SLOT_ELIGIBLE) && rc) { if ((action == PCI_REQ_SLOT_ELIGIBLE) && rc) {
dev_dbg(&slot->pci_bus->self->dev, dev_dbg(&slot->pci_bus->self->dev, "remove failed with error %d sub-error %d\n",
"remove failed with error %d sub-error %d\n",
rc, resp.resp_sub_errno); rc, resp.resp_sub_errno);
return -EIO; return -EIO;
} }
...@@ -417,8 +412,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot) ...@@ -417,8 +412,7 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
phandle = acpi_device_handle(PCI_CONTROLLER(slot->pci_bus)->companion); phandle = acpi_device_handle(PCI_CONTROLLER(slot->pci_bus)->companion);
if (acpi_bus_get_device(phandle, &pdevice)) { if (acpi_bus_get_device(phandle, &pdevice)) {
dev_dbg(&slot->pci_bus->self->dev, dev_dbg(&slot->pci_bus->self->dev, "no parent device, assuming NULL\n");
"no parent device, assuming NULL\n");
pdevice = NULL; pdevice = NULL;
} }
...@@ -447,10 +441,8 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot) ...@@ -447,10 +441,8 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
ret = acpi_bus_scan(chandle); ret = acpi_bus_scan(chandle);
if (ACPI_FAILURE(ret)) { if (ACPI_FAILURE(ret)) {
printk(KERN_ERR "%s: acpi_bus_scan " printk(KERN_ERR "%s: acpi_bus_scan failed (0x%x) for slot %d func %d\n",
"failed (0x%x) for slot %d " __func__, ret, (int)(adr>>16),
"func %d\n", __func__,
ret, (int)(adr>>16),
(int)(adr&0xffff)); (int)(adr&0xffff));
/* try to continue on */ /* try to continue on */
} }
...@@ -471,11 +463,9 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot) ...@@ -471,11 +463,9 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
mutex_unlock(&sn_hotplug_mutex); mutex_unlock(&sn_hotplug_mutex);
if (rc == 0) if (rc == 0)
dev_dbg(&slot->pci_bus->self->dev, dev_dbg(&slot->pci_bus->self->dev, "insert operation successful\n");
"insert operation successful\n");
else else
dev_dbg(&slot->pci_bus->self->dev, dev_dbg(&slot->pci_bus->self->dev, "insert operation failed rc = %d\n", rc);
"insert operation failed rc = %d\n", rc);
return rc; return rc;
} }
...@@ -561,8 +551,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot) ...@@ -561,8 +551,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
acpi_status ret; acpi_status ret;
ret = acpi_unload_table_id(ssdt_id); ret = acpi_unload_table_id(ssdt_id);
if (ACPI_FAILURE(ret)) { if (ACPI_FAILURE(ret)) {
printk(KERN_ERR "%s: acpi_unload_table_id " printk(KERN_ERR "%s: acpi_unload_table_id failed (0x%x) for id %d\n",
"failed (0x%x) for id %d\n",
__func__, ret, ssdt_id); __func__, ret, ssdt_id);
/* try to continue on */ /* try to continue on */
} }
......
drivers/pci/hotplug/shpchp.h
View file @ 38a61482
...@@ -180,7 +180,7 @@ int shpchp_configure_device(struct slot *p_slot); ...@@ -180,7 +180,7 @@ int shpchp_configure_device(struct slot *p_slot);
int shpchp_unconfigure_device(struct slot *p_slot); int shpchp_unconfigure_device(struct slot *p_slot);
void cleanup_slots(struct controller *ctrl); void cleanup_slots(struct controller *ctrl);
void shpchp_queue_pushbutton_work(struct work_struct *work); void shpchp_queue_pushbutton_work(struct work_struct *work);
int shpc_init( struct controller *ctrl, struct pci_dev *pdev); int shpc_init(struct controller *ctrl, struct pci_dev *pdev);
static inline const char *slot_name(struct slot *slot) static inline const char *slot_name(struct slot *slot)
{ {
...@@ -295,7 +295,7 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot) ...@@ -295,7 +295,7 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot)
pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, rse_set); pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MEM_BASE_LIMIT_OFFSET, rse_set);
} }
/* restore MiscII register */ /* restore MiscII register */
pci_read_config_dword( p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, &pcix_misc2_temp ); pci_read_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, &pcix_misc2_temp );
if (p_slot->ctrl->pcix_misc2_reg & SERRFATALENABLE_MASK) if (p_slot->ctrl->pcix_misc2_reg & SERRFATALENABLE_MASK)
pcix_misc2_temp |= SERRFATALENABLE_MASK; pcix_misc2_temp |= SERRFATALENABLE_MASK;
......
drivers/pci/hotplug/shpchp_core.c
View file @ 38a61482
...@@ -143,8 +143,7 @@ static int init_slots(struct controller *ctrl) ...@@ -143,8 +143,7 @@ static int init_slots(struct controller *ctrl)
snprintf(name, SLOT_NAME_SIZE, "%d", slot->number); snprintf(name, SLOT_NAME_SIZE, "%d", slot->number);
hotplug_slot->ops = &shpchp_hotplug_slot_ops; hotplug_slot->ops = &shpchp_hotplug_slot_ops;
ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x " ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x hp_slot=%x sun=%x slot_device_offset=%x\n",
"hp_slot=%x sun=%x slot_device_offset=%x\n",
pci_domain_nr(ctrl->pci_dev->subordinate), pci_domain_nr(ctrl->pci_dev->subordinate),
slot->bus, slot->device, slot->hp_slot, slot->number, slot->bus, slot->device, slot->hp_slot, slot->number,
ctrl->slot_device_offset); ctrl->slot_device_offset);
......
drivers/pci/hotplug/shpchp_ctrl.c
View file @ 38a61482
...@@ -162,7 +162,7 @@ u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl) ...@@ -162,7 +162,7 @@ u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset); p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
if ( !(p_slot->hpc_ops->query_power_fault(p_slot))) { if (!(p_slot->hpc_ops->query_power_fault(p_slot))) {
/* /*
* Power fault Cleared * Power fault Cleared
*/ */
...@@ -196,8 +196,8 @@ static int change_bus_speed(struct controller *ctrl, struct slot *p_slot, ...@@ -196,8 +196,8 @@ static int change_bus_speed(struct controller *ctrl, struct slot *p_slot,
ctrl_dbg(ctrl, "Change speed to %d\n", speed); ctrl_dbg(ctrl, "Change speed to %d\n", speed);
if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, speed))) { if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, speed))) {
ctrl_err(ctrl, "%s: Issue of set bus speed mode command " ctrl_err(ctrl, "%s: Issue of set bus speed mode command failed\n",
"failed\n", __func__); __func__);
return WRONG_BUS_FREQUENCY; return WRONG_BUS_FREQUENCY;
} }
return rc; return rc;
...@@ -215,8 +215,8 @@ static int fix_bus_speed(struct controller *ctrl, struct slot *pslot, ...@@ -215,8 +215,8 @@ static int fix_bus_speed(struct controller *ctrl, struct slot *pslot,
*/ */
if (flag) { if (flag) {
if (asp < bsp) { if (asp < bsp) {
ctrl_err(ctrl, "Speed of bus %x and adapter %x " ctrl_err(ctrl, "Speed of bus %x and adapter %x mismatch\n",
"mismatch\n", bsp, asp); bsp, asp);
rc = WRONG_BUS_FREQUENCY; rc = WRONG_BUS_FREQUENCY;
} }
return rc; return rc;
...@@ -250,8 +250,7 @@ static int board_added(struct slot *p_slot) ...@@ -250,8 +250,7 @@ static int board_added(struct slot *p_slot)
hp_slot = p_slot->device - ctrl->slot_device_offset; hp_slot = p_slot->device - ctrl->slot_device_offset;
ctrl_dbg(ctrl, ctrl_dbg(ctrl, "%s: p_slot->device, slot_offset, hp_slot = %d, %d ,%d\n",
"%s: p_slot->device, slot_offset, hp_slot = %d, %d ,%d\n",
__func__, p_slot->device, ctrl->slot_device_offset, hp_slot); __func__, p_slot->device, ctrl->slot_device_offset, hp_slot);
/* Power on slot without connecting to bus */ /* Power on slot without connecting to bus */
...@@ -263,8 +262,8 @@ static int board_added(struct slot *p_slot) ...@@ -263,8 +262,8 @@ static int board_added(struct slot *p_slot)
if ((ctrl->pci_dev->vendor == 0x8086) && (ctrl->pci_dev->device == 0x0332)) { if ((ctrl->pci_dev->vendor == 0x8086) && (ctrl->pci_dev->device == 0x0332)) {
if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, PCI_SPEED_33MHz))) { if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, PCI_SPEED_33MHz))) {
ctrl_err(ctrl, "%s: Issue of set bus speed mode command" ctrl_err(ctrl, "%s: Issue of set bus speed mode command failed\n",
" failed\n", __func__); __func__);
return WRONG_BUS_FREQUENCY; return WRONG_BUS_FREQUENCY;
} }
...@@ -277,8 +276,7 @@ static int board_added(struct slot *p_slot) ...@@ -277,8 +276,7 @@ static int board_added(struct slot *p_slot)
rc = p_slot->hpc_ops->get_adapter_speed(p_slot, &asp); rc = p_slot->hpc_ops->get_adapter_speed(p_slot, &asp);
if (rc) { if (rc) {
ctrl_err(ctrl, "Can't get adapter speed or " ctrl_err(ctrl, "Can't get adapter speed or bus mode mismatch\n");
"bus mode mismatch\n");
return WRONG_BUS_FREQUENCY; return WRONG_BUS_FREQUENCY;
} }
...@@ -289,8 +287,8 @@ static int board_added(struct slot *p_slot) ...@@ -289,8 +287,8 @@ static int board_added(struct slot *p_slot)
if (!list_empty(&ctrl->pci_dev->subordinate->devices)) if (!list_empty(&ctrl->pci_dev->subordinate->devices))
slots_not_empty = 1; slots_not_empty = 1;
ctrl_dbg(ctrl, "%s: slots_not_empty %d, adapter_speed %d, bus_speed %d," ctrl_dbg(ctrl, "%s: slots_not_empty %d, adapter_speed %d, bus_speed %d, max_bus_speed %d\n",
" max_bus_speed %d\n", __func__, slots_not_empty, asp, __func__, slots_not_empty, asp,
bsp, msp); bsp, msp);
rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, asp, bsp, msp); rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, asp, bsp, msp);
...@@ -490,12 +488,12 @@ static void handle_button_press_event(struct slot *p_slot) ...@@ -490,12 +488,12 @@ static void handle_button_press_event(struct slot *p_slot)
p_slot->hpc_ops->get_power_status(p_slot, &getstatus); p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
if (getstatus) { if (getstatus) {
p_slot->state = BLINKINGOFF_STATE; p_slot->state = BLINKINGOFF_STATE;
ctrl_info(ctrl, "PCI slot #%s - powering off due to " ctrl_info(ctrl, "PCI slot #%s - powering off due to button press\n",
"button press.\n", slot_name(p_slot)); slot_name(p_slot));
} else { } else {
p_slot->state = BLINKINGON_STATE; p_slot->state = BLINKINGON_STATE;
ctrl_info(ctrl, "PCI slot #%s - powering on due to " ctrl_info(ctrl, "PCI slot #%s - powering on due to button press\n",
"button press.\n", slot_name(p_slot)); slot_name(p_slot));
} }
/* blink green LED and turn off amber */ /* blink green LED and turn off amber */
p_slot->hpc_ops->green_led_blink(p_slot); p_slot->hpc_ops->green_led_blink(p_slot);
...@@ -518,8 +516,8 @@ static void handle_button_press_event(struct slot *p_slot) ...@@ -518,8 +516,8 @@ static void handle_button_press_event(struct slot *p_slot)
else else
p_slot->hpc_ops->green_led_off(p_slot); p_slot->hpc_ops->green_led_off(p_slot);
p_slot->hpc_ops->set_attention_status(p_slot, 0); p_slot->hpc_ops->set_attention_status(p_slot, 0);
ctrl_info(ctrl, "PCI slot #%s - action canceled due to " ctrl_info(ctrl, "PCI slot #%s - action canceled due to button press\n",
"button press\n", slot_name(p_slot)); slot_name(p_slot));
p_slot->state = STATIC_STATE; p_slot->state = STATIC_STATE;
break; break;
case POWEROFF_STATE: case POWEROFF_STATE:
......
drivers/pci/hotplug/shpchp_hpc.c
View file @ 38a61482
...@@ -341,8 +341,7 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd) ...@@ -341,8 +341,7 @@ static int shpc_write_cmd(struct slot *slot, u8 t_slot, u8 cmd)
cmd_status = hpc_check_cmd_status(slot->ctrl); cmd_status = hpc_check_cmd_status(slot->ctrl);
if (cmd_status) { if (cmd_status) {
ctrl_err(ctrl, ctrl_err(ctrl, "Failed to issued command 0x%x (error code = %d)\n",
"Failed to issued command 0x%x (error code = %d)\n",
cmd, cmd_status); cmd, cmd_status);
retval = -EIO; retval = -EIO;
} }
...@@ -404,7 +403,7 @@ static int hpc_get_attention_status(struct slot *slot, u8 *status) ...@@ -404,7 +403,7 @@ static int hpc_get_attention_status(struct slot *slot, u8 *status)
return 0; return 0;
} }
static int hpc_get_power_status(struct slot * slot, u8 *status) static int hpc_get_power_status(struct slot *slot, u8 *status)
{ {
struct controller *ctrl = slot->ctrl; struct controller *ctrl = slot->ctrl;
u32 slot_reg = shpc_readl(ctrl, SLOT_REG(slot->hp_slot)); u32 slot_reg = shpc_readl(ctrl, SLOT_REG(slot->hp_slot));
...@@ -528,7 +527,7 @@ static int hpc_get_mode1_ECC_cap(struct slot *slot, u8 *mode) ...@@ -528,7 +527,7 @@ static int hpc_get_mode1_ECC_cap(struct slot *slot, u8 *mode)
return retval; return retval;
} }
static int hpc_query_power_fault(struct slot * slot) static int hpc_query_power_fault(struct slot *slot)
{ {
struct controller *ctrl = slot->ctrl; struct controller *ctrl = slot->ctrl;
u32 slot_reg = shpc_readl(ctrl, SLOT_REG(slot->hp_slot)); u32 slot_reg = shpc_readl(ctrl, SLOT_REG(slot->hp_slot));
...@@ -614,7 +613,7 @@ static void hpc_release_ctlr(struct controller *ctrl) ...@@ -614,7 +613,7 @@ static void hpc_release_ctlr(struct controller *ctrl)
release_mem_region(ctrl->mmio_base, ctrl->mmio_size); release_mem_region(ctrl->mmio_base, ctrl->mmio_size);
} }
static int hpc_power_on_slot(struct slot * slot) static int hpc_power_on_slot(struct slot *slot)
{ {
int retval; int retval;
...@@ -625,7 +624,7 @@ static int hpc_power_on_slot(struct slot * slot) ...@@ -625,7 +624,7 @@ static int hpc_power_on_slot(struct slot * slot)
return retval; return retval;
} }
static int hpc_slot_enable(struct slot * slot) static int hpc_slot_enable(struct slot *slot)
{ {
int retval; int retval;
...@@ -638,7 +637,7 @@ static int hpc_slot_enable(struct slot * slot) ...@@ -638,7 +637,7 @@ static int hpc_slot_enable(struct slot * slot)
return retval; return retval;
} }
static int hpc_slot_disable(struct slot * slot) static int hpc_slot_disable(struct slot *slot)
{ {
int retval; int retval;
...@@ -720,7 +719,7 @@ static int shpc_get_cur_bus_speed(struct controller *ctrl) ...@@ -720,7 +719,7 @@ static int shpc_get_cur_bus_speed(struct controller *ctrl)
} }
static int hpc_set_bus_speed_mode(struct slot * slot, enum pci_bus_speed value) static int hpc_set_bus_speed_mode(struct slot *slot, enum pci_bus_speed value)
{ {
int retval; int retval;
struct controller *ctrl = slot->ctrl; struct controller *ctrl = slot->ctrl;
...@@ -974,8 +973,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev) ...@@ -974,8 +973,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
for (i = 0; i < 9 + num_slots; i++) { for (i = 0; i < 9 + num_slots; i++) {
rc = shpc_indirect_read(ctrl, i, &tempdword); rc = shpc_indirect_read(ctrl, i, &tempdword);
if (rc) { if (rc) {
ctrl_err(ctrl, ctrl_err(ctrl, "Cannot read creg (index = %d)\n",
"Cannot read creg (index = %d)\n", i); i);
goto abort; goto abort;
} }
ctrl_dbg(ctrl, " offset %d: value %x\n", i, tempdword); ctrl_dbg(ctrl, " offset %d: value %x\n", i, tempdword);
...@@ -1060,10 +1059,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev) ...@@ -1060,10 +1059,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
/* Installs the interrupt handler */ /* Installs the interrupt handler */
rc = pci_enable_msi(pdev); rc = pci_enable_msi(pdev);
if (rc) { if (rc) {
ctrl_info(ctrl, ctrl_info(ctrl, "Can't get msi for the hotplug controller\n");
"Can't get msi for the hotplug controller\n"); ctrl_info(ctrl, "Use INTx for the hotplug controller\n");
ctrl_info(ctrl,
"Use INTx for the hotplug controller\n");
} }
rc = request_irq(ctrl->pci_dev->irq, shpc_isr, IRQF_SHARED, rc = request_irq(ctrl->pci_dev->irq, shpc_isr, IRQF_SHARED,
...@@ -1071,8 +1068,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev) ...@@ -1071,8 +1068,8 @@ int shpc_init(struct controller *ctrl, struct pci_dev *pdev)
ctrl_dbg(ctrl, "request_irq %d (returns %d)\n", ctrl_dbg(ctrl, "request_irq %d (returns %d)\n",
ctrl->pci_dev->irq, rc); ctrl->pci_dev->irq, rc);
if (rc) { if (rc) {
ctrl_err(ctrl, "Can't get irq %d for the hotplug " ctrl_err(ctrl, "Can't get irq %d for the hotplug controller\n",
"controller\n", ctrl->pci_dev->irq); ctrl->pci_dev->irq);
goto abort_iounmap; goto abort_iounmap;
} }
} }
......
drivers/pci/hotplug/shpchp_pci.c
View file @ 38a61482
...@@ -46,9 +46,9 @@ int shpchp_configure_device(struct slot *p_slot) ...@@ -46,9 +46,9 @@ int shpchp_configure_device(struct slot *p_slot)
dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0)); dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0));
if (dev) { if (dev) {
ctrl_err(ctrl, "Device %s already exists " ctrl_err(ctrl, "Device %s already exists at %04x:%02x:%02x, cannot hot-add\n",
"at %04x:%02x:%02x, cannot hot-add\n", pci_name(dev), pci_name(dev), pci_domain_nr(parent),
pci_domain_nr(parent), p_slot->bus, p_slot->device); p_slot->bus, p_slot->device);
pci_dev_put(dev); pci_dev_put(dev);
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
......
drivers/pci/hotplug/shpchp_sysfs.c
View file @ 38a61482
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf) static ssize_t show_ctrl (struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
char * out = buf; char *out = buf;
int index, busnr; int index, busnr;
struct resource *res; struct resource *res;
struct pci_bus *bus; struct pci_bus *bus;
......
drivers/pci/htirq.c
View file @ 38a61482
...@@ -105,7 +105,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update) ...@@ -105,7 +105,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
spin_unlock_irqrestore(&ht_irq_lock, flags); spin_unlock_irqrestore(&ht_irq_lock, flags);
max_irq = (data >> 16) & 0xff; max_irq = (data >> 16) & 0xff;
if ( idx > max_irq) if (idx > max_irq)
return -EINVAL; return -EINVAL;
cfg = kmalloc(sizeof(*cfg), GFP_KERNEL); cfg = kmalloc(sizeof(*cfg), GFP_KERNEL);
...@@ -136,6 +136,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update) ...@@ -136,6 +136,7 @@ int __ht_create_irq(struct pci_dev *dev, int idx, ht_irq_update_t *update)
return irq; return irq;
} }
EXPORT_SYMBOL(__ht_create_irq);
/** /**
* ht_create_irq - create an irq and attach it to a device. * ht_create_irq - create an irq and attach it to a device.
...@@ -151,6 +152,7 @@ int ht_create_irq(struct pci_dev *dev, int idx) ...@@ -151,6 +152,7 @@ int ht_create_irq(struct pci_dev *dev, int idx)
{ {
return __ht_create_irq(dev, idx, NULL); return __ht_create_irq(dev, idx, NULL);
} }
EXPORT_SYMBOL(ht_create_irq);
/** /**
* ht_destroy_irq - destroy an irq created with ht_create_irq * ht_destroy_irq - destroy an irq created with ht_create_irq
...@@ -170,7 +172,4 @@ void ht_destroy_irq(unsigned int irq) ...@@ -170,7 +172,4 @@ void ht_destroy_irq(unsigned int irq)
kfree(cfg); kfree(cfg);
} }
EXPORT_SYMBOL(__ht_create_irq);
EXPORT_SYMBOL(ht_create_irq);
EXPORT_SYMBOL(ht_destroy_irq); EXPORT_SYMBOL(ht_destroy_irq);
drivers/pci/msi.c
View file @ 38a61482
...@@ -413,7 +413,7 @@ static void free_msi_irqs(struct pci_dev *dev) ...@@ -413,7 +413,7 @@ static void free_msi_irqs(struct pci_dev *dev)
if (dev->msi_irq_groups) { if (dev->msi_irq_groups) {
sysfs_remove_groups(&dev->dev.kobj, dev->msi_irq_groups); sysfs_remove_groups(&dev->dev.kobj, dev->msi_irq_groups);
msi_attrs = dev->msi_irq_groups[0]->attrs; msi_attrs = dev->msi_irq_groups[0]->attrs;
list_for_each_entry(entry, &dev->msi_list, list) { while (msi_attrs[count]) {
dev_attr = container_of(msi_attrs[count], dev_attr = container_of(msi_attrs[count],
struct device_attribute, attr); struct device_attribute, attr);
kfree(dev_attr->attr.name); kfree(dev_attr->attr.name);
...@@ -980,8 +980,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec) ...@@ -980,8 +980,7 @@ int pci_enable_msix(struct pci_dev *dev, struct msix_entry *entries, int nvec)
/* Check whether driver already requested for MSI irq */ /* Check whether driver already requested for MSI irq */
if (dev->msi_enabled) { if (dev->msi_enabled) {
dev_info(&dev->dev, "can't enable MSI-X " dev_info(&dev->dev, "can't enable MSI-X (MSI IRQ already assigned)\n");
"(MSI IRQ already assigned)\n");
return -EINVAL; return -EINVAL;
} }
status = msix_capability_init(dev, entries, nvec); status = msix_capability_init(dev, entries, nvec);
......
drivers/pci/pci-driver.c
View file @ 38a61482
...@@ -77,6 +77,7 @@ int pci_add_dynid(struct pci_driver *drv, ...@@ -77,6 +77,7 @@ int pci_add_dynid(struct pci_driver *drv,
return retval; return retval;
} }
EXPORT_SYMBOL_GPL(pci_add_dynid);
static void pci_free_dynids(struct pci_driver *drv) static void pci_free_dynids(struct pci_driver *drv)
{ {
...@@ -98,15 +99,15 @@ static void pci_free_dynids(struct pci_driver *drv) ...@@ -98,15 +99,15 @@ static void pci_free_dynids(struct pci_driver *drv)
* *
* Allow PCI IDs to be added to an existing driver via sysfs. * Allow PCI IDs to be added to an existing driver via sysfs.
*/ */
static ssize_t static ssize_t store_new_id(struct device_driver *driver, const char *buf,
store_new_id(struct device_driver *driver, const char *buf, size_t count) size_t count)
{ {
struct pci_driver *pdrv = to_pci_driver(driver); struct pci_driver *pdrv = to_pci_driver(driver);
const struct pci_device_id *ids = pdrv->id_table; const struct pci_device_id *ids = pdrv->id_table;
__u32 vendor, device, subvendor=PCI_ANY_ID, __u32 vendor, device, subvendor = PCI_ANY_ID,
subdevice=PCI_ANY_ID, class=0, class_mask=0; subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
unsigned long driver_data=0; unsigned long driver_data = 0;
int fields=0; int fields = 0;
int retval = 0; int retval = 0;
fields = sscanf(buf, "%x %x %x %x %x %x %lx", fields = sscanf(buf, "%x %x %x %x %x %x %lx",
...@@ -166,8 +167,8 @@ static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id); ...@@ -166,8 +167,8 @@ static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id);
* *
* Removes a dynamic pci device ID to this driver. * Removes a dynamic pci device ID to this driver.
*/ */
static ssize_t static ssize_t store_remove_id(struct device_driver *driver, const char *buf,
store_remove_id(struct device_driver *driver, const char *buf, size_t count) size_t count)
{ {
struct pci_dynid *dynid, *n; struct pci_dynid *dynid, *n;
struct pci_driver *pdrv = to_pci_driver(driver); struct pci_driver *pdrv = to_pci_driver(driver);
...@@ -235,6 +236,7 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, ...@@ -235,6 +236,7 @@ const struct pci_device_id *pci_match_id(const struct pci_device_id *ids,
} }
return NULL; return NULL;
} }
EXPORT_SYMBOL(pci_match_id);
static const struct pci_device_id pci_device_id_any = { static const struct pci_device_id pci_device_id_any = {
.vendor = PCI_ANY_ID, .vendor = PCI_ANY_ID,
...@@ -372,8 +374,7 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev, ...@@ -372,8 +374,7 @@ static int pci_call_probe(struct pci_driver *drv, struct pci_dev *dev,
* returns 0 on success, else error. * returns 0 on success, else error.
* side-effect: pci_dev->driver is set to drv when drv claims pci_dev. * side-effect: pci_dev->driver is set to drv when drv claims pci_dev.
*/ */
static int static int __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
__pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
{ {
const struct pci_device_id *id; const struct pci_device_id *id;
int error = 0; int error = 0;
...@@ -390,7 +391,7 @@ __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev) ...@@ -390,7 +391,7 @@ __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev)
return error; return error;
} }
static int pci_device_probe(struct device * dev) static int pci_device_probe(struct device *dev)
{ {
int error = 0; int error = 0;
struct pci_driver *drv; struct pci_driver *drv;
...@@ -406,10 +407,10 @@ static int pci_device_probe(struct device * dev) ...@@ -406,10 +407,10 @@ static int pci_device_probe(struct device * dev)
return error; return error;
} }
static int pci_device_remove(struct device * dev) static int pci_device_remove(struct device *dev)
{ {
struct pci_dev * pci_dev = to_pci_dev(dev); struct pci_dev *pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver; struct pci_driver *drv = pci_dev->driver;
if (drv) { if (drv) {
if (drv->remove) { if (drv->remove) {
...@@ -537,8 +538,8 @@ static int pci_pm_reenable_device(struct pci_dev *pci_dev) ...@@ -537,8 +538,8 @@ static int pci_pm_reenable_device(struct pci_dev *pci_dev)
static int pci_legacy_suspend(struct device *dev, pm_message_t state) static int pci_legacy_suspend(struct device *dev, pm_message_t state)
{ {
struct pci_dev * pci_dev = to_pci_dev(dev); struct pci_dev *pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver; struct pci_driver *drv = pci_dev->driver;
if (drv && drv->suspend) { if (drv && drv->suspend) {
pci_power_t prev = pci_dev->current_state; pci_power_t prev = pci_dev->current_state;
...@@ -564,8 +565,8 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state) ...@@ -564,8 +565,8 @@ static int pci_legacy_suspend(struct device *dev, pm_message_t state)
static int pci_legacy_suspend_late(struct device *dev, pm_message_t state) static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
{ {
struct pci_dev * pci_dev = to_pci_dev(dev); struct pci_dev *pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver; struct pci_driver *drv = pci_dev->driver;
if (drv && drv->suspend_late) { if (drv && drv->suspend_late) {
pci_power_t prev = pci_dev->current_state; pci_power_t prev = pci_dev->current_state;
...@@ -595,8 +596,8 @@ static int pci_legacy_suspend_late(struct device *dev, pm_message_t state) ...@@ -595,8 +596,8 @@ static int pci_legacy_suspend_late(struct device *dev, pm_message_t state)
static int pci_legacy_resume_early(struct device *dev) static int pci_legacy_resume_early(struct device *dev)
{ {
struct pci_dev * pci_dev = to_pci_dev(dev); struct pci_dev *pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver; struct pci_driver *drv = pci_dev->driver;
return drv && drv->resume_early ? return drv && drv->resume_early ?
drv->resume_early(pci_dev) : 0; drv->resume_early(pci_dev) : 0;
...@@ -604,8 +605,8 @@ static int pci_legacy_resume_early(struct device *dev) ...@@ -604,8 +605,8 @@ static int pci_legacy_resume_early(struct device *dev)
static int pci_legacy_resume(struct device *dev) static int pci_legacy_resume(struct device *dev)
{ {
struct pci_dev * pci_dev = to_pci_dev(dev); struct pci_dev *pci_dev = to_pci_dev(dev);
struct pci_driver * drv = pci_dev->driver; struct pci_driver *drv = pci_dev->driver;
pci_fixup_device(pci_fixup_resume, pci_dev); pci_fixup_device(pci_fixup_resume, pci_dev);
...@@ -1255,6 +1256,7 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner, ...@@ -1255,6 +1256,7 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
/* register with core */ /* register with core */
return driver_register(&drv->driver); return driver_register(&drv->driver);
} }
EXPORT_SYMBOL(__pci_register_driver);
/** /**
* pci_unregister_driver - unregister a pci driver * pci_unregister_driver - unregister a pci driver
...@@ -1266,12 +1268,12 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner, ...@@ -1266,12 +1268,12 @@ int __pci_register_driver(struct pci_driver *drv, struct module *owner,
* driverless. * driverless.
*/ */
void void pci_unregister_driver(struct pci_driver *drv)
pci_unregister_driver(struct pci_driver *drv)
{ {
driver_unregister(&drv->driver); driver_unregister(&drv->driver);
pci_free_dynids(drv); pci_free_dynids(drv);
} }
EXPORT_SYMBOL(pci_unregister_driver);
static struct pci_driver pci_compat_driver = { static struct pci_driver pci_compat_driver = {
.name = "compat" .name = "compat"
...@@ -1284,19 +1286,19 @@ static struct pci_driver pci_compat_driver = { ...@@ -1284,19 +1286,19 @@ static struct pci_driver pci_compat_driver = {
* Returns the appropriate pci_driver structure or %NULL if there is no * Returns the appropriate pci_driver structure or %NULL if there is no
* registered driver for the device. * registered driver for the device.
*/ */
struct pci_driver * struct pci_driver *pci_dev_driver(const struct pci_dev *dev)
pci_dev_driver(const struct pci_dev *dev)
{ {
if (dev->driver) if (dev->driver)
return dev->driver; return dev->driver;
else { else {
int i; int i;
for(i=0; i<=PCI_ROM_RESOURCE; i++) for (i = 0; i <= PCI_ROM_RESOURCE; i++)
if (dev->resource[i].flags & IORESOURCE_BUSY) if (dev->resource[i].flags & IORESOURCE_BUSY)
return &pci_compat_driver; return &pci_compat_driver;
} }
return NULL; return NULL;
} }
EXPORT_SYMBOL(pci_dev_driver);
/** /**
* pci_bus_match - Tell if a PCI device structure has a matching PCI device id structure * pci_bus_match - Tell if a PCI device structure has a matching PCI device id structure
...@@ -1342,6 +1344,7 @@ struct pci_dev *pci_dev_get(struct pci_dev *dev) ...@@ -1342,6 +1344,7 @@ struct pci_dev *pci_dev_get(struct pci_dev *dev)
get_device(&dev->dev); get_device(&dev->dev);
return dev; return dev;
} }
EXPORT_SYMBOL(pci_dev_get);
/** /**
* pci_dev_put - release a use of the pci device structure * pci_dev_put - release a use of the pci device structure
...@@ -1355,6 +1358,7 @@ void pci_dev_put(struct pci_dev *dev) ...@@ -1355,6 +1358,7 @@ void pci_dev_put(struct pci_dev *dev)
if (dev) if (dev)
put_device(&dev->dev); put_device(&dev->dev);
} }
EXPORT_SYMBOL(pci_dev_put);
static int pci_uevent(struct device *dev, struct kobj_uevent_env *env) static int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
{ {
...@@ -1400,19 +1404,10 @@ struct bus_type pci_bus_type = { ...@@ -1400,19 +1404,10 @@ struct bus_type pci_bus_type = {
.drv_groups = pci_drv_groups, .drv_groups = pci_drv_groups,
.pm = PCI_PM_OPS_PTR, .pm = PCI_PM_OPS_PTR,
}; };
EXPORT_SYMBOL(pci_bus_type);
static int __init pci_driver_init(void) static int __init pci_driver_init(void)
{ {
return bus_register(&pci_bus_type); return bus_register(&pci_bus_type);
} }
postcore_initcall(pci_driver_init); postcore_initcall(pci_driver_init);
EXPORT_SYMBOL_GPL(pci_add_dynid);
EXPORT_SYMBOL(pci_match_id);
EXPORT_SYMBOL(__pci_register_driver);
EXPORT_SYMBOL(pci_unregister_driver);
EXPORT_SYMBOL(pci_dev_driver);
EXPORT_SYMBOL(pci_bus_type);
EXPORT_SYMBOL(pci_dev_get);
EXPORT_SYMBOL(pci_dev_put);
drivers/pci/pci-label.c
View file @ 38a61482
...@@ -40,8 +40,7 @@ enum smbios_attr_enum { ...@@ -40,8 +40,7 @@ enum smbios_attr_enum {
SMBIOS_ATTR_INSTANCE_SHOW, SMBIOS_ATTR_INSTANCE_SHOW,
}; };
static size_t static size_t find_smbios_instance_string(struct pci_dev *pdev, char *buf,
find_smbios_instance_string(struct pci_dev *pdev, char *buf,
enum smbios_attr_enum attribute) enum smbios_attr_enum attribute)
{ {
const struct dmi_device *dmi; const struct dmi_device *dmi;
...@@ -74,9 +73,8 @@ find_smbios_instance_string(struct pci_dev *pdev, char *buf, ...@@ -74,9 +73,8 @@ find_smbios_instance_string(struct pci_dev *pdev, char *buf,
return 0; return 0;
} }
static umode_t static umode_t smbios_instance_string_exist(struct kobject *kobj,
smbios_instance_string_exist(struct kobject *kobj, struct attribute *attr, struct attribute *attr, int n)
int n)
{ {
struct device *dev; struct device *dev;
struct pci_dev *pdev; struct pci_dev *pdev;
...@@ -88,8 +86,8 @@ smbios_instance_string_exist(struct kobject *kobj, struct attribute *attr, ...@@ -88,8 +86,8 @@ smbios_instance_string_exist(struct kobject *kobj, struct attribute *attr,
S_IRUGO : 0; S_IRUGO : 0;
} }
static ssize_t static ssize_t smbioslabel_show(struct device *dev,
smbioslabel_show(struct device *dev, struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
pdev = to_pci_dev(dev); pdev = to_pci_dev(dev);
...@@ -98,8 +96,7 @@ smbioslabel_show(struct device *dev, struct device_attribute *attr, char *buf) ...@@ -98,8 +96,7 @@ smbioslabel_show(struct device *dev, struct device_attribute *attr, char *buf)
SMBIOS_ATTR_LABEL_SHOW); SMBIOS_ATTR_LABEL_SHOW);
} }
static ssize_t static ssize_t smbiosinstance_show(struct device *dev,
smbiosinstance_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
...@@ -130,26 +127,22 @@ static struct attribute_group smbios_attr_group = { ...@@ -130,26 +127,22 @@ static struct attribute_group smbios_attr_group = {
.is_visible = smbios_instance_string_exist, .is_visible = smbios_instance_string_exist,
}; };
static int static int pci_create_smbiosname_file(struct pci_dev *pdev)
pci_create_smbiosname_file(struct pci_dev *pdev)
{ {
return sysfs_create_group(&pdev->dev.kobj, &smbios_attr_group); return sysfs_create_group(&pdev->dev.kobj, &smbios_attr_group);
} }
static void static void pci_remove_smbiosname_file(struct pci_dev *pdev)
pci_remove_smbiosname_file(struct pci_dev *pdev)
{ {
sysfs_remove_group(&pdev->dev.kobj, &smbios_attr_group); sysfs_remove_group(&pdev->dev.kobj, &smbios_attr_group);
} }
#else #else
static inline int static inline int pci_create_smbiosname_file(struct pci_dev *pdev)
pci_create_smbiosname_file(struct pci_dev *pdev)
{ {
return -1; return -1;
} }
static inline void static inline void pci_remove_smbiosname_file(struct pci_dev *pdev)
pci_remove_smbiosname_file(struct pci_dev *pdev)
{ {
} }
#endif #endif
...@@ -175,8 +168,8 @@ static void dsm_label_utf16s_to_utf8s(union acpi_object *obj, char *buf) ...@@ -175,8 +168,8 @@ static void dsm_label_utf16s_to_utf8s(union acpi_object *obj, char *buf)
buf[len] = '\n'; buf[len] = '\n';
} }
static int static int dsm_get_label(struct device *dev, char *buf,
dsm_get_label(struct device *dev, char *buf, enum acpi_attr_enum attr) enum acpi_attr_enum attr)
{ {
acpi_handle handle; acpi_handle handle;
union acpi_object *obj, *tmp; union acpi_object *obj, *tmp;
...@@ -212,8 +205,7 @@ dsm_get_label(struct device *dev, char *buf, enum acpi_attr_enum attr) ...@@ -212,8 +205,7 @@ dsm_get_label(struct device *dev, char *buf, enum acpi_attr_enum attr)
return len; return len;
} }
static bool static bool device_has_dsm(struct device *dev)
device_has_dsm(struct device *dev)
{ {
acpi_handle handle; acpi_handle handle;
...@@ -225,8 +217,8 @@ device_has_dsm(struct device *dev) ...@@ -225,8 +217,8 @@ device_has_dsm(struct device *dev)
1 << DEVICE_LABEL_DSM); 1 << DEVICE_LABEL_DSM);
} }
static umode_t static umode_t acpi_index_string_exist(struct kobject *kobj,
acpi_index_string_exist(struct kobject *kobj, struct attribute *attr, int n) struct attribute *attr, int n)
{ {
struct device *dev; struct device *dev;
...@@ -238,14 +230,14 @@ acpi_index_string_exist(struct kobject *kobj, struct attribute *attr, int n) ...@@ -238,14 +230,14 @@ acpi_index_string_exist(struct kobject *kobj, struct attribute *attr, int n)
return 0; return 0;
} }
static ssize_t static ssize_t acpilabel_show(struct device *dev,
acpilabel_show(struct device *dev, struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return dsm_get_label(dev, buf, ACPI_ATTR_LABEL_SHOW); return dsm_get_label(dev, buf, ACPI_ATTR_LABEL_SHOW);
} }
static ssize_t static ssize_t acpiindex_show(struct device *dev,
acpiindex_show(struct device *dev, struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
return dsm_get_label(dev, buf, ACPI_ATTR_INDEX_SHOW); return dsm_get_label(dev, buf, ACPI_ATTR_INDEX_SHOW);
} }
...@@ -271,33 +263,28 @@ static struct attribute_group acpi_attr_group = { ...@@ -271,33 +263,28 @@ static struct attribute_group acpi_attr_group = {
.is_visible = acpi_index_string_exist, .is_visible = acpi_index_string_exist,
}; };
static int static int pci_create_acpi_index_label_files(struct pci_dev *pdev)
pci_create_acpi_index_label_files(struct pci_dev *pdev)
{ {
return sysfs_create_group(&pdev->dev.kobj, &acpi_attr_group); return sysfs_create_group(&pdev->dev.kobj, &acpi_attr_group);
} }
static int static int pci_remove_acpi_index_label_files(struct pci_dev *pdev)
pci_remove_acpi_index_label_files(struct pci_dev *pdev)
{ {
sysfs_remove_group(&pdev->dev.kobj, &acpi_attr_group); sysfs_remove_group(&pdev->dev.kobj, &acpi_attr_group);
return 0; return 0;
} }
#else #else
static inline int static inline int pci_create_acpi_index_label_files(struct pci_dev *pdev)
pci_create_acpi_index_label_files(struct pci_dev *pdev)
{ {
return -1; return -1;
} }
static inline int static inline int pci_remove_acpi_index_label_files(struct pci_dev *pdev)
pci_remove_acpi_index_label_files(struct pci_dev *pdev)
{ {
return -1; return -1;
} }
static inline bool static inline bool device_has_dsm(struct device *dev)
device_has_dsm(struct device *dev)
{ {
return false; return false;
} }
......
drivers/pci/pci-stub.c
View file @ 38a61482
...@@ -55,7 +55,7 @@ static int __init pci_stub_init(void) ...@@ -55,7 +55,7 @@ static int __init pci_stub_init(void)
p = ids; p = ids;
while ((id = strsep(&p, ","))) { while ((id = strsep(&p, ","))) {
unsigned int vendor, device, subvendor = PCI_ANY_ID, unsigned int vendor, device, subvendor = PCI_ANY_ID,
subdevice = PCI_ANY_ID, class=0, class_mask=0; subdevice = PCI_ANY_ID, class = 0, class_mask = 0;
int fields; int fields;
if (!strlen(id)) if (!strlen(id))
......
drivers/pci/pci-sysfs.c
View file @ 38a61482
This diff is collapsed.
drivers/pci/pci.c
View file @ 38a61482
This diff is collapsed.
drivers/pci/pcie/aer/aer_inject.c
View file @ 38a61482
...@@ -397,16 +397,14 @@ static int aer_inject(struct aer_error_inj *einj) ...@@ -397,16 +397,14 @@ static int aer_inject(struct aer_error_inj *einj)
if (!aer_mask_override && einj->cor_status && if (!aer_mask_override && einj->cor_status &&
!(einj->cor_status & ~cor_mask)) { !(einj->cor_status & ~cor_mask)) {
ret = -EINVAL; ret = -EINVAL;
printk(KERN_WARNING "The correctable error(s) is masked " printk(KERN_WARNING "The correctable error(s) is masked by device\n");
"by device\n");
spin_unlock_irqrestore(&inject_lock, flags); spin_unlock_irqrestore(&inject_lock, flags);
goto out_put; goto out_put;
} }
if (!aer_mask_override && einj->uncor_status && if (!aer_mask_override && einj->uncor_status &&
!(einj->uncor_status & ~uncor_mask)) { !(einj->uncor_status & ~uncor_mask)) {
ret = -EINVAL; ret = -EINVAL;
printk(KERN_WARNING "The uncorrectable error(s) is masked " printk(KERN_WARNING "The uncorrectable error(s) is masked by device\n");
"by device\n");
spin_unlock_irqrestore(&inject_lock, flags); spin_unlock_irqrestore(&inject_lock, flags);
goto out_put; goto out_put;
} }
...@@ -464,8 +462,7 @@ static int aer_inject(struct aer_error_inj *einj) ...@@ -464,8 +462,7 @@ static int aer_inject(struct aer_error_inj *einj)
goto out_put; goto out_put;
} }
aer_irq(-1, edev); aer_irq(-1, edev);
} } else
else
ret = -EINVAL; ret = -EINVAL;
out_put: out_put:
kfree(err_alloc); kfree(err_alloc);
......
drivers/pci/pcie/aer/aerdrv_core.c
View file @ 38a61482
...@@ -542,8 +542,7 @@ static void aer_recover_work_func(struct work_struct *work); ...@@ -542,8 +542,7 @@ static void aer_recover_work_func(struct work_struct *work);
#define AER_RECOVER_RING_ORDER 4 #define AER_RECOVER_RING_ORDER 4
#define AER_RECOVER_RING_SIZE (1 << AER_RECOVER_RING_ORDER) #define AER_RECOVER_RING_SIZE (1 << AER_RECOVER_RING_ORDER)
struct aer_recover_entry struct aer_recover_entry {
{
u8 bus; u8 bus;
u8 devfn; u8 devfn;
u16 domain; u16 domain;
......
drivers/pci/pcie/aer/aerdrv_errprint.c
View file @ 38a61482
...@@ -172,9 +172,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) ...@@ -172,9 +172,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
int id = ((dev->bus->number << 8) | dev->devfn); int id = ((dev->bus->number << 8) | dev->devfn);
if (!info->status) { if (!info->status) {
dev_err(&dev->dev, dev_err(&dev->dev, "PCIe Bus Error: severity=%s, type=Unaccessible, id=%04x(Unregistered Agent ID)\n",
"PCIe Bus Error: severity=%s, type=Unaccessible, "
"id=%04x(Unregistered Agent ID)\n",
aer_error_severity_string[info->severity], id); aer_error_severity_string[info->severity], id);
goto out; goto out;
} }
...@@ -182,13 +180,11 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) ...@@ -182,13 +180,11 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
layer = AER_GET_LAYER_ERROR(info->severity, info->status); layer = AER_GET_LAYER_ERROR(info->severity, info->status);
agent = AER_GET_AGENT(info->severity, info->status); agent = AER_GET_AGENT(info->severity, info->status);
dev_err(&dev->dev, dev_err(&dev->dev, "PCIe Bus Error: severity=%s, type=%s, id=%04x(%s)\n",
"PCIe Bus Error: severity=%s, type=%s, id=%04x(%s)\n",
aer_error_severity_string[info->severity], aer_error_severity_string[info->severity],
aer_error_layer[layer], id, aer_agent_string[agent]); aer_error_layer[layer], id, aer_agent_string[agent]);
dev_err(&dev->dev, dev_err(&dev->dev, " device [%04x:%04x] error status/mask=%08x/%08x\n",
" device [%04x:%04x] error status/mask=%08x/%08x\n",
dev->vendor, dev->device, dev->vendor, dev->device,
info->status, info->mask); info->status, info->mask);
......
drivers/pci/pcie/pme.c
View file @ 38a61482
...@@ -199,8 +199,7 @@ static void pcie_pme_handle_request(struct pci_dev *port, u16 req_id) ...@@ -199,8 +199,7 @@ static void pcie_pme_handle_request(struct pci_dev *port, u16 req_id)
* assuming that the PME was reported by a PCIe-PCI bridge that * assuming that the PME was reported by a PCIe-PCI bridge that
* used devfn different from zero. * used devfn different from zero.
*/ */
dev_dbg(&port->dev, "PME interrupt generated for " dev_dbg(&port->dev, "PME interrupt generated for non-existent device %02x:%02x.%d\n",
"non-existent device %02x:%02x.%d\n",
busnr, PCI_SLOT(devfn), PCI_FUNC(devfn)); busnr, PCI_SLOT(devfn), PCI_FUNC(devfn));
found = pcie_pme_from_pci_bridge(bus, 0); found = pcie_pme_from_pci_bridge(bus, 0);
} }
......
drivers/pci/pcie/portdrv_pci.c
View file @ 38a61482
...@@ -204,8 +204,8 @@ static int pcie_portdrv_probe(struct pci_dev *dev, ...@@ -204,8 +204,8 @@ static int pcie_portdrv_probe(struct pci_dev *dev,
return -ENODEV; return -ENODEV;
if (!dev->irq && dev->pin) { if (!dev->irq && dev->pin) {
dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; " dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; check vendor BIOS\n",
"check vendor BIOS\n", dev->vendor, dev->device); dev->vendor, dev->device);
} }
status = pcie_port_device_register(dev); status = pcie_port_device_register(dev);
if (status) if (status)
......
drivers/pci/probe.c
View file @ 38a61482
...@@ -433,8 +433,7 @@ static void pci_read_bridge_mmio_pref(struct pci_bus *child) ...@@ -433,8 +433,7 @@ static void pci_read_bridge_mmio_pref(struct pci_bus *child)
limit |= ((unsigned long) mem_limit_hi) << 32; limit |= ((unsigned long) mem_limit_hi) << 32;
#else #else
if (mem_base_hi || mem_limit_hi) { if (mem_base_hi || mem_limit_hi) {
dev_err(&dev->dev, "can't handle 64-bit " dev_err(&dev->dev, "can't handle 64-bit address space for bridge\n");
"address space for bridge\n");
return; return;
} }
#endif #endif
...@@ -604,7 +603,6 @@ static enum pci_bus_speed agp_speed(int agp3, int agpstat) ...@@ -604,7 +603,6 @@ static enum pci_bus_speed agp_speed(int agp3, int agpstat)
return agp_speeds[index]; return agp_speeds[index];
} }
static void pci_set_bus_speed(struct pci_bus *bus) static void pci_set_bus_speed(struct pci_bus *bus)
{ {
struct pci_dev *bridge = bus->self; struct pci_dev *bridge = bus->self;
...@@ -636,11 +634,10 @@ static void pci_set_bus_speed(struct pci_bus *bus) ...@@ -636,11 +634,10 @@ static void pci_set_bus_speed(struct pci_bus *bus)
} else if (status & PCI_X_SSTATUS_266MHZ) { } else if (status & PCI_X_SSTATUS_266MHZ) {
max = PCI_SPEED_133MHz_PCIX_266; max = PCI_SPEED_133MHz_PCIX_266;
} else if (status & PCI_X_SSTATUS_133MHZ) { } else if (status & PCI_X_SSTATUS_133MHZ) {
if ((status & PCI_X_SSTATUS_VERS) == PCI_X_SSTATUS_V2) { if ((status & PCI_X_SSTATUS_VERS) == PCI_X_SSTATUS_V2)
max = PCI_SPEED_133MHz_PCIX_ECC; max = PCI_SPEED_133MHz_PCIX_ECC;
} else { else
max = PCI_SPEED_133MHz_PCIX; max = PCI_SPEED_133MHz_PCIX;
}
} else { } else {
max = PCI_SPEED_66MHz_PCIX; max = PCI_SPEED_66MHz_PCIX;
} }
...@@ -664,7 +661,6 @@ static void pci_set_bus_speed(struct pci_bus *bus) ...@@ -664,7 +661,6 @@ static void pci_set_bus_speed(struct pci_bus *bus)
} }
} }
static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
struct pci_dev *bridge, int busnr) struct pci_dev *bridge, int busnr)
{ {
...@@ -729,7 +725,8 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, ...@@ -729,7 +725,8 @@ static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent,
return child; return child;
} }
struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr) struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,
int busnr)
{ {
struct pci_bus *child; struct pci_bus *child;
...@@ -741,6 +738,7 @@ struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int ...@@ -741,6 +738,7 @@ struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int
} }
return child; return child;
} }
EXPORT_SYMBOL(pci_add_new_bus);
/* /*
* If it's a bridge, configure it and scan the bus behind it. * If it's a bridge, configure it and scan the bus behind it.
...@@ -887,7 +885,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) ...@@ -887,7 +885,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
* as cards with a PCI-to-PCI bridge can be * as cards with a PCI-to-PCI bridge can be
* inserted later. * inserted later.
*/ */
for (i=0; i<CARDBUS_RESERVE_BUSNR; i++) { for (i = 0; i < CARDBUS_RESERVE_BUSNR; i++) {
struct pci_bus *parent = bus; struct pci_bus *parent = bus;
if (pci_find_bus(pci_domain_nr(bus), if (pci_find_bus(pci_domain_nr(bus),
max+i+1)) max+i+1))
...@@ -934,8 +932,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) ...@@ -934,8 +932,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
(child->number > bus->busn_res.end) || (child->number > bus->busn_res.end) ||
(child->number < bus->number) || (child->number < bus->number) ||
(child->busn_res.end < bus->number)) { (child->busn_res.end < bus->number)) {
dev_info(&child->dev, "%pR %s " dev_info(&child->dev, "%pR %s hidden behind%s bridge %s %pR\n",
"hidden behind%s bridge %s %pR\n",
&child->busn_res, &child->busn_res,
(bus->number > child->busn_res.end && (bus->number > child->busn_res.end &&
bus->busn_res.end < child->number) ? bus->busn_res.end < child->number) ?
...@@ -952,6 +949,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) ...@@ -952,6 +949,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
return max; return max;
} }
EXPORT_SYMBOL(pci_scan_bridge);
/* /*
* Read interrupt line and base address registers. * Read interrupt line and base address registers.
...@@ -992,7 +990,6 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev) ...@@ -992,7 +990,6 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev)
pdev->is_hotplug_bridge = 1; pdev->is_hotplug_bridge = 1;
} }
/** /**
* pci_ext_cfg_is_aliased - is ext config space just an alias of std config? * pci_ext_cfg_is_aliased - is ext config space just an alias of std config?
* @dev: PCI device * @dev: PCI device
...@@ -1225,13 +1222,13 @@ int pci_setup_device(struct pci_dev *dev) ...@@ -1225,13 +1222,13 @@ int pci_setup_device(struct pci_dev *dev)
break; break;
default: /* unknown header */ default: /* unknown header */
dev_err(&dev->dev, "unknown header type %02x, " dev_err(&dev->dev, "unknown header type %02x, ignoring device\n",
"ignoring device\n", dev->hdr_type); dev->hdr_type);
return -EIO; return -EIO;
bad: bad:
dev_err(&dev->dev, "ignoring class %#08x (doesn't match header " dev_err(&dev->dev, "ignoring class %#08x (doesn't match header type %02x)\n",
"type %02x)\n", dev->class, dev->hdr_type); dev->class, dev->hdr_type);
dev->class = PCI_CLASS_NOT_DEFINED; dev->class = PCI_CLASS_NOT_DEFINED;
} }
...@@ -1306,9 +1303,8 @@ bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l, ...@@ -1306,9 +1303,8 @@ bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l,
return false; return false;
/* Card hasn't responded in 60 seconds? Must be stuck. */ /* Card hasn't responded in 60 seconds? Must be stuck. */
if (delay > crs_timeout) { if (delay > crs_timeout) {
printk(KERN_WARNING "pci %04x:%02x:%02x.%d: not " printk(KERN_WARNING "pci %04x:%02x:%02x.%d: not responding\n",
"responding\n", pci_domain_nr(bus), pci_domain_nr(bus), bus->number, PCI_SLOT(devfn),
bus->number, PCI_SLOT(devfn),
PCI_FUNC(devfn)); PCI_FUNC(devfn));
return false; return false;
} }
...@@ -1519,6 +1515,7 @@ int pci_scan_slot(struct pci_bus *bus, int devfn) ...@@ -1519,6 +1515,7 @@ int pci_scan_slot(struct pci_bus *bus, int devfn)
return nr; return nr;
} }
EXPORT_SYMBOL(pci_scan_slot);
static int pcie_find_smpss(struct pci_dev *dev, void *data) static int pcie_find_smpss(struct pci_dev *dev, void *data)
{ {
...@@ -1613,9 +1610,7 @@ static void pcie_write_mrrs(struct pci_dev *dev) ...@@ -1613,9 +1610,7 @@ static void pcie_write_mrrs(struct pci_dev *dev)
} }
if (mrrs < 128) if (mrrs < 128)
dev_err(&dev->dev, "MRRS was unable to be configured with a " dev_err(&dev->dev, "MRRS was unable to be configured with a safe value. If problems are experienced, try running with pci=pcie_bus_safe\n");
"safe value. If problems are experienced, try running "
"with pci=pcie_bus_safe.\n");
} }
static void pcie_bus_detect_mps(struct pci_dev *dev) static void pcie_bus_detect_mps(struct pci_dev *dev)
...@@ -1652,8 +1647,8 @@ static int pcie_bus_configure_set(struct pci_dev *dev, void *data) ...@@ -1652,8 +1647,8 @@ static int pcie_bus_configure_set(struct pci_dev *dev, void *data)
pcie_write_mps(dev, mps); pcie_write_mps(dev, mps);
pcie_write_mrrs(dev); pcie_write_mrrs(dev);
dev_info(&dev->dev, "Max Payload Size set to %4d/%4d (was %4d), " dev_info(&dev->dev, "Max Payload Size set to %4d/%4d (was %4d), Max Read Rq %4d\n",
"Max Read Rq %4d\n", pcie_get_mps(dev), 128 << dev->pcie_mpss, pcie_get_mps(dev), 128 << dev->pcie_mpss,
orig_mps, pcie_get_readrq(dev)); orig_mps, pcie_get_readrq(dev));
return 0; return 0;
...@@ -1716,7 +1711,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) ...@@ -1716,7 +1711,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
bus->is_added = 1; bus->is_added = 1;
} }
for (pass=0; pass < 2; pass++) for (pass = 0; pass < 2; pass++)
list_for_each_entry(dev, &bus->devices, bus_list) { list_for_each_entry(dev, &bus->devices, bus_list) {
if (pci_is_bridge(dev)) if (pci_is_bridge(dev))
max = pci_scan_bridge(bus, dev, max, pass); max = pci_scan_bridge(bus, dev, max, pass);
...@@ -1732,6 +1727,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) ...@@ -1732,6 +1727,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
dev_dbg(&bus->dev, "bus scan returning with max=%02x\n", max); dev_dbg(&bus->dev, "bus scan returning with max=%02x\n", max);
return max; return max;
} }
EXPORT_SYMBOL_GPL(pci_scan_child_bus);
/** /**
* pcibios_root_bridge_prepare - Platform-specific host bridge setup. * pcibios_root_bridge_prepare - Platform-specific host bridge setup.
...@@ -2040,11 +2036,6 @@ unsigned int pci_rescan_bus(struct pci_bus *bus) ...@@ -2040,11 +2036,6 @@ unsigned int pci_rescan_bus(struct pci_bus *bus)
} }
EXPORT_SYMBOL_GPL(pci_rescan_bus); EXPORT_SYMBOL_GPL(pci_rescan_bus);
EXPORT_SYMBOL(pci_add_new_bus);
EXPORT_SYMBOL(pci_scan_slot);
EXPORT_SYMBOL(pci_scan_bridge);
EXPORT_SYMBOL_GPL(pci_scan_child_bus);
/* /*
* pci_rescan_bus(), pci_rescan_bus_bridge_resize() and PCI device removal * pci_rescan_bus(), pci_rescan_bus_bridge_resize() and PCI device removal
* routines should always be executed under this mutex. * routines should always be executed under this mutex.
...@@ -2063,7 +2054,8 @@ void pci_unlock_rescan_remove(void) ...@@ -2063,7 +2054,8 @@ void pci_unlock_rescan_remove(void)
} }
EXPORT_SYMBOL_GPL(pci_unlock_rescan_remove); EXPORT_SYMBOL_GPL(pci_unlock_rescan_remove);
static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b) static int __init pci_sort_bf_cmp(const struct device *d_a,
const struct device *d_b)
{ {
const struct pci_dev *a = to_pci_dev(d_a); const struct pci_dev *a = to_pci_dev(d_a);
const struct pci_dev *b = to_pci_dev(d_b); const struct pci_dev *b = to_pci_dev(d_b);
......
drivers/pci/proc.c
View file @ 38a61482
...@@ -17,15 +17,14 @@ ...@@ -17,15 +17,14 @@
static int proc_initialized; /* = 0 */ static int proc_initialized; /* = 0 */
static loff_t static loff_t proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
proc_bus_pci_lseek(struct file *file, loff_t off, int whence)
{ {
struct pci_dev *dev = PDE_DATA(file_inode(file)); struct pci_dev *dev = PDE_DATA(file_inode(file));
return fixed_size_llseek(file, off, whence, dev->cfg_size); return fixed_size_llseek(file, off, whence, dev->cfg_size);
} }
static ssize_t static ssize_t proc_bus_pci_read(struct file *file, char __user *buf,
proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *ppos) size_t nbytes, loff_t *ppos)
{ {
struct pci_dev *dev = PDE_DATA(file_inode(file)); struct pci_dev *dev = PDE_DATA(file_inode(file));
unsigned int pos = *ppos; unsigned int pos = *ppos;
...@@ -108,8 +107,8 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp ...@@ -108,8 +107,8 @@ proc_bus_pci_read(struct file *file, char __user *buf, size_t nbytes, loff_t *pp
return nbytes; return nbytes;
} }
static ssize_t static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,
proc_bus_pci_write(struct file *file, const char __user *buf, size_t nbytes, loff_t *ppos) size_t nbytes, loff_t *ppos)
{ {
struct inode *ino = file_inode(file); struct inode *ino = file_inode(file);
struct pci_dev *dev = PDE_DATA(ino); struct pci_dev *dev = PDE_DATA(ino);
...@@ -413,7 +412,7 @@ int pci_proc_detach_device(struct pci_dev *dev) ...@@ -413,7 +412,7 @@ int pci_proc_detach_device(struct pci_dev *dev)
return 0; return 0;
} }
int pci_proc_detach_bus(struct pci_bus* bus) int pci_proc_detach_bus(struct pci_bus *bus)
{ {
proc_remove(bus->procdir); proc_remove(bus->procdir);
return 0; return 0;
...@@ -423,6 +422,7 @@ static int proc_bus_pci_dev_open(struct inode *inode, struct file *file) ...@@ -423,6 +422,7 @@ static int proc_bus_pci_dev_open(struct inode *inode, struct file *file)
{ {
return seq_open(file, &proc_bus_pci_devices_op); return seq_open(file, &proc_bus_pci_devices_op);
} }
static const struct file_operations proc_bus_pci_dev_operations = { static const struct file_operations proc_bus_pci_dev_operations = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.open = proc_bus_pci_dev_open, .open = proc_bus_pci_dev_open,
...@@ -443,6 +443,4 @@ static int __init pci_proc_init(void) ...@@ -443,6 +443,4 @@ static int __init pci_proc_init(void)
return 0; return 0;
} }
device_initcall(pci_proc_init); device_initcall(pci_proc_init);
drivers/pci/quirks.c
View file @ 38a61482
This diff is collapsed.
drivers/pci/rom.c
View file @ 38a61482
...@@ -38,6 +38,7 @@ int pci_enable_rom(struct pci_dev *pdev) ...@@ -38,6 +38,7 @@ int pci_enable_rom(struct pci_dev *pdev)
pci_write_config_dword(pdev, pdev->rom_base_reg, rom_addr); pci_write_config_dword(pdev, pdev->rom_base_reg, rom_addr);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(pci_enable_rom);
/** /**
* pci_disable_rom - disable ROM decoding for a PCI device * pci_disable_rom - disable ROM decoding for a PCI device
...@@ -53,6 +54,7 @@ void pci_disable_rom(struct pci_dev *pdev) ...@@ -53,6 +54,7 @@ void pci_disable_rom(struct pci_dev *pdev)
rom_addr &= ~PCI_ROM_ADDRESS_ENABLE; rom_addr &= ~PCI_ROM_ADDRESS_ENABLE;
pci_write_config_dword(pdev, pdev->rom_base_reg, rom_addr); pci_write_config_dword(pdev, pdev->rom_base_reg, rom_addr);
} }
EXPORT_SYMBOL_GPL(pci_disable_rom);
/** /**
* pci_get_rom_size - obtain the actual size of the ROM image * pci_get_rom_size - obtain the actual size of the ROM image
...@@ -135,7 +137,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) ...@@ -135,7 +137,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
} else { } else {
/* assign the ROM an address if it doesn't have one */ /* assign the ROM an address if it doesn't have one */
if (res->parent == NULL && if (res->parent == NULL &&
pci_assign_resource(pdev,PCI_ROM_RESOURCE)) pci_assign_resource(pdev, PCI_ROM_RESOURCE))
return NULL; return NULL;
start = pci_resource_start(pdev, PCI_ROM_RESOURCE); start = pci_resource_start(pdev, PCI_ROM_RESOURCE);
*size = pci_resource_len(pdev, PCI_ROM_RESOURCE); *size = pci_resource_len(pdev, PCI_ROM_RESOURCE);
...@@ -166,6 +168,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size) ...@@ -166,6 +168,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
*size = pci_get_rom_size(pdev, rom, *size); *size = pci_get_rom_size(pdev, rom, *size);
return rom; return rom;
} }
EXPORT_SYMBOL(pci_map_rom);
/** /**
* pci_unmap_rom - unmap the ROM from kernel space * pci_unmap_rom - unmap the ROM from kernel space
...@@ -187,6 +190,7 @@ void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom) ...@@ -187,6 +190,7 @@ void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom)
if (!(res->flags & (IORESOURCE_ROM_ENABLE | IORESOURCE_ROM_SHADOW))) if (!(res->flags & (IORESOURCE_ROM_ENABLE | IORESOURCE_ROM_SHADOW)))
pci_disable_rom(pdev); pci_disable_rom(pdev);
} }
EXPORT_SYMBOL(pci_unmap_rom);
/** /**
* pci_cleanup_rom - free the ROM copy created by pci_map_rom_copy * pci_cleanup_rom - free the ROM copy created by pci_map_rom_copy
...@@ -199,7 +203,7 @@ void pci_cleanup_rom(struct pci_dev *pdev) ...@@ -199,7 +203,7 @@ void pci_cleanup_rom(struct pci_dev *pdev)
struct resource *res = &pdev->resource[PCI_ROM_RESOURCE]; struct resource *res = &pdev->resource[PCI_ROM_RESOURCE];
if (res->flags & IORESOURCE_ROM_COPY) { if (res->flags & IORESOURCE_ROM_COPY) {
kfree((void*)(unsigned long)res->start); kfree((void *)(unsigned long)res->start);
res->flags |= IORESOURCE_UNSET; res->flags |= IORESOURCE_UNSET;
res->flags &= ~IORESOURCE_ROM_COPY; res->flags &= ~IORESOURCE_ROM_COPY;
res->start = 0; res->start = 0;
...@@ -222,9 +226,4 @@ void __iomem *pci_platform_rom(struct pci_dev *pdev, size_t *size) ...@@ -222,9 +226,4 @@ void __iomem *pci_platform_rom(struct pci_dev *pdev, size_t *size)
return NULL; return NULL;
} }
EXPORT_SYMBOL(pci_map_rom);
EXPORT_SYMBOL(pci_unmap_rom);
EXPORT_SYMBOL_GPL(pci_enable_rom);
EXPORT_SYMBOL_GPL(pci_disable_rom);
EXPORT_SYMBOL(pci_platform_rom); EXPORT_SYMBOL(pci_platform_rom);
drivers/pci/search.c
View file @ 38a61482
...@@ -110,8 +110,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev, ...@@ -110,8 +110,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
* legacy PCI bridge and the bridge is directly connected to bus 0), return its * legacy PCI bridge and the bridge is directly connected to bus 0), return its
* parent * parent
*/ */
struct pci_dev * struct pci_dev *pci_find_upstream_pcie_bridge(struct pci_dev *pdev)
pci_find_upstream_pcie_bridge(struct pci_dev *pdev)
{ {
struct pci_dev *tmp = NULL; struct pci_dev *tmp = NULL;
...@@ -143,12 +142,12 @@ static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr) ...@@ -143,12 +142,12 @@ static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr)
struct pci_bus *child; struct pci_bus *child;
struct pci_bus *tmp; struct pci_bus *tmp;
if(bus->number == busnr) if (bus->number == busnr)
return bus; return bus;
list_for_each_entry(tmp, &bus->children, node) { list_for_each_entry(tmp, &bus->children, node) {
child = pci_do_find_bus(tmp, busnr); child = pci_do_find_bus(tmp, busnr);
if(child) if (child)
return child; return child;
} }
return NULL; return NULL;
...@@ -163,7 +162,7 @@ static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr) ...@@ -163,7 +162,7 @@ static struct pci_bus *pci_do_find_bus(struct pci_bus *bus, unsigned char busnr)
* in the global list of PCI buses. If the bus is found, a pointer to its * in the global list of PCI buses. If the bus is found, a pointer to its
* data structure is returned. If no bus is found, %NULL is returned. * data structure is returned. If no bus is found, %NULL is returned.
*/ */
struct pci_bus * pci_find_bus(int domain, int busnr) struct pci_bus *pci_find_bus(int domain, int busnr)
{ {
struct pci_bus *bus = NULL; struct pci_bus *bus = NULL;
struct pci_bus *tmp_bus; struct pci_bus *tmp_bus;
...@@ -177,6 +176,7 @@ struct pci_bus * pci_find_bus(int domain, int busnr) ...@@ -177,6 +176,7 @@ struct pci_bus * pci_find_bus(int domain, int busnr)
} }
return NULL; return NULL;
} }
EXPORT_SYMBOL(pci_find_bus);
/** /**
* pci_find_next_bus - begin or continue searching for a PCI bus * pci_find_next_bus - begin or continue searching for a PCI bus
...@@ -187,8 +187,7 @@ struct pci_bus * pci_find_bus(int domain, int busnr) ...@@ -187,8 +187,7 @@ struct pci_bus * pci_find_bus(int domain, int busnr)
* @from is not %NULL, searches continue from next device on the * @from is not %NULL, searches continue from next device on the
* global list. * global list.
*/ */
struct pci_bus * struct pci_bus *pci_find_next_bus(const struct pci_bus *from)
pci_find_next_bus(const struct pci_bus *from)
{ {
struct list_head *n; struct list_head *n;
struct pci_bus *b = NULL; struct pci_bus *b = NULL;
...@@ -201,6 +200,7 @@ pci_find_next_bus(const struct pci_bus *from) ...@@ -201,6 +200,7 @@ pci_find_next_bus(const struct pci_bus *from)
up_read(&pci_bus_sem); up_read(&pci_bus_sem);
return b; return b;
} }
EXPORT_SYMBOL(pci_find_next_bus);
/** /**
* pci_get_slot - locate PCI device for a given PCI slot * pci_get_slot - locate PCI device for a given PCI slot
...@@ -234,6 +234,7 @@ struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn) ...@@ -234,6 +234,7 @@ struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn)
up_read(&pci_bus_sem); up_read(&pci_bus_sem);
return dev; return dev;
} }
EXPORT_SYMBOL(pci_get_slot);
/** /**
* pci_get_domain_bus_and_slot - locate PCI device for a given PCI domain (segment), bus, and slot * pci_get_domain_bus_and_slot - locate PCI device for a given PCI domain (segment), bus, and slot
...@@ -338,6 +339,7 @@ struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, ...@@ -338,6 +339,7 @@ struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
return pci_get_dev_by_id(&id, from); return pci_get_dev_by_id(&id, from);
} }
EXPORT_SYMBOL(pci_get_subsys);
/** /**
* pci_get_device - begin or continue searching for a PCI device by vendor/device id * pci_get_device - begin or continue searching for a PCI device by vendor/device id
...@@ -353,11 +355,12 @@ struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device, ...@@ -353,11 +355,12 @@ struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
* from next device on the global list. The reference count for @from is * from next device on the global list. The reference count for @from is
* always decremented if it is not %NULL. * always decremented if it is not %NULL.
*/ */
struct pci_dev * struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from) struct pci_dev *from)
{ {
return pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); return pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from);
} }
EXPORT_SYMBOL(pci_get_device);
/** /**
* pci_get_class - begin or continue searching for a PCI device by class * pci_get_class - begin or continue searching for a PCI device by class
...@@ -386,6 +389,7 @@ struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from) ...@@ -386,6 +389,7 @@ struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from)
return pci_get_dev_by_id(&id, from); return pci_get_dev_by_id(&id, from);
} }
EXPORT_SYMBOL(pci_get_class);
/** /**
* pci_dev_present - Returns 1 if device matching the device list is present, 0 if not. * pci_dev_present - Returns 1 if device matching the device list is present, 0 if not.
...@@ -415,12 +419,3 @@ int pci_dev_present(const struct pci_device_id *ids) ...@@ -415,12 +419,3 @@ int pci_dev_present(const struct pci_device_id *ids)
return 0; return 0;
} }
EXPORT_SYMBOL(pci_dev_present); EXPORT_SYMBOL(pci_dev_present);
/* For boot time work */
EXPORT_SYMBOL(pci_find_bus);
EXPORT_SYMBOL(pci_find_next_bus);
/* For everyone */
EXPORT_SYMBOL(pci_get_device);
EXPORT_SYMBOL(pci_get_subsys);
EXPORT_SYMBOL(pci_get_slot);
EXPORT_SYMBOL(pci_get_class);
drivers/pci/setup-bus.c
View file @ 38a61482
...@@ -68,7 +68,7 @@ static int add_to_list(struct list_head *head, ...@@ -68,7 +68,7 @@ static int add_to_list(struct list_head *head,
tmp = kzalloc(sizeof(*tmp), GFP_KERNEL); tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
if (!tmp) { if (!tmp) {
pr_warning("add_to_list: kmalloc() failed!\n"); pr_warn("add_to_list: kmalloc() failed!\n");
return -ENOMEM; return -ENOMEM;
} }
...@@ -148,8 +148,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head) ...@@ -148,8 +148,7 @@ static void pdev_sort_resources(struct pci_dev *dev, struct list_head *head)
tmp = kzalloc(sizeof(*tmp), GFP_KERNEL); tmp = kzalloc(sizeof(*tmp), GFP_KERNEL);
if (!tmp) if (!tmp)
panic("pdev_sort_resources(): " panic("pdev_sort_resources(): kmalloc() failed!\n");
"kmalloc() failed!\n");
tmp->res = r; tmp->res = r;
tmp->dev = dev; tmp->dev = dev;
...@@ -736,7 +735,7 @@ static resource_size_t calculate_iosize(resource_size_t size, ...@@ -736,7 +735,7 @@ static resource_size_t calculate_iosize(resource_size_t size,
{ {
if (size < min_size) if (size < min_size)
size = min_size; size = min_size;
if (old_size == 1 ) if (old_size == 1)
old_size = 0; old_size = 0;
/* To be fixed in 2.5: we should have sort of HAVE_ISA /* To be fixed in 2.5: we should have sort of HAVE_ISA
flag in the struct pci_bus. */ flag in the struct pci_bus. */
...@@ -757,7 +756,7 @@ static resource_size_t calculate_memsize(resource_size_t size, ...@@ -757,7 +756,7 @@ static resource_size_t calculate_memsize(resource_size_t size,
{ {
if (size < min_size) if (size < min_size)
size = min_size; size = min_size;
if (old_size == 1 ) if (old_size == 1)
old_size = 0; old_size = 0;
if (size < old_size) if (size < old_size)
size = old_size; size = old_size;
...@@ -859,9 +858,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, ...@@ -859,9 +858,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
resource_size(b_res), min_align); resource_size(b_res), min_align);
if (!size0 && !size1) { if (!size0 && !size1) {
if (b_res->start || b_res->end) if (b_res->start || b_res->end)
dev_info(&bus->self->dev, "disabling bridge window " dev_info(&bus->self->dev, "disabling bridge window %pR to %pR (unused)\n",
"%pR to %pR (unused)\n", b_res, b_res, &bus->busn_res);
&bus->busn_res);
b_res->flags = 0; b_res->flags = 0;
return; return;
} }
...@@ -872,9 +870,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size, ...@@ -872,9 +870,8 @@ static void pbus_size_io(struct pci_bus *bus, resource_size_t min_size,
if (size1 > size0 && realloc_head) { if (size1 > size0 && realloc_head) {
add_to_list(realloc_head, bus->self, b_res, size1-size0, add_to_list(realloc_head, bus->self, b_res, size1-size0,
min_align); min_align);
dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window %pR to %pR add_size %llx\n",
"%pR to %pR add_size %llx\n", b_res, b_res, &bus->busn_res,
&bus->busn_res,
(unsigned long long)size1-size0); (unsigned long long)size1-size0);
} }
} }
...@@ -974,9 +971,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, ...@@ -974,9 +971,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
if (order < 0) if (order < 0)
order = 0; order = 0;
if (order >= ARRAY_SIZE(aligns)) { if (order >= ARRAY_SIZE(aligns)) {
dev_warn(&dev->dev, "disabling BAR %d: %pR " dev_warn(&dev->dev, "disabling BAR %d: %pR (bad alignment %#llx)\n",
"(bad alignment %#llx)\n", i, r, i, r, (unsigned long long) align);
(unsigned long long) align);
r->flags = 0; r->flags = 0;
continue; continue;
} }
...@@ -1003,9 +999,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, ...@@ -1003,9 +999,8 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
resource_size(b_res), min_align); resource_size(b_res), min_align);
if (!size0 && !size1) { if (!size0 && !size1) {
if (b_res->start || b_res->end) if (b_res->start || b_res->end)
dev_info(&bus->self->dev, "disabling bridge window " dev_info(&bus->self->dev, "disabling bridge window %pR to %pR (unused)\n",
"%pR to %pR (unused)\n", b_res, b_res, &bus->busn_res);
&bus->busn_res);
b_res->flags = 0; b_res->flags = 0;
return 0; return 0;
} }
...@@ -1014,9 +1009,9 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, ...@@ -1014,9 +1009,9 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
b_res->flags |= IORESOURCE_STARTALIGN; b_res->flags |= IORESOURCE_STARTALIGN;
if (size1 > size0 && realloc_head) { if (size1 > size0 && realloc_head) {
add_to_list(realloc_head, bus->self, b_res, size1-size0, min_align); add_to_list(realloc_head, bus->self, b_res, size1-size0, min_align);
dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window %pR to %pR add_size %llx\n",
"%pR to %pR add_size %llx\n", b_res, b_res, &bus->busn_res,
&bus->busn_res, (unsigned long long)size1-size0); (unsigned long long)size1-size0);
} }
return 0; return 0;
} }
...@@ -1274,8 +1269,8 @@ void __pci_bus_assign_resources(const struct pci_bus *bus, ...@@ -1274,8 +1269,8 @@ void __pci_bus_assign_resources(const struct pci_bus *bus,
break; break;
default: default:
dev_info(&dev->dev, "not setting up bridge for bus " dev_info(&dev->dev, "not setting up bridge for bus %04x:%02x\n",
"%04x:%02x\n", pci_domain_nr(b), b->number); pci_domain_nr(b), b->number);
break; break;
} }
} }
...@@ -1312,8 +1307,8 @@ static void __pci_bridge_assign_resources(const struct pci_dev *bridge, ...@@ -1312,8 +1307,8 @@ static void __pci_bridge_assign_resources(const struct pci_dev *bridge,
break; break;
default: default:
dev_info(&bridge->dev, "not setting up bridge for bus " dev_info(&bridge->dev, "not setting up bridge for bus %04x:%02x\n",
"%04x:%02x\n", pci_domain_nr(b), b->number); pci_domain_nr(b), b->number);
break; break;
} }
} }
...@@ -1458,7 +1453,7 @@ static int pci_bus_get_depth(struct pci_bus *bus) ...@@ -1458,7 +1453,7 @@ static int pci_bus_get_depth(struct pci_bus *bus)
int depth = 0; int depth = 0;
struct pci_bus *child_bus; struct pci_bus *child_bus;
list_for_each_entry(child_bus, &bus->children, node){ list_for_each_entry(child_bus, &bus->children, node) {
int ret; int ret;
ret = pci_bus_get_depth(child_bus); ret = pci_bus_get_depth(child_bus);
......
drivers/pci/setup-irq.c
View file @ 38a61482
...@@ -22,8 +22,7 @@ void __weak pcibios_update_irq(struct pci_dev *dev, int irq) ...@@ -22,8 +22,7 @@ void __weak pcibios_update_irq(struct pci_dev *dev, int irq)
pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq); pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
} }
static void static void pdev_fixup_irq(struct pci_dev *dev,
pdev_fixup_irq(struct pci_dev *dev,
u8 (*swizzle)(struct pci_dev *, u8 *), u8 (*swizzle)(struct pci_dev *, u8 *),
int (*map_irq)(const struct pci_dev *, u8, u8)) int (*map_irq)(const struct pci_dev *, u8, u8))
{ {
...@@ -58,11 +57,11 @@ pdev_fixup_irq(struct pci_dev *dev, ...@@ -58,11 +57,11 @@ pdev_fixup_irq(struct pci_dev *dev,
pcibios_update_irq(dev, irq); pcibios_update_irq(dev, irq);
} }
void void pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *),
pci_fixup_irqs(u8 (*swizzle)(struct pci_dev *, u8 *),
int (*map_irq)(const struct pci_dev *, u8, u8)) int (*map_irq)(const struct pci_dev *, u8, u8))
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;
for_each_pci_dev(dev) for_each_pci_dev(dev)
pdev_fixup_irq(dev, swizzle, map_irq); pdev_fixup_irq(dev, swizzle, map_irq);
} }
drivers/pci/setup-res.c
View file @ 38a61482
...@@ -96,8 +96,8 @@ void pci_update_resource(struct pci_dev *dev, int resno) ...@@ -96,8 +96,8 @@ void pci_update_resource(struct pci_dev *dev, int resno)
pci_write_config_dword(dev, reg + 4, new); pci_write_config_dword(dev, reg + 4, new);
pci_read_config_dword(dev, reg + 4, &check); pci_read_config_dword(dev, reg + 4, &check);
if (check != new) { if (check != new) {
dev_err(&dev->dev, "BAR %d: error updating " dev_err(&dev->dev, "BAR %d: error updating (high %#08x != %#08x)\n",
"(high %#08x != %#08x)\n", resno, new, check); resno, new, check);
} }
} }
...@@ -289,8 +289,8 @@ int pci_assign_resource(struct pci_dev *dev, int resno) ...@@ -289,8 +289,8 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
res->flags |= IORESOURCE_UNSET; res->flags |= IORESOURCE_UNSET;
align = pci_resource_alignment(dev, res); align = pci_resource_alignment(dev, res);
if (!align) { if (!align) {
dev_info(&dev->dev, "BAR %d: can't assign %pR " dev_info(&dev->dev, "BAR %d: can't assign %pR (bogus alignment)\n",
"(bogus alignment)\n", resno, res); resno, res);
return -EINVAL; return -EINVAL;
} }
...@@ -314,6 +314,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno) ...@@ -314,6 +314,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
} }
return ret; return ret;
} }
EXPORT_SYMBOL(pci_assign_resource);
int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsize, int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsize,
resource_size_t min_align) resource_size_t min_align)
...@@ -324,8 +325,8 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz ...@@ -324,8 +325,8 @@ int pci_reassign_resource(struct pci_dev *dev, int resno, resource_size_t addsiz
res->flags |= IORESOURCE_UNSET; res->flags |= IORESOURCE_UNSET;
if (!res->parent) { if (!res->parent) {
dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR " dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR\n",
"\n", resno, res); resno, res);
return -EINVAL; return -EINVAL;
} }
......
drivers/pci/syscall.c
View file @ 38a61482
...@@ -99,7 +99,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn, ...@@ -99,7 +99,7 @@ SYSCALL_DEFINE5(pciconfig_write, unsigned long, bus, unsigned long, dfn,
if (!dev) if (!dev)
return -ENODEV; return -ENODEV;
switch(len) { switch (len) {
case 1: case 1:
err = get_user(byte, (u8 __user *)buf); err = get_user(byte, (u8 __user *)buf);
if (err) if (err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7