renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 20:23:57 +08:00
Code

PCI: pcie, aer: checkpatch style cleanup in pcie/aer/*

Browse Source 
Before:
 drivers/pci/pcie/aer/aer_inject.c
  total: 4 errors, 4 warnings, 473 lines checked
 drivers/pci/pcie/aer/aerdrv.c
  total: 5 errors, 2 warnings, 333 lines checked
 drivers/pci/pcie/aer/aerdrv.h
  total: 1 errors, 0 warnings, 139 lines checked
 drivers/pci/pcie/aer/aerdrv_core.c
  total: 4 errors, 3 warnings, 872 lines checked
 drivers/pci/pcie/aer/aerdrv_errprint.c
  total: 12 errors, 11 warnings, 248 lines checked

After:
 drivers/pci/pcie/aer/aer_inject.c
  total: 0 errors, 0 warnings, 466 lines checked
 drivers/pci/pcie/aer/aerdrv.c
  total: 0 errors, 0 warnings, 335 lines checked
 drivers/pci/pcie/aer/aerdrv.h
  total: 0 errors, 0 warnings, 139 lines checked
 drivers/pci/pcie/aer/aerdrv_core.c
  total: 0 errors, 0 warnings, 869 lines checked
 drivers/pci/pcie/aer/aerdrv_errprint.c
  total: 0 errors, 10 warnings, 247 lines checked

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: Andrew Patterson <andrew.patterson@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Hidetoshi Seto 2009-09-07 17:07:29 +09:00 committed by Jesse Barnes
parent b439b1d4e3
commit c9a918838c
5 changed files with 62 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/pci/pcie/aer/aer_inject.c
View File

@ -22,11 +22,10 @@
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include "aerdrv.h" #include "aerdrv.h"
struct aer_error_inj struct aer_error_inj {
{
u8 bus; u8 bus;
u8 dev; u8 dev;
u8 fn; u8 fn;
@ -38,8 +37,7 @@ struct aer_error_inj
u32 header_log3; u32 header_log3;
}; };
struct aer_error struct aer_error {
{
struct list_head list; struct list_head list;
unsigned int bus; unsigned int bus;
unsigned int devfn; unsigned int devfn;
@ -55,8 +53,7 @@ struct aer_error
u32 source_id; u32 source_id;
}; };
struct pci_bus_ops struct pci_bus_ops {
{
struct list_head list; struct list_head list;
struct pci_bus *bus; struct pci_bus *bus;
struct pci_ops *ops; struct pci_ops *ops;
@ -150,7 +147,7 @@ static u32 *find_pci_config_dword(struct aer_error *err, int where,
target = &err->header_log1; target = &err->header_log1;
break; break;
case PCI_ERR_HEADER_LOG+8: case PCI_ERR_HEADER_LOG+8:
target = &err->header_log2; target = &err->header_log2;
break; break;
case PCI_ERR_HEADER_LOG+12: case PCI_ERR_HEADER_LOG+12:
target = &err->header_log3; target = &err->header_log3;
@ -258,8 +255,7 @@ static int pci_bus_set_aer_ops(struct pci_bus *bus)
bus_ops = NULL; bus_ops = NULL;
out: out:
spin_unlock_irqrestore(&inject_lock, flags); spin_unlock_irqrestore(&inject_lock, flags);
if (bus_ops) kfree(bus_ops);
kfree(bus_ops);
return 0; return 0;
} }
@ -401,10 +397,8 @@ static int aer_inject(struct aer_error_inj *einj)
else else
ret = -EINVAL; ret = -EINVAL;
out_put: out_put:
if (err_alloc) kfree(err_alloc);
kfree(err_alloc); kfree(rperr_alloc);
if (rperr_alloc)
kfree(rperr_alloc);
pci_dev_put(dev); pci_dev_put(dev);
return ret; return ret;
} }
@ -458,8 +452,7 @@ static void __exit aer_inject_exit(void)
} }
spin_lock_irqsave(&inject_lock, flags); spin_lock_irqsave(&inject_lock, flags);
list_for_each_entry_safe(err, err_next, list_for_each_entry_safe(err, err_next, &pci_bus_ops_list, list) {
&pci_bus_ops_list, list) {
list_del(&err->list); list_del(&err->list);
kfree(err); kfree(err);
} }

22
drivers/pci/pcie/aer/aerdrv.c
View File

@ -38,7 +38,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC); MODULE_DESCRIPTION(DRIVER_DESC);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int __devinit aer_probe (struct pcie_device *dev); static int __devinit aer_probe(struct pcie_device *dev);
static void aer_remove(struct pcie_device *dev); static void aer_remove(struct pcie_device *dev);
static pci_ers_result_t aer_error_detected(struct pci_dev *dev, static pci_ers_result_t aer_error_detected(struct pci_dev *dev,
enum pci_channel_state error); enum pci_channel_state error);
@ -47,7 +47,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev);
static struct pci_error_handlers aer_error_handlers = { static struct pci_error_handlers aer_error_handlers = {
.error_detected = aer_error_detected, .error_detected = aer_error_detected,
.resume = aer_error_resume, .resume = aer_error_resume,
}; };
static struct pcie_port_service_driver aerdriver = { static struct pcie_port_service_driver aerdriver = {
@ -134,12 +134,12 @@ EXPORT_SYMBOL_GPL(aer_irq);
* *
* Invoked when Root Port's AER service is loaded. * Invoked when Root Port's AER service is loaded.
**/ **/
static struct aer_rpc* aer_alloc_rpc(struct pcie_device *dev) static struct aer_rpc *aer_alloc_rpc(struct pcie_device *dev)
{ {
struct aer_rpc *rpc; struct aer_rpc *rpc;
if (!(rpc = kzalloc(sizeof(struct aer_rpc), rpc = kzalloc(sizeof(struct aer_rpc), GFP_KERNEL);
GFP_KERNEL))) if (!rpc)
return NULL; return NULL;
/* /*
@ -189,26 +189,28 @@ static void aer_remove(struct pcie_device *dev)
* *
* Invoked when PCI Express bus loads AER service driver. * Invoked when PCI Express bus loads AER service driver.
**/ **/
static int __devinit aer_probe (struct pcie_device *dev) static int __devinit aer_probe(struct pcie_device *dev)
{ {
int status; int status;
struct aer_rpc *rpc; struct aer_rpc *rpc;
struct device *device = &dev->device; struct device *device = &dev->device;
/* Init */ /* Init */
if ((status = aer_init(dev))) status = aer_init(dev);
if (status)
return status; return status;
/* Alloc rpc data structure */ /* Alloc rpc data structure */
if (!(rpc = aer_alloc_rpc(dev))) { rpc = aer_alloc_rpc(dev);
if (!rpc) {
dev_printk(KERN_DEBUG, device, "alloc rpc failed\n"); dev_printk(KERN_DEBUG, device, "alloc rpc failed\n");
aer_remove(dev); aer_remove(dev);
return -ENOMEM; return -ENOMEM;
} }
/* Request IRQ ISR */ /* Request IRQ ISR */
if ((status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv", status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv", dev);
dev))) { if (status) {
dev_printk(KERN_DEBUG, device, "request IRQ failed\n"); dev_printk(KERN_DEBUG, device, "request IRQ failed\n");
aer_remove(dev); aer_remove(dev);
return status; return status;

6
drivers/pci/pcie/aer/aerdrv.h
View File

@ -21,7 +21,7 @@
#define AER_ERROR(d) (d & AER_ERROR_MASK) #define AER_ERROR(d) (d & AER_ERROR_MASK)
/* Root Error Status Register Bits */ /* Root Error Status Register Bits */
#define ROOT_ERR_STATUS_MASKS 0x0f #define ROOT_ERR_STATUS_MASKS 0x0f
#define SYSTEM_ERROR_INTR_ON_MESG_MASK (PCI_EXP_RTCTL_SECEE| \ #define SYSTEM_ERROR_INTR_ON_MESG_MASK (PCI_EXP_RTCTL_SECEE| \
PCI_EXP_RTCTL_SENFEE| \ PCI_EXP_RTCTL_SENFEE| \
@ -65,7 +65,7 @@ struct aer_err_info {
int severity; /* 0:NONFATAL | 1:FATAL | 2:COR */ int severity; /* 0:NONFATAL | 1:FATAL | 2:COR */
int flags; int flags;
unsigned int status; /* COR/UNCOR Error Status */ unsigned int status; /* COR/UNCOR Error Status */
struct header_log_regs tlp; /* TLP Header */ struct header_log_regs tlp; /* TLP Header */
}; };
struct aer_err_source { struct aer_err_source {
@ -136,4 +136,4 @@ static inline int aer_osc_setup(struct pcie_device *pciedev)
} }
#endif #endif
#endif //_AERDRV_H_ #endif /* _AERDRV_H_ */

31
drivers/pci/pcie/aer/aerdrv_core.c
View File

@ -49,10 +49,11 @@ int pci_enable_pcie_error_reporting(struct pci_dev *dev)
PCI_EXP_DEVCTL_NFERE | PCI_EXP_DEVCTL_NFERE |
PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_FERE |
PCI_EXP_DEVCTL_URRE; PCI_EXP_DEVCTL_URRE;
pci_write_config_word(dev, pos+PCI_EXP_DEVCTL, pci_write_config_word(dev, pos+PCI_EXP_DEVCTL, reg16);
reg16);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting);
int pci_disable_pcie_error_reporting(struct pci_dev *dev) int pci_disable_pcie_error_reporting(struct pci_dev *dev)
{ {
@ -68,10 +69,11 @@ int pci_disable_pcie_error_reporting(struct pci_dev *dev)
PCI_EXP_DEVCTL_NFERE | PCI_EXP_DEVCTL_NFERE |
PCI_EXP_DEVCTL_FERE | PCI_EXP_DEVCTL_FERE |
PCI_EXP_DEVCTL_URRE); PCI_EXP_DEVCTL_URRE);
pci_write_config_word(dev, pos+PCI_EXP_DEVCTL, pci_write_config_word(dev, pos+PCI_EXP_DEVCTL, reg16);
reg16);
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);
int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev) int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
{ {
@ -92,6 +94,7 @@ int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);
#if 0 #if 0
int pci_cleanup_aer_correct_error_status(struct pci_dev *dev) int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)
@ -110,7 +113,6 @@ int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)
} }
#endif /* 0 */ #endif /* 0 */
static int set_device_error_reporting(struct pci_dev *dev, void *data) static int set_device_error_reporting(struct pci_dev *dev, void *data)
{ {
bool enable = *((bool *)data); bool enable = *((bool *)data);
@ -164,8 +166,9 @@ static int add_error_device(struct aer_err_info *e_info, struct pci_dev *dev)
e_info->dev[e_info->error_dev_num] = dev; e_info->dev[e_info->error_dev_num] = dev;
e_info->error_dev_num++; e_info->error_dev_num++;
return 1; return 1;
} else }
return 0;
return 0;
} }
@ -411,8 +414,7 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev,
pci_cleanup_aer_uncorrect_error_status(dev); pci_cleanup_aer_uncorrect_error_status(dev);
dev->error_state = pci_channel_io_normal; dev->error_state = pci_channel_io_normal;
} }
} } else {
else {
/* /*
* If the error is reported by an end point, we think this * If the error is reported by an end point, we think this
* error is related to the upstream link of the end point. * error is related to the upstream link of the end point.
@ -473,7 +475,7 @@ static pci_ers_result_t reset_link(struct pcie_device *aerdev,
if (dev->hdr_type & PCI_HEADER_TYPE_BRIDGE) if (dev->hdr_type & PCI_HEADER_TYPE_BRIDGE)
udev = dev; udev = dev;
else else
udev= dev->bus->self; udev = dev->bus->self;
data.is_downstream = 0; data.is_downstream = 0;
data.aer_driver = NULL; data.aer_driver = NULL;
@ -576,7 +578,7 @@ static pci_ers_result_t do_recovery(struct pcie_device *aerdev,
* *
* Invoked when an error being detected by Root Port. * Invoked when an error being detected by Root Port.
*/ */
static void handle_error_source(struct pcie_device * aerdev, static void handle_error_source(struct pcie_device *aerdev,
struct pci_dev *dev, struct pci_dev *dev,
struct aer_err_info *info) struct aer_err_info *info)
{ {
@ -682,7 +684,7 @@ static void disable_root_aer(struct aer_rpc *rpc)
* *
* Invoked by DPC handler to consume an error. * Invoked by DPC handler to consume an error.
*/ */
static struct aer_err_source* get_e_source(struct aer_rpc *rpc) static struct aer_err_source *get_e_source(struct aer_rpc *rpc)
{ {
struct aer_err_source *e_source; struct aer_err_source *e_source;
unsigned long flags; unsigned long flags;
@ -865,8 +867,3 @@ int aer_init(struct pcie_device *dev)
return AER_SUCCESS; return AER_SUCCESS;
} }
EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting);
EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);
EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);

49
drivers/pci/pcie/aer/aerdrv_errprint.c
View File

@ -33,7 +33,7 @@
#define AER_AGENT_COMPLETER_MASK PCI_ERR_UNC_COMP_ABORT #define AER_AGENT_COMPLETER_MASK PCI_ERR_UNC_COMP_ABORT
#define AER_AGENT_TRANSMITTER_MASK(t, e) (e & (PCI_ERR_COR_REP_ROLL| \ #define AER_AGENT_TRANSMITTER_MASK(t, e) (e & (PCI_ERR_COR_REP_ROLL| \
((t == AER_CORRECTABLE) ? PCI_ERR_COR_REP_TIMER: 0))) ((t == AER_CORRECTABLE) ? PCI_ERR_COR_REP_TIMER : 0)))
#define AER_GET_AGENT(t, e) \ #define AER_GET_AGENT(t, e) \
((e & AER_AGENT_COMPLETER_MASK) ? AER_AGENT_COMPLETER : \ ((e & AER_AGENT_COMPLETER_MASK) ? AER_AGENT_COMPLETER : \
@ -44,11 +44,11 @@
#define AER_PHYSICAL_LAYER_ERROR_MASK PCI_ERR_COR_RCVR #define AER_PHYSICAL_LAYER_ERROR_MASK PCI_ERR_COR_RCVR
#define AER_DATA_LINK_LAYER_ERROR_MASK(t, e) \ #define AER_DATA_LINK_LAYER_ERROR_MASK(t, e) \
(PCI_ERR_UNC_DLP| \ (PCI_ERR_UNC_DLP| \
PCI_ERR_COR_BAD_TLP| \ PCI_ERR_COR_BAD_TLP| \
PCI_ERR_COR_BAD_DLLP| \ PCI_ERR_COR_BAD_DLLP| \
PCI_ERR_COR_REP_ROLL| \ PCI_ERR_COR_REP_ROLL| \
((t == AER_CORRECTABLE) ? \ ((t == AER_CORRECTABLE) ? \
PCI_ERR_COR_REP_TIMER: 0)) PCI_ERR_COR_REP_TIMER : 0))
#define AER_PHYSICAL_LAYER_ERROR 0 #define AER_PHYSICAL_LAYER_ERROR 0
#define AER_DATA_LINK_LAYER_ERROR 1 #define AER_DATA_LINK_LAYER_ERROR 1
@ -58,38 +58,38 @@
((e & AER_PHYSICAL_LAYER_ERROR_MASK) ? \ ((e & AER_PHYSICAL_LAYER_ERROR_MASK) ? \
AER_PHYSICAL_LAYER_ERROR : \ AER_PHYSICAL_LAYER_ERROR : \
(e & AER_DATA_LINK_LAYER_ERROR_MASK(t, e)) ? \ (e & AER_DATA_LINK_LAYER_ERROR_MASK(t, e)) ? \
AER_DATA_LINK_LAYER_ERROR : \ AER_DATA_LINK_LAYER_ERROR : \
AER_TRANSACTION_LAYER_ERROR) AER_TRANSACTION_LAYER_ERROR)
/* /*
* AER error strings * AER error strings
*/ */
static char* aer_error_severity_string[] = { static char *aer_error_severity_string[] = {
"Uncorrected (Non-Fatal)", "Uncorrected (Non-Fatal)",
"Uncorrected (Fatal)", "Uncorrected (Fatal)",
"Corrected" "Corrected"
}; };
static char* aer_error_layer[] = { static char *aer_error_layer[] = {
"Physical Layer", "Physical Layer",
"Data Link Layer", "Data Link Layer",
"Transaction Layer" "Transaction Layer"
}; };
static char* aer_correctable_error_string[] = { static char *aer_correctable_error_string[] = {
"Receiver Error ", /* Bit Position 0 */ "Receiver Error ", /* Bit Position 0 */
NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL,
NULL, NULL,
"Bad TLP ", /* Bit Position 6 */ "Bad TLP ", /* Bit Position 6 */
"Bad DLLP ", /* Bit Position 7 */ "Bad DLLP ", /* Bit Position 7 */
"RELAY_NUM Rollover ", /* Bit Position 8 */ "RELAY_NUM Rollover ", /* Bit Position 8 */
NULL, NULL,
NULL, NULL,
NULL, NULL,
"Replay Timer Timeout ", /* Bit Position 12 */ "Replay Timer Timeout ", /* Bit Position 12 */
"Advisory Non-Fatal ", /* Bit Position 13 */ "Advisory Non-Fatal ", /* Bit Position 13 */
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -110,7 +110,7 @@ static char* aer_correctable_error_string[] = {
NULL, NULL,
}; };
static char* aer_uncorrectable_error_string[] = { static char *aer_uncorrectable_error_string[] = {
NULL, NULL,
NULL, NULL,
NULL, NULL,
@ -123,10 +123,10 @@ static char* aer_uncorrectable_error_string[] = {
NULL, NULL,
NULL, NULL,
NULL, NULL,
"Poisoned TLP ", /* Bit Position 12 */ "Poisoned TLP ", /* Bit Position 12 */
"Flow Control Protocol ", /* Bit Position 13 */ "Flow Control Protocol ", /* Bit Position 13 */
"Completion Timeout ", /* Bit Position 14 */ "Completion Timeout ", /* Bit Position 14 */
"Completer Abort ", /* Bit Position 15 */ "Completer Abort ", /* Bit Position 15 */
"Unexpected Completion ", /* Bit Position 16 */ "Unexpected Completion ", /* Bit Position 16 */
"Receiver Overflow ", /* Bit Position 17 */ "Receiver Overflow ", /* Bit Position 17 */
"Malformed TLP ", /* Bit Position 18 */ "Malformed TLP ", /* Bit Position 18 */
@ -145,19 +145,19 @@ static char* aer_uncorrectable_error_string[] = {
NULL, NULL,
}; };
static char* aer_agent_string[] = { static char *aer_agent_string[] = {
"Receiver ID", "Receiver ID",
"Requester ID", "Requester ID",
"Completer ID", "Completer ID",
"Transmitter ID" "Transmitter ID"
}; };
static char * aer_get_error_source_name(int severity, static char *aer_get_error_source_name(int severity,
unsigned int status, unsigned int status,
char errmsg_buff[]) char errmsg_buff[])
{ {
int i; int i;
char * errmsg = NULL; char *errmsg = NULL;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
if (!(status & (1 << i))) if (!(status & (1 << i)))
@ -183,9 +183,9 @@ static DEFINE_SPINLOCK(logbuf_lock);
static char errmsg_buff[100]; static char errmsg_buff[100];
void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
{ {
char * errmsg; char *errmsg;
int err_layer, agent; int err_layer, agent;
char * loglevel; char *loglevel;
if (info->severity == AER_CORRECTABLE) if (info->severity == AER_CORRECTABLE)
loglevel = KERN_WARNING; loglevel = KERN_WARNING;
@ -196,7 +196,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
printk("%sError Severity\t\t: %s\n", loglevel, printk("%sError Severity\t\t: %s\n", loglevel,
aer_error_severity_string[info->severity]); aer_error_severity_string[info->severity]);
if ( info->status == 0) { if (info->status == 0) {
printk("%sPCIE Bus Error type\t: (Unaccessible)\n", loglevel); printk("%sPCIE Bus Error type\t: (Unaccessible)\n", loglevel);
printk("%sUnaccessible Received\t: %s\n", loglevel, printk("%sUnaccessible Received\t: %s\n", loglevel,
info->flags & AER_MULTI_ERROR_VALID_FLAG ? info->flags & AER_MULTI_ERROR_VALID_FLAG ?
@ -245,4 +245,3 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
} }
} }
} }