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 C31CBEE01F0 for ; Tue, 10 Sep 2024 23:08:21 +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-Type: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=TtIXcNhPoDDt5h5lLl1E55vBgFmbKmFw9cHSPLKgptQ=; b=RiYufD6XRy5VnD GAhX7ld0dNmz8i7qmCYi2XJyC9B/JZqDJMdEolTnJBA5OYrCE0EdHCLjHLLFxh3LRFcliMnca/XaM GWLx3d488yMZWgUhgEY0KIUa3ymCY88AUsCYMRFeUnXrmkdPkStncTs/VDfPuDJXvVUWCXd+48qZZ pXGP1pEpzfbniPhIHR5mvk10pJUsA7XMEXixg6BNhic7Yr16nKpXoajPMLso7atP7AVnDYcgjzUTE 3rRuIsKlOhzL2RpgRyfOMTChoUFUtXIMoLW1pYma8kMw8UldNww1dyaRx0y+U0pJ2iJBrhCD+AXlT iOFwon3lIaYaHOnYa2Nw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1so9xw-00000007OoW-1M9x; Tue, 10 Sep 2024 23:08:08 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1so9wt-00000007OiR-44gA; Tue, 10 Sep 2024 23:07:05 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4CCDF5C017A; Tue, 10 Sep 2024 23:06:59 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1DB6AC4CEC3; Tue, 10 Sep 2024 23:07:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1726009622; bh=aXNVJJUu723r1qciRRGghYzcmNf7xP8P9iDxmmz+3OI=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=o2GAGHI/MVnWvX8smNfwyH+7o0QNTgbUT+/HV75jeFnjhQyAn+0+slFdBpCD0JTNE zMVbwuQWvAGPzNWcPCnLA32/8syNUOorulamtDnV8zhYxA4EqHoFSgICKUeM4zCycE WPJUNmowQEr49maHfkzTii7hDERN1R6LlqAz+nUcoELZqwoXIRb1dyvYyB54Sa3zVX RWwFKfC27zPAy8lCjFfnwcv7shjYCW8tlrg5iygPkiXM7UWXbRzYB2e233Wg6ySkWp rJ+6POmrg+JUsYT6K7FjDj+KjidBXeADbAjx2y1PExMJWyqFSOqWTL8FBWGwH7SDLa yumPa8iVd4DNg== Date: Tue, 10 Sep 2024 18:07:00 -0500 From: Bjorn Helgaas To: Jim Quinlan Cc: Nicolas Saenz Julienne , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , Manivannan Sadhasivam , Krzysztof Kozlowski , Rob Herring , jim2101024@gmail.com, bcm-kernel-feedback-list@broadcom.com, linux-pci@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Bjorn Helgaas Subject: Re: [PATCH] PCI: brcmstb: Sort enums, pcie_offsets[], pcie_cfg_data, .compatible strings Message-ID: <20240910230700.GA608615@bhelgaas> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240902205456.227409-1-helgaas@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240910_160704_125987_3425A990 X-CRM114-Status: GOOD ( 21.41 ) 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 Mon, Sep 02, 2024 at 03:54:56PM -0500, Bjorn Helgaas wrote: > From: Bjorn Helgaas > > Sort enum pcie_soc_base values. > > Rename pcie_offsets_bmips_7425[] to pcie_offsets_bcm7425[] to match BCM7425 > pcie_soc_base enum, bcm7425_cfg, and "brcm,bcm7425-pcie" .compatible > string. > > Rename pcie_offset_bcm7278[] to pcie_offsets_bcm7278[] to match other > "pcie_offsets" names. > > Rename pcie_offset_bcm7712[] to pcie_offsets_bcm7712[] to match other > "pcie_offsets" names. > > Sort pcie_offsets_*[] by SoC name, move them all together, indent values > for easy reading. > > Sort pcie_cfg_data structs by SoC name. > > Sort .compatible strings by SoC name. > > No functional change intended. > > Signed-off-by: Bjorn Helgaas I applied this on top of pci/controller/brcmstb for v6.12. Krzysztof, if you decide to apply anything else on this branch, feel free to drop this patch first if it causes conflicts, and I can refresh it. > --- > This is based on Jim's v6 series at > https://lore.kernel.org/r/20240815225731.40276-1-james.quinlan@broadcom.com > as applied at > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=1ae791a877e7 > > drivers/pci/controller/pcie-brcmstb.c | 114 +++++++++++++------------- > 1 file changed, 57 insertions(+), 57 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 21e692a57882..07b415fa04ea 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -220,11 +220,11 @@ enum { > > enum pcie_soc_base { > GENERIC, > - BCM7425, > - BCM7435, > + BCM2711, > BCM4908, > BCM7278, > - BCM2711, > + BCM7425, > + BCM7435, > BCM7712, > }; > > @@ -1663,26 +1663,34 @@ static void brcm_pcie_remove(struct platform_device *pdev) > } > > static const int pcie_offsets[] = { > - [RGR1_SW_INIT_1] = 0x9210, > - [EXT_CFG_INDEX] = 0x9000, > - [EXT_CFG_DATA] = 0x9004, > - [PCIE_HARD_DEBUG] = 0x4204, > - [PCIE_INTR2_CPU_BASE] = 0x4300, > + [RGR1_SW_INIT_1] = 0x9210, > + [EXT_CFG_INDEX] = 0x9000, > + [EXT_CFG_DATA] = 0x9004, > + [PCIE_HARD_DEBUG] = 0x4204, > + [PCIE_INTR2_CPU_BASE] = 0x4300, > }; > > -static const int pcie_offsets_bmips_7425[] = { > - [RGR1_SW_INIT_1] = 0x8010, > - [EXT_CFG_INDEX] = 0x8300, > - [EXT_CFG_DATA] = 0x8304, > - [PCIE_HARD_DEBUG] = 0x4204, > - [PCIE_INTR2_CPU_BASE] = 0x4300, > +static const int pcie_offsets_bcm7278[] = { > + [RGR1_SW_INIT_1] = 0xc010, > + [EXT_CFG_INDEX] = 0x9000, > + [EXT_CFG_DATA] = 0x9004, > + [PCIE_HARD_DEBUG] = 0x4204, > + [PCIE_INTR2_CPU_BASE] = 0x4300, > }; > > -static const int pcie_offset_bcm7712[] = { > - [EXT_CFG_INDEX] = 0x9000, > - [EXT_CFG_DATA] = 0x9004, > - [PCIE_HARD_DEBUG] = 0x4304, > - [PCIE_INTR2_CPU_BASE] = 0x4400, > +static const int pcie_offsets_bcm7425[] = { > + [RGR1_SW_INIT_1] = 0x8010, > + [EXT_CFG_INDEX] = 0x8300, > + [EXT_CFG_DATA] = 0x8304, > + [PCIE_HARD_DEBUG] = 0x4204, > + [PCIE_INTR2_CPU_BASE] = 0x4300, > +}; > + > +static const int pcie_offsets_bcm7712[] = { > + [EXT_CFG_INDEX] = 0x9000, > + [EXT_CFG_DATA] = 0x9004, > + [PCIE_HARD_DEBUG] = 0x4304, > + [PCIE_INTR2_CPU_BASE] = 0x4400, > }; > > static const struct pcie_cfg_data generic_cfg = { > @@ -1693,8 +1701,32 @@ static const struct pcie_cfg_data generic_cfg = { > .num_inbound_wins = 3, > }; > > +static const struct pcie_cfg_data bcm2711_cfg = { > + .offsets = pcie_offsets, > + .soc_base = BCM2711, > + .perst_set = brcm_pcie_perst_set_generic, > + .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > + .num_inbound_wins = 3, > +}; > + > +static const struct pcie_cfg_data bcm4908_cfg = { > + .offsets = pcie_offsets, > + .soc_base = BCM4908, > + .perst_set = brcm_pcie_perst_set_4908, > + .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > + .num_inbound_wins = 3, > +}; > + > +static const struct pcie_cfg_data bcm7278_cfg = { > + .offsets = pcie_offsets_bcm7278, > + .soc_base = BCM7278, > + .perst_set = brcm_pcie_perst_set_7278, > + .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278, > + .num_inbound_wins = 3, > +}; > + > static const struct pcie_cfg_data bcm7425_cfg = { > - .offsets = pcie_offsets_bmips_7425, > + .offsets = pcie_offsets_bcm7425, > .soc_base = BCM7425, > .perst_set = brcm_pcie_perst_set_generic, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > @@ -1709,40 +1741,8 @@ static const struct pcie_cfg_data bcm7435_cfg = { > .num_inbound_wins = 3, > }; > > -static const struct pcie_cfg_data bcm4908_cfg = { > - .offsets = pcie_offsets, > - .soc_base = BCM4908, > - .perst_set = brcm_pcie_perst_set_4908, > - .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > - .num_inbound_wins = 3, > -}; > - > -static const int pcie_offset_bcm7278[] = { > - [RGR1_SW_INIT_1] = 0xc010, > - [EXT_CFG_INDEX] = 0x9000, > - [EXT_CFG_DATA] = 0x9004, > - [PCIE_HARD_DEBUG] = 0x4204, > - [PCIE_INTR2_CPU_BASE] = 0x4300, > -}; > - > -static const struct pcie_cfg_data bcm7278_cfg = { > - .offsets = pcie_offset_bcm7278, > - .soc_base = BCM7278, > - .perst_set = brcm_pcie_perst_set_7278, > - .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278, > - .num_inbound_wins = 3, > -}; > - > -static const struct pcie_cfg_data bcm2711_cfg = { > - .offsets = pcie_offsets, > - .soc_base = BCM2711, > - .perst_set = brcm_pcie_perst_set_generic, > - .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > - .num_inbound_wins = 3, > -}; > - > static const struct pcie_cfg_data bcm7216_cfg = { > - .offsets = pcie_offset_bcm7278, > + .offsets = pcie_offsets_bcm7278, > .soc_base = BCM7278, > .perst_set = brcm_pcie_perst_set_7278, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278, > @@ -1751,7 +1751,7 @@ static const struct pcie_cfg_data bcm7216_cfg = { > }; > > static const struct pcie_cfg_data bcm7712_cfg = { > - .offsets = pcie_offset_bcm7712, > + .offsets = pcie_offsets_bcm7712, > .perst_set = brcm_pcie_perst_set_7278, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > .soc_base = BCM7712, > @@ -1762,11 +1762,11 @@ static const struct of_device_id brcm_pcie_match[] = { > { .compatible = "brcm,bcm2711-pcie", .data = &bcm2711_cfg }, > { .compatible = "brcm,bcm4908-pcie", .data = &bcm4908_cfg }, > { .compatible = "brcm,bcm7211-pcie", .data = &generic_cfg }, > - { .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg }, > { .compatible = "brcm,bcm7216-pcie", .data = &bcm7216_cfg }, > - { .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg }, > - { .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg }, > + { .compatible = "brcm,bcm7278-pcie", .data = &bcm7278_cfg }, > { .compatible = "brcm,bcm7425-pcie", .data = &bcm7425_cfg }, > + { .compatible = "brcm,bcm7435-pcie", .data = &bcm7435_cfg }, > + { .compatible = "brcm,bcm7445-pcie", .data = &generic_cfg }, > { .compatible = "brcm,bcm7712-pcie", .data = &bcm7712_cfg }, > {}, > }; > -- > 2.34.1 >