From 3a754ef2b6faa6a8074111d66320edbbd86b5384 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Apr 13 2024 09:55:59 +0000 Subject: Refresh patches.kabi/PCI-Add-locking-to-RMW-PCI-Express-Capability-Regist.patch. Drop a bogus hunk. It was introduced by mistake. Fixes: acf0d9920aee --- diff --git a/patches.kabi/PCI-Add-locking-to-RMW-PCI-Express-Capability-Regist.patch b/patches.kabi/PCI-Add-locking-to-RMW-PCI-Express-Capability-Regist.patch index 08188fb..fb8161f 100644 --- a/patches.kabi/PCI-Add-locking-to-RMW-PCI-Express-Capability-Regist.patch +++ b/patches.kabi/PCI-Add-locking-to-RMW-PCI-Express-Capability-Regist.patch @@ -18,8 +18,8 @@ exported function. Signed-off-by: Jiri Slaby --- drivers/pci/access.c | 27 +++++++++++++++++++++++++++ - include/linux/pci.h | 35 ++++++----------------------------- - 2 files changed, 33 insertions(+), 29 deletions(-) + include/linux/pci.h | 33 +++++---------------------------- + 2 files changed, 32 insertions(+), 28 deletions(-) --- a/drivers/pci/access.c +++ b/drivers/pci/access.c @@ -67,7 +67,7 @@ Signed-off-by: Jiri Slaby u32 saved_config_space[16]; /* Config space saved at suspend time */ struct hlist_head saved_cap_space; int rom_attr_enabled; /* Display of ROM attribute enabled? */ -@@ -516,11 +515,14 @@ struct pci_dev { +@@ -516,6 +515,9 @@ struct pci_dev { /* These methods index pci_reset_fn_methods[] */ u8 reset_methods[PCI_NUM_RESET_METHODS]; /* In priority order */ @@ -77,12 +77,6 @@ Signed-off-by: Jiri Slaby }; static inline struct pci_dev *pci_physfn(struct pci_dev *dev) - { --#ifdef CONFIG_PCI_IOV -+#ifdef CONFIG_PCI_IOe - if (dev->is_virtfn) - dev = dev->physfn; - #endif @@ -1212,6 +1214,8 @@ int pcie_capability_read_word(struct pci int pcie_capability_read_dword(struct pci_dev *dev, int pos, u32 *val); int pcie_capability_write_word(struct pci_dev *dev, int pos, u16 val);