Skip to content

L
linux
Commit cb0c3669 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge bk://linuxusb.bkbits.net/pci_hp-2.5 

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents cbb48783 8d909102
Hide whitespace changes
Inline Side-by-side
Showing with 226 additions and 102 deletions
drivers/hotplug/ibmphp.h
View file @ cb0c3669
...@@ -168,13 +168,11 @@ struct ebda_hpc_slot { ...@@ -168,13 +168,11 @@ struct ebda_hpc_slot {
struct ebda_hpc_bus { struct ebda_hpc_bus {
u32 bus_num; u32 bus_num;
/*
u8 slots_at_33_conv; u8 slots_at_33_conv;
u8 slots_at_66_conv; u8 slots_at_66_conv;
u8 slots_at_66_pcix; u8 slots_at_66_pcix;
u8 slots_at_100_pcix; u8 slots_at_100_pcix;
u8 slots_at_133_pcix; u8 slots_at_133_pcix;
*/
}; };
...@@ -232,12 +230,15 @@ struct bus_info { ...@@ -232,12 +230,15 @@ struct bus_info {
u8 slot_max; u8 slot_max;
u8 slot_count; u8 slot_count;
u8 busno; u8 busno;
u8 current_speed;
u8 supported_speed;
u8 controller_id; u8 controller_id;
u8 supported_bus_mode; u8 current_speed;
u8 current_bus_mode; u8 current_bus_mode;
u8 index; u8 index;
u8 slots_at_33_conv;
u8 slots_at_66_conv;
u8 slots_at_66_pcix;
u8 slots_at_100_pcix;
u8 slots_at_133_pcix;
struct list_head bus_info_list; struct list_head bus_info_list;
}; };
...@@ -690,8 +691,11 @@ struct slot { ...@@ -690,8 +691,11 @@ struct slot {
u8 bus; u8 bus;
u8 device; u8 device;
u8 number; u8 number;
u8 real_physical_slot_num;
char name[100]; char name[100];
u32 capabilities; u32 capabilities;
u8 supported_speed;
u8 supported_bus_mode;
struct hotplug_slot *hotplug_slot; struct hotplug_slot *hotplug_slot;
struct controller *ctrl; struct controller *ctrl;
struct pci_func *func; struct pci_func *func;
...@@ -709,10 +713,12 @@ struct slot { ...@@ -709,10 +713,12 @@ struct slot {
struct controller { struct controller {
struct ebda_hpc_slot *slots; struct ebda_hpc_slot *slots;
struct ebda_hpc_bus *buses; struct ebda_hpc_bus *buses;
u8 starting_slot_num; /* starting and ending slot #'s this ctrl controls*/
u8 ending_slot_num;
u8 revision; u8 revision;
u8 options; /* which options HPC supports */ u8 options; /* which options HPC supports */
u8 status; u8 status;
u8 ctlr_id; /* TONI */ u8 ctlr_id;
u8 slot_count; u8 slot_count;
u8 bus_count; u8 bus_count;
u8 ctlr_relative_id; u8 ctlr_relative_id;
......
drivers/hotplug/ibmphp_core.c
View file @ cb0c3669
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#define get_ctrl_revision(sl, rev) ibmphp_hpc_readslot (sl, READ_REVLEVEL, rev) #define get_ctrl_revision(sl, rev) ibmphp_hpc_readslot (sl, READ_REVLEVEL, rev)
#define get_hpc_options(sl, opt) ibmphp_hpc_readslot (sl, READ_HPCOPTIONS, opt) #define get_hpc_options(sl, opt) ibmphp_hpc_readslot (sl, READ_HPCOPTIONS, opt)
#define DRIVER_VERSION "0.1" #define DRIVER_VERSION "0.2"
#define DRIVER_DESC "IBM Hot Plug PCI Controller Driver" #define DRIVER_DESC "IBM Hot Plug PCI Controller Driver"
int ibmphp_debug; int ibmphp_debug;
...@@ -393,8 +393,8 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, u8 * value) ...@@ -393,8 +393,8 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, u8 * value)
pslot = (struct slot *) hotplug_slot->private; pslot = (struct slot *) hotplug_slot->private;
if (pslot) { if (pslot) {
rc = 0; rc = 0;
mode = pslot->bus_on->supported_bus_mode; mode = pslot->supported_bus_mode;
*value = pslot->bus_on->supported_speed; *value = pslot->supported_speed;
*value &= 0x0f; *value &= 0x0f;
if (mode == BUS_MODE_PCIX) if (mode == BUS_MODE_PCIX)
...@@ -1009,6 +1009,7 @@ static int ibm_configure_device (struct pci_func *func) ...@@ -1009,6 +1009,7 @@ static int ibm_configure_device (struct pci_func *func)
} }
return rc; return rc;
} }
/******************************************************* /*******************************************************
* Returns whether the bus is empty or not * Returns whether the bus is empty or not
*******************************************************/ *******************************************************/
...@@ -1036,7 +1037,9 @@ static int is_bus_empty (struct slot * slot_cur) ...@@ -1036,7 +1037,9 @@ static int is_bus_empty (struct slot * slot_cur)
/*********************************************************** /***********************************************************
* If the HPC permits and the bus currently empty, tries to set the * If the HPC permits and the bus currently empty, tries to set the
* bus speed and mode at the maximum card capability * bus speed and mode at the maximum card and bus capability
* Parameters: slot
* Returns: bus is set (0) or error code
***********************************************************/ ***********************************************************/
static int set_bus (struct slot * slot_cur) static int set_bus (struct slot * slot_cur)
{ {
...@@ -1056,30 +1059,102 @@ static int set_bus (struct slot * slot_cur) ...@@ -1056,30 +1059,102 @@ static int set_bus (struct slot * slot_cur)
cmd = HPC_BUS_33CONVMODE; cmd = HPC_BUS_33CONVMODE;
break; break;
case HPC_SLOT_SPEED_66: case HPC_SLOT_SPEED_66:
if (SLOT_PCIX (slot_cur->ext_status)) if (SLOT_PCIX (slot_cur->ext_status)) {
cmd = HPC_BUS_66PCIXMODE; if ((slot_cur->supported_speed >= BUS_SPEED_66) && (slot_cur->supported_bus_mode == BUS_MODE_PCIX))
else cmd = HPC_BUS_66PCIXMODE;
cmd = HPC_BUS_66CONVMODE; else if (!SLOT_BUS_MODE (slot_cur->ext_status))
/* if max slot/bus capability is 66 pci
and there's no bus mode mismatch, then
the adapter supports 66 pci */
cmd = HPC_BUS_66CONVMODE;
else
cmd = HPC_BUS_33CONVMODE;
} else {
if (slot_cur->supported_speed >= BUS_SPEED_66)
cmd = HPC_BUS_66CONVMODE;
else
cmd = HPC_BUS_33CONVMODE;
}
break; break;
case HPC_SLOT_SPEED_133: case HPC_SLOT_SPEED_133:
if (slot_cur->bus_on->slot_count > 1) switch (slot_cur->supported_speed) {
case BUS_SPEED_33:
cmd = HPC_BUS_33CONVMODE;
break;
case BUS_SPEED_66:
if (slot_cur->supported_bus_mode == BUS_MODE_PCIX)
cmd = HPC_BUS_66PCIXMODE;
else
cmd = HPC_BUS_66CONVMODE;
break;
case BUS_SPEED_100:
cmd = HPC_BUS_100PCIXMODE; cmd = HPC_BUS_100PCIXMODE;
else break;
case BUS_SPEED_133:
cmd = HPC_BUS_133PCIXMODE; cmd = HPC_BUS_133PCIXMODE;
break;
default:
err ("Wrong bus speed \n");
return -ENODEV;
}
break; break;
default: default:
err ("wrong slot speed \n"); err ("wrong slot speed \n");
return -ENODEV; return -ENODEV;
} }
debug ("setting bus speed for slot %d, cmd %x\n", slot_cur->number, cmd); debug ("setting bus speed for slot %d, cmd %x\n", slot_cur->number, cmd);
rc = ibmphp_hpc_writeslot (slot_cur, cmd); ibmphp_hpc_writeslot (slot_cur, cmd);
if (rc)
return rc;
} }
/* This is for x400, once Brandon fixes the firmware,
will not need this delay */
long_delay (1 * HZ);
debug ("%s -Exit \n", __FUNCTION__); debug ("%s -Exit \n", __FUNCTION__);
return 0; return 0;
} }
/* This routine checks the bus limitations that the slot is on from the BIOS.
* This is used in deciding whether or not to power up the slot.
* (electrical/spec limitations. For example, >1 133 MHz or >2 66 PCI cards on
* same bus)
* Parameters: slot
* Returns: 0 = no limitations, -EINVAL = exceeded limitations on the bus
*/
static int check_limitations (struct slot *slot_cur)
{
u8 i;
struct slot * tmp_slot;
u8 count = 0;
u8 limitation = 0;
for (i = slot_cur->bus_on->slot_min; i <= slot_cur->bus_on->slot_max; i++) {
tmp_slot = ibmphp_get_slot_from_physical_num (i);
if ((SLOT_POWER (tmp_slot->status)) && !(SLOT_CONNECT (tmp_slot->status)))
count++;
}
get_cur_bus_info (&slot_cur);
switch (slot_cur->bus_on->current_speed) {
case BUS_SPEED_33:
limitation = slot_cur->bus_on->slots_at_33_conv;
break;
case BUS_SPEED_66:
if (slot_cur->bus_on->current_bus_mode == BUS_MODE_PCIX)
limitation = slot_cur->bus_on->slots_at_66_pcix;
else
limitation = slot_cur->bus_on->slots_at_66_conv;
break;
case BUS_SPEED_100:
limitation = slot_cur->bus_on->slots_at_100_pcix;
break;
case BUS_SPEED_133:
limitation = slot_cur->bus_on->slots_at_133_pcix;
break;
}
if ((count + 1) > limitation)
return -EINVAL;
return 0;
}
static inline void print_card_capability (struct slot *slot_cur) static inline void print_card_capability (struct slot *slot_cur)
{ {
info ("capability of the card is "); info ("capability of the card is ");
...@@ -1136,7 +1211,28 @@ static int enable_slot (struct hotplug_slot *hs) ...@@ -1136,7 +1211,28 @@ static int enable_slot (struct hotplug_slot *hs)
ibmphp_unlock_operations (); ibmphp_unlock_operations ();
return -ENODEV; return -ENODEV;
} }
/*-----------------debugging------------------------------*/
get_cur_bus_info (&slot_cur);
debug ("the current bus speed right after set_bus = %x \n", slot_cur->bus_on->current_speed);
/*----------------------------------------------------------*/
rc = check_limitations (slot_cur);
if (rc) {
err ("Adding this card exceeds the limitations of this bus. \n");
err ("(i.e., >1 133MHz cards running on same bus, or >2 66 PCI cards running on same bus \n. Try hot-adding into another bus \n");
attn_off (slot_cur);
attn_on (slot_cur);
if (slot_update (&slot_cur)) {
ibmphp_unlock_operations ();
return -ENODEV;
}
ibmphp_update_slot_info (slot_cur);
ibmphp_unlock_operations ();
return -EINVAL;
}
rc = power_on (slot_cur); rc = power_on (slot_cur);
if (rc) { if (rc) {
...@@ -1151,19 +1247,24 @@ static int enable_slot (struct hotplug_slot *hs) ...@@ -1151,19 +1247,24 @@ static int enable_slot (struct hotplug_slot *hs)
return -ENODEV; return -ENODEV;
} }
/* Check to see the error of why it failed */ /* Check to see the error of why it failed */
if (!(SLOT_PWRGD (slot_cur->status))) if ((SLOT_POWER (slot_cur->status)) && !(SLOT_PWRGD (slot_cur->status)))
err ("power fault occured trying to power up \n"); err ("power fault occured 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 occured. please check current bus speed and card capability \n"); err ("bus speed mismatch occured. please check 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 occured. please check current bus mode and card capability \n"); err ("bus mode mismatch occured. please check current bus mode and card capability \n");
print_card_capability (slot_cur);
}
ibmphp_update_slot_info (slot_cur); ibmphp_update_slot_info (slot_cur);
ibmphp_unlock_operations (); ibmphp_unlock_operations ();
return rc; return rc;
} }
debug ("after power_on\n"); debug ("after power_on\n");
/*-----------------------debugging---------------------------*/
get_cur_bus_info (&slot_cur);
debug ("the current bus speed right after power_on = %x \n", slot_cur->bus_on->current_speed);
/*----------------------------------------------------------*/
rc = slot_update (&slot_cur); rc = slot_update (&slot_cur);
if (rc) { if (rc) {
...@@ -1180,7 +1281,7 @@ static int enable_slot (struct hotplug_slot *hs) ...@@ -1180,7 +1281,7 @@ static int enable_slot (struct hotplug_slot *hs)
if (SLOT_POWER (slot_cur->status) && !(SLOT_PWRGD (slot_cur->status))) { if (SLOT_POWER (slot_cur->status) && !(SLOT_PWRGD (slot_cur->status))) {
faulted = 1; faulted = 1;
err ("power fault occured trying to power up...\n"); err ("power fault occured trying to power up... \n");
} else if (SLOT_POWER (slot_cur->status) && (SLOT_BUS_SPEED (slot_cur->status))) { } else if (SLOT_POWER (slot_cur->status) && (SLOT_BUS_SPEED (slot_cur->status))) {
faulted = 1; faulted = 1;
err ("bus speed mismatch occured. please check current bus speed and card capability \n"); err ("bus speed mismatch occured. please check current bus speed and card capability \n");
...@@ -1200,8 +1301,8 @@ static int enable_slot (struct hotplug_slot *hs) ...@@ -1200,8 +1301,8 @@ static int enable_slot (struct hotplug_slot *hs)
return rcpr; return rcpr;
} }
if (slot_update (&slot_cur)) { if (slot_update (&slot_cur)) {
ibmphp_unlock_operations (); ibmphp_unlock_operations ();
return -ENODEV; return -ENODEV;
} }
ibmphp_update_slot_info (slot_cur); ibmphp_update_slot_info (slot_cur);
...@@ -1278,20 +1379,24 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot) ...@@ -1278,20 +1379,24 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot)
{ {
int rc; int rc;
struct slot *slot_cur = (struct slot *) hotplug_slot->private; struct slot *slot_cur = (struct slot *) hotplug_slot->private;
u8 flag = slot_cur->flag; u8 flag;
int parm = 0;
slot_cur->flag = TRUE;
debug ("DISABLING SLOT... \n"); debug ("DISABLING SLOT... \n");
ibmphp_lock_operations (); if (slot_cur == NULL)
if (slot_cur == NULL) {
ibmphp_unlock_operations ();
return -ENODEV; return -ENODEV;
}
if (slot_cur->ctrl == NULL) { if (slot_cur->ctrl == NULL)
ibmphp_unlock_operations ();
return -ENODEV; return -ENODEV;
}
flag = slot_cur->flag; /* to see if got here from polling */
if (flag)
ibmphp_lock_operations ();
slot_cur->flag = TRUE;
if (flag == TRUE) { if (flag == TRUE) {
rc = validate (slot_cur, DISABLE); /* checking if powered off already & valid slot # */ rc = validate (slot_cur, DISABLE); /* checking if powered off already & valid slot # */
if (rc) { if (rc) {
...@@ -1333,10 +1438,21 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot) ...@@ -1333,10 +1438,21 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot)
ibmphp_unlock_operations (); ibmphp_unlock_operations ();
return rc; return rc;
} }
/* If we got here from latch suddenly opening on operating card or
a power fault, there's no power to the card, so cannot
read from it to determine what resources it occupied. This operation
is forbidden anyhow. The best we can do is remove it from kernel
lists at least */
if (!flag) {
attn_off (slot_cur);
return 0;
}
rc = ibmphp_unconfigure_card (&slot_cur, 0); rc = ibmphp_unconfigure_card (&slot_cur, parm);
slot_cur->func = NULL; slot_cur->func = NULL;
debug ("in disable_slot. after unconfigure_card \n"); debug ("in disable_slot. after unconfigure_card\n");
if (rc) { if (rc) {
err ("could not unconfigure card.\n"); err ("could not unconfigure card.\n");
attn_off (slot_cur); /* need to turn off if was blinking b4 */ attn_off (slot_cur); /* need to turn off if was blinking b4 */
...@@ -1347,9 +1463,7 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot) ...@@ -1347,9 +1463,7 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot)
return -EFAULT; return -EFAULT;
} }
if (flag) ibmphp_update_slot_info (slot_cur);
ibmphp_update_slot_info (slot_cur);
ibmphp_unlock_operations (); ibmphp_unlock_operations ();
return -EFAULT; return -EFAULT;
} }
...@@ -1363,9 +1477,7 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot) ...@@ -1363,9 +1477,7 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot)
return -EFAULT; return -EFAULT;
} }
if (flag) ibmphp_update_slot_info (slot_cur);
ibmphp_update_slot_info (slot_cur);
ibmphp_unlock_operations (); ibmphp_unlock_operations ();
return rc; return rc;
} }
...@@ -1375,11 +1487,7 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot) ...@@ -1375,11 +1487,7 @@ int ibmphp_disable_slot (struct hotplug_slot *hotplug_slot)
ibmphp_unlock_operations (); ibmphp_unlock_operations ();
return -EFAULT; return -EFAULT;
} }
if (flag) rc = ibmphp_update_slot_info (slot_cur);
rc = ibmphp_update_slot_info (slot_cur);
else
rc = 0;
ibmphp_print_test (); ibmphp_print_test ();
ibmphp_unlock_operations(); ibmphp_unlock_operations();
return rc; return rc;
...@@ -1422,9 +1530,12 @@ static int __init ibmphp_init (void) ...@@ -1422,9 +1530,12 @@ static int __init ibmphp_init (void)
int rc = 0; int rc = 0;
init_flag = 1; init_flag = 1;
info (DRIVER_DESC " version: " DRIVER_VERSION "\n");
ibmphp_pci_root_ops = get_root_pci_ops (); ibmphp_pci_root_ops = get_root_pci_ops ();
if (ibmphp_pci_root_ops == NULL) { if (ibmphp_pci_root_ops == NULL) {
err ("cannot read bus operations... will not be able to read the cards. Please check your system \n"); err ("cannot read bus operations... will not be able to read the cards. Please check your system\n");
return -ENODEV; return -ENODEV;
} }
...@@ -1439,13 +1550,13 @@ static int __init ibmphp_init (void) ...@@ -1439,13 +1550,13 @@ static int __init ibmphp_init (void)
ibmphp_unload (); ibmphp_unload ();
return rc; return rc;
} }
debug ("after ibmphp_access_ebda () \n"); debug ("after ibmphp_access_ebda ()\n");
if ((rc = ibmphp_rsrc_init ())) { if ((rc = ibmphp_rsrc_init ())) {
ibmphp_unload (); ibmphp_unload ();
return rc; return rc;
} }
debug ("AFTER Resource & EBDA INITIALIZATIONS \n"); debug ("AFTER Resource & EBDA INITIALIZATIONS\n");
max_slots = get_max_slots (); max_slots = get_max_slots ();
...@@ -1463,7 +1574,6 @@ static int __init ibmphp_init (void) ...@@ -1463,7 +1574,6 @@ static int __init ibmphp_init (void)
* so that no one can unload us. */ * so that no one can unload us. */
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
info (DRIVER_DESC " version: " DRIVER_VERSION "\n");
return 0; return 0;
} }
...@@ -1471,9 +1581,9 @@ static int __init ibmphp_init (void) ...@@ -1471,9 +1581,9 @@ static int __init ibmphp_init (void)
static void __exit ibmphp_exit (void) static void __exit ibmphp_exit (void)
{ {
ibmphp_hpc_stop_poll_thread (); ibmphp_hpc_stop_poll_thread ();
debug ("after polling \n"); debug ("after polling\n");
ibmphp_unload (); ibmphp_unload ();
debug ("done \n"); debug ("done\n");
} }
module_init (ibmphp_init); module_init (ibmphp_init);
......
drivers/hotplug/ibmphp_ebda.c
View file @ cb0c3669
...@@ -161,9 +161,14 @@ static void print_bus_info (void) ...@@ -161,9 +161,14 @@ static void print_bus_info (void)
debug ("%s - slot_count = %x\n", __FUNCTION__, ptr->slot_count); debug ("%s - slot_count = %x\n", __FUNCTION__, ptr->slot_count);
debug ("%s - bus# = %x\n", __FUNCTION__, ptr->busno); debug ("%s - bus# = %x\n", __FUNCTION__, ptr->busno);
debug ("%s - current_speed = %x\n", __FUNCTION__, ptr->current_speed); debug ("%s - current_speed = %x\n", __FUNCTION__, ptr->current_speed);
debug ("%s - supported_speed = %x\n", __FUNCTION__, ptr->supported_speed);
debug ("%s - controller_id = %x\n", __FUNCTION__, ptr->controller_id); debug ("%s - controller_id = %x\n", __FUNCTION__, ptr->controller_id);
debug ("%s - bus_mode = %x\n", __FUNCTION__, ptr->supported_bus_mode);
debug ("%s - slots_at_33_conv = %x\n", __FUNCTION__, ptr->slots_at_33_conv);
debug ("%s - slots_at_66_conv = %x\n", __FUNCTION__, ptr->slots_at_66_conv);
debug ("%s - slots_at_66_pcix = %x\n", __FUNCTION__, ptr->slots_at_66_pcix);
debug ("%s - slots_at_100_pcix = %x\n", __FUNCTION__, ptr->slots_at_100_pcix);
debug ("%s - slots_at_133_pcix = %x\n", __FUNCTION__, ptr->slots_at_133_pcix);
} }
} }
...@@ -455,19 +460,9 @@ static int ebda_rsrc_controller (void) ...@@ -455,19 +460,9 @@ static int ebda_rsrc_controller (void)
bus_info_ptr1->index = bus_index++; bus_info_ptr1->index = bus_index++;
bus_info_ptr1->current_speed = 0xff; bus_info_ptr1->current_speed = 0xff;
bus_info_ptr1->current_bus_mode = 0xff; bus_info_ptr1->current_bus_mode = 0xff;
if ( ((slot_ptr->slot_cap) & EBDA_SLOT_133_MAX) == EBDA_SLOT_133_MAX )
bus_info_ptr1->supported_speed = 3;
else if ( ((slot_ptr->slot_cap) & EBDA_SLOT_100_MAX) == EBDA_SLOT_100_MAX )
bus_info_ptr1->supported_speed = 2;
else if ( ((slot_ptr->slot_cap) & EBDA_SLOT_66_MAX) == EBDA_SLOT_66_MAX )
bus_info_ptr1->supported_speed = 1;
bus_info_ptr1->controller_id = hpc_ptr->ctlr_id; bus_info_ptr1->controller_id = hpc_ptr->ctlr_id;
if ( ((slot_ptr->slot_cap) & EBDA_SLOT_PCIX_CAP) == EBDA_SLOT_PCIX_CAP )
bus_info_ptr1->supported_bus_mode = 1;
else
bus_info_ptr1->supported_bus_mode =0;
list_add_tail (&bus_info_ptr1->bus_info_list, &bus_info_head); list_add_tail (&bus_info_ptr1->bus_info_list, &bus_info_head);
} else { } else {
...@@ -486,9 +481,25 @@ static int ebda_rsrc_controller (void) ...@@ -486,9 +481,25 @@ static int ebda_rsrc_controller (void)
/* init bus structure */ /* init bus structure */
bus_ptr = hpc_ptr->buses; bus_ptr = hpc_ptr->buses;
for (bus = 0; bus < bus_num; bus++) { for (bus = 0; bus < bus_num; bus++) {
bus_ptr->bus_num = readb (io_mem + addr_bus); bus_ptr->bus_num = readb (io_mem + addr_bus + bus);
bus_ptr->slots_at_33_conv = readb (io_mem + addr_bus + bus_num + 8 * bus);
bus_ptr->slots_at_66_conv = readb (io_mem + addr_bus + bus_num + 8 * bus + 1);
bus_ptr->slots_at_66_pcix = readb (io_mem + addr_bus + bus_num + 8 * bus + 2);
bus_ptr->slots_at_100_pcix = readb (io_mem + addr_bus + bus_num + 8 * bus + 3);
bus_ptr->slots_at_133_pcix = readb (io_mem + addr_bus + bus_num + 8 * bus + 4);
bus_info_ptr2 = ibmphp_find_same_bus_num (bus_ptr->bus_num);
if (bus_info_ptr2) {
bus_info_ptr2->slots_at_33_conv = bus_ptr->slots_at_33_conv;
bus_info_ptr2->slots_at_66_conv = bus_ptr->slots_at_66_conv;
bus_info_ptr2->slots_at_66_pcix = bus_ptr->slots_at_66_pcix;
bus_info_ptr2->slots_at_100_pcix = bus_ptr->slots_at_100_pcix;
bus_info_ptr2->slots_at_133_pcix = bus_ptr->slots_at_133_pcix;
}
bus_ptr++; bus_ptr++;
addr_bus += 1;
} }
hpc_ptr->ctlr_type = temp; hpc_ptr->ctlr_type = temp;
...@@ -511,10 +522,6 @@ static int ebda_rsrc_controller (void) ...@@ -511,10 +522,6 @@ static int ebda_rsrc_controller (void)
case 2: case 2:
hpc_ptr->u.wpeg_ctlr.wpegbbar = readl (io_mem + addr); hpc_ptr->u.wpeg_ctlr.wpegbbar = readl (io_mem + addr);
hpc_ptr->u.wpeg_ctlr.i2c_addr = readb (io_mem + addr + 4); hpc_ptr->u.wpeg_ctlr.i2c_addr = readb (io_mem + addr + 4);
/* following 2 lines for testing purpose */
if (hpc_ptr->u.wpeg_ctlr.i2c_addr == 0)
hpc_ptr->ctlr_type = 4;
hpc_ptr->irq = readb (io_mem + addr + 5); hpc_ptr->irq = readb (io_mem + addr + 5);
addr += 6; addr += 6;
...@@ -537,6 +544,8 @@ static int ebda_rsrc_controller (void) ...@@ -537,6 +544,8 @@ static int ebda_rsrc_controller (void)
hpc_ptr->revision = 0xff; hpc_ptr->revision = 0xff;
hpc_ptr->options = 0xff; hpc_ptr->options = 0xff;
hpc_ptr->starting_slot_num = hpc_ptr->slots[0].slot_num;
hpc_ptr->ending_slot_num = hpc_ptr->slots[slot_num-1].slot_num;
// register slots with hpc core as well as create linked list of ibm slot // register slots with hpc core as well as create linked list of ibm slot
for (index = 0; index < hpc_ptr->slot_count; index++) { for (index = 0; index < hpc_ptr->slot_count; index++) {
...@@ -573,10 +582,24 @@ static int ebda_rsrc_controller (void) ...@@ -573,10 +582,24 @@ static int ebda_rsrc_controller (void)
return -ENOMEM; return -ENOMEM;
} }
((struct slot *)hp_slot_ptr->private)->flag = TRUE; ((struct slot *)hp_slot_ptr->private)->flag = TRUE;
snprintf (hp_slot_ptr->name, 10, "%d", hpc_ptr->slots[index].slot_num); snprintf (hp_slot_ptr->name, 10, "%d", hpc_ptr->slots[index].slot_num);
((struct slot *) hp_slot_ptr->private)->capabilities = hpc_ptr->slots[index].slot_cap; ((struct slot *) hp_slot_ptr->private)->capabilities = hpc_ptr->slots[index].slot_cap;
if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_133_MAX) == EBDA_SLOT_133_MAX)
((struct slot *) hp_slot_ptr->private)->supported_speed = 3;
else if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_100_MAX) == EBDA_SLOT_100_MAX)
((struct slot *) hp_slot_ptr->private)->supported_speed = 2;
else if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_66_MAX) == EBDA_SLOT_66_MAX)
((struct slot *) hp_slot_ptr->private)->supported_speed = 1;
if ((hpc_ptr->slots[index].slot_cap & EBDA_SLOT_PCIX_CAP) == EBDA_SLOT_PCIX_CAP)
((struct slot *) hp_slot_ptr->private)->supported_bus_mode = 1;
else
((struct slot *) hp_slot_ptr->private)->supported_bus_mode = 0;
((struct slot *) hp_slot_ptr->private)->bus = hpc_ptr->slots[index].slot_bus_num; ((struct slot *) hp_slot_ptr->private)->bus = hpc_ptr->slots[index].slot_bus_num;
bus_info_ptr1 = ibmphp_find_same_bus_num (hpc_ptr->slots[index].slot_bus_num); bus_info_ptr1 = ibmphp_find_same_bus_num (hpc_ptr->slots[index].slot_bus_num);
...@@ -591,7 +614,7 @@ static int ebda_rsrc_controller (void) ...@@ -591,7 +614,7 @@ static int ebda_rsrc_controller (void)
((struct slot *) hp_slot_ptr->private)->ctlr_index = hpc_ptr->slots[index].ctl_index; ((struct slot *) hp_slot_ptr->private)->ctlr_index = hpc_ptr->slots[index].ctl_index;
((struct slot *) hp_slot_ptr->private)->number = hpc_ptr->slots[index].slot_num; ((struct slot *) hp_slot_ptr->private)->number = hpc_ptr->slots[index].slot_num;
((struct slot *) hp_slot_ptr->private)->hotplug_slot = hp_slot_ptr; ((struct slot *) hp_slot_ptr->private)->hotplug_slot = hp_slot_ptr;
rc = ibmphp_hpc_fillhpslotinfo (hp_slot_ptr); rc = ibmphp_hpc_fillhpslotinfo (hp_slot_ptr);
......
drivers/hotplug/ibmphp_hpc.c
View file @ cb0c3669
...@@ -83,10 +83,6 @@ static int to_debug = FALSE; ...@@ -83,10 +83,6 @@ static int to_debug = FALSE;
// //
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
#define WPG_I2C_IOREMAP_SIZE 0x2044 // size of linear address interval #define WPG_I2C_IOREMAP_SIZE 0x2044 // size of linear address interval
#define WPG_CTLR_MAX 0x01 // max controllers
#define WPG_SLOT_MAX 0x06 // max slots
#define WPG_CTLR_SLOT_MAX 0x06 // max slots per controller
#define WPG_FIRST_CTLR 0x00 // index of the controller
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// command index // command index
...@@ -127,7 +123,7 @@ static void free_hpc_access (void); ...@@ -127,7 +123,7 @@ static void free_hpc_access (void);
static void poll_hpc (void); static void poll_hpc (void);
static int update_slot (struct slot *, u8); static int update_slot (struct slot *, u8);
static int process_changeinstatus (struct slot *, struct slot *); static int process_changeinstatus (struct slot *, struct slot *);
static int process_changeinlatch (u8, u8); static int process_changeinlatch (u8, u8, struct controller *);
static int hpc_poll_thread (void *); static int hpc_poll_thread (void *);
static int hpc_wait_ctlr_notworking (int, struct controller *, void *, u8 *); static int hpc_wait_ctlr_notworking (int, struct controller *, void *, u8 *);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
...@@ -277,8 +273,7 @@ static u8 ctrl_write (struct controller *ctlr_ptr, void *WPGBbar, u8 index, u8 c ...@@ -277,8 +273,7 @@ static u8 ctrl_write (struct controller *ctlr_ptr, void *WPGBbar, u8 index, u8 c
int i; int i;
debug_polling ("%s - Entry WPGBbar[%lx] index[%x] cmd[%x]\n", debug_polling ("%s - Entry WPGBbar[%lx] index[%x] cmd[%x]\n", __FUNCTION__, (ulong) WPGBbar, index, cmd);
__FUNCTION__, (ulong) WPGBbar, index, cmd);
rc = 0; rc = 0;
//-------------------------------------------------------------------- //--------------------------------------------------------------------
...@@ -470,8 +465,7 @@ int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus) ...@@ -470,8 +465,7 @@ int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus)
int rc = 0; int rc = 0;
int busindex; int busindex;
debug_polling ("%s - Entry pslot[%lx] cmd[%x] pstatus[%lx]\n", debug_polling ("%s - Entry pslot[%lx] cmd[%x] pstatus[%lx]\n", __FUNCTION__, (ulong) pslot, cmd, (ulong) pstatus);
__FUNCTION__, (ulong) pslot, cmd, (ulong) pstatus);
if ((pslot == NULL) if ((pslot == NULL)
|| ((pstatus == NULL) && (cmd != READ_ALLSTAT) && (cmd != READ_BUSSTATUS))) { || ((pstatus == NULL) && (cmd != READ_ALLSTAT) && (cmd != READ_BUSSTATUS))) {
...@@ -779,7 +773,7 @@ static void poll_hpc (void) ...@@ -779,7 +773,7 @@ static void poll_hpc (void)
&curlatchlow); &curlatchlow);
if (oldlatchlow != curlatchlow) if (oldlatchlow != curlatchlow)
process_changeinlatch (oldlatchlow, process_changeinlatch (oldlatchlow,
curlatchlow); curlatchlow, pslot->ctrl);
} }
} }
} }
...@@ -917,7 +911,6 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot) ...@@ -917,7 +911,6 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
// bit 0 - HPC_SLOT_POWER // bit 0 - HPC_SLOT_POWER
if ((pslot->status & 0x01) != (poldslot->status & 0x01)) if ((pslot->status & 0x01) != (poldslot->status & 0x01))
/* ????????? DO WE NEED TO UPDATE BUS SPEED INFO HERE ??? */
update = TRUE; update = TRUE;
// bit 1 - HPC_SLOT_CONNECT // bit 1 - HPC_SLOT_CONNECT
...@@ -936,7 +929,7 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot) ...@@ -936,7 +929,7 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
// bit 5 - HPC_SLOT_PWRGD // bit 5 - HPC_SLOT_PWRGD
if ((pslot->status & 0x20) != (poldslot->status & 0x20)) if ((pslot->status & 0x20) != (poldslot->status & 0x20))
// OFF -> ON: ignore, ON -> OFF: disable slot // OFF -> ON: ignore, ON -> OFF: disable slot
if (poldslot->status & 0x20) if ((poldslot->status & 0x20) && (SLOT_CONNECT (poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT (poldslot->status)))
disable = TRUE; disable = TRUE;
// bit 6 - HPC_SLOT_BUS_SPEED // bit 6 - HPC_SLOT_BUS_SPEED
...@@ -947,20 +940,20 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot) ...@@ -947,20 +940,20 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
update = TRUE; update = TRUE;
// OPEN -> CLOSE // OPEN -> CLOSE
if (pslot->status & 0x80) { if (pslot->status & 0x80) {
if (SLOT_POWER (pslot->status)) { if (SLOT_PWRGD (pslot->status)) {
// power goes on and off after closing latch // power goes on and off after closing latch
// check again to make sure power is still ON // check again to make sure power is still ON
long_delay (1 * HZ); long_delay (1 * HZ);
rc = ibmphp_hpc_readslot (pslot, READ_SLOTSTATUS, &status); rc = ibmphp_hpc_readslot (pslot, READ_SLOTSTATUS, &status);
if (SLOT_POWER (status)) if (SLOT_PWRGD (status))
update = TRUE; update = TRUE;
else // overwrite power in pslot to OFF else // overwrite power in pslot to OFF
pslot->status &= ~HPC_SLOT_POWER; pslot->status &= ~HPC_SLOT_POWER;
} }
} }
// CLOSE -> OPEN // CLOSE -> OPEN
else if ((SLOT_POWER (poldslot->status) == HPC_SLOT_POWER_ON) else if ((SLOT_PWRGD (poldslot->status) == HPC_SLOT_PWRGD_GOOD)
|| (SLOT_CONNECT (poldslot->status) == HPC_SLOT_CONNECTED)) { && (SLOT_CONNECT (poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT (poldslot->status))) {
disable = TRUE; disable = TRUE;
} }
// else - ignore // else - ignore
...@@ -994,7 +987,7 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot) ...@@ -994,7 +987,7 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
* Return 0 or error codes * Return 0 or error codes
* Value: * Value:
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static int process_changeinlatch (u8 old, u8 new) static int process_changeinlatch (u8 old, u8 new, struct controller *ctrl)
{ {
struct slot myslot, *pslot; struct slot myslot, *pslot;
u8 i; u8 i;
...@@ -1004,7 +997,7 @@ static int process_changeinlatch (u8 old, u8 new) ...@@ -1004,7 +997,7 @@ static int process_changeinlatch (u8 old, u8 new)
debug ("%s - Entry old[%x], new[%x]\n", __FUNCTION__, old, new); debug ("%s - Entry old[%x], new[%x]\n", __FUNCTION__, old, new);
// bit 0 reserved, 0 is LSB, check bit 1-6 for 6 slots // bit 0 reserved, 0 is LSB, check bit 1-6 for 6 slots
for (i = 1; i <= 6; i++) { for (i = ctrl->starting_slot_num; i <= ctrl->ending_slot_num; i++) {
mask = 0x01 << i; mask = 0x01 << i;
if ((mask & old) != (mask & new)) { if ((mask & old) != (mask & new)) {
pslot = ibmphp_get_slot_from_physical_num (i); pslot = ibmphp_get_slot_from_physical_num (i);
......
drivers/hotplug/pci_hotplug_core.c
View file @ cb0c3669
...@@ -86,14 +86,6 @@ static spinlock_t list_lock; ...@@ -86,14 +86,6 @@ static spinlock_t list_lock;
LIST_HEAD(pci_hotplug_slot_list); LIST_HEAD(pci_hotplug_slot_list);
static int pcihpfs_statfs (struct super_block *sb, struct statfs *buf)
{
buf->f_type = PCIHPFS_MAGIC;
buf->f_bsize = PAGE_CACHE_SIZE;
buf->f_namelen = 255;
return 0;
}
static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, int dev) static struct inode *pcihpfs_get_inode (struct super_block *sb, int mode, int dev)
{ {
struct inode *inode = new_inode(sb); struct inode *inode = new_inode(sb);
......
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