From owner-svn-src-head@freebsd.org Thu Aug 23 18:33:43 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 428601094913; Thu, 23 Aug 2018 18:33:43 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DA635811E8; Thu, 23 Aug 2018 18:33:42 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5F8525E85; Thu, 23 Aug 2018 18:33:42 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7NIXg2J082057; Thu, 23 Aug 2018 18:33:42 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7NIXgS5082056; Thu, 23 Aug 2018 18:33:42 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201808231833.w7NIXgS5082056@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Thu, 23 Aug 2018 18:33:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r338271 - head/sys/arm/allwinner X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/arm/allwinner X-SVN-Commit-Revision: 338271 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Aug 2018 18:33:43 -0000 Author: manu Date: Thu Aug 23 18:33:42 2018 New Revision: 338271 URL: https://svnweb.freebsd.org/changeset/base/338271 Log: aw_mmc: Handle MMCBR_IVAR_RETUNE_REQ Without this the mmc stack sometimes think that we are in in a retune operation and some command like switch the bus width to 4 bits failed. We now switch correctly to 4 bits mode for sd card. Reported by: jmg, others in pine64 irc channel Modified: head/sys/arm/allwinner/aw_mmc.c Modified: head/sys/arm/allwinner/aw_mmc.c ============================================================================== --- head/sys/arm/allwinner/aw_mmc.c Thu Aug 23 18:19:33 2018 (r338270) +++ head/sys/arm/allwinner/aw_mmc.c Thu Aug 23 18:33:42 2018 (r338271) @@ -1198,6 +1198,9 @@ aw_mmc_read_ivar(device_t bus, device_t child, int whi *(int *)result = (sc->aw_mmc_conf->dma_xferlen * AW_MMC_DMA_SEGS) / MMC_SECTOR_SIZE; break; + case MMCBR_IVAR_RETUNE_REQ: + *(int *)result = retune_req_none; + break; } return (0);