From nobody Fri Jan 9 20:17: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 4dntNj3yPMz6B9hj for ; Fri, 09 Jan 2026 20:17:25 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dntNj0dqlz3KP2 for ; Fri, 09 Jan 2026 20:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767989845; 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=5fgI6ojbWhCFoW0nEwsgrSffJNeKjd4Jd0lEWBC8x1M=; b=ZZ2escdodJZm7N7ROw3gv2oUIkBcSPnaePzOa1a1jjQ2jF7/8OU/hbmEN1F2sZ70RE8QlL WTP9TE7z2v53jMZ8tPx6W5Ihxi7j/iSwmAah1jonymPqJPUtHW5qJp/IrAH6VhP3n05HXy gUAENNNWXl88ahlT/Uj2w6BqCGvfkQi1b8BPqnZWePWm1rkZKjfmfVpN6jiN6UsMytTcSO 0dN+c1vDBeqxruY9o6KB5xmrGquhUb1ijt1yCW72/57AvTrgfsleEZiYT4MdLfNdnbYt8p BDiirBvFlnKof9+fMW/mcB0Ub0OXjmhNHoB3OS6baL55BH822IVh1DVWYQZPsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767989845; 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=5fgI6ojbWhCFoW0nEwsgrSffJNeKjd4Jd0lEWBC8x1M=; b=XNnLyJXEP+6ZiXUgYBCnVrHORH9j51dT8gDTAfW3H85zeUAB4eXn1giCO/hHBdmXwoWZM9 k9dlxFLMf/HpiMmOP02KCIVEvHLVukvN41yvtyqC1qSq9sQR5WdwSA6N2TYlM7hoOnZv2f kHJ7WoFaWgMgFjYGGR1QMYNlFnMM5csqc8dsEeOHmBDOvNFO9V9kjt3g8vr0xdBKgADnzH IIL8DlpaFMAXcBJ35+r39iDOJRHsgqta6GAYitP/+8Itp0CE1cRk/SM1CZ9xAvdD1f2QQH XfSpjm3sGXRXWzgR92XRiLWo55g4uGhrAhfzs3/dDYDy2J6KzRyeox86Km23NQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767989845; a=rsa-sha256; cv=none; b=wnlI4YATZ4yfE6cj3Hg/HJORmq6yEjq5Qxa3+w85aMnmOONiDHDM28Nz6hNen86ROFgmsW ptupoaVHpyErsVPR/+f6maKVATTrXw9GwtpJyAv7YQl57nobrgCzejEXtgINERsLtjTrYZ UVHqEPN+wiOsDAMXkBoE89T6VA73Ls/PcfYf18fHTA25ypTWPXcTr/Lu5xWt8ZfMzYG48F NOo+qSby+Hryf7eVp8qjNpmJ9th2VLEnHzD5VgjWdybZ84gkjNZCQ4TdEM6W9df2ICr42i unK/ILz5a6HCTuUrHOWZ/WU+aGdSlLUzw39VaJwiAH+xe0brQAamOItN7bf0LQ== 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 4dntNj0B3Wz7bG for ; Fri, 09 Jan 2026 20:17:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 801d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 20:17:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Minsoo Choo From: Warner Losh Subject: git: 2727bdebb366 - main - sdio: add sdio_{read,write}_2 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2727bdebb366c3741509eb3553f0fee2453729d3 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 20:17:24 +0000 Message-Id: <69616254.801d.784d49f6@gitrepo.freebsd.org> The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2727bdebb366c3741509eb3553f0fee2453729d3 commit 2727bdebb366c3741509eb3553f0fee2453729d3 Author: Minsoo Choo AuthorDate: 2026-01-06 16:57:25 +0000 Commit: Warner Losh CommitDate: 2026-01-09 20:17:12 +0000 sdio: add sdio_{read,write}_2 This is equivalent of sdio_readw and sdio_writew in linuxkpi Signed-off-by: Minsoo Choo Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1951 --- sys/dev/sdio/sdio_subr.c | 30 ++++++++++++++++++++++++++++++ sys/dev/sdio/sdio_subr.h | 2 ++ 2 files changed, 32 insertions(+) diff --git a/sys/dev/sdio/sdio_subr.c b/sys/dev/sdio/sdio_subr.c index f234eb8bdc84..64b1145e2057 100644 --- a/sys/dev/sdio/sdio_subr.c +++ b/sys/dev/sdio/sdio_subr.c @@ -166,6 +166,36 @@ sdio_write_1(struct sdio_func *f, uint32_t addr, uint8_t val, int *err) *err = error; } +uint16_t +sdio_read_2(struct sdio_func *f, uint32_t addr, int *err) +{ + int error; + uint16_t v; + + error = SDIO_READ_EXTENDED(device_get_parent(f->dev), f->fn, addr, + sizeof(v), (uint8_t *)&v, true); + if (error) { + if (err != NULL) + *err = error; + return (0xffff); + } else { + if (err != NULL) + *err = 0; + return (le16toh(v)); + } +} + +void +sdio_write_2(struct sdio_func *f, uint32_t addr, uint16_t val, int *err) +{ + int error; + + error = SDIO_WRITE_EXTENDED(device_get_parent(f->dev), f->fn, addr, + sizeof(val), (uint8_t *)&val, true); + if (err != NULL) + *err = error; +} + uint32_t sdio_read_4(struct sdio_func *f, uint32_t addr, int *err) { diff --git a/sys/dev/sdio/sdio_subr.h b/sys/dev/sdio/sdio_subr.h index 2d2ae9b01230..96df2e7d658a 100644 --- a/sys/dev/sdio/sdio_subr.h +++ b/sys/dev/sdio/sdio_subr.h @@ -95,6 +95,8 @@ int sdio_set_block_size(struct sdio_func *, uint16_t); uint8_t sdio_read_1(struct sdio_func *, uint32_t, int *); void sdio_write_1(struct sdio_func *, uint32_t, uint8_t, int *); +uint16_t sdio_read_2(struct sdio_func *, uint32_t, int *); +void sdio_write_2(struct sdio_func *, uint32_t, uint16_t, int *); uint32_t sdio_read_4(struct sdio_func *, uint32_t, int *); void sdio_write_4(struct sdio_func *, uint32_t, uint32_t, int *);