PCI: vmd: assign a number to each vmd controller
Subsystems (3)
PATCH RESEND 1/1 PCI: vmd: assign a number to each vmd controller
From: Chunguang Xu <[email protected]>
If the system has multiple vmd controllers, the current vmd driver does not assign a number to each controller, so when analyzing the interrupt through /proc/interrupt, the names of all controllers are the same, which is not very convenient for problem analysis. Here, try to assign a number to each vmd controller.
--- drivers/pci/controller/vmd.c | 58 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 13 deletions(-)
drivers/pci/controller/vmd.c +45 -13
@@ -69,6 +69,8 @@ enum vmd_features { VMD_FEAT_CAN_BYPASS_MSI_REMAP = (1 << 4), }; +static DEFINE_IDA (vmd_instance_ida); +/* * Lock for manipulating VMD IRQ lists. */
@@ -119,6 +121,8 @@ struct vmd_dev {struct pci_bus *bus;u8 busn_start;u8 first_vec; +char *name; +int instance; };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)
@@ -599,7 +603,7 @@ static int vmd_alloc_irqs(struct vmd_dev *vmd)INIT_LIST_HEAD (&vmd->irqs[i].irq_list); err =devm_request_irq (&dev->dev,pci_irq_vector (dev, i), vmd_irq,IRQF_NO_THREAD , -"vmd" , &vmd->irqs[i]); + vmd->name, &vmd->irqs[i]);if (err)return err; }
@@ -769,28 +773,48 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id) {unsigned long features = (unsigned long ) id->driver_data;struct vmd_dev *vmd; -int err; +int err =0 ; -if (resource_size (&dev->resource[VMD_CFGBAR ]) < (1 <<20 )) -return -ENOMEM ; +if (resource_size (&dev->resource[VMD_CFGBAR ]) < (1 <<20 )) { + err = -ENOMEM ; + goto out; + } vmd =devm_kzalloc (&dev->dev,sizeof (*vmd),GFP_KERNEL ); -if (!vmd) -return -ENOMEM ; +if (!vmd) { + err = -ENOMEM ; + goto out; + } vmd->dev = dev; + vmd->instance =ida_simple_get (&vmd_instance_ida,0 ,0 ,GFP_KERNEL ); +if (vmd->instance <0 ) { + err = vmd->instance; + goto out; + } + + vmd->name =kasprintf (GFP_KERNEL ,"vmd%d" , vmd->instance); +if (!vmd->name) { + err = -ENOMEM ; + goto out_release_instance; + } + err =pcim_enable_device (dev);if (err <0 ) -return err; + goto out_release_instance; vmd->cfgbar =pcim_iomap (dev,VMD_CFGBAR ,0 ); -if (!vmd->cfgbar) -return -ENOMEM ; +if (!vmd->cfgbar) { + err = -ENOMEM ; + goto out_release_instance; + }pci_set_master (dev);if (dma_set_mask_and_coherent (&dev->dev,DMA_BIT_MASK (64 )) && -dma_set_mask_and_coherent (&dev->dev,DMA_BIT_MASK (32 ))) -return -ENODEV ; +dma_set_mask_and_coherent (&dev->dev,DMA_BIT_MASK (32 ))) { + err = -ENODEV ; + goto out_release_instance; + }if (features &VMD_FEAT_OFFSET_FIRST_VECTOR ) vmd->first_vec =1 ;
@@ -799,11 +823,17 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)pci_set_drvdata (dev, vmd); err =vmd_enable_domain (vmd, features);if (err) -return err; + goto out_release_instance;dev_info (&vmd->dev->dev,"Bound to PCI domain %04x\n" , vmd->sysdata.domain);return 0 ; + + out_release_instance: +ida_simple_remove (&vmd_instance_ida, vmd->instance); +kfree (vmd->name); + out: +return err; }static void vmd_cleanup_srcu (struct vmd_dev *vmd)
@@ -824,6 +854,8 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);vmd_remove_irq_domain (vmd); +ida_simple_remove (&vmd_instance_ida, vmd->instance); +kfree (vmd->name); }#ifdef CONFIG_PM_SLEEP
@@ -848,7 +880,7 @@ static int vmd_resume(struct device *dev)for (i =0 ; i < vmd->msix_count; i++) { err =devm_request_irq (dev,pci_irq_vector (pdev, i), vmd_irq,IRQF_NO_THREAD , -"vmd" , &vmd->irqs[i]); + vmd->name, &vmd->irqs[i]);if (err)return err; }
Signature · 1 line
1.8.3.1
Quoted 10 lines · brookxu
From: Chunguang Xu <[email protected]>
If the system has multiple vmd controllers, the current vmd driver does not assign a number to each controller, so when analyzing the interrupt through
/proc/interrupt, the names of all controllers are the same, which is not very convenient for problem analysis. Here, try to assign a number to each vmd controller.Signed-off-by Chunguang Xu <[email protected]>Reviewed-by Jon Derrick <[email protected]>
If you repost this for any reason, please update your subject line and commit log to match the convention, e.g.,
PCI: vmd: Assign a number to each VMD controller
If the system has multiple VMD controllers, the current vmd driver
...
try to assign a number to each VMD controller.
If not, Lorenzo might fix this up for you.
Quoted 134 lines
--- drivers/pci/controller/vmd.c | 58 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 45 insertions(+), 13 deletions(-)drivers/pci/controller/vmd.c +45
-13@@ -69,6 +69,8 @@ enum vmd_features { VMD_FEAT_CAN_BYPASS_MSI_REMAP = (1 << 4), }; +static DEFINE_IDA (vmd_instance_ida); +/* * Lock for manipulating VMD IRQ lists. */ @@ -119,6 +121,8 @@ struct vmd_dev {struct pci_bus *bus;u8 busn_start;u8 first_vec; +char *name; +int instance; };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)@@ -599,7 +603,7 @@ static int vmd_alloc_irqs(struct vmd_dev *vmd)INIT_LIST_HEAD (&vmd->irqs[i].irq_list); err =devm_request_irq (&dev->dev,pci_irq_vector (dev, i), vmd_irq,IRQF_NO_THREAD , -"vmd" , &vmd->irqs[i]); + vmd->name, &vmd->irqs[i]);if (err)return err; }@@ -769,28 +773,48 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id) {unsigned long features = (unsigned long ) id->driver_data;struct vmd_dev *vmd; -int err; +int err =0 ; -if (resource_size (&dev->resource[VMD_CFGBAR ]) < (1 <<20 )) -return -ENOMEM ; +if (resource_size (&dev->resource[VMD_CFGBAR ]) < (1 <<20 )) { + err = -ENOMEM ; + goto out; + } vmd =devm_kzalloc (&dev->dev,sizeof (*vmd),GFP_KERNEL ); -if (!vmd) -return -ENOMEM ; +if (!vmd) { + err = -ENOMEM ; + goto out; + } vmd->dev = dev; + vmd->instance =ida_simple_get (&vmd_instance_ida,0 ,0 ,GFP_KERNEL ); +if (vmd->instance <0 ) { + err = vmd->instance; + goto out; + } + + vmd->name =kasprintf (GFP_KERNEL ,"vmd%d" , vmd->instance); +if (!vmd->name) { + err = -ENOMEM ; + goto out_release_instance; + } + err =pcim_enable_device (dev);if (err <0 ) -return err; + goto out_release_instance; vmd->cfgbar =pcim_iomap (dev,VMD_CFGBAR ,0 ); -if (!vmd->cfgbar) -return -ENOMEM ; +if (!vmd->cfgbar) { + err = -ENOMEM ; + goto out_release_instance; + }pci_set_master (dev);if (dma_set_mask_and_coherent (&dev->dev,DMA_BIT_MASK (64 )) && -dma_set_mask_and_coherent (&dev->dev,DMA_BIT_MASK (32 ))) -return -ENODEV ; +dma_set_mask_and_coherent (&dev->dev,DMA_BIT_MASK (32 ))) { + err = -ENODEV ; + goto out_release_instance; + }if (features &VMD_FEAT_OFFSET_FIRST_VECTOR ) vmd->first_vec =1 ;@@ -799,11 +823,17 @@ static int vmd_probe(struct pci_dev *dev, const struct pci_device_id *id)pci_set_drvdata (dev, vmd); err =vmd_enable_domain (vmd, features);if (err) -return err; + goto out_release_instance;dev_info (&vmd->dev->dev,"Bound to PCI domain %04x\n" , vmd->sysdata.domain);return 0 ; + + out_release_instance: +ida_simple_remove (&vmd_instance_ida, vmd->instance); +kfree (vmd->name); + out: +return err; }static void vmd_cleanup_srcu (struct vmd_dev *vmd)@@ -824,6 +854,8 @@ static void vmd_remove(struct pci_dev *dev)vmd_cleanup_srcu (vmd);vmd_detach_resources (vmd);vmd_remove_irq_domain (vmd); +ida_simple_remove (&vmd_instance_ida, vmd->instance); +kfree (vmd->name); }#ifdef CONFIG_PM_SLEEP @@ -848,7 +880,7 @@ static int vmd_resume(struct device *dev)for (i =0 ; i < vmd->msix_count; i++) { err =devm_request_irq (dev,pci_irq_vector (pdev, i), vmd_irq,IRQF_NO_THREAD , -"vmd" , &vmd->irqs[i]); + vmd->name, &vmd->irqs[i]);if (err)return err; }Signature · 1 line
1.8.3.1