Skip to content

Commit 33ed45a

Browse files
author
Fox Snowpatch
committed
From patchwork series 423806
https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=423806
1 parent 56e2adc commit 33ed45a

File tree

11 files changed

+149
-62
lines changed

11 files changed

+149
-62
lines changed

‎drivers/pci/ats.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ int pci_enable_pasid(struct pci_dev *pdev, int features)
377377
if (WARN_ON(pdev->pasid_enabled))
378378
return -EBUSY;
379379

380-
if (!pdev->eetlp_prefix_path && !pdev->pasid_no_tlp)
380+
if (!pdev->eetlp_prefix_max && !pdev->pasid_no_tlp)
381381
return -EINVAL;
382382

383383
if (!pasid)

‎drivers/pci/pci.c

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,34 +1095,6 @@ static void pci_enable_acs(struct pci_dev *dev)
10951095
pci_write_config_word(dev, pos + PCI_ACS_CTRL, caps.ctrl);
10961096
}
10971097

1098-
/**
1099-
* pcie_read_tlp_log - read TLP Header Log
1100-
* @dev: PCIe device
1101-
* @where: PCI Config offset of TLP Header Log
1102-
* @tlp_log: TLP Log structure to fill
1103-
*
1104-
* Fill @tlp_log from TLP Header Log registers, e.g., AER or DPC.
1105-
*
1106-
* Return: 0 on success and filled TLP Log structure, <0 on error.
1107-
*/
1108-
int pcie_read_tlp_log(struct pci_dev *dev, int where,
1109-
struct pcie_tlp_log *tlp_log)
1110-
{
1111-
int i, ret;
1112-
1113-
memset(tlp_log, 0, sizeof(*tlp_log));
1114-
1115-
for (i = 0; i < 4; i++) {
1116-
ret = pci_read_config_dword(dev, where + i * 4,
1117-
&tlp_log->dw[i]);
1118-
if (ret)
1119-
return pcibios_err_to_errno(ret);
1120-
}
1121-
1122-
return 0;
1123-
}
1124-
EXPORT_SYMBOL_GPL(pcie_read_tlp_log);
1125-
11261098
/**
11271099
* pci_restore_bars - restore a device's BAR values (e.g. after wake-up)
11281100
* @dev: PCI device to have its BARs restored

‎drivers/pci/pci.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
#include <linux/pci.h>
66

7+
struct pcie_tlp_log;
8+
79
/* Number of possible devfns: 0.0 to 1f.7 inclusive */
810
#define MAX_NR_DEVFNS 256
911

