From nobody Sun Nov 01 18:35:45 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 4jHk6n6L0wz6xjXn for ; Sun, 01 Nov 2026 18:35:45 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jHk6n2wnmz3KWr for ; Sun, 01 Nov 2026 18:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793558145; 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=3H+03j7uaffyLx9TZhmY0vVJBoySB9F/QcPZ4xbS+w0=; b=pafR/YVEdTATVqI3HNeOAgN2ZUt+KmgHLABizzeCO+gcs8hyq3MePw/1vs2EvWFRLmr+Nt BQiXeX8CSqmR5yRqjtTp28rhZMkqHQ/RZ3mGpJqkHM/ZtfBWH6qvfVHpotnffDY+AC/j+n y5WvCYqOrdYr9q4vGXMmyry5m57f5BsoAc7wBQlRjR230EXQet19uQ3JK7G635VBbo+zew P/yRK35JbuLqsRGsoBXFsutShZXz5DMhVXJiuVSPU5ZR5yB48UMuVTNquiiq+IdmnioCjV sQxPomZFRDPmikW5lg2mEDZmUq4vfBOfIjpVtlcySLFrrgC4g3pGC773/Wi6XA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793558145; b=cjWj7bHVwg8xd4qcCI79JN7GgoRIa4uAZfBiy6+nih3s7/91u7R4wbiEwi+lToXgtfedFb H22bUAvdnNcysckeQjDUAXAzyVo/DA09JUen78lQ1pG+M0ckvoiS5W+ICPVzoZnocx47h+ CeRcZFz1H/bcxMe7dK7Y1sxsMZUVNI+QijlRBj9uu6uy9IfFs5+aD6yEfKrjA+8mwGIG8w anFTC67PFSG0/yo0LyLhI6JRa/t3FOujSY1XvuxixW99ul1BtVayuXP7nw0v4nzthYwSDT NDIfaUCz764t16Vdv0G265bFhiHfGcpd1paQfkLLJANq6VN2TqD+O7tWVCpo7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793558145; 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=3H+03j7uaffyLx9TZhmY0vVJBoySB9F/QcPZ4xbS+w0=; b=LJiIbHwQxB2NqAoYFXS5qiAij1VuvRt8fk6CnFEAVLpsZj3k8rh42YPQ06mPrTQJKPOYPx OYUVDGzpvaWzCagtv4URgc7Wiz+s8m0x29attlvYsD4sXWOi0gXxCJF/JTTUtI+dgeDQcN DlukXrLdPOmsxNqiiK87n7PlzWG7m8pFkTw7b/y51jlHQpQFO2+RjGYmquJuksTFv10RGV 0Z9gMCX9+BSFF/uLETmj/fgMpxjfk3PrLV6wD0L2SRUFPQfUdv/RNbWCm3GVs1Nq6uX8Nv gEMNbgvjQ/pCLpBP7m+Sa0AyP/Y2JdLio6tR9+0LnIfck8uYAN5yN+RlCjVtwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jHk6n2bGPz19Kl for ; Sun, 01 Nov 2026 18:35:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 229c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Nov 2026 18:35:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Abdelkader Boudih Subject: git: 6b649b145231 - stable/15 - sdhci: don't infer a non-removable slot on Apollo Lake SDXC List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: seuros X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 6b649b145231cedc29519a322f3dfa9dcc725e03 Auto-Submitted: auto-generated Date: Sun, 01 Nov 2026 18:35:45 +0000 Message-Id: <6ae78681.229c1.691b25ce@gitrepo.freebsd.org> The branch stable/15 has been updated by seuros: URL: https://cgit.FreeBSD.org/src/commit/?id=6b649b145231cedc29519a322f3dfa9dcc725e03 commit 6b649b145231cedc29519a322f3dfa9dcc725e03 Author: Abdelkader Boudih AuthorDate: 2026-07-29 19:24:46 +0000 Commit: Abdelkader Boudih CommitDate: 2026-11-01 17:01:42 +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 (cherry picked from commit 248d537e4ca7295a08bab60e82633d332d36e525) --- 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 b53b85bf44c2..a4d13a8cdeee 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 4cd007db904a..9d57df49681a 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 */