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 34BFDC3DA5D for ; Thu, 25 Jul 2024 04:58:54 +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=WHJ+bXZgbj37wVLktHgPMsj4okXfb1wUE1MffwGWsEY=; b=EBoLEdd2rPLZV2ou+2dKtC5Vm1 lTbTg4aeHnxlP36a9I4GVXBgRoMWyYSQXLb67uUcBndoyZ1whUp8E36S8GemY951Yms/kE4wlryFS 95Iph+ZIc6SYpoTCdsRvDHjy6qvRaM0Icj4mr/Ob68U6H51uZNjou7xSoZa9HRE4wVxPELAAhyLvo wWaU9qXTd2+NgkafDCvT3oJDp6rvQwqH3nkXRDkxPkK2UODDPD9gd4GUqLYRLb+/cTCnF+W8HII01 KVNu66jiIdzIoWCfmc2Af3n087WHoY9lwO6VDHsNgaw8+tF9BY6K7SdUxkbbhRNVTde+g5KJG3oFq kC8Nowfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWqYt-0000000HP4t-0kH9; Thu, 25 Jul 2024 04:58:43 +0000 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWqYT-0000000HOys-3G3t for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 04:58:19 +0000 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-70d150e8153so367596b3a.0 for ; Wed, 24 Jul 2024 21:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721883497; x=1722488297; 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=WHJ+bXZgbj37wVLktHgPMsj4okXfb1wUE1MffwGWsEY=; b=DPNRLuNgxbxZ6RswOmbSh0kH/Ao3EHPPtFtoT+efDwxhqDelv7voVOo3zSO/Dc1xZE 2RlLoe+Le9woXxDgHLe0V7Ks5Pfi/zlSuXfDllMKVoZW7/VxVhjcGfsBqDqGF6MCD5hh vsBM3l3beB0Je+seBDFPbd97yloO6MX2KJGYg4T02XjqKKEK3a2ynEf0Mf4dKXoKNofi XDinE4A6YNtVyBGrLEq97tSja8gLofZG6OOLDl7gkQpFjNEH15vXK1Hc2usbjbmhFS8q WHOKPEpKSRrHkJlZyw+ve0tKiyPdEZWe6mPsURAyrzKSX5Yj7DE+YNeQM3n7qOLxqBEY 6QYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721883497; x=1722488297; 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=WHJ+bXZgbj37wVLktHgPMsj4okXfb1wUE1MffwGWsEY=; b=cqCktecCwn7Z4ImO2M2xG/Q8Iuj10dMDF2+08f7aYr6qGTBibbQmyCMSqp9oY9Pic6 q0LgdbpYhbyWwo9p71w8KIONBt3GIVIzdcdoR9k5uUGNrPtXVv2JIvk3P7E9PWLtcIxJ EWAz3xifz+GtG8j8+5quNDNEWlKt+Wz5gpJNQGwAbYyG76HBeSHjbY6oWkYVi+MaGgJ4 uMfwruDW9UcM+pWqMlxjYtD0zaK4cBzKfEf6Sp7OIc5EU3VWx7OereYxbwDtlkZOE0aY koK82S3i+vQEyHf5d2PWI+/tGk1+pxD0U+QL5jDLzYAgoGFPwRWV9V9V4jxkV4jJVTxV BDsg== X-Forwarded-Encrypted: i=1; AJvYcCXkxeKmWiYadlcMBO7jdpla5uycVuayn52cLsYHyxR7BV0zGpfdiHNXZItVtZQZ69VCwpk3YrAaoJ7sMKIJ3p3zb08Tz3U4TKMWckyWbvDuj7ZDSRw= X-Gm-Message-State: AOJu0YzVzuOHujdvZzsiBV3RIiBY77X1XB+2dhsfenubwu0AmvQ47UOV ReZz/wKZjf0iPb7bxMZcopNfwAL4jKLh8DBtFxAOUMaO/PXLntygEbnvPuBBPA== X-Google-Smtp-Source: AGHT+IGERFSKOQsg47XBdDbVBiuDeQyNQcDZbrb8qoee9949yCfDn4IW3b1n3MSW1JYc8N574h2NMA== X-Received: by 2002:a05:6a00:9193:b0:70d:2b95:e3c4 with SMTP id d2e1a72fcca58-70e9ee291ddmr6265342b3a.5.1721883496792; Wed, 24 Jul 2024 21:58:16 -0700 (PDT) Received: from thinkpad ([103.244.168.26]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70ead874c62sm374101b3a.157.2024.07.24.21.58.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 21:58:16 -0700 (PDT) Date: Thu, 25 Jul 2024 10:28:10 +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 , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , open list Subject: Re: [PATCH v4 11/12] PCI: brcmstb: Change field name from 'type' to 'model' Message-ID: <20240725045810.GK2317@thinkpad> References: <20240716213131.6036-1-james.quinlan@broadcom.com> <20240716213131.6036-12-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-12-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240724_215817_873010_A0F233E7 X-CRM114-Status: GOOD ( 30.17 ) 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:26PM -0400, Jim Quinlan wrote: > The 'type' field used in the driver to discern SoC differences is confusing > so change it to the more apt 'model'. We considered using 'family' but > this conflicts with Broadcom's conception of a family; for example, 7216a0 > and 7216b0 chips are both considered separate families as each has multiple > derivative product chips based on the original design. > TBH, 'model' is also confusing :) Why can't you just use 'soc' as you are referrring to the SoC name. - Mani > Signed-off-by: Jim Quinlan > Reviewed-by: Florian Fainelli > --- > drivers/pci/controller/pcie-brcmstb.c | 42 +++++++++++++-------------- > 1 file changed, 21 insertions(+), 21 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 2fe1f2a26697..fa5616a56383 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -211,7 +211,7 @@ enum { > PCIE_INTR2_CPU_BASE, > }; > > -enum pcie_type { > +enum pcie_model { > GENERIC, > BCM7425, > BCM7435, > @@ -229,7 +229,7 @@ struct rc_bar { > > struct pcie_cfg_data { > const int *offsets; > - const enum pcie_type type; > + const enum pcie_model model; > const bool has_phy; > unsigned int num_inbound; > int (*perst_set)(struct brcm_pcie *pcie, u32 val); > @@ -270,7 +270,7 @@ struct brcm_pcie { > u64 msi_target_addr; > struct brcm_msi *msi; > const int *reg_offsets; > - enum pcie_type type; > + enum pcie_model model; > struct reset_control *rescal; > struct reset_control *perst_reset; > struct reset_control *bridge; > @@ -288,7 +288,7 @@ struct brcm_pcie { > > static inline bool is_bmips(const struct brcm_pcie *pcie) > { > - return pcie->type == BCM7435 || pcie->type == BCM7425; > + return pcie->model == BCM7435 || pcie->model == BCM7425; > } > > /* > @@ -852,7 +852,7 @@ static int brcm_pcie_get_inbound_wins(struct brcm_pcie *pcie, > * security considerations, and is not implemented in our modern > * SoCs. > */ > - if (pcie->type != BCM7712) > + if (pcie->model != BCM7712) > set_bar(b++, &n, 0, 0, 0); > > resource_list_for_each_entry(entry, &bridge->dma_ranges) { > @@ -869,7 +869,7 @@ static int brcm_pcie_get_inbound_wins(struct brcm_pcie *pcie, > * That being said, each BARs size must still be a power of > * two. > */ > - if (pcie->type == BCM7712) > + if (pcie->model == BCM7712) > set_bar(b++, &n, size, cpu_beg, pcie_beg); > > if (n > pcie->num_inbound) > @@ -886,7 +886,7 @@ static int brcm_pcie_get_inbound_wins(struct brcm_pcie *pcie, > * that enables multiple memory controllers. As such, it can return > * now w/o doing special configuration. > */ > - if (pcie->type == BCM7712) > + if (pcie->model == BCM7712) > return n; > > ret = of_property_read_variable_u64_array(pcie->np, "brcm,scb-sizes", pcie->memc_size, 1, > @@ -1008,7 +1008,7 @@ static void set_inbound_win_registers(struct brcm_pcie *pcie, const struct rc_ba > * 7712: > * All of their BARs need to be set. > */ > - if (pcie->type == BCM7712) { > + if (pcie->model == BCM7712) { > /* BUS remap register settings */ > reg_offset = brcm_ubus_reg_offset(i); > tmp = lower_32_bits(cpu_addr) & ~0xfff; > @@ -1036,7 +1036,7 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) > return ret; > > /* Ensure that PERST# is asserted; some bootloaders may deassert it. */ > - if (pcie->type == BCM2711) { > + if (pcie->model == BCM2711) { > ret = pcie->perst_set(pcie, 1); > if (ret) { > pcie->bridge_sw_init_set(pcie, 0); > @@ -1067,9 +1067,9 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) > */ > if (is_bmips(pcie)) > burst = 0x1; /* 256 bytes */ > - else if (pcie->type == BCM2711) > + else if (pcie->model == BCM2711) > burst = 0x0; /* 128 bytes */ > - else if (pcie->type == BCM7278) > + else if (pcie->model == BCM7278) > burst = 0x3; /* 512 bytes */ > else > burst = 0x2; /* 512 bytes */ > @@ -1666,7 +1666,7 @@ static const int pcie_offsets_bmips_7425[] = { > > static const struct pcie_cfg_data generic_cfg = { > .offsets = pcie_offsets, > - .type = GENERIC, > + .model = GENERIC, > .perst_set = brcm_pcie_perst_set_generic, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > .num_inbound = 3, > @@ -1674,7 +1674,7 @@ static const struct pcie_cfg_data generic_cfg = { > > static const struct pcie_cfg_data bcm7425_cfg = { > .offsets = pcie_offsets_bmips_7425, > - .type = BCM7425, > + .model = BCM7425, > .perst_set = brcm_pcie_perst_set_generic, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > .num_inbound = 3, > @@ -1682,7 +1682,7 @@ static const struct pcie_cfg_data bcm7425_cfg = { > > static const struct pcie_cfg_data bcm7435_cfg = { > .offsets = pcie_offsets, > - .type = BCM7435, > + .model = BCM7435, > .perst_set = brcm_pcie_perst_set_generic, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > .num_inbound = 3, > @@ -1690,7 +1690,7 @@ static const struct pcie_cfg_data bcm7435_cfg = { > > static const struct pcie_cfg_data bcm4908_cfg = { > .offsets = pcie_offsets, > - .type = BCM4908, > + .model = BCM4908, > .perst_set = brcm_pcie_perst_set_4908, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > .num_inbound = 3, > @@ -1706,7 +1706,7 @@ static const int pcie_offset_bcm7278[] = { > > static const struct pcie_cfg_data bcm7278_cfg = { > .offsets = pcie_offset_bcm7278, > - .type = BCM7278, > + .model = BCM7278, > .perst_set = brcm_pcie_perst_set_7278, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278, > .num_inbound = 3, > @@ -1714,7 +1714,7 @@ static const struct pcie_cfg_data bcm7278_cfg = { > > static const struct pcie_cfg_data bcm2711_cfg = { > .offsets = pcie_offsets, > - .type = BCM2711, > + .model = BCM2711, > .perst_set = brcm_pcie_perst_set_generic, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic, > .num_inbound = 3, > @@ -1722,7 +1722,7 @@ static const struct pcie_cfg_data bcm2711_cfg = { > > static const struct pcie_cfg_data bcm7216_cfg = { > .offsets = pcie_offset_bcm7278, > - .type = BCM7278, > + .model = BCM7278, > .perst_set = brcm_pcie_perst_set_7278, > .bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_7278, > .has_phy = true, > @@ -1779,7 +1779,7 @@ static int brcm_pcie_probe(struct platform_device *pdev) > pcie->dev = &pdev->dev; > pcie->np = np; > pcie->reg_offsets = data->offsets; > - pcie->type = data->type; > + pcie->model = data->model; > pcie->perst_set = data->perst_set; > pcie->bridge_sw_init_set = data->bridge_sw_init_set; > pcie->has_phy = data->has_phy; > @@ -1848,7 +1848,7 @@ static int brcm_pcie_probe(struct platform_device *pdev) > goto fail; > > pcie->hw_rev = readl(pcie->base + PCIE_MISC_REVISION); > - if (pcie->type == BCM4908 && pcie->hw_rev >= BRCM_PCIE_HW_REV_3_20) { > + if (pcie->model == BCM4908 && pcie->hw_rev >= BRCM_PCIE_HW_REV_3_20) { > dev_err(pcie->dev, "hardware revision with unsupported PERST# setup\n"); > ret = -ENODEV; > goto fail; > @@ -1863,7 +1863,7 @@ static int brcm_pcie_probe(struct platform_device *pdev) > } > } > > - bridge->ops = pcie->type == BCM7425 ? &brcm7425_pcie_ops : &brcm_pcie_ops; > + bridge->ops = pcie->model == BCM7425 ? &brcm7425_pcie_ops : &brcm_pcie_ops; > bridge->sysdata = pcie; > > platform_set_drvdata(pdev, pcie); > -- > 2.17.1 > -- மணிவண்ணன் சதாசிவம்