Commit 24dbb7be authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Jesse Barnes

PCI: pcie, aer: remove spinlock in aerdrv_errprint.c

The static buffer errmsg_buff[] is used only for building error
message in fixed format, and is protected by a spinlock.

This patch removes this buffer and the spinlock.
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: default avatarAndrew Patterson <andrew.patterson@hp.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 0d465f23
...@@ -152,38 +152,31 @@ static char *aer_agent_string[] = { ...@@ -152,38 +152,31 @@ static char *aer_agent_string[] = {
"Transmitter ID" "Transmitter ID"
}; };
static char *aer_get_error_source_name(int severity, static void aer_print_error_source(struct aer_err_info *info)
unsigned int status,
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 (!(info->status & (1 << i)))
continue; continue;
if (severity == AER_CORRECTABLE) if (info->severity == AER_CORRECTABLE)
errmsg = aer_correctable_error_string[i]; errmsg = aer_correctable_error_string[i];
else else
errmsg = aer_uncorrectable_error_string[i]; errmsg = aer_uncorrectable_error_string[i];
if (!errmsg) { if (errmsg)
sprintf(errmsg_buff, "Unknown Error Bit %2d ", i); AER_PR(info, "%s\t:\n", errmsg);
errmsg = errmsg_buff; else
} AER_PR(info, "Unknown Error Bit %2d \t:\n", i);
break; break;
} }
return errmsg;
} }
static DEFINE_SPINLOCK(logbuf_lock);
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;
int err_layer, agent; int err_layer, agent;
int id = ((dev->bus->number << 8) | dev->devfn); int id = ((dev->bus->number << 8) | dev->devfn);
...@@ -199,12 +192,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info) ...@@ -199,12 +192,7 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
AER_PR(info, "PCIE Bus Error type\t: %s\n", AER_PR(info, "PCIE Bus Error type\t: %s\n",
aer_error_layer[err_layer]); aer_error_layer[err_layer]);
spin_lock(&logbuf_lock); aer_print_error_source(info);
errmsg = aer_get_error_source_name(info->severity,
info->status,
errmsg_buff);
AER_PR(info, "%s\t:\n", errmsg);
spin_unlock(&logbuf_lock);
agent = AER_GET_AGENT(info->severity, info->status); agent = AER_GET_AGENT(info->severity, info->status);
AER_PR(info, "%s\t\t: %04x\n", aer_agent_string[agent], id); AER_PR(info, "%s\t\t: %04x\n", aer_agent_string[agent], id);
......
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