summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2019-07-08 15:11:53 +0000
committerRobert Mustacchi <rm@joyent.com>2019-08-19 17:40:33 +0000
commitb3d69c058376d802cdebbced341adcb3253b113c (patch)
tree8e32fdd7269ed1869bc0e523d1a72fe49df69a09 /usr/src/uts/intel
parente386d4dde2e66dfdb5d0ac143d970d0a77af2786 (diff)
downloadillumos-joyent-b3d69c058376d802cdebbced341adcb3253b113c.tar.gz
11376 PCIe speeds and feeds should be exposed to userland
11373 pcieb should enable link bandwidth notifications 11374 Clean up pcieb CERRWARN and smatch 11375 Clean up pcie module -Wno-uninitialized and -Wno-parentheses Reviewed by: Hans Rosenfeld <hans.rosenfeld@joyent.com> Reviewed by: Patrick Mooney <patrick.mooney@joyent.com> Reviewed by: Toomas Soome <tsoome@me.com> Reviewed by: Paul Winder <Paul.Winder@wdc.com> Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/uts/intel')
-rw-r--r--usr/src/uts/intel/io/pciex/pcieb_x86.c19
-rw-r--r--usr/src/uts/intel/pcieb/Makefile18
2 files changed, 12 insertions, 25 deletions
diff --git a/usr/src/uts/intel/io/pciex/pcieb_x86.c b/usr/src/uts/intel/io/pciex/pcieb_x86.c
index 0d73ca010e..3d3906cd1b 100644
--- a/usr/src/uts/intel/io/pciex/pcieb_x86.c
+++ b/usr/src/uts/intel/io/pciex/pcieb_x86.c
@@ -21,6 +21,7 @@
/*
* Copyright 2010 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
+ * Copyright 2019 Joyent, Inc.
*/
/* x86 specific code used by the pcieb driver */
@@ -43,7 +44,8 @@
int pcieb_intel_workaround_disable = 0;
void
-pcieb_peekpoke_cb(dev_info_t *dip, ddi_fm_error_t *derr) {
+pcieb_peekpoke_cb(dev_info_t *dip, ddi_fm_error_t *derr)
+{
pf_eh_enter(PCIE_DIP2BUS(dip));
(void) pf_scan_fabric(dip, derr, NULL);
pf_eh_exit(PCIE_DIP2BUS(dip));
@@ -201,7 +203,8 @@ pcieb_plat_uninitchild(dev_info_t *child)
/* _OSC related */
void
-pcieb_init_osc(dev_info_t *devi) {
+pcieb_init_osc(dev_info_t *devi)
+{
pcie_bus_t *bus_p = PCIE_DIP2UPBUS(devi);
uint32_t osc_flags = OSC_CONTROL_PCIE_ADV_ERR;
@@ -322,10 +325,10 @@ static x86_error_reg_t intel_5000_rp_regs[] = {
{0x144, 8, 0x0, 0x0, 0xF0},
/* EMASK_UNCOR_PEX[21:0] UE mask */
- {0x148, 32, 0x0, PCIE_AER_UCE_UR, PCIE_AER_UCE_UR},
+ {0x148, 32, 0x0, PCIE_AER_UCE_UR, PCIE_AER_UCE_UR},
/* EMASK_RP_PEX[2:0] FE, UE, CE message detect mask */
- {0x150, 8, 0x0, 0x0, 0x1},
+ {0x150, 8, 0x0, 0x0, 0x1},
};
#define INTEL_5000_RP_REGS_LEN \
(sizeof (intel_5000_rp_regs) / sizeof (x86_error_reg_t))
@@ -353,16 +356,16 @@ static x86_error_reg_t intel_5400_rp_regs[] = {
{0x4E, 8, 0x0, 0x1, 0x0},
/* PEX_ERR_DOCMD[11:0] */
- {0x144, 16, 0x0, 0x0, 0xFF0},
+ {0x144, 16, 0x0, 0x0, 0xFF0},
/* PEX_ERR_PIN_MASK[4:0] do not mask ERR[2:0] pins used by DOCMD */
{0x146, 16, 0x0, 0x10, 0x10},
/* EMASK_UNCOR_PEX[21:0] UE mask */
- {0x148, 32, 0x0, PCIE_AER_UCE_UR, PCIE_AER_UCE_UR},
+ {0x148, 32, 0x0, PCIE_AER_UCE_UR, PCIE_AER_UCE_UR},
/* EMASK_RP_PEX[2:0] FE, UE, CE message detect mask */
- {0x150, 8, 0x0, 0x0, 0x1},
+ {0x150, 8, 0x0, 0x0, 0x1},
};
#define INTEL_5400_RP_REGS_LEN \
(sizeof (intel_5400_rp_regs) / sizeof (x86_error_reg_t))
@@ -569,7 +572,7 @@ pcieb_intel_rber_workaround(dev_info_t *dip)
if (!rber)
return;
- PCIE_AER_PUT(32, bus_p, PCIE_AER_UCE_SERV, pcieb_rber_sev);
+ (void) PCIE_AER_PUT(32, bus_p, PCIE_AER_UCE_SERV, pcieb_rber_sev);
}
/*
diff --git a/usr/src/uts/intel/pcieb/Makefile b/usr/src/uts/intel/pcieb/Makefile
index 3b9f363520..38f4b38a98 100644
--- a/usr/src/uts/intel/pcieb/Makefile
+++ b/usr/src/uts/intel/pcieb/Makefile
@@ -24,7 +24,7 @@
# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# Copyright (c) 2018, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
#
# Path to the base of the uts directory tree (usually /usr/src/uts).
@@ -64,21 +64,6 @@ MODSTUBS_DIR = $(OBJS_DIR)
CLEANFILES += $(MODSTUBS_O)
#
-# For now, disable these lint checks; maintainers should endeavor
-# to investigate and remove these for maximum lint coverage.
-# Please do not carry these forward to new Makefiles.
-#
-LINTTAGS += -erroff=E_SUSPICIOUS_COMPARISON
-LINTTAGS += -erroff=E_BAD_PTR_CAST_ALIGN
-LINTTAGS += -erroff=E_PTRDIFF_OVERFLOW
-LINTTAGS += -erroff=E_ASSIGN_NARROW_CONV
-
-CERRWARN += -_gcc=-Wno-unused-value
-
-# needs work
-SMOFF += all_func_returns
-
-#
# Default build targets.
#
.KEEP_STATE:
@@ -103,4 +88,3 @@ install: $(INSTALL_DEPS)
# Include common targets.
#
include $(UTSBASE)/intel/Makefile.targ
-