aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

genirq/msi: Move descriptor list to struct msi_device_data

Browse Source 
It's only required when MSI is in use.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Michael Kelley <mikelley@microsoft.com>
Tested-by: Nishanth Menon <nm@ti.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20211206210747.650487479@linutronix.de
This commit is contained in:
Thomas Gleixner
2021-12-06 23:51:04 +01:00
parent 1900c962e2
commit 125282cd4f
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/base/core.c
View File

@@ -2874,9 +2874,6 @@ void device_initialize(struct device *dev)
INIT_LIST_HEAD(&dev->devres_head); INIT_LIST_HEAD(&dev->devres_head);
device_pm_init(dev); device_pm_init(dev);
set_dev_node(dev, NUMA_NO_NODE); set_dev_node(dev, NUMA_NO_NODE);
#ifdef CONFIG_GENERIC_MSI_IRQ
INIT_LIST_HEAD(&dev->msi_list);
#endif
INIT_LIST_HEAD(&dev->links.consumers); INIT_LIST_HEAD(&dev->links.consumers);
INIT_LIST_HEAD(&dev->links.suppliers); INIT_LIST_HEAD(&dev->links.suppliers);
INIT_LIST_HEAD(&dev->links.defer_sync); INIT_LIST_HEAD(&dev->links.defer_sync);

4
include/linux/device.h
View File

@@ -423,7 +423,6 @@ struct dev_msi_info {
* @pins: For device pin management. * @pins: For device pin management.
* See Documentation/driver-api/pin-control.rst for details. * See Documentation/driver-api/pin-control.rst for details.
* @msi: MSI related data * @msi: MSI related data
* @msi_list: Hosts MSI descriptors
* @numa_node: NUMA node this device is close to. * @numa_node: NUMA node this device is close to.
* @dma_ops: DMA mapping operations for this device. * @dma_ops: DMA mapping operations for this device.
* @dma_mask: Dma mask (if dma'ble device). * @dma_mask: Dma mask (if dma'ble device).
@@ -519,9 +518,6 @@ struct device {
struct dev_pin_info *pins; struct dev_pin_info *pins;
#endif #endif
struct dev_msi_info msi; struct dev_msi_info msi;
#ifdef CONFIG_GENERIC_MSI_IRQ
struct list_head msi_list;
#endif
#ifdef CONFIG_DMA_OPS #ifdef CONFIG_DMA_OPS
const struct dma_map_ops *dma_ops; const struct dma_map_ops *dma_ops;
#endif #endif

4
include/linux/msi.h
View File

@@ -144,11 +144,13 @@ struct msi_desc {
* @properties: MSI properties which are interesting to drivers * @properties: MSI properties which are interesting to drivers
* @attrs: Pointer to the sysfs attribute group * @attrs: Pointer to the sysfs attribute group
* @platform_data: Platform-MSI specific data * @platform_data: Platform-MSI specific data
* @list: List of MSI descriptors associated to the device
*/ */
struct msi_device_data { struct msi_device_data {
unsigned long properties; unsigned long properties;
const struct attribute_group **attrs; const struct attribute_group **attrs;
struct platform_msi_priv_data *platform_data; struct platform_msi_priv_data *platform_data;
struct list_head list;
}; };
int msi_setup_device_data(struct device *dev); int msi_setup_device_data(struct device *dev);
@@ -157,7 +159,7 @@ unsigned int msi_get_virq(struct device *dev, unsigned int index);
/* Helpers to hide struct msi_desc implementation details */ /* Helpers to hide struct msi_desc implementation details */
#define msi_desc_to_dev(desc) ((desc)->dev) #define msi_desc_to_dev(desc) ((desc)->dev)
#define dev_to_msi_list(dev) (&(dev)->msi_list) #define dev_to_msi_list(dev) (&(dev)->msi.data->list)
#define first_msi_entry(dev) \ #define first_msi_entry(dev) \
list_first_entry(dev_to_msi_list((dev)), struct msi_desc, list) list_first_entry(dev_to_msi_list((dev)), struct msi_desc, list)
#define for_each_msi_entry(desc, dev) \ #define for_each_msi_entry(desc, dev) \

5
kernel/irq/msi.c
View File

@@ -75,7 +75,9 @@ EXPORT_SYMBOL_GPL(get_cached_msi_msg);
static void msi_device_data_release(struct device *dev, void *res) static void msi_device_data_release(struct device *dev, void *res)
{ {
WARN_ON_ONCE(!list_empty(&dev->msi_list)); struct msi_device_data *md = res;
WARN_ON_ONCE(!list_empty(&md->list));
dev->msi.data = NULL; dev->msi.data = NULL;
} }
@@ -100,6 +102,7 @@ int msi_setup_device_data(struct device *dev)
if (!md) if (!md)
return -ENOMEM; return -ENOMEM;
INIT_LIST_HEAD(&md->list);
dev->msi.data = md; dev->msi.data = md;
devres_add(dev, md); devres_add(dev, md);
return 0; return 0;