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.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLACK autolearn=unavailable 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 37855C11D14 for ; Thu, 20 Feb 2020 17:28:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08FB924673 for ; Thu, 20 Feb 2020 17:28:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=thegoodpenguin-co-uk.20150623.gappssmtp.com header.i=@thegoodpenguin-co-uk.20150623.gappssmtp.com header.b="CmcyeEBO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728438AbgBTR2l (ORCPT ); Thu, 20 Feb 2020 12:28:41 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:35005 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728115AbgBTR2l (ORCPT ); Thu, 20 Feb 2020 12:28:41 -0500 Received: by mail-wr1-f67.google.com with SMTP id w12so5585892wrt.2 for ; Thu, 20 Feb 2020 09:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thegoodpenguin-co-uk.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=yg7V2Kitryz7uYVlNn64dGZz3YZSbyjf9HbgWJJRDAs=; b=CmcyeEBOB0TBNIvz/p5XwnAlafyqGrCgVEgvaMgTdOyuEONJXLWP2BuiWcL4WTxOud aUmSx7qqn2snU2zgLbXE/a66nZ3j+UuSMi6wHwMi4skzKVGsuRninJFjVqkPpPvuleLN 8oPei3Ks+Bok6gh12rhXHBfAPK68q+J3FZYwlmxH1pT4bAB8lri9bhSDZ9SJzQdSiaTS ZP/lWL+rjHiKe5nRyh/+DBhzVnRap+ng90tFDcMfJDiN90TXG4QRa9gYT0too8nHBeRy 1bX7b/t+H2/IYLVuJNZLgSYdBe1IGb/tJnbQF1UMxedMk6fr0hWAmTyry39gpCbWcW80 Oigw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=yg7V2Kitryz7uYVlNn64dGZz3YZSbyjf9HbgWJJRDAs=; b=f9GEuYO3QBBayzexUpIBp0OB1m9FV+DvUuVU+ZIlsheZLgV0ivvz82OCkEk+ljoON0 I1PIEn7TVlp0zCzGIjht6uEx6EU65ZpZdYodKOyfFvPLWEoYE9li+6P9TJ/R3ViMC/yp 7KNSguQ1C6Ha5PqqrBic8R8tYzJ7KzFhBIQuW3RMppa2ut8tI803QvxfnXJaVvCAYuTI 5Fb4EAKIHgLY2ojidysi2ETIc7b0u5ux8TMcpHkZScQ1GkSQK6sWE5532amR4WlqWvNP Tx9aYvTBYn+BecpsrM/FnibndJtbWhIQZ9LPGbfMGmQo7vvO3xx9lUC51F2rHCaMinsp mo0g== X-Gm-Message-State: APjAAAV0RdqxAF0KXgE3sZ4nbIBJoeTfLVVEk8xbOQF1+1TJiLfvAaeW lJ1lwl2Xm4JEkWyN2n6VQ2yMTA== X-Google-Smtp-Source: APXvYqzcciySjNsv1+b17UtCc7Fw4uKQANx0Sd40ea91V7lOrEtBQbKyOMSjPgOQOSdAmaRoO3SEBQ== X-Received: by 2002:adf:ed09:: with SMTP id a9mr44518842wro.350.1582219719426; Thu, 20 Feb 2020 09:28:39 -0800 (PST) Received: from big-machine ([2a00:23c5:dd80:8400:98d8:49e6:cdcc:25df]) by smtp.gmail.com with ESMTPSA id 2sm252807wrq.31.2020.02.20.09.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 09:28:38 -0800 (PST) Date: Thu, 20 Feb 2020 17:28:37 +0000 From: Andrew Murray To: Zhiqiang Hou Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, bhelgaas@google.com, robh+dt@kernel.org, andrew.murray@arm.com, arnd@arndb.de, mark.rutland@arm.com, l.subrahmanya@mobiveil.co.in, shawnguo@kernel.org, m.karthikeyan@mobiveil.co.in, leoyang.li@nxp.com, lorenzo.pieralisi@arm.com, catalin.marinas@arm.com, will.deacon@arm.com, Mingkai.Hu@nxp.com, Minghuan.Lian@nxp.com, Xiaowei.Bao@nxp.com Subject: Re: [PATCHv10 07/13] PCI: mobiveil: Allow mobiveil_host_init() to be used to re-init host Message-ID: <20200220172837.GH19388@big-machine> References: <20200213040644.45858-1-Zhiqiang.Hou@nxp.com> <20200213040644.45858-8-Zhiqiang.Hou@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200213040644.45858-8-Zhiqiang.Hou@nxp.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Feb 13, 2020 at 12:06:38PM +0800, Zhiqiang Hou wrote: > From: Hou Zhiqiang > > Allow the mobiveil_host_init() function to be used to re-init > host controller's PAB and GPEX CSR register block, as NXP > integrated Mobiveil IP has to reset and then re-init the PAB > and GPEX CSR registers upon hot-reset. > > Signed-off-by: Hou Zhiqiang > Reviewed-by: Subrahmanya Lingappa Reviewed-by: Andrew Murray > --- > V10: > - Refined the subject and change log. > > .../controller/mobiveil/pcie-mobiveil-host.c | 19 ++++++++++++------- > .../pci/controller/mobiveil/pcie-mobiveil.h | 1 + > 2 files changed, 13 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c > index 53ab8412a1de..44dd641fede3 100644 > --- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c > +++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c > @@ -221,18 +221,23 @@ static void mobiveil_pcie_enable_msi(struct mobiveil_pcie *pcie) > writel_relaxed(1, pcie->apb_csr_base + MSI_ENABLE_OFFSET); > } > > -static int mobiveil_host_init(struct mobiveil_pcie *pcie) > +int mobiveil_host_init(struct mobiveil_pcie *pcie, bool reinit) > { > struct mobiveil_root_port *rp = &pcie->rp; > struct pci_host_bridge *bridge = rp->bridge; > u32 value, pab_ctrl, type; > struct resource_entry *win; > > - /* setup bus numbers */ > - value = mobiveil_csr_readl(pcie, PCI_PRIMARY_BUS); > - value &= 0xff000000; > - value |= 0x00ff0100; > - mobiveil_csr_writel(pcie, value, PCI_PRIMARY_BUS); > + pcie->ib_wins_configured = 0; > + pcie->ob_wins_configured = 0; > + > + if (!reinit) { > + /* setup bus numbers */ > + value = mobiveil_csr_readl(pcie, PCI_PRIMARY_BUS); > + value &= 0xff000000; > + value |= 0x00ff0100; > + mobiveil_csr_writel(pcie, value, PCI_PRIMARY_BUS); > + } > > /* > * program Bus Master Enable Bit in Command Register in PAB Config > @@ -576,7 +581,7 @@ int mobiveil_pcie_host_probe(struct mobiveil_pcie *pcie) > * configure all inbound and outbound windows and prepare the RC for > * config access > */ > - ret = mobiveil_host_init(pcie); > + ret = mobiveil_host_init(pcie, false); > if (ret) { > dev_err(dev, "Failed to initialize host\n"); > return ret; > diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil.h b/drivers/pci/controller/mobiveil/pcie-mobiveil.h > index 346bf79a581b..623c5f0c4441 100644 > --- a/drivers/pci/controller/mobiveil/pcie-mobiveil.h > +++ b/drivers/pci/controller/mobiveil/pcie-mobiveil.h > @@ -166,6 +166,7 @@ struct mobiveil_pcie { > }; > > int mobiveil_pcie_host_probe(struct mobiveil_pcie *pcie); > +int mobiveil_host_init(struct mobiveil_pcie *pcie, bool reinit); > bool mobiveil_pcie_link_up(struct mobiveil_pcie *pcie); > int mobiveil_bringup_link(struct mobiveil_pcie *pcie); > void program_ob_windows(struct mobiveil_pcie *pcie, int win_num, u64 cpu_addr, > -- > 2.17.1 > 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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLACK autolearn=unavailable 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 A663CC11D0C for ; Thu, 20 Feb 2020 17:28:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 58BE424672 for ; Thu, 20 Feb 2020 17:28:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dXBRgzZq"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=thegoodpenguin-co-uk.20150623.gappssmtp.com header.i=@thegoodpenguin-co-uk.20150623.gappssmtp.com header.b="CmcyeEBO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 58BE424672 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=thegoodpenguin.co.uk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=PJvGn99PjqLZiHAOhzcJ4pD3t7irMo91vR+1fypyiT4=; b=dXBRgzZqICrI85 hUlRdMVYG8dv28LYg4dmpgU2hZ0nKNoG9QSY79tHXiSPM6a3zPQC0csxfp9bXdDrGQkYLI9r4oyA+ ITZ/Yd51cgjq0y/DKEH5AZKFpb1Cr8lxl88hFluVAZikCdgrsnmDQafulsoEKDDAjt/8e7b8kIuCE Rq9nysIVD2HgEg90GzXszWqAJkU170KTARoQ/hSPGFS0vzEcn0uHxkuOhZqsKoAfMSkfjTA87MDJG AIFCJ23D7v0Lfxtt9xYgr9SAsfBFf1edQublySESmkmj9Mz6ArkeSiW2LOq8lJOiMyS7IfcrGVgxU zy/4/+r6rWTXvvgvzzXg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1j4pd3-0008Vi-7U; Thu, 20 Feb 2020 17:28:49 +0000 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1j4pcv-0008QC-4O for linux-arm-kernel@lists.infradead.org; Thu, 20 Feb 2020 17:28:42 +0000 Received: by mail-wr1-x443.google.com with SMTP id c9so5527471wrw.8 for ; Thu, 20 Feb 2020 09:28:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=thegoodpenguin-co-uk.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=yg7V2Kitryz7uYVlNn64dGZz3YZSbyjf9HbgWJJRDAs=; b=CmcyeEBOB0TBNIvz/p5XwnAlafyqGrCgVEgvaMgTdOyuEONJXLWP2BuiWcL4WTxOud aUmSx7qqn2snU2zgLbXE/a66nZ3j+UuSMi6wHwMi4skzKVGsuRninJFjVqkPpPvuleLN 8oPei3Ks+Bok6gh12rhXHBfAPK68q+J3FZYwlmxH1pT4bAB8lri9bhSDZ9SJzQdSiaTS ZP/lWL+rjHiKe5nRyh/+DBhzVnRap+ng90tFDcMfJDiN90TXG4QRa9gYT0too8nHBeRy 1bX7b/t+H2/IYLVuJNZLgSYdBe1IGb/tJnbQF1UMxedMk6fr0hWAmTyry39gpCbWcW80 Oigw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=yg7V2Kitryz7uYVlNn64dGZz3YZSbyjf9HbgWJJRDAs=; b=XnET+e9BSudelmP/tUb0ZjCYOzZdaYgaAWltspN2MTWlKmfPuRxoluLS/Os+oGyjtJ a4Id43Yb58GUr4aPXGxy8oQYwyhnlxBKZR+mhqL4GXEMQt9J7AcSM5d3f/gRzsIBfFSS qR+DPgmc0Hu0zqKCwxcu9sPucQPWdsO782kUYztu/g132RZxxTVqSyVgOdQy7UMrbFRs bscR4cy3GpIWwtzj3Vf5bqrGJ0KEz0hZ39Z24cRClM590YgrujAH9DQuxQDerAqbzHI6 Rq6CGm2gZdmE3aGIhWBKDNeQJaddL3QPqh3+Lb5RMmFZoju5FUxeWBusPSBwQri0Chhs szgw== X-Gm-Message-State: APjAAAWFHZZ5xA8s8uk0dxTpS+VXfVW6dUt9DtyReA2LYo5t2cPhCFEy JvUxYy4pDmZjWko2QiEh95v2ew== X-Google-Smtp-Source: APXvYqzcciySjNsv1+b17UtCc7Fw4uKQANx0Sd40ea91V7lOrEtBQbKyOMSjPgOQOSdAmaRoO3SEBQ== X-Received: by 2002:adf:ed09:: with SMTP id a9mr44518842wro.350.1582219719426; Thu, 20 Feb 2020 09:28:39 -0800 (PST) Received: from big-machine ([2a00:23c5:dd80:8400:98d8:49e6:cdcc:25df]) by smtp.gmail.com with ESMTPSA id 2sm252807wrq.31.2020.02.20.09.28.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2020 09:28:38 -0800 (PST) Date: Thu, 20 Feb 2020 17:28:37 +0000 From: Andrew Murray To: Zhiqiang Hou Subject: Re: [PATCHv10 07/13] PCI: mobiveil: Allow mobiveil_host_init() to be used to re-init host Message-ID: <20200220172837.GH19388@big-machine> References: <20200213040644.45858-1-Zhiqiang.Hou@nxp.com> <20200213040644.45858-8-Zhiqiang.Hou@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200213040644.45858-8-Zhiqiang.Hou@nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200220_092841_204407_E1652F17 X-CRM114-Status: GOOD ( 18.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, devicetree@vger.kernel.org, lorenzo.pieralisi@arm.com, m.karthikeyan@mobiveil.co.in, arnd@arndb.de, linux-pci@vger.kernel.org, l.subrahmanya@mobiveil.co.in, will.deacon@arm.com, linux-kernel@vger.kernel.org, leoyang.li@nxp.com, Minghuan.Lian@nxp.com, robh+dt@kernel.org, Mingkai.Hu@nxp.com, Xiaowei.Bao@nxp.com, catalin.marinas@arm.com, bhelgaas@google.com, andrew.murray@arm.com, shawnguo@kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Feb 13, 2020 at 12:06:38PM +0800, Zhiqiang Hou wrote: > From: Hou Zhiqiang > > Allow the mobiveil_host_init() function to be used to re-init > host controller's PAB and GPEX CSR register block, as NXP > integrated Mobiveil IP has to reset and then re-init the PAB > and GPEX CSR registers upon hot-reset. > > Signed-off-by: Hou Zhiqiang > Reviewed-by: Subrahmanya Lingappa Reviewed-by: Andrew Murray > --- > V10: > - Refined the subject and change log. > > .../controller/mobiveil/pcie-mobiveil-host.c | 19 ++++++++++++------- > .../pci/controller/mobiveil/pcie-mobiveil.h | 1 + > 2 files changed, 13 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c > index 53ab8412a1de..44dd641fede3 100644 > --- a/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c > +++ b/drivers/pci/controller/mobiveil/pcie-mobiveil-host.c > @@ -221,18 +221,23 @@ static void mobiveil_pcie_enable_msi(struct mobiveil_pcie *pcie) > writel_relaxed(1, pcie->apb_csr_base + MSI_ENABLE_OFFSET); > } > > -static int mobiveil_host_init(struct mobiveil_pcie *pcie) > +int mobiveil_host_init(struct mobiveil_pcie *pcie, bool reinit) > { > struct mobiveil_root_port *rp = &pcie->rp; > struct pci_host_bridge *bridge = rp->bridge; > u32 value, pab_ctrl, type; > struct resource_entry *win; > > - /* setup bus numbers */ > - value = mobiveil_csr_readl(pcie, PCI_PRIMARY_BUS); > - value &= 0xff000000; > - value |= 0x00ff0100; > - mobiveil_csr_writel(pcie, value, PCI_PRIMARY_BUS); > + pcie->ib_wins_configured = 0; > + pcie->ob_wins_configured = 0; > + > + if (!reinit) { > + /* setup bus numbers */ > + value = mobiveil_csr_readl(pcie, PCI_PRIMARY_BUS); > + value &= 0xff000000; > + value |= 0x00ff0100; > + mobiveil_csr_writel(pcie, value, PCI_PRIMARY_BUS); > + } > > /* > * program Bus Master Enable Bit in Command Register in PAB Config > @@ -576,7 +581,7 @@ int mobiveil_pcie_host_probe(struct mobiveil_pcie *pcie) > * configure all inbound and outbound windows and prepare the RC for > * config access > */ > - ret = mobiveil_host_init(pcie); > + ret = mobiveil_host_init(pcie, false); > if (ret) { > dev_err(dev, "Failed to initialize host\n"); > return ret; > diff --git a/drivers/pci/controller/mobiveil/pcie-mobiveil.h b/drivers/pci/controller/mobiveil/pcie-mobiveil.h > index 346bf79a581b..623c5f0c4441 100644 > --- a/drivers/pci/controller/mobiveil/pcie-mobiveil.h > +++ b/drivers/pci/controller/mobiveil/pcie-mobiveil.h > @@ -166,6 +166,7 @@ struct mobiveil_pcie { > }; > > int mobiveil_pcie_host_probe(struct mobiveil_pcie *pcie); > +int mobiveil_host_init(struct mobiveil_pcie *pcie, bool reinit); > bool mobiveil_pcie_link_up(struct mobiveil_pcie *pcie); > int mobiveil_bringup_link(struct mobiveil_pcie *pcie); > void program_ob_windows(struct mobiveil_pcie *pcie, int win_num, u64 cpu_addr, > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel