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=-2.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT 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 15A27C04A6B for ; Mon, 13 May 2019 03:01:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D3FDB208CB for ; Mon, 13 May 2019 03:01:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557716498; bh=Vf3S4y6D2Q7ocm8jNWZb50W9bK/aBU2qQFrwVceRIGk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=WCwBUWBUY/dvnM09n+wQiGScvjvWSkB58PyUR7zAEW3Cc8XSWx/CWJYdySHUWqcA+ ZoknEQSXc/QEiNW+viZxqxhY8dXz5y7+HKNpvJrk4n1U49WnHs6V02bBpYCpdYz4Rn VwuUdOddEIt/0O46VGeertD8EGnFoBkM6kF4R/Jg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727311AbfEMDBi (ORCPT ); Sun, 12 May 2019 23:01:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:50182 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727198AbfEMDBh (ORCPT ); Sun, 12 May 2019 23:01:37 -0400 Received: from dragon (98.142.130.235.16clouds.com [98.142.130.235]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id E95E920989; Mon, 13 May 2019 03:01:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557716497; bh=Vf3S4y6D2Q7ocm8jNWZb50W9bK/aBU2qQFrwVceRIGk=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=yTcnpyJsSX9vo49LjtqtriKMqO88BQS9lKyV/PCWwLKqYhHKNUO6tc0lj+o1q1zIj vnRT2Vgippve56ayQtRLmNpHVIpINBctso7Icn5878eKgBpKJhxD7DRjvVFhks6sYx 03DXUAsZWrCkhrwKovW03UROjPQkJIc0+bK2ZiTk= Date: Mon, 13 May 2019 11:01:06 +0800 From: Shawn Guo To: Fabio Estevam Cc: Sasha Levin , Sascha Hauer , NXP Linux Team , stable Subject: Re: [PATCH] ARM: imx: cpuidle-imx6sx: Restrict the SW2ISO increase to i.MX6SX Message-ID: <20190513030105.GR15856@dragon> References: <20190502113020.8642-1-festevam@gmail.com> <20190502122645.C5FD52081C@mail.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, May 02, 2019 at 09:54:16AM -0300, Fabio Estevam wrote: > On Thu, May 2, 2019 at 9:33 AM Fabio Estevam wrote: > > > > On Thu, May 2, 2019 at 9:26 AM Sasha Levin wrote: > > > > > > Hi, > > > > > > [This is an automated email] > > > > > > This commit has been processed because it contains a "Fixes:" tag, > > > fixing commit: 1e434b703248 ARM: imx: update the cpu power up timing setting on i.mx6sx. > > > > > > The bot has tested the following trees: v5.0.10, v4.19.37, v4.14.114, v4.9.171, v4.4.179. > > > > > > v5.0.10: Build OK! > > > v4.19.37: Build OK! > > > v4.14.114: Build OK! > > > v4.9.171: Build OK! > > > v4.4.179: Failed to apply! Possible dependencies: > > > 6ae44aa651d0 ("ARM: imx: enable WAIT mode hardware workaround for imx6sx") > > > > > > > > > How should we proceed with this patch? > > > > I can submit a version for 4.4 stable tree once this hits mainline. > > The conflict resolution is very simple. > > Or maybe I can send a simpler version that applies all the way to 4.4: > > --- a/arch/arm/mach-imx/cpuidle-imx6sx.c > +++ b/arch/arm/mach-imx/cpuidle-imx6sx.c > @@ -15,6 +15,7 @@ > > #include "common.h" > #include "cpuidle.h" > +#include "hardware.h" > > static int imx6sx_idle_finish(unsigned long val) > { > @@ -110,7 +111,7 @@ int __init imx6sx_cpuidle_init(void) > * except for power up sw2iso which need to be > * larger than LDO ramp up time. > */ > - imx_gpc_set_arm_power_up_timing(0xf, 1); > + imx_gpc_set_arm_power_up_timing(cpu_is_imx6sx() ? 0xf: 0x2, 1); ^ missing space > imx_gpc_set_arm_power_down_timing(1, 1); > > return cpuidle_register(&imx6sx_cpuidle_driver, NULL); > > Would this be preferred? Yes, please. Shawn