mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-05 00:20:32 +00:00
platform/x86: p2sb: Don't init until unassigned resources have been assigned
[ Upstream commit 2c6370e660
]
The P2SB could get an invalid BAR from the BIOS, and that won't be fixed
up until pcibios_assign_resources(), which is an fs_initcall().
- Move p2sb_fs_init() to an fs_initcall_sync(). This is still early
enough to avoid a race with any dependent drivers.
- Add a check for IORESOURCE_UNSET in p2sb_valid_resource() to catch
unset BARs going forward.
- Return error values from p2sb_fs_init() so that the 'initcall_debug'
cmdline arg provides useful data.
Signed-off-by: Ben Fradella <bfradell@netapp.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Tested-by: Klara Modin <klarasmodin@gmail.com>
Reviewed-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Link: https://lore.kernel.org/r/20240509164905.41016-1-bcfradella@proton.me
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
594ae3795e
commit
b9e25964b5
1 changed files with 15 additions and 14 deletions
|
@ -56,12 +56,9 @@ static int p2sb_get_devfn(unsigned int *devfn)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool p2sb_valid_resource(struct resource *res)
|
static bool p2sb_valid_resource(const struct resource *res)
|
||||||
{
|
{
|
||||||
if (res->flags)
|
return res->flags & ~IORESOURCE_UNSET;
|
||||||
return true;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Copy resource from the first BAR of the device in question */
|
/* Copy resource from the first BAR of the device in question */
|
||||||
|
@ -220,16 +217,20 @@ EXPORT_SYMBOL_GPL(p2sb_bar);
|
||||||
|
|
||||||
static int __init p2sb_fs_init(void)
|
static int __init p2sb_fs_init(void)
|
||||||
{
|
{
|
||||||
p2sb_cache_resources();
|
return p2sb_cache_resources();
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* pci_rescan_remove_lock to avoid access to unhidden P2SB devices can
|
* pci_rescan_remove_lock() can not be locked in sysfs PCI bus rescan path
|
||||||
* not be locked in sysfs pci bus rescan path because of deadlock. To
|
* because of deadlock. To avoid the deadlock, access P2SB devices with the lock
|
||||||
* avoid the deadlock, access to P2SB devices with the lock at an early
|
* at an early step in kernel initialization and cache required resources.
|
||||||
* step in kernel initialization and cache required resources. This
|
*
|
||||||
* should happen after subsys_initcall which initializes PCI subsystem
|
* We want to run as early as possible. If the P2SB was assigned a bad BAR,
|
||||||
* and before device_initcall which requires P2SB resources.
|
* we'll need to wait on pcibios_assign_resources() to fix it. So, our list of
|
||||||
|
* initcall dependencies looks something like this:
|
||||||
|
*
|
||||||
|
* ...
|
||||||
|
* subsys_initcall (pci_subsys_init)
|
||||||
|
* fs_initcall (pcibios_assign_resources)
|
||||||
*/
|
*/
|
||||||
fs_initcall(p2sb_fs_init);
|
fs_initcall_sync(p2sb_fs_init);
|
||||||
|
|
Loading…
Reference in a new issue