From owner-svn-src-all@freebsd.org Thu Jul 19 20:39:11 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 A484D1049D83; Thu, 19 Jul 2018 20:39:11 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 556B87AD2B; Thu, 19 Jul 2018 20:39:11 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id E920B8F9A; Thu, 19 Jul 2018 20:39:10 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-lj1-f172.google.com with SMTP id v9-v6so9287562ljk.4; Thu, 19 Jul 2018 13:39:10 -0700 (PDT) X-Gm-Message-State: AOUpUlGHGvzx5JYo96rJrg5KllXH/jKwEd80zpLFHKkn9s+b8MNwyRzo 6S+rIT50+sHS1kUrK0Kh394e4NcZjEUvgzfWSDU= X-Google-Smtp-Source: AAOMgpdeDH2quhXDcb0fxKUtARnkTlxI19dJnjOJgkTsnNlWQyvtKJncif1JRqNYOzwZiXdzWQwZdugqcjRKmiIW+hg= X-Received: by 2002:a19:7b08:: with SMTP id w8-v6mr7412230lfc.22.1532032749606; Thu, 19 Jul 2018 13:39:09 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a2e:5742:0:0:0:0:0 with HTTP; Thu, 19 Jul 2018 13:38:49 -0700 (PDT) In-Reply-To: <72e23592-9ff2-b373-f8cc-755c358989f5@freebsd.org> References: <201807192022.w6JKMkE6044331@repo.freebsd.org> <72e23592-9ff2-b373-f8cc-755c358989f5@freebsd.org> From: Kyle Evans Date: Thu, 19 Jul 2018 15:38:49 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r336514 - head/sys/dev/vt/hw/ofwfb To: Nathan Whitehorn Cc: Justin Hibbits , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" 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: Thu, 19 Jul 2018 20:39:11 -0000 Seems like some bad decisions have been made with regards to naming... e.g. https://lkml.org/lkml/2018/6/25/784 On Thu, Jul 19, 2018 at 3:26 PM, Nathan Whitehorn wrote: > Isn't stdout-path supposed to contain a string rather than an ihandle? This > code assumes it is an ihandle (or xref phandle), which I think is wrong. > -Nathan > > > On 07/19/18 13:22, Justin Hibbits wrote: >> >> Author: jhibbits >> Date: Thu Jul 19 20:22:46 2018 >> New Revision: 336514 >> URL: https://svnweb.freebsd.org/changeset/base/336514 >> >> Log: >> ofwfb: Check for /chosen/stdout-path in addition to /chosen/stdout >> Some platforms use /chosen/stdout-path as the property containing >> the path to >> the stdout node, not /chosen/stdout. >> >> Modified: >> head/sys/dev/vt/hw/ofwfb/ofwfb.c >> >> Modified: head/sys/dev/vt/hw/ofwfb/ofwfb.c >> >> ============================================================================== >> --- head/sys/dev/vt/hw/ofwfb/ofwfb.c Thu Jul 19 20:20:43 2018 >> (r336513) >> +++ head/sys/dev/vt/hw/ofwfb/ofwfb.c Thu Jul 19 20:22:46 2018 >> (r336514) >> @@ -102,6 +102,10 @@ ofwfb_probe(struct vt_device *vd) >> if (OF_getprop(chosen, "stdout", &stdout, sizeof(stdout)) == >> sizeof(stdout)) >> node = OF_instance_to_package(stdout); >> + if (node == -1) >> + if (OF_getprop(chosen, "stdout-path", &stdout, sizeof(stdout)) >> == >> + sizeof(stdout)) >> + node = OF_instance_to_package(stdout); >> if (node == -1) { >> /* >> * The "/chosen/stdout" does not exist try >> > >