From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Cyril Brulebois <kibi@debian.org>,
Sasha Levin <sashal@kernel.org>,
jim2101024@gmail.com, nsaenz@kernel.org, f.fainelli@gmail.com,
lpieralisi@kernel.org, linux-pci@vger.kernel.org,
linux-rpi-kernel@lists.infradead.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH AUTOSEL 5.18 62/68] Revert "PCI: brcmstb: Add mechanism to turn on subdev regulators"
Date: Tue, 7 Jun 2022 13:48:28 -0400 [thread overview]
Message-ID: <20220607174846.477972-62-sashal@kernel.org> (raw)
In-Reply-To: <20220607174846.477972-1-sashal@kernel.org>
From: Bjorn Helgaas <bhelgaas@google.com>
[ Upstream commit 420be2f7ebe60c9ba3e332f5290017cd168e2bf8 ]
This reverts commit 67211aadcb4b968d0fdc57bc27240fa71500c2d4.
This is part of a revert of the following commits:
11ed8b8624b8 ("PCI: brcmstb: Do not turn off WOL regulators on suspend")
93e41f3fca3d ("PCI: brcmstb: Add control of subdevice voltage regulators")
67211aadcb4b ("PCI: brcmstb: Add mechanism to turn on subdev regulators")
830aa6f29f07 ("PCI: brcmstb: Split brcm_pcie_setup() into two funcs")
Cyril reported that 830aa6f29f07 ("PCI: brcmstb: Split brcm_pcie_setup()
into two funcs"), which appeared in v5.17-rc1, broke booting on the
Raspberry Pi Compute Module 4. Apparently 830aa6f29f07 panics with an
Asynchronous SError Interrupt, and after further commits here is a black
screen on HDMI and no output on the serial console.
This does not seem to affect the Raspberry Pi 4 B.
Link: https://bugzilla.kernel.org/show_bug.cgi?id=215925
Link: https://lore.kernel.org/r/20220511201856.808690-4-helgaas@kernel.org
Reported-by: Cyril Brulebois <kibi@debian.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/pci/controller/pcie-brcmstb.c | 76 ---------------------------
1 file changed, 76 deletions(-)
diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c
index fd464d38fecb..0e8346114a8d 100644
--- a/drivers/pci/controller/pcie-brcmstb.c
+++ b/drivers/pci/controller/pcie-brcmstb.c
@@ -24,7 +24,6 @@
#include <linux/pci.h>
#include <linux/pci-ecam.h>
#include <linux/printk.h>
-#include <linux/regulator/consumer.h>
#include <linux/reset.h>
#include <linux/sizes.h>
#include <linux/slab.h>
@@ -284,14 +283,6 @@ static const struct pcie_cfg_data bcm2711_cfg = {
.bridge_sw_init_set = brcm_pcie_bridge_sw_init_set_generic,
};
-struct subdev_regulators {
- unsigned int num_supplies;
- struct regulator_bulk_data supplies[];
-};
-
-static int pci_subdev_regulators_add_bus(struct pci_bus *bus);
-static void pci_subdev_regulators_remove_bus(struct pci_bus *bus);
-
struct brcm_msi {
struct device *dev;
void __iomem *base;
@@ -445,71 +436,6 @@ static int brcm_pcie_set_ssc(struct brcm_pcie *pcie)
return ssc && pll ? 0 : -EIO;
}
-static void *alloc_subdev_regulators(struct device *dev)
-{
- static const char * const supplies[] = {
- "vpcie3v3",
- "vpcie3v3aux",
- "vpcie12v",
- };
- const size_t size = sizeof(struct subdev_regulators)
- + sizeof(struct regulator_bulk_data) * ARRAY_SIZE(supplies);
- struct subdev_regulators *sr;
- int i;
-
- sr = devm_kzalloc(dev, size, GFP_KERNEL);
- if (sr) {
- sr->num_supplies = ARRAY_SIZE(supplies);
- for (i = 0; i < ARRAY_SIZE(supplies); i++)
- sr->supplies[i].supply = supplies[i];
- }
-
- return sr;
-}
-
-static int pci_subdev_regulators_add_bus(struct pci_bus *bus)
-{
- struct device *dev = &bus->dev;
- struct subdev_regulators *sr;
- int ret;
-
- if (!dev->of_node || !bus->parent || !pci_is_root_bus(bus->parent))
- return 0;
-
- if (dev->driver_data)
- dev_err(dev, "dev.driver_data unexpectedly non-NULL\n");
-
- sr = alloc_subdev_regulators(dev);
- if (!sr)
- return -ENOMEM;
-
- dev->driver_data = sr;
- ret = regulator_bulk_get(dev, sr->num_supplies, sr->supplies);
- if (ret)
- return ret;
-
- ret = regulator_bulk_enable(sr->num_supplies, sr->supplies);
- if (ret) {
- dev_err(dev, "failed to enable regulators for downstream device\n");
- return ret;
- }
-
- return 0;
-}
-
-static void pci_subdev_regulators_remove_bus(struct pci_bus *bus)
-{
- struct device *dev = &bus->dev;
- struct subdev_regulators *sr = dev->driver_data;
-
- if (!sr || !bus->parent || !pci_is_root_bus(bus->parent))
- return;
-
- if (regulator_bulk_disable(sr->num_supplies, sr->supplies))
- dev_err(dev, "failed to disable regulators for downstream device\n");
- dev->driver_data = NULL;
-}
-
/* Limits operation to a specific generation (1, 2, or 3) */
static void brcm_pcie_set_gen(struct brcm_pcie *pcie, int gen)
{
@@ -853,8 +779,6 @@ static struct pci_ops brcm_pcie_ops = {
.map_bus = brcm_pcie_map_conf,
.read = pci_generic_config_read,
.write = pci_generic_config_write,
- .add_bus = pci_subdev_regulators_add_bus,
- .remove_bus = pci_subdev_regulators_remove_bus,
};
static struct pci_ops brcm_pcie_ops32 = {
--
2.35.1
next prev parent reply other threads:[~2022-06-07 18:27 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-07 17:47 [PATCH AUTOSEL 5.18 01/68] iio: dummy: iio_simple_dummy: check the return value of kstrdup() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 02/68] staging: rtl8712: fix a potential memory leak in r871xu_drv_init() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 03/68] iio: st_sensors: Add a local lock for protecting odr Sasha Levin
2022-06-08 9:26 ` Jonathan Cameron
2022-06-09 13:56 ` Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 04/68] lkdtm/usercopy: Expand size of "out of frame" object Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 05/68] drivers: staging: rtl8723bs: Fix deadlock in rtw_surveydone_event_callback() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 06/68] drivers: staging: rtl8192bs: Fix deadlock in rtw_joinbss_event_prehandle() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 07/68] drivers: staging: rtl8192eu: Fix deadlock in rtw_joinbss_event_prehandle Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 08/68] tty: synclink_gt: Fix null-pointer-dereference in slgt_clean() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 09/68] tty: Fix a possible resource leak in icom_probe Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 10/68] thunderbolt: Use different lane for second DisplayPort tunnel Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 11/68] drivers: staging: rtl8192u: Fix deadlock in ieee80211_beacons_stop() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 12/68] drivers: staging: rtl8192e: Fix deadlock in rtllib_beacons_stop() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 13/68] USB: host: isp116x: check return value after calling platform_get_resource() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 14/68] drivers: tty: serial: Fix deadlock in sa1100_set_termios() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 15/68] drivers: usb: host: Fix deadlock in oxu_bus_suspend() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 16/68] USB: hcd-pci: Fully suspend across freeze/thaw cycle Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 17/68] char: xillybus: fix a refcount leak in cleanup_dev() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 18/68] sysrq: do not omit current cpu when showing backtrace of all active CPUs Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 19/68] usb: dwc2: gadget: don't reset gadget's driver->bus Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 20/68] usb: dwc3: host: Stop setting the ACPI companion Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 21/68] usb: dwc3: gadget: Only End Transfer for ep0 data phase Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 22/68] soundwire: qcom: adjust autoenumeration timeout Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 23/68] misc: rtsx: set NULL intfdata when probe fails Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 24/68] extcon: Fix extcon_get_extcon_dev() error handling Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 25/68] extcon: Modify extcon device to be created after driver data is set Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 26/68] clocksource/drivers/sp804: Avoid error on multiple instances Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 27/68] staging: rtl8723bs: Fix alignment to match open parenthesis Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 28/68] staging: rtl8712: fix uninit-value in usb_read8() and friends Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 29/68] staging: rtl8712: fix uninit-value in r871xu_drv_init() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 30/68] serial: msm_serial: disable interrupts in __msm_console_write() Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 31/68] accessiblity: speakup: Add missing misc_deregister in softsynth_probe Sasha Levin
2022-06-09 12:28 ` Samuel Thibault
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 32/68] kernfs: Separate kernfs_pr_cont_buf and rename_lock Sasha Levin
2022-06-07 17:47 ` [PATCH AUTOSEL 5.18 33/68] watchdog: wdat_wdt: Stop watchdog when rebooting the system Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 34/68] ksmbd: smbd: fix connection dropped issue Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 35/68] md: don't unregister sync_thread with reconfig_mutex held Sasha Levin
2022-06-08 8:43 ` [dm-devel] " Guoqing Jiang
2022-06-12 17:53 ` Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 36/68] md: protect md_unregister_thread from reentrancy Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 37/68] ASoC: SOF: amd: Fixed Build error Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 38/68] scsi: myrb: Fix up null pointer access on myrb_cleanup() Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 39/68] ASoC: rt5640: Do not manipulate pin "Platform Clock" if the "Platform Clock" is not in the DAPM Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 40/68] Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process" Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 41/68] ceph: allow ceph.dir.rctime xattr to be updatable Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 42/68] ceph: flush the mdlog for filesystem sync Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 43/68] ceph: fix possible deadlock when holding Fwb to get inline_data Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 44/68] net, neigh: Set lower cap for neigh_managed_work rearming Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 45/68] drm/amd/display: Check if modulo is 0 before dividing Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 46/68] drm/amd/display: Check zero planes for OTG disable W/A on clock change Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 47/68] drm/radeon: fix a possible null pointer dereference Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 48/68] drm/amd/pm: fix a potential gpu_metrics_table memory leak Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 49/68] drm/amd/pm: Fix missing thermal throttler status Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 50/68] drm/amd/pm: correct the metrics version for SMU 11.0.11/12/13 Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 51/68] um: line: Use separate IRQs per line Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 52/68] modpost: fix undefined behavior of is_arm_mapping_symbol() Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 53/68] objtool: Mark __ubsan_handle_builtin_unreachable() as noreturn Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 54/68] x86/cpu: Elide KCSAN for cpu_has() and friends Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 55/68] jump_label,noinstr: Avoid instrumentation for JUMP_LABEL=n builds Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 56/68] nbd: call genl_unregister_family() first in nbd_cleanup() Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 57/68] nbd: fix race between nbd_alloc_config() and module removal Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 58/68] nbd: fix io hung while disconnecting device Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 59/68] fs/ntfs3: Fix invalid free in log_replay Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 60/68] Revert "PCI: brcmstb: Do not turn off WOL regulators on suspend" Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 61/68] Revert "PCI: brcmstb: Add control of subdevice voltage regulators" Sasha Levin
2022-06-07 17:48 ` Sasha Levin [this message]
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 63/68] Revert "PCI: brcmstb: Split brcm_pcie_setup() into two funcs" Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 64/68] cifs: fix potential deadlock in direct reclaim Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 65/68] s390/gmap: voluntarily schedule during key setting Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 66/68] cifs: version operations for smb20 unneeded when legacy support disabled Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 67/68] drm/amd/pm: use bitmap_{from,to}_arr32 where appropriate Sasha Levin
2022-06-07 17:48 ` [PATCH AUTOSEL 5.18 68/68] nodemask: Fix return values to be unsigned Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220607174846.477972-62-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=bhelgaas@google.com \
--cc=f.fainelli@gmail.com \
--cc=jim2101024@gmail.com \
--cc=kibi@debian.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=lpieralisi@kernel.org \
--cc=nsaenz@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).