From nobody Wed Aug 10 20:07:34 2022 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 4M31FL502dz4Y6Hd; Wed, 10 Aug 2022 20:07:34 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M31FL4S4bz3qTt; Wed, 10 Aug 2022 20:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660162054; 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=GaUa+1Z6GUya/l/N5sitVk+/PaEsFAP+Q38u6p9FAV0=; b=Mgzdayd+ou8s90EVCYRgRYb+NYNHcopgy7iJ5Sx4/Y8lNWtf/mxxy4Ezuc2TGSIV0anNCY yWIsoeNnOnWAVInyrgKXYyaPtVwL6qSh3ge7OcVh+lqeCbnkzW/Yy12f8i2gn1prXH9RPO ua21HPL3ZytHUHWwDGnPjwBZe1+MiGKAyEPPwRmd1KF2tzzTRd9/qyBrx4/JN9w3cbN5xP 5CWTrfcmCvAzsdFG6ZZILEDjt8MK7jHw6fVs/DIxaZmp7uocfewfZ2LcVb01MGPExbHwKG nS1ya7VOnI4pLc/l+AiSF9VwwVFA5M6ehafiIV8x9UirXPP7rSj+Z/H7TvbHcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4M31FL3YzXzPY4; Wed, 10 Aug 2022 20:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27AK7YkU001080; Wed, 10 Aug 2022 20:07:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27AK7YFt001079; Wed, 10 Aug 2022 20:07:34 GMT (envelope-from git) Date: Wed, 10 Aug 2022 20:07:34 GMT Message-Id: <202208102007.27AK7YFt001079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 49da0242e798 - main - sdio: Do not allow setting a block size if function doesn't support it 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49da0242e798ade8a578036929bff493a2d6ef75 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660162054; 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=GaUa+1Z6GUya/l/N5sitVk+/PaEsFAP+Q38u6p9FAV0=; b=awJL+g2O3Oz/q17y3khK/X3lOeqsMZs81pZPX7SBPtbd+PkxNUpZUEtBc5Eay1zU/SG4jk 99+zLGg2njmgFAMm9EMzHMWTw3ho8xc5/D0zH7j9D/7pY7BCejl7wRbHetFDyel/nBoQ8V CLn9wO/tJILOVsK/XMe01hKbh0+czEk0/7QJhILgQrLXTQ3M1YOEBbIFZsre4MW1zgutSz wZaH8oiJx98jdWvSiINKeGQiOryMO9+bHXl5v1VZ74INFS+Zmh/JTh+CdP10OGhpBayK4+ KHkzR4+mjMVVmpLb0TWMZR4I26uIcuWWYN57ad2pfXCD6i74FLtQjqWBujs6ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660162054; a=rsa-sha256; cv=none; b=Ge4X9l+rotC7mezeyZnJz7xzi89XXvP+U/NQpSaaD+Hs2Qbx2JVaF389h46KrWHCeBeOt4 bVFFHU6leEZGEAgsyED9/d2xTKA9AYhykMXZod1bxLOmGEiPjtwZUeJUff+FJNGGIqNTig V25NMxL3flmi3gLGmXhhklZBVNBDJ85Loc+aGhfXbZG12CjkCt+P/bdB6FiMcDepgZvbMb 2cAwEgyU6b/ZT46STriiHhoVGu2oYwgf2E/C78k36mup3Yl3Oy1DtS9HMzSh9Pr35Oe8dW cWRL4izZp99VW9IuozfSCWtnNa/7VshVhrKFB9XOGX/kFp353mzoJ2BoHpBjzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=49da0242e798ade8a578036929bff493a2d6ef75 commit 49da0242e798ade8a578036929bff493a2d6ef75 Author: Emmanuel Vadot AuthorDate: 2021-05-26 11:15:58 +0000 Commit: Emmanuel Vadot CommitDate: 2022-08-10 20:07:24 +0000 sdio: Do not allow setting a block size if function doesn't support it --- sys/dev/sdio/sdio_subr.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/dev/sdio/sdio_subr.c b/sys/dev/sdio/sdio_subr.c index 0885b16550a6..50b741ff2a27 100644 --- a/sys/dev/sdio/sdio_subr.c +++ b/sys/dev/sdio/sdio_subr.c @@ -121,6 +121,9 @@ sdio_set_block_size(struct sdio_func *f, uint16_t bs) uint32_t addr; uint16_t v; + if (bs > f->max_blksize) + return (EOPNOTSUPP); + if (!sdio_get_support_multiblk(f->dev)) return (EOPNOTSUPP);