From: Rob Herring <robh@kernel.org> To: Jim Quinlan <james.quinlan@broadcom.com> Cc: linux-pci@vger.kernel.org, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, Christoph Hellwig <hch@lst.de>, Robin Murphy <robin.murphy@arm.com>, bcm-kernel-feedback-list@broadcom.com, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Bjorn Helgaas <bhelgaas@google.com>, Florian Fainelli <f.fainelli@gmail.com>, "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" <linux-rpi-kernel@lists.infradead.org>, "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" <linux-arm-kernel@lists.infradead.org>, open list <linux-kernel@vger.kernel.org> Subject: Re: [PATCH v11 05/11] PCI: brcmstb: Add bcm7278 PERST# support Date: Thu, 10 Sep 2020 10:04:11 -0600 [thread overview] Message-ID: <20200910160411.GA439527@bogus> (raw) In-Reply-To: <20200824193036.6033-6-james.quinlan@broadcom.com> On Mon, Aug 24, 2020 at 03:30:18PM -0400, Jim Quinlan wrote: > From: Jim Quinlan <jquinlan@broadcom.com> > > The PERST# bit was moved to a different register in 7278-type STB chips. > In addition, the polarity of the bit was also changed; for other chips > writing a 1 specified assert; for 7278-type chips, writing a 0 specifies > assert. > > Of course, PERST# is a PCIe asserted-low signal. > > Signed-off-by: Jim Quinlan <jquinlan@broadcom.com> > Acked-by: Florian Fainelli <f.fainelli@gmail.com> > --- > drivers/pci/controller/pcie-brcmstb.c | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 3d588ab7a6dd..acf2239b0251 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -83,6 +83,7 @@ > > #define PCIE_MISC_PCIE_CTRL 0x4064 > #define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_MASK 0x1 > +#define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK 0x4 > > #define PCIE_MISC_PCIE_STATUS 0x4068 > #define PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK 0x80 > @@ -684,9 +685,16 @@ static inline void brcm_pcie_perst_set(struct brcm_pcie *pcie, u32 val) > { > u32 tmp; > > - tmp = readl(pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); > - u32p_replace_bits(&tmp, val, PCIE_RGR1_SW_INIT_1_PERST_MASK); > - writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); > + if (pcie->type == BCM7278) { > + /* Perst bit has moved and assert value is 0 */ > + tmp = readl(pcie->base + PCIE_MISC_PCIE_CTRL); > + u32p_replace_bits(&tmp, !val, PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK); > + writel(tmp, pcie->base + PCIE_MISC_PCIE_CTRL); > + } else { > + tmp = readl(pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); > + u32p_replace_bits(&tmp, val, PCIE_RGR1_SW_INIT_1_PERST_MASK); > + writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); Humm, now we have a mixture of a code path based on the chip and variables to abstract the register details. Just do a function per chip. I have some notion to abstract out the PERST# handling from the host bridges. We have several cases of GPIO based handling and random assertion times. So having an ops function here will move in that direction. > + } > } > > static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie, > @@ -771,7 +779,10 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) > > /* Reset the bridge */ > brcm_pcie_bridge_sw_init_set(pcie, 1); > - brcm_pcie_perst_set(pcie, 1); If these 2 functions are always called together, then you just need 1 per chip function. > + > + /* BCM7278 fails when PERST# is set here */ > + if (pcie->type != BCM7278) > + brcm_pcie_perst_set(pcie, 1); > > usleep_range(100, 200); > > -- > 2.17.1 >
WARNING: multiple messages have this Message-ID (diff)
From: Rob Herring <robh@kernel.org> To: Jim Quinlan <james.quinlan@broadcom.com> Cc: "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" <linux-arm-kernel@lists.infradead.org>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, linux-pci@vger.kernel.org, open list <linux-kernel@vger.kernel.org>, Florian Fainelli <f.fainelli@gmail.com>, bcm-kernel-feedback-list@broadcom.com, "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" <linux-rpi-kernel@lists.infradead.org>, Bjorn Helgaas <bhelgaas@google.com>, Robin Murphy <robin.murphy@arm.com>, Christoph Hellwig <hch@lst.de>, Nicolas Saenz Julienne <nsaenzjulienne@suse.de> Subject: Re: [PATCH v11 05/11] PCI: brcmstb: Add bcm7278 PERST# support Date: Thu, 10 Sep 2020 10:04:11 -0600 [thread overview] Message-ID: <20200910160411.GA439527@bogus> (raw) In-Reply-To: <20200824193036.6033-6-james.quinlan@broadcom.com> On Mon, Aug 24, 2020 at 03:30:18PM -0400, Jim Quinlan wrote: > From: Jim Quinlan <jquinlan@broadcom.com> > > The PERST# bit was moved to a different register in 7278-type STB chips. > In addition, the polarity of the bit was also changed; for other chips > writing a 1 specified assert; for 7278-type chips, writing a 0 specifies > assert. > > Of course, PERST# is a PCIe asserted-low signal. > > Signed-off-by: Jim Quinlan <jquinlan@broadcom.com> > Acked-by: Florian Fainelli <f.fainelli@gmail.com> > --- > drivers/pci/controller/pcie-brcmstb.c | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 3d588ab7a6dd..acf2239b0251 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -83,6 +83,7 @@ > > #define PCIE_MISC_PCIE_CTRL 0x4064 > #define PCIE_MISC_PCIE_CTRL_PCIE_L23_REQUEST_MASK 0x1 > +#define PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK 0x4 > > #define PCIE_MISC_PCIE_STATUS 0x4068 > #define PCIE_MISC_PCIE_STATUS_PCIE_PORT_MASK 0x80 > @@ -684,9 +685,16 @@ static inline void brcm_pcie_perst_set(struct brcm_pcie *pcie, u32 val) > { > u32 tmp; > > - tmp = readl(pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); > - u32p_replace_bits(&tmp, val, PCIE_RGR1_SW_INIT_1_PERST_MASK); > - writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); > + if (pcie->type == BCM7278) { > + /* Perst bit has moved and assert value is 0 */ > + tmp = readl(pcie->base + PCIE_MISC_PCIE_CTRL); > + u32p_replace_bits(&tmp, !val, PCIE_MISC_PCIE_CTRL_PCIE_PERSTB_MASK); > + writel(tmp, pcie->base + PCIE_MISC_PCIE_CTRL); > + } else { > + tmp = readl(pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); > + u32p_replace_bits(&tmp, val, PCIE_RGR1_SW_INIT_1_PERST_MASK); > + writel(tmp, pcie->base + PCIE_RGR1_SW_INIT_1(pcie)); Humm, now we have a mixture of a code path based on the chip and variables to abstract the register details. Just do a function per chip. I have some notion to abstract out the PERST# handling from the host bridges. We have several cases of GPIO based handling and random assertion times. So having an ops function here will move in that direction. > + } > } > > static inline int brcm_pcie_get_rc_bar2_size_and_offset(struct brcm_pcie *pcie, > @@ -771,7 +779,10 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) > > /* Reset the bridge */ > brcm_pcie_bridge_sw_init_set(pcie, 1); > - brcm_pcie_perst_set(pcie, 1); If these 2 functions are always called together, then you just need 1 per chip function. > + > + /* BCM7278 fails when PERST# is set here */ > + if (pcie->type != BCM7278) > + brcm_pcie_perst_set(pcie, 1); > > usleep_range(100, 200); > > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-09-10 19:06 UTC|newest] Thread overview: 176+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-24 19:30 [PATCH v11 00/11] PCI: brcmstb: enable PCIe for STB chips Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan via iommu 2020-08-24 19:30 ` Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-08-24 19:30 ` [PATCH v11 01/11] PCI: brcmstb: PCIE_BRCMSTB depends on ARCH_BRCMSTB Jim Quinlan 2020-08-24 19:30 ` [PATCH v11 02/11] dt-bindings: PCI: Add bindings for more Brcmstb chips Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-08-24 19:30 ` [PATCH v11 03/11] PCI: brcmstb: Add bcm7278 register info Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-09-10 15:44 ` Rob Herring 2020-09-10 15:44 ` Rob Herring 2020-08-24 19:30 ` [PATCH v11 04/11] PCI: brcmstb: Add suspend and resume pm_ops Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-09-10 15:56 ` Rob Herring 2020-09-10 15:56 ` Rob Herring 2020-09-10 16:42 ` Jim Quinlan 2020-09-10 16:42 ` Jim Quinlan 2020-09-10 18:50 ` Rob Herring 2020-09-10 18:50 ` Rob Herring 2020-09-10 18:54 ` Florian Fainelli 2020-09-10 18:54 ` Florian Fainelli 2020-09-10 19:05 ` Jim Quinlan 2020-09-10 19:05 ` Jim Quinlan 2020-09-10 19:07 ` Florian Fainelli 2020-09-10 19:07 ` Florian Fainelli 2020-09-10 19:09 ` Jim Quinlan 2020-09-10 19:09 ` Jim Quinlan 2020-09-10 18:47 ` Florian Fainelli 2020-09-10 18:47 ` Florian Fainelli 2020-08-24 19:30 ` [PATCH v11 05/11] PCI: brcmstb: Add bcm7278 PERST# support Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-09-10 16:04 ` Rob Herring [this message] 2020-09-10 16:04 ` Rob Herring 2020-08-24 19:30 ` [PATCH v11 06/11] PCI: brcmstb: Add control of rescal reset Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-09-08 13:32 ` Lorenzo Pieralisi 2020-09-08 13:32 ` Lorenzo Pieralisi 2020-09-10 16:09 ` Rob Herring 2020-09-10 16:09 ` Rob Herring 2020-08-24 19:30 ` [PATCH v11 07/11] device-mapping: Introduce DMA range map, supplanting dma_pfn_offset Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan via iommu 2020-08-25 9:45 ` Andy Shevchenko 2020-08-25 9:45 ` Andy Shevchenko 2020-08-25 9:45 ` Andy Shevchenko 2020-08-25 15:37 ` Jim Quinlan 2020-08-25 15:37 ` Jim Quinlan 2020-08-25 15:37 ` Jim Quinlan via iommu 2020-09-01 8:24 ` Christoph Hellwig 2020-09-01 8:24 ` Christoph Hellwig 2020-09-02 15:02 ` Jim Quinlan 2020-09-02 15:02 ` Jim Quinlan 2020-09-02 15:02 ` Jim Quinlan via iommu 2020-09-03 16:06 ` Christoph Hellwig 2020-09-03 16:06 ` Christoph Hellwig 2020-09-07 15:18 ` Nicolas Saenz Julienne 2020-09-07 15:18 ` Nicolas Saenz Julienne 2020-09-07 15:18 ` Nicolas Saenz Julienne 2020-09-08 6:54 ` Christoph Hellwig 2020-09-08 6:54 ` Christoph Hellwig 2020-09-02 21:53 ` Nathan Chancellor 2020-09-02 21:53 ` Nathan Chancellor 2020-09-02 21:53 ` Nathan Chancellor 2020-09-02 22:11 ` Jim Quinlan 2020-09-02 22:11 ` Jim Quinlan 2020-09-02 22:11 ` Jim Quinlan via iommu 2020-09-02 22:38 ` Nathan Chancellor 2020-09-02 22:38 ` Nathan Chancellor 2020-09-02 22:38 ` Nathan Chancellor 2020-09-03 0:36 ` Florian Fainelli 2020-09-03 0:36 ` Florian Fainelli 2020-09-03 0:36 ` Florian Fainelli 2020-09-03 0:52 ` Nathan Chancellor 2020-09-03 0:52 ` Nathan Chancellor 2020-09-03 0:52 ` Nathan Chancellor 2020-09-03 17:32 ` Jim Quinlan 2020-09-03 17:32 ` Jim Quinlan 2020-09-03 17:32 ` Jim Quinlan via iommu 2020-09-07 15:01 ` Nicolas Saenz Julienne 2020-09-07 15:01 ` Nicolas Saenz Julienne 2020-09-07 15:01 ` Nicolas Saenz Julienne 2020-09-07 17:40 ` Jim Quinlan 2020-09-07 17:40 ` Jim Quinlan 2020-09-07 17:40 ` Jim Quinlan via iommu 2020-09-07 18:19 ` Nicolas Saenz Julienne 2020-09-07 18:19 ` Nicolas Saenz Julienne 2020-09-07 18:19 ` Nicolas Saenz Julienne 2020-09-08 6:59 ` Christoph Hellwig 2020-09-08 6:59 ` Christoph Hellwig 2020-09-08 7:29 ` Christoph Hellwig 2020-09-08 7:29 ` Christoph Hellwig 2020-09-08 7:32 ` Christoph Hellwig 2020-09-08 7:32 ` Christoph Hellwig 2020-09-08 9:43 ` Christoph Hellwig 2020-09-08 9:43 ` Christoph Hellwig 2020-09-08 11:20 ` Nicolas Saenz Julienne 2020-09-08 11:20 ` Nicolas Saenz Julienne 2020-09-08 11:20 ` Nicolas Saenz Julienne 2020-09-08 12:41 ` Christoph Hellwig 2020-09-08 12:41 ` Christoph Hellwig 2020-09-08 15:59 ` Jim Quinlan 2020-09-08 15:59 ` Jim Quinlan 2020-09-08 15:59 ` Jim Quinlan via iommu 2020-09-09 6:21 ` Nathan Chancellor 2020-09-09 6:21 ` Nathan Chancellor 2020-09-09 6:21 ` Nathan Chancellor 2020-09-08 6:58 ` Christoph Hellwig 2020-09-08 6:58 ` Christoph Hellwig 2020-08-24 19:30 ` [PATCH v11 08/11] PCI: brcmstb: Set additional internal memory DMA viewport sizes Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-09-10 16:17 ` Rob Herring 2020-09-10 16:17 ` Rob Herring 2020-09-11 15:28 ` Jim Quinlan 2020-09-11 15:28 ` Jim Quinlan 2020-09-11 16:13 ` Rob Herring 2020-09-11 16:13 ` Rob Herring 2020-08-24 19:30 ` [PATCH v11 09/11] PCI: brcmstb: Accommodate MSI for older chips Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-09-10 16:20 ` Rob Herring 2020-09-10 16:20 ` Rob Herring 2020-08-24 19:30 ` [PATCH v11 10/11] PCI: brcmstb: Set bus max burst size by chip type Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-09-10 16:22 ` Rob Herring 2020-09-10 16:22 ` Rob Herring 2020-08-24 19:30 ` [PATCH v11 11/11] PCI: brcmstb: Add bcm7211, bcm7216, bcm7445, bcm7278 to match list Jim Quinlan 2020-08-24 19:30 ` Jim Quinlan 2020-09-10 16:23 ` Rob Herring 2020-09-10 16:23 ` Rob Herring 2020-08-25 17:40 ` [PATCH v11 00/11] PCI: brcmstb: enable PCIe for STB chips Florian Fainelli 2020-08-25 17:40 ` Florian Fainelli 2020-08-25 17:40 ` Florian Fainelli 2020-08-25 17:40 ` Florian Fainelli 2020-08-25 17:40 ` Florian Fainelli 2020-08-25 17:40 ` Florian Fainelli 2020-08-27 6:35 ` Christoph Hellwig 2020-08-27 6:35 ` Christoph Hellwig 2020-08-27 6:35 ` Christoph Hellwig 2020-08-27 6:35 ` Christoph Hellwig 2020-08-27 6:35 ` Christoph Hellwig 2020-08-27 13:29 ` Jim Quinlan 2020-08-27 13:29 ` Jim Quinlan 2020-08-27 13:29 ` Jim Quinlan 2020-08-27 13:29 ` Jim Quinlan via iommu 2020-08-27 13:29 ` Jim Quinlan 2020-08-27 13:29 ` Jim Quinlan 2020-09-07 9:16 ` Lorenzo Pieralisi 2020-09-07 9:16 ` Lorenzo Pieralisi 2020-09-07 9:16 ` Lorenzo Pieralisi 2020-09-07 9:16 ` Lorenzo Pieralisi 2020-09-07 9:16 ` Lorenzo Pieralisi 2020-09-07 9:16 ` Lorenzo Pieralisi 2020-09-07 17:43 ` Jim Quinlan 2020-09-07 17:43 ` Jim Quinlan 2020-09-07 17:43 ` Jim Quinlan 2020-09-07 17:43 ` Jim Quinlan via iommu 2020-09-07 17:43 ` Jim Quinlan 2020-09-07 17:43 ` Jim Quinlan 2020-09-07 18:29 ` Florian Fainelli 2020-09-07 18:29 ` Florian Fainelli 2020-09-07 18:29 ` Florian Fainelli 2020-09-07 18:29 ` Florian Fainelli 2020-09-07 18:29 ` Florian Fainelli 2020-09-07 18:29 ` Florian Fainelli 2020-09-08 10:42 ` Lorenzo Pieralisi 2020-09-08 10:42 ` Lorenzo Pieralisi 2020-09-08 10:42 ` Lorenzo Pieralisi 2020-09-08 10:42 ` Lorenzo Pieralisi 2020-09-08 10:42 ` Lorenzo Pieralisi 2020-09-08 10:42 ` Lorenzo Pieralisi 2020-09-08 12:20 ` Christoph Hellwig 2020-09-08 12:20 ` Christoph Hellwig 2020-09-08 12:20 ` Christoph Hellwig 2020-09-08 12:20 ` Christoph Hellwig 2020-09-08 12:20 ` Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200910160411.GA439527@bogus \ --to=robh@kernel.org \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=bhelgaas@google.com \ --cc=f.fainelli@gmail.com \ --cc=hch@lst.de \ --cc=james.quinlan@broadcom.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux-rpi-kernel@lists.infradead.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=nsaenzjulienne@suse.de \ --cc=robin.murphy@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.