From nobody Thu Feb 03 23:43:55 2022 X-Original-To: dev-commits-src-all@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 5E5F619A1B29; Thu, 3 Feb 2022 23:43:57 +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 4JqZxm09ZTz3RF9; Thu, 3 Feb 2022 23:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643931836; 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=RIHzS1afcg/ENHTVLntIOeM1dPwzHJo6Toh78AQZ+Ks=; b=JCQ1jyHKjQHb0xfGoKmheLsD3GMhP6V7pwsSHOdDq/mwlf+m/2Afwyjk7uAAwtNmkEN5Cd nY6nuOSEOD453aHcl/H9ireyHe5sENM1mguxrBVTzdidem2Bd+2Hi2tyl8XkQWabX9qub7 cqiKqmhs3OC8LiCY5+hjIfg0+GD2LFR9JEblQeU+hOrIJSq1Pbryzmq9x4H0Dp/RmyKaCa T3z4G4ygugkLfWPjTWFF6n+U0PEWz94LmWYT3jC3p4B97cdFNqZL3Iw7MV/elOSwCZJcep o8U9Ut+wZCwZDP0fvDhZ//dT2pyY5pXy88kq5X/TkhM2fZazIUhsbppQma5Klg== 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 2730821524; Thu, 3 Feb 2022 23:43:55 +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 213NhtWi076722; Thu, 3 Feb 2022 23:43:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 213Nhtvn076721; Thu, 3 Feb 2022 23:43:55 GMT (envelope-from git) Date: Thu, 3 Feb 2022 23:43:55 GMT Message-Id: <202202032343.213Nhtvn076721@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jung-uk Kim Subject: git: 1e800a593445 - main - rtsx: Do not display pci_read_config() errors during rtsx_init() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e800a593445b83e010e3d2985ca66e56107dd76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643931836; 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=RIHzS1afcg/ENHTVLntIOeM1dPwzHJo6Toh78AQZ+Ks=; b=Fm3IhyzJgn6PsNqXa65F8ViYCCmW9Lbs3rl2ttcUTP+VCcZAPUPUcPm0IMyquMSVOdHJ+l EIGt85pclOjFrywOpPSzZPZskwK1UihoKz4gWnBOOwMa613ggzS2Re5eqJbYBHzfS4NUE2 uZDsVS+J5iUndvs5aMjmWCDcDelUZqkpyvkwUJ2RXDF6qyNcifjKQruzuYGfSxx4t7d8td Xxuqu26TXFbQ5JAcYfJUOUfNA+uvIRE5ZWswK4kT8aV2tEQ1o73S1r9bm/4uMKyjz6GXeE yBcSWaoG8RjGk26vrQkhn+AgalpOnv380S6qNNV1bJ3XWoBOqm8G+DnjWtq3VQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643931836; a=rsa-sha256; cv=none; b=lUtsO96Idj8rPA5CVf/bJZQSMfWw+KnysFRXfVSTH7ucAhX07xjrFo4XyIfoLlBlCSBYtt G0V+gj3bpjm8E9skRjNaJXdejTsZ2mWxF9RCYgXfyk84+3sVbArhD3Cp5QgfeVLxFpla3H iNEjKvD4a9gh02E4wsyETUOnQG2Ly/YZ84/JvSRF8dc2sGymYDCNX0qT8DVAprrYn7IgCM qw9LyIFQ5WciTLCrdmKBAGA38sjCePZmcywHoSsns554Zk7xosOf9voqVJWAeax90V3OCW TAEeEKwAOLEsKbY0P9sUzKRyinUu6hMtXh/8y3GJIFWDdXYW/0OuqKtOrt7jNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/src/commit/?id=1e800a593445b83e010e3d2985ca66e56107dd76 commit 1e800a593445b83e010e3d2985ca66e56107dd76 Author: Henri Hennebert AuthorDate: 2022-02-03 23:22:24 +0000 Commit: Jung-uk Kim CommitDate: 2022-02-03 23:43:13 +0000 rtsx: Do not display pci_read_config() errors during rtsx_init() Differential Revision: https://reviews.freebsd.org/D32154 --- 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)