From nobody Sat Nov 07 17:46:48 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 4jMNlf36p3z708HD for ; Sat, 07 Nov 2026 17:46:54 +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 4jMNlf1YjQz4kQ2 for ; Sat, 07 Nov 2026 17:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794073614; 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=ZSfOjiF2iF+gPMt4cbShIZKd/kyJSYHLVZhN/oNgFc4=; b=f7M+CG+gvXhQJ8eAjiDFO1/SpQ3TMw+vnLAmUFO4iq0icehDQtVZ27/GORFt14Dfa2Hwb6 hTEcTy9hXCi84tjdMPwNySV+akoFQgxI7maIADgOSaMpOCwlZRjQVPkt/DFDpBIOgN0/H9 rbpwB2Fq7eObBTfKrXP+we2lAz+lw5EItUssk2Sy15ETj0C213Fmt/KanZ/W3kFD0TSUTo ty//0iGr5X8mJF3OkF3iPuLmQKsrpaXFsTYpAJRdATIMVhEpA+8rG2WmP2Bj7SHNu33ZwN TKdrU+TLMsFBAal1xOvkV2w7KXtqZFmrub4ejO2XMKD7vKLDpV4tTfaUDsW32A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794073614; b=ajUKkqXRcAz/bS9e8j9Bl+ftYZhPZwQ5etqnmAGGmIzlwFmegW5PmSTAM3MTBJdOH6knzG n/ugBNtsuJbtgqzvSDbZiANeBozeN+G6QZDHgvSODz26eyVk9RcZWiNtaudCQAO9rFhcEw Vff2mPV7kTM9h119UPpWJMjA2mgUt+JloPgP54qKFXuagmFMkMTM2B2n9uTgVFYm7cHo4S 04J0MKiqbGvulWwWwKP27lgQcmL49ryTvIf7Ozcjw/vHVAs/3c5928QhsckBn+oNLjaBG0 jDeBXF5PU5e3AHWtnzhiGcXjiyPw7Q6MxzbR5S/p/1EVqh3l/JajO1mpPXjDug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794073614; 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=ZSfOjiF2iF+gPMt4cbShIZKd/kyJSYHLVZhN/oNgFc4=; b=fuNtMShv8zXFAQ6ucy5oND8MwI8GAKWemolvIrdjZsgQVv3PlE4xj2HPCezSOj2w4LkWEA y9fHcVpZR4GD+SawJoVAd6w3+zK9nyfE5sxeQjKK0OI4zUbE7F96u8jHu39uzay84OxJ3x hfUhqMq2oTffh09uLuTQpU+ETol/mApasQrGJOtPhU+ko8er54BREkPd03A3xQjh8k7HDP kXCXyYHZW/a+QpCw1WeZYATvr1U9kNPbnFza5nTrI55SBtoI+LIbntNtyfSOTPQh0reVGe 3lvFX8hmIBR9dkPvUXudRfOJLSy+PWSMsSwHtWl/nqJTX2Zj7wP+pA46cndT1Q== 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 4jMNlf0wdfzXKq for ; Sat, 07 Nov 2026 17:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bcda by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Nov 2026 17:46:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: 8679d115a00f - stable/14 - sdiob: copy vendor/device IDs from card common CIS 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: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8679d115a00f361be298a4ce78f5ab87b201650d Auto-Submitted: auto-generated Date: Sat, 07 Nov 2026 17:46:48 +0000 Message-Id: <6aef6408.1bcda.3e307935@gitrepo.freebsd.org> The branch stable/14 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=8679d115a00f361be298a4ce78f5ab87b201650d commit 8679d115a00f361be298a4ce78f5ab87b201650d Author: Ahmad Khalifa AuthorDate: 2026-11-04 15:37:54 +0000 Commit: Ahmad Khalifa CommitDate: 2026-11-07 14:08:23 +0000 sdiob: copy vendor/device IDs from card common CIS Copy both the vendor and device IDs from the card common CIS if they are absent in a function. These are optional according to the spec. [1] [1] Part E1 SDIO Simplified Specification ยง16.6 MFC after: 3 days Reviewed by: kibab, imp, adrian Differential Revision: https://reviews.freebsd.org/D60988 (cherry picked from commit c91dfb47e0bcdf682f7f152624e03747787c6ea3) --- sys/dev/sdio/sdiob.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sys/dev/sdio/sdiob.c b/sys/dev/sdio/sdiob.c index e60e8759599f..5566ccc896ab 100644 --- a/sys/dev/sdio/sdiob.c +++ b/sys/dev/sdio/sdiob.c @@ -893,8 +893,15 @@ sdiob_get_card_info(struct sdiob_softc *sc) sc->cardinfo.f[fn].vendor, sc->cardinfo.f[fn].device, sc->cardinfo.f[fn].max_blksize); if (sc->cardinfo.f[fn].vendor == 0) { - DPRINTF("%s: F%d doesn't exist\n", __func__, fn); - break; + /* + * If a function doesn't provide a vendor/device ID, + * copy it from the card common CIS. + */ + DPRINTF("%s: F%d: " + "Copying vendor and device IDs from F0\n", + __func__, fn); + sc->cardinfo.f[fn].vendor = sc->cardinfo.f[0].vendor; + sc->cardinfo.f[fn].device = sc->cardinfo.f[0].device; } sc->cardinfo.num_funcs++; }