FAILED: patch "[PATCH] PCI: Skip Resizable BAR restore on read error" failed to apply to 6.18-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x ee7471fe968d210939be9046089a924cd23c8c3b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071350-unfold-lather-d66a@gregkh' --subject-prefix 'PATCH 6.18.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ee7471fe968d210939be9046089a924cd23c8c3b Mon Sep 17 00:00:00 2001
From: Marco Nenciarini <[email protected]>
Date: Fri, 17 Apr 2026 15:24:36 +0200
Subject: [PATCH] PCI: Skip Resizable BAR restore on read error
pci_restore_rebar_state() uses the Resizable BAR Control register to decide how many BARs to restore (nbars) and which BAR each iteration addresses (bar_idx).
When a device does not respond, config reads typically return PCI_ERROR_RESPONSE (~0). Both fields are 3 bits wide, so nbars and bar_idx both evaluate to 7, past the spec's valid ranges for both fields. pci_resource_n() then returns an unrelated resource slot, whose size is used to derive a nonsensical value written back to the Resizable BAR Control register.
Bail out if any Resizable BAR Control read returns PCI_ERROR_RESPONSE. No further BARs are touched, which is safe because a config read that returns PCI_ERROR_RESPONSE indicates the device is unreachable and restoration is pointless.
drivers/pci/rebar.c +6 -0
@@ -231,6 +231,9 @@ void pci_restore_rebar_state(struct pci_dev *pdev)return ;pci_read_config_dword (pdev, pos +PCI_REBAR_CTRL , &ctrl); +if (PCI_POSSIBLE_ERROR (ctrl)) +return ; + nbars =FIELD_GET (PCI_REBAR_CTRL_NBAR_MASK , ctrl);for (i =0 ; i < nbars; i++, pos +=8 ) {
@@ -238,6 +241,9 @@ void pci_restore_rebar_state(struct pci_dev *pdev)int bar_idx, size;pci_read_config_dword (pdev, pos +PCI_REBAR_CTRL , &ctrl); +if (PCI_POSSIBLE_ERROR (ctrl)) +return ; + bar_idx = ctrl &PCI_REBAR_CTRL_BAR_IDX ; res =pci_resource_n (pdev, bar_idx); size =pci_rebar_bytes_to_size (resource_size (res));
Sasha Levin
maintainerPATCH 1/8 PCI/IOV: Adjust ->barsz[] when changing BAR size
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 4687b3315a3f76647746f5b7f92684cf1045b085 ]
pci_rebar_set_size() adjusts BAR size for both normal and IOV BARs. The struct pci_sriov keeps a cached copy of BAR size in ->barsz[] which is not adjusted by pci_rebar_set_size() but by pci_iov_resource_set_size(). pci_iov_resource_set_size() is called also from pci_resize_resource_set_size().
The current arrangement is problematic once BAR resize algorithm starts to roll back changes properly in case of a failure. The normal resource fitting algorithm rolls back resource size using the struct pci_dev_resource easily but also calling pci_resize_resource_set_size() or pci_iov_resource_set_size() to roll back BAR size would be an extra burden, whereas combining ->barsz[] update with pci_rebar_set_size() naturally rolls back it when restoring the old BAR size on a different layer of the BAR resize operation.
Thus, rework pci_rebar_set_size() to also update ->barsz[].
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/pci/iov.c | 15 ++++----------- drivers/pci/pci.c | 4 ++++ drivers/pci/pci.h | 5 ++--- drivers/pci/setup-res.c | 10 ++++------ 4 files changed, 14 insertions(+), 20 deletions(-)
drivers/pci/iov.c +4 -11
@@ -158,8 +158,7 @@ resource_size_t pci_iov_resource_size(struct pci_dev *dev, int resno)return dev->sriov->barsz[pci_resource_num_to_vf_bar (resno)]; } -void pci_iov_resource_set_size (struct pci_dev *dev,int resno, -resource_size_t size) +void pci_iov_resource_set_size (struct pci_dev *dev,int resno,int size) {if (!pci_resource_is_iov (resno)) { pci_warn(dev, "%s is not an IOV resource\n",
@@ -167,7 +166,8 @@ void pci_iov_resource_set_size(struct pci_dev *dev, int resno,return ; } - dev->sriov->barsz[pci_resource_num_to_vf_bar (resno)] = size; + resno =pci_resource_num_to_vf_bar (resno); + dev->sriov->barsz[resno] =pci_rebar_size_to_bytes (size); }bool pci_iov_is_memory_decoding_enabled (struct pci_dev *dev)
@@ -1339,7 +1339,6 @@ EXPORT_SYMBOL_GPL(pci_sriov_configure_simple);int pci_iov_vf_bar_set_size (struct pci_dev *dev,int resno,int size) {u32 sizes; -int ret;if (!pci_resource_is_iov (resno))return -EINVAL ;
@@ -1354,13 +1353,7 @@ int pci_iov_vf_bar_set_size(struct pci_dev *dev, int resno, int size)if (!(sizes &BIT (size)))return -EINVAL ; - ret =pci_rebar_set_size (dev, resno, size); -if (ret) -return ret; - -pci_iov_resource_set_size (dev, resno,pci_rebar_size_to_bytes (size)); - -return 0 ; +return pci_rebar_set_size (dev, resno, size); }EXPORT_SYMBOL_GPL (pci_iov_vf_bar_set_size);
drivers/pci/pci.c +4 -0
@@ -3800,6 +3800,10 @@ int pci_rebar_set_size(struct pci_dev *pdev, int bar, int size) ctrl &= ~PCI_REBAR_CTRL_BAR_SIZE ; ctrl |=FIELD_PREP (PCI_REBAR_CTRL_BAR_SIZE , size);pci_write_config_dword (pdev, pos +PCI_REBAR_CTRL , ctrl); + +if (pci_resource_is_iov (bar)) +pci_iov_resource_set_size (pdev, bar, size); +return 0 ; }
drivers/pci/pci.h +2 -3
@@ -826,8 +826,7 @@ void pci_iov_update_resource(struct pci_dev *dev, int resno);resource_size_t pci_sriov_resource_alignment (struct pci_dev *dev,int resno);void pci_restore_iov_state (struct pci_dev *dev);int pci_iov_bus_range (struct pci_bus *bus); -void pci_iov_resource_set_size (struct pci_dev *dev,int resno, -resource_size_t size); +void pci_iov_resource_set_size (struct pci_dev *dev,int resno,int size);bool pci_iov_is_memory_decoding_enabled (struct pci_dev *dev);static inline u16 pci_iov_vf_rebar_cap (struct pci_dev *dev) {
@@ -869,7 +868,7 @@ static inline int pci_iov_bus_range(struct pci_bus *bus)return 0 ; }static inline void pci_iov_resource_set_size (struct pci_dev *dev,int resno, -resource_size_t size) { } +int size) { }static inline bool pci_iov_is_memory_decoding_enabled (struct pci_dev *dev) {return false;
drivers/pci/setup-res.c +4 -6
@@ -452,12 +452,10 @@ static void pci_resize_resource_set_size(struct pci_dev *dev, int resno,resource_size_t res_size =pci_rebar_size_to_bytes (size);struct resource *res =pci_resource_n (dev, resno); -if (!pci_resource_is_iov (resno)) { -resource_set_size (res, res_size); - }else { -resource_set_size (res, res_size *pci_sriov_get_totalvfs (dev)); -pci_iov_resource_set_size (dev, resno, res_size); - } +if (pci_resource_is_iov (resno)) + res_size *=pci_sriov_get_totalvfs (dev); + +resource_set_size (res, res_size); }int pci_resize_resource (struct pci_dev *dev,int resno,int size)
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/8 PCI: Change pci_dev variable from 'bridge' to 'dev'
From: Ilpo Järvinen <[email protected]>
[ Upstream commit 34c702ea0497e092a487eacdf28a037f43e3e39f ]
Upcoming fix to BAR resize will store also device BAR resource in the saved list. Change the pci_dev variable in the loop from 'bridge' to 'dev' as the former would be misleading with non-bridges in the list.
This is in a separate change to reduce churn in the upcoming BAR resize fix.
While it appears that the logic in the loop doing pci_setup_bridge() is altered as 'bridge' variable is no longer updated, a bridge should never appear more than once in the saved list so the check can only match to the first entry. As such, the code with two distinct pci_dev variables better represents the intention of the check compared with the old code where bridge variable was reused for a different purpose.
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/pci/setup-bus.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/pci/setup-bus.c +9 -8
@@ -2431,12 +2431,13 @@ int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *res) }list_for_each_entry (dev_res, &saved, list) { +struct pci_dev *dev = dev_res->dev; +/* Skip the bridge we just assigned resources for */ -if (bridge == dev_res->dev) +if (bridge == dev)continue ; - bridge = dev_res->dev; -pci_setup_bridge (bridge->subordinate); +pci_setup_bridge (dev->subordinate); }free_list (&saved);
@@ -2452,19 +2453,19 @@ int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *res)/* Revert to the old configuration */ list_for_each_entry (dev_res, &saved, list) {struct resource *res = dev_res->res; +struct pci_dev *dev = dev_res->dev; - bridge = dev_res->dev; - i =pci_resource_num (bridge, res); + i =pci_resource_num (dev, res);if (res->parent) {release_child_resources (res); -pci_release_resource (bridge, i); +pci_release_resource (dev, i); }restore_dev_resource (dev_res); -pci_claim_resource (bridge, i); -pci_setup_bridge (bridge->subordinate); +pci_claim_resource (dev, i); +pci_setup_bridge (dev->subordinate); }free_list (&saved);up_read (&pci_bus_sem);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/8 PCI: Try BAR resize even when no window was released
In reply to Sasha LevinFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit 121d3e9e4b217f2f23715901fb15c6a3ca2bab46 ]
Usually, resizing BARs requires releasing bridge windows in order to resize it to fit a larger BAR into the window. This is not always the case, however, FW could have made the window large enough to accommodate larger BAR as is, or the user might prefer to shrink a BAR to make more space for another Resizable BAR.
Thus, replace the check that requires that at least one bridge window was released with a check that simply ensures bridge is not NULL.
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/pci/setup-bus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/setup-bus.c +2 -4
@@ -2376,7 +2376,7 @@ int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *res) {unsigned long type = res->flags;struct pci_dev_resource *dev_res; -struct pci_dev *bridge; +struct pci_dev *bridge =NULL ;LIST_HEAD (saved);LIST_HEAD (added);LIST_HEAD (failed);
@@ -2411,10 +2411,8 @@ int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *res) bus = bus->parent; } -if (list_empty (&saved)) { -up_read (&pci_bus_sem); +if (!bridge)return -ENOENT ; - }__pci_bus_size_bridges (bridge->subordinate, &added);__pci_bridge_assign_resources (bridge, &added, &failed);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 4/8 PCI: Free saved list without holding pci_bus_sem
In reply to Sasha LevinFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit 1d8a0506f69895b7cfd9d5c4546761c508231a8a ]
Freeing the saved list does not require holding pci_bus_sem, so the critical section can be made shorter.
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/pci/setup-bus.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/setup-bus.c +1 -1
@@ -2465,8 +2465,8 @@ int pbus_reassign_bridge_resources(struct pci_bus *bus, struct resource *res)pci_claim_resource (dev, i);pci_setup_bridge (dev->subordinate); } -free_list (&saved);up_read (&pci_bus_sem); +free_list (&saved);return ret; }
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 5/8 PCI: Fix restoring BARs on BAR resize rollback path
In reply to Sasha LevinFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit 337b1b566db087347194e4543ddfdfa5645275cc ]
BAR resize operation is implemented in the pci_resize_resource() and pbus_reassign_bridge_resources() functions. pci_resize_resource() can be called either from __resource_resize_store() from sysfs or directly by the driver for the Endpoint Device.
The pci_resize_resource() requires that caller has released the device resources that share the bridge window with the BAR to be resized as otherwise the bridge window is pinned in place and cannot be changed.
pbus_reassign_bridge_resources() rolls back resources if the resize operation fails, but rollback is performed only for the bridge windows. Because releasing the device resources are done by the caller of the BAR resize interface, these functions performing the BAR resize do not have access to the device resources as they were before the resize.
pbus_reassign_bridge_resources() could try __pci_bridge_assign_resources() after rolling back the bridge windows as they were, however, it will not guarantee the resource are assigned due to differences in how FW and the kernel assign the resources (alignment of the start address and tail).
To perform rollback robustly, the BAR resize interface has to be altered to also release the device resources that share the bridge window with the BAR to be resized.
Also, remove restoring from the entries failed list as saved list should now contain both the bridge windows and device resources so the extra restore is duplicated work.
Some drivers (currently only amdgpu) want to prevent releasing some resources. Add exclude_bars param to pci_resize_resource() and make amdgpu pass its register BAR (BAR 2 or 5), which should never be released during resize operation. Normally 64-bit prefetchable resources do not share a bridge window with the 32-bit only register BAR, but there are various fallbacks in the resource assignment logic which may make the resources share the bridge window in rare cases.
This change (together with the driver side changes) is to counter the resource releases that had to be done to prevent resource tree corruption in the ("PCI: Release assigned resource before restoring them") change. As such, it likely restores functionality in cases where device resources were released to avoid resource tree conflicts which appeared to be "working" when such conflicts were not correctly detected by the kernel.
[bhelgaas: squash amdgpu BAR selection from
https: //lore.kernel.org/r/[email protected]]
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 2 +- drivers/gpu/drm/xe/xe_vram.c | 2 +- drivers/pci/pci-sysfs.c | 17 +--- drivers/pci/pci.h | 4 +- drivers/pci/setup-bus.c | 100 +++++++++++++++----- drivers/pci/setup-res.c | 23 ++--- include/linux/pci.h | 3 +- 8 files changed, 93 insertions(+), 62 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -1
@@ -1736,7 +1736,9 @@ int amdgpu_device_resize_fb_bar(struct amdgpu_device *adev)pci_release_resource (adev->pdev,0 ); - r =pci_resize_resource (adev->pdev,0 , rbar_size); + r =pci_resize_resource (adev->pdev,0 , rbar_size, + (adev->asic_type >=CHIP_BONAIRE ) ?1 <<5 + :1 <<2 );if (r == -ENOSPC )dev_info (adev->dev,"Not enough PCI address space for a large BAR." );
drivers/gpu/drm/i915/gt/intel_region_lmem.c +1 -1
@@ -37,7 +37,7 @@ _resize_bar(struct drm_i915_private *i915, int resno, resource_size_t size)_release_bars (pdev); - ret =pci_resize_resource (pdev, resno, bar_size); + ret =pci_resize_resource (pdev, resno, bar_size,0 );if (ret) {drm_info (&i915->drm,"Failed to resize BAR%d to %dM (%pe)\n" , resno,1 << bar_size,ERR_PTR (ret));
drivers/gpu/drm/xe/xe_vram.c +1 -1
@@ -56,7 +56,7 @@ static void resize_bar(struct xe_device *xe, int resno, resource_size_t size)release_bars (pdev); - ret =pci_resize_resource (pdev, resno, bar_size); + ret =pci_resize_resource (pdev, resno, bar_size,0 );if (ret) {drm_info (&xe->drm,"Failed to resize BAR%d to %dM (%pe). Consider enabling 'Resizable BAR' support in your BIOS\n" , resno,1 << bar_size,ERR_PTR (ret));
drivers/pci/pci-sysfs.c +2 -15
@@ -1571,18 +1571,13 @@ static ssize_t __resource_resize_store(struct device *dev, int n, {struct pci_dev *pdev =to_pci_dev (dev);struct pci_bus *bus = pdev->bus; -struct resource *b_win, *res;unsigned long size; -int ret, i; +int ret;u16 cmd;if (kstrtoul (buf,0 , &size) <0 )return -EINVAL ; - b_win =pbus_select_window (bus,pci_resource_n (pdev, n)); -if (!b_win) -return -EINVAL ; -device_lock (dev);if (dev->driver ||pci_num_vf (pdev)) { ret = -EBUSY ;
@@ -1604,15 +1599,7 @@ static ssize_t __resource_resize_store(struct device *dev, int n,pci_remove_resource_files (pdev); -pci_dev_for_each_resource (pdev, res, i) { -if (i >=PCI_BRIDGE_RESOURCES ) -break ; - -if (b_win ==pbus_select_window (bus, res)) -pci_release_resource (pdev, i); - } - - ret =pci_resize_resource (pdev, n, size); + ret =pci_resize_resource (pdev, n, size,0 );pci_assign_unassigned_bus_resources (bus);
drivers/pci/pci.h +3 -1
@@ -439,8 +439,10 @@ enum pci_bar_type {struct device *pci_get_host_bridge_device (struct pci_dev *dev);void pci_put_host_bridge_device (struct device *dev); +void pci_resize_resource_set_size (struct pci_dev *dev,int resno,int size); +int pci_do_resource_release_and_resize (struct pci_dev *dev,int resno,int size, +int exclude_bars);unsigned int pci_rescan_bus_bridge_resize (struct pci_dev *bridge); -int pbus_reassign_bridge_resources (struct pci_bus *bus,struct resource *res);int __must_check pci_reassign_resource (struct pci_dev *dev,int i,resource_size_t add_size,resource_size_t align);int pci_configure_extended_tags (struct pci_dev *dev,void *ign);
drivers/pci/setup-bus.c +75 -25
149 lines not on this page · raw message
drivers/pci/setup-res.c +6 -17
@@ -446,8 +446,7 @@ static bool pci_resize_is_memory_decoding_enabled(struct pci_dev *dev,return cmd &PCI_COMMAND_MEMORY ; } -static void pci_resize_resource_set_size (struct pci_dev *dev,int resno, -int size) +void pci_resize_resource_set_size (struct pci_dev *dev,int resno,int size) {resource_size_t res_size =pci_rebar_size_to_bytes (size);struct resource *res =pci_resource_n (dev, resno);
@@ -458,9 +457,9 @@ static void pci_resize_resource_set_size(struct pci_dev *dev, int resno,resource_set_size (res, res_size); } -int pci_resize_resource (struct pci_dev *dev,int resno,int size) +int pci_resize_resource (struct pci_dev *dev,int resno,int size, +int exclude_bars) { -struct resource *res =pci_resource_n (dev, resno);struct pci_host_bridge *host;int old, ret;u32 sizes;
@@ -470,10 +469,6 @@ int pci_resize_resource(struct pci_dev *dev, int resno, int size)if (host->preserve_config)return -ENOTSUPP ; -/* Make sure the resource isn't assigned before resizing it. */ -if (!(res->flags &IORESOURCE_UNSET )) -return -EBUSY ; -if (pci_resize_is_memory_decoding_enabled (dev, resno))return -EBUSY ;
@@ -492,19 +487,13 @@ int pci_resize_resource(struct pci_dev *dev, int resno, int size)if (ret)return ret; -pci_resize_resource_set_size (dev, resno, size); - -/* Check if the new config works by trying to assign everything. */ -if (dev->bus->self) { - ret =pbus_reassign_bridge_resources (dev->bus, res); -if (ret) - goto error_resize; - } + ret =pci_do_resource_release_and_resize (dev, resno, size, exclude_bars); +if (ret) + goto error_resize;return 0 ; error_resize:pci_rebar_set_size (dev, resno, old); -pci_resize_resource_set_size (dev, resno, old);return ret; }EXPORT_SYMBOL (pci_resize_resource);
include/linux/pci.h +2 -1
@@ -1425,7 +1425,8 @@ static inline int pci_rebar_bytes_to_size(u64 bytes) }u32 pci_rebar_get_possible_sizes (struct pci_dev *pdev,int bar); -int __must_check pci_resize_resource (struct pci_dev *dev,int i,int size); +int __must_check pci_resize_resource (struct pci_dev *dev,int i,int size, +int exclude_bars);int pci_select_bars (struct pci_dev *dev,unsigned long flags);bool pci_device_is_present (struct pci_dev *pdev);void pci_ignore_hotplug (struct pci_dev *dev);
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 6/8 PCI: Add kerneldoc for pci_resize_resource()
In reply to Sasha LevinFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit d787018e2dfdc4c1331538e7a8717690d1b7c9b3 ]
As pci_resize_resource() is meant to be used also outside of PCI core, document the interface with kerneldoc.
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- drivers/pci/setup-res.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/pci/setup-res.c +20 -0
@@ -457,6 +457,26 @@ void pci_resize_resource_set_size(struct pci_dev *dev, int resno, int size)resource_set_size (res, res_size); } +/** +* pci_resize_resource - reconfigure a Resizable BAR and resources +* @dev: the PCI device +* @resno: index of the BAR to be resized +* @size: new size as defined in the spec (0=1MB, 31=128TB) +* @exclude_bars: a mask of BARs that should not be released +* +* Reconfigure @resno to @size and re-run resource assignment algorithm +* with the new size. +* +* Prior to resize, release @dev resources that share a bridge window with +* @resno. This unpins the bridge window resource to allow changing it. +* +* The caller may prevent releasing a particular BAR by providing +* @exclude_bars mask, but this may result in the resize operation failing +* due to insufficient space. +* +* Return: 0 on success, or negative on error. In case of an error, the +* resources are restored to their original places. +*/ int pci_resize_resource (struct pci_dev *dev,int resno,int size,int exclude_bars) {
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 7/8 PCI: Move Resizable BAR code to rebar.c
In reply to Sasha LevinFrom: Ilpo Järvinen <[email protected]>
[ Upstream commit 9f71938cd77f32a448f40a288e409eca60e55486 ]
For lack of a better place to put it, Resizable BAR code has been placed inside pci.c and setup-res.c that do not use it for anything. Upcoming changes are going to add more Resizable BAR related functions, increasing the code size.
As pci.c is huge as is, move the Resizable BAR related code and the BAR resize code from setup-res.c to rebar.c.
Stable-dep-of: ee7471fe968d ("PCI: Skip Resizable BAR restore on read error")
--- Documentation/driver-api/pci/pci.rst | 3 + drivers/pci/Makefile | 2 +- drivers/pci/pci.c | 149 ---------------- drivers/pci/pci.h | 1 + drivers/pci/rebar.c | 247 +++++++++++++++++++++++++++ drivers/pci/setup-res.c | 85 --------- 6 files changed, 252 insertions(+), 235 deletions(-) create mode 100644 drivers/pci/rebar.c
Documentation/driver-api/pci/pci.rst +3 -0
@@ -37,6 +37,9 @@ PCI Support Library .. kernel-doc:: drivers/pci/slot.c :export: +.. kernel-doc:: drivers/pci/rebar.c + :export: + .. kernel-doc:: drivers/pci/rom.c :export:
drivers/pci/Makefile +1 -1
@@ -4,7 +4,7 @@ obj-$(CONFIG_PCI) += access.o bus.o probe.o host-bridge.o \ remove.o pci.o pci-driver.o search.o \ - rom.o setup-res.o irq.o vpd.o \ + rebar.o rom.o setup-res.o irq.o vpd.o \ setup-bus.o vc.o mmap.o devres.o obj-$(CONFIG_PCI) += msi/
drivers/pci/pci.c +0 -149
161 lines not on this page · raw message
drivers/pci/pci.h +1 -0
@@ -1042,6 +1042,7 @@ static inline int acpi_get_rc_resources(struct device *dev, const char *hid,#endif void pci_rebar_init (struct pci_dev *pdev); +void pci_restore_rebar_state (struct pci_dev *pdev);int pci_rebar_get_current_size (struct pci_dev *pdev,int bar);int pci_rebar_set_size (struct pci_dev *pdev,int bar,int size);static inline u64 pci_rebar_size_to_bytes (int size)
drivers/pci/rebar.c new file +247 -0
247 lines not on this page · raw message
drivers/pci/setup-res.c +0 -85
91 lines not on this page · raw message
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 8/8 PCI: Skip Resizable BAR restore on read error
In reply to Sasha LevinFrom: Marco Nenciarini <[email protected]>
[ Upstream commit ee7471fe968d210939be9046089a924cd23c8c3b ]
pci_restore_rebar_state() uses the Resizable BAR Control register to decide how many BARs to restore (nbars) and which BAR each iteration addresses (bar_idx).
When a device does not respond, config reads typically return PCI_ERROR_RESPONSE (~0). Both fields are 3 bits wide, so nbars and bar_idx both evaluate to 7, past the spec's valid ranges for both fields. pci_resource_n() then returns an unrelated resource slot, whose size is used to derive a nonsensical value written back to the Resizable BAR Control register.
Bail out if any Resizable BAR Control read returns PCI_ERROR_RESPONSE. No further BARs are touched, which is safe because a config read that returns PCI_ERROR_RESPONSE indicates the device is unreachable and restoration is pointless.
--- drivers/pci/rebar.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/pci/rebar.c +6 -0
@@ -145,6 +145,9 @@ void pci_restore_rebar_state(struct pci_dev *pdev)return ;pci_read_config_dword (pdev, pos +PCI_REBAR_CTRL , &ctrl); +if (PCI_POSSIBLE_ERROR (ctrl)) +return ; + nbars =FIELD_GET (PCI_REBAR_CTRL_NBAR_MASK , ctrl);for (i =0 ; i < nbars; i++, pos +=8 ) {
@@ -152,6 +155,9 @@ void pci_restore_rebar_state(struct pci_dev *pdev)int bar_idx, size;pci_read_config_dword (pdev, pos +PCI_REBAR_CTRL , &ctrl); +if (PCI_POSSIBLE_ERROR (ctrl)) +return ; + bar_idx = ctrl &PCI_REBAR_CTRL_BAR_IDX ; res =pci_resource_n (pdev, bar_idx); size =pci_rebar_bytes_to_size (resource_size (res));
Signature · 1 line
2.53.0