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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 14579C31E45 for ; Thu, 13 Jun 2019 18:24:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D606120679 for ; Thu, 13 Jun 2019 18:24:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="cwDZbbRi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727266AbfFMSYf (ORCPT ); Thu, 13 Jun 2019 14:24:35 -0400 Received: from hqemgate16.nvidia.com ([216.228.121.65]:19902 "EHLO hqemgate16.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727058AbfFMSYf (ORCPT ); Thu, 13 Jun 2019 14:24:35 -0400 Received: from hqpgpgate102.nvidia.com (Not Verified[216.228.121.13]) by hqemgate16.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 13 Jun 2019 11:24:32 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate102.nvidia.com (PGP Universal service); Thu, 13 Jun 2019 11:24:32 -0700 X-PGP-Universal: processed; by hqpgpgate102.nvidia.com on Thu, 13 Jun 2019 11:24:32 -0700 Received: from [10.25.73.66] (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Thu, 13 Jun 2019 18:24:29 +0000 Subject: Re: [PATCH V4 1/2] PCI: dwc: Add API support to de-initialize host From: Vidya Sagar To: Lorenzo Pieralisi CC: , , , , , , , , , References: <20190502170426.28688-1-vidyas@nvidia.com> <20190503112338.GA25649@e121166-lin.cambridge.arm.com> <37697830-5a94-0f8e-a5cf-3347bc4850cb@nvidia.com> <011b52b6-9fcd-8930-1313-6b546226c7b9@nvidia.com> X-Nvconfidentiality: public Message-ID: <8a6696e0-fc53-2e6b-536b-d1d2668e0f21@nvidia.com> Date: Thu, 13 Jun 2019 23:54:26 +0530 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <011b52b6-9fcd-8930-1313-6b546226c7b9@nvidia.com> X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1560450272; bh=8e5+YQl3ybd2VIPeXzJDvgsHhnZhXmat1afJBCN4yvU=; h=X-PGP-Universal:Subject:From:To:CC:References:X-Nvconfidentiality: Message-ID:Date:User-Agent:MIME-Version:In-Reply-To: X-Originating-IP:X-ClientProxiedBy:Content-Type:Content-Language: Content-Transfer-Encoding; b=cwDZbbRi4Ch1nMDlv2Y5q0unD5Bly2ehpDzK3x9gpsN3nAIHmarWbUjCAmnXAJCWK ycKLwdS2+Rddp4Jt2pAjAAqzIyFJrWKOcBi6tZ/cEX/E/6Udt9HfshvoOiw1CwzlCT DOztKdXrVjd5hm2NwVcBobvRLakL5rkBJ4NLqGk3A3nqJsK2zqQbWJHHxsgCygAF1K yCjVVKOZlbx0dp+tdpFmnyRz5sR+wSlpcbLhju1h3/bfKl4ETrAwup6StoV1JYZ15Z kEJiVTYCYUt84iQ7rqG6l9xFk6p+/nW9qZSy/IYWqthMDK05XvRFA6qwts/8/4/1Z8 aoPlB8MryWxBQ== Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On 6/7/2019 6:43 PM, Vidya Sagar wrote: > On 5/27/2019 4:39 PM, Vidya Sagar wrote: >> On 5/7/2019 12:25 PM, Vidya Sagar wrote: >>> On 5/7/2019 11:19 AM, Vidya Sagar wrote: >>>> On 5/3/2019 4:53 PM, Lorenzo Pieralisi wrote: >>>>> On Thu, May 02, 2019 at 10:34:25PM +0530, Vidya Sagar wrote: >>>>>> Add an API to group all the tasks to be done to de-initialize host w= hich >>>>>> can then be called by any DesignWare core based driver implementatio= ns >>>>>> while adding .remove() support in their respective drivers. >>>>>> >>>>>> Signed-off-by: Vidya Sagar >>>>>> Acked-by: Gustavo Pimentel >>>>>> --- >>>>>> Changes from v3: >>>>>> * Added check if (pci_msi_enabled() && !pp->ops->msi_host_init) befo= re calling >>>>>> =C2=A0=C2=A0 dw_pcie_free_msi() API to mimic init path >>>>>> >>>>>> Changes from v2: >>>>>> * Rebased on top of linux-next top of the tree branch >>>>>> >>>>>> Changes from v1: >>>>>> * s/Designware/DesignWare >>>>>> >>>>>> =C2=A0 drivers/pci/controller/dwc/pcie-designware-host.c | 8 +++++++= + >>>>>> =C2=A0 drivers/pci/controller/dwc/pcie-designware.h=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0 | 5 +++++ >>>>>> =C2=A0 2 files changed, 13 insertions(+) >>>>> >>>>> Series doesn't apply to v5.1-rc1, what's based on ? I suspect >>>>> there is a dependency on pci/keystone, given the tight timeline >>>>> for the merge window, would you mind postponing it to v5.3 ? >>>>> >>>>> I do not think it is urgent, I am happy to create a branch >>>>> for it as soon as v5.2-rc1 is released. >>>> I rebased my changes on top of linux-next. I see that they have confli= cts >>>> on top of v5.1-rc1. Do you want me to rebase them on top of v5.1-rc1 i= nstead >>>> of linux-next? >>>> I'm fine with v5.2-rc1 as well.I forgot to mention that these changes = are made on top of Jisheng's patches >>> FWIW, Jisheng's patches are approved and applied to pci/dwc for v5.2 >>> https://www.mail-archive.com/linux-kernel@vger.kernel.org/msg1968324.ht= ml >> >> Hi Lorenzo, >> Now that v5.2-rc2 is also available, could you please pick up this serie= s? >> >> Thanks, >> Vidya Sagar >> > Hi Bjorn / Lorenzo, > Can you please pick up these two patches? >=20 > Thanks, > Vidya Sagar Apologies for pinging again. These two patches can be applied directly on t= op of v5.2-rc4. Please do let me know if there is anything required from my side. Thanks, Vidya Sagar >=20 >>> >>>> >>>>> >>>>> Thanks, >>>>> Lorenzo >>>>> >>>>>> diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/dri= vers/pci/controller/dwc/pcie-designware-host.c >>>>>> index 77db32529319..d069e4290180 100644 >>>>>> --- a/drivers/pci/controller/dwc/pcie-designware-host.c >>>>>> +++ b/drivers/pci/controller/dwc/pcie-designware-host.c >>>>>> @@ -496,6 +496,14 @@ int dw_pcie_host_init(struct pcie_port *pp) >>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return ret; >>>>>> =C2=A0 } >>>>>> +void dw_pcie_host_deinit(struct pcie_port *pp) >>>>>> +{ >>>>>> +=C2=A0=C2=A0=C2=A0 pci_stop_root_bus(pp->root_bus); >>>>>> +=C2=A0=C2=A0=C2=A0 pci_remove_root_bus(pp->root_bus); >>>>>> +=C2=A0=C2=A0=C2=A0 if (pci_msi_enabled() && !pp->ops->msi_host_init= ) >>>>>> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 dw_pcie_free_msi(pp); >>>>>> +} >>>>>> + >>>>>> =C2=A0 static int dw_pcie_access_other_conf(struct pcie_port *pp, st= ruct pci_bus *bus, >>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 u32 devf= n, int where, int size, u32 *val, >>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 bool wri= te) >>>>>> diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/= pci/controller/dwc/pcie-designware.h >>>>>> index deab426affd3..4f48ec78c7b9 100644 >>>>>> --- a/drivers/pci/controller/dwc/pcie-designware.h >>>>>> +++ b/drivers/pci/controller/dwc/pcie-designware.h >>>>>> @@ -348,6 +348,7 @@ void dw_pcie_msi_init(struct pcie_port *pp); >>>>>> =C2=A0 void dw_pcie_free_msi(struct pcie_port *pp); >>>>>> =C2=A0 void dw_pcie_setup_rc(struct pcie_port *pp); >>>>>> =C2=A0 int dw_pcie_host_init(struct pcie_port *pp); >>>>>> +void dw_pcie_host_deinit(struct pcie_port *pp); >>>>>> =C2=A0 int dw_pcie_allocate_domains(struct pcie_port *pp); >>>>>> =C2=A0 #else >>>>>> =C2=A0 static inline irqreturn_t dw_handle_msi_irq(struct pcie_port = *pp) >>>>>> @@ -372,6 +373,10 @@ static inline int dw_pcie_host_init(struct pcie= _port *pp) >>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return 0; >>>>>> =C2=A0 } >>>>>> +static inline void dw_pcie_host_deinit(struct pcie_port *pp) >>>>>> +{ >>>>>> +} >>>>>> + >>>>>> =C2=A0 static inline int dw_pcie_allocate_domains(struct pcie_port *= pp) >>>>>> =C2=A0 { >>>>>> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 return 0; >>>>>> --=20 >>>>>> 2.17.1 >>>>>> >>>> >>> >> >=20