Module Name: src
Committed By: msaitoh
Date: Thu Feb 1 08:18:47 UTC 2018
Modified Files:
src/sys/dev/pci: pci_subr.c
Log Message:
Cleanup:
- Don't pass a capability pointer as a argument of pci_conf_find_cap() and
determine the first pointer in the pci_conf_find_cap() function.
- Don't pass a capability pointer as a argument of pci_conf_find_extcap()
because it's not used.
- Remove unsed code.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/sys/dev/pci/pci_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.198 src/sys/dev/pci/pci_subr.c:1.199
--- src/sys/dev/pci/pci_subr.c:1.198 Thu Feb 1 02:50:51 2018
+++ src/sys/dev/pci/pci_subr.c Thu Feb 1 08:18:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.198 2018/02/01 02:50:51 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.199 2018/02/01 08:18:47 msaitoh Exp $ */
/*
* Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.198 2018/02/01 02:50:51 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.199 2018/02/01 08:18:47 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -70,7 +70,8 @@ __KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v
#include <dev/pci/pcidevs_data.h>
#endif
-static int pci_conf_find_cap(const pcireg_t *, int, unsigned int, int *);
+static int pci_conf_find_cap(const pcireg_t *, unsigned int, int *);
+static int pci_conf_find_extcap(const pcireg_t *, unsigned int, int *);
static void pci_conf_print_pcie_power(uint8_t, unsigned int);
/*
@@ -831,8 +832,7 @@ pci_conf_print_common(
int pcie_capoff;
pcireg_t reg;
- if (pci_conf_find_cap(regs, PCI_CAPLISTPTR_REG,
- PCI_CAP_PCIEXPRESS, &pcie_capoff)) {
+ if (pci_conf_find_cap(regs, PCI_CAP_PCIEXPRESS, &pcie_capoff)) {
reg = regs[o2i(pcie_capoff + PCIE_XCAP)];
if (PCIE_XCAP_TYPE(reg) == PCIE_XCAP_TYPE_ROOT_EVNTC)
subclass = PCI_SUBCLASS_SYSTEM_RCEC;
@@ -2446,13 +2446,29 @@ static struct {
};
static int
-pci_conf_find_cap(const pcireg_t *regs, int capoff, unsigned int capid,
- int *offsetp)
+pci_conf_find_cap(const pcireg_t *regs, unsigned int capid, int *offsetp)
{
pcireg_t rval;
+ unsigned int capptr;
int off;
- for (off = PCI_CAPLIST_PTR(regs[o2i(capoff)]);
+ if (!(regs[o2i(PCI_COMMAND_STATUS_REG)] & PCI_STATUS_CAPLIST_SUPPORT))
+ return 0;
+
+ /* Determine the Capability List Pointer register to start with. */
+ switch (PCI_HDRTYPE_TYPE(regs[o2i(PCI_BHLC_REG)])) {
+ case 0: /* standard device header */
+ case 1: /* PCI-PCI bridge header */
+ capptr = PCI_CAPLISTPTR_REG;
+ break;
+ case 2: /* PCI-CardBus Bridge header */
+ capptr = PCI_CARDBUS_CAPLISTPTR_REG;
+ break;
+ default:
+ return 0;
+ }
+
+ for (off = PCI_CAPLIST_PTR(regs[o2i(capptr)]);
off != 0; off = PCI_CAPLIST_NEXT(rval)) {
rval = regs[o2i(off)];
if (capid == PCI_CAPLIST_CAP(rval)) {
@@ -2511,13 +2527,6 @@ pci_conf_print_caplist(
* the same. This is required because some capabilities
* appear multiple times (e.g. HyperTransport capability).
*/
-#if 0
- if (pci_conf_find_cap(regs, capoff, i, &off)) {
- rval = regs[o2i(off)];
- if (pci_captab[i].printfunc != NULL)
- pci_captab[i].printfunc(regs, off);
- }
-#else
for (off = PCI_CAPLIST_PTR(regs[o2i(capoff)]);
off != 0; off = PCI_CAPLIST_NEXT(regs[o2i(off)])) {
rval = regs[o2i(off)];
@@ -2525,7 +2534,6 @@ pci_conf_print_caplist(
&& (pci_captab[i].printfunc != NULL))
pci_captab[i].printfunc(regs, off);
}
-#endif
}
}
@@ -2633,14 +2641,14 @@ pci_conf_print_aer_cap_errsrc_id(pcireg_
}
static void
-pci_conf_print_aer_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_aer_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
int pcie_capoff;
int pcie_devtype = -1;
bool tlp_prefix_log = false;
- if (pci_conf_find_cap(regs, capoff, PCI_CAP_PCIEXPRESS, &pcie_capoff)) {
+ if (pci_conf_find_cap(regs, PCI_CAP_PCIEXPRESS, &pcie_capoff)) {
reg = regs[o2i(pcie_capoff)];
pcie_devtype = PCIE_XCAP_TYPE(reg);
/* PCIe DW9 to DW14 is for PCIe 2.0 and newer */
@@ -2727,7 +2735,7 @@ pci_conf_print_vc_cap_arbtab(const pcire
}
static void
-pci_conf_print_vc_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_vc_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg, n;
int parbtab, parbsize;
@@ -2918,7 +2926,7 @@ pci_conf_print_pwrbdgt_pwrrail(uint8_t r
}
static void
-pci_conf_print_pwrbdgt_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_pwrbdgt_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
@@ -2967,7 +2975,7 @@ pci_conf_print_rclink_dcl_cap_elmtype(un
}
static void
-pci_conf_print_rclink_dcl_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_rclink_dcl_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
unsigned char nent, linktype;
@@ -3046,7 +3054,7 @@ pci_conf_print_rclink_dcl_cap(const pcir
/* XXX pci_conf_print_rclink_ctl_cap */
static void
-pci_conf_print_rcec_assoc_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_rcec_assoc_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
@@ -3064,7 +3072,7 @@ pci_conf_print_rcec_assoc_cap(const pcir
/* XXX pci_conf_print_cac_cap */
static void
-pci_conf_print_acs_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_acs_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg, cap, ctl;
unsigned int size, i;
@@ -3107,7 +3115,7 @@ pci_conf_print_acs_cap(const pcireg_t *r
}
static void
-pci_conf_print_ari_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_ari_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg, cap, ctl;
@@ -3129,7 +3137,7 @@ pci_conf_print_ari_cap(const pcireg_t *r
}
static void
-pci_conf_print_ats_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_ats_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg, cap, ctl;
unsigned int num;
@@ -3154,7 +3162,7 @@ pci_conf_print_ats_cap(const pcireg_t *r
}
static void
-pci_conf_print_sernum_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_sernum_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t lo, hi;
@@ -3168,7 +3176,7 @@ pci_conf_print_sernum_cap(const pcireg_t
}
static void
-pci_conf_print_sriov_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_sriov_cap(const pcireg_t *regs, int extcapoff)
{
char buf[sizeof("99999 MB")];
pcireg_t reg;
@@ -3280,7 +3288,7 @@ pci_conf_print_sriov_cap(const pcireg_t
/* XXX pci_conf_print_mriov_cap */
static void
-pci_conf_print_multicast_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_multicast_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg, cap, ctl;
pcireg_t regl, regh;
@@ -3348,7 +3356,7 @@ pci_conf_print_multicast_cap(const pcire
}
static void
-pci_conf_print_page_req_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_page_req_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg, ctl, sta;
@@ -3379,7 +3387,7 @@ pci_conf_print_page_req_cap(const pcireg
#define MEM_PBUFSIZE sizeof("999GB")
static void
-pci_conf_print_resizbar_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_resizbar_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t cap, ctl;
unsigned int bars, i, n;
@@ -3436,7 +3444,7 @@ pci_conf_print_resizbar_cap(const pcireg
}
static void
-pci_conf_print_dpa_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_dpa_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
unsigned int substmax, i;
@@ -3516,7 +3524,7 @@ pci_conf_print_tph_req_cap_sttabloc(uint
}
static void
-pci_conf_print_tph_req_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_tph_req_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
int size, i, j;
@@ -3587,7 +3595,7 @@ pci_conf_print_tph_req_cap(const pcireg_
}
static void
-pci_conf_print_ltr_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_ltr_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
@@ -3604,7 +3612,7 @@ pci_conf_print_ltr_cap(const pcireg_t *r
}
static void
-pci_conf_print_sec_pcie_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_sec_pcie_cap(const pcireg_t *regs, int extcapoff)
{
int pcie_capoff;
pcireg_t reg;
@@ -3626,7 +3634,7 @@ pci_conf_print_sec_pcie_cap(const pcireg
printf(" Lane Error Status register: 0x%08x\n", reg);
/* Get Max Link Width */
- if (pci_conf_find_cap(regs, capoff, PCI_CAP_PCIEXPRESS, &pcie_capoff)){
+ if (pci_conf_find_cap(regs, PCI_CAP_PCIEXPRESS, &pcie_capoff)){
reg = regs[o2i(pcie_capoff + PCIE_LCAP)];
maxlinkwidth = __SHIFTOUT(reg, PCIE_LCAP_MAX_WIDTH);
} else {
@@ -3657,7 +3665,7 @@ pci_conf_print_sec_pcie_cap(const pcireg
/* XXX pci_conf_print_pmux_cap */
static void
-pci_conf_print_pasid_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_pasid_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg, cap, ctl;
unsigned int num;
@@ -3680,7 +3688,7 @@ pci_conf_print_pasid_cap(const pcireg_t
}
static void
-pci_conf_print_lnr_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_lnr_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg, cap, ctl;
unsigned int num;
@@ -3718,7 +3726,7 @@ pci_conf_print_dpc_pio(pcireg_t r)
}
static void
-pci_conf_print_dpc_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_dpc_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg, cap, ctl, stat, errsrc;
const char *trigstr;
@@ -3861,7 +3869,7 @@ pci_conf_l1pm_cap_tposcale(unsigned char
}
static void
-pci_conf_print_l1pm_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_l1pm_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
int scale, val;
@@ -3911,7 +3919,7 @@ pci_conf_print_l1pm_cap(const pcireg_t *
}
static void
-pci_conf_print_ptm_cap(const pcireg_t *regs, int capoff, int extcapoff)
+pci_conf_print_ptm_cap(const pcireg_t *regs, int extcapoff)
{
pcireg_t reg;
uint32_t val;
@@ -3971,7 +3979,7 @@ pci_conf_print_ptm_cap(const pcireg_t *r
static struct {
pcireg_t cap;
const char *name;
- void (*printfunc)(const pcireg_t *, int, int);
+ void (*printfunc)(const pcireg_t *, int);
} pci_extcaptab[] = {
{ 0, "reserved",
NULL },
@@ -4054,8 +4062,7 @@ static struct {
};
static int
-pci_conf_find_extcap(const pcireg_t *regs, int capoff, unsigned int capid,
- int *offsetp)
+pci_conf_find_extcap(const pcireg_t *regs, unsigned int capid, int *offsetp)
{
int off;
pcireg_t rval;
@@ -4078,7 +4085,7 @@ pci_conf_print_extcaplist(
#ifdef _KERNEL
pci_chipset_tag_t pc, pcitag_t tag,
#endif
- const pcireg_t *regs, int capoff)
+ const pcireg_t *regs)
{
int off;
pcireg_t foundcap;
@@ -4133,14 +4140,14 @@ pci_conf_print_extcaplist(
* print all capabilities that the capabiliy type is
* the same.
*/
- if (pci_conf_find_extcap(regs, capoff, i, &off) == 0)
+ if (pci_conf_find_extcap(regs, i, &off) == 0)
continue;
rval = regs[o2i(off)];
if ((PCI_EXTCAPLIST_VERSION(rval) <= 0)
|| (pci_extcaptab[i].printfunc == NULL))
continue;
- pci_extcaptab[i].printfunc(regs, capoff, off);
+ pci_extcaptab[i].printfunc(regs, off);
}
}
@@ -4691,9 +4698,9 @@ pci_conf_print(
return;
#ifdef _KERNEL
- pci_conf_print_extcaplist(pc, tag, regs, capoff);
+ pci_conf_print_extcaplist(pc, tag, regs);
#else
- pci_conf_print_extcaplist(regs, capoff);
+ pci_conf_print_extcaplist(regs);
#endif
printf("\n");
