From nobody Fri Dec 19 17:01:48 2025 Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) (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 82660268C58 for ; Fri, 14 Feb 2025 17:39:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554798; cv=none; b=rb/IvjCD8F5qOa/1IMwaUYrbs4psV+h73y4ku8eGlr0AowXjqAa8PsyVZuTGSaYPsh/e4wXEUjw81WmmFUCXpTJl3lBprAl8+H0m7GWnVhGD3+furlXPcLvySQiRTKcxAN7JIPHrKjaPgZDREIScKuFPubdCe7tJTk+jw7vHXUE= 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.42 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-f42.google.com with SMTP id 006d021491bc7-5fa28eaa52cso1469433eaf.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=Li65u8sDBKU1eDNef57lQ0kNr7kqyGFsUHMbfK9HUEdhc/XymQexpKRUeIeQq9NwlN 7u7jmCBrOFL6FAiRPjHSacv66EIzi9ta7UU4TxfZ0fGxnybsmJHF3KOs1IfgZh0a/rES t25KPn8xTAchX9d4dC73XUyuaNG/6FI5oKPWLodRPQCWkYLVhB5UPnZN2VnHJoIPO348 IwxV/ScikrA0ozpGwjKOFRRCMleML0+v/UCxpVju6R8PgrCtiyzaxQLL7VexC5kUfVs/ ia9HBen7W4lSyiRmPBWiROYHMNeVGhBMCM6N4G8XQzDtKGfYNQmScSlR8oruX6zdIFv8 PDyQ== X-Forwarded-Encrypted: i=1; AJvYcCXgPSJWglPLqAhMM7XRKw4DuCzidJvEjScdffX8oZB4l18ndy5aFcR+9L6gIjqDaRhyGbeCJAiP4UVsjAA=@vger.kernel.org X-Gm-Message-State: AOJu0YyLXk3gsjYra/zULyv7PR9k8not9iOLhlM/oDwJ/x0ifNINmOf5 pfQWk4Tp7y6S4REYGYskMn43xh25y+EbcA/782eS/+d2M0b1JhrGqzsO6q/Wvw== X-Gm-Gg: ASbGncsT470ViR2DUyljr3o/XU0uKfgz8X0iC6clYXXsSpwuIgCZXfa3FsXApppsyGJ u251UVXVOY11YUG4UEeeAe2XKBPvNItITX/nowkUNm1XpW3zX1FIp611+1XfwVx8KIeBbS/kanx Z/9CfrXs8kqUyBnKuXmJBQzkaDmk2XX8U/ff2JtIhOSi8cZJF5cD8OHWEVRYrrPTyDK0LrD5j5i 01y51rhnBjCg4SYVEQBgvoMOg7FWl/u9OfFZhi2e/TcAqoJfhwKRIO8MnULQ+hBzn2QzOgSnv58 7SnJ8QopUkQEMZWgiqVGO+Om4NnXUsUyAORV0EvT/k15P9OLHsa9n9ZoJCRqRZhWJoHWR2I= 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=20Wilczy=C5=84ski?= , 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Broadco= m STB PCIe host controller driver") Signed-off-by: Jim Quinlan Reviewed-by: Florian Fainelli Reviewed-by: Manivannan Sadhasivam --- 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 *pc= ie) bool ssc_good =3D false; int ret, i; =20 + /* Limit the generation if specified */ + if (pcie->gen) + brcm_pcie_set_gen(pcie, pcie->gen); + /* Unassert the fundamental reset */ ret =3D pcie->cfg->perst_set(pcie, 0); if (ret) @@ -1350,9 +1354,6 @@ static int brcm_pcie_start_link(struct brcm_pcie *pci= e) =20 brcm_config_clkreq(pcie); =20 - if (pcie->gen) - brcm_pcie_set_gen(pcie, pcie->gen); - if (pcie->ssc) { ret =3D brcm_pcie_set_ssc(pcie); if (ret =3D=3D 0) --=20 2.43.0 From nobody Fri Dec 19 17:01:48 2025 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) (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 D19C4268FD9 for ; Fri, 14 Feb 2025 17:39:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554801; cv=none; b=jK+EHxXrKOiW8RH+iA1fpkYRkx3cm5BHZaRLXHVf9cqtZvdSOxltgPZqD1hL0vq+WJ1hRaMfSO5NV8v9G5MWZc/ojr5gpbr9301pqB8ZNxbgRrjsioOXqKdyYU6eLErp8azho7sDvL5OfmJbHtz+UCQ9PiFoxx6eiN2pTpI22dw= 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.52 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-f52.google.com with SMTP id 46e09a7af769-7270c259104so545990a34.1 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=iA4h+r415nwkE/jUlsfs0T/NwidjSto4E7bxF3PdYQnQr+kG/US4xCFBo0j+0HQLBA 7S9+TGBqT9o9Nnpc73NMa0TPo1dqUAhQ3jakeaPfVw68ktA8qA7bs2mrCIILTF3ulbTT ID5cX16kmfqZXLwCrur2pqvuzc/aQUZPiFLfw47+U6m7qp5LR7oGgAT47FFgfVH299Jo HI+qrzZODRl8DoOaueRXKdPH77u5dfDghEc2lk3HZEZDa1F2dFeg6FKK/aP7ejTzf/bs ovDZLGSsoyCb96e8Fv3yJCzqGgUtQt2dNau9+3wyrA8oEaJShFFGIzMfhR5vz13P1U28 vYzg== X-Forwarded-Encrypted: i=1; AJvYcCUZANbM5CQFW/hXuqecMdBYnLua3NuX3D0xQA8JkCJzKgzpH9hWVhETfpvONaxKEt7mJQh5qF/6TN8hfdk=@vger.kernel.org X-Gm-Message-State: AOJu0YxDwOq37KJFe0ceaJNzJNcV+FP9oOALmljur7yHQtvkpOJ/rd7A k1zxweqWcl6e3WOTZzM7BoIjF4CRTa7v8TrOKEwDDhRORmvYBlR/429nIss10A== X-Gm-Gg: ASbGncucaJkHsjlhEBxVIZYoXSqBqE1xXYE4WbCZKSBoU83LN9Zx9mX9Ym+5x9YOdON rrqvelTuWNEK83uYCIWGl7XmqrAKu/I46YjgJKg4lmxCw5nWfuGa7QNs+40QTyvVaX1SlpqnAtD Zbz6P87vdjxGq+geESwMZnXvOWLwqkH+JHaVees9tAzaQrSwWChf4mgkpOovkMfr8IwkTEnJjWG HU2c4VJqYCXFiZ4YFBxwdag7tF8F1/aoO2QatN0snZC0ph1NH3LVK+qQ0yGxo1Ps3DaoOnS0oOl McN8mJO35JPxVIB6vaA0UJhicmO0eJ2I1+LM4+gvkC0vl7TiK2umvwHD3Z4KCwUhcDAEtRg= 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=20Wilczy=C5=84ski?= , 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Broadco= m STB PCIe host controller driver") Signed-off-by: Jim Quinlan Reviewed-by: Florian Fainelli Reviewed-by: Manivannan Sadhasivam --- 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 =3D readw(pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2); - u32 lnkcap =3D readl(pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCAP); + u32 lnkcap =3D readl(pcie->base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); =20 lnkcap =3D (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); =20 lnkctl2 =3D (lnkctl2 & ~0xf) | gen; writew(lnkctl2, pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2); --=20 2.43.0 From nobody Fri Dec 19 17:01:48 2025 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 DABB62690E1 for ; Fri, 14 Feb 2025 17:40:03 +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-5fc0c06e1deso1099242eaf.1 for ; Fri, 14 Feb 2025 09:40:03 -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=GcHRdv9NqclcegfCZ8AwqOD2nyxVLXt4QOrnD6a33tMd3poNivfltvTQ4SsIW6KbeY Dn2BycoZOFJYL5VSRpYTv14SbQ//pslMgG9EOgHGkWnLbmN9U7mvA+rFRBDh5FRfVZCT clzng5TWn5ssAnJVvmzOjhQCmUhtulll1dds6TcFqRdGDgq9/549uLSPAxoFhTCPFJo6 Mm7Gas40R2QVx3k1WewRWl0eqX68jIJyGD/pYNan2WmBEmzgxDjkgjStHlILTEjaEsRE rF/YI1yRfOu+cFBH4GxKTCvx1t2AcrUlY3Fovy1TOzfYJw4xGu//Rbx+DpWLsvr1Veoi 2UGA== X-Forwarded-Encrypted: i=1; AJvYcCUaVxqVm57a5B87NFdKRHlJB0lp+2Z5oXmbRZ3EYgwpRLF/Uc50HctK7bca1uwXMZoRr8Rg8e9JdbqOEjY=@vger.kernel.org X-Gm-Message-State: AOJu0YwPPSEoE4ol0rMn0NalnvJgmDteiISooysKz0A/wtvXCMprKzu/ m/lnK+FywmyAsHgFl2wB9XXQeigCLXziXs2mQTAlfGFjYnFaiFkVG7tx+yvnxg== X-Gm-Gg: ASbGnctn5nVmOgy+EzFoq6XzMW9YJRhuxCYvNSHadi26RvsWDtcmFwlBlIIy8j06Vxz 3DaCQ5v2c7Bwyt5G0990aKpTI2bSguV9lxrFJMm6aHZyCb77CYyQ/06Zv9g8WqMvpLT3pJUI2+m 8JLsg2yRxt5u4eryBu0pLTfvu85ecyldVe0wpayGjeV8XxQWvY3697f3fTHMvDK4P+8Q3xKkyPQ ylFq5YkRAIfhuATNaV42ch831mDz/+EsOeJ5vfhztV7fQFfCiNjXhFa4DaUZX25ZCG7G58trK/R uw2mK3V2Okw2L4n5qz6sZ5J0C95TRUDhqAXGLcYP/KpO2yU9hg4GvNQwyocNAtH++fHpVDE= 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=20Wilczy=C5=84ski?= , 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Manivannan Sadhasivam --- 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 =3D readw(pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2); u32 lnkcap =3D readl(pcie->base + PCIE_RC_CFG_PRIV1_LINK_CAPABILITY); =20 - lnkcap =3D (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); =20 - lnkctl2 =3D (lnkctl2 & ~0xf) | gen; + u16p_replace_bits(&lnkctl2, gen, PCI_EXP_LNKCTL2_TLS); writew(lnkctl2, pcie->base + BRCM_PCIE_CAP_REGS + PCI_EXP_LNKCTL2); } =20 --=20 2.43.0 From nobody Fri Dec 19 17:01:48 2025 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 3EF552690F7 for ; Fri, 14 Feb 2025 17:40:07 +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=1739554808; cv=none; b=qKIqK2VsH4/a61eO1cQq40EEqdAVph/mE5crrWh9qRNSv6+ILWG6IhsuXvNL64ru1Ql37fTNQTBaKU7XVO7wVq6Q9mzSCBMdBZrW7jEgxuyw6idj3WINlEgl56yqWr/KMyFCBQ4NvtxRzJtKkDt40G0PgkTJXN1hWDjmbnD/IQ8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554808; c=relaxed/simple; bh=hpYFno3xFpTtIFF8NpBFjFKOov5U886g51Xm0GPpMkw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XwSaR31K1+e+RUQH9H2LggOA7X9eea6xR6AU9SIUZJFd3GLTbIsPumCbmBPfVj8PqTrCGS1Y84+6LuAI3KYiEMOhdmVpHROxbtx/kWeo1CuG2j3xUleuzWysPyYoKMIywW8g+EZFIE1uP3xWOXfthfqvK2jFzyBvt6e/KwLM2tI= 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.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="WHFxHSuS" Received: by mail-oo1-f43.google.com with SMTP id 006d021491bc7-5fcbb00261cso562232eaf.3 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=CKgAulj0Kw6R6JfsV9JMmwHRIznFASJx2XBHUIzobw4g+V6cU5XkVDG64qjbGsW1cq tVM0Y7a+uI5CVcFCH135xVtyyUmGs1HY1RkNwCTEDjBZL3Ca+b0Vh9OlXeYcD46w4KN/ QoZRuE4/cIwTf7HYWIB69+Djv6tipoLWogO150lThPiVY2M3sMvUS9XFG+u72U7LMhkM kIvptPAGPjFfxhuGqke/OgyXIgXh9BHbvHU6dPsKyDsGuiW8wjK9RkMlWQD6kam0DtRw /njUs+IdoTjvPFKAIu6BLgHw6BypPJiXLnDQDB4HemK7a9eCRvYhMvJIJ2ldAkqoMIUc d1rg== X-Forwarded-Encrypted: i=1; AJvYcCW6kGgl0/UQwjN+ApOVq6NTcYJXgzwb6hjIL0J3ggj3tFTFfI/qB9aHd78kdNLfeVIH1h5alyPNu+F09UE=@vger.kernel.org X-Gm-Message-State: AOJu0Yww6Xk7fXNy7jd4V39Wt5X2lRtoVJ6VR+EAjnHDZ3jGzwkGxUX8 5xxwJS3XyHdj7/giBOfX8dF/RuQBAWYe8KSK4haB6hWhE+wa6Go/JPhFIM5EDA== X-Gm-Gg: ASbGncv3NqvqpomJSsulkkfzVpKIlWxNgm0GJn5qVR8s0nVpiewvQ+Raf1plF5KOeoT 3JugQ1gG7utvK++XE6z8MWYhooZQkV8Ew9e+MkmripT0sKsfJvJ3qNG7zhSnrRJzAy4vDObFMp3 O//4B+islEcoAHDi8tlG3qS+zYLfvLQVFme+gQv44fjoNGOasLSpgJzfUfgx0WQt0Hd/LUMCTC7 pcA+0mvcSAabJIQNvoKxwvUOvSj6wE8r+UkRhZOQSbVz/XrlAxZqyXyJCp5RUQvluiqekdpGnDc yZR7ozxlvXxyjKeGYcOmylW6SLq5BPNVcij5AQjDmJyGh83mf0UgGjtrpVQAJ8zivYiLvmA= 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=20Wilczy=C5=84ski?= , 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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) =20 ret =3D 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=3D%d\n", ret); + pcie->sr =3D NULL; goto no_regulators; } =20 --=20 2.43.0 From nobody Fri Dec 19 17:01:48 2025 Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) (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 D699A269837 for ; Fri, 14 Feb 2025 17:40:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554813; cv=none; b=tjNHE8tKHeL/OgM5cXrtJdi7LnBNQ90AkrgVZL2SQmwafDOb0NxD0NM8OQDzqzTGQExCFfKFo4WgO4SpH5HpMaGvYc3DYEsx2QtwfUW77+oxRblSijkduZu3WPoycPkNG0Gd8D4TbvPk2ADNiZUhh4wJ77grkaprwvWcDJubKNw= 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.53 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-f53.google.com with SMTP id 006d021491bc7-5fa8fa48ee5so730098eaf.2 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=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=R6SRdqYo2EqI+snXIfZ2yo7lJU/6mjdaKRl6key71LfPV/kfINlzIFk+wyM27XkP/2 UF1szot8CxIR3pX34kUKhpJ9SlSq0PmVQrUl62VGA2o3hipU/fujd+szd1lKvYs1csz8 o0fjTEUpkzYs8rnBosUY340cas4LF/7A/r8TK0dbwUOIyp1MBTcPMrUQobnoR5bQtE7D fgNiNkyMXAS6DF2h/PYjvrN0TJU+6n1LzHzUghs367WPwig5TpdrvADF0HpgUs4HZVmC blTibBMmf02raL+Vd7/D6dmG5cyqKuehIxzdIdgXmAZ1piE1cKbBqMeis2fM4efhwpm/ +New== X-Forwarded-Encrypted: i=1; AJvYcCWCsAZ7iTeuhYv7j2DokPfK5nd7NOzOGOSBVHWU+4QTS+H4uFn4Yx7iL90gAYMuSU6GNB8DGA9Nl/MjKjA=@vger.kernel.org X-Gm-Message-State: AOJu0YyJE8kcveG2hAbv1TteKESc55BeovGYEZ/h99DI+MRPTPPCC643 ixA7a0tZgDMQZyA9XxQv+BLYrkb1B/LUs4pIP3Ra31LJWrr/UEnZXqHdpDOU+Q== X-Gm-Gg: ASbGncvOfq0vf1oBWWzLRV+CzWVJ3+cBeWdgM199mzjbk6ftCZ/dCAX8pb0X2qm/S2M Hjwr7Iers3CJwM8UqF0V8ABrBmv0QHQoS1Z5EPbKponmOCQnFq7LGdxHgOzj/Q4ilBqr/3GCjXn fdSV4ZDk8QqiOhFLnjuVWbWv8GdmVj13EzCXbSRu6b94hN4wu7kM9j5sL08D/O6F9sF8Zk+5cqZ xviKVz2Agtru6bUKD4j37l9uxV2jzbt6Q3rLA6LSR054y0mnjwjGd9A4fIhsIPLXSCUVlv5XFmq h9K3arzY7uVB2+ckEdzMWnyCF+rv4wQw5H15f7oSOzjX5v+zaxbbUIgZw2iOo0P4wFK2fa0= 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=20Wilczy=C5=84ski?= , 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Manivannan Sadhasivam --- 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 =3D pcie->sr; struct device *dev =3D &bus->dev; =20 - if (!sr) + if (!sr || !bus->parent || !pci_is_root_bus(bus->parent)) return; =20 if (regulator_bulk_disable(sr->num_supplies, sr->supplies)) --=20 2.43.0 From nobody Fri Dec 19 17:01:48 2025 Received: from mail-oo1-f46.google.com (mail-oo1-f46.google.com [209.85.161.46]) (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 7DE632690F7 for ; Fri, 14 Feb 2025 17:40:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554816; cv=none; b=kmcNkt6VAfrzkMB5etut7cwx+KHFQkva/E9WaDnLF0FoJ+fqX0jNOWJgxx8RRu6M37AzEhU2hqOxwj0GwLMw5akx0WMiEeAyGNh0Xcap3Kdnpoo1PvbluII0EbzBN3FogGtgxhkR36djXTSQDPL/yUiJY0W3sUcMihmgcXg5VTo= 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.46 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-f46.google.com with SMTP id 006d021491bc7-5f6b65c89c4so643465eaf.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=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=sjNlXye2ur07OOgGkyL7ouJT1wdJXn43AWdkSe8wKNsZO4w8NNVOr2Y2n1N1uXvnqe B+KGehDaVyIE0+ItekEec8Y7lcsOC2wiqCKVNwM2Nph4zHKic5RktD5LicVB1XtO2v34 xGfMKxeDy4kFDGSzrszIqtDUJc8aXNH3rCG7DwKJQG9vq5L2iWtXa4delWY/sEsNpxwE jcmBNlVDu6TPGouZHyh0p2F7rTvnfo/p9dQJ3M5mTbEVf+gsTRH1uVbv51FkutdbKoTu 1YKoh7eZysX2Pa7iUxm2IKcOGqI0ENJXcE49fOJ9jd6M+aBX7HjzPXphNuJipHo77sAG ZpsA== X-Forwarded-Encrypted: i=1; AJvYcCX5SevgI1GMEyMRRHdzX1ih8KT4o1xXOSPKSml6Ok8lF7zMe8qokbbrXDbiksQNxt5jMpgXtmKhowbQ1Qs=@vger.kernel.org X-Gm-Message-State: AOJu0YwusklAfla6saYpISXerEwEtT37vSkF6FyakP8WGOoF+JojSUNp Qes/JOLuWiibZQ9TZCVcG5KfUli26KIAqAqD04cJM5fU7t0A1iLuoIX6p1KsBg== X-Gm-Gg: ASbGncsPvog8fCaT+aM/nh5EVLqK2WTl+7futzQ0lsoJiO/m74+wBFEDqcCGNmliNx/ Ry/B1ZXUyYrZK08P2mhtSNbBlKVFFciB5kith3YZFi0yGCuwlnvEWTMp0DFr3vTzN1TESrz+Nyz 8woAy2oCAOhgD+zcoSxdz1TQiyOd1QygotwjOhHm5iF6q3zxKmMk540g1p0k3Sp/Bi3FDPDjkTF IQPrB9BQbBeXJYLD8CUJgQNOA98tpL7RRJSIbjqM/hIcOxbgoCSVwKsMtcIsveMykOOkfwtMmHT eNaAuwpvNUi/Ort3vm0Mf4tSu4N+v2kqi+Qt25oTX120jdxSEt09XxQ1hC1JD4sqF/UcE0w= 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=20Wilczy=C5=84ski?= , 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =20 -#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 =20 @@ -727,8 +724,8 @@ static void __iomem *brcm_pcie_map_bus(struct pci_bus *= bus, =20 /* For devices, write to the config space index register */ idx =3D 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); } =20 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[] =3D { [RGR1_SW_INIT_1] =3D 0x9210, [EXT_CFG_INDEX] =3D 0x9000, - [EXT_CFG_DATA] =3D 0x9004, + [EXT_CFG_DATA] =3D 0x8000, [PCIE_HARD_DEBUG] =3D 0x4204, [PCIE_INTR2_CPU_BASE] =3D 0x4300, }; @@ -1719,7 +1716,7 @@ static const int pcie_offsets[] =3D { static const int pcie_offsets_bcm7278[] =3D { [RGR1_SW_INIT_1] =3D 0xc010, [EXT_CFG_INDEX] =3D 0x9000, - [EXT_CFG_DATA] =3D 0x9004, + [EXT_CFG_DATA] =3D 0x8000, [PCIE_HARD_DEBUG] =3D 0x4204, [PCIE_INTR2_CPU_BASE] =3D 0x4300, }; @@ -1733,8 +1730,9 @@ static const int pcie_offsets_bcm7425[] =3D { }; =20 static const int pcie_offsets_bcm7712[] =3D { + [RGR1_SW_INIT_1] =3D 0x9210, [EXT_CFG_INDEX] =3D 0x9000, - [EXT_CFG_DATA] =3D 0x9004, + [EXT_CFG_DATA] =3D 0x8000, [PCIE_HARD_DEBUG] =3D 0x4304, [PCIE_INTR2_CPU_BASE] =3D 0x4400, }; --=20 2.43.0 From nobody Fri Dec 19 17:01:48 2025 Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) (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 9EE8C269AE8 for ; Fri, 14 Feb 2025 17:40:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554820; cv=none; b=HBGHZp7AbqboLlULpCzuV9ZK+1syeOmo1kRSVnaKyCT3HtOUBR1Cp5Kyz+e+zIVqloAdwwWun5dkbG6O1Wu82IBHqQ1eEB6+CAbM/gudbYOMLEEnT3zgVeMu3vD8M89ArNR20bCMSiNmNF4/7cEwLRWyUFCIxJmgceRcP/4xQSo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739554820; c=relaxed/simple; bh=fGgqLUYQ3l+rbJFzjKjU0U0rU073XUhDX3WKSwxzq9s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MfuVhNZr6qSchquLpidK0YbwsVmwoGF9D1/E3ypQ1zhw9fVHqpOlVbPdODEgd7YIummBLnIVVHpBu5fNTImwqgEvoNdSAvgqZ5nE2oJz3uzr1sXv4MEkhaciTVjrjdLk6ECfN3ZfknjfcMKygJ0Lgh4sZwa+ADj3nv8GH0psZ0o= 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=WNz0kbvw; arc=none smtp.client-ip=209.85.161.52 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="WNz0kbvw" Received: by mail-oo1-f52.google.com with SMTP id 006d021491bc7-5fcc45803easo47437eaf.3 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=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=WNz0kbvwBnyrv74gM3mFoS7i0v1Nqp8BWww4jLMV1PHqf+eqzo6tSn1Yb2S4MsCLbo xJzfKDhD9Rc5il7WDrrdEaP3sUyn0PjEBjSVQCKmDIrm0DX/67XHllFYyebMtdTjRQcu N+ujAQJHQByLxsLI5bUsBOrY9UNr5aFmtDF0Q= 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=NqVkblARQC36SxJEZm6GIDar6HWXwhIS/CLnuV8T2t8Qc+oFULXlhAUNMBhAj9TQoP Wb4SuTqFZFO3adqiYlAGFEjNZoy4rTzlhPORoS718vVyuNbEjCazs13kQDkeU6LZ4hbw 6t6yEVET76Na+IM80xjAkJe40w/Uu+yRTYlTEGhAdG+/3bJWMI/BaqAdKKm6XzktIB4B z7L+Siil3y308SuzJ+KQN9AfyaxO5oSbnJdUw7dCCJjRVNIGA1H25OFPu9V1IecAigb3 TcGPocnJixsV8VoIkNaAyfl0CQYq+kubHXMXSsU2VFzoqQIUxZeGXYeI09jiGYbCuwEb ed3A== X-Forwarded-Encrypted: i=1; AJvYcCVPrHOM3uMHk8erD3hizsjUFnb3h2/JtMR6FUCh69whA/zdhGLW6omQIy/XJM0qwRvkpDkG5AukB5jwZS4=@vger.kernel.org X-Gm-Message-State: AOJu0YzXU3zUxrXhISlV/IedA2C0HxBxGvR+XuLmugDFDDNT/4HGn+iw lSQ5sqmI07VL8V3QMGiWq3bjZo8L3JP2g2IuIF83VJDOjOwcaRWmxAyCJeo01Q== X-Gm-Gg: ASbGncs+/2/aVnZaa5Re+zsYcscZNPxiItBCDiRrwpN7EgrEC5renq1T6DmoNRfkY3z fwgqvSyrRgt5y1ioqO+5d+Zaj8riycLfEHuBKm00S/bqvOJbSCWD6pFOJx4zfK5XPN/dpF55rwv pNH2qLVeiUXBAgeCPoi+0SHrTkumrmkXly9IDa+FcGF7NQTKAbeJ7hUtba6i4+GlVyPTKeFuhOx 4wEs8wrJIFlxf4kn+XNOFlUKRV2XuIgIFaC+hH58oYOq8JLQR54tkOav7dTFHzmeXZaYRyaNZi2 3cZ/C2A9zUvlEAcCxcXoqx/pOhcai+/tfdLAAkEfIGU4Poq8mMDc3cD/NatupWgWuH2/Ux4= 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=20Wilczy=C5=84ski?= , 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Manivannan Sadhasivam --- 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 =3D 0; =20 + pkt |=3D FIELD_PREP(MDIO_PORT_EXT_MASK, port >> 4); pkt |=3D FIELD_PREP(MDIO_PORT_MASK, port); pkt |=3D FIELD_PREP(MDIO_REGAD_MASK, regad); pkt |=3D FIELD_PREP(MDIO_CMD_MASK, cmd); --=20 2.43.0 From nobody Fri Dec 19 17:01:48 2025 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 B2857269B04 for ; Fri, 14 Feb 2025 17:40:22 +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=1739554824; cv=none; b=ltvxCdmWMvsn0FJOVlWz3wFO6CZ2EVMVF5JPfqEX+jHYKbIFdBAztwSBs3uXPF4HwRIoTZbvMeDhnQ54EPSsJNkSx4YTZH+KXCoFMz/PVdKAfbBOicEPB0M8yURqZrxIT1vaywMrRPo1PspnyQ6Xzw6pt/Xdso/hr5zYu1/xRjg= 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.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="MccvvWWk" Received: by mail-oo1-f48.google.com with SMTP id 006d021491bc7-5fa28eaa52cso1469722eaf.2 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=e2BxXBu8L8hdJp5Eo1M/8XgR7l/X0RuahdqjI9HXxVxVWxZzClT81wCiCm67vn4EBm EyDBi0Oci3Q+jj4pGab2i0sHCrZZRxlu5cwHZKZQy2gt+7EVI/6jOPe4Nb2D0djSnnLy b6IURCX4wFB18/L3YSS6omfwJNkiiU6wvj7Te8BGu4rQaR685Bf69VJ5ZUv1KcLdsfZD 9zA6ZaOIlc+M2udQTp7UgKjpqq7YuwckfvJ5Zo1A1si2v6VygUTcWXQyYCBrCyBgNQHG tqcgJ3j5F7oiz2steWEYhVIAbbkcO9gzsA0rbJGXwv/+yEYvsP7bdslSaz5wdmFe9Dhm /cng== X-Forwarded-Encrypted: i=1; AJvYcCVmCKYvVKvcj6nNQQuyTrggiZGgJTJ8XnzL5KiT4dgKtoGf/PMxYR7RA28LmseEIoKk1uajXkDFgr0Z4PI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw3w6roS8VWpS8+HpYiLjfr4OP4kLWvsxnD9XbxnthkQu/NLxne uuFACo5h00JP4o4fhJ6D8GIYKnGHr/YCiWuzx+ALX6wyFL90DVtZ3R4CPVyrDw== X-Gm-Gg: ASbGnctwNTW9bvcodpf5/ihKSKP/nDyZdGWTX7RzNdPFcoKaD4zFUkTVyiETJ6P9j8n ahmYBdWFzqaH6eAND2q8gF/yauSzrLDoNHDe8o7o1jo8GQDAsFO1qUYbGqTQZKasL4V7WhWUeWi VKAPud9HFOT9a4XD7fGQ7w2dFgYXCJB6lh5GozAZwyVC1sZOhHxjoBa+Szrz9CgMVQYd8BvsF2E EjZC2AYc04Pga8wDnT4uVvys7RLPraWvVROty/iLJpWURvZY8QR4sBWaJPMG3PvgZHX3GYc7Q5X RFDqwjesIIn4RBBj6RmRVfJDL0s7dES5xhvlwN40YA57Nt1v6B5FBqA6EWHSxUuJD14Cin8= 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=20Wilczy=C5=84ski?= , 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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Manivannan Sadhasivam --- 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 *dom= ain, unsigned int virq, return hwirq; =20 for (i =3D 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; --=20 2.43.0