Skip to content

Commit 0a5a46a

Browse files
ij-intelbjorn-helgaas
ij-intel
authored and
bjorn-helgaas
committed
PCI/AER: Generalize TLP Header Log reading
Both AER and DPC RP PIO provide TLP Header Log registers (PCIe r6.1 secs 7.8.4 & 7.9.14) to convey error diagnostics but the struct is named after AER as the struct aer_header_log_regs. Also, not all places that handle TLP Header Log use the struct and the struct members are named individually. Generalize the struct name and members, and use it consistently where TLP Header Log is being handled so that a pcie_read_tlp_log() helper can be easily added. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ilpo Järvinen <[email protected]> [bhelgaas: drop ixgbe changes for now, tidy whitespace] Signed-off-by: Bjorn Helgaas <[email protected]>
1 parent a37e12b commit 0a5a46a

File tree

7 files changed

+48
-35
lines changed

7 files changed

+48
-35
lines changed

‎drivers/firmware/efi/cper.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,8 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie,
445445
printk("%saer_uncor_severity: 0x%08x\n",
446446
pfx, aer->uncor_severity);
447447
printk("%sTLP Header: %08x %08x %08x %08x\n", pfx,
448-
aer->header_log.dw0, aer->header_log.dw1,
449-
aer->header_log.dw2, aer->header_log.dw3);
448+
aer->header_log.dw[0], aer->header_log.dw[1],
449+
aer->header_log.dw[2], aer->header_log.dw[3]);
450450
}
451451
}
452452

‎drivers/pci/pci.c

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1067,6 +1067,34 @@ static void pci_enable_acs(struct pci_dev *dev)
10671067
pci_disable_acs_redir(dev);
10681068
}
10691069

1070+
/**
1071+
* pcie_read_tlp_log - read TLP Header Log
1072+
* @dev: PCIe device
1073+
* @where: PCI Config offset of TLP Header Log
1074+
* @tlp_log: TLP Log structure to fill
1075+
*
1076+
* Fill @tlp_log from TLP Header Log registers, e.g., AER or DPC.
1077+
*
1078+
* Return: 0 on success and filled TLP Log structure, <0 on error.
1079+
*/
1080+
int pcie_read_tlp_log(struct pci_dev *dev, int where,
1081+
struct pcie_tlp_log *tlp_log)
1082+
{
1083+
int i, ret;
1084+
1085+
memset(tlp_log, 0, sizeof(*tlp_log));
1086+
1087+
for (i = 0; i < 4; i++) {
1088+
ret = pci_read_config_dword(dev, where + i * 4,
1089+
&tlp_log->dw[i]);
1090+
if (ret)
1091+
return pcibios_err_to_errno(ret);
1092+
}
1093+
1094+
return 0;
1095+
}
1096+
EXPORT_SYMBOL_GPL(pcie_read_tlp_log);
1097+
10701098
/**
10711099
* pci_restore_bars - restore a device's BAR values (e.g. after wake-up)
10721100
* @dev: PCI device to have its BARs restored

‎drivers/pci/pci.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ struct aer_err_info {
409409

410410
unsigned int status; /* COR/UNCOR Error Status */
411411
unsigned int mask; /* COR/UNCOR Error Mask */
412-
struct aer_header_log_regs tlp; /* TLP Header */
412+
struct pcie_tlp_log tlp; /* TLP Header */
413413
};
414414

415415
int aer_get_device_error_info(struct pci_dev *dev, struct aer_err_info *info);

‎drivers/pci/pcie/aer.c

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -664,11 +664,10 @@ static void pci_rootport_aer_stats_incr(struct pci_dev *pdev,
664664
}
665665
}
666666

667-
static void __print_tlp_header(struct pci_dev *dev,
668-
struct aer_header_log_regs *t)
667+
static void __print_tlp_header(struct pci_dev *dev, struct pcie_tlp_log *t)
669668
{
670669
pci_err(dev, " TLP Header: %08x %08x %08x %08x\n",
671-
t->dw0, t->dw1, t->dw2, t->dw3);
670+
t->dw[0], t->dw[1], t->dw[2], t->dw[3]);
672671
}
673672

