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 54376C3DA5D for ; Thu, 25 Jul 2024 04:43:49 +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=kforIxrR32hXGERHtjq0u+nCqy7s7oB2GTNLcgTbBB0=; b=hMSBgtMjNFAGuZ9Bl92wH0sqXJ YmPLsN7riNeRRaJowgtm9CQNKJKHNjrgLbw4MEEnpfP42a4E4vw7lN87RaW1U6SdTXY3EoM9Vfc/v cXeiio4EMEjDDlLpEPG0bjDhb5GVi60Jj4VHCgQuxecUS3aB6udl8USFsbDlFHyLprVzvCR0kj6VL mkgZ3K7G1ClLZP18elcNSu8UxYt3YVFCD8IOgG25piK1N1bqSzInhhNl6tsGvM4j3zFhu4VEtsS4o vdzMscQ5SPeXobkAoHTmsNnzS4krrEROwE2hvRwSiqOLBZRJk2C421P6n+pWC4vbZJ71Uf6uB7sOq 5ZigJqeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWqKF-0000000HNMA-41dc; Thu, 25 Jul 2024 04:43:36 +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 1sWqJp-0000000HNEQ-2Gr3 for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 04:43:11 +0000 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-70d333d5890so439880b3a.0 for ; Wed, 24 Jul 2024 21:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721882588; x=1722487388; 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=kforIxrR32hXGERHtjq0u+nCqy7s7oB2GTNLcgTbBB0=; b=fFw9VsGezCXcuI1Kke5F6Y2JDlro1rGu2rOWeq8ejh5OHo1qfytSisiQkj0O+njcQc z7/8tyP5UsU8DGfhM7G7J+cbie4Ug36bjIx1IaN5KTNXONtHWIJ3XFGUi7SlrJHHUSLx +ojba2Zo1WvLstBBWi4BFSXCb0mm+8WMNLDRm5Tu7Ak/aWOdEg9LYvld+bnT0UbStaQv WP9YMohOc+XMxQV91v/iZEzf8NeFJMbzLnT5PEx9+BhGTdTxz3chTsE08HOME0opX5M0 pclF8nT1E2aGYPowrxWOyo6e40gkfO+TlXjZ0X6tO6JglfHKA4dKLm0/XjqMApsHyChH ZBsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721882588; x=1722487388; 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=kforIxrR32hXGERHtjq0u+nCqy7s7oB2GTNLcgTbBB0=; b=vAPq043m+51GDAJ6vsWtmxqRgcsUyWK6VaRDMXmM+thq3BOCgguYV+jop86M5IfNP9 jizeiH/7QZkxr417DRkrsCEUxFfAUUOfclKXCG9err7FomHjsn4ZrYmYSIdybvC31/Yo WsZkexrJGDsJV0ADKfUld9YGAkce1usorLp7vERklWBMO+O5spJlo2WBPjLtDZpCZYdW mu/qaS+XLO26dEjI0zOy5+/fIhDu/d2ne8F6haMRkNy4j8gLU02afQKF+LfkB8qBNfgM G/ZesL21PzMvRzbYlUXGfuXf4eLoYq0H0Q4THvrw23nlLcam0K9qPf/FNWirrC1uGZJ9 wf1g== X-Forwarded-Encrypted: i=1; AJvYcCXrL0tOs0joBrgI86TW2YQtdL90VYYTQKny+tapTguPzJhkTtYD04JLOpHz95NhwcFZp12IzBECMbjvr230oGI3ls5In5IyrUq4CaYef8OmMDfdV2s= X-Gm-Message-State: AOJu0Yy0+Bx6Te/Vlig/6OGr2DPoEhXB4fPoNLqhAUU2I0VpJ8EGl5GH PduhYTfQ0Pk6aTaLhLG+9SGWMtBxvWXFWQqiXiK5kC+BEjYugUMbzWzUZdlZnw== X-Google-Smtp-Source: AGHT+IHejSYglU67gOhhrkzZa6hhL8uC7FSKZRpllYkdugTHOn/pFSyK/PB4UJ0WAa6BXbBcEvzKig== X-Received: by 2002:a05:6a21:2d08:b0:1c2:8dcf:1b8f with SMTP id adf61e73a8af0-1c47b16661emr867852637.7.1721882588416; Wed, 24 Jul 2024 21:43:08 -0700 (PDT) Received: from thinkpad ([103.244.168.26]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70ead71592bsm358996b3a.86.2024.07.24.21.43.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 21:43:08 -0700 (PDT) Date: Thu, 25 Jul 2024 10:13:02 +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 06/12] PCI: brcmstb: PCI: brcmstb: Make HARD_DEBUG, INTR2_CPU_BASE offsets SoC-specific Message-ID: <20240725044302.GG2317@thinkpad> References: <20240716213131.6036-1-james.quinlan@broadcom.com> <20240716213131.6036-7-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-7-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240724_214309_590979_B38368E3 X-CRM114-Status: GOOD ( 24.69 ) 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:21PM -0400, Jim Quinlan wrote: > Our HW design has again changed a register offset which used to be standard Changed for which SoC? Please mention that this is a preparatory work. > for all Broadcom SOCs with PCIe cores. This difference is now reconciled > for the registers HARD_DEBUG and INTR2_CPU_BASE. > > Signed-off-by: Jim Quinlan With that, Reviewed-by: Manivannan Sadhasivam - Mani > Reviewed-by: Stanimir Varbanov > Reviewed-by: Florian Fainelli > --- > drivers/pci/controller/pcie-brcmstb.c | 39 ++++++++++++++++----------- > 1 file changed, 24 insertions(+), 15 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 4dc2ff7f3167..073d790d97b7 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -122,7 +122,6 @@ > #define PCIE_MEM_WIN0_LIMIT_HI(win) \ > PCIE_MISC_CPU_2_PCIE_MEM_WIN0_LIMIT_HI + ((win) * 8) > > -#define PCIE_MISC_HARD_PCIE_HARD_DEBUG 0x4204 > #define PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK 0x2 > #define PCIE_MISC_HARD_PCIE_HARD_DEBUG_L1SS_ENABLE_MASK 0x200000 > #define PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK 0x08000000 > @@ -131,9 +130,9 @@ > (PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK | \ > PCIE_MISC_HARD_PCIE_HARD_DEBUG_L1SS_ENABLE_MASK) > > -#define PCIE_INTR2_CPU_BASE 0x4300 > #define PCIE_MSI_INTR2_BASE 0x4500 > -/* Offsets from PCIE_INTR2_CPU_BASE and PCIE_MSI_INTR2_BASE */ > + > +/* Offsets from INTR2_CPU and MSI_INTR2 BASE offsets */ > #define MSI_INT_STATUS 0x0 > #define MSI_INT_CLR 0x8 > #define MSI_INT_MASK_SET 0x10 > @@ -184,9 +183,11 @@ > #define SSC_STATUS_PLL_LOCK_MASK 0x800 > #define PCIE_BRCM_MAX_MEMC 3 > > -#define IDX_ADDR(pcie) (pcie->reg_offsets[EXT_CFG_INDEX]) > -#define DATA_ADDR(pcie) (pcie->reg_offsets[EXT_CFG_DATA]) > -#define PCIE_RGR1_SW_INIT_1(pcie) (pcie->reg_offsets[RGR1_SW_INIT_1]) > +#define IDX_ADDR(pcie) ((pcie)->reg_offsets[EXT_CFG_INDEX]) > +#define DATA_ADDR(pcie) ((pcie)->reg_offsets[EXT_CFG_DATA]) > +#define PCIE_RGR1_SW_INIT_1(pcie) ((pcie)->reg_offsets[RGR1_SW_INIT_1]) > +#define HARD_DEBUG(pcie) ((pcie)->reg_offsets[PCIE_HARD_DEBUG]) > +#define INTR2_CPU_BASE(pcie) ((pcie)->reg_offsets[PCIE_INTR2_CPU_BASE]) > > /* Rescal registers */ > #define PCIE_DVT_PMU_PCIE_PHY_CTRL 0xc700 > @@ -205,6 +206,8 @@ enum { > RGR1_SW_INIT_1, > EXT_CFG_INDEX, > EXT_CFG_DATA, > + PCIE_HARD_DEBUG, > + PCIE_INTR2_CPU_BASE, > }; > > enum { > @@ -651,7 +654,7 @@ static int brcm_pcie_enable_msi(struct brcm_pcie *pcie) > BUILD_BUG_ON(BRCM_INT_PCI_MSI_LEGACY_NR > BRCM_INT_PCI_MSI_NR); > > if (msi->legacy) { > - msi->intr_base = msi->base + PCIE_INTR2_CPU_BASE; > + msi->intr_base = msi->base + INTR2_CPU_BASE(pcie); > msi->nr = BRCM_INT_PCI_MSI_LEGACY_NR; > msi->legacy_shift = 24; > } else { > @@ -898,12 +901,12 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) > /* Take the bridge out of reset */ > pcie->bridge_sw_init_set(pcie, 0); > > - tmp = readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); > + tmp = readl(base + HARD_DEBUG(pcie)); > if (is_bmips(pcie)) > tmp &= ~PCIE_BMIPS_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK; > else > tmp &= ~PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK; > - writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); > + writel(tmp, base + HARD_DEBUG(pcie)); > /* Wait for SerDes to be stable */ > usleep_range(100, 200); > > @@ -1072,7 +1075,7 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie) > } > > /* Start out assuming safe mode (both mode bits cleared) */ > - clkreq_cntl = readl(pcie->base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); > + clkreq_cntl = readl(pcie->base + HARD_DEBUG(pcie)); > clkreq_cntl &= ~PCIE_CLKREQ_MASK; > > if (strcmp(mode, "no-l1ss") == 0) { > @@ -1115,7 +1118,7 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie) > dev_err(pcie->dev, err_msg); > mode = "safe"; > } > - writel(clkreq_cntl, pcie->base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); > + writel(clkreq_cntl, pcie->base + HARD_DEBUG(pcie)); > > dev_info(pcie->dev, "clkreq-mode set to %s\n", mode); > } > @@ -1337,9 +1340,9 @@ static void brcm_pcie_turn_off(struct brcm_pcie *pcie) > writel(tmp, base + PCIE_MISC_PCIE_CTRL); > > /* Turn off SerDes */ > - tmp = readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); > + tmp = readl(base + HARD_DEBUG(pcie)); > u32p_replace_bits(&tmp, 1, PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK); > - writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); > + writel(tmp, base + HARD_DEBUG(pcie)); > > /* Shutdown PCIe bridge */ > pcie->bridge_sw_init_set(pcie, 1); > @@ -1425,9 +1428,9 @@ static int brcm_pcie_resume_noirq(struct device *dev) > pcie->bridge_sw_init_set(pcie, 0); > > /* SERDES_IDDQ = 0 */ > - tmp = readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); > + tmp = readl(base + HARD_DEBUG(pcie)); > u32p_replace_bits(&tmp, 0, PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK); > - writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); > + writel(tmp, base + HARD_DEBUG(pcie)); > > /* wait for serdes to be stable */ > udelay(100); > @@ -1499,12 +1502,16 @@ 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, > }; > > 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 struct pcie_cfg_data generic_cfg = { > @@ -1539,6 +1546,8 @@ 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 = { > -- > 2.17.1 > -- மணிவண்ணன் சதாசிவம்