@@ -480,6 +482,12 @@ struct aer_err_info {
480482

481483
int aer_get_device_error_info(struct pci_dev *dev, struct aer_err_info *info);
482484
void aer_print_error(struct pci_dev *dev, struct aer_err_info *info);
485+
486+
int pcie_read_tlp_log(struct pci_dev *dev, int where, int where2,
487+
unsigned int tlp_len, struct pcie_tlp_log *log);
488+
unsigned int aer_tlp_log_len(struct pci_dev *dev);
489+
void pcie_print_tlp_log(const struct pci_dev *dev,
490+
const struct pcie_tlp_log *log, const char *pfx);
483491
#endif /* CONFIG_PCIEAER */
484492

485493
#ifdef CONFIG_PCIEPORTBUS
@@ -498,6 +506,7 @@ void pci_dpc_init(struct pci_dev *pdev);
498506
void dpc_process_error(struct pci_dev *pdev);
499507
pci_ers_result_t dpc_reset_link(struct pci_dev *pdev);
500508
bool pci_dpc_recovered(struct pci_dev *pdev);
509+
unsigned int dpc_tlp_log_len(struct pci_dev *dev);
501510
#else
502511
static inline void pci_save_dpc_state(struct pci_dev *dev) { }
503512
static inline void pci_restore_dpc_state(struct pci_dev *dev) { }

‎drivers/pci/pcie/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pcieportdrv-y := portdrv.o rcec.o
77
obj-$(CONFIG_PCIEPORTBUS) += pcieportdrv.o
88

99
obj-y += aspm.o
10-
obj-$(CONFIG_PCIEAER) += aer.o err.o
10+
obj-$(CONFIG_PCIEAER) += aer.o err.o tlp.o
1111
obj-$(CONFIG_PCIEAER_INJECT) += aer_inject.o
1212
obj-$(CONFIG_PCIE_PME) += pme.o
1313
obj-$(CONFIG_PCIE_DPC) += dpc.o

‎drivers/pci/pcie/aer.c

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

667-
static void __print_tlp_header(struct pci_dev *dev, struct pcie_tlp_log *t)
668-
{
669-
pci_err(dev, " TLP Header: %08x %08x %08x %08x\n",
670-
t->dw[0], t->dw[1], t->dw[2], t->dw[3]);
671-
}
672-
673667
static void __aer_print_error(struct pci_dev *dev,
674668
struct aer_err_info *info)
675669
{
@@ -691,8 +685,8 @@ static void __aer_print_error(struct pci_dev *dev,
691685
if (!errmsg)
692686
errmsg = "Unknown Error Bit";
693687

694-
pci_printk(level, dev, " [%2d] %-22s%s\n", i, errmsg,
695-
info->first_error == i ? " (First)" : "");
688+
pci_printk(level, dev, "%s [%2d] %-22s%s\n", dev_fmt(""), i,
689+
errmsg, info->first_error == i ? " (First)" : "");
696690
}
697691
pci_dev_aer_stats_incr(dev, info);
698692
}
@@ -714,17 +708,17 @@ void aer_print_error(struct pci_dev *dev, struct aer_err_info *info)
714708

715709
level = (info->severity == AER_CORRECTABLE) ? KERN_WARNING : KERN_ERR;
716710

717-
pci_printk(level, dev, "PCIe Bus Error: severity=%s, type=%s, (%s)\n",
718-
aer_error_severity_string[info->severity],
711+
pci_printk(level, dev, "%sPCIe Bus Error: severity=%s, type=%s, (%s)\n",
712+
dev_fmt(""), aer_error_severity_string[info->severity],
719713
aer_error_layer[layer], aer_agent_string[agent]);
720714

721-
pci_printk(level, dev, " device [%04x:%04x] error status/mask=%08x/%08x\n",
722-
dev->vendor, dev->device, info->status, info->mask);
715+
pci_printk(level, dev, "%s device [%04x:%04x] error status/mask=%08x/%08x\n",
716+
dev_fmt(""), dev->vendor, dev->device, info->status, info->mask);
723717

724718
__aer_print_error(dev, info);
725719

726720
if (info->tlp_header_valid)
727-
__print_tlp_header(dev, &info->tlp);
721+
pcie_print_tlp_log(dev, &info->tlp, dev_fmt(" "));
728722

729723
out:
730724
if (info->id && info->error_dev_num > 1 && info->id == id)
@@ -796,7 +790,7 @@ void pci_print_aer(struct pci_dev *dev, int aer_severity,
796790
aer->uncor_severity);
797791

798792
if (tlp_header_valid)
799-
__print_tlp_header(dev, &aer->header_log);
793+
pcie_print_tlp_log(dev, &aer->header_log, dev_fmt(" "));
800794

801795
trace_aer_event(dev_name(&dev->dev), (status & ~mask),
802796
aer_severity, tlp_header_valid, &aer->header_log);
@@ -1245,7 +1239,9 @@ int aer_get_device_error_info(struct pci_dev *dev, struct aer_err_info *info)
12451239

12461240
if (info->status & AER_LOG_TLP_MASKS) {
12471241
info->tlp_header_valid = 1;
1248-
pcie_read_tlp_log(dev, aer + PCI_ERR_HEADER_LOG, &info->tlp);
1242+
pcie_read_tlp_log(dev, aer + PCI_ERR_HEADER_LOG,
1243+
aer + PCI_ERR_PREFIX_LOG,
1244+
aer_tlp_log_len(dev), &info->tlp);
12491245
}
12501246
}
12511247

‎drivers/pci/pcie/dpc.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ 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, log, prefix;
193+
u32 status, mask, sev, syserr, exc, log;
194194
struct pcie_tlp_log tlp_log;
195195
int i;
196196

@@ -217,20 +217,16 @@ static void dpc_process_rp_pio_error(struct pci_dev *pdev)
217217

218218
if (pdev->dpc_rp_log_size < 4)
219219
goto clear_status;
220-
pcie_read_tlp_log(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG, &tlp_log);
221-
pci_err(pdev, "TLP Header: %#010x %#010x %#010x %#010x\n",
222-
tlp_log.dw[0], tlp_log.dw[1], tlp_log.dw[2], tlp_log.dw[3]);
220+
pcie_read_tlp_log(pdev, cap + PCI_EXP_DPC_RP_PIO_HEADER_LOG,
221+
cap + PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG,
222+
dpc_tlp_log_len(pdev), &tlp_log);
223+
pcie_print_tlp_log(pdev, &tlp_log, dev_fmt(""));
223224

224225
if (pdev->dpc_rp_log_size < 5)
225226
goto clear_status;
226227
pci_read_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_IMPSPEC_LOG, &log);
227228
pci_err(pdev, "RP PIO ImpSpec Log %#010x\n", log);
228229

