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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9FE8DC3DA5D for ; Thu, 25 Jul 2024 04:38:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To: Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID: Subject:Cc: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=j1JZC88oKp8I89s655kcwpoA6y+G6A3ga7BdD3U4lzs=; b=C0qPmILSj/rij5uVHSlKyiXwkg YsVhvqFaK+IckwKBzbNy6F73Y+W1Hr7LHbmYJeJ8X9GAq4RBF4WOcOmlNSTqYwXz85sco9fzNK/wY alySL/t/s0wTcesqmjBodq0CKboJxf02JqAEywwOjg42Vw9fp/SnbxeCtOHylgmCgJ3aFkwjq1Ib5 Oy8TOcl9s6X4SKFXXCX4NUehX/rMXeBRpaFgoTEBA2Oq42v/GPxsx6pCoVz2NhrWfiwa7xABfwBD5 RqQlvrU6conMB2/z8Iv+r3MUuz7P+vDtmIy8YV2y4Nn19+tIjjWbrIktg9tmYcUE13keGDsNkg+8u UjRHoLfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWqEi-0000000HMfg-2aJd; Thu, 25 Jul 2024 04:37:52 +0000 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWqEK-0000000HMbE-0I7u for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 04:37:29 +0000 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-70ea93aa9bdso452618b3a.0 for ; Wed, 24 Jul 2024 21:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721882247; x=1722487047; darn=lists.infradead.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=j1JZC88oKp8I89s655kcwpoA6y+G6A3ga7BdD3U4lzs=; b=Ap5EXoaQBMrm9HgTP5u01Vs1r0rq5y5oEWt/CEV8jWLRvbzil1LyKx+vbctKNbZfoy 3G2sQuKL+I8NySPiJOku5xwanYvZtBN5zIXGC5DvjHYC/rdFOccyP/OvaArnsQ6qhxQY TrhIW7y5TuJYPeLoq3ddx9ejGToip7QO7JCGJFeHISrHk5UfJ9T8apvwga1T4i7lkZxp XXBXj+g0SRgfiMh3XepakC3vXvLJcYkgq/yf2nBhHicwT+ISY/H8S8GRmt2Q5DCu5aX5 XL2WEB46Gs8PYi5TdpX7+8t/zy4xZFyjYGUa5ERfOAMIcnMk84oTT/inRkOiFU4paKVS 0igw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721882247; x=1722487047; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=j1JZC88oKp8I89s655kcwpoA6y+G6A3ga7BdD3U4lzs=; b=VEk5uO+tzi3OL//5uBQA/gGMe76yFgDmUbs0B3QTyPBroqzI5d5UQgxY5T1/4/ucaI Ow9gbYtnI9ohL4c8SDrO2D/LvdfOm8iNeI+KnXcUSBCV6d0/QAMdF8hV7J6x+g1JP0EV am6JfiwW4+tZvGSoELfYf1DWN5tkkyKrQlPrqaeHDk367jJNqnwSe/CXHW6/wZU4R+Qq mcd4vDhhQl17ckSM8Bw6QlpI7KutloRjZwnU/wCV+AtEPTXARgqhCW+VD28lCVffJ1TG SdxDoaHgC0v8JMuNiFWyVDyb5XT6TJmePsxh/B9iy7W6tY19VZOAl9q3XsSee5X8Ozcs YS6A== X-Forwarded-Encrypted: i=1; AJvYcCUoXnixSB8ABsQ7nqZgS6n/W8EuhIxmcIKqXl4QR5TUBT2JOpFataa0mT+u5H7uRlzxZn3pvKYQ2+r+Oj96I7ThrETLDalLN1fAN+c0iE889qoGqnI= X-Gm-Message-State: AOJu0YwfKrjaXgvheP48oWzLJiprbxmA5qx5Uz3+rg8UsnVuiawMcT6a DxLeqI62WnHP5FFRp+XKtI4n5VQXvm6KC67hrHqpatGUGIRPGxXOVzjC5+foTw== X-Google-Smtp-Source: AGHT+IHb2jiz9X2SslE25mDu/kpZvHi3w6d2thIeHc9lJAHRInMESIHfvCFleCXeNij5wye9qnJ6mg== X-Received: by 2002:a05:6a21:328e:b0:1c3:b1e3:eb42 with SMTP id adf61e73a8af0-1c4727fb229mr2515129637.15.1721882246765; Wed, 24 Jul 2024 21:37:26 -0700 (PDT) Received: from thinkpad ([103.244.168.26]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1fed7ccd5adsm4291585ad.74.2024.07.24.21.37.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 21:37:26 -0700 (PDT) Date: Thu, 25 Jul 2024 10:07:20 +0530 From: Manivannan Sadhasivam To: Jim Quinlan Cc: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , Krzysztof Kozlowski , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, Florian Fainelli , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Rob Herring , Philipp Zabel , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , open list Subject: Re: [PATCH v4 04/12] PCI: brcmstb: Use bridge reset if available Message-ID: <20240725043720.GE2317@thinkpad> References: <20240716213131.6036-1-james.quinlan@broadcom.com> <20240716213131.6036-5-james.quinlan@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240716213131.6036-5-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240724_213728_142535_88A22D23 X-CRM114-Status: GOOD ( 21.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Jul 16, 2024 at 05:31:19PM -0400, Jim Quinlan wrote: > The 7712 SOC has a bridge reset which can be described in the device tree. > If it is present, use it. Otherwise, continue to use the legacy method to > reset the bridge. > > Signed-off-by: Jim Quinlan > Reviewed-by: Stanimir Varbanov > Reviewed-by: Florian Fainelli > --- > drivers/pci/controller/pcie-brcmstb.c | 22 +++++++++++++++++----- > 1 file changed, 17 insertions(+), 5 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index c257434edc08..92816d8d215a 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -265,6 +265,7 @@ struct brcm_pcie { > enum pcie_type type; > struct reset_control *rescal; > struct reset_control *perst_reset; > + struct reset_control *bridge; 'bridge' is an opaque name. Use something like 'bridge_reset'. > int num_memc; > u64 memc_size[PCIE_BRCM_MAX_MEMC]; > u32 hw_rev; > @@ -732,12 +733,19 @@ static void __iomem *brcm7425_pcie_map_bus(struct pci_bus *bus, > > static void brcm_pcie_bridge_sw_init_set_generic(struct brcm_pcie *pcie, u32 val) > { > - u32 tmp, mask = RGR1_SW_INIT_1_INIT_GENERIC_MASK; > - u32 shift = RGR1_SW_INIT_1_INIT_GENERIC_SHIFT; > + if (pcie->bridge) { > + if (val) > + reset_control_assert(pcie->bridge); > + else > + reset_control_deassert(pcie->bridge); Well, these APIs will bail out if the reset_control pointer is NULL. So you can just call them directly instead of if..else condition. - Mani -- மணிவண்ணன் சதாசிவம்