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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 8EC1EC3A5A1 for ; Wed, 28 Aug 2019 22:16:07 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 153AA22DA7 for ; Wed, 28 Aug 2019 22:16:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 153AA22DA7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 46Jg780bjYzDqkS for ; Thu, 29 Aug 2019 08:16:04 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 46Jg4l3fSLzDqXQ for ; Thu, 29 Aug 2019 08:13:59 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) by bilbo.ozlabs.org (Postfix) with ESMTP id 46Jg4l34gGz8svv for ; Thu, 29 Aug 2019 08:13:59 +1000 (AEST) Received: by ozlabs.org (Postfix) id 46Jg4l2vpXz9sNk; Thu, 29 Aug 2019 08:13:59 +1000 (AEST) Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=cclaudio@linux.ibm.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46Jg4k60rFz9sNC; Thu, 29 Aug 2019 08:13:58 +1000 (AEST) Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x7SMCdVW018230; Wed, 28 Aug 2019 18:13:56 -0400 Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0b-001b2d01.pphosted.com with ESMTP id 2up27400qv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Aug 2019 18:13:56 -0400 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id x7SM9h5B015389; Wed, 28 Aug 2019 22:13:55 GMT Received: from b01cxnp22033.gho.pok.ibm.com (b01cxnp22033.gho.pok.ibm.com [9.57.198.23]) by ppma01dal.us.ibm.com with ESMTP id 2unb3t0kvj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 28 Aug 2019 22:13:55 +0000 Received: from b01ledav006.gho.pok.ibm.com (b01ledav006.gho.pok.ibm.com [9.57.199.111]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x7SMDs7B44302696 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Aug 2019 22:13:54 GMT Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A07CCAC133; Wed, 28 Aug 2019 22:13:54 +0000 (GMT) Received: from b01ledav006.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 17EFEAC117; Wed, 28 Aug 2019 22:13:54 +0000 (GMT) Received: from [9.85.164.95] (unknown [9.85.164.95]) by b01ledav006.gho.pok.ibm.com (Postfix) with ESMTP; Wed, 28 Aug 2019 22:13:53 +0000 (GMT) Subject: Re: [PATCH v4 1/2] powerpc/powernv/opal-msglog: Refactor memcons code To: Michael Ellerman , linuxppc-dev@ozlabs.org References: <20190828130521.26764-1-mpe@ellerman.id.au> From: Claudio Carvalho Message-ID: <7fb68a9a-65b5-2ac6-105b-2603bd75af28@linux.ibm.com> Date: Wed, 28 Aug 2019 19:13:52 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.0 MIME-Version: 1.0 In-Reply-To: <20190828130521.26764-1-mpe@ellerman.id.au> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-08-28_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1906280000 definitions=main-1908280214 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On 8/28/19 10:05 AM, Michael Ellerman wrote: > From: Claudio Carvalho > > This patch refactors the code in opal-msglog that operates on the OPAL > memory console in order to make it cleaner and also allow the reuse of > the new memcons_* functions. Tested-by: Claudio Carvalho Thanks, Claudio > Signed-off-by: Claudio Carvalho > Signed-off-by: Michael Ellerman > --- > v4: mpe: Rename memcons_load_from_dt() to memcons_init(). > Make memcons_init() and memcons_get_size() non-static. > Continue to use opal_msglog_copy() in opal_msglog_read(). > --- > arch/powerpc/platforms/powernv/opal-msglog.c | 57 +++++++++++++------- > 1 file changed, 39 insertions(+), 18 deletions(-) > > diff --git a/arch/powerpc/platforms/powernv/opal-msglog.c b/arch/powerpc/platforms/powernv/opal-msglog.c > index dc51d03c6370..d26da19a611f 100644 > --- a/arch/powerpc/platforms/powernv/opal-msglog.c > +++ b/arch/powerpc/platforms/powernv/opal-msglog.c > @@ -29,23 +29,23 @@ struct memcons { > > static struct memcons *opal_memcons = NULL; > > -ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count) > +ssize_t memcons_copy(struct memcons *mc, char *to, loff_t pos, size_t count) > { > const char *conbuf; > ssize_t ret; > size_t first_read = 0; > uint32_t out_pos, avail; > > - if (!opal_memcons) > + if (!mc) > return -ENODEV; > > - out_pos = be32_to_cpu(READ_ONCE(opal_memcons->out_pos)); > + out_pos = be32_to_cpu(READ_ONCE(mc->out_pos)); > > /* Now we've read out_pos, put a barrier in before reading the new > * data it points to in conbuf. */ > smp_rmb(); > > - conbuf = phys_to_virt(be64_to_cpu(opal_memcons->obuf_phys)); > + conbuf = phys_to_virt(be64_to_cpu(mc->obuf_phys)); > > /* When the buffer has wrapped, read from the out_pos marker to the end > * of the buffer, and then read the remaining data as in the un-wrapped > @@ -53,7 +53,7 @@ ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count) > if (out_pos & MEMCONS_OUT_POS_WRAP) { > > out_pos &= MEMCONS_OUT_POS_MASK; > - avail = be32_to_cpu(opal_memcons->obuf_size) - out_pos; > + avail = be32_to_cpu(mc->obuf_size) - out_pos; > > ret = memory_read_from_buffer(to, count, &pos, > conbuf + out_pos, avail); > @@ -71,7 +71,7 @@ ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count) > } > > /* Sanity check. The firmware should not do this to us. */ > - if (out_pos > be32_to_cpu(opal_memcons->obuf_size)) { > + if (out_pos > be32_to_cpu(mc->obuf_size)) { > pr_err("OPAL: memory console corruption. Aborting read.\n"); > return -EINVAL; > } > @@ -86,6 +86,11 @@ ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count) > return ret; > } > > +ssize_t opal_msglog_copy(char *to, loff_t pos, size_t count) > +{ > + return memcons_copy(opal_memcons, to, pos, count); > +} > + > static ssize_t opal_msglog_read(struct file *file, struct kobject *kobj, > struct bin_attribute *bin_attr, char *to, > loff_t pos, size_t count) > @@ -98,32 +103,48 @@ static struct bin_attribute opal_msglog_attr = { > .read = opal_msglog_read > }; > > -void __init opal_msglog_init(void) > +struct memcons *memcons_init(struct device_node *node, const char *mc_prop_name) > { > u64 mcaddr; > struct memcons *mc; > > - if (of_property_read_u64(opal_node, "ibm,opal-memcons", &mcaddr)) { > - pr_warn("OPAL: Property ibm,opal-memcons not found, no message log\n"); > - return; > + if (of_property_read_u64(node, mc_prop_name, &mcaddr)) { > + pr_warn("%s property not found, no message log\n", > + mc_prop_name); > + goto out_err; > } > > mc = phys_to_virt(mcaddr); > if (!mc) { > - pr_warn("OPAL: memory console address is invalid\n"); > - return; > + pr_warn("memory console address is invalid\n"); > + goto out_err; > } > > if (be64_to_cpu(mc->magic) != MEMCONS_MAGIC) { > - pr_warn("OPAL: memory console version is invalid\n"); > - return; > + pr_warn("memory console version is invalid\n"); > + goto out_err; > } > > - /* Report maximum size */ > - opal_msglog_attr.size = be32_to_cpu(mc->ibuf_size) + > - be32_to_cpu(mc->obuf_size); > + return mc; > + > +out_err: > + return NULL; > +} > + > +u32 memcons_get_size(struct memcons *mc) > +{ > + return be32_to_cpu(mc->ibuf_size) + be32_to_cpu(mc->obuf_size); > +} > + > +void __init opal_msglog_init(void) > +{ > + opal_memcons = memcons_init(opal_node, "ibm,opal-memcons"); > + if (!opal_memcons) { > + pr_warn("OPAL: memcons failed to load from ibm,opal-memcons\n"); > + return; > + } > > - opal_memcons = mc; > + opal_msglog_attr.size = memcons_get_size(opal_memcons); > } > > void __init opal_msglog_sysfs_init(void)