Skip to content

L
linux
Commit 01f3bfb7 authored by Gavin Shan's avatar Gavin Shan Committed by Benjamin Herrenschmidt
Browse files
Options

powerpc/powernv: Shorten EEH function names 

The patch shortens names of EEH functions in powernv-eeh.c and no
logic change introduced by this patch.
Signed-off-by: default avatarGavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6ec73343
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 52 deletions
arch/powerpc/platforms/powernv/eeh-powernv.c
View file @ 01f3bfb7
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
#include "pci.h" #include "pci.h"
/** /**
* powernv_eeh_init - EEH platform dependent initialization * pnv_eeh_init - EEH platform dependent initialization
* *
* EEH platform dependent initialization on powernv * EEH platform dependent initialization on powernv
*/ */
static int powernv_eeh_init(void) static int pnv_eeh_init(void)
{ {
struct pci_controller *hose; struct pci_controller *hose;
struct pnv_phb *phb; struct pnv_phb *phb;
...@@ -86,14 +86,14 @@ static int powernv_eeh_init(void) ...@@ -86,14 +86,14 @@ static int powernv_eeh_init(void)
} }
/** /**
* powernv_eeh_post_init - EEH platform dependent post initialization * pnv_eeh_post_init - EEH platform dependent post initialization
* *
* EEH platform dependent post initialization on powernv. When * EEH platform dependent post initialization on powernv. When
* the function is called, the EEH PEs and devices should have * the function is called, the EEH PEs and devices should have
* been built. If the I/O cache staff has been built, EEH is * been built. If the I/O cache staff has been built, EEH is
* ready to supply service. * ready to supply service.
*/ */
static int powernv_eeh_post_init(void) static int pnv_eeh_post_init(void)
{ {
struct pci_controller *hose; struct pci_controller *hose;
struct pnv_phb *phb; struct pnv_phb *phb;
...@@ -113,7 +113,7 @@ static int powernv_eeh_post_init(void) ...@@ -113,7 +113,7 @@ static int powernv_eeh_post_init(void)
} }
/** /**
* powernv_eeh_dev_probe - Do probe on PCI device * pnv_eeh_dev_probe - Do probe on PCI device
* @dev: PCI device * @dev: PCI device
* @flag: unused * @flag: unused
* *
...@@ -129,7 +129,7 @@ static int powernv_eeh_post_init(void) ...@@ -129,7 +129,7 @@ static int powernv_eeh_post_init(void)
* was possiblly triggered by EEH core, the binding between EEH device * was possiblly triggered by EEH core, the binding between EEH device
* and the PCI device isn't built yet. * and the PCI device isn't built yet.
*/ */
static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag) static int pnv_eeh_dev_probe(struct pci_dev *dev, void *flag)
{ {
struct pci_controller *hose = pci_bus_to_host(dev->bus); struct pci_controller *hose = pci_bus_to_host(dev->bus);
struct pnv_phb *phb = hose->private_data; struct pnv_phb *phb = hose->private_data;
...@@ -221,7 +221,7 @@ static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag) ...@@ -221,7 +221,7 @@ static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag)
} }
/** /**
* powernv_eeh_set_option - Initialize EEH or MMIO/DMA reenable * pnv_eeh_set_option - Initialize EEH or MMIO/DMA reenable
* @pe: EEH PE * @pe: EEH PE
* @option: operation to be issued * @option: operation to be issued
* *
...@@ -229,7 +229,7 @@ static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag) ...@@ -229,7 +229,7 @@ static int powernv_eeh_dev_probe(struct pci_dev *dev, void *flag)
* Currently, following options are support according to PAPR: * Currently, following options are support according to PAPR:
* Enable EEH, Disable EEH, Enable MMIO and Enable DMA * Enable EEH, Disable EEH, Enable MMIO and Enable DMA
*/ */
static int powernv_eeh_set_option(struct eeh_pe *pe, int option) static int pnv_eeh_set_option(struct eeh_pe *pe, int option)
{ {
struct pci_controller *hose = pe->phb; struct pci_controller *hose = pe->phb;
struct pnv_phb *phb = hose->private_data; struct pnv_phb *phb = hose->private_data;
...@@ -246,19 +246,19 @@ static int powernv_eeh_set_option(struct eeh_pe *pe, int option) ...@@ -246,19 +246,19 @@ static int powernv_eeh_set_option(struct eeh_pe *pe, int option)
} }
/** /**
* powernv_eeh_get_pe_addr - Retrieve PE address * pnv_eeh_get_pe_addr - Retrieve PE address
* @pe: EEH PE * @pe: EEH PE
* *
* Retrieve the PE address according to the given tranditional * Retrieve the PE address according to the given tranditional
* PCI BDF (Bus/Device/Function) address. * PCI BDF (Bus/Device/Function) address.
*/ */
static int powernv_eeh_get_pe_addr(struct eeh_pe *pe) static int pnv_eeh_get_pe_addr(struct eeh_pe *pe)
{ {
return pe->addr; return pe->addr;
} }
/** /**
* powernv_eeh_get_state - Retrieve PE state * pnv_eeh_get_state - Retrieve PE state
* @pe: EEH PE * @pe: EEH PE
* @delay: delay while PE state is temporarily unavailable * @delay: delay while PE state is temporarily unavailable
* *
...@@ -267,7 +267,7 @@ static int powernv_eeh_get_pe_addr(struct eeh_pe *pe) ...@@ -267,7 +267,7 @@ static int powernv_eeh_get_pe_addr(struct eeh_pe *pe)
* we prefer passing down to hardware implementation to handle * we prefer passing down to hardware implementation to handle
* it. * it.
*/ */
static int powernv_eeh_get_state(struct eeh_pe *pe, int *delay) static int pnv_eeh_get_state(struct eeh_pe *pe, int *delay)
{ {
struct pci_controller *hose = pe->phb; struct pci_controller *hose = pe->phb;
struct pnv_phb *phb = hose->private_data; struct pnv_phb *phb = hose->private_data;
...@@ -292,13 +292,13 @@ static int powernv_eeh_get_state(struct eeh_pe *pe, int *delay) ...@@ -292,13 +292,13 @@ static int powernv_eeh_get_state(struct eeh_pe *pe, int *delay)
} }
/** /**
* powernv_eeh_reset - Reset the specified PE * pnv_eeh_reset - Reset the specified PE
* @pe: EEH PE * @pe: EEH PE
* @option: reset option * @option: reset option
* *
* Reset the specified PE * Reset the specified PE
*/ */
static int powernv_eeh_reset(struct eeh_pe *pe, int option) static int pnv_eeh_reset(struct eeh_pe *pe, int option)
{ {
struct pci_controller *hose = pe->phb; struct pci_controller *hose = pe->phb;
struct pnv_phb *phb = hose->private_data; struct pnv_phb *phb = hose->private_data;
...@@ -311,20 +311,20 @@ static int powernv_eeh_reset(struct eeh_pe *pe, int option) ...@@ -311,20 +311,20 @@ static int powernv_eeh_reset(struct eeh_pe *pe, int option)
} }
/** /**
* powernv_eeh_wait_state - Wait for PE state * pnv_eeh_wait_state - Wait for PE state
* @pe: EEH PE * @pe: EEH PE
* @max_wait: maximal period in microsecond * @max_wait: maximal period in microsecond
* *
* Wait for the state of associated PE. It might take some time * Wait for the state of associated PE. It might take some time
* to retrieve the PE's state. * to retrieve the PE's state.
*/ */
static int powernv_eeh_wait_state(struct eeh_pe *pe, int max_wait) static int pnv_eeh_wait_state(struct eeh_pe *pe, int max_wait)
{ {
int ret; int ret;
int mwait; int mwait;
while (1) { while (1) {
ret = powernv_eeh_get_state(pe, &mwait); ret = pnv_eeh_get_state(pe, &mwait);
/* /*
* If the PE's state is temporarily unavailable, * If the PE's state is temporarily unavailable,
...@@ -348,7 +348,7 @@ static int powernv_eeh_wait_state(struct eeh_pe *pe, int max_wait) ...@@ -348,7 +348,7 @@ static int powernv_eeh_wait_state(struct eeh_pe *pe, int max_wait)
} }
/** /**
* powernv_eeh_get_log - Retrieve error log * pnv_eeh_get_log - Retrieve error log
* @pe: EEH PE * @pe: EEH PE
* @severity: temporary or permanent error log * @severity: temporary or permanent error log
* @drv_log: driver log to be combined with retrieved error log * @drv_log: driver log to be combined with retrieved error log
...@@ -356,7 +356,7 @@ static int powernv_eeh_wait_state(struct eeh_pe *pe, int max_wait) ...@@ -356,7 +356,7 @@ static int powernv_eeh_wait_state(struct eeh_pe *pe, int max_wait)
* *
* Retrieve the temporary or permanent error from the PE. * Retrieve the temporary or permanent error from the PE.
*/ */
static int powernv_eeh_get_log(struct eeh_pe *pe, int severity, static int pnv_eeh_get_log(struct eeh_pe *pe, int severity,
char *drv_log, unsigned long len) char *drv_log, unsigned long len)
{ {
struct pci_controller *hose = pe->phb; struct pci_controller *hose = pe->phb;
...@@ -370,14 +370,14 @@ static int powernv_eeh_get_log(struct eeh_pe *pe, int severity, ...@@ -370,14 +370,14 @@ static int powernv_eeh_get_log(struct eeh_pe *pe, int severity,
} }
/** /**
* powernv_eeh_configure_bridge - Configure PCI bridges in the indicated PE * pnv_eeh_configure_bridge - Configure PCI bridges in the indicated PE
* @pe: EEH PE * @pe: EEH PE
* *
* The function will be called to reconfigure the bridges included * The function will be called to reconfigure the bridges included
* in the specified PE so that the mulfunctional PE would be recovered * in the specified PE so that the mulfunctional PE would be recovered
* again. * again.
*/ */
static int powernv_eeh_configure_bridge(struct eeh_pe *pe) static int pnv_eeh_configure_bridge(struct eeh_pe *pe)
{ {
struct pci_controller *hose = pe->phb; struct pci_controller *hose = pe->phb;
struct pnv_phb *phb = hose->private_data; struct pnv_phb *phb = hose->private_data;
...@@ -390,7 +390,7 @@ static int powernv_eeh_configure_bridge(struct eeh_pe *pe) ...@@ -390,7 +390,7 @@ static int powernv_eeh_configure_bridge(struct eeh_pe *pe)
} }
/** /**
* powernv_pe_err_inject - Inject specified error to the indicated PE * pnv_pe_err_inject - Inject specified error to the indicated PE
* @pe: the indicated PE * @pe: the indicated PE
* @type: error type * @type: error type
* @func: specific error type * @func: specific error type
...@@ -401,7 +401,7 @@ static int powernv_eeh_configure_bridge(struct eeh_pe *pe) ...@@ -401,7 +401,7 @@ static int powernv_eeh_configure_bridge(struct eeh_pe *pe)
* determined by @type and @func, to the indicated PE for * determined by @type and @func, to the indicated PE for
* testing purpose. * testing purpose.
*/ */
static int powernv_eeh_err_inject(struct eeh_pe *pe, int type, int func, static int pnv_eeh_err_inject(struct eeh_pe *pe, int type, int func,
unsigned long addr, unsigned long mask) unsigned long addr, unsigned long mask)
{ {
struct pci_controller *hose = pe->phb; struct pci_controller *hose = pe->phb;
...@@ -414,7 +414,7 @@ static int powernv_eeh_err_inject(struct eeh_pe *pe, int type, int func, ...@@ -414,7 +414,7 @@ static int powernv_eeh_err_inject(struct eeh_pe *pe, int type, int func,
return ret; return ret;
} }
static inline bool powernv_eeh_cfg_blocked(struct device_node *dn) static inline bool pnv_eeh_cfg_blocked(struct device_node *dn)
{ {
struct eeh_dev *edev = of_node_to_eeh_dev(dn); struct eeh_dev *edev = of_node_to_eeh_dev(dn);
...@@ -427,10 +427,10 @@ static inline bool powernv_eeh_cfg_blocked(struct device_node *dn) ...@@ -427,10 +427,10 @@ static inline bool powernv_eeh_cfg_blocked(struct device_node *dn)
return false; return false;
} }
static int powernv_eeh_read_config(struct device_node *dn, static int pnv_eeh_read_config(struct device_node *dn,
int where, int size, u32 *val) int where, int size, u32 *val)
{ {
if (powernv_eeh_cfg_blocked(dn)) { if (pnv_eeh_cfg_blocked(dn)) {
*val = 0xFFFFFFFF; *val = 0xFFFFFFFF;
return PCIBIOS_SET_FAILED; return PCIBIOS_SET_FAILED;
} }
...@@ -438,22 +438,22 @@ static int powernv_eeh_read_config(struct device_node *dn, ...@@ -438,22 +438,22 @@ static int powernv_eeh_read_config(struct device_node *dn,
return pnv_pci_cfg_read(dn, where, size, val); return pnv_pci_cfg_read(dn, where, size, val);
} }
static int powernv_eeh_write_config(struct device_node *dn, static int pnv_eeh_write_config(struct device_node *dn,
int where, int size, u32 val) int where, int size, u32 val)
{ {
if (powernv_eeh_cfg_blocked(dn)) if (pnv_eeh_cfg_blocked(dn))
return PCIBIOS_SET_FAILED; return PCIBIOS_SET_FAILED;
return pnv_pci_cfg_write(dn, where, size, val); return pnv_pci_cfg_write(dn, where, size, val);
} }
/** /**
* powernv_eeh_next_error - Retrieve next EEH error to handle * pnv_eeh_next_error - Retrieve next EEH error to handle
* @pe: Affected PE * @pe: Affected PE
* *
* Using OPAL API, to retrieve next EEH error for EEH core to handle * Using OPAL API, to retrieve next EEH error for EEH core to handle
*/ */
static int powernv_eeh_next_error(struct eeh_pe **pe) static int pnv_eeh_next_error(struct eeh_pe **pe)
{ {
struct pci_controller *hose; struct pci_controller *hose;
struct pnv_phb *phb = NULL; struct pnv_phb *phb = NULL;
...@@ -469,7 +469,7 @@ static int powernv_eeh_next_error(struct eeh_pe **pe) ...@@ -469,7 +469,7 @@ static int powernv_eeh_next_error(struct eeh_pe **pe)
return -EEXIST; return -EEXIST;
} }
static int powernv_eeh_restore_config(struct device_node *dn) static int pnv_eeh_restore_config(struct device_node *dn)
{ {
struct eeh_dev *edev = of_node_to_eeh_dev(dn); struct eeh_dev *edev = of_node_to_eeh_dev(dn);
struct pnv_phb *phb; struct pnv_phb *phb;
...@@ -490,24 +490,24 @@ static int powernv_eeh_restore_config(struct device_node *dn) ...@@ -490,24 +490,24 @@ static int powernv_eeh_restore_config(struct device_node *dn)
return 0; return 0;
} }
static struct eeh_ops powernv_eeh_ops = { static struct eeh_ops pnv_eeh_ops = {
.name = "powernv", .name = "powernv",
.init = powernv_eeh_init, .init = pnv_eeh_init,
.post_init = powernv_eeh_post_init, .post_init = pnv_eeh_post_init,
.of_probe = NULL, .of_probe = NULL,
.dev_probe = powernv_eeh_dev_probe, .dev_probe = pnv_eeh_dev_probe,
.set_option = powernv_eeh_set_option, .set_option = pnv_eeh_set_option,
.get_pe_addr = powernv_eeh_get_pe_addr, .get_pe_addr = pnv_eeh_get_pe_addr,
.get_state = powernv_eeh_get_state, .get_state = pnv_eeh_get_state,
.reset = powernv_eeh_reset, .reset = pnv_eeh_reset,
.wait_state = powernv_eeh_wait_state, .wait_state = pnv_eeh_wait_state,
.get_log = powernv_eeh_get_log, .get_log = pnv_eeh_get_log,
.configure_bridge = powernv_eeh_configure_bridge, .configure_bridge = pnv_eeh_configure_bridge,
.err_inject = powernv_eeh_err_inject, .err_inject = pnv_eeh_err_inject,
.read_config = powernv_eeh_read_config, .read_config = pnv_eeh_read_config,
.write_config = powernv_eeh_write_config, .write_config = pnv_eeh_write_config,
.next_error = powernv_eeh_next_error, .next_error = pnv_eeh_next_error,
.restore_config = powernv_eeh_restore_config .restore_config = pnv_eeh_restore_config
}; };
/** /**
...@@ -521,7 +521,7 @@ static int __init eeh_powernv_init(void) ...@@ -521,7 +521,7 @@ static int __init eeh_powernv_init(void)
int ret = -EINVAL; int ret = -EINVAL;
eeh_set_pe_aux_size(PNV_PCI_DIAG_BUF_SIZE); eeh_set_pe_aux_size(PNV_PCI_DIAG_BUF_SIZE);
ret = eeh_ops_register(&powernv_eeh_ops); ret = eeh_ops_register(&pnv_eeh_ops);
if (!ret) if (!ret)
pr_info("EEH: PowerNV platform initialized\n"); pr_info("EEH: PowerNV platform initialized\n");
else else
......
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