From nobody Sun Feb 8 21:47:10 2026 Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C17F16EB5C for ; Wed, 31 Jul 2024 22:28:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722464926; cv=none; b=tRXTpQqce3ASFue6u1dIDWMljeDo7pupEfYteAFbR8P1t6dGpUAXHoAL4+0nRzukCW8avLwKwSaNI4ZFV+lgNdkagLbeGJIQBJR/KztAcPK4LaUx+pLkVFN7TUttAnZs/8PX3YAaN0iuVGZoYedhZa/fZspif53KPdaziQgiGEI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722464926; c=relaxed/simple; bh=s1fh7f0lmM/Iaphg/fT8tq7g+OZlQdDIO9Songz0MXU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=jAduLfV7Cy157+W4SLUwyfxOJYcshNbfIO82CSmlWfO0YC93nCwJknwR1amljO3r6aaTxSBd23Po05cZfneo81LoZmjoWAT1paM/wjHKV1OPx9Nu6vNdQtMN1P5+SVDzCYUROQfLp121qYDXkLBItIpSFbHWYbY8d2rL4440BIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=ZY+mXoHr; arc=none smtp.client-ip=209.85.160.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="ZY+mXoHr" Received: by mail-qt1-f180.google.com with SMTP id d75a77b69052e-44fe11dedb3so28446871cf.1 for ; Wed, 31 Jul 2024 15:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1722464923; x=1723069723; darn=vger.kernel.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=MXnrW2wZh+02qVnTjCR225qdcoHcBT0cTq9H5uoC8Ts=; b=ZY+mXoHrSXeHp0GzmeIWzokvVKBtogAdmHRqfq6lCVUqTG1v+zC+D6E3CeBVvQDl0v uN24Ejydde1Kr5nYfNtbl6wbzTp8+wBA0H95LxFFnaPnTZYf35gEI//x/2bSY3BwpEYH E7UNKWgy3ppdtBKID0QvdswtxX7+gH+1YxYu4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722464923; x=1723069723; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MXnrW2wZh+02qVnTjCR225qdcoHcBT0cTq9H5uoC8Ts=; b=OfNbe0RwO8+LYiqPaL6mj8w+mAS0iMWKj53Gs1yODbM6R8o/qOsGHEJnG9vxCsQgjI Os4McoetK9EUo3dUncdqQzTtSZHyoCclruYKWAs8ku/inK7jwlf5YIztWFZjpAMiblHV /T1BJ3NGobW8Wc90nlOqLOrE//hR1GXhSgDPYDW+pjCkDs+B8IyHa9lNHBQQYrEdL/MX vPCDMT09y96pXvQlLjPgsR/MSSgf7hGxkE34gDoMIVB70seSGRGAaiA+v2BS2qR1JYXt /gOrkQ595oRFDzrEphZzFgUnMJ0RLq+yRnG3ngpavRywUvsRSS71o4PQ8qCBDeZi+C/o KjSA== X-Forwarded-Encrypted: i=1; AJvYcCXiLdOjSZChe0fSptWWDpe/BhY3hKpLYl7MVN+yw9NK60QQS4i1BswW3MqpCY2TYM+kTcu7i6f+7ofNDIur5/MEZrj/XLUUUG1eSxzg X-Gm-Message-State: AOJu0YxCFzn3sXooupNnppOaLbz9DPVhpdcsq438m2jzzET2ufmLgXFk ZuEe4CC7jSzIWZVsqZVoL/RM319xmBD/EYedpj6+KeNYtQW14Ipyf9MpsJ2WCw== X-Google-Smtp-Source: AGHT+IGpqHg8M4yPN3SsdyZANWJHE4R2f7s83hYUJdBqpCyFA+T5oHK7zAIU12me/Z/Bj/nc/ABqzQ== X-Received: by 2002:ac8:7dc6:0:b0:44f:fb58:8c3e with SMTP id d75a77b69052e-4514f9b69b1mr8004891cf.46.1722464923324; Wed, 31 Jul 2024 15:28:43 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-44fe8416c80sm62359181cf.96.2024.07.31.15.28.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Jul 2024 15:28:42 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , Manivannan Sadhasivam , Krzysztof Kozlowski , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Rob Herring , linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 06/12] PCI: brcmstb: PCI: brcmstb: Make HARD_DEBUG, INTR2_CPU_BASE offsets SoC-specific Date: Wed, 31 Jul 2024 18:28:20 -0400 Message-Id: <20240731222831.14895-7-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20240731222831.14895-1-james.quinlan@broadcom.com> References: <20240731222831.14895-1-james.quinlan@broadcom.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Do prepatory work for the 7712 SoC, which is introduced in a future commit. Our HW design has changed two register offsets for the 7712, where previously it was a common value for all Broadcom SOCs with PCIe cores. Specifically, the two offsets are to the registers HARD_DEBUG and INTR2_CPU_BASE. Signed-off-by: Jim Quinlan Reviewed-by: Stanimir Varbanov Reviewed-by: Florian Fainelli Reviewed-by: Manivannan Sadhasivam --- 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 948fd4d176bc..9fa1500b8eee 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) =20 -#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) =20 -#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 =20 -#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]) =20 /* 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, }; =20 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); =20 if (msi->legacy) { - msi->intr_base =3D msi->base + PCIE_INTR2_CPU_BASE; + msi->intr_base =3D msi->base + INTR2_CPU_BASE(pcie); msi->nr =3D BRCM_INT_PCI_MSI_LEGACY_NR; msi->legacy_shift =3D 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); =20 - tmp =3D readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); + tmp =3D readl(base + HARD_DEBUG(pcie)); if (is_bmips(pcie)) tmp &=3D ~PCIE_BMIPS_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK; else tmp &=3D ~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); =20 @@ -1072,7 +1075,7 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie) } =20 /* Start out assuming safe mode (both mode bits cleared) */ - clkreq_cntl =3D readl(pcie->base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); + clkreq_cntl =3D readl(pcie->base + HARD_DEBUG(pcie)); clkreq_cntl &=3D ~PCIE_CLKREQ_MASK; =20 if (strcmp(mode, "no-l1ss") =3D=3D 0) { @@ -1115,7 +1118,7 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie) dev_err(pcie->dev, err_msg); mode =3D "safe"; } - writel(clkreq_cntl, pcie->base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); + writel(clkreq_cntl, pcie->base + HARD_DEBUG(pcie)); =20 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); =20 /* Turn off SerDes */ - tmp =3D readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); + tmp =3D readl(base + HARD_DEBUG(pcie)); u32p_replace_bits(&tmp, 1, PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MAS= K); - writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); + writel(tmp, base + HARD_DEBUG(pcie)); =20 /* 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); =20 /* SERDES_IDDQ =3D 0 */ - tmp =3D readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); + tmp =3D readl(base + HARD_DEBUG(pcie)); u32p_replace_bits(&tmp, 0, PCIE_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MAS= K); - writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); + writel(tmp, base + HARD_DEBUG(pcie)); =20 /* wait for serdes to be stable */ udelay(100); @@ -1499,12 +1502,16 @@ static const int pcie_offsets[] =3D { [RGR1_SW_INIT_1] =3D 0x9210, [EXT_CFG_INDEX] =3D 0x9000, [EXT_CFG_DATA] =3D 0x9004, + [PCIE_HARD_DEBUG] =3D 0x4204, + [PCIE_INTR2_CPU_BASE] =3D 0x4300, }; =20 static const int pcie_offsets_bmips_7425[] =3D { [RGR1_SW_INIT_1] =3D 0x8010, [EXT_CFG_INDEX] =3D 0x8300, [EXT_CFG_DATA] =3D 0x8304, + [PCIE_HARD_DEBUG] =3D 0x4204, + [PCIE_INTR2_CPU_BASE] =3D 0x4300, }; =20 static const struct pcie_cfg_data generic_cfg =3D { @@ -1539,6 +1546,8 @@ static const int pcie_offset_bcm7278[] =3D { [RGR1_SW_INIT_1] =3D 0xc010, [EXT_CFG_INDEX] =3D 0x9000, [EXT_CFG_DATA] =3D 0x9004, + [PCIE_HARD_DEBUG] =3D 0x4204, + [PCIE_INTR2_CPU_BASE] =3D 0x4300, }; =20 static const struct pcie_cfg_data bcm7278_cfg =3D { --=20 2.17.1