674673
static void __aer_print_error(struct pci_dev *dev,
@@ -1246,14 +1245,7 @@ int aer_get_device_error_info(struct pci_dev *dev, struct aer_err_info *info)
12461245

12471246
if (info->status & AER_LOG_TLP_MASKS) {
12481247
info->tlp_header_valid = 1;
1249-
pci_read_config_dword(dev,
1250-
aer + PCI_ERR_HEADER_LOG, &info->tlp.dw0);
1251-
pci_read_config_dword(dev,
1252-
aer + PCI_ERR_HEADER_LOG + 4, &info->tlp.dw1);
1253-
pci_read_config_dword(dev,
1254-
aer + PCI_ERR_HEADER_LOG + 8, &info->tlp.dw2);
1255-
pci_read_config_dword(dev,
1256-
aer + PCI_ERR_HEADER_LOG + 12, &info->tlp.dw3);
1248+
pcie_read_tlp_log(dev, aer + PCI_ERR_HEADER_LOG, &info->tlp);
12571249
}
12581250
}
12591251

‎drivers/pci/pcie/dpc.c

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ pci_ers_result_t dpc_reset_link(struct pci_dev *pdev)
190190
static void dpc_process_rp_pio_error(struct pci_dev *pdev)
191191
{
192192
u16 cap = pdev->dpc_cap, dpc_status, first_error;
193-
u32 status, mask, sev, syserr, exc, dw0, dw1, dw2, dw3, log, prefix;
193+
u32 status, mask, sev, syserr, exc, log, prefix;
194+
struct pcie_tlp_log tlp_log;
194195
int i;
195196

196197
pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_STATUS, &status);
@@ -216,16 +217,9 @@ static void dpc_process_rp_pio_error(struct pci_dev *pdev)
216217

217218
if (pdev->dpc_rp_log_size < 4)
218219
goto clear_status;
219-
pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG,
220-
&dw0);
221-
pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG + 4,
222-
&dw1);
223-
pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG + 8,
224-
&dw2);
225-
pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG + 12,
226-
&dw3);
220+
pcie_read_tlp_log(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG, &tlp_log);
227221
pci_err(pdev, "TLP Header: %#010x %#010x %#010x %#010x\n",
228-
dw0, dw1, dw2, dw3);
222+
tlp_log.dw[0], tlp_log.dw[1], tlp_log.dw[2], tlp_log.dw[3]);
229223

230224
if (pdev->dpc_rp_log_size < 5)
231225
goto clear_status;

‎include/linux/aer.h

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,8 @@
1818

1919
struct pci_dev;
2020

21-
struct aer_header_log_regs {
22-
u32 dw0;
23-
u32 dw1;
24-
u32 dw2;
25-
u32 dw3;
21+
struct pcie_tlp_log {
22+
u32 dw[4];
2623
};
2724

2825
struct aer_capability_regs {
@@ -33,13 +30,15 @@ struct aer_capability_regs {
3330
u32 cor_status;
3431
u32 cor_mask;
3532
u32 cap_control;
36-
struct aer_header_log_regs header_log;
33+
struct pcie_tlp_log header_log;
3734
u32 root_command;
3835
u32 root_status;
3936
u16 cor_err_source;
4037
u16 uncor_err_source;
4138
};
4239

40+
int pcie_read_tlp_log(struct pci_dev *dev, int where, struct pcie_tlp_log *log);
41+
4342
#if defined(CONFIG_PCIEAER)
4443
int pci_aer_clear_nonfatal_status(struct pci_dev *dev);
4544
int pcie_aer_is_native(struct pci_dev *dev);

‎include/ras/ras_event.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ TRACE_EVENT(aer_event,
300300
const u32 status,
301301
const u8 severity,
302302
const u8 tlp_header_valid,
303-
struct aer_header_log_regs *tlp),
303+
struct pcie_tlp_log *tlp),
304304

305305
TP_ARGS(dev_name, status, severity, tlp_header_valid, tlp),
306306

@@ -318,10 +318,10 @@ TRACE_EVENT(aer_event,
318318
__entry->severity = severity;
319319
__entry->tlp_header_valid = tlp_header_valid;
320320
if (tlp_header_valid) {
321-
__entry->tlp_header[0] = tlp->dw0;
322-
__entry->tlp_header[1] = tlp->dw1;
323-
__entry->tlp_header[2] = tlp->dw2;
324-
__entry->tlp_header[3] = tlp->dw3;
321+
__entry->tlp_header[0] = tlp->dw[0];
322+
__entry->tlp_header[1] = tlp->dw[1];
323+
__entry->tlp_header[2] = tlp->dw[2];
324+
__entry->tlp_header[3] = tlp->dw[3];
325325
}
326326
),
327327

0 commit comments

Comments
 (0)