device: Add device:: Msi_data pointer and struct msi_device_data

Create struct msi_device_data and add a pointer of that type to struct dev_msi_info, which is part of struct device. Provide an allocator function which can be invoked from the MSI interrupt allocation code pathes. Add a properties field to the data structure as a first member so the allocation size is not zero bytes. The field will be uses later on.

Thomas Gleixner committed 4 years ago

Commit 013bd8e1 parent 34fff623 files · +55 −0Browse files

Unified · Split

3 files

include/linux/device.h +5 −0
include/linux/msi.h +18 −0
kernel/irq/msi.c +32 −0

include/linux/device.h+5−0

 struct iommu_group;
 struct dev_pin_info;
 struct dev_iommu;
+struct msi_device_data;
 /**
  * struct subsys_interface - interfaces to device functions
 /**
  * struct dev_msi_info - Device data related to MSI
  * @domain:	The MSI interrupt domain associated to the device
+ * @data:	Pointer to MSI device data
  */
 struct dev_msi_info {
 #ifdef CONFIG_GENERIC_MSI_IRQ_DOMAIN
 	struct irq_domain	*domain;
 #endif
+#ifdef CONFIG_GENERIC_MSI_IRQ
+	struct msi_device_data	*data;
+#endif
 };
 /**

include/linux/msi.h+18−0

 	};
 };
+/**
+ * msi_device_data - MSI per device data
+ * @properties:		MSI properties which are interesting to drivers
+ */
+struct msi_device_data {
+	unsigned long			properties;
+};
+int msi_setup_device_data(struct device *dev);
 /* Helpers to hide struct msi_desc implementation details */
 #define msi_desc_to_dev(desc)		((desc)->dev)
 #define dev_to_msi_list(dev)		(&(dev)->msi_list)
 void pci_msi_unmask_irq(struct irq_data *data);
 #ifdef CONFIG_SYSFS
+int msi_device_populate_sysfs(struct device *dev);
+void msi_device_destroy_sysfs(struct device *dev);
 const struct attribute_group **msi_populate_sysfs(struct device *dev);
 void msi_destroy_sysfs(struct device *dev,
 		       const struct attribute_group **msi_irq_groups);
 #else
+static inline int msi_device_populate_sysfs(struct device *dev) { return 0; }
+static inline void msi_device_destroy_sysfs(struct device *dev) { }
 static inline const struct attribute_group **msi_populate_sysfs(struct device *dev)
 {
 	return NULL;
 	MSI_FLAG_MUST_REACTIVATE	= (1 << 5),
 	/* Is level-triggered capable, using two messages */
 	MSI_FLAG_LEVEL_CAPABLE		= (1 << 6),
+	/* Populate sysfs on alloc() and destroy it on free() */
+	MSI_FLAG_DEV_SYSFS		= (1 << 7),
 };
 int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask,

kernel/irq/msi.c+32−0

@@ -73,6 +73,38 @@ void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg) · 72 unmodified lines
73	}	73	}
74	EXPORT_SYMBOL_GPL(get_cached_msi_msg);	74	EXPORT_SYMBOL_GPL(get_cached_msi_msg);
75		75
		76	static void msi_device_data_release(struct device dev, void res)
		77	{
		78	WARN_ON_ONCE(!list_empty(&dev->msi_list));
		79	dev->msi.data = NULL;
		80	}
		81
		82	/**
		83	* msi_setup_device_data - Setup MSI device data
		84	* @dev: Device for which MSI device data should be set up
		85	*
		86	* Return: 0 on success, appropriate error code otherwise
		87	*
		88	* This can be called more than once for @dev. If the MSI device data is
		89	* already allocated the call succeeds. The allocated memory is
		90	* automatically released when the device is destroyed.
		91	*/
		92	int msi_setup_device_data(struct device *dev)
		93	{
		94	struct msi_device_data *md;
		95
		96	if (dev->msi.data)
		97	return 0;
		98
		99	md = devres_alloc(msi_device_data_release, sizeof(*md), GFP_KERNEL);
		100	if (!md)
		101	return -ENOMEM;
		102
		103	dev->msi.data = md;
		104	devres_add(dev, md);
		105	return 0;
		106	}
		107
76	#ifdef CONFIG_SYSFS	108	#ifdef CONFIG_SYSFS
77	static ssize_t msi_mode_show(struct device dev, struct device_attribute attr,	109	static ssize_t msi_mode_show(struct device dev, struct device_attribute attr,
78	char *buf)	110	char *buf)