PCI: Fix all whitespace issues
Fix all whitespace issues (missing or needed whitespace) in all files in drivers/pci. Code is compiled with allyesconfig before and after code changes and objects are recorded and checked with objdiff and they are not changed after this commit. Signed-off-by: Bogicevic Sasa <brutallesale@gmail.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bogicevic Sasa
committed by
Bjorn Helgaas
Bjorn Helgaas
parent
1d1e8cdc82
commit
ff3ce480e8
@@ -40,7 +40,7 @@
|
||||
#include "ibmphp.h"
|
||||
|
||||
static int to_debug = 0;
|
||||
#define debug_polling(fmt, arg...) do { if (to_debug) debug (fmt, arg); } while (0)
|
||||
#define debug_polling(fmt, arg...) do { if (to_debug) debug(fmt, arg); } while (0)
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
// timeout values
|
||||
@@ -110,16 +110,16 @@ static struct task_struct *ibmphp_poll_thread;
|
||||
//----------------------------------------------------------------------------
|
||||
// local function prototypes
|
||||
//----------------------------------------------------------------------------
|
||||
static u8 i2c_ctrl_read (struct controller *, void __iomem *, u8);
|
||||
static u8 i2c_ctrl_write (struct controller *, void __iomem *, u8, u8);
|
||||
static u8 hpc_writecmdtoindex (u8, u8);
|
||||
static u8 hpc_readcmdtoindex (u8, u8);
|
||||
static void get_hpc_access (void);
|
||||
static void free_hpc_access (void);
|
||||
static u8 i2c_ctrl_read(struct controller *, void __iomem *, u8);
|
||||
static u8 i2c_ctrl_write(struct controller *, void __iomem *, u8, u8);
|
||||
static u8 hpc_writecmdtoindex(u8, u8);
|
||||
static u8 hpc_readcmdtoindex(u8, u8);
|
||||
static void get_hpc_access(void);
|
||||
static void free_hpc_access(void);
|
||||
static int poll_hpc(void *data);
|
||||
static int process_changeinstatus (struct slot *, struct slot *);
|
||||
static int process_changeinlatch (u8, u8, struct controller *);
|
||||
static int hpc_wait_ctlr_notworking (int, struct controller *, void __iomem *, u8 *);
|
||||
static int process_changeinstatus(struct slot *, struct slot *);
|
||||
static int process_changeinlatch(u8, u8, struct controller *);
|
||||
static int hpc_wait_ctlr_notworking(int, struct controller *, void __iomem *, u8 *);
|
||||
//----------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -128,16 +128,16 @@ static int hpc_wait_ctlr_notworking (int, struct controller *, void __iomem *, u
|
||||
*
|
||||
* Action: initialize semaphores and variables
|
||||
*---------------------------------------------------------------------*/
|
||||
void __init ibmphp_hpc_initvars (void)
|
||||
void __init ibmphp_hpc_initvars(void)
|
||||
{
|
||||
debug ("%s - Entry\n", __func__);
|
||||
debug("%s - Entry\n", __func__);
|
||||
|
||||
mutex_init(&sem_hpcaccess);
|
||||
sema_init(&semOperations, 1);
|
||||
sema_init(&sem_exit, 0);
|
||||
to_debug = 0;
|
||||
|
||||
debug ("%s - Exit\n", __func__);
|
||||
debug("%s - Exit\n", __func__);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
@@ -146,7 +146,7 @@ void __init ibmphp_hpc_initvars (void)
|
||||
* Action: read from HPC over I2C
|
||||
*
|
||||
*---------------------------------------------------------------------*/
|
||||
static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8 index)
|
||||
static u8 i2c_ctrl_read(struct controller *ctlr_ptr, void __iomem *WPGBbar, u8 index)
|
||||
{
|
||||
u8 status;
|
||||
int i;
|
||||
@@ -155,7 +155,7 @@ static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
unsigned long ultemp;
|
||||
unsigned long data; // actual data HILO format
|
||||
|
||||
debug_polling ("%s - Entry WPGBbar[%p] index[%x] \n", __func__, WPGBbar, index);
|
||||
debug_polling("%s - Entry WPGBbar[%p] index[%x] \n", __func__, WPGBbar, index);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// READ - step 1
|
||||
@@ -178,28 +178,28 @@ static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
ultemp = ultemp << 8;
|
||||
data |= ultemp;
|
||||
} else {
|
||||
err ("this controller type is not supported \n");
|
||||
err("this controller type is not supported \n");
|
||||
return HPC_ERROR;
|
||||
}
|
||||
|
||||
wpg_data = swab32 (data); // swap data before writing
|
||||
wpg_data = swab32(data); // swap data before writing
|
||||
wpg_addr = WPGBbar + WPG_I2CMOSUP_OFFSET;
|
||||
writel (wpg_data, wpg_addr);
|
||||
writel(wpg_data, wpg_addr);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// READ - step 2 : clear the message buffer
|
||||
data = 0x00000000;
|
||||
wpg_data = swab32 (data);
|
||||
wpg_data = swab32(data);
|
||||
wpg_addr = WPGBbar + WPG_I2CMBUFL_OFFSET;
|
||||
writel (wpg_data, wpg_addr);
|
||||
writel(wpg_data, wpg_addr);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// READ - step 3 : issue start operation, I2C master control bit 30:ON
|
||||
// 2020 : [20] OR operation at [20] offset 0x20
|
||||
data = WPG_I2CMCNTL_STARTOP_MASK;
|
||||
wpg_data = swab32 (data);
|
||||
wpg_data = swab32(data);
|
||||
wpg_addr = WPGBbar + WPG_I2CMCNTL_OFFSET + WPG_I2C_OR;
|
||||
writel (wpg_data, wpg_addr);
|
||||
writel(wpg_data, wpg_addr);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// READ - step 4 : wait until start operation bit clears
|
||||
@@ -207,14 +207,14 @@ static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
while (i) {
|
||||
msleep(10);
|
||||
wpg_addr = WPGBbar + WPG_I2CMCNTL_OFFSET;
|
||||
wpg_data = readl (wpg_addr);
|
||||
data = swab32 (wpg_data);
|
||||
wpg_data = readl(wpg_addr);
|
||||
data = swab32(wpg_data);
|
||||
if (!(data & WPG_I2CMCNTL_STARTOP_MASK))
|
||||
break;
|
||||
i--;
|
||||
}
|
||||
if (i == 0) {
|
||||
debug ("%s - Error : WPG timeout\n", __func__);
|
||||
debug("%s - Error : WPG timeout\n", __func__);
|
||||
return HPC_ERROR;
|
||||
}
|
||||
//--------------------------------------------------------------------
|
||||
@@ -223,26 +223,26 @@ static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
while (i) {
|
||||
msleep(10);
|
||||
wpg_addr = WPGBbar + WPG_I2CSTAT_OFFSET;
|
||||
wpg_data = readl (wpg_addr);
|
||||
data = swab32 (wpg_data);
|
||||
if (HPC_I2CSTATUS_CHECK (data))
|
||||
wpg_data = readl(wpg_addr);
|
||||
data = swab32(wpg_data);
|
||||
if (HPC_I2CSTATUS_CHECK(data))
|
||||
break;
|
||||
i--;
|
||||
}
|
||||
if (i == 0) {
|
||||
debug ("ctrl_read - Exit Error:I2C timeout\n");
|
||||
debug("ctrl_read - Exit Error:I2C timeout\n");
|
||||
return HPC_ERROR;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// READ - step 6 : get DATA
|
||||
wpg_addr = WPGBbar + WPG_I2CMBUFL_OFFSET;
|
||||
wpg_data = readl (wpg_addr);
|
||||
data = swab32 (wpg_data);
|
||||
wpg_data = readl(wpg_addr);
|
||||
data = swab32(wpg_data);
|
||||
|
||||
status = (u8) data;
|
||||
|
||||
debug_polling ("%s - Exit index[%x] status[%x]\n", __func__, index, status);
|
||||
debug_polling("%s - Exit index[%x] status[%x]\n", __func__, index, status);
|
||||
|
||||
return (status);
|
||||
}
|
||||
@@ -254,7 +254,7 @@ static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
*
|
||||
* Return 0 or error codes
|
||||
*---------------------------------------------------------------------*/
|
||||
static u8 i2c_ctrl_write (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8 index, u8 cmd)
|
||||
static u8 i2c_ctrl_write(struct controller *ctlr_ptr, void __iomem *WPGBbar, u8 index, u8 cmd)
|
||||
{
|
||||
u8 rc;
|
||||
void __iomem *wpg_addr; // base addr + offset
|
||||
@@ -263,7 +263,7 @@ static u8 i2c_ctrl_write (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
unsigned long data; // actual data HILO format
|
||||
int i;
|
||||
|
||||
debug_polling ("%s - Entry WPGBbar[%p] index[%x] cmd[%x]\n", __func__, WPGBbar, index, cmd);
|
||||
debug_polling("%s - Entry WPGBbar[%p] index[%x] cmd[%x]\n", __func__, WPGBbar, index, cmd);
|
||||
|
||||
rc = 0;
|
||||
//--------------------------------------------------------------------
|
||||
@@ -289,28 +289,28 @@ static u8 i2c_ctrl_write (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
ultemp = ultemp << 8;
|
||||
data |= ultemp;
|
||||
} else {
|
||||
err ("this controller type is not supported \n");
|
||||
err("this controller type is not supported \n");
|
||||
return HPC_ERROR;
|
||||
}
|
||||
|
||||
wpg_data = swab32 (data); // swap data before writing
|
||||
wpg_data = swab32(data); // swap data before writing
|
||||
wpg_addr = WPGBbar + WPG_I2CMOSUP_OFFSET;
|
||||
writel (wpg_data, wpg_addr);
|
||||
writel(wpg_data, wpg_addr);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// WRITE - step 2 : clear the message buffer
|
||||
data = 0x00000000 | (unsigned long)cmd;
|
||||
wpg_data = swab32 (data);
|
||||
wpg_data = swab32(data);
|
||||
wpg_addr = WPGBbar + WPG_I2CMBUFL_OFFSET;
|
||||
writel (wpg_data, wpg_addr);
|
||||
writel(wpg_data, wpg_addr);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// WRITE - step 3 : issue start operation,I2C master control bit 30:ON
|
||||
// 2020 : [20] OR operation at [20] offset 0x20
|
||||
data = WPG_I2CMCNTL_STARTOP_MASK;
|
||||
wpg_data = swab32 (data);
|
||||
wpg_data = swab32(data);
|
||||
wpg_addr = WPGBbar + WPG_I2CMCNTL_OFFSET + WPG_I2C_OR;
|
||||
writel (wpg_data, wpg_addr);
|
||||
writel(wpg_data, wpg_addr);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// WRITE - step 4 : wait until start operation bit clears
|
||||
@@ -318,14 +318,14 @@ static u8 i2c_ctrl_write (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
while (i) {
|
||||
msleep(10);
|
||||
wpg_addr = WPGBbar + WPG_I2CMCNTL_OFFSET;
|
||||
wpg_data = readl (wpg_addr);
|
||||
data = swab32 (wpg_data);
|
||||
wpg_data = readl(wpg_addr);
|
||||
data = swab32(wpg_data);
|
||||
if (!(data & WPG_I2CMCNTL_STARTOP_MASK))
|
||||
break;
|
||||
i--;
|
||||
}
|
||||
if (i == 0) {
|
||||
debug ("%s - Exit Error:WPG timeout\n", __func__);
|
||||
debug("%s - Exit Error:WPG timeout\n", __func__);
|
||||
rc = HPC_ERROR;
|
||||
}
|
||||
|
||||
@@ -335,25 +335,25 @@ static u8 i2c_ctrl_write (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
while (i) {
|
||||
msleep(10);
|
||||
wpg_addr = WPGBbar + WPG_I2CSTAT_OFFSET;
|
||||
wpg_data = readl (wpg_addr);
|
||||
data = swab32 (wpg_data);
|
||||
if (HPC_I2CSTATUS_CHECK (data))
|
||||
wpg_data = readl(wpg_addr);
|
||||
data = swab32(wpg_data);
|
||||
if (HPC_I2CSTATUS_CHECK(data))
|
||||
break;
|
||||
i--;
|
||||
}
|
||||
if (i == 0) {
|
||||
debug ("ctrl_read - Error : I2C timeout\n");
|
||||
debug("ctrl_read - Error : I2C timeout\n");
|
||||
rc = HPC_ERROR;
|
||||
}
|
||||
|
||||
debug_polling ("%s Exit rc[%x]\n", __func__, rc);
|
||||
debug_polling("%s Exit rc[%x]\n", __func__, rc);
|
||||
return (rc);
|
||||
}
|
||||
|
||||
//------------------------------------------------------------
|
||||
// Read from ISA type HPC
|
||||
//------------------------------------------------------------
|
||||
static u8 isa_ctrl_read (struct controller *ctlr_ptr, u8 offset)
|
||||
static u8 isa_ctrl_read(struct controller *ctlr_ptr, u8 offset)
|
||||
{
|
||||
u16 start_address;
|
||||
u16 end_address;
|
||||
@@ -361,56 +361,56 @@ static u8 isa_ctrl_read (struct controller *ctlr_ptr, u8 offset)
|
||||
|
||||
start_address = ctlr_ptr->u.isa_ctlr.io_start;
|
||||
end_address = ctlr_ptr->u.isa_ctlr.io_end;
|
||||
data = inb (start_address + offset);
|
||||
data = inb(start_address + offset);
|
||||
return data;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------
|
||||
// Write to ISA type HPC
|
||||
//--------------------------------------------------------------
|
||||
static void isa_ctrl_write (struct controller *ctlr_ptr, u8 offset, u8 data)
|
||||
static void isa_ctrl_write(struct controller *ctlr_ptr, u8 offset, u8 data)
|
||||
{
|
||||
u16 start_address;
|
||||
u16 port_address;
|
||||
|
||||
start_address = ctlr_ptr->u.isa_ctlr.io_start;
|
||||
port_address = start_address + (u16) offset;
|
||||
outb (data, port_address);
|
||||
outb(data, port_address);
|
||||
}
|
||||
|
||||
static u8 pci_ctrl_read (struct controller *ctrl, u8 offset)
|
||||
static u8 pci_ctrl_read(struct controller *ctrl, u8 offset)
|
||||
{
|
||||
u8 data = 0x00;
|
||||
debug ("inside pci_ctrl_read\n");
|
||||
debug("inside pci_ctrl_read\n");
|
||||
if (ctrl->ctrl_dev)
|
||||
pci_read_config_byte (ctrl->ctrl_dev, HPC_PCI_OFFSET + offset, &data);
|
||||
pci_read_config_byte(ctrl->ctrl_dev, HPC_PCI_OFFSET + offset, &data);
|
||||
return data;
|
||||
}
|
||||
|
||||
static u8 pci_ctrl_write (struct controller *ctrl, u8 offset, u8 data)
|
||||
static u8 pci_ctrl_write(struct controller *ctrl, u8 offset, u8 data)
|
||||
{
|
||||
u8 rc = -ENODEV;
|
||||
debug ("inside pci_ctrl_write\n");
|
||||
debug("inside pci_ctrl_write\n");
|
||||
if (ctrl->ctrl_dev) {
|
||||
pci_write_config_byte (ctrl->ctrl_dev, HPC_PCI_OFFSET + offset, data);
|
||||
pci_write_config_byte(ctrl->ctrl_dev, HPC_PCI_OFFSET + offset, data);
|
||||
rc = 0;
|
||||
}
|
||||
return rc;
|
||||
}
|
||||
|
||||
static u8 ctrl_read (struct controller *ctlr, void __iomem *base, u8 offset)
|
||||
static u8 ctrl_read(struct controller *ctlr, void __iomem *base, u8 offset)
|
||||
{
|
||||
u8 rc;
|
||||
switch (ctlr->ctlr_type) {
|
||||
case 0:
|
||||
rc = isa_ctrl_read (ctlr, offset);
|
||||
rc = isa_ctrl_read(ctlr, offset);
|
||||
break;
|
||||
case 1:
|
||||
rc = pci_ctrl_read (ctlr, offset);
|
||||
rc = pci_ctrl_read(ctlr, offset);
|
||||
break;
|
||||
case 2:
|
||||
case 4:
|
||||
rc = i2c_ctrl_read (ctlr, base, offset);
|
||||
rc = i2c_ctrl_read(ctlr, base, offset);
|
||||
break;
|
||||
default:
|
||||
return -ENODEV;
|
||||
@@ -418,7 +418,7 @@ static u8 ctrl_read (struct controller *ctlr, void __iomem *base, u8 offset)
|
||||
return rc;
|
||||
}
|
||||
|
||||
static u8 ctrl_write (struct controller *ctlr, void __iomem *base, u8 offset, u8 data)
|
||||
static u8 ctrl_write(struct controller *ctlr, void __iomem *base, u8 offset, u8 data)
|
||||
{
|
||||
u8 rc = 0;
|
||||
switch (ctlr->ctlr_type) {
|
||||
@@ -426,7 +426,7 @@ static u8 ctrl_write (struct controller *ctlr, void __iomem *base, u8 offset, u8
|
||||
isa_ctrl_write(ctlr, offset, data);
|
||||
break;
|
||||
case 1:
|
||||
rc = pci_ctrl_write (ctlr, offset, data);
|
||||
rc = pci_ctrl_write(ctlr, offset, data);
|
||||
break;
|
||||
case 2:
|
||||
case 4:
|
||||
@@ -444,7 +444,7 @@ static u8 ctrl_write (struct controller *ctlr, void __iomem *base, u8 offset, u8
|
||||
*
|
||||
* Return index, HPC_ERROR
|
||||
*---------------------------------------------------------------------*/
|
||||
static u8 hpc_writecmdtoindex (u8 cmd, u8 index)
|
||||
static u8 hpc_writecmdtoindex(u8 cmd, u8 index)
|
||||
{
|
||||
u8 rc;
|
||||
|
||||
@@ -476,7 +476,7 @@ static u8 hpc_writecmdtoindex (u8 cmd, u8 index)
|
||||
break;
|
||||
|
||||
default:
|
||||
err ("hpc_writecmdtoindex - Error invalid cmd[%x]\n", cmd);
|
||||
err("hpc_writecmdtoindex - Error invalid cmd[%x]\n", cmd);
|
||||
rc = HPC_ERROR;
|
||||
}
|
||||
|
||||
@@ -490,7 +490,7 @@ static u8 hpc_writecmdtoindex (u8 cmd, u8 index)
|
||||
*
|
||||
* Return index, HPC_ERROR
|
||||
*---------------------------------------------------------------------*/
|
||||
static u8 hpc_readcmdtoindex (u8 cmd, u8 index)
|
||||
static u8 hpc_readcmdtoindex(u8 cmd, u8 index)
|
||||
{
|
||||
u8 rc;
|
||||
|
||||
@@ -533,7 +533,7 @@ static u8 hpc_readcmdtoindex (u8 cmd, u8 index)
|
||||
*
|
||||
* 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;
|
||||
struct controller *ctlr_ptr;
|
||||
@@ -542,69 +542,69 @@ int ibmphp_hpc_readslot (struct slot *pslot, u8 cmd, u8 *pstatus)
|
||||
int rc = 0;
|
||||
int busindex;
|
||||
|
||||
debug_polling ("%s - Entry pslot[%p] cmd[%x] pstatus[%p]\n", __func__, pslot, cmd, pstatus);
|
||||
debug_polling("%s - Entry pslot[%p] cmd[%x] pstatus[%p]\n", __func__, pslot, cmd, pstatus);
|
||||
|
||||
if ((pslot == NULL)
|
||||
|| ((pstatus == NULL) && (cmd != READ_ALLSTAT) && (cmd != READ_BUSSTATUS))) {
|
||||
rc = -EINVAL;
|
||||
err ("%s - Error invalid pointer, rc[%d]\n", __func__, rc);
|
||||
err("%s - Error invalid pointer, rc[%d]\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
if (cmd == READ_BUSSTATUS) {
|
||||
busindex = ibmphp_get_bus_index (pslot->bus);
|
||||
busindex = ibmphp_get_bus_index(pslot->bus);
|
||||
if (busindex < 0) {
|
||||
rc = -EINVAL;
|
||||
err ("%s - Exit Error:invalid bus, rc[%d]\n", __func__, rc);
|
||||
err("%s - Exit Error:invalid bus, rc[%d]\n", __func__, rc);
|
||||
return rc;
|
||||
} else
|
||||
index = (u8) busindex;
|
||||
} else
|
||||
index = pslot->ctlr_index;
|
||||
|
||||
index = hpc_readcmdtoindex (cmd, index);
|
||||
index = hpc_readcmdtoindex(cmd, index);
|
||||
|
||||
if (index == HPC_ERROR) {
|
||||
rc = -EINVAL;
|
||||
err ("%s - Exit Error:invalid index, rc[%d]\n", __func__, rc);
|
||||
err("%s - Exit Error:invalid index, rc[%d]\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
ctlr_ptr = pslot->ctrl;
|
||||
|
||||
get_hpc_access ();
|
||||
get_hpc_access();
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// map physical address to logical address
|
||||
//--------------------------------------------------------------------
|
||||
if ((ctlr_ptr->ctlr_type == 2) || (ctlr_ptr->ctlr_type == 4))
|
||||
wpg_bbar = ioremap (ctlr_ptr->u.wpeg_ctlr.wpegbbar, WPG_I2C_IOREMAP_SIZE);
|
||||
wpg_bbar = ioremap(ctlr_ptr->u.wpeg_ctlr.wpegbbar, WPG_I2C_IOREMAP_SIZE);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// check controller status before reading
|
||||
//--------------------------------------------------------------------
|
||||
rc = hpc_wait_ctlr_notworking (HPC_CTLR_WORKING_TOUT, ctlr_ptr, wpg_bbar, &status);
|
||||
rc = hpc_wait_ctlr_notworking(HPC_CTLR_WORKING_TOUT, ctlr_ptr, wpg_bbar, &status);
|
||||
if (!rc) {
|
||||
switch (cmd) {
|
||||
case READ_ALLSTAT:
|
||||
// update the slot structure
|
||||
pslot->ctrl->status = status;
|
||||
pslot->status = ctrl_read (ctlr_ptr, wpg_bbar, index);
|
||||
rc = hpc_wait_ctlr_notworking (HPC_CTLR_WORKING_TOUT, ctlr_ptr, wpg_bbar,
|
||||
pslot->status = ctrl_read(ctlr_ptr, wpg_bbar, index);
|
||||
rc = hpc_wait_ctlr_notworking(HPC_CTLR_WORKING_TOUT, ctlr_ptr, wpg_bbar,
|
||||
&status);
|
||||
if (!rc)
|
||||
pslot->ext_status = ctrl_read (ctlr_ptr, wpg_bbar, index + WPG_1ST_EXTSLOT_INDEX);
|
||||
pslot->ext_status = ctrl_read(ctlr_ptr, wpg_bbar, index + WPG_1ST_EXTSLOT_INDEX);
|
||||
|
||||
break;
|
||||
|
||||
case READ_SLOTSTATUS:
|
||||
// DO NOT update the slot structure
|
||||
*pstatus = ctrl_read (ctlr_ptr, wpg_bbar, index);
|
||||
*pstatus = ctrl_read(ctlr_ptr, wpg_bbar, index);
|
||||
break;
|
||||
|
||||
case READ_EXTSLOTSTATUS:
|
||||
// DO NOT update the slot structure
|
||||
*pstatus = ctrl_read (ctlr_ptr, wpg_bbar, index);
|
||||
*pstatus = ctrl_read(ctlr_ptr, wpg_bbar, index);
|
||||
break;
|
||||
|
||||
case READ_CTLRSTATUS:
|
||||
@@ -613,36 +613,36 @@ int ibmphp_hpc_readslot (struct slot *pslot, u8 cmd, u8 *pstatus)
|
||||
break;
|
||||
|
||||
case READ_BUSSTATUS:
|
||||
pslot->busstatus = ctrl_read (ctlr_ptr, wpg_bbar, index);
|
||||
pslot->busstatus = ctrl_read(ctlr_ptr, wpg_bbar, index);
|
||||
break;
|
||||
case READ_REVLEVEL:
|
||||
*pstatus = ctrl_read (ctlr_ptr, wpg_bbar, index);
|
||||
*pstatus = ctrl_read(ctlr_ptr, wpg_bbar, index);
|
||||
break;
|
||||
case READ_HPCOPTIONS:
|
||||
*pstatus = ctrl_read (ctlr_ptr, wpg_bbar, index);
|
||||
*pstatus = ctrl_read(ctlr_ptr, wpg_bbar, index);
|
||||
break;
|
||||
case READ_SLOTLATCHLOWREG:
|
||||
// DO NOT update the slot structure
|
||||
*pstatus = ctrl_read (ctlr_ptr, wpg_bbar, index);
|
||||
*pstatus = ctrl_read(ctlr_ptr, wpg_bbar, index);
|
||||
break;
|
||||
|
||||
// Not used
|
||||
case READ_ALLSLOT:
|
||||
list_for_each (pslotlist, &ibmphp_slot_head) {
|
||||
pslot = list_entry (pslotlist, struct slot, ibm_slot_list);
|
||||
list_for_each(pslotlist, &ibmphp_slot_head) {
|
||||
pslot = list_entry(pslotlist, struct slot, ibm_slot_list);
|
||||
index = pslot->ctlr_index;
|
||||
rc = hpc_wait_ctlr_notworking (HPC_CTLR_WORKING_TOUT, ctlr_ptr,
|
||||
rc = hpc_wait_ctlr_notworking(HPC_CTLR_WORKING_TOUT, ctlr_ptr,
|
||||
wpg_bbar, &status);
|
||||
if (!rc) {
|
||||
pslot->status = ctrl_read (ctlr_ptr, wpg_bbar, index);
|
||||
rc = hpc_wait_ctlr_notworking (HPC_CTLR_WORKING_TOUT,
|
||||
pslot->status = ctrl_read(ctlr_ptr, wpg_bbar, index);
|
||||
rc = hpc_wait_ctlr_notworking(HPC_CTLR_WORKING_TOUT,
|
||||
ctlr_ptr, wpg_bbar, &status);
|
||||
if (!rc)
|
||||
pslot->ext_status =
|
||||
ctrl_read (ctlr_ptr, wpg_bbar,
|
||||
ctrl_read(ctlr_ptr, wpg_bbar,
|
||||
index + WPG_1ST_EXTSLOT_INDEX);
|
||||
} else {
|
||||
err ("%s - Error ctrl_read failed\n", __func__);
|
||||
err("%s - Error ctrl_read failed\n", __func__);
|
||||
rc = -EINVAL;
|
||||
break;
|
||||
}
|
||||
@@ -659,11 +659,11 @@ int ibmphp_hpc_readslot (struct slot *pslot, u8 cmd, u8 *pstatus)
|
||||
|
||||
// remove physical to logical address mapping
|
||||
if ((ctlr_ptr->ctlr_type == 2) || (ctlr_ptr->ctlr_type == 4))
|
||||
iounmap (wpg_bbar);
|
||||
iounmap(wpg_bbar);
|
||||
|
||||
free_hpc_access ();
|
||||
free_hpc_access();
|
||||
|
||||
debug_polling ("%s - Exit rc[%d]\n", __func__, rc);
|
||||
debug_polling("%s - Exit rc[%d]\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -672,7 +672,7 @@ int ibmphp_hpc_readslot (struct slot *pslot, u8 cmd, u8 *pstatus)
|
||||
*
|
||||
* 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;
|
||||
struct controller *ctlr_ptr;
|
||||
@@ -682,55 +682,55 @@ int ibmphp_hpc_writeslot (struct slot *pslot, u8 cmd)
|
||||
int rc = 0;
|
||||
int timeout;
|
||||
|
||||
debug_polling ("%s - Entry pslot[%p] cmd[%x]\n", __func__, pslot, cmd);
|
||||
debug_polling("%s - Entry pslot[%p] cmd[%x]\n", __func__, pslot, cmd);
|
||||
if (pslot == NULL) {
|
||||
rc = -EINVAL;
|
||||
err ("%s - Error Exit rc[%d]\n", __func__, rc);
|
||||
err("%s - Error Exit rc[%d]\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
if ((cmd == HPC_BUS_33CONVMODE) || (cmd == HPC_BUS_66CONVMODE) ||
|
||||
(cmd == HPC_BUS_66PCIXMODE) || (cmd == HPC_BUS_100PCIXMODE) ||
|
||||
(cmd == HPC_BUS_133PCIXMODE)) {
|
||||
busindex = ibmphp_get_bus_index (pslot->bus);
|
||||
busindex = ibmphp_get_bus_index(pslot->bus);
|
||||
if (busindex < 0) {
|
||||
rc = -EINVAL;
|
||||
err ("%s - Exit Error:invalid bus, rc[%d]\n", __func__, rc);
|
||||
err("%s - Exit Error:invalid bus, rc[%d]\n", __func__, rc);
|
||||
return rc;
|
||||
} else
|
||||
index = (u8) busindex;
|
||||
} else
|
||||
index = pslot->ctlr_index;
|
||||
|
||||
index = hpc_writecmdtoindex (cmd, index);
|
||||
index = hpc_writecmdtoindex(cmd, index);
|
||||
|
||||
if (index == HPC_ERROR) {
|
||||
rc = -EINVAL;
|
||||
err ("%s - Error Exit rc[%d]\n", __func__, rc);
|
||||
err("%s - Error Exit rc[%d]\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
ctlr_ptr = pslot->ctrl;
|
||||
|
||||
get_hpc_access ();
|
||||
get_hpc_access();
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// map physical address to logical address
|
||||
//--------------------------------------------------------------------
|
||||
if ((ctlr_ptr->ctlr_type == 2) || (ctlr_ptr->ctlr_type == 4)) {
|
||||
wpg_bbar = ioremap (ctlr_ptr->u.wpeg_ctlr.wpegbbar, WPG_I2C_IOREMAP_SIZE);
|
||||
wpg_bbar = ioremap(ctlr_ptr->u.wpeg_ctlr.wpegbbar, WPG_I2C_IOREMAP_SIZE);
|
||||
|
||||
debug ("%s - ctlr id[%x] physical[%lx] logical[%lx] i2c[%x]\n", __func__,
|
||||
debug("%s - ctlr id[%x] physical[%lx] logical[%lx] i2c[%x]\n", __func__,
|
||||
ctlr_ptr->ctlr_id, (ulong) (ctlr_ptr->u.wpeg_ctlr.wpegbbar), (ulong) wpg_bbar,
|
||||
ctlr_ptr->u.wpeg_ctlr.i2c_addr);
|
||||
}
|
||||
//--------------------------------------------------------------------
|
||||
// check controller status before writing
|
||||
//--------------------------------------------------------------------
|
||||
rc = hpc_wait_ctlr_notworking (HPC_CTLR_WORKING_TOUT, ctlr_ptr, wpg_bbar, &status);
|
||||
rc = hpc_wait_ctlr_notworking(HPC_CTLR_WORKING_TOUT, ctlr_ptr, wpg_bbar, &status);
|
||||
if (!rc) {
|
||||
|
||||
ctrl_write (ctlr_ptr, wpg_bbar, index, cmd);
|
||||
ctrl_write(ctlr_ptr, wpg_bbar, index, cmd);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// check controller is still not working on the command
|
||||
@@ -738,11 +738,11 @@ int ibmphp_hpc_writeslot (struct slot *pslot, u8 cmd)
|
||||
timeout = CMD_COMPLETE_TOUT_SEC;
|
||||
done = 0;
|
||||
while (!done) {
|
||||
rc = hpc_wait_ctlr_notworking (HPC_CTLR_WORKING_TOUT, ctlr_ptr, wpg_bbar,
|
||||
rc = hpc_wait_ctlr_notworking(HPC_CTLR_WORKING_TOUT, ctlr_ptr, wpg_bbar,
|
||||
&status);
|
||||
if (!rc) {
|
||||
if (NEEDTOCHECK_CMDSTATUS (cmd)) {
|
||||
if (CTLR_FINISHED (status) == HPC_CTLR_FINISHED_YES)
|
||||
if (NEEDTOCHECK_CMDSTATUS(cmd)) {
|
||||
if (CTLR_FINISHED(status) == HPC_CTLR_FINISHED_YES)
|
||||
done = 1;
|
||||
} else
|
||||
done = 1;
|
||||
@@ -751,7 +751,7 @@ int ibmphp_hpc_writeslot (struct slot *pslot, u8 cmd)
|
||||
msleep(1000);
|
||||
if (timeout < 1) {
|
||||
done = 1;
|
||||
err ("%s - Error command complete timeout\n", __func__);
|
||||
err("%s - Error command complete timeout\n", __func__);
|
||||
rc = -EFAULT;
|
||||
} else
|
||||
timeout--;
|
||||
@@ -763,10 +763,10 @@ int ibmphp_hpc_writeslot (struct slot *pslot, u8 cmd)
|
||||
|
||||
// remove physical to logical address mapping
|
||||
if ((ctlr_ptr->ctlr_type == 2) || (ctlr_ptr->ctlr_type == 4))
|
||||
iounmap (wpg_bbar);
|
||||
free_hpc_access ();
|
||||
iounmap(wpg_bbar);
|
||||
free_hpc_access();
|
||||
|
||||
debug_polling ("%s - Exit rc[%d]\n", __func__, rc);
|
||||
debug_polling("%s - Exit rc[%d]\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -775,7 +775,7 @@ int ibmphp_hpc_writeslot (struct slot *pslot, u8 cmd)
|
||||
*
|
||||
* Action: make sure only one process can access HPC at one time
|
||||
*---------------------------------------------------------------------*/
|
||||
static void get_hpc_access (void)
|
||||
static void get_hpc_access(void)
|
||||
{
|
||||
mutex_lock(&sem_hpcaccess);
|
||||
}
|
||||
@@ -783,7 +783,7 @@ static void get_hpc_access (void)
|
||||
/*----------------------------------------------------------------------
|
||||
* Name: free_hpc_access()
|
||||
*---------------------------------------------------------------------*/
|
||||
void free_hpc_access (void)
|
||||
void free_hpc_access(void)
|
||||
{
|
||||
mutex_unlock(&sem_hpcaccess);
|
||||
}
|
||||
@@ -793,21 +793,21 @@ void free_hpc_access (void)
|
||||
*
|
||||
* Action: make sure only one process can change the data structure
|
||||
*---------------------------------------------------------------------*/
|
||||
void ibmphp_lock_operations (void)
|
||||
void ibmphp_lock_operations(void)
|
||||
{
|
||||
down (&semOperations);
|
||||
down(&semOperations);
|
||||
to_debug = 1;
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
* Name: ibmphp_unlock_operations()
|
||||
*---------------------------------------------------------------------*/
|
||||
void ibmphp_unlock_operations (void)
|
||||
void ibmphp_unlock_operations(void)
|
||||
{
|
||||
debug ("%s - Entry\n", __func__);
|
||||
up (&semOperations);
|
||||
debug("%s - Entry\n", __func__);
|
||||
up(&semOperations);
|
||||
to_debug = 0;
|
||||
debug ("%s - Exit\n", __func__);
|
||||
debug("%s - Exit\n", __func__);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
@@ -828,28 +828,28 @@ static int poll_hpc(void *data)
|
||||
int poll_count = 0;
|
||||
u8 ctrl_count = 0x00;
|
||||
|
||||
debug ("%s - Entry\n", __func__);
|
||||
debug("%s - Entry\n", __func__);
|
||||
|
||||
while (!kthread_should_stop()) {
|
||||
/* try to get the lock to do some kind of hardware access */
|
||||
down (&semOperations);
|
||||
down(&semOperations);
|
||||
|
||||
switch (poll_state) {
|
||||
case POLL_LATCH_REGISTER:
|
||||
oldlatchlow = curlatchlow;
|
||||
ctrl_count = 0x00;
|
||||
list_for_each (pslotlist, &ibmphp_slot_head) {
|
||||
list_for_each(pslotlist, &ibmphp_slot_head) {
|
||||
if (ctrl_count >= ibmphp_get_total_controllers())
|
||||
break;
|
||||
pslot = list_entry (pslotlist, struct slot, ibm_slot_list);
|
||||
pslot = list_entry(pslotlist, struct slot, ibm_slot_list);
|
||||
if (pslot->ctrl->ctlr_relative_id == ctrl_count) {
|
||||
ctrl_count++;
|
||||
if (READ_SLOT_LATCH (pslot->ctrl)) {
|
||||
rc = ibmphp_hpc_readslot (pslot,
|
||||
if (READ_SLOT_LATCH(pslot->ctrl)) {
|
||||
rc = ibmphp_hpc_readslot(pslot,
|
||||
READ_SLOTLATCHLOWREG,
|
||||
&curlatchlow);
|
||||
if (oldlatchlow != curlatchlow)
|
||||
process_changeinlatch (oldlatchlow,
|
||||
process_changeinlatch(oldlatchlow,
|
||||
curlatchlow,
|
||||
pslot->ctrl);
|
||||
}
|
||||
@@ -859,25 +859,25 @@ static int poll_hpc(void *data)
|
||||
poll_state = POLL_SLEEP;
|
||||
break;
|
||||
case POLL_SLOTS:
|
||||
list_for_each (pslotlist, &ibmphp_slot_head) {
|
||||
pslot = list_entry (pslotlist, struct slot, ibm_slot_list);
|
||||
list_for_each(pslotlist, &ibmphp_slot_head) {
|
||||
pslot = list_entry(pslotlist, struct slot, ibm_slot_list);
|
||||
// make a copy of the old status
|
||||
memcpy ((void *) &myslot, (void *) pslot,
|
||||
sizeof (struct slot));
|
||||
rc = ibmphp_hpc_readslot (pslot, READ_ALLSTAT, NULL);
|
||||
memcpy((void *) &myslot, (void *) pslot,
|
||||
sizeof(struct slot));
|
||||
rc = ibmphp_hpc_readslot(pslot, READ_ALLSTAT, NULL);
|
||||
if ((myslot.status != pslot->status)
|
||||
|| (myslot.ext_status != pslot->ext_status))
|
||||
process_changeinstatus (pslot, &myslot);
|
||||
process_changeinstatus(pslot, &myslot);
|
||||
}
|
||||
ctrl_count = 0x00;
|
||||
list_for_each (pslotlist, &ibmphp_slot_head) {
|
||||
list_for_each(pslotlist, &ibmphp_slot_head) {
|
||||
if (ctrl_count >= ibmphp_get_total_controllers())
|
||||
break;
|
||||
pslot = list_entry (pslotlist, struct slot, ibm_slot_list);
|
||||
pslot = list_entry(pslotlist, struct slot, ibm_slot_list);
|
||||
if (pslot->ctrl->ctlr_relative_id == ctrl_count) {
|
||||
ctrl_count++;
|
||||
if (READ_SLOT_LATCH (pslot->ctrl))
|
||||
rc = ibmphp_hpc_readslot (pslot,
|
||||
if (READ_SLOT_LATCH(pslot->ctrl))
|
||||
rc = ibmphp_hpc_readslot(pslot,
|
||||
READ_SLOTLATCHLOWREG,
|
||||
&curlatchlow);
|
||||
}
|
||||
@@ -887,13 +887,13 @@ static int poll_hpc(void *data)
|
||||
break;
|
||||
case POLL_SLEEP:
|
||||
/* don't sleep with a lock on the hardware */
|
||||
up (&semOperations);
|
||||
up(&semOperations);
|
||||
msleep(POLL_INTERVAL_SEC * 1000);
|
||||
|
||||
if (kthread_should_stop())
|
||||
goto out_sleep;
|
||||
|
||||
down (&semOperations);
|
||||
down(&semOperations);
|
||||
|
||||
if (poll_count >= POLL_LATCH_CNT) {
|
||||
poll_count = 0;
|
||||
@@ -903,13 +903,13 @@ static int poll_hpc(void *data)
|
||||
break;
|
||||
}
|
||||
/* give up the hardware semaphore */
|
||||
up (&semOperations);
|
||||
up(&semOperations);
|
||||
/* sleep for a short time just for good measure */
|
||||
out_sleep:
|
||||
msleep(100);
|
||||
}
|
||||
up (&sem_exit);
|
||||
debug ("%s - Exit\n", __func__);
|
||||
up(&sem_exit);
|
||||
debug("%s - Exit\n", __func__);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -929,14 +929,14 @@ out_sleep:
|
||||
*
|
||||
* Notes:
|
||||
*---------------------------------------------------------------------*/
|
||||
static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
|
||||
static int process_changeinstatus(struct slot *pslot, struct slot *poldslot)
|
||||
{
|
||||
u8 status;
|
||||
int rc = 0;
|
||||
u8 disable = 0;
|
||||
u8 update = 0;
|
||||
|
||||
debug ("process_changeinstatus - Entry pslot[%p], poldslot[%p]\n", pslot, poldslot);
|
||||
debug("process_changeinstatus - Entry pslot[%p], poldslot[%p]\n", pslot, poldslot);
|
||||
|
||||
// bit 0 - HPC_SLOT_POWER
|
||||
if ((pslot->status & 0x01) != (poldslot->status & 0x01))
|
||||
@@ -958,7 +958,7 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
|
||||
// bit 5 - HPC_SLOT_PWRGD
|
||||
if ((pslot->status & 0x20) != (poldslot->status & 0x20))
|
||||
// OFF -> ON: ignore, ON -> OFF: disable slot
|
||||
if ((poldslot->status & 0x20) && (SLOT_CONNECT (poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT (poldslot->status)))
|
||||
if ((poldslot->status & 0x20) && (SLOT_CONNECT(poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT(poldslot->status)))
|
||||
disable = 1;
|
||||
|
||||
// bit 6 - HPC_SLOT_BUS_SPEED
|
||||
@@ -969,20 +969,20 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
|
||||
update = 1;
|
||||
// OPEN -> CLOSE
|
||||
if (pslot->status & 0x80) {
|
||||
if (SLOT_PWRGD (pslot->status)) {
|
||||
if (SLOT_PWRGD(pslot->status)) {
|
||||
// power goes on and off after closing latch
|
||||
// check again to make sure power is still ON
|
||||
msleep(1000);
|
||||
rc = ibmphp_hpc_readslot (pslot, READ_SLOTSTATUS, &status);
|
||||
if (SLOT_PWRGD (status))
|
||||
rc = ibmphp_hpc_readslot(pslot, READ_SLOTSTATUS, &status);
|
||||
if (SLOT_PWRGD(status))
|
||||
update = 1;
|
||||
else // overwrite power in pslot to OFF
|
||||
pslot->status &= ~HPC_SLOT_POWER;
|
||||
}
|
||||
}
|
||||
// CLOSE -> OPEN
|
||||
else if ((SLOT_PWRGD (poldslot->status) == HPC_SLOT_PWRGD_GOOD)
|
||||
&& (SLOT_CONNECT (poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT (poldslot->status))) {
|
||||
else if ((SLOT_PWRGD(poldslot->status) == HPC_SLOT_PWRGD_GOOD)
|
||||
&& (SLOT_CONNECT(poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT(poldslot->status))) {
|
||||
disable = 1;
|
||||
}
|
||||
// else - ignore
|
||||
@@ -992,15 +992,15 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
|
||||
update = 1;
|
||||
|
||||
if (disable) {
|
||||
debug ("process_changeinstatus - disable slot\n");
|
||||
debug("process_changeinstatus - disable slot\n");
|
||||
pslot->flag = 0;
|
||||
rc = ibmphp_do_disable_slot (pslot);
|
||||
rc = ibmphp_do_disable_slot(pslot);
|
||||
}
|
||||
|
||||
if (update || disable)
|
||||
ibmphp_update_slot_info (pslot);
|
||||
ibmphp_update_slot_info(pslot);
|
||||
|
||||
debug ("%s - Exit rc[%d] disable[%x] update[%x]\n", __func__, rc, disable, update);
|
||||
debug("%s - Exit rc[%d] disable[%x] update[%x]\n", __func__, rc, disable, update);
|
||||
|
||||
return rc;
|
||||
}
|
||||
@@ -1015,32 +1015,32 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
|
||||
* Return 0 or error codes
|
||||
* Value:
|
||||
*---------------------------------------------------------------------*/
|
||||
static int process_changeinlatch (u8 old, u8 new, struct controller *ctrl)
|
||||
static int process_changeinlatch(u8 old, u8 new, struct controller *ctrl)
|
||||
{
|
||||
struct slot myslot, *pslot;
|
||||
u8 i;
|
||||
u8 mask;
|
||||
int rc = 0;
|
||||
|
||||
debug ("%s - Entry old[%x], new[%x]\n", __func__, old, new);
|
||||
debug("%s - Entry old[%x], new[%x]\n", __func__, old, new);
|
||||
// bit 0 reserved, 0 is LSB, check bit 1-6 for 6 slots
|
||||
|
||||
for (i = ctrl->starting_slot_num; i <= ctrl->ending_slot_num; i++) {
|
||||
mask = 0x01 << i;
|
||||
if ((mask & old) != (mask & new)) {
|
||||
pslot = ibmphp_get_slot_from_physical_num (i);
|
||||
pslot = ibmphp_get_slot_from_physical_num(i);
|
||||
if (pslot) {
|
||||
memcpy ((void *) &myslot, (void *) pslot, sizeof (struct slot));
|
||||
rc = ibmphp_hpc_readslot (pslot, READ_ALLSTAT, NULL);
|
||||
debug ("%s - call process_changeinstatus for slot[%d]\n", __func__, i);
|
||||
process_changeinstatus (pslot, &myslot);
|
||||
memcpy((void *) &myslot, (void *) pslot, sizeof(struct slot));
|
||||
rc = ibmphp_hpc_readslot(pslot, READ_ALLSTAT, NULL);
|
||||
debug("%s - call process_changeinstatus for slot[%d]\n", __func__, i);
|
||||
process_changeinstatus(pslot, &myslot);
|
||||
} else {
|
||||
rc = -EINVAL;
|
||||
err ("%s - Error bad pointer for slot[%d]\n", __func__, i);
|
||||
err("%s - Error bad pointer for slot[%d]\n", __func__, i);
|
||||
}
|
||||
}
|
||||
}
|
||||
debug ("%s - Exit rc[%d]\n", __func__, rc);
|
||||
debug("%s - Exit rc[%d]\n", __func__, rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
@@ -1049,13 +1049,13 @@ static int process_changeinlatch (u8 old, u8 new, struct controller *ctrl)
|
||||
*
|
||||
* Action: start polling thread
|
||||
*---------------------------------------------------------------------*/
|
||||
int __init ibmphp_hpc_start_poll_thread (void)
|
||||
int __init ibmphp_hpc_start_poll_thread(void)
|
||||
{
|
||||
debug ("%s - Entry\n", __func__);
|
||||
debug("%s - Entry\n", __func__);
|
||||
|
||||
ibmphp_poll_thread = kthread_run(poll_hpc, NULL, "hpc_poll");
|
||||
if (IS_ERR(ibmphp_poll_thread)) {
|
||||
err ("%s - Error, thread not started\n", __func__);
|
||||
err("%s - Error, thread not started\n", __func__);
|
||||
return PTR_ERR(ibmphp_poll_thread);
|
||||
}
|
||||
return 0;
|
||||
@@ -1066,30 +1066,30 @@ int __init ibmphp_hpc_start_poll_thread (void)
|
||||
*
|
||||
* Action: stop polling thread and cleanup
|
||||
*---------------------------------------------------------------------*/
|
||||
void __exit ibmphp_hpc_stop_poll_thread (void)
|
||||
void __exit ibmphp_hpc_stop_poll_thread(void)
|
||||
{
|
||||
debug ("%s - Entry\n", __func__);
|
||||
debug("%s - Entry\n", __func__);
|
||||
|
||||
kthread_stop(ibmphp_poll_thread);
|
||||
debug ("before locking operations \n");
|
||||
ibmphp_lock_operations ();
|
||||
debug ("after locking operations \n");
|
||||
debug("before locking operations\n");
|
||||
ibmphp_lock_operations();
|
||||
debug("after locking operations\n");
|
||||
|
||||
// wait for poll thread to exit
|
||||
debug ("before sem_exit down \n");
|
||||
down (&sem_exit);
|
||||
debug ("after sem_exit down \n");
|
||||
debug("before sem_exit down\n");
|
||||
down(&sem_exit);
|
||||
debug("after sem_exit down\n");
|
||||
|
||||
// cleanup
|
||||
debug ("before free_hpc_access \n");
|
||||
free_hpc_access ();
|
||||
debug ("after free_hpc_access \n");
|
||||
ibmphp_unlock_operations ();
|
||||
debug ("after unlock operations \n");
|
||||
up (&sem_exit);
|
||||
debug ("after sem exit up\n");
|
||||
debug("before free_hpc_access\n");
|
||||
free_hpc_access();
|
||||
debug("after free_hpc_access\n");
|
||||
ibmphp_unlock_operations();
|
||||
debug("after unlock operations\n");
|
||||
up(&sem_exit);
|
||||
debug("after sem exit up\n");
|
||||
|
||||
debug ("%s - Exit\n", __func__);
|
||||
debug("%s - Exit\n", __func__);
|
||||
}
|
||||
|
||||
/*----------------------------------------------------------------------
|
||||
@@ -1100,32 +1100,32 @@ void __exit ibmphp_hpc_stop_poll_thread (void)
|
||||
* Return 0, HPC_ERROR
|
||||
* 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)
|
||||
{
|
||||
int rc = 0;
|
||||
u8 done = 0;
|
||||
|
||||
debug_polling ("hpc_wait_ctlr_notworking - Entry timeout[%d]\n", timeout);
|
||||
debug_polling("hpc_wait_ctlr_notworking - Entry timeout[%d]\n", timeout);
|
||||
|
||||
while (!done) {
|
||||
*pstatus = ctrl_read (ctlr_ptr, wpg_bbar, WPG_CTLR_INDEX);
|
||||
*pstatus = ctrl_read(ctlr_ptr, wpg_bbar, WPG_CTLR_INDEX);
|
||||
if (*pstatus == HPC_ERROR) {
|
||||
rc = HPC_ERROR;
|
||||
done = 1;
|
||||
}
|
||||
if (CTLR_WORKING (*pstatus) == HPC_CTLR_WORKING_NO)
|
||||
if (CTLR_WORKING(*pstatus) == HPC_CTLR_WORKING_NO)
|
||||
done = 1;
|
||||
if (!done) {
|
||||
msleep(1000);
|
||||
if (timeout < 1) {
|
||||
done = 1;
|
||||
err ("HPCreadslot - Error ctlr timeout\n");
|
||||
err("HPCreadslot - Error ctlr timeout\n");
|
||||
rc = HPC_ERROR;
|
||||
} else
|
||||
timeout--;
|
||||
}
|
||||
}
|
||||
debug_polling ("hpc_wait_ctlr_notworking - Exit rc[%x] status[%x]\n", rc, *pstatus);
|
||||
debug_polling("hpc_wait_ctlr_notworking - Exit rc[%x] status[%x]\n", rc, *pstatus);
|
||||
return rc;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user