From owner-svn-src-head@freebsd.org Fri Sep 22 12:07:04 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7CF7E263D1; Fri, 22 Sep 2017 12:07:04 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3EA66834C; Fri, 22 Sep 2017 12:07:04 +0000 (UTC) (envelope-from scottl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8MC73b9025593; Fri, 22 Sep 2017 12:07:03 GMT (envelope-from scottl@FreeBSD.org) Received: (from scottl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8MC73gm025591; Fri, 22 Sep 2017 12:07:03 GMT (envelope-from scottl@FreeBSD.org) Message-Id: <201709221207.v8MC73gm025591@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: scottl set sender to scottl@FreeBSD.org using -f From: Scott Long Date: Fri, 22 Sep 2017 12:07:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323922 - in head/sys/dev: mpr mps X-SVN-Group: head X-SVN-Commit-Author: scottl X-SVN-Commit-Paths: in head/sys/dev: mpr mps X-SVN-Commit-Revision: 323922 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2017 12:07:05 -0000 Author: scottl Date: Fri Sep 22 12:07:03 2017 New Revision: 323922 URL: https://svnweb.freebsd.org/changeset/base/323922 Log: Clean up error messages related to device discovery Sponsored by: Netflix Modified: head/sys/dev/mpr/mpr_sas_lsi.c head/sys/dev/mps/mps_sas_lsi.c Modified: head/sys/dev/mpr/mpr_sas_lsi.c ============================================================================== --- head/sys/dev/mpr/mpr_sas_lsi.c Fri Sep 22 10:51:32 2017 (r323921) +++ head/sys/dev/mpr/mpr_sas_lsi.c Fri Sep 22 12:07:03 2017 (r323922) @@ -781,9 +781,11 @@ mprsas_add_device(struct mpr_softc *sc, u16 handle, u8 sassc = sc->sassc; mprsas_startup_increment(sassc); - if ((mpr_config_get_sas_device_pg0(sc, &mpi_reply, &config_page, - MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, handle))) { - printf("%s: error reading SAS device page0\n", __func__); + if (mpr_config_get_sas_device_pg0(sc, &mpi_reply, &config_page, + MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, handle) != 0) { + mpr_dprint(sc, MPR_INFO|MPR_MAPPING|MPR_FAULT, + "Error reading SAS device %#x page0, iocstatus= 0x%x\n", + handle, mpi_reply.IOCStatus); error = ENXIO; goto out; } @@ -795,12 +797,14 @@ mprsas_add_device(struct mpr_softc *sc, u16 handle, u8 Mpi2ConfigReply_t tmp_mpi_reply; Mpi2SasDevicePage0_t parent_config_page; - if ((mpr_config_get_sas_device_pg0(sc, &tmp_mpi_reply, - &parent_config_page, MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, - le16toh(config_page.ParentDevHandle)))) { + if (mpr_config_get_sas_device_pg0(sc, &tmp_mpi_reply, + &parent_config_page, MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, + le16toh(config_page.ParentDevHandle)) != 0) { mpr_dprint(sc, MPR_MAPPING|MPR_FAULT, - "%s: error reading SAS device %#x page0\n", - __func__, le16toh(config_page.ParentDevHandle)); + "Error reading parent SAS device %#x page0, " + "iocstatus= 0x%x\n", + le16toh(config_page.ParentDevHandle), + tmp_mpi_reply.IOCStatus); } else { parent_sas_address = parent_config_page.SASAddress.High; parent_sas_address = (parent_sas_address << 32) | @@ -1148,8 +1152,9 @@ mprsas_get_sata_identify(struct mpr_softc *sc, u16 han * If the request returns an error then we need to do a diag * reset */ - printf("%s: request for page completed with error %d", - __func__, error); + mpr_dprint(sc, MPR_INFO|MPR_FAULT|MPR_MAPPING, + "Request for SATA PASSTHROUGH page completed with error %d", + error); error = ENXIO; goto out; } @@ -1157,8 +1162,9 @@ mprsas_get_sata_identify(struct mpr_softc *sc, u16 han bcopy(reply, mpi_reply, sizeof(Mpi2SataPassthroughReply_t)); if ((le16toh(reply->IOCStatus) & MPI2_IOCSTATUS_MASK) != MPI2_IOCSTATUS_SUCCESS) { - printf("%s: error reading SATA PASSTHRU; iocstatus = 0x%x\n", - __func__, reply->IOCStatus); + mpr_dprint(sc, MPR_INFO|MPR_MAPPING|MPR_FAULT, + "Error reading device %#x SATA PASSTHRU; iocstatus= 0x%x\n", + handle, reply->IOCStatus); error = ENXIO; goto out; } Modified: head/sys/dev/mps/mps_sas_lsi.c ============================================================================== --- head/sys/dev/mps/mps_sas_lsi.c Fri Sep 22 10:51:32 2017 (r323921) +++ head/sys/dev/mps/mps_sas_lsi.c Fri Sep 22 12:07:03 2017 (r323922) @@ -628,9 +628,11 @@ mpssas_add_device(struct mps_softc *sc, u16 handle, u8 sassc = sc->sassc; mpssas_startup_increment(sassc); - if ((mps_config_get_sas_device_pg0(sc, &mpi_reply, &config_page, - MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, handle))) { - printf("%s: error reading SAS device page0\n", __func__); + if (mps_config_get_sas_device_pg0(sc, &mpi_reply, &config_page, + MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, handle) != 0) { + mps_dprint(sc, MPS_INFO|MPS_MAPPING|MPS_FAULT, + "Error reading SAS device %#x page0, iocstatus= 0x%x\n", + handle, mpi_reply.IOCStatus); error = ENXIO; goto out; } @@ -642,12 +644,14 @@ mpssas_add_device(struct mps_softc *sc, u16 handle, u8 Mpi2ConfigReply_t tmp_mpi_reply; Mpi2SasDevicePage0_t parent_config_page; - if ((mps_config_get_sas_device_pg0(sc, &tmp_mpi_reply, - &parent_config_page, MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, - le16toh(config_page.ParentDevHandle)))) { + if (mps_config_get_sas_device_pg0(sc, &tmp_mpi_reply, + &parent_config_page, MPI2_SAS_DEVICE_PGAD_FORM_HANDLE, + le16toh(config_page.ParentDevHandle)) != 0) { mps_dprint(sc, MPS_MAPPING|MPS_FAULT, - "%s: error reading SAS device %#x page0\n", - __func__, le16toh(config_page.ParentDevHandle)); + "Error reading parent SAS device %#x page0, " + "iocstatus= 0x%x\n", + le16toh(config_page.ParentDevHandle), + tmp_mpi_reply.IOCStatus); } else { parent_sas_address = parent_config_page.SASAddress.High; parent_sas_address = (parent_sas_address << 32) | @@ -973,8 +977,9 @@ mpssas_get_sata_identify(struct mps_softc *sc, u16 han * If the request returns an error then we need to do a diag * reset */ - printf("%s: request for page completed with error %d", - __func__, error); + mps_dprint(sc, MPS_INFO|MPS_FAULT|MPS_MAPPING, + "Request for SATA PASSTHROUGH page completed with error %d", + error); error = ENXIO; goto out; } @@ -982,8 +987,9 @@ mpssas_get_sata_identify(struct mps_softc *sc, u16 han bcopy(reply, mpi_reply, sizeof(Mpi2SataPassthroughReply_t)); if ((le16toh(reply->IOCStatus) & MPI2_IOCSTATUS_MASK) != MPI2_IOCSTATUS_SUCCESS) { - printf("%s: error reading SATA PASSTHRU; iocstatus = 0x%x\n", - __func__, reply->IOCStatus); + mps_dprint(sc, MPS_INFO|MPS_MAPPING|MPS_FAULT, + "Error reading device %#x SATA PASSTHRU; iocstatus= 0x%x\n", + handle, reply->IOCStatus); error = ENXIO; goto out; }