From owner-svn-soc-all@freebsd.org Sat Jul 9 13:51:23 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 1BD32B82F8D for ; Sat, 9 Jul 2016 13:51:23 +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 E9F591A53 for ; Sat, 9 Jul 2016 13:51:22 +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 u69DpMnT067057 for ; Sat, 9 Jul 2016 13:51:22 GMT (envelope-from iateaca@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id u69DpMTx067055 for svn-soc-all@FreeBSD.org; Sat, 9 Jul 2016 13:51:22 GMT (envelope-from iateaca@FreeBSD.org) Date: Sat, 9 Jul 2016 13:51:22 GMT Message-Id: <201607091351.u69DpMTx067055@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: r305903 - 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: Sat, 09 Jul 2016 13:51:23 -0000 Author: iateaca Date: Sat Jul 9 13:51:21 2016 New Revision: 305903 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=305903 Log: implement the RIRB interrupts M bhyve/pci_hda.c 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 Sat Jul 9 12:17:01 2016 (r305902) +++ soc2016/iateaca/bhyve-hda-head/usr.sbin/bhyve/pci_hda.c Sat Jul 9 13:51:21 2016 (r305903) @@ -81,6 +81,7 @@ uint32_t regs[HDA_LAST_OFFSET]; uint8_t lintr; + uint8_t rirb_cnt; uint64_t wall_clock_start; struct hda_codec_cmd_ctl corb; @@ -106,6 +107,8 @@ static struct hda_softc *hda_init(const char *opts); static void hda_update_intr(struct hda_softc *sc); +static void +hda_response_interrupt(struct hda_softc *sc); static int hda_codec_constructor(struct hda_softc *sc, struct hda_codec_class *codec); static struct hda_codec_class * @@ -330,11 +333,16 @@ uint32_t intctl = hda_get_reg_by_offset(sc, HDAC_INTCTL); uint32_t intsts = 0; uint32_t sdsts = 0; + uint32_t rirbsts = 0; uint32_t off = 0; int i; /* TODO update the CIS bits */ + rirbsts = hda_get_reg_by_offset(sc, HDAC_RIRBSTS); + if (rirbsts & (HDAC_RIRBSTS_RINTFL | HDAC_RIRBSTS_RIRBOIS)) + intsts |= HDAC_INTSTS_CIS; + /* update the SIS bits */ for (i = 0; i < HDA_IOSS_NO; i++) { off = hda_get_offset_stream(i); @@ -364,6 +372,20 @@ return; } +static void +hda_response_interrupt(struct hda_softc *sc) +{ + uint8_t rirbctl = hda_get_reg_by_offset(sc, HDAC_RIRBCTL); + + if ((rirbctl & HDAC_RIRBCTL_RINTCTL) && sc->rirb_cnt) { + sc->rirb_cnt = 0; + hda_set_field_by_offset(sc, HDAC_RIRBSTS, HDAC_RIRBSTS_RINTFL, HDAC_RIRBSTS_RINTFL); + hda_update_intr(sc); + } + + return; +} + static int hda_codec_constructor(struct hda_softc *sc, struct hda_codec_class *codec) { @@ -725,6 +747,9 @@ hda_set_reg_by_offset(sc, HDAC_CORBRP, corb->rp); + if (corb->run) + hda_response_interrupt(sc); + return 0; } @@ -956,6 +981,7 @@ struct hda_softc *sc = NULL; struct hda_codec_cmd_ctl *rirb = NULL; uint32_t response_ex = 0; + uint8_t rintcnt = 0; assert(hci); assert(hci->cad <= HDA_CODEC_MAX); @@ -975,8 +1001,14 @@ hda_dma_st_dword(rirb->dma_vaddr + HDA_RIRB_ENTRY_LEN * rirb->wp + 0x04, response_ex); hda_set_reg_by_offset(sc, HDAC_RIRBWP, rirb->wp); + + sc->rirb_cnt++; } + rintcnt = hda_get_reg_by_offset(sc, HDAC_RINTCNT); + if (sc->rirb_cnt == rintcnt) + hda_response_interrupt(sc); + return 0; }