From nobody Wed Feb 23 01:05:33 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 65D4E19DDF44; Wed, 23 Feb 2022 01:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K3HsB0f1nz4gYL; Wed, 23 Feb 2022 01:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645578334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SE0q0toW/1v9pr9QQdhaI3Sxg0UHFjo2danVln38m/Q=; b=CW9v3ZR+UK+jy8BsKrZPReb4FxhquvspoVANo3hy7i0Cr4gqGjNIVNZkt/NIVgaI9PemRn NUiTTiO34QB7Ill3f/9/xjTCh/NsDrnEREOcUgMEuzuObdZwnSmKji+mVMlUQ+Alu4gnSq TTql/2D69XSU1DoqDJxtEOCtfd2IUSBFEK4kTbmUIK2pOzqGGiAazDcuo9ZF5HhUTX0lK1 AifP2w08sMuXz0O7iNF1V6Yxp4QN1MIYX1Y/yWN6vrfi8y17WFLclt9QXFgGylDWFTtKug VsdjybjaeGBzWsWjnQgGse2qbyYafAbfaycWC2Z6pbHjcemFEIPcwtXEu/NFIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D03FD6AF2; Wed, 23 Feb 2022 01:05:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21N15XVu047645; Wed, 23 Feb 2022 01:05:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21N15XLm047644; Wed, 23 Feb 2022 01:05:33 GMT (envelope-from git) Date: Wed, 23 Feb 2022 01:05:33 GMT Message-Id: <202202230105.21N15XLm047644@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: 23566767c37e - stable/13 - rtsx: Do not display pci_read_config() errors during rtsx_init() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 23566767c37ec280fb848869cbe5ea930842fd92 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645578334; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SE0q0toW/1v9pr9QQdhaI3Sxg0UHFjo2danVln38m/Q=; b=ZiS2A+ojkAtl2JzT9CnGSDUP1Z/OUuEH8i2PpoNXBAbNn0xFa8wpS3fvFI1RxWYW3OsE68 E9i3Sz7omeJolu20DFTKNj3VOS40Egz2ns2cEOSwKgv1Ll0PooXNZ3bULlSNApnJswnPDD Y3Aey5mcEBpL+AjvbnerFUsdEpgy4UKDsFTRua/y1RVqzdXWK8oIL7if9JWY2bI4OIsbyw 8U+bcClKTBp9iSeQyfSoTQ2tfUci2h2J1UeXlmtbsxgfOZWzJ0uJhKCQxtyypvVZnzDN99 7GXpVzg1e8rflWdbPBQ1w6wz8XbVoWBGqsDRN3oJliJ5V2t/StkNgc5DOIqsYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645578334; a=rsa-sha256; cv=none; b=mSElAJ/J7cuwFTnnNf5bgffacNmvUyotymUnFZxzfSIH5zqTWwJIZx5Y/VB7wN0neC/In4 zu92gS1BP3s5Y1WWaLYwPyIcKS5vCnv9pTv+YdKfCb8Tj98HCqYbtD/dUBn3OqsEz65+Sv hSKYuuEPn0qhEZKx17PMuwWK6D+93yA4MaMSW2Iv1edcJCMQkRKpp1BsjC08KoZYDjJ8Z0 k4WGf5IGryVc2dC7YZnR3ENT4zmezKdQJgFNhPSQCvFE3B9GjwlOQttEWMiDnASRL2Yo+z FCJQ/l7lRToUBeCiYYQD/LX4jHqC5ilXdSLAb9kX67QTr7eTvuYcM7Wm0ODGgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=23566767c37ec280fb848869cbe5ea930842fd92 commit 23566767c37ec280fb848869cbe5ea930842fd92 Author: Henri Hennebert AuthorDate: 2022-02-03 23:22:24 +0000 Commit: Alexander Motin CommitDate: 2022-02-23 00:39:53 +0000 rtsx: Do not display pci_read_config() errors during rtsx_init() Differential Revision: https://reviews.freebsd.org/D32154 (cherry picked from commit 1e800a593445b83e010e3d2985ca66e56107dd76) --- sys/dev/rtsx/rtsx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/dev/rtsx/rtsx.c b/sys/dev/rtsx/rtsx.c index 5146ca54141c..7c0c8b21d815 100644 --- a/sys/dev/rtsx/rtsx.c +++ b/sys/dev/rtsx/rtsx.c @@ -781,7 +781,7 @@ rtsx_init(struct rtsx_softc *sc) if (!(reg & 0x80)) { sc->rtsx_card_drive_sel = (reg >> 8) & 0x3F; sc->rtsx_sd30_drive_sel_3v3 = reg & 0x07; - } else { + } else if (bootverbose || rtsx_init_debug) { device_printf(sc->rtsx_dev, "pci_read_config() error - reg: 0x%08x\n", reg); } if (bootverbose || rtsx_init_debug) @@ -799,7 +799,7 @@ rtsx_init(struct rtsx_softc *sc) sc->rtsx_sd30_drive_sel_3v3 = (reg >> 5) & 0x03; if (reg & 0x4000) sc->rtsx_flags |= RTSX_F_REVERSE_SOCKET; - } else { + } else if (bootverbose || rtsx_init_debug) { device_printf(sc->rtsx_dev, "pci_read_config() error - reg: 0x%08x\n", reg); } if (bootverbose || rtsx_init_debug) @@ -816,7 +816,7 @@ rtsx_init(struct rtsx_softc *sc) sc->rtsx_card_drive_sel |= ((reg >> 25) & 0x01) << 6; reg = pci_read_config(sc->rtsx_dev, RTSX_PCR_SETTING_REG2, 4); sc->rtsx_sd30_drive_sel_3v3 = rtsx_map_sd_drive((reg >> 5) & 0x03); - } else { + } else if (bootverbose || rtsx_init_debug) { device_printf(sc->rtsx_dev, "pci_read_config() error - reg: 0x%08x\n", reg); } if (bootverbose || rtsx_init_debug) @@ -834,7 +834,7 @@ rtsx_init(struct rtsx_softc *sc) sc->rtsx_sd30_drive_sel_3v3 = (reg >> 5) & 0x03; if (reg & 0x4000) sc->rtsx_flags |= RTSX_F_REVERSE_SOCKET; - } else { + } else if (bootverbose || rtsx_init_debug) { device_printf(sc->rtsx_dev, "pci_read_config() error - reg: 0x%08x\n", reg); } if (bootverbose || rtsx_init_debug) @@ -853,7 +853,7 @@ rtsx_init(struct rtsx_softc *sc) sc->rtsx_card_drive_sel |= ((reg1 >> 25) & 0x01) << 6; reg3 = pci_read_config(sc->rtsx_dev, RTSX_PCR_SETTING_REG3, 1); sc->rtsx_sd30_drive_sel_3v3 = (reg3 >> 5) & 0x07; - } else { + } else if (bootverbose || rtsx_init_debug) { device_printf(sc->rtsx_dev, "pci_read_config() error - reg1: 0x%08x\n", reg1); } if (bootverbose || rtsx_init_debug) @@ -867,7 +867,7 @@ rtsx_init(struct rtsx_softc *sc) reg = pci_read_config(sc->rtsx_dev, RTSX_PCR_SETTING_REG1, 4); if (!(reg & 0x1000000)) { sc->rtsx_sd30_drive_sel_3v3 = rtsx_map_sd_drive(reg & 0x03); - } else { + } else if (bootverbose || rtsx_init_debug) { device_printf(sc->rtsx_dev, "pci_read_config() error - reg: 0x%08x\n", reg); } if (bootverbose || rtsx_init_debug)