From owner-svn-src-all@freebsd.org Mon Jul 30 20:00:57 2018 Return-Path: Delivered-To: svn-src-all@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 05BA5105F9D9; Mon, 30 Jul 2018 20:00:57 +0000 (UTC) (envelope-from jhibbits@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 ABF4E81FC3; Mon, 30 Jul 2018 20:00:56 +0000 (UTC) (envelope-from jhibbits@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 8CF7D1201; Mon, 30 Jul 2018 20:00:56 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6UK0uIk049965; Mon, 30 Jul 2018 20:00:56 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6UK0usQ049964; Mon, 30 Jul 2018 20:00:56 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201807302000.w6UK0usQ049964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Mon, 30 Jul 2018 20:00:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336931 - head/sys/dev/sound/pci/hda X-SVN-Group: head X-SVN-Commit-Author: jhibbits X-SVN-Commit-Paths: head/sys/dev/sound/pci/hda X-SVN-Commit-Revision: 336931 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jul 2018 20:00:57 -0000 Author: jhibbits Date: Mon Jul 30 20:00:56 2018 New Revision: 336931 URL: https://svnweb.freebsd.org/changeset/base/336931 Log: snd_hda: Make codec control path endian safe The CORB and RIRB buffers exist in DMA memory, but the device reads them as little-endian only. Read and write as LE into the DMA memory block, to work on BE platforms. Modified: head/sys/dev/sound/pci/hda/hdac.c Modified: head/sys/dev/sound/pci/hda/hdac.c ============================================================================== --- head/sys/dev/sound/pci/hda/hdac.c Mon Jul 30 19:44:14 2018 (r336930) +++ head/sys/dev/sound/pci/hda/hdac.c Mon Jul 30 20:00:56 2018 (r336931) @@ -41,6 +41,7 @@ #include #include +#include #include #include @@ -900,7 +901,7 @@ hdac_rirb_flush(struct hdac_softc *sc) { struct hdac_rirb *rirb_base, *rirb; nid_t cad; - uint32_t resp; + uint32_t resp, resp_ex; uint8_t rirbwp; int ret; @@ -916,9 +917,10 @@ hdac_rirb_flush(struct hdac_softc *sc) sc->rirb_rp++; sc->rirb_rp %= sc->rirb_size; rirb = &rirb_base[sc->rirb_rp]; - cad = HDAC_RIRB_RESPONSE_EX_SDATA_IN(rirb->response_ex); - resp = rirb->response; - if (rirb->response_ex & HDAC_RIRB_RESPONSE_EX_UNSOLICITED) { + resp = le32toh(rirb->response); + resp_ex = le32toh(rirb->response_ex); + cad = HDAC_RIRB_RESPONSE_EX_SDATA_IN(resp_ex); + if (resp_ex & HDAC_RIRB_RESPONSE_EX_UNSOLICITED) { sc->unsolq[sc->unsolq_wp++] = resp; sc->unsolq_wp %= HDAC_UNSOLQ_MAX; sc->unsolq[sc->unsolq_wp++] = cad; @@ -985,7 +987,7 @@ hdac_send_command(struct hdac_softc *sc, nid_t cad, ui bus_dmamap_sync(sc->corb_dma.dma_tag, sc->corb_dma.dma_map, BUS_DMASYNC_PREWRITE); #endif - corb[sc->corb_wp] = verb; + corb[sc->corb_wp] = htole32(verb); #if 0 bus_dmamap_sync(sc->corb_dma.dma_tag, sc->corb_dma.dma_map, BUS_DMASYNC_POSTWRITE);