From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7ED0DC04E87 for ; Wed, 15 May 2019 19:24:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 424E72084E for ; Wed, 15 May 2019 19:24:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="iOG/8mNj"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="OV7VyfmB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726583AbfEOTYO (ORCPT ); Wed, 15 May 2019 15:24:14 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:41148 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726124AbfEOTYN (ORCPT ); Wed, 15 May 2019 15:24:13 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 3B3926087A; Wed, 15 May 2019 19:24:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557948252; bh=IhMSDG5a5N0dL5eqitoSAgF0GjbDpoPuc54UFkEWmSM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=iOG/8mNjRXLkM0rBqsyyQIiRTecWHPhZPWxeULXedlF5fejT5FWLj1ph2vkHUa9kA ORmhjFsSttyn0Kq1dWGsCyjCxBKx2GCP2odvEa1v4DKrtcLYy6yJPZ7JWaMd9JFNrp 5V05iR/GFnIKU6NI+24EzTXwSTl0hiJuQMSiCYPQ= Received: from jcrouse1-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6709360592; Wed, 15 May 2019 19:24:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1557948251; bh=IhMSDG5a5N0dL5eqitoSAgF0GjbDpoPuc54UFkEWmSM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=OV7VyfmBMxvleNQtJng1Lv6XGtvld6L5TIzlbWqdtSjf5WUElLykidfhqPPR1xL/0 qjlFI0l1CyL6I1xubXnaaQ76ORsDEPNc1bu6ny8fRd63UFyWl+b0kbgqxGv0aYslUn oENiYl4/sMEIww6gtOGGE52lqUjJ89ijC4sWcFV8= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6709360592 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jcrouse@codeaurora.org Date: Wed, 15 May 2019 13:24:08 -0600 From: Jordan Crouse To: Rob Clark Cc: Doug Anderson , Rob Clark , linux-arm-msm , Stephen Boyd , Andy Gross , David Brown , Rob Herring , Mark Rutland , devicetree@vger.kernel.org, LKML Subject: Re: [RFC 2/3] arm64: dts: qcom: sdm845-cheza: Re-add reserved memory Message-ID: <20190515192408.GD24137@jcrouse1-lnx.qualcomm.com> Mail-Followup-To: Rob Clark , Doug Anderson , Rob Clark , linux-arm-msm , Stephen Boyd , Andy Gross , David Brown , Rob Herring , Mark Rutland , devicetree@vger.kernel.org, LKML References: <20190509184415.11592-1-robdclark@gmail.com> <20190509184415.11592-3-robdclark@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 14, 2019 at 09:09:55PM -0700, Rob Clark wrote: > On Mon, May 13, 2019 at 3:48 PM Doug Anderson wrote: > > > > Hi, > > > > On Thu, May 9, 2019 at 11:44 AM Rob Clark wrote: > > > > > From: Douglas Anderson > > > > > > Let's fixup the reserved memory to re-add the things we deleted in > > > ("CHROMIUM: arm64: dts: qcom: sdm845-cheza: Temporarily delete > > > reserved-mem changes") in a way that plays nicely with the new > > > upstream definitions. > > > > The message above makes no sense since that commit you reference isn't > > in upstream. > > > > ...but in any case, why not squash this in with the previous commit? > > Yeah, I should have mentioned this was my intention, I just left it > unsquashed since (at the time) it was something I had cherry-picked on > top of current 4.19 cros kernel.. > > anyways, I pushed an (unsquashed, converted to fixup!'s) update to: > > https://github.com/freedreno/kernel-msm/commits/wip/cheza-dtb-upstreaming > > which has updates based on you're review comments (at least assuming I > understood them correctly).. plus some unrelated to cheza-dt patches > on top to get things actually working (ie. ignore everything on top of > the fixup!'s) > > I didn't see any comments on the 'delete zap-shader' patch, so > hopefully that means what I did there was a sane (or at least not > insane) way to handle android/linux tz vs what we have on cheza? Yeah. In a world where all the 845 firmware is in linux-firmware the best differentiating factor would be the absence of the reserved memory or the zap-shader node in the device tree. Otherwise we would have to try and fail to execute the scm call and then make some sort of educated guess as to if it failed for the "right" reasons. Jordan > > > Signed-off-by: Douglas Anderson > > > Reviewed-by: Stephen Boyd > > > Signed-off-by: Rob Clark > > > > Remove Stephen's Reviewed-by. In general reviews that happen in the > > Chrome OS gerrit shouldn't be carried over when things are posted > > upstream. > > > > > > > +/* Increase the size from 2MB to 8MB */ > > > +&rmtfs_mem { > > > + reg = <0 0x88f00000 0 0x800000>; > > > +}; > > > + > > > +/ { > > > + reserved-memory { > > > + venus_mem: memory@96000000 { > > > + reg = <0 0x96000000 0 0x500000>; > > > + no-map; > > > + }; > > > + }; > > > +}; > > > > nit: blank line? > > > > -Doug -- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project