From patchwork Fri Feb 14 17:39:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13975498 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 2C7A0C02198 for ; Fri, 14 Feb 2025 18:24:00 +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=K5WBjTrVITVgZYhJvGdqnlQGu4S0yfOA3QhZ3ApzwhQ=; b=lbEImFDYf07JaUrHZAH0rPq2UG 6QR5KxWgtPdT+9UXZjiYifFWQpo2NRr/BsawOlJa1fsecGWZ1BOapr7+rsaB9tIOU+emCWi3uXLew csLogW91kMxLPvWXgM4XicgK4SW8MSRDL7DNy3l4YFgGXZ2MsAjQEEFsraU3aZ8G1T3pt6DziJhcQ Eave/wK68jX7SXfdAQi3y2F66TvY+WM+fMpsS8ZNx4qZqwHg8bRPwSbyTCapUZPt10jCj4CD8rc0I 71DKa4/HImRZ/33Od8ZnHlFELJjK0NFO9HhylY6wFG1clwp2JJkZXB4OxV2AG7GcnR/NKIgNsoFaC uaCmDA7w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0Lt-0000000FrbO-0ned; Fri, 14 Feb 2025 18:23:49 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfU-0000000FkWM-3M0k for linux-arm-kernel@bombadil.infradead.org; Fri, 14 Feb 2025 17:40:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=K5WBjTrVITVgZYhJvGdqnlQGu4S0yfOA3QhZ3ApzwhQ=; b=QtknJRjuKiP1Mg+8g9cEjOYGZ/ LmcP3niKSWH059zB6W4ahjk90BX9AWtETVpcH5FeNAfLEh+W6ExT8UHxJjNKOCIjOvD2mMSvupkD0 neZFw8fzxVw3k1aag/wlz+Gu2B1BkOoSu3UKf/zbgGfvmCzW2f3zjAdKYGkDp1sWjrmsV+9AeGMMo 9fLShUUqweOnvTieqhmIa4V8pvTK/HgjTSFM6tptXTy2Ui6TveQP1gywj6ylRQFXVBLZPvPlIykoQ KHoopSHgSDy2Jnbyw8Jo4fFBTd4gNb+hM1FPqly9VK0E9Jci7kGKr2G5SnBd9knbxtRVfePbA2eOB 0eQM04Xg==; Received: from mail-oo1-xc29.google.com ([2607:f8b0:4864:20::c29]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfR-00000001IDM-3e81 for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2025 17:39:59 +0000 Received: by mail-oo1-xc29.google.com with SMTP id 006d021491bc7-5fca2d12020so1469892eaf.3 for ; Fri, 14 Feb 2025 09:39:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554795; x=1740159595; 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=K5WBjTrVITVgZYhJvGdqnlQGu4S0yfOA3QhZ3ApzwhQ=; b=GygXqYtaCQJq0VPPUsnnu8YM/6+EkuJPJ2BQIfusiJeLyWxKMmI0dupr8dBopaCEtD 85Gkxc3pymsnOvlrdbahNgLwdKE6j1bWLTeZRLKIa1mCDhxca94/Xu93fqjScPFUpwgC Sleyv6wB6IHuiILZ7zG6HAyL6FO9WxcbjqCIM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739554795; x=1740159595; 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=K5WBjTrVITVgZYhJvGdqnlQGu4S0yfOA3QhZ3ApzwhQ=; b=kAwLAhjmNg3s3JHvq+YCt3OXcKEtEhgo9rL2ttFush6/SMekbTuuX3Azj7u9qps/sq 1PcKXrk5e3yvxL2jkM2xBDcv0EU1LRYoQIHOfpa9ZksL6/qnuEw/sMynz/l6JYrhmm04 zyaOsQCqWO8Bs7YdyCNlPOl+eB5mL9+OorwDzNf2R9DgGJD3me9Wz/Qa7z7mYhEsbw7+ LS4jgjKZ3TiTgdXYfQWK34DGcICX+SR12gpXQpyufNIB2zpDnsc/U5MYxHYr3V6NFQEb Gn3EsC6F0xfhglZl0F6MAl+lJiqTW/mOpMxzP6hQw3NpHvzmZ4L/2FsGaxRef+/KwoZW DbFw== X-Forwarded-Encrypted: i=1; AJvYcCUjt8zx79sDjAhbHpaL7Xb623lVyehrS6CY0Mib29CprQd1r8XfoWpIp2PpvU4HUi+NpMFAY5LyAgpF7dyFr5ws@lists.infradead.org X-Gm-Message-State: AOJu0YwrMKCYG1ryvs7VxFugjqlDSideNkiX06X2aYme2Ekmkqfl4hfW uSvobHaCDK+fDM4gSyIs2gWij7l4dzM1S89r0WTVr/u8CNJX3XIb1UU7FOLOBw== X-Gm-Gg: ASbGncsBtOcxIPMBueISGy6OeJ9Equn4l6xO1qHQ1pHGSUUQmp1Sc8v9xZVbrRUI5pK 77cskpRk+iZjDCvpNAZc27gYYfByBUnysb+0/5x5psNvuiJ4juBc0Ql5efPWGpQ3worbJjc6sBO b+0VOrhWcogTmn9hvrhRtsFlLT4RL1NoQGXb8omsFx23N/1ZH9Vl3B38gMSX7EIx/yTQQCoAlIk 9hGA/POqEtpkA56O4tHNCNVmmPJP5lI/UHub4pr9fub2hsXexU1u3T37BpNUwstql0sKYdWmBFq Jy2t52iuifHA2oIP4VyCZJU8/Zvem861h4mhOcFYOaDhz97zUTdsmmsBgDzm5Q2QiI7euk0= X-Google-Smtp-Source: AGHT+IHHLIOPe+42yxDSEg6UPq/HyJpzpOJx8RHpCQuMziDQFg6kMun+TwGePYtgASMBwGxG/t8jXA== X-Received: by 2002:a05:6820:160a:b0:5fc:c1c5:873a with SMTP id 006d021491bc7-5fcc54fd122mr31501eaf.0.1739554795496; Fri, 14 Feb 2025 09:39:55 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5fcb17a4ca4sm1284073eaf.30.2025.02.14.09.39.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 09:39:54 -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 , Andrew Murray , Jeremy Linton , 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 v2 1/8] PCI: brcmstb: Set gen limitation before link, not after Date: Fri, 14 Feb 2025 12:39:29 -0500 Message-ID: <20250214173944.47506-2-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214173944.47506-1-james.quinlan@broadcom.com> References: <20250214173944.47506-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-20250214_173957_981050_C112D2E7 X-CRM114-Status: GOOD ( 11.88 ) 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 When the user elects to limit the PCIe generation via the appropriate DT property, apply the settings before the PCIe link-up, not after. Fixes: c0452137034bda8f686dd9a2e167949bfffd6776 ("PCI: brcmstb: Add Broadcom STB PCIe host controller driver") Signed-off-by: Jim Quinlan Reviewed-by: Florian Fainelli --- drivers/pci/controller/pcie-brcmstb.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 546056f7f0d3..64a7511e66a8 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1324,6 +1324,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 +1354,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 Fri Feb 14 17:39:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13975499 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 42BD2C02198 for ; Fri, 14 Feb 2025 18:25:29 +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=jXbSVytevldhOW6yTI16BOZbfAnBjooyTrFkgreq94E=; b=Xyiy5JpSFYav6Q4ujVLidOWfmi umgP9j9+Pu/7FR9/SFfOGr/6NTw6fF3REI3FN61sCY2MEVpjD7JS900cueNumSq6OIVGRBmN39jA5 jZfuFYklPdWNuB4CVHDFKfr/SwnF2zUXLOuLey2n7+IFLisV6II0BHnyPTXtWxUXEyPb28/2GE633 THgIUhdTQFJLzRYcbPQi8y/FZOY6CG3/y+8+25KW4yu96CjQTerDMoK8BQDpG/Ofnl73XYB4CnOok +PFb9PGhmHGcPI/3xICDq3jSxZZsOBCrkFl06HL/EVSLmfLSwfYaZwOLkm0AIn89+/drvIATAo13j N6jEd1LA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0NI-0000000Frmv-3XL2; Fri, 14 Feb 2025 18:25:16 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfY-0000000FkX6-0H48 for linux-arm-kernel@bombadil.infradead.org; Fri, 14 Feb 2025 17:40:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=jXbSVytevldhOW6yTI16BOZbfAnBjooyTrFkgreq94E=; b=W2QN96tQq9d5hfaDDvY0p1ABi4 EDIvaRqZVcX36kOF2EqMYSgyNKLM0AucrNNCYpJW8WMRRiZtrjL5GeI8W3RPjtdkbpQ7nSZ30xRFH k9h+esPqJx77PwMl+c1f3GgHyferfGMWDbTlncLfSgiJ1KEPfg2Slqdk7HGNxQaBu8kYCl9TZzw4F OAcdBjzJB0BNDX832MAYtfhZkfHLr3zPh8jYE5+fy5FRzlezW1m5pdcUidfzVyfHJ4Q01KpGu4MB+ 1pVtN60C4l+7/T3WMAwK3aXGPdttr+F+wexmVbVGdaGTjF7e2E/K5Pp/fZuqksfzaiw+c0W3eC8gH zwwh6WbQ==; Received: from mail-ot1-x333.google.com ([2607:f8b0:4864:20::333]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfV-00000001IEY-12Ms for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2025 17:40:02 +0000 Received: by mail-ot1-x333.google.com with SMTP id 46e09a7af769-72708b0db90so690930a34.3 for ; Fri, 14 Feb 2025 09:40:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554799; x=1740159599; 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=jXbSVytevldhOW6yTI16BOZbfAnBjooyTrFkgreq94E=; b=Oc1pPVyoGKoOet9nExmhUefL+2fleTIlEp3iTDXiCQAwxlbtFSAawgfIMjcJOciVZl h30NaxMXzdn1hlyHYzhOYtFR3lTlL+mqykxdncdI+v8Hnupescg+//XRgCJxkNtvrXVj czcFOOhGwmwkiqGaLLDIJG3NpGedeZSxru8OI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739554799; x=1740159599; 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=jXbSVytevldhOW6yTI16BOZbfAnBjooyTrFkgreq94E=; b=Ef9YeyHgnZ1exveik7ZFSoIuE0HW74uFcv8k66VUURKMUvCrCiR40Ou5HUFB5sDUfi 2Vvwlqx+TSLeyTXVRGdvba7RsPhY8BS1Zdv6pcKk8VM1iVz/XlnrXiJBzPoyBkfXS+CW jEBsRZC5OY8WXEVZCPOOZdZ8BHnqF5OE+w2MhoBtz36GpDbepi10o9BUohkp3WGTYihf eEOQlHOhyOUMjSHhPPdk0xgoLouMrD73UVs1Uazymy8vUt5jtjqtvngibpcuUkc5JUtt FNfHQ8ThO77UXaIY0Ny9Y6CJyQxfxr8kIVs3RG6BHmNtOqoXMoDiMyOUO0CcUY2nQ0S7 RU8A== X-Forwarded-Encrypted: i=1; AJvYcCWLC946HEHbe8L4nZL1k4xlAOe8/F/shnv23FtXdok7f8IrCmwn1NVXsof2uCE8Ic0tq89r/XxdX5EFsWTuZFgX@lists.infradead.org X-Gm-Message-State: AOJu0YySgt5ssJKDju+AWEJqSDMefaac0bDupiGS35stLwp2uzka5W5f taFSq4bVSh1Xy2synzKgmUiBv5T3XtWgGtgj/lS6vfjDOzneukCtzMiY5xwJKwbZe/cXEK8iMZH s7g== X-Gm-Gg: ASbGnct4FpAxO16qUUdPGRXi9L/ySdGW7H+/0Ypf+SU2nlDbyuk6Hv776Caqby3x/aI H3O8khCaBEsyTn5xDFx378SC0thG/rdpc3Ydc2V//+NteBug76dKMaw5PDFuPiN+id/Sj0cK7O1 7GdJlqcjrHKNOEJYMgxGgik+xiQduVaX9So+tOtAi06wXhjmxmCn8v6nn3dU2Ka3u0zPT5EQbLr nR9sEyhF8tU2nx7F7ymmuADJ23QWjTe/Cmv07y8AlExo6rZ5lOfsFdCFBSS1neo9mgS7FM9t7jM VMzkZYK7mV39H5gxumODllPo7Queto/T5CrppaocuTg33DDhW3nuCWOGGuVgKhJEie5cocA= X-Google-Smtp-Source: AGHT+IHswiwCPm7v4tYhF6/KFpk1Gc9mqP45iu1cae5YdAzQ3o5pgDycSQ+Qw63bZd0jTXMIoI2SqQ== X-Received: by 2002:a05:6830:6e9a:b0:727:ec1:73ad with SMTP id 46e09a7af769-72712043690mr27736a34.11.1739554798795; Fri, 14 Feb 2025 09:39:58 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5fcb17a4ca4sm1284073eaf.30.2025.02.14.09.39.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 09:39:58 -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 , Andrew Murray , Jeremy Linton , 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 v2 2/8] PCI: brcmstb: Write to internal register to change link cap Date: Fri, 14 Feb 2025 12:39:30 -0500 Message-ID: <20250214173944.47506-3-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214173944.47506-1-james.quinlan@broadcom.com> References: <20250214173944.47506-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-20250214_174001_365486_031B2A97 X-CRM114-Status: GOOD ( 11.56 ) 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 driver was mistakenly writing to a RO config-space register (PCI_EXP_LNKCAP). Although harmless in this case, the proper destination is an internal RW register that is reflected by PCI_EXP_LNKCAP. Fixes: c0452137034bda8f686dd9a2e167949bfffd6776 ("PCI: brcmstb: Add Broadcom STB PCIe host controller driver") Signed-off-by: Jim Quinlan Reviewed-by: Florian Fainelli --- drivers/pci/controller/pcie-brcmstb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 64a7511e66a8..98542e74aa16 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -413,10 +413,10 @@ 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); + writel(lnkcap, pcie->base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); lnkctl2 = (lnkctl2 & ~0xf) | gen; writew(lnkctl2, pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2); From patchwork Fri Feb 14 17:39:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13975503 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 572D8C021A4 for ; Fri, 14 Feb 2025 18:26:55 +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=ucKiOpBc+S4NSSHbPlsmk0SXtuaeNxQ7iIuZM167kvY=; b=eAhU3FaWf8N7grTkXdCC0qPhf7 8C2i03Y+5Id9iFLMdNTM4U9FxLOxVIDMe4kD+RP2BgGQPwly27ly6sgtWiPTGBsznnEI+/PHGWT3C 2/ozj1l3REp6efalvLyddIrDf37uUlycPGkRd+io1OcflvmFiKNmWlVEamAw3Uu0wvmvmLFoYZ6ZQ ktEzGZW+BvRmyN3kT2ek41p4nrvGkTwB6HXf24wDgv0/a49C7ScbYAda7bJrkCuUfG9dAY7d5bEJF hGqhk7ba4yW1+QqSGMifhwFVx8MDBvXoEXj+TE++3UjF2jxmExas/4kE7oBk8W0o3OibTVm8M7g4l 2qKZ2HzA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0Oj-0000000Fs99-0HVi; Fri, 14 Feb 2025 18:26:45 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfb-0000000FkY8-1Asq for linux-arm-kernel@bombadil.infradead.org; Fri, 14 Feb 2025 17:40:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=ucKiOpBc+S4NSSHbPlsmk0SXtuaeNxQ7iIuZM167kvY=; b=eZHxJ1o8BK69XGHKxmCx+OJP5K 5zxX51B6qxAGqLeJ20BCbV+dRocgAHqvImpTpWs2VdajjHIZKOX6j+i1oP1onb9OxeiclCPl6ghhD AK27MFJGPoSQ5SBqAdjRsPWk2vtUbVhMJvs7umt2/D0ufOClt1tpIIkZo0VHKYAxUdkmKfMVBdWf+ TWfcNWGY4+gO8JSaVTFOOTVKQh4DnNpoTTsN17lWGH765XnskHcMfn8m0D2RDYG1DapckzdtFU4WU zi+95OniGJUmz4dAZVbHUeWhiV0WehU7FUzODf17KpGYo1X2uLkaPhWlLlb4iPesxvP74ZB8cj5KP rwTI++nA==; Received: from mail-oo1-xc29.google.com ([2607:f8b0:4864:20::c29]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfY-00000001IFt-1IzB for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2025 17:40:06 +0000 Received: by mail-oo1-xc29.google.com with SMTP id 006d021491bc7-5fcad6dbc73so1162189eaf.3 for ; Fri, 14 Feb 2025 09:40:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554803; x=1740159603; 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=ucKiOpBc+S4NSSHbPlsmk0SXtuaeNxQ7iIuZM167kvY=; b=DSE3NJs4+Uksq6Igktgt5A5OXNdBoHYJ3B2NBTjI9MK+eebZMc2XCIFi0I2DjUBsD6 9tHlXivgSlfTVxsRyet7xE6B990okazbyrSkXT97x6ep6I1gZuggK/gvIAo/5yJ+PJ9V AQbPswpiGp62+SUSWxFuGd/7AlYH5tL1wWSH8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739554803; x=1740159603; 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=ucKiOpBc+S4NSSHbPlsmk0SXtuaeNxQ7iIuZM167kvY=; b=wMeGJhoOdAll+ZddZiYKLZZtFg8HdpqALTKCwZa3VaSyrCxw13wXZrtR0ygNxxCjRz pxDLYab2rf8q8Q44oi7KRoRqFli3oOTJA2KrQeKE5as+w+GKErA40sSj3hCXrNzYBxVp kdlmoavUP/9vQ1ekzUAlgMNsxtok3YcFT0W0LBPSkCYSkBERGdPP0vAX/gg8ID1kVsAG UcsWcFazHw25udBGzrY+9Bbu+sJG8lnSSlNqprcyiebYWUGbAfvsMQf2HJe78oHG8wIc CwAtVId+n82A0OBCVxdJBkQXwArKbnmIGS4O5DhsQUq06bepAYaFrpGKhOYYMJknLdOv dq1w== X-Forwarded-Encrypted: i=1; AJvYcCUDqUkOMuIKJfJO2tbYEizxWNuTSBSDCPngkajzlC13O6U2zQfKAL0ucsjkRUMljKxUBVtqAPKeVgpMwlPB3guv@lists.infradead.org X-Gm-Message-State: AOJu0YybHdW9fE30Cpf9yv65CNLDk0kEHhxFStLHc7kjHPRj8MPkKswV FO+D0U7Io9hna7sxYFWICSBkPEXYVOc8wQsKdL1hgif+GhLvmgNPsCRehaUlYw== X-Gm-Gg: ASbGncuL/sHFK2ejUmVuRqpKDs8nntSfF7Y7hQ57umr/i3i/7dCbDs3i34N+D8o3hK6 wfj2pSKES8dDNCbVKoPG98wgXgLsX7ojt+A5hLue9rVrynZs9hU8n1N7Mvx934OcLxntS7LPVly VIArtmm2aCb7V6MPIuKXpiXQKxFdR8B3sv6adb7gRSk7YehjoL5fNclQEHYSud/s9YQFJwWHrDh zaTlm3UBOXmQAxGMLDlzompGBYVi1OpA+Xvxww8CIKB1YT3BxyjmqgyKcdPId/y6lSxUwWuZHti NyuBtHc9ERZGufBcOnppxoJxVnV0FZ9hFl9GcFaZ2VdIMQvVdx+AWogPZHO1Dj+/YahPc40= X-Google-Smtp-Source: AGHT+IEHCQouVhYnVU0zbdmV9+4+4+6gGSYlzxuVdn+GGhOSlftYZsrzvcgZIZVnH8WQyajm4LLIQQ== X-Received: by 2002:a05:6820:220d:b0:5fc:ba35:d704 with SMTP id 006d021491bc7-5fcba35d7fcmr2395959eaf.5.1739554803022; Fri, 14 Feb 2025 09:40:03 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5fcb17a4ca4sm1284073eaf.30.2025.02.14.09.39.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 09:40:01 -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 v2 3/8] PCI: brcmstb: Do not assume that reg field starts at LSB Date: Fri, 14 Feb 2025 12:39:31 -0500 Message-ID: <20250214173944.47506-4-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214173944.47506-1-james.quinlan@broadcom.com> References: <20250214173944.47506-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-20250214_174004_579831_21594D0B X-CRM114-Status: GOOD ( 13.54 ) 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 When setting a register field it was assumed that the field started at the lsb of the register. Although the masks do indeed start at the lsb, and this will probably not change, it is prudent to use a method that makes no assumption about the mask's placement in the register. The uXXp_replace_bits() calls are used since they are already prevalent in this driver. Signed-off-by: Jim Quinlan Reviewed-by: Florian Fainelli --- drivers/pci/controller/pcie-brcmstb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 98542e74aa16..e0b20f58c604 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -415,10 +415,10 @@ 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 + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); - lnkcap = (lnkcap & ~PCI_EXP_LNKCAP_SLS) | gen; + u32p_replace_bits(&lnkcap, gen, PCI_EXP_LNKCAP_SLS); 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); } From patchwork Fri Feb 14 17:39:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13975570 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 BF59BC02198 for ; Fri, 14 Feb 2025 19:41:37 +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=TW9nWifCzwYZy8eQdCTo6EqgINRvFFYuVj87cGvTYVY=; b=a1bj/XgCurG29Tb4CFZVbB6N3j BpAfJYiPDzQZgQAIzjujUtx7yJdtdfmjajdLJf5WE/KxbMbF15ZCi4hW/dz7bsYF5qIIXKQl7R4VI 8asrxAW10+99ZyiwIG0WBWKZL7yadO/Pq+OW1+Hl0g9X6aWdZ5Qe6UqqZdqTtehPB50iJMXesKsO/ v7MsE+EtICjB7W/QvqB0xqW2VUNAk3E0sDW8cyPWSRUsmqTU0DdG4Fl8D0diMqYX9Nxu8y6CTJxEG JTQH/ePIMdWciljjnNuXLiA6Zw3IcnXVm8+Apa8n5HXQTKxUXZi9JuEt3n7gahftU5Qsk71hYPItR OSF6JzSA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj1Z2-0000000G3ov-0NAK; Fri, 14 Feb 2025 19:41:28 +0000 Received: from mail-oo1-xc2d.google.com ([2607:f8b0:4864:20::c2d]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfb-0000000FkYB-1mvL for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2025 17:40:09 +0000 Received: by mail-oo1-xc2d.google.com with SMTP id 006d021491bc7-5fcb8a9c1a6so782017eaf.2 for ; Fri, 14 Feb 2025 09:40:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554806; x=1740159606; 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=TW9nWifCzwYZy8eQdCTo6EqgINRvFFYuVj87cGvTYVY=; b=FapJmCQ0X14iS9JhIy4DE/cTogq3rxjm6yQNw70EHfOZM/aFc6hXJhco4EgsJNVHJI 23I6Gcv+o2ClIhcbsBGuUzJV8ponqRVP+BL7VklKjfRYw68mMXWTrWRG8QtdDxax8RDg TvqjGuyyWVSS7e0Hees39JLTdrdfaQ955B2pk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739554806; x=1740159606; 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=TW9nWifCzwYZy8eQdCTo6EqgINRvFFYuVj87cGvTYVY=; b=EnsbfBWOfmzAevWE60bUeaxldXYKfrdq8dtlD7tYJQ5FN0Mxpy/8SgUOIktqTl5oVh qftNafTocD4P3jTqzNfzI7MPT4V8imNhfBud/lNA8fKo+epLu5hpT5y6avnNU1vAN+yB K3Cb6c2MBcoV4ONoeBYeYHeXUbkYVgrH16iHhuupVTsL37EHJC8G70qkcor/3IcajP5t 4tFZ0n6Vk1Bhz4pGVX3x/o0E+QH2QUeV9qlPTUb/4Aur2gtyc6sYjJ6HBePwb/g1XQK0 afvWrrjer1Rx4r39ZkAPQ/ZRzWvO8KOyr5mXuKZq9x/aK+L0xxbznm866Lf1jTC8uCbC Cb3w== X-Forwarded-Encrypted: i=1; AJvYcCUqWtGk+57DCjsfCtwojPAeGXQq28ckGyEnqjO2IcqYnohRMnx8A1kEKxr41A2X3x2tTljcDCMvbeXHRfEg6+Yp@lists.infradead.org X-Gm-Message-State: AOJu0YyAdiNltX5MJryju+AieLT+Tmw/0ycs6zTg2fQDYF5JMYVzBG3q XgBSokolYQ0SWdio/9K2krBsNKMbSw9X/GUW9e4eAkHePsitX+35R646vbcSF0bfcUuBxHxy96z f8Q== X-Gm-Gg: ASbGncvrjPs0XDNe9PE5ngPb9UmLwsbdqwVgdsh/ZWcE5TcjIzsT6JsUY6Hq4uPj9kL 9Tdzf4gSHixE/lwcVurMvpkoV/GqYlly2ZNoyHKgwOMuqNNAib2t5cCBXnlcCQdAwQPLBHt5Vgw m8WvAxFa7B10OHKkhScu9iQWXh6jmRBwLXCirfoIlHYQynNg2wqbYCr1+ymZf0u2ExNKpK5KU27 8pjJEiWTWY3mPQ4NfbDpLvQyC7qTSk5PPavy69ltNvjsR+irXUMj2OdDAVQrWZCtHDxXe+lsmzE w3wWXyI52vhFaGgZgTJNmDyIMp/dzoZo1OTL6CH25VL6hGXsTazbfYQNBOB4TzMXCbd6Slc= X-Google-Smtp-Source: AGHT+IHsRBlmYmWP6ec6QvQPHeSSiuic4NDtKAA7m7DLRipohduC9tXO6eBUjYvMvWROPLOlA/zw6g== X-Received: by 2002:a05:6820:c85:b0:5fc:b1d9:9b68 with SMTP id 006d021491bc7-5fcb1d99d08mr4047840eaf.5.1739554806336; Fri, 14 Feb 2025 09:40:06 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5fcb17a4ca4sm1284073eaf.30.2025.02.14.09.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 09:40:04 -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 v2 4/8] PCI: brcmstb: Fix error path upon call of regulator_bulk_get() Date: Fri, 14 Feb 2025 12:39:32 -0500 Message-ID: <20250214173944.47506-5-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214173944.47506-1-james.quinlan@broadcom.com> References: <20250214173944.47506-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-20250214_094007_467536_DC262039 X-CRM114-Status: GOOD ( 11.98 ) 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 Reviewed-by: Florian Fainelli --- 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 e0b20f58c604..56b49d3cae19 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1416,7 +1416,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); + pcie->sr = NULL; goto no_regulators; } From patchwork Fri Feb 14 17:39:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13975506 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 77E98C02198 for ; Fri, 14 Feb 2025 18:31:21 +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=cxVjaXboKEqmhgPS1SWexvRwQQsKkPF5XcZy4FqcIn4=; b=OXWisyFlPC0/9tBLa4iZy2xA3w ajFhU3MZnb+Pvcb+eJ7ve8RS8I070gPNQJNc1WGM670zLSpOJuFHAmchHd+KpVKKIcd7o1vGE3eYm wJes1cdAF+MsfB/SQXpXEZVX+kWNi5Sw3BLtwl7v1KDUkssvfhu6SSpnvRq18AxYCM3bnt1WvpZ4Q I8x53KDblNcdSSTqKUM3dJy0FjHXN+16SBToNhIwyg1DYFQ7g1kT4r462qBcjj+rKkBTzZQt3x/W1 veL12U5+7Np3xia6xWci0zhR6J2bTnviGNfX7TNBbBPyNIlqDJSkIDR+tYFueSpSc468lwAYgRzbD oResxY8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0Sy-0000000Fsw0-2hVA; Fri, 14 Feb 2025 18:31:08 +0000 Received: from mail-oo1-xc35.google.com ([2607:f8b0:4864:20::c35]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfg-0000000FkZq-04u5 for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2025 17:40:13 +0000 Received: by mail-oo1-xc35.google.com with SMTP id 006d021491bc7-5fc447b03f2so622841eaf.0 for ; Fri, 14 Feb 2025 09:40:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554811; x=1740159611; 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=cxVjaXboKEqmhgPS1SWexvRwQQsKkPF5XcZy4FqcIn4=; b=OlTGEzNYS5GfPl87LEq4BP1qd2FkRBhMyN/pimBxY5lius4K4lQfGfMWZATC3MiLKZ HV47t7pCd1S1nmbgPWQbjtEX/k37fsATxRAToQYsC2VzfMumBtNi0oZNH18YS/gQJZwQ FG3WJ6qtkW2j49PPAt+JzRrclW/4J6mNGse6Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739554811; x=1740159611; 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=cxVjaXboKEqmhgPS1SWexvRwQQsKkPF5XcZy4FqcIn4=; b=cz9pZ8w0Gn1FleaiuWGyY05F7IN3JKCJQMk0RSb4fnZJx6OJK81OFcd0gyF9TipfF3 jYs8ADshuHfV7jsctvnfUn9nJX9jUOmDbx3RoCnX7RpX3KUfQJij885kNlg13MG8UCr+ Y9AM2SB8DvNg87kvYHW5XLHJfJ0azEt51F3R/Dxog1N0IUyAkw+EHy7ovIO6ZaA1ICwJ BfBO6R1CKJJqz+CKH8cJdvgbmSqjqANmpt0FjzG+uANWgK68Wt1X2aHRdT8jDOTMktFD nxhCq83OCfDVry0+0q8UdDpRggAtFOjC3bUzhmwbXKKkbd1BV/W4J31vD9xG+cgboPl8 8w3w== X-Forwarded-Encrypted: i=1; AJvYcCU4VrWtgsPoHtyk8+WNigsTPzlol5zUXFtz2apvnK85Y4ccAe/dfTZo41PANQCUrsEKdqisHkLE9qBvmSdzNZPR@lists.infradead.org X-Gm-Message-State: AOJu0YyRfb2vkW95/m5VXAN8cFcLDc0Tl6CvYvPMwz25zGmpWyreMumT 6uqK45pZZP7DIhO2dU0O7ZCT3M4g7rsdgTcRC41pP/A//mzxtF2/YJnq6bsSdQ== X-Gm-Gg: ASbGncuzDolcZB8FSmWg2WowvQWWQ99ytBXWyKF6Yi4s8DdXQPKtyvqSxqtDN5IxgdP Rubh9llYr8XQb9Cb5D2UHVNbHoNWMhxBBHbDdoIcYo+fc2IxKEsVrc+fDr5ZCSjFyW1YhD8KNs1 /VPtbJqwnQMby/zhSJe70E1rjh114/PQ0nGXFgT6IsayzTNlD+WQuKkcbW8tqov6qhhS46mGJuz IHkUZi9rhT/mwey1/YTfnCRwK5murpG0EXoJm379VK3gLskCkbR14A96MNE5U2PAzYLvkbEc6Ys C5piS7KhBqTSfJ6iIrqE4gUBIN1Q5072RFrctEyZWbfudANJ76CuN423eRVpTzUMGqBaGIY= X-Google-Smtp-Source: AGHT+IH+XOVc8NTHW3k+78X5WYAnuU8kXspEfNlGrsjwFcY/02Yv6CZB+J3SozAcYaszP+QsOrsaFA== X-Received: by 2002:a05:6820:1c90:b0:5fc:abe1:98a6 with SMTP id 006d021491bc7-5fcc54f758emr37937eaf.0.1739554809423; Fri, 14 Feb 2025 09:40:09 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5fcb17a4ca4sm1284073eaf.30.2025.02.14.09.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 09:40:09 -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 v2 5/8] PCI: brcmstb: Fix potential premature regulator disabling Date: Fri, 14 Feb 2025 12:39:33 -0500 Message-ID: <20250214173944.47506-6-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214173944.47506-1-james.quinlan@broadcom.com> References: <20250214173944.47506-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-20250214_094012_056499_560FFBAD X-CRM114-Status: GOOD ( 14.38 ) 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 Reviewed-by: Florian Fainelli --- 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 56b49d3cae19..e1059e3365bd 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1440,7 +1440,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 Fri Feb 14 17:39:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13975508 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 BCC9FC02198 for ; Fri, 14 Feb 2025 18:34:16 +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=TsOCGGo9ceVGY3SPzwGNmGL7lbsQrpsFZ6ZHHv/lIws=; b=fHCVGWkRlTchykhkjCDpQQi29K WAVCJcl+ZzIkC6ml/LZH73NohIAYP1O3jymHj8oXjUkhdDuZ/sid51fEHs/d0HyI/mvI1s1HjN67J RfZPJ6e7/LTD0W3YLj0oTEO4EWRze5EMXPZU6G/1LSKBsEW7qd+JVQXicnNy1FngZaQZAbdq4gj45 /rHzw5SG7pPsKjf1JQixZ3RKNrC8vKsXqly3SlyAh7NjlhxVPtf19VHdyFVFrxpPAutwcasHOW2ZH vcZzaqShvOjsSnWJ/epcIK5BRSIsFIyqhNdP+urFKRU1oecUpUexBLodXjRB9I4uLw5hSPNlzbLFt U/cqQ8OA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0Vo-0000000FtWP-0A53; Fri, 14 Feb 2025 18:34:04 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfo-0000000FkdN-0ahA for linux-arm-kernel@bombadil.infradead.org; Fri, 14 Feb 2025 17:40:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=TsOCGGo9ceVGY3SPzwGNmGL7lbsQrpsFZ6ZHHv/lIws=; b=Cq21K3tEO5mlldpvf/65rUH+qk 8eNIxZGWqs0A1KhGog7NvPAzXf2iqssi/7Bik/E2+rIvhNnhUhUcXWwKAseg0NzEdzzAj7R158ZJG Z8141NnpNXw3dJ8SPCxY/sOppMxF8sVv8ER4rXXm3d5yyf7E5Xa+S7aio2xLv16tGpbAnmgIJuYKL YEo8ISvLkb0o4JQKPv8xR3ja72gqsz3BlLK48tScyuEZGjQOUwQHBSgksYbMdEiVySLO2fhwHKUUK Q7JOoqwD8ZWYckgepcYJLyPI5lPzxNBh1bnJ3vAz1ylhxYSrj6k4gx5c07urZ2Pw+QNghWNX3filS YDClZCdA==; Received: from mail-oo1-xc33.google.com ([2607:f8b0:4864:20::c33]) by desiato.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfj-00000001II3-42Hf for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2025 17:40:17 +0000 Received: by mail-oo1-xc33.google.com with SMTP id 006d021491bc7-5f6b65c89c4so643464eaf.2 for ; Fri, 14 Feb 2025 09:40:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554813; x=1740159613; 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=TsOCGGo9ceVGY3SPzwGNmGL7lbsQrpsFZ6ZHHv/lIws=; b=Ic6Nzlt3j7sLc0QBSYxp6aCxdJQPKeZaXd35DF5T61vW8ozCFAj4/UEflhJmxkeyYQ kmJz3biml6l6KoHlaehN2fUQ+OxQ32te/Dgxn4xsLC3HunwMuXuOco29J56BGd9617fP Ikclv5CYYCCt+b94ytP8JEcyCwknC94OR9KNo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739554813; x=1740159613; 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=TsOCGGo9ceVGY3SPzwGNmGL7lbsQrpsFZ6ZHHv/lIws=; b=L62QbmLnlIa3V1ZqOWpX/RHlc1rGCI4x25z+h6lCG8IIiKBi+LXG6YNf1L3GF/gqoY KPk6tGJgUj2HdTSTOJblDZNlZ5uJJ5vriqzvyiBQhaTkZUH6I98CbJTn4ThaPMu2+3Gq TV+beO3k3LRdCwdXM3IoQFH2GQ6xlPu+QMwwDFvef3dPWJZeTGFTOZ2+USjRUnU2xAN0 k2OnDKiVhizNabhTax6flWD0nxFgETWNx5rA31aYAy0WwDI1Z8dhlRmCCpKBeRPvOqOA QIffPMvg9eiIRy/rR3zKbJAmesiLrselrd2QNLzmH3prUQ+bfSdmLA7HlCSJK7/yUzrA RMUA== X-Forwarded-Encrypted: i=1; AJvYcCWtxAwy0LqxDVMW1Td7oj+bWppgNVawm3Fy1vfd8vCcy8CT+uin6sox3gG1Sl5V53793C40LhNXg+eQQwmuO0g5@lists.infradead.org X-Gm-Message-State: AOJu0Yxcno8DBppQy3p844+40qyYGh6V8A+kwTZV/9i1OTTbw9yn4KvJ MLniVCtFEyB963zLtLYeXzc5DicMRK8hDvjbvhHccKEA+xCS9kvyC5ziCdKukQ== X-Gm-Gg: ASbGncuR3BaPsT//Ovh+HvuBNH6GHG4sBHcKhmatH4YHSrCvdMGRSfmu3QGZQAptEyA k3NYu3+MchqAHpDtV2fKjPEt1ZpBlfh6i/3orYFrNkAVMjZQYl4XPdB2i2ZKEcG2pe4bD750xq2 4elXMr6mascIE+HYktyp1nJzXt+eD/STBHNZKk6WdAPlZmQt6jm0sS+JTS7vK3XBvi3LXVGOEkb 1pZ3AC2LHCtGyFKkXdEJ/xhjGYOLV0FpHPXWzFOqQkQxPmZZ7QvyW6LDrB5Wx4wMzRBmkmMPoKD RNnRLZNBof8C71y0xQS3H90Gb34cbP6fHTCK1dty3Bp0elenBt8QRMONT9KGhOVIVgDte7k= X-Google-Smtp-Source: AGHT+IEHK/RYufUjO2+odce57Cx5Dp9JDUKZ5jsTgSO+dN2Z245MJjJKtjxMOKhmnO9Jpvg4aHpnVA== X-Received: by 2002:a05:6820:310a:b0:5fc:9bb2:f78 with SMTP id 006d021491bc7-5fcaf564190mr4940899eaf.8.1739554813562; Fri, 14 Feb 2025 09:40:13 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5fcb17a4ca4sm1284073eaf.30.2025.02.14.09.40.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 09:40:12 -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 v2 6/8] PCI: brcmstb: Use same constant table for config space access Date: Fri, 14 Feb 2025 12:39:34 -0500 Message-ID: <20250214173944.47506-7-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214173944.47506-1-james.quinlan@broadcom.com> References: <20250214173944.47506-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-20250214_174016_111737_0DB23E30 X-CRM114-Status: GOOD ( 14.63 ) 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 Reviewed-by: Florian Fainelli --- 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 e1059e3365bd..923ac1a03f85 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -150,9 +150,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 @@ -727,8 +724,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, @@ -1711,7 +1708,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, }; @@ -1719,7 +1716,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, }; @@ -1733,8 +1730,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 Fri Feb 14 17:39:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13975507 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 E9341C021A6 for ; Fri, 14 Feb 2025 18:32:46 +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=CSW4cfeQPfDzJdrXVnX+xGV7pqYpNxrZbvVlU0rLzgU=; b=iHJsF/0tu7uFnZjjBmWMiym3zF 3W9p9ACI5WCwwspQpxtuiIeuOx5BgGn9IDPItuzAKTrtPuHn+j8ccOP5j64OrMS4X6a1e1bSW+Ttx ZFDt8UbXuPMt25JboMmI01rAtllfWhONjNvEvgxpgLSNckhR8zpH8FXCAA03Co7i0tt52lqPYvibe y/zaFtk9FEJCkcX6adKVzxgzvqGc/rj9qcFdb6PvwhLQis6vj91lAUe9euRp4VBwUdpVYOyWngrOJ /UxmbOKWTAXNwUsOld/i5TCWkND7ymWVw0i4XslhmwxA3dZkXNrUE5U+lkG+WIHTxEWNkbOPF4RTo 8c2dlZNg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0UO-0000000FtCi-1btO; Fri, 14 Feb 2025 18:32:36 +0000 Received: from mail-oo1-xc33.google.com ([2607:f8b0:4864:20::c33]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfm-0000000Fkcr-2pZZ for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2025 17:40:19 +0000 Received: by mail-oo1-xc33.google.com with SMTP id 006d021491bc7-5fcb3ee41c5so590187eaf.1 for ; Fri, 14 Feb 2025 09:40:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554817; x=1740159617; 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=CSW4cfeQPfDzJdrXVnX+xGV7pqYpNxrZbvVlU0rLzgU=; b=MnKg3giMdYVro6MoxUjMBUOppRGd49IqCcDos5kCyJVt45HjTJB/M9W3wLArogYIqB x38Qkrm23oXJRxOJQf301xHXVS1hl9+0k/tHBGp4obiEYrO7qBDGv7lnvdfsfLziVCa8 VuhsX4/QQPkhwbJMFUhe1Rf542fp4KsljiUoU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739554817; x=1740159617; 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=CSW4cfeQPfDzJdrXVnX+xGV7pqYpNxrZbvVlU0rLzgU=; b=UJQUh38/CDrYiMU3Im0qeR6SbjY9k79pDX6biMSxNTcmOAp+WyqKACEKSOTWS0+1dT sV/wIjl+8c1HSic9eXPJQlI94wkd3vWcoS+fVncJzbnspLYDUB6kUJOF7cBEuaKyf7PV +cuj6DO54eVrnTmsKxOUdye2BIlydaBgS5e36/So6MP7TCTRDL1eMjdPHroltDfauQ/u SYDgoEsuKLdX8TtQQ7RViAs31mhyjtcsbWxInUqz4YVqU6W/YFB1LSyROmFMykMKuYZh 8Y0TVZ6Q+p9ES8D7KH3AUBl2r1eUPRY5pxKHKQqnMCuvwQVkQsoWdp7cTWSaSlobt4qe oGHw== X-Forwarded-Encrypted: i=1; AJvYcCVhBSxGyFvbEO3DoHcZ/0JzAc6t+DOb5vZRenmn0ngrjg+3Skh/RacaP5454S3OpZe7TfOPi/+tNCahNWT7q9Ar@lists.infradead.org X-Gm-Message-State: AOJu0YzyquAxjPmz3Y2ZfO0Gb6CSECT1Zhs4DDvOnSCrtv2ltA5HmuX8 TTDFBwhZuSf6/VIGtnFnuBhLj+7peRL0+IFAQFar7xGoZ3lGdwD3J+Xv/4eidQ== X-Gm-Gg: ASbGnctvHJwwVgexNHNfmb47mpwYvtUiYAHpOlKIG1o4fD3rRScqF4wRj6sMxTWaQHZ sIhjc/hWpN1uL5c5PCgzaOh53jY1G7RDLp4Up84nMExLpAIyRGwkReNCJRQEiT7HYbUzRe+cE5U FhqvFSZRYRzmWE3B+IQ1Qt3JWq8YGGXxw3GCRsk9NJGCFq91ycJ4xy4Izgcy9MRd7h3roZvVe66 eVYhj37K1dLJS0tQbf4szG3JR9ZHCWjst1+VRL3/txKhkuXdudbLVEvHYiqyP8mKyATjkPvNxCq QCF0CA6eOOc5kOz43TpmAODO4CaPzDzjDL79El82r8OAdDTvgvgbFrDnG7ZOaunFs1esD5g= X-Google-Smtp-Source: AGHT+IGzGxY4gVdlR82gAdB7cjaGdcaL5kCbohfl9gRTT5OL6p6gaqIDXsIm/04V9i6hRIlQvRjbtQ== X-Received: by 2002:a05:6820:1c8f:b0:5fc:98ab:2b27 with SMTP id 006d021491bc7-5fcaf54776dmr4801224eaf.6.1739554817648; Fri, 14 Feb 2025 09:40:17 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5fcb17a4ca4sm1284073eaf.30.2025.02.14.09.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 09:40:16 -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 v2 7/8] PCI: brcmstb: Make two changes in MDIO register fields Date: Fri, 14 Feb 2025 12:39:35 -0500 Message-ID: <20250214173944.47506-8-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214173944.47506-1-james.quinlan@broadcom.com> References: <20250214173944.47506-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-20250214_094018_706429_E0CB238E X-CRM114-Status: GOOD ( 13.62 ) 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 Reviewed-by: Florian Fainelli --- 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 923ac1a03f85..cb897d4b2579 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -175,8 +175,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 @@ -327,6 +328,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 Fri Feb 14 17:39:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Quinlan X-Patchwork-Id: 13975509 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 3E96AC02198 for ; Fri, 14 Feb 2025 18:35:42 +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=QAlxapwLw5ouznsWC8StdUePnEcSqjOB1MsFoZtsKuc=; b=Nl1kP+OHv68OmXr5G5TZ5G3D8H P/GtxVgYlopvphbjnLRNzUyy4ay9ecgSQ4ysXcL6I+wfWihLuu7dHT9C+6susAzuqOsYCfeEc7zpq z4Tqqi09GwKcD0DHoUQLwwR/AkhKCvGhNvuHCqyg/K2X+7UvjoMx1ajopNob+T/bk6adgsg5/TOCv AlflGd4owhCNIUvRE7F9kAO70EFQPMGP3Mo+VTeTwtGVW+Qf8cobsJJ0rA/LB882aMXn3hdXomTU9 QAHxLwrZyzIGiTwK1FQGogafRHiHJU6laEoafy4bExy76ehkew4M1pAxqKdEf80SNEqUIckhRhBtb wtj22Fnw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tj0XD-0000000Ftiq-31z0; Fri, 14 Feb 2025 18:35:31 +0000 Received: from mail-oo1-xc36.google.com ([2607:f8b0:4864:20::c36]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tizfq-0000000Fke6-3Bol for linux-arm-kernel@lists.infradead.org; Fri, 14 Feb 2025 17:40:23 +0000 Received: by mail-oo1-xc36.google.com with SMTP id 006d021491bc7-5fa22d0b88fso1487042eaf.1 for ; Fri, 14 Feb 2025 09:40:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554822; x=1740159622; 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=QAlxapwLw5ouznsWC8StdUePnEcSqjOB1MsFoZtsKuc=; b=DX9KEIpHC6cMj5zPXZHBwnvGIuXunv1xkyjkqCwrRsalgLPAhY1+DiTXADp5uSZXsA tOF1ffwuNMJ+diIFkojO5S70IIg/RYuz8vSLECSnUrSqtJgRyxZYUsPnbYIVjaGraoKs qJXbia6sGWHxTqpXHXmmJVsL4KHrtt2qY8NoU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739554822; x=1740159622; 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=QAlxapwLw5ouznsWC8StdUePnEcSqjOB1MsFoZtsKuc=; b=LHh6ruBwan0tOrFMr6h/ZR5sS22ySr3sRiudr7okZif8R4Rl1r9lDigxDQioxqtYKi KnAJGbwA/bbaR0We1onHz/JsS3XtH97V7xU1k0DVUSAUFX7qly2PmQmZMxYouGkNmFkp yLfi1xXifvqpl1p9B3JHItaa/8mYflyQ0BQmdmEvEgBqRPMExVcObZWYoEmfNU22Ukd+ bUiY4NY1yWTXz1taw7XGZUQr33rfz3b4XSMGxiTgjn8bCMTjzbtkjExZOaQUQ9CAVzUE eFn8aWZfhSkf/CUEElp1U03G6C/lUWQuxj20tYcnR+6r54kvYA/k8AkvvQX20h5cR3HK f/4g== X-Forwarded-Encrypted: i=1; AJvYcCWZqJJAoXh1l1ElfvI0Bwn1voxl1zN6uwpYuyZq1/YQMKSEYB96cQN3T4Y/UEBST6C3NQjJ+fVcoXx+jHo+D5lE@lists.infradead.org X-Gm-Message-State: AOJu0YzMN2Yjws6Ml055oHCZWOrqPJFt3fZomZnbS6Yl5TzEkmPa+fsK lWbWdZskktMuV5kGoClA55Acmgf9bfYFc8HeqyEeBwfNizR5n1l/p1qdusJ+ww== X-Gm-Gg: ASbGncsU/3qBEoUT+JHuwEyWd0Vw6qBm7QY/K1aUisHedmsLo8IgwS2czKagmf/Hxdb zER8RjrrZ84PkZJ8BOJlSuQMCDkxYIIZU3xc7uZsZ9SGgT9zzsG7MnE0RUnu5BTTbqbc0FuvE07 GPCa8mIPMN+U/RSi/QMimCTtGnYbxuJgDFS5czNruxPxlhg+SkLp04P5Yhlxd3T5oIcm3lR8bET ALo73KufNTAd2ClQ7ZG92kcscLKLmmD1PVJ1pwJhMz0giMS2j5LjUDW/J276OXUzoITW644ymwg e3Eo1daY9o7+QejRwy9NU3ELKjgh54M8jOTyqNBi756hyo5fj3HR7K97yZBJa/gwfpUT3Qk= X-Google-Smtp-Source: AGHT+IF8Xjib64lmMqD097Fqb8iAnB8oVv8SuKUplvbq9RXROblxeeVuY5j8JISp/0552IXX4jSipA== X-Received: by 2002:a4a:e68b:0:b0:5fc:a7d4:d788 with SMTP id 006d021491bc7-5fca7d4d8cdmr5224730eaf.7.1739554821727; Fri, 14 Feb 2025 09:40:21 -0800 (PST) Received: from stbsrv-and-02.and.broadcom.net ([192.19.144.250]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5fcb17a4ca4sm1284073eaf.30.2025.02.14.09.40.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 09:40:20 -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 v2 8/8] PCI: brcmstb: Clarify conversion of irq_domain_set_info() param Date: Fri, 14 Feb 2025 12:39:36 -0500 Message-ID: <20250214173944.47506-9-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250214173944.47506-1-james.quinlan@broadcom.com> References: <20250214173944.47506-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-20250214_094022_791340_61B053C7 X-CRM114-Status: GOOD ( 13.16 ) 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 Reviewed-by: Florian Fainelli --- 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 cb897d4b2579..f790d5252e9f 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -559,7 +559,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;