229-
for (i = 0; i < pdev->dpc_rp_log_size - 5; i++) {
230-
pci_read_config_dword(pdev,
231-
cap + PCI_EXP_DPC_RP_PIO_TLPPREFIX_LOG + i * 4, &prefix);
232-
pci_err(pdev, "TLP Prefix Header: dw%d, %#010x\n", i, prefix);
233-
}
234230
clear_status:
235231
pci_write_config_dword(pdev, cap + PCI_EXP_DPC_RP_PIO_STATUS, status);
236232
}

‎drivers/pci/pcie/tlp.c

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
/*
3+
* PCIe TLP Log handling
4+
*
5+
* Copyright (C) 2024 Intel Corporation
6+
*/
7+
8+
#include <linux/aer.h>
9+
#include <linux/array_size.h>
10+
#include <linux/pci.h>
11+
#include <linux/string.h>
12+
13+
#include "../pci.h"
14+
15+
/**
16+
* aer_tlp_log_len - Calculates AER Capability TLP Header/Prefix Log length
17+
* @dev: PCIe device
18+
*
19+
* Return: TLP Header/Prefix Log length
20+
*/
21+
unsigned int aer_tlp_log_len(struct pci_dev *dev)
22+
{
23+
return 4 + dev->eetlp_prefix_max;
24+
}
25+
26+
#ifdef CONFIG_PCIE_DPC
27+
/**
28+
* dpc_tlp_log_len - Calculates DPC RP PIO TLP Header/Prefix Log length
29+
* @dev: PCIe device
30+
*
31+
* Return: TLP Header/Prefix Log length
32+
*/
33+
unsigned int dpc_tlp_log_len(struct pci_dev *dev)
34+
{
35+
/* Remove ImpSpec Log register from the count */
36+
if (dev->dpc_rp_log_size >= 5)
37+
return dev->dpc_rp_log_size - 1;
38+
39+
return dev->dpc_rp_log_size;
40+
}
41+
#endif
42+
43+
/**
44+
* pcie_read_tlp_log - read TLP Header Log
45+
* @dev: PCIe device
46+
* @where: PCI Config offset of TLP Header Log
47+
* @where2: PCI Config offset of TLP Prefix Log
48+
* @tlp_len: TLP Log length (Header Log + TLP Prefix Log in DWORDs)
49+
* @log: TLP Log structure to fill
50+
*
51+
* Fill @log from TLP Header Log registers, e.g., AER or DPC.
52+
*
53+
* Return: 0 on success and filled TLP Log structure, <0 on error.
54+
*/
55+
int pcie_read_tlp_log(struct pci_dev *dev, int where, int where2,
56+
unsigned int tlp_len, struct pcie_tlp_log *log)
57+
{
58+
unsigned int i;
59+
int off, ret;
60+
u32 *to;
61+
62+
memset(log, 0, sizeof(*log));
63+
64+
for (i = 0; i < tlp_len; i++) {
65+
if (i < 4) {
66+
off = where + i * 4;
67+
to = &log->dw[i];
68+
} else {
69+
off = where2 + (i - 4) * 4;
70+
to = &log->prefix[i - 4];
71+
}
72+
73+
ret = pci_read_config_dword(dev, off, to);
74+
if (ret)
75+
return pcibios_err_to_errno(ret);
76+
}
77+
78+
return 0;
79+
}
80+
81+
/**
82+
* pcie_print_tlp_log - Print TLP Header / Prefix Log contents
83+
* @dev: PCIe device
84+
* @log: TLP Log structure
85+
* @pfx: String prefix (for print out indentation)
86+
*
87+
* Prints TLP Header and Prefix Log information held by @log.
88+
*/
89+
void pcie_print_tlp_log(const struct pci_dev *dev,
90+
const struct pcie_tlp_log *log, const char *pfx)
91+
{
92+
char buf[(10 + 1) * (4 + ARRAY_SIZE(log->prefix)) + 14 + 1];
93+
unsigned int i;
94+
int len;
95+
96+
len = scnprintf(buf, sizeof(buf), "%#010x %#010x %#010x %#010x",
97+
log->dw[0], log->dw[1], log->dw[2], log->dw[3]);
98+
99+
if (log->prefix[0])
100+
len += scnprintf(buf + len, sizeof(buf) - len, " E-E Prefixes:");
101+
for (i = 0; i < ARRAY_SIZE(log->prefix); i++) {
102+
if (!log->prefix[i])
103+
break;
104+
len += scnprintf(buf + len, sizeof(buf) - len,
105+
" %#010x", log->prefix[i]);
106+
}
107+
108+
pci_err(dev, "%sTLP Header: %s\n", pfx, buf);
109+
}

