From nobody Wed Jul 29 19:25:24 2026 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 4h9Mjw4gzHz6mj6g for ; Wed, 29 Jul 2026 19:25:24 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h9Mjw30q9z3Vgp for ; Wed, 29 Jul 2026 19:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785353124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2cJGOTzwge7QmGVzQC/47QELC6s93/0UNZcYFiQfxiM=; b=yQ9CFLLRxa1FKU5xdAEHV4sBlBKceil47mEBeNdBPeIwl47QjC4yLcAME/0LZVYNIs7wum uj5oPsuRJ9z90VbnAYSh7NrSRke34iHtiYNM3fLr2ubNBLSLsMYy7l50co0UguhWpg63yS 0vl0Rzo7WEzF+zKWZ944DMK07Rg2FqeQzooPsFcnML2OwVrtxl7ipzgsD3JwII2UmF3KCZ VfrDp6PDfkQnZGTYZPbRpbYD6va8XjAhXXarA4hMK4MQXxDXfQuF6KTBodwzp4+3hWOKZ0 WsoQ9QmecqCVaGLjKxZg3WyZQXBcu/9tJ4aitxpS+ebZGNR6yVXtWYG/A9hj/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1785353124; a=rsa-sha256; cv=none; b=ekeBxBWpGbu67Z2WNaPcpNklB4GLGwMbZ6ViV413xIde4CvLlON1uCQstL9RYggiGsLR7l stqJ2UGnuVSGAGe6c3PbhdRYAw1aeBEdCydPy/PQCLBvVxECuK1gS4kVUi7vpukfuwQi3C m7Wvu0iZgJcXYUkuAobAU5nUg9Q+x1IFRjnIpbrjso8L1BANUkLXR253QFfiWK4QyUltYR uBIlDibVS7RqKLE7WgLcAa8LoT6TxwaRRBbdHhhWZbux93lIahQJUGTs7mbIW/qlSiM7OX gdXfIJ5RzoX6QN4NipXssJy0j4uwusSDGrZ6RzXKJOsGz0/idXoItt8lB0iJSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1785353124; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2cJGOTzwge7QmGVzQC/47QELC6s93/0UNZcYFiQfxiM=; b=DzLDHdT86Upy03p65R73xkJjt3XBcbstPVww7rfBfzaLsVagqEVR4y75xX2wTMJ6uWm9x2 U1pbzdkzNLU9keTAoDyIvo6oGZJN+1fy4aC2roFbSiS6/2Scm01x5lpfxNv5X37C66mGCm 96SjRQZGBFaSK6b0HT+TEMihTF2ieCnk/g3fCAvs4NGiQKRBThDvm18tBNBrz5mmSCZJuI xh5GSGwaRFUsgEPIIGcUS2LvQiwvGZ6BtUalm8Sq55vquRlk8VgGyNBQQEokRgo/Yu7gx+ T4pGOqD8nEYHnKrIWboz5sFLMIfSAfE+7QLDclW04Vbo8eHqXLE4vH39WnF6fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h9Mjw20LXzgML for ; Wed, 29 Jul 2026 19:25:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 449ad by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 29 Jul 2026 19:25:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Abdelkader Boudih From: Adrian Chadd Subject: git: 248d537e4ca7 - main - sdhci: don't infer a non-removable slot on Apollo Lake SDXC 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 248d537e4ca7295a08bab60e82633d332d36e525 Auto-Submitted: auto-generated Date: Wed, 29 Jul 2026 19:25:24 +0000 Message-Id: <6a6a53a4.449ad.76f9417e@gitrepo.freebsd.org> The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=248d537e4ca7295a08bab60e82633d332d36e525 commit 248d537e4ca7295a08bab60e82633d332d36e525 Author: Abdelkader Boudih AuthorDate: 2026-07-29 19:24:46 +0000 Commit: Adrian Chadd CommitDate: 2026-07-29 19:24:49 +0000 sdhci: don't infer a non-removable slot on Apollo Lake SDXC Intel Apollo Lake SDXC controller reports a Slot Type of "Embedded Slot for One Device" in SDHCI_CAPABILITIES bits, even when the slot is a removable card reader. This caused 48 timeouts before the boot sequence resumed. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D58467 --- sys/dev/sdhci/sdhci.c | 3 ++- sys/dev/sdhci/sdhci.h | 2 ++ sys/dev/sdhci/sdhci_pci.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index 0426d9d27916..b536e273d4bf 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -901,7 +901,8 @@ sdhci_init_slot(device_t dev, struct sdhci_slot *slot, int num) SDHCI_LOCK_DESTROY(slot); return (ENXIO); } else if ((caps & SDHCI_SLOTTYPE_MASK) == - SDHCI_SLOTTYPE_EMBEDDED) { + SDHCI_SLOTTYPE_EMBEDDED && + !(slot->quirks & SDHCI_QUIRK_SLOTTYPE_BROKEN)) { slot->opt |= SDHCI_SLOT_EMBEDDED | SDHCI_NON_REMOVABLE; } } diff --git a/sys/dev/sdhci/sdhci.h b/sys/dev/sdhci/sdhci.h index c5b2f24061ae..7f18ce2325c3 100644 --- a/sys/dev/sdhci/sdhci.h +++ b/sys/dev/sdhci/sdhci.h @@ -95,6 +95,8 @@ #define SDHCI_QUIRK_MMC_HS400_IF_CAN_SDR104 (1 << 29) /* SDMA boundary in SDHCI_BLOCK_SIZE broken - use front-end supplied value. */ #define SDHCI_QUIRK_BROKEN_SDMA_BOUNDARY (1 << 30) +/* Slot type in SDHCI_CAPABILITIES reads as embedded, but slot is removable. */ +#define SDHCI_QUIRK_SLOTTYPE_BROKEN (1U << 31) /* * Controller registers diff --git a/sys/dev/sdhci/sdhci_pci.c b/sys/dev/sdhci/sdhci_pci.c index 4f9bbfec50fb..3ede3a666578 100644 --- a/sys/dev/sdhci/sdhci_pci.c +++ b/sys/dev/sdhci/sdhci_pci.c @@ -142,6 +142,7 @@ static const struct sdhci_device { { 0x5aca8086, 0xffff, "Intel Apollo Lake SDXC Controller", SDHCI_QUIRK_BROKEN_DMA | /* APL18 erratum */ SDHCI_QUIRK_WAIT_WHILE_BUSY | + SDHCI_QUIRK_SLOTTYPE_BROKEN | SDHCI_QUIRK_PRESET_VALUE_BROKEN }, { 0x5acc8086, 0xffff, "Intel Apollo Lake eMMC 5.0 Controller", SDHCI_QUIRK_BROKEN_DMA | /* APL18 erratum */