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: 13975407 X-Patchwork-Delegate: kw@linux.com Received: from mail-oo1-f48.google.com (mail-oo1-f48.google.com [209.85.161.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F1BE2268C6A for ; Fri, 14 Feb 2025 17:39:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554798; cv=none; b=SRMqJZftoWEMgxKev4v5d6llxp3IFlDK1kovP9YeCOBDfHPHfwgJyqUJfiP4/NYos3p6JW8tpRTvFWNXjPMaW7BYxYUD6jpfO89/rrrDY2wtkclWR/lsQMB4qJI+ecB/rkQ41daNp1im+Lhvf3EfCdmwdsFCNINwcOAXqEebg5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554798; c=relaxed/simple; bh=wWDSiynleuPZE3S/Pww46mj6AfFqdSQeGB8YL6rAx6o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BAyd4Us4Sb6ypDMmh3k4GEobSqc673++C7Mu/8IRK2Md2mBERWi+4fTIU/33bzbcg5EJNpEFQzs9X2sHE0xtyEAhotDVsovz6XFnOqWPRwXKqS7nqAcK4OjugbDq9e4mW+SdM86TMk5baxZcsyMQ6sNeZGKABUGuf1UvoRFxGEs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=AU8jaPw/; arc=none smtp.client-ip=209.85.161.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="AU8jaPw/" Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-5fa28eaa52cso1469440eaf.2 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=vger.kernel.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=AU8jaPw/4w+cfO+cCUdXeJEYR22BVnJrhQKfQHd+XhCNgfjJaAVs6p/j6uSHtm+VLy HvHefs3GA1hhAn9Bcz9SQ5zDWW0ojzXZp1qS+rzzYlcUlM3GhgvLPAk93Jvxty5UaIVF drPjZqtcXROzByUz/bSLYnMGqc0IYJ1kBOzuU= 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=tQnnT0R9WRcCq+T/7OO66d58oywheUfbow3SJU/hsbwsFgh2jtvHxYiAOnPWn3FBYu gOSP+coe+oEXZj+ewK2IJS4NYlUTbBAJHDcpUUXezbNkCGiqmt9LIeZssQ8QZcf4UnN3 R1xy1XtIjG+DGG2ApWGXxYo6FVnKF3NzBmGTcj2w/wQ+7GMb4q2eEKaRRgkYF5bvrzqR lwX38yFKLzf+m3q99+PfMN1Yu1HUVR8e/d/rNzbcAiZgAuaMUwcYBxynmTDbtE5P4a4/ ncQ566+dyzu7Eusnu2oaVJUh2zQ/l25k1x9Fp/mGG/xxykeAH2QljNJCNBYlGKEZuXIs 6VOg== X-Gm-Message-State: AOJu0YyBUUWjppvLdRMa7SsME9DV/rKSu96Qsu6eLfp+OH8L+edShaUz ijlOT7YA3BQsNCoMsyOZyIKSE57Zid2eYNqhz4eSFnAoPmpEtc/BUDfUbssKs3a7rRE/MIFp0YR QwfnO4MkIGByseR0kzGOYnXo/uiZu+7gkAMlKRh1EqVOMtIBVe2nM7S7fn0+GCOwKE6wKWuL9ds L2BuSFWX2Kmj2MCSMUz+pkr67WH05O17aO95CMduFv4p5ITWTy X-Gm-Gg: ASbGncujL04E0RfkoVBLTsawnKs2ruElUyNB+xrKtBRloHDbU3pvJ2FKepF2TnPGRg/ grZONeKsAse9p7zu+4+aQxUG7f8ZOID5EXQd1zuuD2R2n2hc6RPYWHLr/lHghxJKUwlUDgxL7P2 HZQRakc4I8wsZMPXj+2+STYHq/at0ybY8kaVD++xPn8Jow+EN0AAwnJxFeCD6F7GiI3++vZ0pvw kDB7LzL+rOEDek7goS9kVVLOQXU7TplyTUfZEI0r7kpl+dOqNutwbJ4h80dsFPVHAFNBSWAEHJ6 rUb1euaCnf1Wrbn8I9O5zrwLDbFJ81KVJRQ2/fKK73Wf/nbY4Lwqv0aRVoBLGHQEzhc2Xdw= 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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13975408 X-Patchwork-Delegate: kw@linux.com Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 459E12686AA for ; Fri, 14 Feb 2025 17:40:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554801; cv=none; b=s4K8tuxJXnWSQtsq75Yfoa84FXlyKCYBMYTfsRLDcfkKw1G9JHMoGWO3ail/vebIsVk8ozY5Hji0TbEVLIDoeFMzp50JbYvmHBDZzViRHVuPW2LDc4y9lwGpHCCjpJHCeJorN4zuSX/gE9bREUOK4IdwyjiHlKfmQVsd/kse5pk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554801; c=relaxed/simple; bh=XusFJlqd1Zppl59SKwtxO2YRR6ByM8N3PtB0xFQ1r28=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EtBcRmo9wR73OkKH1ivT8dd8coWbL7YD7iNH78wYnBI/SOkjLN55F4jBWihjPA8IKPEUN39wTplXI7yGRuzUrv3JmJdCTcizyynbGmW+K1DOWWLLLq/JdvmpMwMWEGZUKToXW8/Rd4nhL+2qYf7Kul6X82ejv8CW7trr5v0S5xg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=aBAPG59F; arc=none smtp.client-ip=209.85.210.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="aBAPG59F" Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-726fe6dda74so1738406a34.0 for ; Fri, 14 Feb 2025 09:39:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554799; x=1740159599; darn=vger.kernel.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=aBAPG59FjBTI8KReZg3/NyNyh5Huh09xXsNN/x1FJUSy2SZmU4Yc3vpI0Ojht8BTfN ScELWebdlR6YLUrxEenS1m0TVIRRrPG6MUN6RpPygppYJ35ua4Vr6rbrGj8R9r3FWcQn WU1ih2XNqFK1HfNNGMuJZku5SyO6PRM2BTMwM= 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=e7HZVHgzNSQbWQuqKqJMZ0x0SnxZ0oUUj1qNEo43IewXwon1hTHLLdqHnALJPZRhw2 kAA/zry8epfVzaz5sUOaUvAMdbd3buzwZJEUZ6GqnKhbSWSVvQtekAx6VaLV+tv0lbha WAPVxBBD3yibKx3WD7PMIW884DFosGUjzWju9Cv1s4R+wUgMUFEvEhBgF90vq41TzFwy 7XyMfU+Od/beYYHzCtZNZbco5Sv/1WgkldNd6rDXqxopbT2ZmEo+ycuFgKLWVAqLMhQ/ VOvSo+5gt8+49R6cICuBXAj3m4qgmYkhpYHidbEQUT607QMmwaA3QcymGySciXibOe4C sIxw== X-Gm-Message-State: AOJu0Yz+GEdbv+zHjT7e6dKcO9FLyHpVUQRzon1ml8Dk/kPAcZAL6Bep 8F7v1ONEqSkoXT9jZTJpHEM1BYH/0ZsXhtnU1XUhwzOSge2oNCdvzFA4VRKK5KU7bCXNVJfq34k peAMa482/LUNXTivvPwNBIDJ0upHghg9iqr/NKld7as1NunxiM+skBEz44qdMwPH4+pWr0FT+cX E2dfQp0CYr5ko0yTo8++4duCUp1kHGblR126eEO5pF3DAbK9bv X-Gm-Gg: ASbGncuoTh4b0BVetqhkQ0Hl3plTHq66S2iX9sBcvFaVTYmO4KH5I3C8w4EcOzIoO9h iHnHpJ5SkSCw6c3kGa6I7ii2qdkX0dGJIfzC8Lyti4yLQwisCO0jJj9pyE1hLUf8sAkgHtj4Z4h OsefqHMqwgXJq4i9nMMvxg4EJaXY/MOSyq2UT4FnqBtfP4EbRhYln6rBA3sQr/W+xQ4DaUu8/S2 0a+gifKjPWVJYiTyY274Q0A7OqJ2QeHaj8V1b+OdW0xkUmKimyHHIUlasu0Dr0CnWgm56Gvh2hS M3PApaqzmjakRaSD+qfHzL9WBQ6FPPuVLLQGV3NbWS+vHO+S+J71KNUOHnwIhzFjGMOh9uw= 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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13975409 X-Patchwork-Delegate: kw@linux.com Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72A7D2690E6 for ; Fri, 14 Feb 2025 17:40:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554805; cv=none; b=eqKs0IFg6LlA09Wsq6fe6O8K2H5mqlOr+hGN2IbRyirTykYkC3g+vALf0saApx/aMedXIjhi2duUZtkOxkFcdFGADrnkvzQGW/n0sfninC9rngxadAqyu40DZFY/WEs1dikFUE3wTM5DP+se1VN5vq5UX+EbqgQ56nTiKFfYopo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554805; c=relaxed/simple; bh=lsg4Fcw8VcMaHZ6PHXq4ByEugOSBshba/6E5rrl25tM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dTLho7B5SA/wRTKSEGrJPipzsWscpikWFM+XrZRfGXZaYGnjsBxuizEOaQYRfxM4mi43XEBpmMB/+QR52OTuB/EZ8BR6+InbfFCo7xp/bizUPx26k7a6h68yxqamKtyMytgLBhAGaD4VC3bwIe9ACxC65O4tZA6S3VlHzFWIdI0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=exceKfgg; arc=none smtp.client-ip=209.85.161.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="exceKfgg" Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-5f4d935084aso990546eaf.2 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=vger.kernel.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=exceKfggvwVwPwKg7SYRopQVAV81v171osSSePbwsLvvaqGiEN2O74Ta5eWgPJIJb6 ydBKbeI06ppsIZAD1Ki0UkNB8MWNh637z5QpZpvj/dfxu+YGJj1o8D5krc7KX/YvbYwD pEbVv+548KVJSjgO+jDHFvaBsQ5z48EveIyHs= 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=FCzHJC48oyaLdHNKg/fbDIjJ5aSGG4AIGY0LBKIBG/WBUjbiSfpT+qpDfRmIKHWcdD bDJxWBX9qFfzZcltOjnRRou1ysUGRztSbTEsH5zW0kAmNKXxAbAOwI9uDc1IeSXU0sRj JwCeCqZZKJmztohkH4rTWOkeMNFUmzX1qj0D1fqf9wNphheONXzUCNOro4tjCDDy2++r eoDJIAbFj4FulbJV10fWucoGG1fLyNctGYogFulsSshzUkd4pkaRa4PJntZDMUDU7r+x WLPsiOKvYVazz/12xTYNRuDVadCzpiOukO6scuU3UxONVMKGiVwejv6xfTILaZ2WDvbb uvhQ== X-Gm-Message-State: AOJu0Yxhw9ZokE534swyDTBpc1K43uK5Q76I42PEcB5koi9GRTUcaPCQ g6Pp5qudDcnpsA8cGdi/0CFIf78eCCv8Y91bhDd43JRK+BiV/jLggfEmNRihBsdQGFNKeu3gEiC tuo3xf4lQNQHX0apD3oX4H9RkFOZhTcpBPtIRaBuBeZC+dVhRs9/b/q2d1R3cst8X8XIW8jPnNF HGx9jsRiTUuPPtPdbmPkn4PsSkVIuCgqwhdfZI0ZIYFRhpfXg7 X-Gm-Gg: ASbGncsOR18uQMcORNZf52WmSESKmVpUzABNTTMC5wAU1R71rFz15HyYqxOa7K/lSIe 60pskUyPr/iGeLJrZANizqW106FTRJvvI+tjTnKdMwtRMgALi+PSWa09h4j66odmQi24iPmuDbA y0XaE0dNdV8bNqAaljKb+G6QvJGvckQSHIckGYVd89gtJhlN9uAE9BAJj80Mna29dKV5jyIeJqD 3jSJ4p8SfXIXnXKo+/uZskWypuXwVp8S4wZEuIJVN8hxKx/3ECJpMZ3pWlQWXLHEYkDIQ9XUzWq Xrmay7kjjqGcPUIJn557q+ZVUtEzCP/BF6SpSAgvUAopoG6MrTMoh5795G0rV9olYzfiilc= 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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13975410 X-Patchwork-Delegate: kw@linux.com Received: from mail-oo1-f44.google.com (mail-oo1-f44.google.com [209.85.161.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 490F9268C68 for ; Fri, 14 Feb 2025 17:40:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554809; cv=none; b=lHhxCOPZ9aNYFMTngykxqfZQJMjrOnprElaxJoelZsjCoLSMzAS7sTs3dwikcAwYoiaT09EAseo9Uiz9qDakTgO/65Ypi3uUbNWES0xvjLaVqjsuBepilSDjCUpSDSnizlBEHHOYsDVmaNLEYgSmi4p7XLYvnwIMvvZF6jQk23M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554809; c=relaxed/simple; bh=hpYFno3xFpTtIFF8NpBFjFKOov5U886g51Xm0GPpMkw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kty48ukDqtdKzM11gaOCQhhRaEzRF64HEMgx3XKmm9bSUu02KeZLBVNC4J+AIjEfwxLDFYKWXvPqoVMuM6TLsIcyvxKQ+pCGgshpbbdchhpKGZsTeuz8au3H1jpKQuFdRbM33xgETLWBsxm4zbKGUuGKe6PTo/NE8MfbLjE623s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=WHFxHSuS; arc=none smtp.client-ip=209.85.161.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="WHFxHSuS" Received: by mail-oo1-f44.google.com with SMTP id 006d021491bc7-5fc6cd89f85so1089867eaf.1 for ; Fri, 14 Feb 2025 09:40:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554806; x=1740159606; darn=vger.kernel.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=WHFxHSuSMEUZc0NEZk60+QjWikrCDjNZrflG9iuLSfcSNseE8X6ZfGUbUrJwXW1ebC cL+jqmO1KKePcZifWYNYcGIWNMBa2MQIMSQNLWeF2oo6pGeIz1gXMsR6s3pKAP9BXK6M TO7zRNAvSX8E0msGMnLDFg5L8di4xPTEZUqgs= 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=umeuet9YvNTsWnUWXLlmK5NDSQ7z9S9QHAD8/WIbhFwpTrD+MwH/5eRB81OGdyn3v+ I/c56qnVB+CpGqlfaRsrqePkQrLLg44JSEPYgIs3DkVYBcmUze54Cr8VrptWhQ9f8rT+ D7AH1I9xd1hEvuE62+/UkmzHNyDIN6ZVr4vbQb9QXkemNBsQpMsbZH9M+/Cb8oa9Vmuf QWiO+F0icoyzOUkqfyKX8CzjQI0WdTMFRPMeq7a9jdzfHXt2zpVTlCwxrxZMVET7TU4O D5BDF9w5nmpr1BU+F7qJ2iNzkyzCxksgMwDZ5ceZmPHKzd3C5vxs2fy3ne89Td/jX8dI MqRg== X-Gm-Message-State: AOJu0Ywln04Tagna8xyrzmM97Ou6Vu0+JUS3IBkRlG6BVkmH0/s928NF Zx+IC+JwLU1n38a9XdlLscm9UkDQ6nGlt4jtn9MV/GtXy8WAFhoqBr+/wfXYtsvjp1wDItUclbd Uz+E0tchX4Xa0MiLFCStAsWkwIExcOc1utScUCud3w/k62FmkrCVgVwTfV/FL65IMlVJO6WDs2Q 3yB24dPaU/lqmb9VDsu7bzoCaiSXSY+dVj0/G1ejfcnkzh7xyf X-Gm-Gg: ASbGncv1REzimqoGE13b5rU7OzP0T8Zk5yq7//x4nlQKFaDBmMy/yRetUkiYuvYcucn FREPPNXJ7ZWX9UW76wGenNT5DFbCHvc8IZghwZv47qko2dgmQ5BuE4/PWb8DeZC0UCm85WzwuNP gDzHMjL0Fefxke5Hzx0TEdqEsQpNS2OKwRUGDT3J25L32NsLWLDnMgsMbCDWDLdFkwgF9uaRHd1 VepsR9AaC3Nc5MZ8FPaKMCgttunc9U/8GJ1Rh/ibhtTykLqAipN/ZBp+U0DkQ7AHe/h1T1vXplY AjUCmRqf6kbCBPaFMRtc+0JrNYRiuGOGo5a9vlVp+neKei0j1ukdEABdfnqD1c+zkVa/cgI= 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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13975411 X-Patchwork-Delegate: kw@linux.com Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A27E2690F7 for ; Fri, 14 Feb 2025 17:40:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554813; cv=none; b=u7mouDYlqbj/Fl28uIz3YdxkE6g5wAxth6wrGLzu9Gy1xG+bRER2LIAJlgz9CM3/j5Pyl8xbLyLHCWij5k7Ogndg90E4HsL/IuyBcTszTCAi27kEyQJ8dDstKpq+jwlEKD3FzBf/aCS3tDjzur02UNmbNPcB44ZzclTfslhHesY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554813; c=relaxed/simple; bh=8sIVeXISLhuu8alyiP65k7wuvZYSU2e6JSJtcZ8AiwY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fBBnYeqRz6cOwNDfLO9Quu7t5TUbnjPHPsnwiRLTILV7jZMj0FKsAakRSdB3wUHqIFGqaAWjemZkGZ9GB1nurskNdRT3qOUsawoLCn5lR3r6873laDV65r0fMF7a+XrcXTRtKfVCUC5Pa8YfUSEP5SOSE4LAE4rgbORG2loJOgQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=LgAXDMVT; arc=none smtp.client-ip=209.85.161.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="LgAXDMVT" Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-5fa8fa48ee5so730104eaf.2 for ; Fri, 14 Feb 2025 09:40:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554811; x=1740159611; darn=vger.kernel.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=LgAXDMVTpw/WAdSLmznL0ewBKHivLZRXxMua3qNK2PEe+upzgXqoaOJ1u3weeuWD3b neNwWdKqL3Qis0dz5Sj8jhwEhP/vFajzUfSbm6nMgfk/iZojaEiL/saEA7syaFghbk/l aXoWX6OMnZCQqYwN5S1K5Z8ZMXwEwXN9wOy5g= 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=k1p2stv4SW0N3/VWWmKRF/dv3r53lFSXGpFrHHjRvUrq8Xo27VWPEsGmaCUItATeM8 ofU6+0tuqs7DDrrDUjm5mL2ACURwaD/Qh1Aeuz5QciKWUsRW6vYDR+m2KMPDXoZzwqj4 h/VXOxdxnwJx3u79USndCIeP1rhn4ZRjoMT1vqaQ+deZIiy0lEcZYR8cISR7Ix2vkJ6D uA+6av2SncRiKz7SA7fKhY6IB16jVl0Up2xvkR1u6HZPDXrnKJn+h7xJM6MM+U2D97Ye gWy3TQg97dZj43A7sYFtKtNrSg1U1kiV4SUMerZXBXi7e2S19QrqbbwBrTpZtI2PAum3 yOKQ== X-Gm-Message-State: AOJu0YwttqT3YWB9RKykWBUd798rkNj8QYTTe4jzAYZdpWXuNOCchpdY CRNDBhjCJPyTR9gf1i08tjIVMydMD3lKtd0LcDX0H6sqeVqffPmwVLJVLyJmOUVmIiPEUGb8brC CzlIfY1s3HfCKXxGfzkAexZ/3nOidaCQ4a2Sj+C3soo5vKVyfkS4LkHKsZnETZMWVfPI3txtkpM 3v9bcB+/JF7VcGHJhuoc2o6gBm8uM5q3Mlnqx3gXjHjEOLB9M+ X-Gm-Gg: ASbGncsfdG0NKzPxCVsYyd7URqJiRzbDrmQ5fSefGbNo7G1swRvvzuj7aIxFDegvAfj FSVTC1JwOdzI+TcY9cslPYUTlxCLzg4pe9cU9sWno+MlL/c253/228G7NCgz0qnaWMxTPoQk0Su Sff70qOOFfNzKoja+yaHwQvtDPfg8zWvuHVAzJ7f1OkB51xVPnV8kEiCg+fm5lloLpBVh/EbS+z moymMzYC73waNZfBmtb5vtdEbDM67Vb1zjtc6+cYjul2G55ieUDFtIxpwjbnHubO/Tr8Qhils/r lydzsNWR2gedC+UuJHGF7G3kQCYXokfmxpQsqqpVNl9Fq7e8CeVBUHlCgLckUaNwmerc6jw= 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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13975412 X-Patchwork-Delegate: kw@linux.com Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A4D826989B for ; Fri, 14 Feb 2025 17:40:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554816; cv=none; b=a4Fm7ZpaxHSbWUzlv18UwVfUEP8Cn4oeApVFEHMpjq5Z64Ua1akjk0tg2dNp5dvEXEdEU+FKqpIEyyKRzLY80Z6iaKBle/LbN6C6SAWICU+ii4AhUn+hv7/DE1DlSwnMQgbZJwTr52qdeCBBabyXaCoe/LA9KqK73TTBrwuuf6Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554816; c=relaxed/simple; bh=x1WpMbPrXt/ixRuU1MPNtZbnxurSV3/WnsYb3wurrDU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fUo05Z+FuXg60EZ0bxowH1H1M1I4vGmJUpoWZz2mozTEW6SRfFPJstXCkjiNloVFC949HxAfQQOHlK/ueuU50Xjzc6MmS1hfvmdBGttaXSpqTT32FwCzjLikHDL/ylHZcWcCjp32eEFYXAVp7poogJCCXzv1+ivMuunoPcyUvdQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=gQpuV36v; arc=none smtp.client-ip=209.85.161.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="gQpuV36v" Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-5fcb3ee41c5so590165eaf.1 for ; Fri, 14 Feb 2025 09:40:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554813; x=1740159613; darn=vger.kernel.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=gQpuV36vdspRU5zZ2FXNCaga46Ot3BoAeEtI84k8+2qJ/783RJIJA0gnvsCNxZk1yl DovhyagfWGKVjCVZAqEYczLTWKHWr6WZ1ySE/LqoCLi+o8YJCgWV1Jy8qlZdzGI0x8c7 wQrJAm1F1TyX46g5x3ZSzxtccgYiculkUTpM8= 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=lH7gdIRAoyBHp9frYqoUYFE5iaRdl/4C8MCcMU7m5kLN+wTLrJMbd5V79yt3nXyjYv fWIhmO837OVuBz9v5BqMAiR+tdtPFqnz12sAm5yhaHP4oidb6KJ03S/38aLI1MStLZL3 yTGkSs+t0jwYj6ot5nitZs6QzQrHbUKK+0GkYcX64MMjUI2Y6q8203nZjcGKtN/URrgV TAgwBC71yw/kqWLNn/tArs7fmtZ2rtm3Fo94aTIWGRTp7Vxq0on461imgDUaBwV88ozh b3/MCzfQ4dXfunxSev10WWtqkblW+809omZRuWH8poMSTbcMxjOIElDkXJ7OpKfAO6hi v+FA== X-Gm-Message-State: AOJu0YyjJk1eQFXShoL3udyUTNT3bzrwIrPclaELrDso/BUVO4RA7fON j3HXGJQh3zAwTlLc7m+Lwi+MrwIaMHDESg9hYt3LzQpyl+A8PWRGpXOhoyyvjZZ7TSN+OW0xjY+ SjqkpbFqZQZ+k0YdLTepA4tSku6zQGRlE+5LDscMnFSuS6SGQR4t3YaP8Pf4M1XZ097xLLxuDoj r8w8inmC0m/m8+8p6ensF1X8Io9RrQUjcxbGI/3tpCkrj7Wy73 X-Gm-Gg: ASbGncuOCjLqyuxMW6CkelxpTKWmrhz/0l6VREUEGUj4yDsaF2M0WbuO9Rh9I3nOEHL hMHmeG4nukA1jvnkxNrBLkrRRJ9SCDUl0EhC01ZHzF9f56mLU4mTaYPX8ccDSXhOyTwzTiW37HL UIK/yDzQTvZwW08sOAW4UFwZnoDF6tzBlBD8nZOvtO+hqWI9A6qC/QW136bE8eBA/aCrxr/ezsc xoL62Cf7/jW74yX7BWVDwRIbw7gSw6vDqO/wPmvhhaJV11qpdhjs8vvsn7GSdp2BBY9JZ5JNNAH IklZukH0Moq1PMFA3ePpAJOrL9vvpj3MFdqlLvusTA7UJtJjvWq1QDHfd/JUFlgchNx3XNA= 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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13975413 X-Patchwork-Delegate: kw@linux.com Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CF67269AEF for ; Fri, 14 Feb 2025 17:40:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554821; cv=none; b=gjt12TIpHI4sw7+RCgysl1tK+anSMvxub7E2IrzkT0k6kRdDZxz3dAMw8Nd0Qi3MEG0luIsfTtDkqw9WKj02goGymVlQmDMemrGqdDxRzyZeso0snozlV+/dF0j25hLl9rKVNh5ggyCw/ewY3F3nHW2UYGXrXHzXcs4U76trEtI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554821; c=relaxed/simple; bh=fGgqLUYQ3l+rbJFzjKjU0U0rU073XUhDX3WKSwxzq9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iEwghY6s7vibimOlQDDwlksHViVVNgf5ir6Hn/3aX5Cs898zkDpWVsqXO/H8X3IsqIaMv4/Pm5ecME8D4YPKns+1SM3fKkzhifs0DTS8Z90X/w7YNoori3LjY5SpUUAk7xA9TK4KWCzPEIXIBk+sGfgb/tYoLyQvGWpHXfQhkvU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=SQLOb6CO; arc=none smtp.client-ip=209.85.161.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="SQLOb6CO" Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-5fcb3ee41c5so590194eaf.1 for ; Fri, 14 Feb 2025 09:40:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1739554818; x=1740159618; darn=vger.kernel.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=SQLOb6CO+0a5oC6HFk4K90rrSIg5jYZ2GU3l8gR507Rfs8tNjYLHyOvxR4h0C6TQ0g 2SAiiPOWYdIoOq/nUHnZuMwdzOnW26FMICQ+VhCZv70ZXekWiPPgLBkBeJw0pj1Ks7Qz nU68mA+NHfSAH4g4o+2ZZn7u1WCl91ofjnkWM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739554818; x=1740159618; 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=PxqGFrB82+fmyfyEExCKZJMqbH2XppoXduXX9rmmXA/tmP/Z7l8ZPRe6gb7hj+PO2O l8LmsIOEsIZeYKSpXBrpczBa2WAvplF7ZiKEcg90tOtqhvHyqUTMeU9uYuflQfRv0QgK PJ3sviNp5+PheKEH6ACPepdgXEX402GHPTrz8s7W1kjOCiJPNzOnjgyuOfUTvrrfYZOz P0/o5oMKL/joMrRG6ezfeGje3jPW+gBGG5Gnsz5Wdv45hOGShdYO8vUrcaJ5OYhVa3Au oest0ytuyjjvM7UDT35yTm4McX/79chcxErMgIurDI2uzpexcgb/traqWeqDVDpJ9qOA PVSg== X-Gm-Message-State: AOJu0YwAmSH77rzLPyjWpx/wdTjnHWd1+GRHIQmYsqxs24VUukD0l/sU jFfeTWiZ7aRPYm1ImC1R837cPmnebK1bccTYMDGtIWhfgRo0HhI4ZeCQiS+2lWa4QYd2DyOUGY1 zDNaJmkN/HfPBo6B7w3c+HPak1KZHv83hJvIY/XmWzxYY4p3RI57X+hCBTEKWjDSDE5xPopkgv5 wzPmaQa+mrpis0qdoWHeOOotzSktpIkkcUCL9QJv7ly8Vxn8Vd X-Gm-Gg: ASbGncsydD70w4ui27NSWWGyLKS1QlkJU04/PXzlQGud1ngJWSp3X9qBIUAsrtNj12a 2rqyMapeupf2j5azAhr8rI2x30+DTAObjLwRi1f1h9SG0daKMhs0ioVmSiiHyYdZIsh+RoRuAKW iDWbdxA7ZOoL5eYz2DWhJfU0uWpzQ65YWOYGgpnNzk+tQ02POiwt+5KnZMQW/zENT0NW9AesofD hIsH8Dn4pPFi03pUQlVd/SDUO25cByqpVEAVgCOIfEDf+SbdHd3yLRW+Zto/CQh9QpKojzzaGJz p82XmTMUgo0Rf/+F+LBmg8mrAH0RKg+I2xealrzkGaUzEGBCXqni8NAa1ieTjpO1RuMPBhk= 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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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: 13975427 X-Patchwork-Delegate: kw@linux.com Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BC002690C6 for ; Fri, 14 Feb 2025 17:40:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554824; cv=none; b=LlNHYR7RhAmkHQ2gAY7GMNMf3jH4yimZJY9T1CVblxjJ/xRNTyqjMKk6DhXmielrsOfw2JWoXSCFMSFiJ/zXJ5SpQL6s1xaE5okZsUsovk4qlg65g0BEXl/j0TB78Z5Phl/JyQ2xO2wiQ+wjQCvfmMS1+NseiEc0A4lEva7//Qc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554824; c=relaxed/simple; bh=WBgjH17iGQ0M1wewIalhrW/3ZOyyZII+ENhL+eX1Ijw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L0Uk4gIBrU1J2Zf55BayHGcSk1Mfw5LwX34mYLlbOd88C+BOTTc3argMmulUTC9SFOc4ZSJsTYZ/5RQjQCnElYfFjl1tt+Hw5t7bfVPrBA3F5QLhULTYxXIYcEviXar6ati5gLLODTWOqYTCRpsH7zVvkcfPLpzzPveNnI7SitE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=MccvvWWk; arc=none smtp.client-ip=209.85.161.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="MccvvWWk" Received: by mail-oo1-f41.google.com with SMTP id 006d021491bc7-5fa22d0b88fso1487046eaf.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=vger.kernel.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=MccvvWWkba1jaXhQjmFDjVTdwupoV43LxdUks5tnbAyN2fBm5ggrfW8ZlyHB+ybXgg MBu434jR97+ZJZqJUo0VWhy4BAbpE56yz0d/zmifrxm/p0Zznn0XHdRxO94iRwD8ahkU deXGp3Bg0xmOgt9DHvoqYMqvER4Bl8+zA1lc4= 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=i9u6UW9Ah7Jqw7781ho7iuh+n0zRRVv6Ww0A+tX8r6yb65c4th37qZM8hebvBWf6WJ 7/yz4UfHS8s/knJii9UVPd8YzpVgAWP1CEo1D2RtvEVgstncVGfHPnW7SAPxSBg8mSxP QGKaCOyEi/AJePtDTJAGMjEm6hGdEwOnVdQjPg/P498d/BkFOQjVwSxXOMyB+acT95Uv +9sRh0BnARggDl4dGytSm5ACNO/8sg6GSUQeF3ydTsYLj1ZRKXZL8Fn8UrAkiwQvIxQB YZd+DnV9ERlbUdLmT1IZOiOHnsjnfp44gN85ktnA6ucycIPt7wNZ3aWvLPn20QjaZ2ob 2faA== X-Gm-Message-State: AOJu0Yzkl/Q8NA2MCPOHudJAP2pxQvRFcP7hLS/B2pv2zKuul6juKkJS tgpaNC+Q2VtWppQHYVbQr4Wgm05uo8oRyDOMwkBx85v7jH9RZpozO//+WyiwNGXPytuO1OxbomZ NhHnE2aGa0M/OZJvyFdaV7pUweN/1mNvElLguENhSnrgqE+QzVUB7gVCP/AT8tS1dveGLTAsqcL dXRcTJzNmvgDjIO42dbv46+uwSvb2zMxkmIV2M4bs4utb8qcfj X-Gm-Gg: ASbGncuUoGFJhFMnG6Jao2soHPMfReuM71nvQq6xwOm4yM86KwqTJQRSUzIEc83+xM8 TzaySxv3khyDPLCmdOHv33Zo1uKllMw5TJK94bFARr342659Gfc19sn41WtfYUYjn+Jl37iRvBq 8LJJluxy6XFSXLDLQ+GjXyyNLUwo2naimBxivmWU/fsg2F7sVMoQFUGEfkLHg0Jxy2xsvGvkSal y7F1RdH1xXoeRkEbZ3tQwIVuBMuqcxOMpix40MozAocWj5qyYmHhgKZTyfba7ULtd3aSIOw8GVM YGBRh+iQgY830zCzrJbmTynnw+nFBqLa1Oq+EJeM/UqOzHiubrhb40wdR/l9jwmVnUmfaR8= 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> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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;