From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754795AbbCSMoj (ORCPT ); Thu, 19 Mar 2015 08:44:39 -0400 Received: from skprod2.natinst.com ([130.164.80.23]:45629 "EHLO ni.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751351AbbCSMoh (ORCPT ); Thu, 19 Mar 2015 08:44:37 -0400 Date: Thu, 19 Mar 2015 07:44:14 -0500 From: Josh Cartwright To: Michal Simek Cc: S?ren Brinkmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] ARM: zynq: use restart_handler mechanism for slcr reset Message-ID: <20150319124414.GG24619@jcartwri.amer.corp.natinst.com> References: <1425049769-24929-1-git-send-email-joshc@ni.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-MIMETrack: Itemize by SMTP Server on US-AUS-MGWOut2/AUS/H/NIC(Release 8.5.3FP6|November 21, 2013) at 03/19/2015 07:44:14 AM, Serialize by Router on US-AUS-MGWOut2/AUS/H/NIC(Release 8.5.3FP6|November 21, 2013) at 03/19/2015 07:44:14 AM, Serialize complete at 03/19/2015 07:44:14 AM Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2015-03-19_04:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Mar 19, 2015 at 11:44:23AM +0100, Michal Simek wrote: > On 02/27/2015 04:09 PM, Josh Cartwright wrote: [..] > > +++ b/arch/arm/mach-zynq/slcr.c > > @@ -15,6 +15,7 @@ > > */ > > > > #include > > +#include > > #include > > #include > > #include > > @@ -91,10 +92,9 @@ u32 zynq_slcr_get_device_id(void) > > return val; > > } > > > > -/** > > - * zynq_slcr_system_reset - Reset the entire system. > > - */ > > -void zynq_slcr_system_reset(void) > > +static > > +int zynq_slcr_system_restart(struct notifier_block *nb, > > + unsigned long action, void *data) > > { > > First of all sorry for delay. No problem. I suspect ZynqMP is keeping you busy. > Any reason to remove kernel-doc format? It didn't seem to provide anything meaningful, as it was just a restatement of the function name, and since this function has become static, it makes even less sense. > The rest looks good and I have also tested it. Great! > BTW: was also thinking about syscon-reboot option but it doesn't fit to > our reset sequence. :-( Because of the code that handles this? /* * Clear 0x0F000000 bits of reboot status register to workaround * the FSBL not loading the bitstream after soft-reboot * This is a temporary solution until we know more. */ Has this FSBL bug been addressed? I suspect we could also drop the zynq_slcr_unlock() as well...we unlock the SLCR early at boot and don't lock it, AFAICT. With those two pieces dropped, I think we'd fit the syscon-reboot model. Josh