Skip to content

L
linux
Commit ba51b0eb authored by Rolf Eike Beer's avatar Rolf Eike Beer Committed by Deepak Saxena
Browse files
Options

[PATCH] SHPC PCI Hotplug: more coding style fixes 

A big bunch of coding style fixes for shpchp_ctrl.c and shpchp_pci.c

Eike
parent 986f1878
Show whitespace changes
Inline Side-by-side
Showing with 131 additions and 81 deletions
drivers/pci/hotplug/shpchp_ctrl.c
View file @ ba51b0eb
...@@ -2516,7 +2516,7 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f ...@@ -2516,7 +2516,7 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f
kfree(hold_mem_node); kfree(hold_mem_node);
kfree(hold_p_mem_node); kfree(hold_p_mem_node);
return(1); return 1;
} }
memcpy(hold_bus_node, bus_node, sizeof(struct pci_resource)); memcpy(hold_bus_node, bus_node, sizeof(struct pci_resource));
...@@ -2535,11 +2535,11 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f ...@@ -2535,11 +2535,11 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f
/* set IO base and Limit registers */ /* set IO base and Limit registers */
RES_CHECK(io_node->base, 8); RES_CHECK(io_node->base, 8);
temp_byte = (u8)(io_node->base >> 8); temp_byte = (u8)(io_node->base >> 8);
rc = pci_bus_write_config_byte (pci_bus, devfn, PCI_IO_BASE, temp_byte); rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_IO_BASE, temp_byte);
RES_CHECK(io_node->base + io_node->length - 1, 8); RES_CHECK(io_node->base + io_node->length - 1, 8);
temp_byte = (u8)((io_node->base + io_node->length - 1) >> 8); temp_byte = (u8)((io_node->base + io_node->length - 1) >> 8);
rc = pci_bus_write_config_byte (pci_bus, devfn, PCI_IO_LIMIT, temp_byte); rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_IO_LIMIT, temp_byte);
} else { } else {
kfree(hold_IO_node); kfree(hold_IO_node);
hold_IO_node = NULL; hold_IO_node = NULL;
...@@ -2556,17 +2556,17 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f ...@@ -2556,17 +2556,17 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f
/* set Mem base and Limit registers */ /* set Mem base and Limit registers */
RES_CHECK(mem_node->base, 16); RES_CHECK(mem_node->base, 16);
temp_word = (u32)(mem_node->base >> 16); temp_word = (u32)(mem_node->base >> 16);
rc = pci_bus_write_config_word (pci_bus, devfn, PCI_MEMORY_BASE, temp_word); rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_BASE, temp_word);
RES_CHECK(mem_node->base + mem_node->length - 1, 16); RES_CHECK(mem_node->base + mem_node->length - 1, 16);
temp_word = (u32)((mem_node->base + mem_node->length - 1) >> 16); temp_word = (u32)((mem_node->base + mem_node->length - 1) >> 16);
rc = pci_bus_write_config_word (pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word); rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word);
} else { } else {
temp_word = 0xFFFF; temp_word = 0xFFFF;
rc = pci_bus_write_config_word (pci_bus, devfn, PCI_MEMORY_BASE, temp_word); rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_BASE, temp_word);
temp_word = 0x0000; temp_word = 0x0000;
rc = pci_bus_write_config_word (pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word); rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word);
kfree(hold_mem_node); kfree(hold_mem_node);
hold_mem_node = NULL; hold_mem_node = NULL;
...@@ -2583,17 +2583,17 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f ...@@ -2583,17 +2583,17 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f
/* set Pre Mem base and Limit registers */ /* set Pre Mem base and Limit registers */
RES_CHECK(p_mem_node->base, 16); RES_CHECK(p_mem_node->base, 16);
temp_word = (u32)(p_mem_node->base >> 16); temp_word = (u32)(p_mem_node->base >> 16);
rc = pci_bus_write_config_word (pci_bus, devfn, PCI_PREF_MEMORY_BASE, temp_word); rc = pci_bus_write_config_word(pci_bus, devfn, PCI_PREF_MEMORY_BASE, temp_word);
RES_CHECK(p_mem_node->base + p_mem_node->length - 1, 16); RES_CHECK(p_mem_node->base + p_mem_node->length - 1, 16);
temp_word = (u32)((p_mem_node->base + p_mem_node->length - 1) >> 16); temp_word = (u32)((p_mem_node->base + p_mem_node->length - 1) >> 16);
rc = pci_bus_write_config_word (pci_bus, devfn, PCI_PREF_MEMORY_LIMIT, temp_word); rc = pci_bus_write_config_word(pci_bus, devfn, PCI_PREF_MEMORY_LIMIT, temp_word);
} else { } else {
temp_word = 0xFFFF; temp_word = 0xFFFF;
rc = pci_bus_write_config_word (pci_bus, devfn, PCI_PREF_MEMORY_BASE, temp_word); rc = pci_bus_write_config_word(pci_bus, devfn, PCI_PREF_MEMORY_BASE, temp_word);
temp_word = 0x0000; temp_word = 0x0000;
rc = pci_bus_write_config_word (pci_bus, devfn, PCI_PREF_MEMORY_LIMIT, temp_word); rc = pci_bus_write_config_word(pci_bus, devfn, PCI_PREF_MEMORY_LIMIT, temp_word);
kfree(hold_p_mem_node); kfree(hold_p_mem_node);
hold_p_mem_node = NULL; hold_p_mem_node = NULL;
...@@ -2610,7 +2610,8 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f ...@@ -2610,7 +2610,8 @@ static int configure_new_function (struct controller * ctrl, struct pci_func * f
ID = 0xFFFFFFFF; ID = 0xFFFFFFFF;
pci_bus->number = hold_bus_node->base; pci_bus->number = hold_bus_node->base;
pci_bus_read_config_dword (pci_bus, PCI_DEVFN(device, 0), PCI_VENDOR_ID, &ID); pci_bus_read_config_dword(pci_bus, PCI_DEVFN(device, 0),
PCI_VENDOR_ID, &ID);
pci_bus->number = func->bus; pci_bus->number = func->bus;
if (ID != 0xFFFFFFFF) { /* device Present */ if (ID != 0xFFFFFFFF) { /* device Present */
......
drivers/pci/hotplug/shpchp_pci.c
View file @ ba51b0eb
...@@ -82,10 +82,12 @@ int shpchp_unconfigure_device(struct pci_func* func) ...@@ -82,10 +82,12 @@ int shpchp_unconfigure_device(struct pci_func* func)
int rc = 0; int rc = 0;
int j; int j;
dbg("%s: bus/dev/func = %x/%x/%x\n", __FUNCTION__, func->bus, func->device, func->function); dbg("%s: bus/dev/func = %x/%x/%x\n", __FUNCTION__, func->bus,
func->device, func->function);
for (j=0; j<8 ; j++) { for (j=0; j<8 ; j++) {
struct pci_dev* temp = pci_find_slot(func->bus, (func->device << 3) | j); struct pci_dev* temp = pci_find_slot(func->bus,
(func->device << 3) | j);
if (temp) { if (temp) {
pci_remove_bus_device(temp); pci_remove_bus_device(temp);
} }
...@@ -164,12 +166,14 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot ...@@ -164,12 +166,14 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot
int is_hot_plug = num_ctlr_slots || first_device_num; int is_hot_plug = num_ctlr_slots || first_device_num;
struct pci_bus lpci_bus, *pci_bus; struct pci_bus lpci_bus, *pci_bus;
dbg("%s: num_ctlr_slots = %d, first_device_num = %d\n", __FUNCTION__, num_ctlr_slots, first_device_num); dbg("%s: num_ctlr_slots = %d, first_device_num = %d\n", __FUNCTION__,
num_ctlr_slots, first_device_num);
memcpy(&lpci_bus, ctrl->pci_dev->subordinate, sizeof(lpci_bus)); memcpy(&lpci_bus, ctrl->pci_dev->subordinate, sizeof(lpci_bus));
pci_bus = &lpci_bus; pci_bus = &lpci_bus;
dbg("%s: num_ctlr_slots = %d, first_device_num = %d\n", __FUNCTION__, num_ctlr_slots, first_device_num); dbg("%s: num_ctlr_slots = %d, first_device_num = %d\n", __FUNCTION__,
num_ctlr_slots, first_device_num);
/* Decide which slots are supported */ /* Decide which slots are supported */
if (is_hot_plug) { if (is_hot_plug) {
...@@ -183,20 +187,24 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot ...@@ -183,20 +187,24 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot
LastSupported = 0x1F; LastSupported = 0x1F;
} }
dbg("FirstSupported = %d, LastSupported = %d\n", FirstSupported, LastSupported); dbg("FirstSupported = %d, LastSupported = %d\n", FirstSupported,
LastSupported);
/* Save PCI configuration space for all devices in supported slots */ /* Save PCI configuration space for all devices in supported slots */
pci_bus->number = busnumber; pci_bus->number = busnumber;
for (device = FirstSupported; device <= LastSupported; device++) { for (device = FirstSupported; device <= LastSupported; device++) {
ID = 0xFFFFFFFF; ID = 0xFFFFFFFF;
rc = pci_bus_read_config_dword(pci_bus, PCI_DEVFN(device, 0), PCI_VENDOR_ID, &ID); rc = pci_bus_read_config_dword(pci_bus, PCI_DEVFN(device, 0),
PCI_VENDOR_ID, &ID);
if (ID != 0xFFFFFFFF) { /* device in slot */ if (ID != 0xFFFFFFFF) { /* device in slot */
rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, 0), 0x0B, &class_code); rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, 0),
0x0B, &class_code);
if (rc) if (rc)
return rc; return rc;
rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, 0), PCI_HEADER_TYPE, &header_type); rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, 0),
PCI_HEADER_TYPE, &header_type);
if (rc) if (rc)
return rc; return rc;
...@@ -217,7 +225,8 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot ...@@ -217,7 +225,8 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot
/* Recurse the subordinate bus /* Recurse the subordinate bus
* get the subordinate bus number * get the subordinate bus number
*/ */
rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, function), rc = pci_bus_read_config_byte(pci_bus,
PCI_DEVFN(device, function),
PCI_SECONDARY_BUS, &secondary_bus); PCI_SECONDARY_BUS, &secondary_bus);
if (rc) { if (rc) {
return rc; return rc;
...@@ -256,13 +265,17 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot ...@@ -256,13 +265,17 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot
new_slot->switch_save = 0x10; new_slot->switch_save = 0x10;
/* In case of unsupported board */ /* In case of unsupported board */
new_slot->status = DevError; new_slot->status = DevError;
new_slot->pci_dev = pci_find_slot(new_slot->bus, (new_slot->device << 3) | new_slot->function); new_slot->pci_dev = pci_find_slot(new_slot->bus,
(new_slot->device << 3) | new_slot->function);
dbg("new_slot->pci_dev = %p\n", new_slot->pci_dev); dbg("new_slot->pci_dev = %p\n", new_slot->pci_dev);
for (cloop = 0; cloop < 0x20; cloop++) { for (cloop = 0; cloop < 0x20; cloop++) {
rc = pci_bus_read_config_dword(pci_bus, PCI_DEVFN(device, function), rc = pci_bus_read_config_dword(pci_bus,
cloop << 2, (u32 *) & (new_slot->config_space [cloop])); PCI_DEVFN(device, function),
/* dbg("new_slot->config_space[%x] = %x\n", cloop, new_slot->config_space[cloop]); */ cloop << 2,
(u32 *) &(new_slot->config_space [cloop]));
/* dbg("new_slot->config_space[%x] = %x\n",
cloop, new_slot->config_space[cloop]); */
if (rc) if (rc)
return rc; return rc;
} }
...@@ -276,23 +289,28 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot ...@@ -276,23 +289,28 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot
*/ */
while ((function < max_functions)&&(!stop_it)) { while ((function < max_functions)&&(!stop_it)) {
rc = pci_bus_read_config_dword(pci_bus, PCI_DEVFN(device, function), PCI_VENDOR_ID, &ID); rc = pci_bus_read_config_dword(pci_bus,
PCI_DEVFN(device, function),
PCI_VENDOR_ID, &ID);
if (ID == 0xFFFFFFFF) { /* nothing there. */ if (ID == 0xFFFFFFFF) { /* nothing there. */
function++; function++;
dbg("Nothing there\n"); dbg("Nothing there\n");
} else { /* Something there */ } else { /* Something there */
rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, function), rc = pci_bus_read_config_byte(pci_bus,
PCI_DEVFN(device, function),
0x0B, &class_code); 0x0B, &class_code);
if (rc) if (rc)
return rc; return rc;
rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, function), rc = pci_bus_read_config_byte(pci_bus,
PCI_DEVFN(device, function),
PCI_HEADER_TYPE, &header_type); PCI_HEADER_TYPE, &header_type);
if (rc) if (rc)
return rc; return rc;
dbg("class_code = %x, header_type = %x\n", class_code, header_type); dbg("class_code = %x, header_type = %x\n",
class_code, header_type);
stop_it++; stop_it++;
} }
} }
...@@ -329,7 +347,7 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot ...@@ -329,7 +347,7 @@ int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slot
* *
* returns 0 if success * returns 0 if success
*/ */
int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot) int shpchp_save_slot_config(struct controller *ctrl, struct pci_func * new_slot)
{ {
int rc; int rc;
u8 class_code; u8 class_code;
...@@ -348,12 +366,15 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot ...@@ -348,12 +366,15 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot
ID = 0xFFFFFFFF; ID = 0xFFFFFFFF;
pci_bus_read_config_dword(pci_bus, PCI_DEVFN(new_slot->device, 0), PCI_VENDOR_ID, &ID); pci_bus_read_config_dword(pci_bus, PCI_DEVFN(new_slot->device, 0),
PCI_VENDOR_ID, &ID);
if (ID != 0xFFFFFFFF) { /* device in slot */ if (ID != 0xFFFFFFFF) { /* device in slot */
pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, 0), 0x0B, &class_code); pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, 0),
0x0B, &class_code);
pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, 0), PCI_HEADER_TYPE, &header_type); pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, 0),
PCI_HEADER_TYPE, &header_type);
if (header_type & 0x80) /* Multi-function device */ if (header_type & 0x80) /* Multi-function device */
max_functions = 8; max_functions = 8;
...@@ -365,7 +386,8 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot ...@@ -365,7 +386,8 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot
do { do {
if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) { /* PCI-PCI Bridge */ if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) { /* PCI-PCI Bridge */
/* Recurse the subordinate bus */ /* Recurse the subordinate bus */
pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, function), pci_bus_read_config_byte(pci_bus,
PCI_DEVFN(new_slot->device, function),
PCI_SECONDARY_BUS, &secondary_bus); PCI_SECONDARY_BUS, &secondary_bus);
sub_bus = (int) secondary_bus; sub_bus = (int) secondary_bus;
...@@ -374,15 +396,17 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot ...@@ -374,15 +396,17 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot
rc = shpchp_save_config(ctrl, sub_bus, 0, 0); rc = shpchp_save_config(ctrl, sub_bus, 0, 0);
if (rc) if (rc)
return(rc); return rc;
} /* End of IF */ } /* End of IF */
new_slot->status = 0; new_slot->status = 0;
for (cloop = 0; cloop < 0x20; cloop++) { for (cloop = 0; cloop < 0x20; cloop++) {
pci_bus_read_config_dword(pci_bus, PCI_DEVFN(new_slot->device, function), pci_bus_read_config_dword(pci_bus,
cloop << 2, (u32 *) & (new_slot->config_space [cloop])); PCI_DEVFN(new_slot->device, function),
cloop << 2,
(u32 *) &(new_slot->config_space [cloop]));
} }
function++; function++;
...@@ -394,15 +418,20 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot ...@@ -394,15 +418,20 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot
*/ */
while ((function < max_functions) && (!stop_it)) { while ((function < max_functions) && (!stop_it)) {
pci_bus_read_config_dword(pci_bus, PCI_DEVFN(new_slot->device, function), PCI_VENDOR_ID, &ID); pci_bus_read_config_dword(pci_bus,
PCI_DEVFN(new_slot->device, function),
PCI_VENDOR_ID, &ID);
if (ID == 0xFFFFFFFF) { /* nothing there. */ if (ID == 0xFFFFFFFF) { /* nothing there. */
function++; function++;
} else { /* Something there */ } else { /* Something there */
pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, function), 0x0B, &class_code); pci_bus_read_config_byte(pci_bus,
PCI_DEVFN(new_slot->device, function),
0x0B, &class_code);
pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, function), PCI_HEADER_TYPE, pci_bus_read_config_byte(pci_bus,
&header_type); PCI_DEVFN(new_slot->device, function),
PCI_HEADER_TYPE, &header_type);
stop_it++; stop_it++;
} }
...@@ -411,10 +440,10 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot ...@@ -411,10 +440,10 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot
} while (function < max_functions); } while (function < max_functions);
} /* End of IF (device in slot?) */ } /* End of IF (device in slot?) */
else { else {
return(2); return 2;
} }
return(0); return 0;
} }
...@@ -430,7 +459,7 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot ...@@ -430,7 +459,7 @@ int shpchp_save_slot_config (struct controller *ctrl, struct pci_func * new_slot
* it loops for all functions of the slot and disables them. * it loops for all functions of the slot and disables them.
* else, it just get resources of the function and return. * else, it just get resources of the function and return.
*/ */
int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, int disable) int shpchp_save_used_resources(struct controller *ctrl, struct pci_func *func, int disable)
{ {
u8 cloop; u8 cloop;
u8 header_type; u8 header_type;
...@@ -462,7 +491,7 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -462,7 +491,7 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
devfn = PCI_DEVFN(func->device, func->function); devfn = PCI_DEVFN(func->device, func->function);
/* Save the command register */ /* Save the command register */
pci_bus_read_config_word (pci_bus, devfn, PCI_COMMAND, &save_command); pci_bus_read_config_word(pci_bus, devfn, PCI_COMMAND, &save_command);
if (disable) { if (disable) {
/* disable card */ /* disable card */
...@@ -471,20 +500,22 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -471,20 +500,22 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
} }
/* Check for Bridge */ /* Check for Bridge */
pci_bus_read_config_byte (pci_bus, devfn, PCI_HEADER_TYPE, &header_type); pci_bus_read_config_byte(pci_bus, devfn, PCI_HEADER_TYPE, &header_type);
if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) { /* PCI-PCI Bridge */ if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) { /* PCI-PCI Bridge */
dbg("Save_used_res of PCI bridge b:d=0x%x:%x, sc=0x%x\n", func->bus, func->device, save_command); dbg("Save_used_res of PCI bridge b:d=0x%x:%x, sc=0x%x\n",
func->bus, func->device, save_command);
if (disable) { if (disable) {
/* Clear Bridge Control Register */ /* Clear Bridge Control Register */
command = 0x00; command = 0x00;
pci_bus_write_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, command); pci_bus_write_config_word(pci_bus, devfn, PCI_BRIDGE_CONTROL, command);
} }
pci_bus_read_config_byte (pci_bus, devfn, PCI_SECONDARY_BUS, &secondary_bus); pci_bus_read_config_byte(pci_bus, devfn, PCI_SECONDARY_BUS, &secondary_bus);
pci_bus_read_config_byte (pci_bus, devfn, PCI_SUBORDINATE_BUS, &temp_byte); pci_bus_read_config_byte(pci_bus, devfn, PCI_SUBORDINATE_BUS, &temp_byte);
bus_node =(struct pci_resource *) kmalloc(sizeof(struct pci_resource), GFP_KERNEL); bus_node = kmalloc(sizeof(struct pci_resource),
GFP_KERNEL);
if (!bus_node) if (!bus_node)
return -ENOMEM; return -ENOMEM;
...@@ -495,13 +526,14 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -495,13 +526,14 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
func->bus_head = bus_node; func->bus_head = bus_node;
/* Save IO base and Limit registers */ /* Save IO base and Limit registers */
pci_bus_read_config_byte (pci_bus, devfn, PCI_IO_BASE, &temp_byte); pci_bus_read_config_byte(pci_bus, devfn, PCI_IO_BASE, &temp_byte);
base = temp_byte; base = temp_byte;
pci_bus_read_config_byte (pci_bus, devfn, PCI_IO_LIMIT, &temp_byte); pci_bus_read_config_byte(pci_bus, devfn, PCI_IO_LIMIT, &temp_byte);
length = temp_byte; length = temp_byte;
if ((base <= length) && (!disable || (save_command & PCI_COMMAND_IO))) { if ((base <= length) && (!disable || (save_command & PCI_COMMAND_IO))) {
io_node = (struct pci_resource *) kmalloc(sizeof(struct pci_resource), GFP_KERNEL); io_node = kmalloc(sizeof(struct pci_resource),
GFP_KERNEL);
if (!io_node) if (!io_node)
return -ENOMEM; return -ENOMEM;
...@@ -513,11 +545,12 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -513,11 +545,12 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
} }
/* Save memory base and Limit registers */ /* Save memory base and Limit registers */
pci_bus_read_config_word (pci_bus, devfn, PCI_MEMORY_BASE, &w_base); pci_bus_read_config_word(pci_bus, devfn, PCI_MEMORY_BASE, &w_base);
pci_bus_read_config_word (pci_bus, devfn, PCI_MEMORY_LIMIT, &w_length); pci_bus_read_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, &w_length);
if ((w_base <= w_length) && (!disable || (save_command & PCI_COMMAND_MEMORY))) { if ((w_base <= w_length) && (!disable || (save_command & PCI_COMMAND_MEMORY))) {
mem_node = (struct pci_resource *) kmalloc(sizeof(struct pci_resource), GFP_KERNEL); mem_node = kmalloc(sizeof(struct pci_resource),
GFP_KERNEL);
if (!mem_node) if (!mem_node)
return -ENOMEM; return -ENOMEM;
...@@ -528,11 +561,12 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -528,11 +561,12 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
func->mem_head = mem_node; func->mem_head = mem_node;
} }
/* Save prefetchable memory base and Limit registers */ /* Save prefetchable memory base and Limit registers */
pci_bus_read_config_word (pci_bus, devfn, PCI_PREF_MEMORY_BASE, &w_base); pci_bus_read_config_word(pci_bus, devfn, PCI_PREF_MEMORY_BASE, &w_base);
pci_bus_read_config_word (pci_bus, devfn, PCI_PREF_MEMORY_LIMIT, &w_length); pci_bus_read_config_word(pci_bus, devfn, PCI_PREF_MEMORY_LIMIT, &w_length);
if ((w_base <= w_length) && (!disable || (save_command & PCI_COMMAND_MEMORY))) { if ((w_base <= w_length) && (!disable || (save_command & PCI_COMMAND_MEMORY))) {
p_mem_node = (struct pci_resource *) kmalloc(sizeof(struct pci_resource), GFP_KERNEL); p_mem_node = kmalloc(sizeof(struct pci_resource),
GFP_KERNEL);
if (!p_mem_node) if (!p_mem_node)
return -ENOMEM; return -ENOMEM;
...@@ -543,38 +577,41 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -543,38 +577,41 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
func->p_mem_head = p_mem_node; func->p_mem_head = p_mem_node;
} }
} else if ((header_type & 0x7F) == PCI_HEADER_TYPE_NORMAL) { } else if ((header_type & 0x7F) == PCI_HEADER_TYPE_NORMAL) {
dbg("Save_used_res of PCI adapter b:d=0x%x:%x, sc=0x%x\n", func->bus, func->device, save_command); dbg("Save_used_res of PCI adapter b:d=0x%x:%x, sc=0x%x\n",
func->bus, func->device, save_command);
/* Figure out IO and memory base lengths */ /* Figure out IO and memory base lengths */
for (cloop = PCI_BASE_ADDRESS_0; cloop <= PCI_BASE_ADDRESS_5; cloop += 4) { for (cloop = PCI_BASE_ADDRESS_0; cloop <= PCI_BASE_ADDRESS_5; cloop += 4) {
pci_bus_read_config_dword (pci_bus, devfn, cloop, &save_base); pci_bus_read_config_dword(pci_bus, devfn, cloop, &save_base);
temp_register = 0xFFFFFFFF; temp_register = 0xFFFFFFFF;
pci_bus_write_config_dword (pci_bus, devfn, cloop, temp_register); pci_bus_write_config_dword(pci_bus, devfn, cloop, temp_register);
pci_bus_read_config_dword (pci_bus, devfn, cloop, &temp_register); pci_bus_read_config_dword(pci_bus, devfn, cloop, &temp_register);
if (!disable) { if (!disable)
pci_bus_write_config_dword (pci_bus, devfn, cloop, save_base); pci_bus_write_config_dword(pci_bus, devfn, cloop, save_base);
}
if (!temp_register) if (!temp_register)
continue; continue;
base = temp_register; base = temp_register;
if ((base & PCI_BASE_ADDRESS_SPACE_IO) && (!disable || (save_command & PCI_COMMAND_IO))) { if ((base & PCI_BASE_ADDRESS_SPACE_IO) &&
(!disable || (save_command & PCI_COMMAND_IO))) {
/* IO base */ /* IO base */
/* set temp_register = amount of IO space requested */ /* set temp_register = amount of IO space requested */
base = base & 0xFFFFFFFCL; base = base & 0xFFFFFFFCL;
base = (~base) + 1; base = (~base) + 1;
io_node = (struct pci_resource *) kmalloc(sizeof (struct pci_resource), GFP_KERNEL); io_node = kmalloc(sizeof (struct pci_resource),
GFP_KERNEL);
if (!io_node) if (!io_node)
return -ENOMEM; return -ENOMEM;
io_node->base = (ulong)save_base & PCI_BASE_ADDRESS_IO_MASK; io_node->base = (ulong)save_base & PCI_BASE_ADDRESS_IO_MASK;
io_node->length = (ulong)base; io_node->length = (ulong)base;
dbg("sur adapter: IO bar=0x%x(length=0x%x)\n", io_node->base, io_node->length); dbg("sur adapter: IO bar=0x%x(length=0x%x)\n",
io_node->base, io_node->length);
io_node->next = func->io_head; io_node->next = func->io_head;
func->io_head = io_node; func->io_head = io_node;
...@@ -584,11 +621,13 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -584,11 +621,13 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
char *res_type_str = "PMEM"; char *res_type_str = "PMEM";
u32 temp_register2; u32 temp_register2;
t_mem_node = (struct pci_resource *) kmalloc(sizeof (struct pci_resource), GFP_KERNEL); t_mem_node = kmalloc(sizeof (struct pci_resource),
GFP_KERNEL);
if (!t_mem_node) if (!t_mem_node)
return -ENOMEM; return -ENOMEM;
if (!(base & PCI_BASE_ADDRESS_MEM_PREFETCH) && (!disable || (save_command & PCI_COMMAND_MEMORY))) { if (!(base & PCI_BASE_ADDRESS_MEM_PREFETCH) &&
(!disable || (save_command & PCI_COMMAND_MEMORY))) {
prefetchable = 0; prefetchable = 0;
mem_node = t_mem_node; mem_node = t_mem_node;
res_type_str++; res_type_str++;
...@@ -603,16 +642,20 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -603,16 +642,20 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
if (prefetchable) { if (prefetchable) {
p_mem_node->base = (ulong)save_base & PCI_BASE_ADDRESS_MEM_MASK; p_mem_node->base = (ulong)save_base & PCI_BASE_ADDRESS_MEM_MASK;
p_mem_node->length = (ulong)base; p_mem_node->length = (ulong)base;
dbg("sur adapter: 32 %s bar=0x%x(length=0x%x)\n", res_type_str, dbg("sur adapter: 32 %s bar=0x%x(length=0x%x)\n",
p_mem_node->base, p_mem_node->length); res_type_str,
p_mem_node->base,
p_mem_node->length);
p_mem_node->next = func->p_mem_head; p_mem_node->next = func->p_mem_head;
func->p_mem_head = p_mem_node; func->p_mem_head = p_mem_node;
} else { } else {
mem_node->base = (ulong)save_base & PCI_BASE_ADDRESS_MEM_MASK; mem_node->base = (ulong)save_base & PCI_BASE_ADDRESS_MEM_MASK;
mem_node->length = (ulong)base; mem_node->length = (ulong)base;
dbg("sur adapter: 32 %s bar=0x%x(length=0x%x)\n", res_type_str, dbg("sur adapter: 32 %s bar=0x%x(length=0x%x)\n",
mem_node->base, mem_node->length); res_type_str,
mem_node->base,
mem_node->length);
mem_node->next = func->mem_head; mem_node->next = func->mem_head;
func->mem_head = mem_node; func->mem_head = mem_node;
...@@ -632,16 +675,20 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -632,16 +675,20 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
if (prefetchable) { if (prefetchable) {
p_mem_node->base = base64 & PCI_BASE_ADDRESS_MEM_MASK; p_mem_node->base = base64 & PCI_BASE_ADDRESS_MEM_MASK;
p_mem_node->length = base; p_mem_node->length = base;
dbg("sur adapter: 64 %s base=0x%x(len=0x%x)\n", res_type_str, dbg("sur adapter: 64 %s base=0x%x(len=0x%x)\n",
p_mem_node->base, p_mem_node->length); res_type_str,
p_mem_node->base,
p_mem_node->length);
p_mem_node->next = func->p_mem_head; p_mem_node->next = func->p_mem_head;
func->p_mem_head = p_mem_node; func->p_mem_head = p_mem_node;
} else { } else {
mem_node->base = base64 & PCI_BASE_ADDRESS_MEM_MASK; mem_node->base = base64 & PCI_BASE_ADDRESS_MEM_MASK;
mem_node->length = base; mem_node->length = base;
dbg("sur adapter: 64 %s base=0x%x(len=0x%x)\n", res_type_str, dbg("sur adapter: 64 %s base=0x%x(len=0x%x)\n",
mem_node->base, mem_node->length); res_type_str,
mem_node->base,
mem_node->length);
mem_node->next = func->mem_head; mem_node->next = func->mem_head;
func->mem_head = mem_node; func->mem_head = mem_node;
...@@ -649,13 +696,15 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func, ...@@ -649,13 +696,15 @@ int shpchp_save_used_resources (struct controller *ctrl, struct pci_func *func,
cloop += 4; cloop += 4;
break; break;
default: default:
dbg("asur: reserved BAR type=0x%x\n", temp_register); dbg("asur: reserved BAR type=0x%x\n",
temp_register);
break; break;
} }
} }
} /* End of base register loop */ } /* End of base register loop */
} else { /* Some other unknown header type */ } else { /* Some other unknown header type */
dbg("Save_used_res of PCI unknown type b:d=0x%x:%x. skip.\n", func->bus, func->device); dbg("Save_used_res of PCI unknown type b:d=0x%x:%x. skip.\n",
func->bus, func->device);
} }
/* find the next device in this slot */ /* find the next device in this slot */
......
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