From patchwork Fri Jun 23 14:40:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13290767 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 41F5FEB64DD for ; Fri, 23 Jun 2023 14:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=yB7fVezWLMOT95kkU42eQiWzf9ffphjm/Z2AtE2CY/0=; b=fVrZ/qM6Ui1FbOTvnE2sZl6nB3 mjd9d0G7FmTLs3CVYV1cDJCGMwohWYyVKKAlub7oVXsUXc0rMCc51Kr1MAtAnLWVYxu8WNomAKShq +714Zs0ikAaklElxiULrlJkz5dr+M/NIDLl1AbfHc0E5b8sXWMnQdnoWvIEWNhVCBNiAxzNPlK19h Lbgm6Le/etJE4Z6RlUfviMNYz1I7qiuz0XLDgd9Rpm75qJSKooN3gA+T2CRRv4QOqo4MOQSYexaQc Cc+M/oV35U6OrzqlRXQODgB0/cRAUJ+JBAtG/M2C5s/DlX1X7yrQLmM3GxckjTziAvqmAOIBOKg/G Z4KVMyRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qChyT-003oNX-2R; Fri, 23 Jun 2023 14:41:21 +0000 Received: from mail-qk1-x731.google.com ([2607:f8b0:4864:20::731]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qChyI-003oIP-33 for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2023 14:41:13 +0000 Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-76246351f0cso60446985a.1 for ; Fri, 23 Jun 2023 07:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1687531268; x=1690123268; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=8Fpd7b1ELJYkh4N7Xdv+f428e2r8crHJlvQBGQ+Y+iw=; b=eDY8oM1dDX4W4EZECLnidybYW026+Z/bNLR+mm4XR1gUrv9MSRndgV1Wh/4awsuIVf Sx05QO5WJFjHXMr059Tj51g3suAiV6OC68HPv0/ymK8kI/mn3wnUucunPGYXDjGfOQq+ 2TT2v4p9oThPoLG762wpj+g2u/7ISyco5yO7U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687531268; x=1690123268; 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=8Fpd7b1ELJYkh4N7Xdv+f428e2r8crHJlvQBGQ+Y+iw=; b=Mmjb1k/e0MH7XNH07WoG8qjWxP9hAqyP/1tX00YF5uQyl7GfRvs7wUca2AMBNEw9sM 2tE4FtinMf/RAGvhKksKoDc2oS1xZ6a+WbH2qUCA92QA/lz9S55DOUKVVNGLW/1u65FI R7lN9w7TD0jv5gAwc2cXKaapnkY2iWP6WXY1oRNlnXjW23g0P/VlmR8OjQ9khRjwHfYc 13uvN+iraMbPMVnA77/T7F8lzOUtoxqbLw1picES9LOTJTfCYKt3/rHxp/ozQTvttYPS PML7AnyQBP8VlD+FU4SKLuBJAYjA9VG1uI6/4yVhO8zf8FM5nsyFU/jFc0+w8ia8awLA FIIA== X-Gm-Message-State: AC+VfDzZXc7qzds57RSIo4eCz4CxxOfzrwIUz0TSCQcCEdoMwdSNWZSj ZJlh81kX9EDbAdqvAASEmAZuaw== X-Google-Smtp-Source: ACHHUZ6VEUGWHyC6gT/qBlxdtFs8HESOkMiVWwwv0lzZBtEqaLYNovEbLqSls92mOSWoka1L+bDJrg== X-Received: by 2002:a05:620a:424d:b0:75b:23a1:3606 with SMTP id w13-20020a05620a424d00b0075b23a13606mr15726420qko.23.1687531268377; Fri, 23 Jun 2023 07:41:08 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id i18-20020a05620a145200b007625382f4ccsm4564613qkl.69.2023.06.23.07.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 07:41:07 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Cc: Jim Quinlan , Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM7XXX ARM ARCHITECTURE), linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 1/5] dt-bindings: PCI: brcmstb: Add brcm,enable-l1ss property Date: Fri, 23 Jun 2023 10:40:54 -0400 Message-Id: <20230623144100.34196-2-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230623144100.34196-1-james.quinlan@broadcom.com> References: <20230623144100.34196-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230623_074110_986002_6A937981 X-CRM114-Status: GOOD ( 14.68 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This commit adds the boolean "brcm,enable-l1ss" property: The Broadcom STB/CM PCIe HW -- a core that is also used by RPi SOCs -- requires the driver probe() to deliberately place the HW one of three CLKREQ# modes: (a) CLKREQ# driven by the RC unconditionally (b) CLKREQ# driven by the EP for ASPM L0s, L1 (c) Bidirectional CLKREQ#, as used for L1 Substates (L1SS). The HW+driver can tell the difference between downstream devices that need (a) and (b), but does not know when to configure (c). All devices should work fine when the driver chooses (a) or (b), but (c) may be desired to realize the extra power savings that L1SS offers. So we introduce the boolean "brcm,enable-l1ss" property to inform the driver that (c) is desired. Setting this property only makes sense when the downstream device is L1SS-capable and the OS is configured to activate this mode (e.g. policy==powersupersave). This property is already present in the Raspian version of Linux, but the upstream driver implementation that follows adds more details and discerns between (a) and (b). Signed-off-by: Jim Quinlan Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml b/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml index 7e15aae7d69e..8b61c2179608 100644 --- a/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml +++ b/Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml @@ -64,6 +64,15 @@ properties: aspm-no-l0s: true + brcm,enable-l1ss: + description: Indicates that PCIe L1SS power savings + are desired, the downstream device is L1SS-capable, and the + OS has been configured to enable this mode. For boards + using a mini-card connector, this mode may not meet the + TCRLon maximum time of 400ns, as specified in 3.2.5.2.2 + of the PCI Express Mini CEM 2.0 specification. + type: boolean + brcm,scb-sizes: description: u64 giving the 64bit PCIe memory viewport size of a memory controller. There may be up to From patchwork Fri Jun 23 14:40:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13290766 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 4F7A8EB64DD for ; Fri, 23 Jun 2023 14:41: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:Content-Type: MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cO+G9UuYm5JEjtn/cX1BeknLq3bqJAm7ZBaHdqmwDRw=; b=KQ56Hsdd7f4c72hYpu2YcV+Jul mwoi5M2huI3IQVkPKqflsBd7bvi43pE2p5lxPpUDHlGr35O0OyukdaaG0FyvD2WA37Pua5e00WIJb 48qG7WWBRQX7oMK9cQed8WVoT6g3/acg+dkcBXHbnxbtqqU/98/iKI3ok2FPpn0+2IjeHrfScldYo DxRdKGSbDnfHu1LZYy8VRq3LIjv0wWFFElb+xEBX4kvFzf4ZVBTceY8GbZklD42JcjFaSYWOWBr6I fHh/Gyv0xhYkpc1cvyy0Ysf0tKap8CivL/k1Rwc3rxsFwzCcSiAnf8UaqKBsBQMsI+Ufrp4mU1FNe xzMxw4Kg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qChyU-003oNr-12; Fri, 23 Jun 2023 14:41:22 +0000 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qChyK-003oIV-2v for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2023 14:41:14 +0000 Received: by mail-qk1-x734.google.com with SMTP id af79cd13be357-7624e8ceef7so60291685a.2 for ; Fri, 23 Jun 2023 07:41:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1687531269; x=1690123269; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=Ea4rQPgS+JlJ+ONpA7RIpEHK9vln5icVUjKYLAFrh6c=; b=X1zM9otgf74RyDHNQ2Om/8W3IJfXdT/qeXa+90bH4VbPGjOsBykVUyGdIArC1A4+S7 zL7MxyRgWOlh2tjwNxDgODa53fljrZ6voh9+uSDEfr2pCtj+XkU2+PMPx9HzYAq228KO FljXM7nPGDJfrL1x9O1pLgiJBzI6HKlSAUrzM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687531269; x=1690123269; 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=Ea4rQPgS+JlJ+ONpA7RIpEHK9vln5icVUjKYLAFrh6c=; b=aOpdExXZMyHMRz88lbuQKv8+2uYXeW1fH5ZBms4KyeNdWnC2MD7ggpCm1PfS5XzqJV XQKG4nJ2VbXY1VcKRqCKPiA6RHU3S0XJ6I8dSd6rflf1wGc1+tkEX2xjr6qI8pfdQ1F9 U3RaG3CD6nqU8FtfQicnE5xEOzilM/EvXwRh2BrQlVhaEHnyY5CPlybij/NRlkuoHFfM wMsq/ftkCuGPiXtNyxvfkxQmX/3vkZn5r6f17Km4UMeOJ1Bk8pAMYBphu1uqJ74tj/Qu xXaeaDUQUOjOIXiqu69ECFBOF+5Kjz7Owf3h5XV4+D7M5Yue2s/WeKMhHxbtaR4Y9dtF lwUw== X-Gm-Message-State: AC+VfDyJ2/mbQSW+k9lR5pheo6lH5DBP7CCBYvoKnXM09dMhSB0l1TBk sjzNWhQAjQU7c1l1IdPkepEl5w== X-Google-Smtp-Source: ACHHUZ6qMOU/Dr/xZWfyf58cntxdi4IvXYnS/1XLdfxFGeFg/hftxGR16LNk1v7hMsbUSZhL9cLbew== X-Received: by 2002:a37:ad06:0:b0:763:dc8c:e85 with SMTP id f6-20020a37ad06000000b00763dc8c0e85mr7507800qkm.67.1687531269684; Fri, 23 Jun 2023 07:41:09 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id i18-20020a05620a145200b007625382f4ccsm4564613qkl.69.2023.06.23.07.41.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 07:41:09 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Jim Quinlan , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , 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 v6 2/5] PCI: brcmstb: Configure HW CLKREQ# mode appropriate for downstream device Date: Fri, 23 Jun 2023 10:40:55 -0400 Message-Id: <20230623144100.34196-3-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230623144100.34196-1-james.quinlan@broadcom.com> References: <20230623144100.34196-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230623_074112_944450_54026F7F X-CRM114-Status: GOOD ( 20.19 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Broadcom STB/CM PCIe HW core, which is also used in RPi SOCs, must be deliberately set by the RC probe() into one of three mutually exclusive modes: (a) No CLKREQ# expected or required, refclk is always available. (b) CLKREQ# is expected to be driven by downstream device when needed. (c) Bidirectional CLKREQ# for L1SS capable devices. Previously, only (b) was supported by the driver, as almost all STB/CM boards operate in this mode. But now there is interest in activating L1SS power savings from STB/CM customers, and also interest in accommodating mode (a) for designs such as the RPi CM4 with IO board. The HW+driver is able to tell us when mode (a) or (b) is needed. All devices should be functional using the RC-driver selected (a) or (b) mode. For those with L1SS-capable devices that desire the power savings that come with mode (c) we rely on the DT prop "brcm,enable-l1ss". It would be nice to do this automatically but there is no easy way to determine this at the time the PCI RC driver executes its probe(). Using this mode only makes sense when the downstream device is L1SS-capable and the OS has been configured to activate L1SS (e.g. policy==powersupersave). The "brcm,enable-l1ss" property has already been in use by Raspian Linux, but this implementation adds more details and discerns between (a) and (b) automatically. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217276 Signed-off-by: Jim Quinlan Tested-by: Florian Fainelli Tested-by: Cyril Brulebois Tested-by: Sam Edwards --- drivers/pci/controller/pcie-brcmstb.c | 69 +++++++++++++++++++++++---- 1 file changed, 59 insertions(+), 10 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index edf283e2b5dd..d30636a725d7 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -48,10 +48,17 @@ #define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY 0x04dc #define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK 0xc00 +#define PCIE_RC_CFG_PRIV1_ROOT_CAP 0x4f8 +#define PCIE_RC_CFG_PRIV1_ROOT_CAP_L1SS_MODE_MASK 0xf8 + #define PCIE_RC_DL_MDIO_ADDR 0x1100 #define PCIE_RC_DL_MDIO_WR_DATA 0x1104 #define PCIE_RC_DL_MDIO_RD_DATA 0x1108 +#define PCIE_0_RC_PL_PHY_DBG_CLKREQ2_0 0x1e30 +#define CLKREQ2_0_CLKREQ_IN_CNT_MASK 0x3f000000 +#define CLKREQ2_0_CLKREQ_IN_MASK 0x40000000 + #define PCIE_MISC_MISC_CTRL 0x4008 #define PCIE_MISC_MISC_CTRL_PCIE_RCB_64B_MODE_MASK 0x80 #define PCIE_MISC_MISC_CTRL_PCIE_RCB_MPS_MODE_MASK 0x400 @@ -121,9 +128,12 @@ #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 #define PCIE_BMIPS_MISC_HARD_PCIE_HARD_DEBUG_SERDES_IDDQ_MASK 0x00800000 - +#define PCIE_CLKREQ_MASK \ + (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 @@ -1024,13 +1034,58 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) return 0; } +static void brcm_config_clkreq(struct brcm_pcie *pcie) +{ + bool l1ss = of_property_read_bool(pcie->np, "brcm,enable-l1ss"); + void __iomem *base = pcie->base; + u32 clkreq_set, tmp = readl(base + PCIE_0_RC_PL_PHY_DBG_CLKREQ2_0); + bool clkreq_in_seen; + + /* + * We have "seen" CLKREQ# if it is asserted or has been in the past. + * Note that the CLKREQ_IN_MASK is 1 if CLKREQ# is asserted. + */ + clkreq_in_seen = !!(tmp & CLKREQ2_0_CLKREQ_IN_MASK) || + !!FIELD_GET(CLKREQ2_0_CLKREQ_IN_CNT_MASK, tmp); + + /* Start with safest setting where we provide refclk regardless */ + clkreq_set = readl(pcie->base + PCIE_MISC_HARD_PCIE_HARD_DEBUG) & + ~PCIE_CLKREQ_MASK; + + if (l1ss && IS_ENABLED(CONFIG_PCIEASPM)) { + /* + * Note: For boards using a mini-card connector, this mode + * (L1SS CLKREQ# mode) may not meet the TCRLon maximum time + * of 400ns, as specified in 3.2.5.2.2 of the PCI Express + * Mini CEM 2.0 specification. + */ + clkreq_set |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_L1SS_ENABLE_MASK; + dev_info(pcie->dev, "bi-dir CLKREQ# for L1SS power savings"); + } else { + if (clkreq_in_seen && IS_ENABLED(CONFIG_PCIEASPM)) { + clkreq_set |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK; + dev_info(pcie->dev, "uni-dir CLKREQ# for L0s, L1 ASPM\n"); + } else { + dev_info(pcie->dev, "CLKREQ# ignored; no ASPM\n"); + /* Might as well unadvertise ASPM */ + tmp = readl(base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY) & + ~PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK; + writel(tmp, base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); + } + /* Setting the field to 2 unadvertises L1SS support */ + tmp = readl(base + PCIE_RC_CFG_PRIV1_ROOT_CAP); + u32p_replace_bits(&tmp, 2, PCIE_RC_CFG_PRIV1_ROOT_CAP_L1SS_MODE_MASK); + writel(tmp, base + PCIE_RC_CFG_PRIV1_ROOT_CAP); + } + writel(clkreq_set, pcie->base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); +} + static int brcm_pcie_start_link(struct brcm_pcie *pcie) { struct device *dev = pcie->dev; void __iomem *base = pcie->base; u16 nlw, cls, lnksta; bool ssc_good = false; - u32 tmp; int ret, i; /* Unassert the fundamental reset */ @@ -1055,6 +1110,8 @@ static int brcm_pcie_start_link(struct brcm_pcie *pcie) return -ENODEV; } + brcm_config_clkreq(pcie); + if (pcie->gen) brcm_pcie_set_gen(pcie, pcie->gen); @@ -1073,14 +1130,6 @@ static int brcm_pcie_start_link(struct brcm_pcie *pcie) pci_speed_string(pcie_link_speed[cls]), nlw, ssc_good ? "(SSC)" : "(!SSC)"); - /* - * Refclk from RC should be gated with CLKREQ# input when ASPM L0s,L1 - * is enabled => setting the CLKREQ_DEBUG_ENABLE field to 1. - */ - tmp = readl(base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); - tmp |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_CLKREQ_DEBUG_ENABLE_MASK; - writel(tmp, base + PCIE_MISC_HARD_PCIE_HARD_DEBUG); - return 0; } From patchwork Fri Jun 23 14:40:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13290768 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 DE5F1EB64DD for ; Fri, 23 Jun 2023 14:42:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dD8TEzokmvPtHc6E+keIA6DEtZ3c+oF9fcxBFpUF3Qo=; b=S7PXtEsuLxW6E41XYx3L1RPvV9 WoAYDb99bajfYUuRNA0mOC2pxeBW8gC4Iy04PoldHWNJHXtyDSdOGDHOyzyWdTRLsWAx95RErlKho PJSExzjUM82MCEH8WPc6L27aT+ISCaHATTHe1zhc4mGe6tG2Sz4Joe5KRSTM3ymU6GJYUcNvSPGoA UYNMPjPLbAaZIiGY6bovihIBDApH/yu6xrD/vufemeSVHoGv6W3/6thFBFz+wkyQ79ZnCEm/UJfEX weARrJ2R1rYoR9EWnxwfnPFUPC1eKRF/MfW2EhK5H25qGWzNBvWOQ6MwK3POOVPy4JdkdXCmgArFC N+ZA+LXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qChyi-003oVN-2h; Fri, 23 Jun 2023 14:41:36 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qChyV-003oOJ-2v for linux-arm-kernel@bombadil.infradead.org; Fri, 23 Jun 2023 14:41:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Transfer-Encoding:Content-ID:Content-Description; bh=c7rKGn4/ee/mDhPOx85jTOAepK059364chiKbGoFwQM=; b=qphJsB3B3WY+zBeysNwXkIgkwa e4dCYwfdrbghw0hzuzLqG8i3JjUY7RcY6v1BB/6V4TvpstifFKYccvu3nNOVZY8B45nQtOKWSbpPQ ZAYFohMwPqMiP57QdNG1oIKSLRX/hZXcaI+6ZD/tKrwChvocYOWfbgOG5ssVV2dRHXwWAg9LDXWvz mDCr7MPwe+KeyaoQ0k5gs2tbNc56KU8mkIwHmCgZJrIu/pZZiqxUWSdgU8mnqKvHmQPlCkkD4vtn8 oCGuKgeVkZyhM59e1vWZHOSwJx+/SGuNPU1DwvFk7xiO7i3woZm5xvr8YtCAVWdoyJ4Izli95UWT9 oNkoG6kw==; Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qChyR-002Fjs-1u for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2023 14:41:22 +0000 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-763e968b7feso59400485a.3 for ; Fri, 23 Jun 2023 07:41:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1687531271; x=1690123271; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=c7rKGn4/ee/mDhPOx85jTOAepK059364chiKbGoFwQM=; b=YuBXA8lxT1u969TgVHLS8U5a4jkQZcs5ODhKS6Wr4EKjX/QN4JHrEzSDtd57Bg8+HC tPScqwsMd9yDL7oyLG5bSSy6isAsv/iEqIGd8RKOrxY5fwPHHupPNXUEg59Cgzsp31nj x22QNUrKLlJufh+KOy7HGAAsDyB6n7kD6v+r0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687531271; x=1690123271; 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=c7rKGn4/ee/mDhPOx85jTOAepK059364chiKbGoFwQM=; b=RGrq9W6O/MXOgUE0kO0SmkVuaGJ6ZnSSmREaW+dOwoSN9e3Biz0UiOj3Z2Z6crnhiC 4JhQe6U04jaM/Jm4KRNxGvqav2OtnpF5D5cA7cHV1wEE3MTYL0oT3dPpO7+PfSmBquSo UuqhGkwFyv1QxR7CK0Ai682NBmRRNFYw30fzBBH1+qecjTwvRrRIGRve2mSDtdMWjaG7 4KJ0e81yjHrdO+D2v3jzipDLs9JKbtQT5jv90IPgnKbyYPhXrRUXJOYxXL15gG41FGwx PQ8kMHp80Zeyn3fkJ6Fz45PhOkx/Hp3d6+irInHW33vuKnYpaKbSk54iOA8jMB7+IyrZ niCw== X-Gm-Message-State: AC+VfDyHZZZeJzvIw823dO1QDLultwdPZZumoPf48XeJcR3+2CTHv/vH j5xdrtTUv25k0MT6FA+DT9NmdA== X-Google-Smtp-Source: ACHHUZ4VUTc2qoNcrsn8Qp7O9siw73GsqtGEpwTfEu0R/xUCLrc8O1bXbkl3FlCTdDU63D7TU7ARxg== X-Received: by 2002:a05:620a:8290:b0:763:98b4:e81f with SMTP id ox16-20020a05620a829000b0076398b4e81fmr14356285qkn.39.1687531270963; Fri, 23 Jun 2023 07:41:10 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id i18-20020a05620a145200b007625382f4ccsm4564613qkl.69.2023.06.23.07.41.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 07:41:10 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Jim Quinlan , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , 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 v6 3/5] PCI: brcmstb: Set higher value for internal bus timeout Date: Fri, 23 Jun 2023 10:40:56 -0400 Message-Id: <20230623144100.34196-4-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230623144100.34196-1-james.quinlan@broadcom.com> References: <20230623144100.34196-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230623_154119_961626_56EF3DB5 X-CRM114-Status: GOOD ( 12.74 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org During long periods of the PCIe RC HW being in an L1SS sleep state, there may be a timeout on an internal bus access, even though there may not be any PCIe access involved. Such a timeout will cause a subsequent CPU abort. So, when "brcm,enable-l1ss" is observed, we increase the timeout value to four seconds instead of using its HW default. Signed-off-by: Jim Quinlan Tested-by: Florian Fainelli --- drivers/pci/controller/pcie-brcmstb.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index d30636a725d7..fe0415a98c63 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1034,6 +1034,21 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) return 0; } +/* + * This extends the timeout period for an access to an internal bus. This + * access timeout may occur during L1SS sleep periods even without the + * presence of a PCIe access. + */ +static void brcm_extend_rbus_timeout(struct brcm_pcie *pcie) +{ + /* TIMEOUT register is two registers before RGR1_SW_INIT_1 */ + const unsigned int REG_OFFSET = PCIE_RGR1_SW_INIT_1(pcie) - 8; + u32 timeout_us = 4000000; /* 4 seconds, our setting for L1SS */ + + /* Each unit in timeout register is 1/216,000,000 seconds */ + writel(216 * timeout_us, pcie->base + REG_OFFSET); +} + static void brcm_config_clkreq(struct brcm_pcie *pcie) { bool l1ss = of_property_read_bool(pcie->np, "brcm,enable-l1ss"); @@ -1059,6 +1074,7 @@ static void brcm_config_clkreq(struct brcm_pcie *pcie) * of 400ns, as specified in 3.2.5.2.2 of the PCI Express * Mini CEM 2.0 specification. */ + brcm_extend_rbus_timeout(pcie); clkreq_set |= PCIE_MISC_HARD_PCIE_HARD_DEBUG_L1SS_ENABLE_MASK; dev_info(pcie->dev, "bi-dir CLKREQ# for L1SS power savings"); } else { From patchwork Fri Jun 23 14:40:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13290769 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 E1319EB64DD for ; Fri, 23 Jun 2023 14:42:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ZOLp3bk0jD6zKZ+wvSm0Nu3XfjTBYu9f4HMcaJGWmlU=; b=IaRRoOj3JcZWF6Kt3OnqraWKbX /go2aRLjApgJ/j4Ff9aA4/+ew6g8YFIiRIKaNcyaFU0ekQJnpiv8d7zMK6MHMf4twg2F1vK0dWF/2 MHQHiZGFZbnjs6Xp4cjEKV8uWtQPfm866YhOHcNuaiBIT7gcqayejVWI3bMv6cpfd/T0J65fftxMW xdaeXSjrh+Ui5Ptu+a1+KZ6jiOQI631ib3mjHEa66T20GFg/gJnFIR/tJMw50JRq5syvKqmkKlEb3 JUfgrPuo273iNZZL5iwg2D+eRVHL/a2ZdwKKIcc69hVdRMCpWqbSrxzQ5iuBN7WaOIe3ehDVfqgpl wo4g/tUA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qChyi-003oV4-13; Fri, 23 Jun 2023 14:41:36 +0000 Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qChyN-003oJq-28 for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2023 14:41:17 +0000 Received: by mail-qk1-x72b.google.com with SMTP id af79cd13be357-763ddc42589so59562985a.3 for ; Fri, 23 Jun 2023 07:41:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1687531272; x=1690123272; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=mLOAdESKh3sTGS58SjkxpqoAsTbzH05ir4M6w20w/1M=; b=BGriy14B6AYNMtNbf5UTviEvbk/grxKMtlAuDWI147LC0LDK+T43BY6/P71ZWtATJd SgyYjSiTUzYGidNK0vNzQOzzpH7jyYuOpu8FAhJm7/6FgL88CY0xmYzpw1UgeNCLkiQN GsbLQvLjR1uEf8qv5tttqX0bm34U8plvzH3pA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687531272; x=1690123272; 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=mLOAdESKh3sTGS58SjkxpqoAsTbzH05ir4M6w20w/1M=; b=SWsk7h6XtDSYcjclG57yKMthTozWQXIGKYQjBvUHY+Yz79kiOVkCV59lfsRv6i7jDd 8jKMKw2ThAF1uooBBNRFBirJwTDKmWiYfgWNcghuuk74rd9RZmBIG294sD/Vxgc5DTdV bDTV2nzeHKFjhxO/2Uet8tp1xqOvZg5PS6p/+W+eki7GxokfwHS/i20i0BgLf49VE/z4 EY/YWhWHKzJj9msTwZj1MiWBodBdFwourd14JHFkK9NkEOAr17R2DoJXNeUO0RKRQMkc HMo5UjNnG5nF2F/oD0Z6ffXLgBosyWGwBZ6PGZwgLu0JCgAz4zd+S8pNoST8Xp+MrFz9 NQqA== X-Gm-Message-State: AC+VfDxcFpxB6ptCSbYDsYFUoJCjDU+F21+fuy5etehRgoDmMxJX/fPo 7wYhR2aeu5iP3pPdOxQBBQN2Ag== X-Google-Smtp-Source: ACHHUZ7YaKrVqQ8QnvGuhcY3JvOvengIIXyMeQqiinLnw5eZIkQ6quN3qI+0+AoueIHKsYdVThZWIw== X-Received: by 2002:a05:620a:2955:b0:763:a83c:a9e4 with SMTP id n21-20020a05620a295500b00763a83ca9e4mr18146840qkp.31.1687531272243; Fri, 23 Jun 2023 07:41:12 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id i18-20020a05620a145200b007625382f4ccsm4564613qkl.69.2023.06.23.07.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 07:41:11 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Jim Quinlan , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , 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 v6 4/5] PCI: brcmstb: Assert PERST# on BCM2711 Date: Fri, 23 Jun 2023 10:40:57 -0400 Message-Id: <20230623144100.34196-5-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230623144100.34196-1-james.quinlan@broadcom.com> References: <20230623144100.34196-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230623_074115_700699_132135B7 X-CRM114-Status: GOOD ( 12.00 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The current PCIe driver assumes PERST# is asserted when probe() is invoked. Some older versions of the 2711/RPi bootloader left PERST# unasserted, as the Raspian OS does assert PERST# on probe(). For this reason, we assert PERST# for BCM2711 SOCs (i.e. RPi). Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index fe0415a98c63..7b698a9a851e 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -884,6 +884,11 @@ static int brcm_pcie_setup(struct brcm_pcie *pcie) /* Reset the bridge */ pcie->bridge_sw_init_set(pcie, 1); + + /* Ensure that PERST# is asserted; some bootloaders may deassert it. */ + if (pcie->type == BCM2711) + pcie->perst_set(pcie, 1); + usleep_range(100, 200); /* Take the bridge out of reset */ From patchwork Fri Jun 23 14:40:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13290770 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 3DE16EB64D7 for ; Fri, 23 Jun 2023 14:42:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/KNLYelgO3GlDJcVUZk3zsRV5imO2h3rY4kS5+S9VGU=; b=Yn4KJ9diBC7z3dK0/CeF8YbMR2 aE6Cit6mN8xgLtLlRgTjMfheoGF9MvCZcreKvun6Nvp2XS1qRJPUPPvqXmVB8z+w+rjhlIMM4g1/C NwAXxIkJZ2llV2R8XNpUalqw3ESnUj99FT5eNeUdtW5kr12uBqIdmklXKUCKxaWumY2dzmx5vKSNr QtMKsl796I3Pbhwb6VcfR/iYlf3T2XjCTydGvstA4tYoGkI0Km7QYkbXrZVsGhdILvWpQaKG4vpJ7 dqqWHpApEjUOnt097/jwcBIoFPa+zDmgwguw6HeM8VDt9qUpRuZoGinaTOnhdq4UKOoYk7dJt4VDo QQ6Y1XNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qChyk-003oWR-14; Fri, 23 Jun 2023 14:41:38 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qChyZ-003oR2-0q for linux-arm-kernel@bombadil.infradead.org; Fri, 23 Jun 2023 14:41:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version: Content-Transfer-Encoding:Content-ID:Content-Description; bh=+fjME/QaYWwEevyvmr+oXvkWrMnNsawb8MYTsr9WTos=; b=DIBqF0LNUFbZYyKELgOwobHp9E FHDQI+1NUxV3KL88db0yvEf50Tq4siZMPH732+SRD9WN0vkTpZ6MsxtAb3nq7jpjOJK8R7WqUxeUS 93OzLtMMRerQpBVsEMfSzoASEOosrOrsEQFw4DulT3BZLUAhHcUceFaQ0XKsI7CRjPtvTjvBNySFX lch0GLNqn1BwEhRkWoJ48H2T3tF77Ws18FZ5am++tno+bZ0MRZhTjT+IaITL/raSlsJL4iZ0szx8U WC4ATe/j7bGOnxxmbijFC4ypXqkvjRz2l6RtKKQM1/ySaFsQUZZX0NZv0b4Jhnbds35n02kPimwdv KlwSKS2w==; Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qChyR-002Fjt-1n for linux-arm-kernel@lists.infradead.org; Fri, 23 Jun 2023 14:41:24 +0000 Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-763bd31d223so54004985a.3 for ; Fri, 23 Jun 2023 07:41:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1687531273; x=1690123273; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=+fjME/QaYWwEevyvmr+oXvkWrMnNsawb8MYTsr9WTos=; b=OUqhZgB+P429KI0L67GzFsuQon7tyUC9DCfAx2WhYnoSIQUr+dF+1zwVdbL49aZ/dd 5D+HLcQKPx9Io+Ulia1S2Rl3bD99BJexFnapO98B/BPMziQQf8m/h7Mw6IhFkevyJB5O 9TvNqbCXSveHYbZGhC9iAUnHU65UIYbYH/QoE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687531273; x=1690123273; 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=+fjME/QaYWwEevyvmr+oXvkWrMnNsawb8MYTsr9WTos=; b=ju8D3jsEjiYRCR3YS2FrwAHfQfbWiMp5zvub0+2fQJEyChjkigBWLCO8xSJ/nQ1Jq5 ZHytFFnZClbh69H7TuDhFSxOWgyuwMoH/LMMM4rH/F1WUJiulgieOQm7CwyCO6lsY8oE RGFzco9pJVj814v9FM8aFKq8sARHtGLKEQJhHvSI6Od1R6Xz1l52aN66O14SkizGn5G8 tXX0/e+9sTL5NiMUGXGy580UzdvmVk53AAAnwkq2WbX6NE/u/J3r5H55Y7K6lc2Onzgg 4Egj3rgQbTnFbR0q0tUXIa2+9zWC6O15etJ53j0Atl5LOGJmu/oxwLoFgn/aFyLD3CZY Wp9g== X-Gm-Message-State: AC+VfDwtQySPqdf5oPYXNhuMrdyLY/5fejPvVIVuvwX5xVE1A+lAO26h 533lr82FikQoigEotMOVZEzusQ== X-Google-Smtp-Source: ACHHUZ4z22njj6lm9ZBJ1QTVTo9qcRFq/VHNwFt6J9LH8KydwGK/aHQm1kGoh7wk8yFvvRurz1fwtA== X-Received: by 2002:a05:620a:414f:b0:75b:23a1:830b with SMTP id k15-20020a05620a414f00b0075b23a1830bmr32798557qko.6.1687531273562; Fri, 23 Jun 2023 07:41:13 -0700 (PDT) Received: from stbsrv-and-01.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id i18-20020a05620a145200b007625382f4ccsm4564613qkl.69.2023.06.23.07.41.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 07:41:13 -0700 (PDT) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Phil Elwell , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Cc: Jim Quinlan , Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , 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 v6 5/5] PCI: brcmstb: Remove stale comment Date: Fri, 23 Jun 2023 10:40:58 -0400 Message-Id: <20230623144100.34196-6-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230623144100.34196-1-james.quinlan@broadcom.com> References: <20230623144100.34196-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230623_154122_901322_C5EEB8DF X-CRM114-Status: GOOD ( 11.94 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org A comment says that Multi-MSI is not supported by the driver. A past commit [1] added this feature, so the comment is incorrect and is removed. [1] commit 198acab1772f22f2 ("PCI: brcmstb: Enable Multi-MSI") Signed-off-by: Jim Quinlan Acked-by: Florian Fainelli --- drivers/pci/controller/pcie-brcmstb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 7b698a9a851e..acd478edbe2f 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -449,7 +449,6 @@ static struct irq_chip brcm_msi_irq_chip = { }; static struct msi_domain_info brcm_msi_domain_info = { - /* Multi MSI is supported by the controller, but not by this driver */ .flags = (MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | MSI_FLAG_MULTI_PCI_MSI), .chip = &brcm_msi_irq_chip,