From owner-svn-soc-all@freebsd.org Sun May 15 14:23:52 2016 Return-Path: Delivered-To: svn-soc-all@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 B8138B3BFEB for ; Sun, 15 May 2016 14:23:52 +0000 (UTC) (envelope-from iateaca@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (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 9B84A1EE8 for ; Sun, 15 May 2016 14:23:52 +0000 (UTC) (envelope-from iateaca@FreeBSD.org) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id u4FENqMp030343 for ; Sun, 15 May 2016 14:23:52 GMT (envelope-from iateaca@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u4FENqFU030339 for svn-soc-all@FreeBSD.org; Sun, 15 May 2016 14:23:52 GMT (envelope-from iateaca@FreeBSD.org) Date: Sun, 15 May 2016 14:23:52 GMT Message-Id: <201605151423.u4FENqFU030339@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to iateaca@FreeBSD.org using -f From: iateaca@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r303017 - soc2016/iateaca/bhyve-hda-head/usr.sbin/bhyve MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 May 2016 14:23:52 -0000 Author: iateaca Date: Sun May 15 14:23:51 2016 New Revision: 303017 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=303017 Log: reset the HDA controller registers when the GCTL_RESET is cleared Modified: soc2016/iateaca/bhyve-hda-head/usr.sbin/bhyve/pci_hda.c Modified: soc2016/iateaca/bhyve-hda-head/usr.sbin/bhyve/pci_hda.c ============================================================================== --- soc2016/iateaca/bhyve-hda-head/usr.sbin/bhyve/pci_hda.c Sun May 15 13:20:59 2016 (r303016) +++ soc2016/iateaca/bhyve-hda-head/usr.sbin/bhyve/pci_hda.c Sun May 15 14:23:51 2016 (r303017) @@ -174,11 +174,17 @@ static void hda_reset_regs(struct hda_softc *sc) { + DPRINTF("Reset the HDA controller registers ...\n"); + memset(sc->regs, 0, sizeof(sc->regs)); - hda_set_reg_by_offset(sc, HDAC_GCAP, 0x4401); - hda_set_reg_by_offset(sc, HDAC_CORBSIZE, 0x42); - hda_set_reg_by_offset(sc, HDAC_RIRBSIZE, 0x42); + hda_set_reg_by_offset(sc, HDAC_GCAP, + HDAC_GCAP_64OK | + (HDA_ISS_NO << HDAC_GCAP_ISS_SHIFT) | + (HDA_OSS_NO << HDAC_GCAP_OSS_SHIFT)); + + hda_set_reg_by_offset(sc, HDAC_CORBSIZE, HDAC_CORBSIZE_CORBSZCAP_256 | HDAC_CORBSIZE_CORBSIZE_256); + hda_set_reg_by_offset(sc, HDAC_RIRBSIZE, HDAC_RIRBSIZE_RIRBSZCAP_256 | HDAC_RIRBSIZE_RIRBSIZE_256); return; } @@ -212,6 +218,12 @@ static void hda_set_gctl(struct hda_softc *sc, uint32_t offset, uint32_t old) { + uint32_t value = sc->regs[offset]; + + if (!(value & HDAC_GCTL_CRST)) { + hda_reset_regs(sc); + } + return; }