From patchwork Wed Feb 5 19:12:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13961805 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 38817C02192 for ; Wed, 5 Feb 2025 19:22:35 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FyxoQmP+DrPfyNDFU6zDEUm+WeVsHxsrhuRbOaUfCms=; b=FRncvHr2VYBQhx1Y+kG+882E/s ujlQO3JH46pmKjWbYuMcJSWpaXCdbnVNl9WMUjpsLQVp5mrgds+BkuePMjrYT4U31YWXZTAj6j8xW sM5ufZzDPyEJZ3Z841CuB08aM/VXz8WNtx9d5El41bO12MmwIeouR7J6huyfCuKcjmbPXXQYfK5lw CfiGnXDaqN9kHTC/Ve5iRaqN3NR232IMphAfSbT+anvyUTPfU96JMxatPPGX6yFAyGcj8BVRts2z+ etMaP3Gav/AJZoAU/TlY0uJeagxaubU90SwtYu6/Ht9kBGnHG9lZbMMk7DiIZoA1h0MVkljb8Lwgr ShUosdbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfkye-00000004OdW-2Vrl; Wed, 05 Feb 2025 19:22:24 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfkpV-00000004MpV-1TgG for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 19:12:58 +0000 Received: by mail-pl1-x630.google.com with SMTP id d9443c01a7336-21661be2c2dso3506115ad.1 for ; Wed, 05 Feb 2025 11:12:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1738782777; x=1739387577; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=FyxoQmP+DrPfyNDFU6zDEUm+WeVsHxsrhuRbOaUfCms=; b=YK6P/BV/DVZOCczcqYF5i07ngtCCoMEusxvFcw6QlReJl6//jHiLkXRorGHpBft13s PKJ7ZdpHR03tPVJ4UpfCPaEg7jyhY30U/Yt/w0JAuCQyyyOaNqo2/6xTqC5s6jDhrT6z X6M78F9hDaGe/PT31tOypEg7Q0/lRj1fFrc9U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738782777; x=1739387577; h=content-transfer-encoding:mime-version: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=FyxoQmP+DrPfyNDFU6zDEUm+WeVsHxsrhuRbOaUfCms=; b=kE7Are8lhbACREdhekVsUSvvOInyMuoABtrnUWFqjaaFR6swXQixerSoaZJo9sf6ol J0toTgzlD9K9jRaRwiO1+2yo/JRCsgBrmUp4P3naDCX7cCg0QZje+Tg9ibtP0msiruB+ EL3LPdAh2Pl/GOEps/3AO26dX/3DwWdDfuFU7qzMou1/5aJ0cyIkMZbLBny4EvrpbrxL IQ57gOEhCDfWUWfQG+jREunNUScSpyACXc+lJ2j6IZrIYMfgMcMpl8LU6fp5/CrQ5PHd qYLjLVSvdxvD7Bs+Xz3cSdiHr6JkAQjJVlYHX6/RiKzlVea0WIU0ktUmk6uG6ELULger T7ww== X-Forwarded-Encrypted: i=1; AJvYcCURoQGIlVOJQ+/prfWrWcQg7miefzfrhavX0lyXoleX/7iWATk7/Bg2mJv8NVHh1oMu3yt6QzhvEZ4B/eU7tGK7@lists.infradead.org X-Gm-Message-State: AOJu0Yyi1g4W72mSez02CiERS7O6XqW75H2XoGamovwwdcaVzcezDHjJ SYzKZYBUmJU7lYIP9gJSR0SrY3MZ+tQvcLGvQP97qghbfUkfVm1fKRfnbRraog== X-Gm-Gg: ASbGncur+zmquGCXNAa7L6Pi12eG8N80FAEV6pGH450LYZmgOnKugvAm75Z+hNAmMKn QJR5b/788y3U5h2qyQLOWWTW20zSVZf6ymHUGiMyYduMJeGFrZu++ep7K/nY8qmii2mLCn7EnR8 M0xtS47Ctfrc5Yiwd/nwGskD6X4M/2jziz41SZjGUmeYU+vmve5FAIhoHu1v+oAf3c97OhvDAIX O3VdG4hvQivpzMo0+0GlmNE+z76JF2dB5rR6zhi56IBppZpO3qrH4Hc/SPI5s9KVlde5H0mQPXb hVROnn79AyMNM3x7Wlq2hPVUWf01FOQ9I/AqsBRWRSDFid1BZVwaWpc8SBigxRh6+U/Ba80= X-Google-Smtp-Source: AGHT+IGu6hun4FwjJUr/ASi5VtU1r7KzOWGkU1swFqWYgTtfTk7Rzk7GNGUnU+ZBJXjxJW+oGt6ZSw== X-Received: by 2002:a05:6a00:3002:b0:725:b201:2362 with SMTP id d2e1a72fcca58-7303511e562mr5701360b3a.11.1738782746930; Wed, 05 Feb 2025 11:12:26 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69ceb1csm12670842b3a.151.2025.02.05.11.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 11:12:26 -0800 (PST) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , 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 v1 1/6] PCI: brcmstb: Refactor max speed limit functionality Date: Wed, 5 Feb 2025 14:12:01 -0500 Message-ID: <20250205191213.29202-2-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250205191213.29202-1-james.quinlan@broadcom.com> References: <20250205191213.29202-1-james.quinlan@broadcom.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250205_111257_390395_C1535401 X-CRM114-Status: GOOD ( 14.48 ) 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 Make changes to the code that limits the PCIe max speed. (1) Do the changes before link-up, not after. We do not want to temporarily rise to a higher speed than desired. (2) Use constants from pci_reg.h when possible (3) Use uXX_replace_bits(...) for setting a register field. (4) Use the internal link capabilities register for writing the max speed, not the official config space register where the speed field is RO. Updating this field is not necessary to limit the speed so this mistake was harmless. Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 546056f7f0d3..f8fc3d620ee2 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -47,6 +47,7 @@ #define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY 0x04dc #define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_ASPM_SUPPORT_MASK 0xc00 +#define PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_MAX_LINK_SPEED_MASK 0xf #define PCIE_RC_CFG_PRIV1_ROOT_CAP 0x4f8 #define PCIE_RC_CFG_PRIV1_ROOT_CAP_L1SS_MODE_MASK 0xf8 @@ -413,12 +414,12 @@ static int brcm_pcie_set_ssc(struct brcm_pcie *pcie) static void brcm_pcie_set_gen(struct brcm_pcie *pcie, int gen) { u16 lnkctl2 = readw(pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2); - u32 lnkcap = readl(pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCAP); + u32 lnkcap = readl(pcie->base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); - lnkcap = (lnkcap & ~PCI_EXP_LNKCAP_SLS) | gen; - writel(lnkcap, pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCAP); + u32p_replace_bits(&lnkcap, gen, PCIE_RC_CFG_PRIV1_LINK_CAPABILITY_MAX_LINK_SPEED_MASK); + writel(lnkcap, pcie->base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); - lnkctl2 = (lnkctl2 & ~0xf) | gen; + u16p_replace_bits(&lnkctl2, gen, PCI_EXP_LNKCTL2_TLS); writew(lnkctl2, pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2); } @@ -1324,6 +1325,10 @@ static int brcm_pcie_start_link(struct brcm_pcie *pcie) bool ssc_good = false; int ret, i; + /* Limit the generation if specified */ + if (pcie->gen) + brcm_pcie_set_gen(pcie, pcie->gen); + /* Unassert the fundamental reset */ ret = pcie->cfg->perst_set(pcie, 0); if (ret) @@ -1350,9 +1355,6 @@ static int brcm_pcie_start_link(struct brcm_pcie *pcie) brcm_config_clkreq(pcie); - if (pcie->gen) - brcm_pcie_set_gen(pcie, pcie->gen); - if (pcie->ssc) { ret = brcm_pcie_set_ssc(pcie); if (ret == 0) From patchwork Wed Feb 5 19:12:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13961800 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 5D0B6C02198 for ; Wed, 5 Feb 2025 19:15:28 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rshGoTVKNv7yJ8UG0ncdA2L3Ez+eMRudoZQa+hQwzgo=; b=chWgwbUG4Gxf34SGLBgadmWU4E x0bpMhMQNRQKxOqTQNpcTe4MqmkxAE5BUgPQkWoqr18LbMNvXCELrh0htqvRhvtPTWWMRmNusRj5z Egi9y/xYMrBC2MfksR9wjTEfmwMha1TI9HSD9sHeb9LU6EMKsLDyHgUseUF2sjqDKoH265uEgj+BU 4KAF2RaIw1QF/tj0gOwruL5pGlFxivza3x4u7XIIBOeZDAK8IfpKkxXsopsRLXwZZEa7rYLkfX5ap C7ONI4uw+LTZ40h7IO+dUShUvWqPU3Ja5sNCH/esAwekagv04HocqiW/Rq5OabcRDxE9m4wwP4Dvo BfG72Vew==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfkro-00000004NOC-0Sm3; Wed, 05 Feb 2025 19:15:20 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfkp6-00000004MgK-0POp for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 19:12:33 +0000 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-21f20666e72so3474005ad.1 for ; Wed, 05 Feb 2025 11:12:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1738782750; x=1739387550; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rshGoTVKNv7yJ8UG0ncdA2L3Ez+eMRudoZQa+hQwzgo=; b=CVc1CDrU/pGufVL7vz01sUjaDeIrgcVTTEJAwLo9CT+7d6GL95QrwVTesONWBKnVHa 3r607he1JK2I9/o30SbWhSoEVtNH8H/y5FXpdPZ/Mq1bF5YkK9QqSCbtvfIf+0wPHY34 B0c+eVgrErR5bFvC4/s4hHtJBZYEZrDoedcVM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738782750; x=1739387550; h=content-transfer-encoding:mime-version: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=rshGoTVKNv7yJ8UG0ncdA2L3Ez+eMRudoZQa+hQwzgo=; b=QfrDdxg5Bnok0HgGCanyv3xEA/dbxG6hITDwdHtg32lXg6jZaC6LqFmDNSsu8FRQ+g 1Ctxm0KtzGyHM9qrp488u3QqV2ETPhOTiEZfgsOTY8UetCPItHoixFlEOz+KLMA3Lsqi MrxRCu9MkokKxtqaoeRyGPgY/BmAVUDjKrIsUAyQZs8EyuS8DplGFBHpNkN//37jAPi5 LNmiPyoeoBpSA602GGDiC5tNGhuV48oMpb9FFKycj4QJjV05IUqLDC9M6LTHQMdvkT6/ rnFAye0pDErOYHf1AxwRD8ki/RniUWBF6pZRMeXlwzJrcBxQynwPtj5tug8jKkTG3s+1 CfDA== X-Forwarded-Encrypted: i=1; AJvYcCUv/EfSxqibDmfX1V+ZXxKNKhSK3sCWKPSFztIeLrHy9HkmL9iqc468xV6PCJMuejMsO13GiiEZgLeRpKoWyGQ1@lists.infradead.org X-Gm-Message-State: AOJu0YzO0mhGCjGAqkyDWKDZFTrgKFCAPBNjb93ds6e7bow8eIBxjagq kmrVh8SGMp03D3OatHNP8wRybY5A5m7+24oN+FedgFQ0YpGl8MHL5surLKh7rQ== X-Gm-Gg: ASbGncu43ulWmHXa71/DlrcZHA6lYN42SuA+to6rK7E24MPjg6gyhwFXvwENFesu862 C6JXWVGBt91lbRDxh9VHHyj9FVB8iyNJ7rWji6UHJ+Wlxd2xQy2xjsBEN1S8c4G07BEGdsmRpkR zvD+FHEW+jQQMrMENx+0kC9pS+4ZA9dTNNMNa4vO1yWVM7/+BbTxqMx1k0nQOx4xtXMFq7xsNbu pL58/ZTrhV2Xd8Rs5e2N/n8L+Vs00K9z4mI5hjfJnogU6+z7eMXuHQgZcmE6o8KIEp+y5Fjj0/E vffKNlVg0WUzx04mOxqi11xW29eE73MHKz7dFoq7K444apWhGmhQLnOh31vdwaHNpKbxjRQ= X-Google-Smtp-Source: AGHT+IEvH1UsOv2Pdep53yziZn/D7SThmLNGW4jFaeetD7lQZsfU1M4mdvMGq8u34jzx7Ya85/+NnQ== X-Received: by 2002:a05:6a20:2d0b:b0:1ea:ddd1:2fa7 with SMTP id adf61e73a8af0-1ede88b9994mr7396175637.28.1738782750080; Wed, 05 Feb 2025 11:12:30 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69ceb1csm12670842b3a.151.2025.02.05.11.12.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 11:12:29 -0800 (PST) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , 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 v1 2/6] PCI: brcmstb: Fix error path upon call of regulator_bulk_get() Date: Wed, 5 Feb 2025 14:12:02 -0500 Message-ID: <20250205191213.29202-3-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250205191213.29202-1-james.quinlan@broadcom.com> References: <20250205191213.29202-1-james.quinlan@broadcom.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250205_111232_142553_A077D434 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org If regulator_bulk_get() returns an error, no regulators are created and we need to set their number to zero. If we do not do this and the PCIe link-up fails, regulator_bulk_free() will be invoked and effect a panic. Also print out the error value, as we cannot return an error upwards as Linux will WARN on an error from add_bus(). Fixes: 9e6be018b263 ("PCI: brcmstb: Enable child bus device regulators from DT") Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index f8fc3d620ee2..bf919467cbcd 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1417,7 +1417,8 @@ static int brcm_pcie_add_bus(struct pci_bus *bus) ret = regulator_bulk_get(dev, sr->num_supplies, sr->supplies); if (ret) { - dev_info(dev, "No regulators for downstream device\n"); + dev_info(dev, "Did not get regulators; err=%d\n", ret); + sr->num_supplies = 0; goto no_regulators; } From patchwork Wed Feb 5 19:12:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13961801 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 2804DC02192 for ; Wed, 5 Feb 2025 19:16:57 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=rl5E0UVjy+KHHY0GruFIRH1nxCM5/nCEesXNNBsIatY=; b=1Btvcrzl7wMpIvwA+5NueBa+RN 4oowyY0fCsIY5bcCIKstyr7WCc4Yd5sirhyucw+LvJrGbn5EtZhZVrUQtzLs032cANMsNEmBbmr5J ECKVXMdvrfkVkAUOOBQtD0IbHyOKpxZT4C6kkuoVbivFzpdeYrQPtCSOTtu4SpeRffe+bLw1KVuUF 5UG5XTpYDF9I4J19bBbm9dPSUOYoejhkV0v5i6y2eemkuI8XEv7s8UqH4xCXVXPVrOjxPXalQ0s9q qg7iVY5RlX2KuLmYAsmPUgjT7uM35U0KwbME21yDCGd/5WOm/wQoELWvaSpERQPP97qA3PcyR9tNi s7c4wLkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfktA-00000004NoF-3Zxo; Wed, 05 Feb 2025 19:16:45 +0000 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfkp8-00000004MhL-13f6 for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 19:12:35 +0000 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-21f169e9595so2614015ad.2 for ; Wed, 05 Feb 2025 11:12:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1738782753; x=1739387553; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rl5E0UVjy+KHHY0GruFIRH1nxCM5/nCEesXNNBsIatY=; b=N/QSqxOolX4zcPCRX9nduBMgNiKBDqu7UrshMh/yePtCbL8suWkNSvd5Wgxk9eK5IU csRoanT2mZJ+iMO61MtBLxWd6bw97NRsRa/JBPhsNNmzLa0gKFU82n5TxeI88mWad/bf 2L+Rf+MBcLv/Z5xfPqI2w0nbtyL+Rhy2RDRMQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738782753; x=1739387553; h=content-transfer-encoding:mime-version: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=rl5E0UVjy+KHHY0GruFIRH1nxCM5/nCEesXNNBsIatY=; b=nTvOuAGjyl7RUxVka0hvXRtBB3Q0YGm5UYvDaG39lNJPgxAMl94Nfyq7WZzUuwYw1J cwSKdlIBwzkv86oe/tBFAlRE6XW1p+cmuMCIU6ke76xW9ZOanpSpQY7xQ0nhLekni5j/ loeUl9tkHcO/ocNHYyRjLtqAi2juPSADt7eZxeKailV4dcu+Q08qI4ltL/CNbOASV2Bp ApbML8L1vzZgwA5XoPoNfK+GeOehedOs2mF6RXsJmmOIC8AFbEr5UDxqHwBX1XylOfIl 1Hqaym6QVs5RKEbPV6Ah4cXUbIsn5267A3oPwSA9OdbW6HmSJXhkXVdVcpi9s26dWAio f1BA== X-Forwarded-Encrypted: i=1; AJvYcCUGywBw0FNBvN9VPAIQFpNwZb8konAv31snBVCvLaBntxbzM86tnmwI1n7OucqDyTOKtVLCTj0OsvRVtnbaVkhz@lists.infradead.org X-Gm-Message-State: AOJu0YyfN4DyOHp9dJVvckayXXpliXbOxOtqaGBl97H/a6HbNsLPz1Mz GG1vScUajuzGnB++izOVtj3mRvBR9hcKZNtNhCaivZLkMLDwYlSW/E2lGlWaBQ== X-Gm-Gg: ASbGncvue+a9fPfkz3Ovr6KYUoWAQgX2gssClXZwA+KOsk9Rv3is9Rb3VkXWQ/u+WwL 1ReCVTUnhhGolftXOYaS+FdzIQO45f/bQ+Q4zoNHfFPmJmvwkvk2QaDCaVvRSLW8G37CdSb7POl UlabR0EJIVOvSrFUNsS6yEq05lENz9rabYizL5AJtVC2DbnFSD5TnQDWa1Ah8fs3OCBdTBR42ap GURLtePQHxWwOmFayBElV4M7woap320RkPsbg7QIJKHiPjKqWAazuB3l/gDi0Ia4mBW1JUb9qFX WOHnUFLt3SEgSyLWalAQgrjzLFd7NYKhUUroOYhHzh1D4UTvU3X4DtHa7nP9sTleIEHGEzU= X-Google-Smtp-Source: AGHT+IGHNDQdUmc+0d+Oa25tolqBbEh64Eprx1WXUEnsJUtgXypSDf+wemV6e9iAiBws6tIO7Kj01Q== X-Received: by 2002:a05:6a00:3cc3:b0:72d:3c4d:c1ea with SMTP id d2e1a72fcca58-730351017f7mr5551115b3a.7.1738782753270; Wed, 05 Feb 2025 11:12:33 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69ceb1csm12670842b3a.151.2025.02.05.11.12.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 11:12:32 -0800 (PST) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , 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 v1 3/6] PCI: brcmstb: Fix potential premature regluator disabling Date: Wed, 5 Feb 2025 14:12:03 -0500 Message-ID: <20250205191213.29202-4-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250205191213.29202-1-james.quinlan@broadcom.com> References: <20250205191213.29202-1-james.quinlan@broadcom.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250205_111234_293833_228AED45 X-CRM114-Status: GOOD ( 14.37 ) 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 Our system for enabling and disabling regulators is designed to work only on the port driver below the root complex. The conditions to discriminate for this case should be the same when we are adding or removing the bus. Without this change the regulators may be disabled prematurely when a bus further down the tree is removed. Fixes: 9e6be018b263 ("PCI: brcmstb: Enable child bus device regulators from DT") Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index bf919467cbcd..4f5d751cbdd7 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1441,7 +1441,7 @@ static void brcm_pcie_remove_bus(struct pci_bus *bus) struct subdev_regulators *sr = pcie->sr; struct device *dev = &bus->dev; - if (!sr) + if (!sr || !bus->parent || !pci_is_root_bus(bus->parent)) return; if (regulator_bulk_disable(sr->num_supplies, sr->supplies)) From patchwork Wed Feb 5 19:12:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13961806 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 A7059C02192 for ; Wed, 5 Feb 2025 19:24:02 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=p2SP8UN+7O3+LtijH955HifaeFHXMbD1xCtBylyCBjw=; b=rtodaTm1U0LH1QNm7bJCqmQNZo bRQxXJWBQeTYJ0YhvzJ28yVwUD1S1Jpxj3XCgWaMIB26JSHWA4nd3f9n6czpANktIfrmEIw1AxYvc Tn/5NiSf74vaCmIvw0OtTvGniecfuyfNOiH/RiVR7q16Nos5MpFDSQZVzwTAz6PFRH/Ah8fF3V3sL Gg1wPNVD3ZH1c6lqnNuiS6Rc3IIXB3L4n7GKTSlQ7CQxsubZYl7wC6SwbHnNGE49TVCIiTgOV2gYC b8WR/a65+6LAKqDQb8LSDDmM13sR+nhc48h3hsf5BsRt9h1uQRUI3OGKB8nMYEl8Dk9/x5D8Wko8w ezmW8bvA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfl04-00000004Oop-0pRn; Wed, 05 Feb 2025 19:23:52 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfkpf-00000004Ms3-1Ypt for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 19:13:08 +0000 Received: by mail-pj1-x1033.google.com with SMTP id 98e67ed59e1d1-2f9bd7c480eso90823a91.1 for ; Wed, 05 Feb 2025 11:13:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1738782786; x=1739387586; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p2SP8UN+7O3+LtijH955HifaeFHXMbD1xCtBylyCBjw=; b=EZx9Esq9nL4oHetdh+cOFS5abf8J/fxGObWCaMOQZp9EHjpRzsSBg9M0aUKK3RpSyu ZDvVdB+mpxzo26ajA5FuM1fm0HAPDgHsPYqJN3vJsPQh198kcIXqvuUu0iwf/SAb879N EbfodYmUCey7fAby03LnkOMxeM6NWhtEW8K7E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738782786; x=1739387586; h=content-transfer-encoding:mime-version: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=p2SP8UN+7O3+LtijH955HifaeFHXMbD1xCtBylyCBjw=; b=pajzPqTqhjOH9b64U/+KXfXMSTk3BbH2BO4Vy4SL7Qr+gaftDN8yTUq+HVArK4AwRt 03uviJJE7lkeH1/PpTl16K0a8/PBPfUh2Zk+dCfpqmMa0ATY5kVWQxTSb6YekFcCZpdp AWSjpReCF6rYpgNrqLPSb6BOAloOQvNDtIHwQiUFCs44GwJy/WekaRXKAh54CcdbxgQy dl8oeRrbztnNS5JQf5ee6SgPwhA7bK6XltzKpwu/FZhpk0UrF81wCFEiEPDzzlJ+R6Up KaSdpG+47ZwBWRTYcwjDObKPIgu9BjQn97vpPvAMhvPfTmmSHyFOAySJe6sPxNQdgZCA eDVA== X-Forwarded-Encrypted: i=1; AJvYcCUZSEWbLZNhN0e173TWDwYqTaac1L0JP9b6Efu70cfOOUmy4Kysni+3cigMeUb7jpAzbDV17Vs5W3s5XZRmSAgk@lists.infradead.org X-Gm-Message-State: AOJu0YxxNxCMaKn5ffFy4dJ8dvFy/Qgl+7+Ayph9LXUAvW+/2nl7uIIy JSk5fGJh4hD5aB9FhThV9H1A/3LOBSez4mvryA1qILifdkvwsdvTNctsg+97TQ== X-Gm-Gg: ASbGnctKrch16Byk+i7HM5Ipv3UDnb79kuZM2xVt00uete6WBJrRrK3RjKttIcS7+ar dD7uzkoqOcbhTlFiexNUvy4mtpyuxME+2qJZhS7LJtds01kii36A2BS0wlhKuMU8f7fypZjPf0+ POnWQ6PpJIFHrsc8J2L8mGkYyW0i5I4uN8AtFPztdyunleRzYBeBeaIZRXZ8YY7+fyXtR22h5yk WBheMHbN7eblvkdqhMQ3+6AdMnyT1KhT8rUb58MyX9U6K8LMP+zkAFeaTjrCQJbKjcaThQOi2Ry jG5hk2OEXRPOdQZACRaAksX6tz8fng5y9TIyQhU6/0qYBqh45ccpI0n+8hvJv/MHod+/UpQ= X-Google-Smtp-Source: AGHT+IFWf34gqo2Cq3GC10EE4JpvnnXxd/baqFQ4/rfJGOY8K+FfkhKwIxsYtkyKK3/Ky0Uqi5YYwA== X-Received: by 2002:a05:6a00:2908:b0:72d:8fa2:9998 with SMTP id d2e1a72fcca58-7303513ac4amr6540559b3a.14.1738782756542; Wed, 05 Feb 2025 11:12:36 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69ceb1csm12670842b3a.151.2025.02.05.11.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 11:12:36 -0800 (PST) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , 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 v1 4/6] PCI: brcmstb: Use same constant table for config space access Date: Wed, 5 Feb 2025 14:12:04 -0500 Message-ID: <20250205191213.29202-5-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250205191213.29202-1-james.quinlan@broadcom.com> References: <20250205191213.29202-1-james.quinlan@broadcom.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250205_111307_410723_478EDE26 X-CRM114-Status: GOOD ( 14.66 ) 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 The constants EXT_CFG_DATA and EXT_CFG_INDEX vary by SOC. One of the map_bus methods used these constants, the other used different constants. Fortunately there was no problem because the SoCs that used the latter map_bus method all had the same register constants. Remove the redundant constants and adjust the code to use them. In addition, update EXT_CFG_DATA to use the 4k-page based config space access system, which is what the second map_bus method was already using. Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 4f5d751cbdd7..2d1969d7fd30 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -151,9 +151,6 @@ #define MSI_INT_MASK_SET 0x10 #define MSI_INT_MASK_CLR 0x14 -#define PCIE_EXT_CFG_DATA 0x8000 -#define PCIE_EXT_CFG_INDEX 0x9000 - #define PCIE_RGR1_SW_INIT_1_PERST_MASK 0x1 #define PCIE_RGR1_SW_INIT_1_PERST_SHIFT 0x0 @@ -728,8 +725,8 @@ static void __iomem *brcm_pcie_map_bus(struct pci_bus *bus, /* For devices, write to the config space index register */ idx = PCIE_ECAM_OFFSET(bus->number, devfn, 0); - writel(idx, pcie->base + PCIE_EXT_CFG_INDEX); - return base + PCIE_EXT_CFG_DATA + PCIE_ECAM_REG(where); + writel(idx, base + IDX_ADDR(pcie)); + return base + DATA_ADDR(pcie) + PCIE_ECAM_REG(where); } static void __iomem *brcm7425_pcie_map_bus(struct pci_bus *bus, @@ -1712,7 +1709,7 @@ 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, + [EXT_CFG_DATA] = 0x8000, [PCIE_HARD_DEBUG] = 0x4204, [PCIE_INTR2_CPU_BASE] = 0x4300, }; @@ -1720,7 +1717,7 @@ static const int pcie_offsets[] = { static const int pcie_offsets_bcm7278[] = { [RGR1_SW_INIT_1] = 0xc010, [EXT_CFG_INDEX] = 0x9000, - [EXT_CFG_DATA] = 0x9004, + [EXT_CFG_DATA] = 0x8000, [PCIE_HARD_DEBUG] = 0x4204, [PCIE_INTR2_CPU_BASE] = 0x4300, }; @@ -1734,8 +1731,9 @@ static const int pcie_offsets_bcm7425[] = { }; static const int pcie_offsets_bcm7712[] = { + [RGR1_SW_INIT_1] = 0x9210, [EXT_CFG_INDEX] = 0x9000, - [EXT_CFG_DATA] = 0x9004, + [EXT_CFG_DATA] = 0x8000, [PCIE_HARD_DEBUG] = 0x4304, [PCIE_INTR2_CPU_BASE] = 0x4400, }; From patchwork Wed Feb 5 19:12:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13961802 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 72A59C02198 for ; Wed, 5 Feb 2025 19:18:23 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=10mgnfIVzR+iSJ+OJSuQ8EcOXoSsF+yM91bimaJiDRM=; b=oeDlzF55R29HnE99frVN34ApGe 7/3JeLgnb5/1gPjEpSr6RF0GH95dGN397KHAKzM0wWhJlSRFkmLS6J9b6IYrJ/9rMOhoV8oVHmLfR iEiBppJYC1I5fDcBNSDm6BNBohtKZadn1vFhXIgMpK+vm+S4O7qUQJ9rItkHg/aQlzdjs+Sqk6/iU SlL5Xy39YR8DOCObDtMfqYGT8ImMZqAj1bzpGVCQjV0bmqhah3ueGrT5cyNr+oA7fsw3NTB+7AD8s Vk2tDJdxxo6rN7AXw5n/fKsYnsblOwKHvWtqDRavG8/bxmIMLuRdKWforzpyqQT2Z6BsnTxo31uxX N5zOIshQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfkuZ-00000004OBH-3Vxa; Wed, 05 Feb 2025 19:18:11 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfkpE-00000004Mil-33F3 for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 19:12:42 +0000 Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-2f9d74037a7so77359a91.2 for ; Wed, 05 Feb 2025 11:12:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1738782760; x=1739387560; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=10mgnfIVzR+iSJ+OJSuQ8EcOXoSsF+yM91bimaJiDRM=; b=fh3ZBXxewVSNKZWWmL3DerjwxaoLfWiq0KO6bv9XVfB+GEzKK5eaby/4erpbj/N+mq uEOF/z6EAjpMwuMKKxEuajGzZE6BrC2XR/NRzWutJL/QUi8ZT19VRPjxN6/hu7bAZOFu xCm9nL3Za7S5tZBgZqtIC0Nj9SrPFWPDZfuuQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738782760; x=1739387560; h=content-transfer-encoding:mime-version: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=10mgnfIVzR+iSJ+OJSuQ8EcOXoSsF+yM91bimaJiDRM=; b=S3Xxo+p5iGiEcPl8HgPlCivCE8R0G4ymr7KDpe5EHLH4R5oBL7LfvTMTeHOSNuBAOP X0IhbaNQ1JutWlA4XGCDpx1eDClvteZ3JXIg807U+N6DD3JdK+ef01JUUzjBD/kJVjjZ 8g/JyrFxtNXD3OE/Y++wphteXYzL/Q/7hcNJRvG/o8tD7WbE3U8o3k/1st+Mm55NICAB V/0/F8N5dZQrHMQ9n/nkMN0jgxaQ9gqm5GDYum0V/FBJgek6ossEpA+5hAHX/e5/epAZ 0ZYPbw862QM9H1aGpG3V/ZtrzHyURdPc+YSTDcUB20RqRuErUe0M2j2+W9tDYlKJU6Ft cnzA== X-Forwarded-Encrypted: i=1; AJvYcCVTyaw+bIjHmNpMk0exMXhTkd53bp4d/UIrSGpw267oyMLJdg/sY8RLXJz8Sx61VLYDY3qEIOvuGtwb4nFlC6JD@lists.infradead.org X-Gm-Message-State: AOJu0YxYUxZFXiCMzFCtp/L1Bm3KpBRzAGzEBvOEyhnQVoPCrCozzZxR uJ7Zbq6NX8O4eGsGcu0hvlNKKWFyHQj+oNf46/O56969T46nZ8eV0dSl6LJePg== X-Gm-Gg: ASbGncs3i/cJbvGWVM2MKnNaUGIPoXbNiptBqyH+2dUJyUOYv0zLr3f9gxB1tyoTFuQ JIcq++mbi0ClfXMrCqnfUp7+wglJjgkhky7Je2KWOUNiv62WK2rdpryoyuArxGBW+k78KJNwIvh /1oZjYd5IeGPGSqA1qoqvjNufnDqMHfn2l8CFUXDKXASlRYMBDx17q+2GCO0XuglvLgM6/ia/vM cZ7fr0+LzFvA7Dl3yEYowQWL62fAUjyEXoYXOmOUNd8hoUog1h31UqM5NLr8A+dJvlVl2/eHZ7v hl+SnEOZxs6x3FNxUdXRcOM8jwXDqRnz86PM8hBAgLoWUqUrdYiI7HE0CD+WeZ2lPIudRsU= X-Google-Smtp-Source: AGHT+IF/Wwlp9qYJd0K8y8zdsTfFgaW5Ghm0UX8Zc6UwKaMRKZ6CF/yzfZfIYoJNe7yUoNtnkLYNSA== X-Received: by 2002:a05:6a00:3905:b0:725:4615:a778 with SMTP id d2e1a72fcca58-7303511d28fmr6538015b3a.7.1738782759745; Wed, 05 Feb 2025 11:12:39 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69ceb1csm12670842b3a.151.2025.02.05.11.12.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 11:12:39 -0800 (PST) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , 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 v1 5/6] PCI: brcmstb: Make two changes in MDIO register fields Date: Wed, 5 Feb 2025 14:12:05 -0500 Message-ID: <20250205191213.29202-6-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250205191213.29202-1-james.quinlan@broadcom.com> References: <20250205191213.29202-1-james.quinlan@broadcom.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250205_111240_763628_1015BF57 X-CRM114-Status: GOOD ( 13.51 ) 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 The HW team has decided to "tighten" some field definitions in the MDIO packet format. Fortunately these two changes may be made in a backwards compatible manner. The CMD field used to be 12 bits and now is one. This change is backwards compatible because the field's starting bit position is unchanged and the only commands we've used have values 0 and 1. The PORT field's width has been changed from four to five bits. When written, the new bit is not contiguous with the other four. Fortunately, this change is backwards compatible because we have never used anything other than 0 for the port field's value. Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 2d1969d7fd30..da7b10036948 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -176,8 +176,9 @@ #define MDIO_PORT0 0x0 #define MDIO_DATA_MASK 0x7fffffff #define MDIO_PORT_MASK 0xf0000 +#define MDIO_PORT_EXT_MASK 0x200000 #define MDIO_REGAD_MASK 0xffff -#define MDIO_CMD_MASK 0xfff00000 +#define MDIO_CMD_MASK 0x00100000 #define MDIO_CMD_READ 0x1 #define MDIO_CMD_WRITE 0x0 #define MDIO_DATA_DONE_MASK 0x80000000 @@ -328,6 +329,7 @@ static u32 brcm_pcie_mdio_form_pkt(int port, int regad, int cmd) { u32 pkt = 0; + pkt |= FIELD_PREP(MDIO_PORT_EXT_MASK, port >> 4); pkt |= FIELD_PREP(MDIO_PORT_MASK, port); pkt |= FIELD_PREP(MDIO_REGAD_MASK, regad); pkt |= FIELD_PREP(MDIO_CMD_MASK, cmd); From patchwork Wed Feb 5 19:12:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13961803 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 444A1C02192 for ; Wed, 5 Feb 2025 19:19:47 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=X0ZTsssVvHzsc0e1DxaZAFNaCnLOP9m4uEkLrLv90vI=; b=iGBYl3iIQaj338/XSXs4xP1qSK 8a5SUe91jTUUhMo9/jpLOVDhjT3wQuqnahGdbp/i5IGJKNFghyhTmCF6qrz9GHUURsc/pePv8GyYg 0oS6napORtEdvjrCOwbrlDZY5O6e08FWbtKGPfE2VXxNGx83axVqImNbggRNHJaamofaPm0lgW5Zz KLmIfJnvzGSTkDvap1gkep76jjvDuhtB1f4dmYfFw09LkswVLKUQbbHciyFnExh/elmko9n+N/aoL YHOGlE7Hwr5PDugGamszwfTcmNjK26BoIEqMClUJ3t3m3+NVkdjQpcY25YUkFE2GH8wK+bJGErYcb 9SxzOVOA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tfkvx-00000004OM0-0Aby; Wed, 05 Feb 2025 19:19:37 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tfkpH-00000004Mk5-3UpG for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2025 19:12:46 +0000 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-21f05693a27so2266785ad.2 for ; Wed, 05 Feb 2025 11:12:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1738782763; x=1739387563; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=X0ZTsssVvHzsc0e1DxaZAFNaCnLOP9m4uEkLrLv90vI=; b=Nium8749FyqfIvcQ/6bcbVkuWPd+W+Ay4VkQOaGQrxCxmHFMWKMQixCXZGuM3db2ds 6U2m0I3uyC4t/un+r+kl8plgl0IoDmwtwpodYF+alZnJG2Kd3jMYtZ04G1BkPWx+gYHr 7kgdxXO9mlwKZSc5+BGtPNpzZOdgbfyIds3z4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738782763; x=1739387563; h=content-transfer-encoding:mime-version: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=X0ZTsssVvHzsc0e1DxaZAFNaCnLOP9m4uEkLrLv90vI=; b=sIlci0+DqiWJ8omZZPmMts4Sb6JqYIC87Vb+HcDA0RX2qtgNIpfF+CaaC9NxnMYqWA TcmBZ/uj+hRZJmu8lWw3/+By1IHWoBLEKifqjgnN9Kz+dn5xml8Smr4VTgpcTifmy17I 7ZlbYdUx4gn6dD7FW48dW7Ex6nVWxYg8dUCV9TcUVxyKtvbCKsDIHjFIBWEvZXTeIiD1 FiMKT9eIpXE94lN1ow4b30IsI+SpxEmNzBHVWEEGFAgTIwWCygeQ3n3r0hETzfhh8Cjt 8v8VMkJvleR9oGbysS5AzBJKYxBwMfppor5a4frHtJJp5LgUz3RRZQmTYDDAFb54tdi5 tpvw== X-Forwarded-Encrypted: i=1; AJvYcCWt2PB2KxtCr2WD5oj3qmwD/LIKEZxoEzEk5sfLZkKWz9BbQv4KA/fjNRkrbfPDKwsWkySFOHnWvM5glH0N2Cfp@lists.infradead.org X-Gm-Message-State: AOJu0Yx112HZErF4g+90iEA90meffEa/PoINeLx1lTkjxtTKALl9yOEC rpmDIFMV8ICZaQDsXTE7l/woXVrpMqNex/A3BVYGzfW0g/KjSZnC6qfhpdyByA== X-Gm-Gg: ASbGncvP1kgQz66twYvqxzPUkb7OcX/347vTqdPqxADfIgIc3IkezVPaP0kSYil5EGt Eawkr4nJYv7POp7CBqzDA97uT79O0U0F6ZMqdERNvwrnOD5HNntoDOdBbiD1bFwUh1qMSXrRhf5 RxneAKlWDjESutrIazn0CplPnYCCUfOAjKBa2zGoEv/XhvWUlV9Kr+A/bJZ8a0UdwJ0FH9IAHBB 7Bs2nJRJk2qMpUrah655gEoFhMtqGvbd6XiSbzipFyDs51fq5cTVSc1oYUHhj+Om+Kxzkq9I+8v trFW8TyqZLdki7lBs/VRD9W8IlRRqPZizFr9xrkHGjtN8jqChS5c2yjyj1koSN/ytu5Jr/E= X-Google-Smtp-Source: AGHT+IEXcZFzv42qZ8TJ/klgDwqqS/+A00tWNgeMvaWCk7kbJI8shXduYKzokviPveKCUA311SJ4wA== X-Received: by 2002:a05:6a00:851:b0:725:96f2:9e63 with SMTP id d2e1a72fcca58-73035224858mr7975973b3a.24.1738782762954; Wed, 05 Feb 2025 11:12:42 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72fe69ceb1csm12670842b3a.151.2025.02.05.11.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Feb 2025 11:12:42 -0800 (PST) From: Jim Quinlan To: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, james.quinlan@broadcom.com Cc: Florian Fainelli , Lorenzo Pieralisi , =?utf-8?q?Krzysztof_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , 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 v1 6/6] PCI: brcmstb: Cast an int variable to an irq_hw_number_t Date: Wed, 5 Feb 2025 14:12:06 -0500 Message-ID: <20250205191213.29202-7-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250205191213.29202-1-james.quinlan@broadcom.com> References: <20250205191213.29202-1-james.quinlan@broadcom.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250205_111243_912067_516DC57B X-CRM114-Status: GOOD ( 13.32 ) 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 Just make it clear to the reader that there is a conversion happening, in this case from an int type to an irq_hw_number_t, an unsigned long int. Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index da7b10036948..1e24e7fc895c 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -560,7 +560,7 @@ static int brcm_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, return hwirq; for (i = 0; i < nr_irqs; i++) - irq_domain_set_info(domain, virq + i, hwirq + i, + irq_domain_set_info(domain, virq + i, (irq_hw_number_t)hwirq + i, &brcm_msi_bottom_irq_chip, domain->host_data, handle_edge_irq, NULL, NULL); return 0;