leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NTB: Add split BAR output for debugfs stats

Browse Source 
When split BAR is enabled, the driver needs to dump out the split BAR
registers rather than the original 64bit BAR registers.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Dave Jiang 2015-06-18 05:17:30 -04:00 committed by Jon Mason
parent fd839bf884
commit bf44fe4671
1 changed files with 68 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
drivers/ntb/hw/intel/ntb_hw_intel.c
View File

@ -632,17 +632,36 @@ static ssize_t ndev_debugfs_read(struct file *filp, char __user *ubuf,
off += scnprintf(buf + off, buf_size - off, off += scnprintf(buf + off, buf_size - off,
"XLAT23 -\t\t%#018llx\n", u.v64); "XLAT23 -\t\t%#018llx\n", u.v64);
u.v64 = ioread64(mmio + bar2_off(ndev->xlat_reg->bar2_xlat, 4)); if (ndev->bar4_split) {
off += scnprintf(buf + off, buf_size - off, u.v32 = ioread32(mmio + bar2_off(ndev->xlat_reg->bar2_xlat, 4));
"XLAT45 -\t\t%#018llx\n", u.v64); off += scnprintf(buf + off, buf_size - off,
"XLAT4 -\t\t\t%#06x\n", u.v32);
u.v32 = ioread32(mmio + bar2_off(ndev->xlat_reg->bar2_xlat, 5));
off += scnprintf(buf + off, buf_size - off,
"XLAT5 -\t\t\t%#06x\n", u.v32);
} else {
u.v64 = ioread64(mmio + bar2_off(ndev->xlat_reg->bar2_xlat, 4));
off += scnprintf(buf + off, buf_size - off,
"XLAT45 -\t\t%#018llx\n", u.v64);
}
u.v64 = ioread64(mmio + bar2_off(ndev->xlat_reg->bar2_limit, 2)); u.v64 = ioread64(mmio + bar2_off(ndev->xlat_reg->bar2_limit, 2));
off += scnprintf(buf + off, buf_size - off, off += scnprintf(buf + off, buf_size - off,
"LMT23 -\t\t\t%#018llx\n", u.v64); "LMT23 -\t\t\t%#018llx\n", u.v64);
u.v64 = ioread64(mmio + bar2_off(ndev->xlat_reg->bar2_limit, 4)); if (ndev->bar4_split) {
off += scnprintf(buf + off, buf_size - off, u.v32 = ioread32(mmio + bar2_off(ndev->xlat_reg->bar2_limit, 4));
"LMT45 -\t\t\t%#018llx\n", u.v64); off += scnprintf(buf + off, buf_size - off,
"LMT4 -\t\t\t%#06x\n", u.v32);
u.v32 = ioread32(mmio + bar2_off(ndev->xlat_reg->bar2_limit, 5));
off += scnprintf(buf + off, buf_size - off,
"LMT5 -\t\t\t%#06x\n", u.v32);
} else {
u.v64 = ioread64(mmio + bar2_off(ndev->xlat_reg->bar2_limit, 4));
off += scnprintf(buf + off, buf_size - off,
"LMT45 -\t\t\t%#018llx\n", u.v64);
}
if (pdev_is_xeon(ndev->ntb.pdev)) { if (pdev_is_xeon(ndev->ntb.pdev)) {
if (ntb_topo_is_b2b(ndev->ntb.topo)) { if (ntb_topo_is_b2b(ndev->ntb.topo)) {
@ -653,17 +672,41 @@ static ssize_t ndev_debugfs_read(struct file *filp, char __user *ubuf,
off += scnprintf(buf + off, buf_size - off, off += scnprintf(buf + off, buf_size - off,
"B2B XLAT23 -\t\t%#018llx\n", u.v64); "B2B XLAT23 -\t\t%#018llx\n", u.v64);
u.v64 = ioread64(mmio + XEON_PBAR45XLAT_OFFSET); if (ndev->bar4_split) {
off += scnprintf(buf + off, buf_size - off, u.v32 = ioread32(mmio + XEON_PBAR4XLAT_OFFSET);
"B2B XLAT45 -\t\t%#018llx\n", u.v64); off += scnprintf(buf + off, buf_size - off,
"B2B XLAT4 -\t\t%#06x\n",
u.v32);
u.v32 = ioread32(mmio + XEON_PBAR5XLAT_OFFSET);
off += scnprintf(buf + off, buf_size - off,
"B2B XLAT5 -\t\t%#06x\n",
u.v32);
} else {
u.v64 = ioread64(mmio + XEON_PBAR45XLAT_OFFSET);
off += scnprintf(buf + off, buf_size - off,
"B2B XLAT45 -\t\t%#018llx\n",
u.v64);
}
u.v64 = ioread64(mmio + XEON_PBAR23LMT_OFFSET); u.v64 = ioread64(mmio + XEON_PBAR23LMT_OFFSET);
off += scnprintf(buf + off, buf_size - off, off += scnprintf(buf + off, buf_size - off,
"B2B LMT23 -\t\t%#018llx\n", u.v64); "B2B LMT23 -\t\t%#018llx\n", u.v64);
u.v64 = ioread64(mmio + XEON_PBAR45LMT_OFFSET); if (ndev->bar4_split) {
off += scnprintf(buf + off, buf_size - off, u.v32 = ioread32(mmio + XEON_PBAR4LMT_OFFSET);
"B2B LMT45 -\t\t%#018llx\n", u.v64); off += scnprintf(buf + off, buf_size - off,
"B2B LMT4 -\t\t%#06x\n",
u.v32);
u.v32 = ioread32(mmio + XEON_PBAR5LMT_OFFSET);
off += scnprintf(buf + off, buf_size - off,
"B2B LMT5 -\t\t%#06x\n",
u.v32);
} else {
u.v64 = ioread64(mmio + XEON_PBAR45LMT_OFFSET);
off += scnprintf(buf + off, buf_size - off,
"B2B LMT45 -\t\t%#018llx\n",
u.v64);
}
off += scnprintf(buf + off, buf_size - off, off += scnprintf(buf + off, buf_size - off,
"\nNTB Secondary BAR:\n"); "\nNTB Secondary BAR:\n");
@ -676,9 +719,19 @@ static ssize_t ndev_debugfs_read(struct file *filp, char __user *ubuf,
off += scnprintf(buf + off, buf_size - off, off += scnprintf(buf + off, buf_size - off,
"SBAR23 -\t\t%#018llx\n", u.v64); "SBAR23 -\t\t%#018llx\n", u.v64);
u.v64 = ioread64(mmio + XEON_SBAR45BASE_OFFSET); if (ndev->bar4_split) {
off += scnprintf(buf + off, buf_size - off, u.v32 = ioread32(mmio + XEON_SBAR4BASE_OFFSET);
"SBAR45 -\t\t%#018llx\n", u.v64); off += scnprintf(buf + off, buf_size - off,
"SBAR4 -\t\t\t%#06x\n", u.v32);
u.v32 = ioread32(mmio + XEON_SBAR5BASE_OFFSET);
off += scnprintf(buf + off, buf_size - off,
"SBAR5 -\t\t\t%#06x\n", u.v32);
} else {
u.v64 = ioread64(mmio + XEON_SBAR45BASE_OFFSET);
off += scnprintf(buf + off, buf_size - off,
"SBAR45 -\t\t%#018llx\n",
u.v64);
}
} }
off += scnprintf(buf + off, buf_size - off, off += scnprintf(buf + off, buf_size - off,