From nobody Wed Nov 04 16:19:15 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 4jKVy12fR9z6y8lR for ; Wed, 04 Nov 2026 16:19:21 +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 4jKVy10Jcyz4jjf for ; Wed, 04 Nov 2026 16:19:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793809161; 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=twYHxmYDmjWu7z30Yx+7lDf0D8C4Qu4HL+fCiax7rjg=; b=KTukkQfglaZECt3I/pDnUWBvhmgPjiFbMZ+mse1nLUV2yLXdgmEQGK+IyL+wsHYDw15xug Erf2O9+3u2tQ8tsVDoDrBy2FeovGvHKcMHKs5wTkwGWiJ/L+doombNi9AlhF5QnwJJFJ3z amp60jUWmP2hbWuDNrF8o6GEbF6a+iEAlE5HFxnKUPuDXYaUcCt128rjewBNgyI1/237xS A4AzrIaDqaBLuJp6Cd2Fan2zBhRctbccseWFxTWPFhj9owBleBIEdsUTK8gm/RefxtU1O8 csleIZJEfJ+PEc2MchjAJcbOaa8ZhM8jPoUu2qun9SDrcpBl+5fu4sHH+yKjVQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793809161; b=JXiMmhMlvdHPzNyT2t4TSsvSYBQYVFqNywZU22+GOfrz4BzZxi1bIKyrHm2vdKEaWeKmia iviS7RB6zHEHU3zM73Qu+l3e09yJ2FGpNo+G/YanXF6ItNADns/WOU78QBkrq/w19neAeE 7awuOF68GIlRrLbKqCHZojyS+gwn+jeI2zfCOYaw6pcyxpRY8AqSK28FTJg2std7Mpm0AO gXcj07IJJX/DdOwxncs3LTlQBA0J0Sg3qW8cD8whltaUwqAKGCPFGwdXfRqWV41igWrHcb d85F2+oWPNIXTHQ+gdZTn6tXMS4WjxH1Ue9T5GYdrJxaIDtvU5NyFuRuw01Umg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793809161; 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=twYHxmYDmjWu7z30Yx+7lDf0D8C4Qu4HL+fCiax7rjg=; b=Sllsj2wUUDEKBXrAPoFTnQUnk2ErH9NEjU854eHcjwnJEi6dAMyDfAQ0qJTix9v5g108Dt N9TVoNvJ2Yj9MymQP/mZik9T9BYOpzoFX6iUIT8ZA0yAv6LR+lJr6x4zNZyd872bgy2kL5 22EqoFNxSsT+FLFYm1VJtjjVLvT0a51P27+oZeQXMzEy6ya5PmA/pl2jnMChMTyGGPDJps DLDfZ6QW0cJ/vl+aQJ2DqofZMH6H/FNm/4CMoaR6bePkmUYwW0u0kxsz8gNpKJ77zy/58k iR272wdv9ghGdMgE5rspJPsVElSafFlwzrKdBUkZveZ+fiKpp8wiK14AjSi/bQ== 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 4jKVy074Pmz18tK for ; Wed, 04 Nov 2026 16:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1db9f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 04 Nov 2026 16:19:15 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ahmad Khalifa Subject: git: c91dfb47e0bc - main - 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/main X-Git-Reftype: branch X-Git-Commit: c91dfb47e0bcdf682f7f152624e03747787c6ea3 Auto-Submitted: auto-generated Date: Wed, 04 Nov 2026 16:19:15 +0000 Message-Id: <6aeb5b03.1db9f.58083c4c@gitrepo.freebsd.org> The branch main has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=c91dfb47e0bcdf682f7f152624e03747787c6ea3 commit c91dfb47e0bcdf682f7f152624e03747787c6ea3 Author: Ahmad Khalifa AuthorDate: 2026-11-04 15:37:54 +0000 Commit: Ahmad Khalifa CommitDate: 2026-11-04 15:38:49 +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 --- 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 cb2cc0da6b77..a73de209146e 100644 --- a/sys/dev/sdio/sdiob.c +++ b/sys/dev/sdio/sdiob.c @@ -890,8 +890,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++; }