From nobody Fri Feb 02 19:59:20 2024 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 4TRRS85shKz588g4; Fri, 2 Feb 2024 19:59:20 +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 4TRRS83jr9z4tKy; Fri, 2 Feb 2024 19:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903960; 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=lqF2gDBhkiaM6hXjuKavYO/kXDTTiQ2XZq1z/8Q5aDA=; b=lXymEZLjQUgQepxDzQ+4DE1B+gW5RAD6R3yZ+B0vjLCzCHxCT1A6Q54iaEjAlv8BZFW1Tk EPQIMhXdPBrD8eQRtmrPQdYkTgs0WC6/yJUWh7G33zti9HqMdo5c0/A5MwK1gfh81Yk5bc GSSMlY5bX3ojLwFEqmxUGtGP+gy42sqQIik3MVlVjrZXh4sdwxNkNhuagV2p1qdUrt6Ybt 4j4G3obgKojy7ZmPiOOLSkodVIT1f/kdEh+GrJAmQ8e3rKNQXOvIt9L5eptkb8wKTsd5Ai h6JtJj/hA1juQQ6nx7uplPaXGW+cspfDJ4O8vFETRhog0YIkGY9KSUcOGUPgbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706903960; 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=lqF2gDBhkiaM6hXjuKavYO/kXDTTiQ2XZq1z/8Q5aDA=; b=gTFdvGDWk6Fl909tNJLjZg/wVIsStQqU/T9XlNvxfe0MFRS2udzjTG1HIa7fOaUlORdezE 78x18jB7dSfDjpn4fePbq0BNbM6pqCWMhW3Ddf6ptug3lMGIDZSqbdLkev2OMRSI4nW3fq KU7Axf8WY8h+Q2gIQoyc4cxsSqvzsxzG1tACjFdBvSLcy02tLt0EJ1u7Y7IFg4fVEhDIvW OKDVtZN4cWbm2F0TgVZQHg4Az5LCu6cbrEXHFk/eWTzctmVZrN2PG1mymYerSUaaAUau5z Q2kCbZ6pvLJ92qMNlnG6DJZnJlD8VklJ8dP9fRM0Zir9lz8pep6uR9nrTg2pmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706903960; a=rsa-sha256; cv=none; b=m28fmc7u7ryQ+tq3gtYXuzLdgQVvv234k+Td/KgfdNoc+i8GSRNI3apO1K6t41OL8ztHm1 xx5rUNES7AQwtPVDIXFpsd/jqG/sSnyZErFuV6dwQuUyCq1dDLFv+PEPu3XqIax7K1dzza 4VYznzrEIuHIwY9f6t/iCz8F8VZZt4bs0dTJi47SuCUCHCGjavgo1h3ef01KA4DyHBevif UW07H7WqZFz8lZIq38qx9zk/2puv6EVfLwJr1Bf5/HPsKlgZSlVdGYuOPBbg+tTu+vTeOz gqP6CRmH7jFBmODIzLypW8HnU2Yi4Zx5+zIHGsYdcEctpzjmZwnPeE2VykM/lQ== 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 4TRRS82QR6zkcd; Fri, 2 Feb 2024 19:59:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 412JxKpA038339; Fri, 2 Feb 2024 19:59:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 412JxKop038336; Fri, 2 Feb 2024 19:59:20 GMT (envelope-from git) Date: Fri, 2 Feb 2024 19:59:20 GMT Message-Id: <202402021959.412JxKop038336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 834517eff8aa - main - x86 & arm: remove CAM_DEBUG_FLAGS= from MMCCAM kernels 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 834517eff8aaab46760645619b880d97f23ab61b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=834517eff8aaab46760645619b880d97f23ab61b commit 834517eff8aaab46760645619b880d97f23ab61b Author: Mina Galić AuthorDate: 2024-02-02 19:46:01 +0000 Commit: Warner Losh CommitDate: 2024-02-02 19:51:51 +0000 x86 & arm: remove CAM_DEBUG_FLAGS= from MMCCAM kernels we leave `options CAMDEBUG` enabled, so that when needed, CAM debugging can be enabled *as needed*, rather than setting a default of everything. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/798 --- sys/amd64/conf/GENERIC-MMCCAM | 6 +----- sys/arm/conf/GENERIC-MMCCAM | 6 +----- sys/arm64/conf/GENERIC-MMCCAM | 9 +++------ 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/sys/amd64/conf/GENERIC-MMCCAM b/sys/amd64/conf/GENERIC-MMCCAM index 26e19887c800..65bada999030 100644 --- a/sys/amd64/conf/GENERIC-MMCCAM +++ b/sys/amd64/conf/GENERIC-MMCCAM @@ -12,12 +12,8 @@ ident GENERIC-MMCCAM options MMCCAM -# Add CAMDEBUG stuff +# Allow for CAM debugging options CAMDEBUG -options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) - -# pass(4) device -device pass nodevice mmc nodevice mmcsd diff --git a/sys/arm/conf/GENERIC-MMCCAM b/sys/arm/conf/GENERIC-MMCCAM index 26e19887c800..65bada999030 100644 --- a/sys/arm/conf/GENERIC-MMCCAM +++ b/sys/arm/conf/GENERIC-MMCCAM @@ -12,12 +12,8 @@ ident GENERIC-MMCCAM options MMCCAM -# Add CAMDEBUG stuff +# Allow for CAM debugging options CAMDEBUG -options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) - -# pass(4) device -device pass nodevice mmc nodevice mmcsd diff --git a/sys/arm64/conf/GENERIC-MMCCAM b/sys/arm64/conf/GENERIC-MMCCAM index 471b299ab3c2..77d65d959763 100644 --- a/sys/arm64/conf/GENERIC-MMCCAM +++ b/sys/arm64/conf/GENERIC-MMCCAM @@ -10,13 +10,10 @@ include GENERIC ident GENERIC-MMCCAM -# Add CAMDEBUG stuff -options CAMDEBUG -options CAM_DEBUG_FLAGS=(CAM_DEBUG_INFO|CAM_DEBUG_PROBE|CAM_DEBUG_PERIPH) - -# pass(4) device -device pass options MMCCAM +# Allow for CAM debugging +options CAMDEBUG + nodevice mmc nodevice mmcsd