From owner-svn-src-head@freebsd.org Sun Jul 9 20:49:03 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BEED6D94E94; Sun, 9 Jul 2017 20:49:03 +0000 (UTC) (envelope-from imp@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 mx1.freebsd.org (Postfix) with ESMTPS id 8CCDA6F62C; Sun, 9 Jul 2017 20:49:03 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v69Kn2oI090135; Sun, 9 Jul 2017 20:49:02 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v69Kn2ve090134; Sun, 9 Jul 2017 20:49:02 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201707092049.v69Kn2ve090134@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 9 Jul 2017 20:49:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r320850 - head/sys/dev/sdhci X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/sdhci X-SVN-Commit-Revision: 320850 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.23 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: Sun, 09 Jul 2017 20:49:03 -0000 Author: imp Date: Sun Jul 9 20:49:02 2017 New Revision: 320850 URL: https://svnweb.freebsd.org/changeset/base/320850 Log: Back out enabling the card interrupt detection bit. It is not ready to commit. Noticed by: marius@ Modified: head/sys/dev/sdhci/sdhci.c Modified: head/sys/dev/sdhci/sdhci.c ============================================================================== --- head/sys/dev/sdhci/sdhci.c Sun Jul 9 20:42:11 2017 (r320849) +++ head/sys/dev/sdhci/sdhci.c Sun Jul 9 20:49:02 2017 (r320850) @@ -268,7 +268,7 @@ sdhci_init(struct sdhci_slot *slot) SDHCI_INT_END_BIT | SDHCI_INT_CRC | SDHCI_INT_TIMEOUT | SDHCI_INT_DATA_AVAIL | SDHCI_INT_SPACE_AVAIL | SDHCI_INT_DMA_END | SDHCI_INT_DATA_END | SDHCI_INT_RESPONSE | - SDHCI_INT_ACMD12ERR | SDHCI_INT_CARD_INT; + SDHCI_INT_ACMD12ERR; if (!(slot->quirks & SDHCI_QUIRK_POLL_CARD_PRESENT) && !(slot->opt & SDHCI_NON_REMOVABLE)) { @@ -1826,10 +1826,7 @@ sdhci_generic_intr(struct sdhci_slot *slot) "Card is consuming too much power!\n"); intmask &= ~SDHCI_INT_BUS_POWER; } - /* Handle card interrupt. */ - if (intmask & SDHCI_INT_CARD_INT) { - - } + /* The rest is unknown. */ if (intmask) { WR4(slot, SDHCI_INT_STATUS, intmask);