From nobody Sat Nov 07 17:46:49 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 4jMNlZ4mw5z708M3 for ; Sat, 07 Nov 2026 17:46:50 +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 4jMNlZ0sPvz4k5j for ; Sat, 07 Nov 2026 17:46:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794073610; 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=N5mhy1yqTfnH1STplHN61Xqg7MDGdNqh2Av+llz+KmA=; b=CjH0SrPYvGYxpSxjq0UD4NIjuLrNR1deQ1Zxuvv5Ru+IxESTJDY7IOAx9LgOJvroE84+fc PdhDHT0zeM/iB3dXBO7PIfrI/sa6E9fxw68n/TU/dI8e4AFKQVmgSXMn6Yw+ttPtlKT20r gGnvvkdORDtftUypKHn8Bu7jamhM3JkxHIQLPa6zwpv6LDSRo+pXw2h/z4CZQ+LVKW4LpQ 8TuBPfOm3Bdzd1/nwf/f2uHflOiUA4nE9kNpPpZwD3TzhvFtxwyTBqKxDojLIHy3BY7BiJ X52tJItJK2oi7yqmqDSS2ibUhRAw+BZjd8zz/pYcKo76ohiZy/ZWqEo6JpjXUw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794073610; b=gx8SqCrtU9MLdciu5gW8MmBx6oi6wZOWA8NOV9GgY2MsEMcZ3Xc2SeCugz9AJV0sx8p7yr 62jDRms4UdWKm0NfSo8PgDH7T0hZXpz8o3a+MOzxBPujpmpCRdf2uwlu7xG2h6d3slkeTa erQLYmRrvGrsw2P4oY+qzpvJQuY/2VLlUW9frF3DPKZK/ZCxNgg+Eg8/m+N3vvNGeohfa4 OgAcRF/spvNr6YTglHU4RzXmLRTtA+ZFQ9Z7kP+0jxh8l1GjuQS94JN9w+zQ8Vmtptqv39 IH2b+Par0io80SSCV0sd4wqTdPzDW6luMsos3o3cQSomuk9fYqxZEeZ/Bx1AJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794073610; 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=N5mhy1yqTfnH1STplHN61Xqg7MDGdNqh2Av+llz+KmA=; b=TKfS1RbDSVvbHkOax6fNx9aMjjMtvzJ60dgxV81l6xt8/+PDbEDUBbmstBayON95R+Sqzh 4AXr8qwvkF1PpUA45rlk08yU+zH7rREzjzulnO7xq/aJXyHl3c6WVxX5UW2ydJQS/gmnp9 MhEGnDTaZ9uOl3JCPqXTqGIVibu23CNE0ImcV9nXVFrBNpCAuywzOu6GkSfJgmtLxW8PnU uVc4DRU3oljHL46Eu2pqa6Tx06h9WnL7kn95B4lS6IqWS2XIuclBr0pd4eHwkmRALUrJic 66+hZYn9wLAcbJt21QbfoC2YuRNp+x5fp+v7jY8QM8sSp4M9odO386pzQlUlAw== 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 4jMNlY6n2GzW5X for ; Sat, 07 Nov 2026 17:46:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bea6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 07 Nov 2026 17:46:49 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: 94df98ceb368 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 94df98ceb3689d0cbf064edb5cddb000cf35235a Auto-Submitted: auto-generated Date: Sat, 07 Nov 2026 17:46:49 +0000 Message-Id: <6aef6409.1bea6.411226bc@gitrepo.freebsd.org> The branch stable/15 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=94df98ceb3689d0cbf064edb5cddb000cf35235a commit 94df98ceb3689d0cbf064edb5cddb000cf35235a Author: Ahmad Khalifa AuthorDate: 2026-11-04 15:37:54 +0000 Commit: Ahmad Khalifa CommitDate: 2026-11-07 14:04:36 +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 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++; }