Skip to contentSkip to conversation

Guard pci_create_sysfs_dev_files with atomic value

PATCH In review Korneliusz Osmenda 2 participants 2 messages Aug 29, 2022 – Oct 6, 2022 PCI

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Guard pci_create_sysfs_dev_files with atomic value

On Gateworks Ventana there is a number of PCI devices and:
- imx6_pcie_probe takes longer than start of late init
- pci_sysfs_init sets up flag sysfs_initialized
- pci_sysfs_init initializes already found devices
- imx6_pcie_probe tries to reinitialize device

---
 drivers/pci/pci-sysfs.c | 6 ++++++
 include/linux/pci.h     | 2 ++
 2 files changed, 8 insertions(+)
drivers/pci/pci-sysfs.c +6 -0
index fc804e08e3cb..a6648239e235 100644
@@ -1378,6 +1378,9 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
 	if (!sysfs_initialized)
 		return -EACCES;
 
+	if (atomic_cmpxchg(&pdev->sysfs_init_cnt,0,1) == 1)
+		return 0;		/* already added */
+
 	return pci_create_resource_files(pdev);
 }
 
@@ -1392,6 +1395,9 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev)
 	if (!sysfs_initialized)
 		return;
 
+	if (atomic_cmpxchg(&pdev->sysfs_init_cnt,1,0) == 0)
+		return;		/* already removed */
+
 	pci_remove_resource_files(pdev);
 }
 
include/linux/pci.h +2 -0
index 060af91bafcd..5477de2ef057 100644
@@ -465,6 +465,8 @@ struct pci_dev {
 	pci_dev_flags_t dev_flags;
 	atomic_t	enable_cnt;	/* pci_enable_device has been called */
 
+	atomic_t	sysfs_init_cnt;	/* pci_create_sysfs_dev_files has been called */
+
 	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? */
Signature · 1 line
2.36.1
#1 lore raw

Hi,

Am Montag, 29. August 2022, 21:14:43 CEST schrieb Korneliusz Osmenda:

Quoted 44 lines

On Gateworks Ventana there is a number of PCI devices and:
- imx6_pcie_probe takes longer than start of late init
- pci_sysfs_init sets up flag sysfs_initialized
- pci_sysfs_init initializes already found devices
- imx6_pcie_probe tries to reinitialize device

---
  drivers/pci/pci-sysfs.c | 6 ++++++
  include/linux/pci.h     | 2 ++
  2 files changed, 8 insertions(+)
drivers/pci/pci-sysfs.c +6 -0
index fc804e08e3cb..a6648239e235 100644
@@ -1378,6 +1378,9 @@ int __must_check pci_create_sysfs_dev_files(struct
 pci_dev *pdev)
  	if (!sysfs_initialized)
  		return -EACCES;
 
+	if (atomic_cmpxchg(&pdev->sysfs_init_cnt,0,1) == 1)
+		return 0;		/* already added */
+
  	return pci_create_resource_files(pdev);
  }
@@ -1392,6 +1395,9 @@ void pci_remove_sysfs_dev_files(struct pci_dev *pdev)
  	if (!sysfs_initialized)
  		return;
 
+	if (atomic_cmpxchg(&pdev->sysfs_init_cnt,1,0) == 0)
+		return;		/* already removed */
+
  	pci_remove_resource_files(pdev);
  }
 
include/linux/pci.h +0 -0
index 060af91bafcd..5477de2ef057 100644

include/linux/pci.h struct pci_dev { · line 466

Quoted 2 lines
include/linux/pci.h +0 -0
@@ -465,6 +465,8 @@ struct pci_dev {
  	pci_dev_flags_t dev_flags;
  	atomic_t	enable_cnt;	/* pci_enable_device has been 

called */

include/linux/pci.h struct pci_dev { · line 467

Quoted 2 lines
include/linux/pci.h +1 -0
+	atomic_t	sysfs_init_cnt;	/* pci_create_sysfs_dev_files has 

been called */

include/linux/pci.h struct pci_dev { · line 469

Quoted 2 lines
include/linux/pci.h +1 -0
+
  	u32		saved_config_space[16]; /* Config space saved 

at suspend time */

include/linux/pci.h struct pci_dev { · line 471

Quoted 2 lines
include/linux/pci.h +0 -0
  	struct hlist_head saved_cap_space;
  	int		rom_attr_enabled;	/* Display of ROM 

attribute enabled? */

Is there any feedback here? I'm hitting the same issue on TQMa6x+MBa6x. Having this patch applied my PCIe device using several bridges is detected fine.

root@tqma6-common:~# lspci
00:00.0 PCI bridge: Synopsys, Inc. DWC_usb3 / PCIe bridge (rev 01)
01:00.0 PCI bridge: Pericom Semiconductor Device a303 (rev 03)
02:01.0 PCI bridge: Pericom Semiconductor Device a303 (rev 03)
02:02.0 PCI bridge: Pericom Semiconductor Device a303 (rev 03)
03:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 
PCI Express Gigabit Ethernet Controller (rev 0c)
04:00.0 Ethernet controller: Realtek Semiconductor Co., Ltd. RTL8111/8168/8411 
PCI Express Gigabit Ethernet Controller (rev 0c)
root@tqma6-common:~# lspci -t
-[0000:00]---00.0-[01-ff]----00.0-[02-04]--+-01.0-[03]----00.0
                                           \-02.0-[04]----00.0

Best regards,
Alexander