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=-5.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=no 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 E00DBC47423 for ; Fri, 2 Oct 2020 15:03:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B627A206CA for ; Fri, 2 Oct 2020 15:03:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388236AbgJBPDW (ORCPT ); Fri, 2 Oct 2020 11:03:22 -0400 Received: from foss.arm.com ([217.140.110.172]:38470 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726017AbgJBPDV (ORCPT ); Fri, 2 Oct 2020 11:03:21 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7C8171396; Fri, 2 Oct 2020 08:03:20 -0700 (PDT) Received: from e121166-lin.cambridge.arm.com (e121166-lin.cambridge.arm.com [10.1.196.255]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1116B3F73B; Fri, 2 Oct 2020 08:03:18 -0700 (PDT) Date: Fri, 2 Oct 2020 16:03:09 +0100 From: Lorenzo Pieralisi To: Pali =?iso-8859-1?Q?Roh=E1r?= Cc: Rob Herring , Bjorn Helgaas , Miquel Raynal , Kishon Vijay Abraham I , Vinod Koul , Marek =?iso-8859-1?Q?Beh=FAn?= , Tomasz Maciej Nowak , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 0/2] PCI: aardvark: Fix comphy with old ATF Message-ID: <20201002150300.GA25684@e121166-lin.cambridge.arm.com> References: <20200902144344.16684-1-pali@kernel.org> <20201002133713.GA24425@e121166-lin.cambridge.arm.com> <20201002142616.dxgdneg2lqw4pxie@pali> <20201002143851.GA25575@e121166-lin.cambridge.arm.com> <20201002145237.r2troxmgbq2bf3ep@pali> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201002145237.r2troxmgbq2bf3ep@pali> User-Agent: Mutt/1.9.4 (2018-02-28) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Oct 02, 2020 at 04:52:37PM +0200, Pali Rohár wrote: > On Friday 02 October 2020 15:38:51 Lorenzo Pieralisi wrote: > > On Fri, Oct 02, 2020 at 04:26:16PM +0200, Pali Rohár wrote: > > > On Friday 02 October 2020 14:37:13 Lorenzo Pieralisi wrote: > > > > On Wed, Sep 02, 2020 at 04:43:42PM +0200, Pali Rohár wrote: > > > > > This patch series fixes regression introduced in commit 366697018c9a > > > > > ("PCI: aardvark: Add PHY support") which caused aardvark driver > > > > > initialization failure on EspressoBin board with factory version of > > > > > Arm Trusted Firmware provided by Marvell. > > > > > > > > > > Second patch depends on the first patch, so please add appropriate > > > > > Fixes/Cc:stable@ tags to have both patches correctly backported to > > > > > stable kernels. > > > > > > > > > > I have tested both patches with Marvell ATF firmware ebin-17.10-uart.zip > > > > > and with upstream ATF+uboot and aardvark was initialized successfully. > > > > > Without this patch series on ebin-17.10-uart.zip aardvark initialization > > > > > failed. > > > > > > > > > > Pali Rohár (2): > > > > > phy: marvell: comphy: Convert internal SMCC firmware return codes to > > > > > errno > > > > > PCI: aardvark: Fix initialization with old Marvell's Arm Trusted > > > > > Firmware > > > > > > > > > > drivers/pci/controller/pci-aardvark.c | 4 +++- > > > > > drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 14 +++++++++++--- > > > > > drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 14 +++++++++++--- > > > > > 3 files changed, 25 insertions(+), 7 deletions(-) > > > > > > > > Applied to pci/aardvark (both patches), thanks. > > > > > > Ok! For second patch would be needed to put CC:stable line with > > > specifying prerequisite of first patch as written in document: > > > > > > https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html > > > > > > If I understood it correctly, second patch needs following line: > > > > > > Cc: # : comphy: errno return codes > > > > > > where is commit id of PATCH 1/2. > > > > > > (correct me if I'm wrong) > > > > > > Now when first commit has commit id, could you update second commit to > > > include this information about prerequisite? > > > > No I can't because they will be merged at the same time. > > And it is a problem? Git commit id of first patch would not be changed, > so referencing to it is now possible from second commit (unless you do > rebasing). > > > What we can do is mark the second patch for stable > > This is done by adding "Cc: " line to second > patch which I suggested, right? I will apply the stable tag and dependency, it should be fine. Please ensure you follow up stable updates especially in case patches don't backport properly (ie please try). Lorenzo