From owner-svn-src-head@freebsd.org Wed Sep 23 00:06:48 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EB1243E57DF; Wed, 23 Sep 2020 00:06:48 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bwz4S5j20z3fT5; Wed, 23 Sep 2020 00:06:48 +0000 (UTC) (envelope-from bdragon@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 A550727B1F; Wed, 23 Sep 2020 00:06:48 +0000 (UTC) (envelope-from bdragon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08N06mxh016263; Wed, 23 Sep 2020 00:06:48 GMT (envelope-from bdragon@FreeBSD.org) Received: (from bdragon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08N06mFx016261; Wed, 23 Sep 2020 00:06:48 GMT (envelope-from bdragon@FreeBSD.org) Message-Id: <202009230006.08N06mFx016261@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdragon set sender to bdragon@FreeBSD.org using -f From: Brandon Bergren Date: Wed, 23 Sep 2020 00:06:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366036 - in head/sys/powerpc: powernv pseries X-SVN-Group: head X-SVN-Commit-Author: bdragon X-SVN-Commit-Paths: in head/sys/powerpc: powernv pseries X-SVN-Commit-Revision: 366036 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.33 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: Wed, 23 Sep 2020 00:06:49 -0000 Author: bdragon Date: Wed Sep 23 00:06:48 2020 New Revision: 366036 URL: https://svnweb.freebsd.org/changeset/base/366036 Log: [PowerPC64LE] Fix endianness issues in phyp and opal consoles. This applies to both pseries and powernv, which were tested at different points during the patchset development. Sponsored by: Tag1 Consulting, Inc. Modified: head/sys/powerpc/powernv/opal_console.c head/sys/powerpc/pseries/phyp_console.c Modified: head/sys/powerpc/powernv/opal_console.c ============================================================================== --- head/sys/powerpc/powernv/opal_console.c Wed Sep 23 00:03:35 2020 (r366035) +++ head/sys/powerpc/powernv/opal_console.c Wed Sep 23 00:06:48 2020 (r366036) @@ -25,6 +25,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include @@ -323,7 +324,7 @@ uart_opal_get(struct uart_opal_softc *sc, void *buffer int hdr = 0; if (sc->protocol == OPAL_RAW) { - uint64_t len = bufsize; + uint64_t len = htobe64(bufsize); uint64_t olen = (uint64_t)&len; uint64_t obuf = (uint64_t)buffer; @@ -336,7 +337,7 @@ uart_opal_get(struct uart_opal_softc *sc, void *buffer if (err != OPAL_SUCCESS) return (-1); - bufsize = len; + bufsize = be64toh(len); } else { uart_lock(&sc->sc_mtx); if (sc->inbuflen == 0) { @@ -347,6 +348,7 @@ uart_opal_get(struct uart_opal_softc *sc, void *buffer return (-1); } hdr = 1; + sc->inbuflen = be64toh(sc->inbuflen); } if (sc->inbuflen == 0) { @@ -391,7 +393,9 @@ uart_opal_put(struct uart_opal_softc *sc, void *buffer len = bufsize; uart_opal_real_map_outbuffer(&obuf, &olen); + *(uint64_t*)olen = htobe64(*(uint64_t*)olen); err = opal_call(OPAL_CONSOLE_WRITE, sc->vtermid, olen, obuf); + *(uint64_t*)olen = be64toh(*(uint64_t*)olen); uart_opal_real_unmap_outbuffer(&len); } else { uart_lock(&sc->sc_mtx); @@ -406,7 +410,9 @@ uart_opal_put(struct uart_opal_softc *sc, void *buffer len = 4 + bufsize; uart_opal_real_map_outbuffer(&obuf, &olen); + *(uint64_t*)olen = htobe64(*(uint64_t*)olen); err = opal_call(OPAL_CONSOLE_WRITE, sc->vtermid, olen, obuf); + *(uint64_t*)olen = be64toh(*(uint64_t*)olen); uart_opal_real_unmap_outbuffer(&len); uart_unlock(&sc->sc_mtx); Modified: head/sys/powerpc/pseries/phyp_console.c ============================================================================== --- head/sys/powerpc/pseries/phyp_console.c Wed Sep 23 00:03:35 2020 (r366035) +++ head/sys/powerpc/pseries/phyp_console.c Wed Sep 23 00:06:48 2020 (r366036) @@ -27,6 +27,7 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include @@ -306,6 +307,11 @@ uart_phyp_get(struct uart_phyp_softc *sc, void *buffer return (0); } +#if BYTE_ORDER == LITTLE_ENDIAN + sc->phyp_inbuf.u64[0] = be64toh(sc->phyp_inbuf.u64[0]); + sc->phyp_inbuf.u64[1] = be64toh(sc->phyp_inbuf.u64[1]); +#endif + if ((sc->protocol == HVTERMPROT) && (hdr == 1)) { sc->inbuflen = sc->inbuflen - 4; /* The VTERM protocol has a 4 byte header, skip it here. */ @@ -380,8 +386,8 @@ uart_phyp_put(struct uart_phyp_softc *sc, void *buffer } do { - err = phyp_hcall(H_PUT_TERM_CHAR, sc->vtermid, len, cbuf.u64[0], - cbuf.u64[1]); + err = phyp_hcall(H_PUT_TERM_CHAR, sc->vtermid, len, htobe64(cbuf.u64[0]), + htobe64(cbuf.u64[1])); DELAY(100); } while (err == H_BUSY);