From nobody Thu Feb 17 06:57:34 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 DA1E319C60BA; Thu, 17 Feb 2022 06:57: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 4Jzly65nfWz3LZ1; Thu, 17 Feb 2022 06:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645081054; 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=p4U28/Qu4tQlDOo3aEz4idGyIH2F6QlMlF6KAbTi2jc=; b=mJtD+kz3XhJfigKg4qQB1ZK/xtr2gPwr1wEGo0CX+JKXTQ2Y9snKE5DyumMTpaARPOU3r6 ReGpGTOTnlpFMyMd71/p0tRXpoXHkE/AGtekQw4pX0x+KYTDfyIGnPot/CgDnNiIOJQyPK 97pC/OodZy06ZqMaPf3KsmItLEMwnIROBUWSKHu5WCoKFUpt0GW5CJQ65MTGj11yyknTWK fuoIae12EsTsrohgsd7saCI4q/Dn3olnaZyXGz2+pMDMtPsN5jGJawzqS+nTlVckewe7Qi BB1sjQHWPACYj5khOJqtiIaJZcVsvdelGR4/KRyeLoLrzeNH1NTAm2667mYn5Q== 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 A6EE32549F; Thu, 17 Feb 2022 06:57:34 +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 21H6vYsO097375; Thu, 17 Feb 2022 06:57:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21H6vY2R097374; Thu, 17 Feb 2022 06:57:34 GMT (envelope-from git) Date: Thu, 17 Feb 2022 06:57:34 GMT Message-Id: <202202170657.21H6vY2R097374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andriy Gapon Subject: git: 6b3071c70e64 - stable/13 - mmc_da: create disk(9) for pre-2.0 SD cards 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: avg X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6b3071c70e64650313b851024c70b828b1bedecf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645081054; 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=p4U28/Qu4tQlDOo3aEz4idGyIH2F6QlMlF6KAbTi2jc=; b=rcLrF33mTNLuFaYJkTIOrkdC9YtPxL2DAdBLaUaWQlGY/3TnPgqsuASVUJ6TuiO5CbcFKJ RDS5JAzzgQ3+Ab/I+nnBFT8addKsJWkOj9fLte8WbQ84twe23DeKYCfTDCz5vX6ZZ9HbMq eSxkMs1yiEAJlfPKKyADwGbp6abN5zUFh5wS3R6A+O7q94xEmyGkOaqcube5XkFoilJqke B9jxiPWo5ewISiNtNLKCrGlAEHfDzHT5IGm3uFAxDiKGKxaqhnntgcegDe3cwIMsLSqDxW 8ZySNO5+81z+vJClsibWicDaKavFdCkPBAuzWlGxbc0G1XB8KOjjTwhnYFX5PQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645081054; a=rsa-sha256; cv=none; b=Z1EVQCfGkrUba2Qefzn0CwKjlcDy7U0PJ6WRCNYjcyLFQMb6qUjMzwwjY6aXoPPkr3HWYZ 2USTXJmNXxb/FGztuz+09pNI1ro9poYhnj9+1IUJTuiBKLfT7k/P4NdPhkfSvBArKe4kO9 8WS7dcqvycjwJmbyIHrRI5seHgqUdMLiLHR/N6Wu7/brGyTYCeFezDiD6A5EVCJ0Wmgd/I iVIB6uNQwsucsyBkztUlF/lT4Fpb1/XRCZj/TLVTltaA8wuwDArgIsfOdAPhItLBrIpXbL cuSA2eZpIuabFFUyoI+5wrj/e8HQlSvr+IHEgY7aM+//V+oHLa+ZBQi3hSz3kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=6b3071c70e64650313b851024c70b828b1bedecf commit 6b3071c70e64650313b851024c70b828b1bedecf Author: Andriy Gapon AuthorDate: 2022-01-27 16:49:27 +0000 Commit: Andriy Gapon CommitDate: 2022-02-17 06:56:56 +0000 mmc_da: create disk(9) for pre-2.0 SD cards It does not look like there is anything in mmc_da code that actually requires protocol 2.0 or later. dev/mmc code also does not have such a restriction. Tested with a very old 2GB mini-SD card. Prior to this change mmc_da would claim the card but would not expose it to GEOM. Without MMCCAM: mmc0: on sdhci_pci0 mmc0: Probing bus mmc0: SD probe: OK (OCR: 0x00ff8000) mmc0: Current OCR: 0x00ff8000 mmc0: CMD8 failed, RESULT: 1 mmc0: Probing cards mmc0: New card detected (CID 1c53565344432020100002982e007600) mmc0: New card detected (CSD 005e00325f5a83d02db7ffbf96800000) mmc0: Card at relative address 0xb368 added: mmc0: card: SD SDC 1.0 SN 0002982E MFG 06/2007 by 28 SV mmc0: quirks: 0 mmc0: bus: 4bit, 50MHz (high speed timing) mmc0: memory: 3998720 blocks, erase sector 256 blocks mmc0: setting transfer rate to 50.000MHz (high speed timing) GEOM: new disk mmcsd0 mmcsd0: 2GB at mmc0 50.0MHz/4bit/65535-block mmc0: setting bus width to 4 bits high speed timing With MMCCAM and this change: sdda0 at sdhci_slot0 bus 0 scbus2 target 0 lun 0 sdda0: Relative addr: 0000b368 Card features: sdda0: Serial Number 0002982E sdda0: SD SDC 1.0 SN 0002982E MFG 06/2007 by 28 SV GEOM: new disk sdda0 (cherry picked from commit 6fd84a627fa066a98777c7ab1e65bdd885407516) --- sys/cam/mmc/mmc_da.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index 15e80fe879c9..e13bee75c216 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -1478,7 +1478,7 @@ finish_hs_tests: /* MMC partitions support */ if (mmcp->card_features & CARD_FEATURE_MMC && mmc_get_spec_vers(periph) >= 4) { sdda_process_mmc_partitions(periph, start_ccb); - } else if (mmcp->card_features & CARD_FEATURE_SD20) { + } else if (mmcp->card_features & CARD_FEATURE_MEMORY) { /* For SD[HC] cards, just add one partition that is the whole card */ if (sdda_add_part(periph, 0, "sdda", periph->unit_number,