From nobody Mon Mar 07 16:00:05 2022 X-Original-To: dev-commits-src-branches@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 EB04D19F74CB; Mon, 7 Mar 2022 16:00:05 +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 4KC37n6Gtgz4S97; Mon, 7 Mar 2022 16:00:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646668805; 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=QV6jMamN/hT81gG9FjiSZQUdKBpG/dlh3wmzQAmBbK8=; b=WwvIilTIUE6o1N1fnASCoENFTGggaIhQVfm/9XQNz8xzeOOnw8fptOug/tYmLRkcCrCzw8 Jxy1+vEC9Cm7+Crcfqg488fa2eC15s3yjZFdmA0cnjmisxKe1O6TGZ69m4pgOIVsHxz1qf 73BfgFZQec4AkFOMHXqlIt8vNIImwy5EcfobIOUqvLSUVmJRhfoaDsyYbmTjFrFzcCoSAB tv0KMSdQPAF8VHjXH++BzIZ2/REJE6B8fuz6evTFp/3fY6p3hTM1ojhHftP+5nCvC5yTE5 81JMu+uYr3cFJTGHLvTwiRDDuZdC61RqliGfxWaK+CPSrij30P9Sxj3goqpQ+g== 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 B16D531AF; Mon, 7 Mar 2022 16:00:05 +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 227G05Ol066173; Mon, 7 Mar 2022 16:00:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227G05jg066170; Mon, 7 Mar 2022 16:00:05 GMT (envelope-from git) Date: Mon, 7 Mar 2022 16:00:05 GMT Message-Id: <202203071600.227G05jg066170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marcin Wojtas Subject: git: 55e7f40ce3a5 - stable/13 - sdhci: allow setting MMC capabilities before sdhci_init_slot List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mw X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 55e7f40ce3a54e1119ba3c2ef72701cc785ee69b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646668805; 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=QV6jMamN/hT81gG9FjiSZQUdKBpG/dlh3wmzQAmBbK8=; b=N5IjwOmAsfy7xPUcXLI3ZKFN8LAPuIxQQHTvm6nkZb07ed61go0wao+lQI9bkQVep28T5y TaFaw2ShlM3X0udbjbMFL0g/1s7L8fhLQ/Cfe+skLXa+8qFExvcMdqwNr3Uc1KTy+zVZSz EEVNc/seGBUzG+bf1hfMOplzyomFFA1Rrfch1RYzBXtuhNM645VCo2Lw8U70p0rGnkUD5H WB0o/nTeH7fLC1FlH7yEChgnBEOhHyZr7+MuuErUVMhrrkslrNZOIxSz2focY7Az/UBsny C3J7O+6RboYAkwC5guVE2yFzX4jcGrU6/f7A7kTsZwEkELkAc+fwWNFoqhVlNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646668805; a=rsa-sha256; cv=none; b=NYM/e46z0hRcsjC3/bwzepSYCIcWg2U8UFlG8BE7hsbyDeIh2TieEbeqrFfHaSjV5JA9b1 kHyMUyV56LYrd03lqDUpbvb8FeB965+7NvXlgHwDTw8l9sI7awadd5JGiWTo+DHkFLKHxC sm+PWlBNLDpwcXCayvx2zDCLG6fuG8XuXTwgjkXJYUOBz696ed5jrZ72+HdQ9dMJxacYvd m7EsEGfphhYEwJ3dPiZHXpsbuBpf04ds7DqN9Voq3SEsLUmaxrOm6ma0E8XaK2irsuV56G PPF4oGQcqflE9WR8IknesuANrU4PUIqEis7KZVrWt0yE1RHlQlptvQjx8I3tPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mw: URL: https://cgit.FreeBSD.org/src/commit/?id=55e7f40ce3a54e1119ba3c2ef72701cc785ee69b commit 55e7f40ce3a54e1119ba3c2ef72701cc785ee69b Author: Marcin Wojtas AuthorDate: 2021-05-04 22:57:50 +0000 Commit: Marcin Wojtas CommitDate: 2022-03-07 15:59:50 +0000 sdhci: allow setting MMC capabilities before sdhci_init_slot With this change the host controller drivers can set the MMC capabilities (e.g. using mmc_fdt_parse() helper) before calling sdhci_init_slot(). This way the configuration dump (eg. in bootverbose) can include the possible additional information. Reviewed by: manu Obtained from: Semihalf Sponsored by: Marvell Differential Revision: https://reviews.freebsd.org/D30561 MFC after: 2 weeks (cherry picked from commit 5652be30a322f2543bc1e3bcc135abc56b3eb268) --- sys/dev/sdhci/sdhci.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/sdhci/sdhci.c b/sys/dev/sdhci/sdhci.c index 33a34b28b44d..39053229abb1 100644 --- a/sys/dev/sdhci/sdhci.c +++ b/sys/dev/sdhci/sdhci.c @@ -890,7 +890,8 @@ sdhci_init_slot(device_t dev, struct sdhci_slot *slot, int num) "support voltages.\n"); } - host_caps = MMC_CAP_4_BIT_DATA; + host_caps = slot->host.caps; + host_caps |= MMC_CAP_4_BIT_DATA; if (caps & SDHCI_CAN_DO_8BITBUS) host_caps |= MMC_CAP_8_BIT_DATA; if (caps & SDHCI_CAN_DO_HISPD)