‎drivers/pci/probe.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2228,8 +2228,8 @@ static void pci_configure_relaxed_ordering(struct pci_dev *dev)
22282228

22292229
static void pci_configure_eetlp_prefix(struct pci_dev *dev)
22302230
{
2231-
#ifdef CONFIG_PCI_PASID
22322231
struct pci_dev *bridge;
2232+
unsigned int eetlp_max;
22332233
int pcie_type;
22342234
u32 cap;
22352235

@@ -2241,15 +2241,19 @@ static void pci_configure_eetlp_prefix(struct pci_dev *dev)
22412241
return;
22422242

22432243
pcie_type = pci_pcie_type(dev);
2244+
2245+
eetlp_max = FIELD_GET(PCI_EXP_DEVCAP2_EE_PREFIX_MAX, cap);
2246+
/* 00b means 4 */
2247+
eetlp_max = eetlp_max ?: 4;
2248+
22442249
if (pcie_type == PCI_EXP_TYPE_ROOT_PORT ||
22452250
pcie_type == PCI_EXP_TYPE_RC_END)
2246-
dev->eetlp_prefix_path = 1;
2251+
dev->eetlp_prefix_max = eetlp_max;
22472252
else {
22482253
bridge = pci_upstream_bridge(dev);
2249-
if (bridge && bridge->eetlp_prefix_path)
2250-
dev->eetlp_prefix_path = 1;
2254+
if (bridge && bridge->eetlp_prefix_max)
2255+
dev->eetlp_prefix_max = eetlp_max;
22512256
}
2252-
#endif
22532257
}
22542258

22552259
static void pci_configure_serr(struct pci_dev *dev)

‎include/linux/aer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ struct pci_dev;
2020

2121
struct pcie_tlp_log {
2222
u32 dw[4];
23+
u32 prefix[4];
2324
};
2425

2526
struct aer_capability_regs {
@@ -37,8 +38,6 @@ struct aer_capability_regs {
3738
u16 uncor_err_source;
3839
};
3940

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

‎include/linux/pci.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ struct pci_dev {
398398
supported from root to here */
399399
#endif
400400
unsigned int pasid_no_tlp:1; /* PASID works without TLP Prefix */
401-
unsigned int eetlp_prefix_path:1; /* End-to-End TLP Prefix */
401+
unsigned int eetlp_prefix_max:3; /* Max # of End-End TLP Prefixes, 0=not supported */
402402

403403
pci_channel_state_t error_state; /* Current connectivity state */
404404
struct device dev; /* Generic device interface */

‎include/uapi/linux/pci_regs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -661,6 +661,7 @@
661661
#define PCI_EXP_DEVCAP2_OBFF_MSG 0x00040000 /* New message signaling */
662662
#define PCI_EXP_DEVCAP2_OBFF_WAKE 0x00080000 /* Re-use WAKE# for OBFF */
663663
#define PCI_EXP_DEVCAP2_EE_PREFIX 0x00200000 /* End-End TLP Prefix */
664+
#define PCI_EXP_DEVCAP2_EE_PREFIX_MAX 0x00c00000 /* Max End-End TLP Prefixes */
664665
#define PCI_EXP_DEVCTL2 0x28 /* Device Control 2 */
665666
#define PCI_EXP_DEVCTL2_COMP_TIMEOUT 0x000f /* Completion Timeout Value */
666667
#define PCI_EXP_DEVCTL2_COMP_TMOUT_DIS 0x0010 /* Completion Timeout Disable */
@@ -802,6 +803,7 @@
802803
#define PCI_ERR_ROOT_FATAL_RCV 0x00000040 /* Fatal Received */
803804
#define PCI_ERR_ROOT_AER_IRQ 0xf8000000 /* Advanced Error Interrupt Message Number */
804805
#define PCI_ERR_ROOT_ERR_SRC 0x34 /* Error Source Identification */
806+
#define PCI_ERR_PREFIX_LOG 0x38 /* TLP Prefix LOG Register (up to 16 bytes) */
805807

806808
/* Virtual Channel */
807809
#define PCI_VC_PORT_CAP1 0x04

0 commit comments

Comments
 (0)