From owner-svn-src-projects@freebsd.org Tue Nov 17 16:18:46 2015 Return-Path: Delivered-To: svn-src-projects@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 49C8DA31425 for ; Tue, 17 Nov 2015 16:18:46 +0000 (UTC) (envelope-from nwhitehorn@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 09DD618F7; Tue, 17 Nov 2015 16:18:45 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAHGIjWa073942; Tue, 17 Nov 2015 16:18:45 GMT (envelope-from nwhitehorn@FreeBSD.org) Received: (from nwhitehorn@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAHGIjPS073940; Tue, 17 Nov 2015 16:18:45 GMT (envelope-from nwhitehorn@FreeBSD.org) Message-Id: <201511171618.tAHGIjPS073940@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: nwhitehorn set sender to nwhitehorn@FreeBSD.org using -f From: Nathan Whitehorn Date: Tue, 17 Nov 2015 16:18:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r290992 - projects/powernv/powerpc/powernv X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Nov 2015 16:18:46 -0000 Author: nwhitehorn Date: Tue Nov 17 16:18:44 2015 New Revision: 290992 URL: https://svnweb.freebsd.org/changeset/base/290992 Log: Make sure we use OF_getencprop() instead of OF_getprop() before the rot moves too far forward. We'll need endian safety on powernv at some point. Sponsored by: FreeBSD Foundation Modified: projects/powernv/powerpc/powernv/opal_console.c projects/powernv/powerpc/powernv/platform_powernv.c Modified: projects/powernv/powerpc/powernv/opal_console.c ============================================================================== --- projects/powernv/powerpc/powernv/opal_console.c Tue Nov 17 16:16:18 2015 (r290991) +++ projects/powernv/powerpc/powernv/opal_console.c Tue Nov 17 16:18:44 2015 (r290992) @@ -186,7 +186,7 @@ uart_opal_probe_node(struct uart_opal_so return (ENXIO); reg = -1; - OF_getprop(node, "reg", ®, sizeof(reg)); + OF_getencprop(node, "reg", ®, sizeof(reg)); if (reg == -1) return (ENXIO); sc->vtermid = reg; Modified: projects/powernv/powerpc/powernv/platform_powernv.c ============================================================================== --- projects/powernv/powerpc/powernv/platform_powernv.c Tue Nov 17 16:16:18 2015 (r290991) +++ projects/powernv/powerpc/powernv/platform_powernv.c Tue Nov 17 16:18:44 2015 (r290992) @@ -140,7 +140,7 @@ powernv_timebase_freq(platform_t plat, s phandle = cpuref->cr_hwref; - OF_getprop(phandle, "timebase-frequency", &ticks, sizeof(ticks)); + OF_getencprop(phandle, "timebase-frequency", &ticks, sizeof(ticks)); if (ticks <= 0) panic("Unable to determine timebase frequency!"); @@ -186,10 +186,10 @@ powernv_smp_first_cpu(platform_t plat, s return (ENOENT); cpuref->cr_hwref = cpu; - res = OF_getprop(cpu, "ibm,ppc-interrupt-server#s", &cpuid, + res = OF_getencprop(cpu, "ibm,ppc-interrupt-server#s", &cpuid, sizeof(cpuid)); if (res <= 0) - res = OF_getprop(cpu, "reg", &cpuid, sizeof(cpuid)); + res = OF_getencprop(cpu, "reg", &cpuid, sizeof(cpuid)); if (res <= 0) cpuid = 0; cpuref->cr_cpuid = cpuid; @@ -208,7 +208,7 @@ powernv_smp_next_cpu(platform_t plat, st res = OF_getproplen(cpuref->cr_hwref, "ibm,ppc-interrupt-server#s"); if (res > 0) { cell_t interrupt_servers[res/sizeof(cell_t)]; - OF_getprop(cpuref->cr_hwref, "ibm,ppc-interrupt-server#s", + OF_getencprop(cpuref->cr_hwref, "ibm,ppc-interrupt-server#s", interrupt_servers, res); for (i = 0; i < res/sizeof(cell_t) - 1; i++) { if (interrupt_servers[i] == cpuref->cr_cpuid) { @@ -230,10 +230,10 @@ powernv_smp_next_cpu(platform_t plat, st return (ENOENT); cpuref->cr_hwref = cpu; - res = OF_getprop(cpu, "ibm,ppc-interrupt-server#s", &cpuid, + res = OF_getencprop(cpu, "ibm,ppc-interrupt-server#s", &cpuid, sizeof(cpuid)); if (res <= 0) - res = OF_getprop(cpu, "reg", &cpuid, sizeof(cpuid)); + res = OF_getencprop(cpu, "reg", &cpuid, sizeof(cpuid)); if (res <= 0) cpuid = 0; cpuref->cr_cpuid = cpuid;