Introduce pcim_alloc_irq_vectors()
Subsystems (7)
v7 cover Introduce pcim_alloc_irq_vectors()
Introduce pcim_alloc_irq_vectors(), a device-managed version of pci_alloc_irq_vectors(), In some i2c drivers, If pcim_enable_device() has been called before, then pci_alloc_irq_vectors() is actually a device-managed function. It is used as a device-managed function, So replace it with pcim_alloc_irq_vectors().
Changelog
---------
v6 -> v7:
- rebase to PCI next branch
- add a stub for pci_is_managed() when disable PCI for fix build error in sparc architecture.
v5 -> v6:
- rebase to 5.13-rc4
v4 -> v5:
- Remove the check of enable device in pcim_alloc_irq_vectors() and make it as a static line function.
- Modify the subject name in patch 3 and patch 4.
v3 -> v4:
- add some commit comments for patch 3
v2 -> v3:
- Add some commit comments for replace some codes in pcim_release() by pci_free_irq_vectors().
- Simplify the error handling path in i2c designware driver.
v1 -> v2:
- Use pci_free_irq_vectors() to replace some code in pcim_release().
- Modify some commit messages.
Dejin Zheng (4):
PCI: Introduce pcim_alloc_irq_vectors()
Documentation: devres: Add pcim_alloc_irq_vectors()
i2c: designware: Use pcim_alloc_irq_vectors() to allocate IRQ vectors
i2c: thunderx: Use pcim_alloc_irq_vectors() to allocate IRQ vectors
.../driver-api/driver-model/devres.rst | 1 + drivers/i2c/busses/i2c-designware-pcidrv.c | 15 +++-------- drivers/i2c/busses/i2c-thunderx-pcidrv.c | 2 +- drivers/pci/pci.c | 5 +--- include/linux/pci.h | 25 +++++++++++++++++++ 5 files changed, 32 insertions(+), 16 deletions(-)
Signature · 1 line
2.30.1
PATCH v7 1/4 PCI: Introduce pcim_alloc_irq_vectors()
Introduce pcim_alloc_irq_vectors(), a device-managed version of pci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.
And use pci_free_irq_vectors() to replace some code in pcim_release(), they are equivalent, and no functional change. It is more explicit that pcim_alloc_irq_vectors() is a device-managed function.
When CONFIG_PCI=n, there is no stub for pci_is_managed(), but pcim_alloc_irq_vectors() will use it, so add one like other similar stubs. Otherwise there can be build errors, as here by kernel test robot reported:include/linux/pci.h: In function 'pcim_alloc_irq_vectors':
Quoted 1 line
Quoted 1 line
include/linux/pci.h:1847:7: error: implicit declaration of function 'pci_is_managed' [-Werror=implicit-function-declaration]
1847 | if (!pci_is_managed(dev))
| ^~~~~~~~~~~~~~---
v6 -> v7:
- rebase to PCI next branch
- add a stub for pci_is_managed() when disable PCI for fix build error in sparc architecture.
v5 -> v6:
- rebase to 5.13-rc4
v4 -> v5:
- Remove the check of enable device in pcim_alloc_irq_vectors() and make it as a static line function.
v3 -> v4:
- No change
v2 -> v3:
- Add some commit comments for replace some codes in pcim_release() by pci_free_irq_vectors().
v1 -> v2:
- Use pci_free_irq_vectors() to replace some code in pcim_release().
- Modify some commit messages.
drivers/pci/pci.c | 5 +---- include/linux/pci.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-)
drivers/pci/pci.c +1 -4
@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i; -if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++)if (this->region_mask & (1 << i))
include/linux/pci.h +25 -0
@@ -1730,6 +1730,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class,static inline void pci_set_master (struct pci_dev *dev) { }static inline int pci_enable_device (struct pci_dev *dev) {return -EIO ; } +static inline int pci_is_managed (struct pci_dev *pdev) {return 0 ; }static inline void pci_disable_device (struct pci_dev *dev) { }static inline int pcim_enable_device (struct pci_dev *pdev) {return -EIO ; }static inline int pci_assign_resource (struct pci_dev *dev,int i)
@@ -1825,6 +1826,30 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, NULL); } +/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +* +* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags); +} +/* Include architecture-dependent settings and functions */ #include <asm/pci.h>
Signature · 1 line
2.30.1
Andy Shevchenko
reviewerRe: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
Quoted 7 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function.
...
Quoted 8 lines
When
CONFIG_PCI=n, there is no stub forpci_is_managed(), butpcim_alloc_irq_vectors()will use it, so add one like other similar stubs. Otherwise there can be build errors, as here by kernel test robot reported:include/linux/pci.h: In function 'pcim_alloc_irq_vectors':Quoted 1 line
Quoted 1 line
include/linux/pci.h:1847:7: error: implicit declaration of function 'pci_is_managed' [-Werror=implicit-function-declaration]1847 | if (!pci_is_managed(dev)) | ^~~~~~~~~~~~~~
This is rather changelog related material. No need to pollute commit message with this.
...
Quoted 1 line
Reported-by kernel test robot <[email protected]>
It's new functionality. Why this tag is here?
Use comments (similar location than changelog) to give a credit if you wish.
Quoted 91 lines
Suggested-by Andy Shevchenko <[email protected]>Reviewed-by Robert Richter <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Acked-by Bjorn Helgaas <[email protected]>Signed-off-by Dejin Zheng <[email protected]>---
v6 -> v7:
- rebase to PCI next branch
- add a stub forpci_is_managed()when disable PCI for fix build error in sparc architecture.
v5 -> v6:
- rebase to 5.13-rc4
v4 -> v5:
- Remove the check of enable device inpcim_alloc_irq_vectors()and make it as a static line function.
v3 -> v4:
- No change
v2 -> v3:
- Add some commit comments for replace some codes inpcim_release()bypci_free_irq_vectors().
v1 -> v2:
- Usepci_free_irq_vectors()to replace some code inpcim_release().
- Modify some commit messages.drivers/pci/pci.c | 5 +---- include/linux/pci.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-)drivers/pci/pci.c +1
-4@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i; -if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++)if (this->region_mask & (1 << i))include/linux/pci.h +25
-0@@ -1730,6 +1730,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class,static inline void pci_set_master (struct pci_dev *dev) { }static inline int pci_enable_device (struct pci_dev *dev) {return -EIO ; } +static inline int pci_is_managed (struct pci_dev *pdev) {return 0 ; }static inline void pci_disable_device (struct pci_dev *dev) { }static inline int pcim_enable_device (struct pci_dev *pdev) {return -EIO ; }static inline int pci_assign_resource (struct pci_dev *dev,int i)@@ -1825,6 +1826,30 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, NULL); } +/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +* +* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags); +} +/* Include architecture-dependent settings and functions */ #include <asm/pci.h> Signature · 1 line
2.30.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
Quoted 23 lines · Andy Shevchenko
Quoted 7 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function....
Quoted 8 lines
When
CONFIG_PCI=n, there is no stub forpci_is_managed(), butpcim_alloc_irq_vectors()will use it, so add one like other similar stubs. Otherwise there can be build errors, as here by kernel test robot reported:include/linux/pci.h: In function 'pcim_alloc_irq_vectors':Quoted 1 line
Quoted 1 line
include/linux/pci.h:1847:7: error: implicit declaration of function 'pci_is_managed' [-Werror=implicit-function-declaration]1847 | if (!pci_is_managed(dev)) | ^~~~~~~~~~~~~~This is rather changelog related material. No need to pollute commit message with this.
Quoted 6 lines
...
Quoted 1 line
Reported-by kernel test robot <[email protected]>It's new functionality. Why this tag is here?
Use comments (similar location than changelog) to give a credit if you wish.
Agreed, I'll tidy that up, so no need to repost for this.
Re: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
Quoted 24 lines · Bjorn Helgaas
Quoted 23 lines · Andy Shevchenko
Quoted 7 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function....
Quoted 8 lines
When
CONFIG_PCI=n, there is no stub forpci_is_managed(), butpcim_alloc_irq_vectors()will use it, so add one like other similar stubs. Otherwise there can be build errors, as here by kernel test robot reported:include/linux/pci.h: In function 'pcim_alloc_irq_vectors':Quoted 1 line
Quoted 1 line
include/linux/pci.h:1847:7: error: implicit declaration of function 'pci_is_managed' [-Werror=implicit-function-declaration]1847 | if (!pci_is_managed(dev)) | ^~~~~~~~~~~~~~This is rather changelog related material. No need to pollute commit message with this.
Quoted 8 lines
Quoted 6 lines
...
Quoted 1 line
Reported-by kernel test robot <[email protected]>It's new functionality. Why this tag is here?
Use comments (similar location than changelog) to give a credit if you wish.Agreed, I'll tidy that up, so no need to repost for this.
Bjorn, Thank you very much, you are so nice!
BR,
Dejin
Re: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
In reply to Andy ShevchenkoQuoted 16 lines · Andy Shevchenko
Quoted 7 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function....
Quoted 5 lines
When
CONFIG_PCI=n, there is no stub forpci_is_managed(), butpcim_alloc_irq_vectors()will use it, so add one like other similar stubs. Otherwise there can be build errors, as here by kernel test robot reported:include/linux/pci.h: In function 'pcim_alloc_irq_vectors':
Quoted 7 lines
Quoted 3 lines
Quoted 1 line
Quoted 1 line
include/linux/pci.h:1847:7: error: implicit declaration of function 'pci_is_managed' [-Werror=implicit-function-declaration]1847 | if (!pci_is_managed(dev)) | ^~~~~~~~~~~~~~This is rather changelog related material. No need to pollute commit message with this.
Okey.
Quoted 7 lines
...
Quoted 1 line
Reported-by kernel test robot <[email protected]>It's new functionality. Why this tag is here?
Use comments (similar location than changelog) to give a credit if you wish.
Got it, Thanks!
Quoted 97 lines
Quoted 91 lines
Suggested-by Andy Shevchenko <[email protected]>Reviewed-by Robert Richter <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Acked-by Bjorn Helgaas <[email protected]>Signed-off-by Dejin Zheng <[email protected]>---
v6 -> v7:
- rebase to PCI next branch
- add a stub forpci_is_managed()when disable PCI for fix build error in sparc architecture.
v5 -> v6:
- rebase to 5.13-rc4
v4 -> v5:
- Remove the check of enable device inpcim_alloc_irq_vectors()and make it as a static line function.
v3 -> v4:
- No change
v2 -> v3:
- Add some commit comments for replace some codes inpcim_release()bypci_free_irq_vectors().
v1 -> v2:
- Usepci_free_irq_vectors()to replace some code inpcim_release().
- Modify some commit messages.drivers/pci/pci.c | 5 +---- include/linux/pci.h | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-)drivers/pci/pci.c +1
-4@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i; -if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++)if (this->region_mask & (1 << i))include/linux/pci.h +25
-0@@ -1730,6 +1730,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class,static inline void pci_set_master (struct pci_dev *dev) { }static inline int pci_enable_device (struct pci_dev *dev) {return -EIO ; } +static inline int pci_is_managed (struct pci_dev *pdev) {return 0 ; }static inline void pci_disable_device (struct pci_dev *dev) { }static inline int pcim_enable_device (struct pci_dev *pdev) {return -EIO ; }static inline int pci_assign_resource (struct pci_dev *dev,int i)@@ -1825,6 +1826,30 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, NULL); } +/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +* +* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags); +} +/* Include architecture-dependent settings and functions */ #include <asm/pci.h> Signature · 1 line
2.30.1Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
In reply to Dejin ZhengQuoted 13 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function.drivers/pci/pci.c +0
-0
drivers/pci/pci.c static void pcim_release(struct device *gendev, void *res) · line 1992
Quoted 8 lines
drivers/pci/pci.c +1
-4@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i; -if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);
If I understand correctly, this hunk is a nice simplification, but actually has nothing to do with making pcim_alloc_irq_vectors(). I have it split to a separate patch in my local tree. Or am I wrong about that?
Quoted 30 lines
drivers/pci/pci.c +0
-0for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++)if (this->region_mask & (1 << i))include/linux/pci.h +13
-0@@ -1730,6 +1730,7 @@ static inline struct pci_dev *pci_get_class(unsigned int class,static inline void pci_set_master (struct pci_dev *dev) { }static inline int pci_enable_device (struct pci_dev *dev) {return -EIO ; } +static inline int pci_is_managed (struct pci_dev *pdev) {return 0 ; }static inline void pci_disable_device (struct pci_dev *dev) { }static inline int pcim_enable_device (struct pci_dev *pdev) {return -EIO ; }static inline int pci_assign_resource (struct pci_dev *dev,int i)@@ -1825,6 +1826,30 @@ pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, NULL); } +/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +*
include/linux/pci.h pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, · line 1850
Quoted 10 lines
include/linux/pci.h +10
-0+* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags);
This is great, but can you explain how pci_alloc_irq_vectors() magically becomes a managed interface if we've already called pcim_enable_device()?
I certainly believe it does; I'd just like to put a hint in the commit log since my 5 minutes of grepping around didn't make it obvious to me.
I see that pcim_enable_device() sets pdev->is_managed, but I didn't find the connection between that and pci_alloc_irq_vectors().
Quoted 8 lines
include/linux/pci.h +2
-0+} +/* Include architecture-dependent settings and functions */ #include <asm/pci.h> Signature · 1 line
2.30.1
Andy Shevchenko
reviewerRe: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
Quoted 8 lines · Bjorn Helgaas
Quoted 7 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function.
...
Quoted 4 lines
Quoted 4 lines
drivers/pci/pci.c +0
-0@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i;
Quoted 10 lines
drivers/pci/pci.c static void pcim_release(struct device *gendev, void *res) · line 1992
Quoted 5 lines
drivers/pci/pci.c +1
-4-if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);If I understand correctly, this hunk is a nice simplification, but actually has nothing to do with making
pcim_alloc_irq_vectors(). I have it split to a separate patch in my local tree. Or am I wrong about that?
It's a good simplification that had to be done when pci_free_irq_vectors() appeared. But here is the fact that indirectly it's related to the pcim_*() APIs, i.e. pcim_alloc_irq_vectors(), because you may noticed this is inside pcim_release().
...
Quoted 27 lines
Quoted 12 lines
include/linux/pci.h +12
-0+/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +* include/linux/pci.h pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, · line 1850
Quoted 10 lines
include/linux/pci.h +10
-0+* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags);This is great, but can you explain how
pci_alloc_irq_vectors()magically becomes a managed interface if we've already calledpcim_enable_device()?
Quoted 6 lines
I certainly believe it does; I'd just like to put a hint in the commit log since my 5 minutes of grepping around didn't make it obvious to me.
I see that
pcim_enable_device()setspdev->is_managed, but I didn't find the connection between that andpci_alloc_irq_vectors().
One needs to read and understand the code, I agree. The explanation is spread between pcim_release() and __pci_enable_msi/x_range().
The call chain is
msi_capability_init() / msix_capability_init()
...
<- __pci_enable_msi/x_range()
<- pci_alloc_irq_vectors_affinity()
<- pci_alloc_irq_vectors()where device msi_enabled / msix_enabled is set.
So, it may deserve to be explained in the commit message.
Quoted 1 line
Quoted 1 line
+}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
Quoted 27 lines · Andy Shevchenko
Quoted 8 lines · Bjorn Helgaas
Quoted 7 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function....
Quoted 4 lines
Quoted 4 lines
drivers/pci/pci.c +0
-0@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i;Quoted 10 lines
drivers/pci/pci.c static void pcim_release(struct device *gendev, void *res) · line 1992
Quoted 5 lines
drivers/pci/pci.c +1
-4-if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);If I understand correctly, this hunk is a nice simplification, but actually has nothing to do with making
pcim_alloc_irq_vectors(). I have it split to a separate patch in my local tree. Or am I wrong about that?
Quoted 2 lines
It's a good simplification that had to be done when
pci_free_irq_vectors()appeared.
Sorry to be pedantic. You say the simplification "had to be done," but AFAICT there was no actual *requirement* for this simplification to be done since pci_free_irq_vectors() is functionally identical to the previous code. I think we should do it because it's a little simpler, but not because it *fixes* anything.
Quoted 3 lines
But here is the fact that indirectly it's related to the pcim_*() APIs, i.e.
pcim_alloc_irq_vectors(), because you may noticed this is insidepcim_release().
Yes. For posterity, my notes about the call chain (after applying this patch):
pci_alloc_irq_vectors
pci_alloc_irq_vectors_affinity
__pci_enable_msix_range # MSI-X path
__pci_enable_msix
msix_capability_init
msix_setup_entries
for (...)
entry = alloc_msi_entry
kzalloc(msi_desc) <--- alloc
kmemdup(msi_desc->affinity) <--- alloc
dev->msix_enabled = 1 # MSI-X enabled
__pci_enable_msi_range # MSI path
msi_capability_init
msi_setup_entry
alloc_msi_entry <--- alloc
dev->msi_enabled = 1 # MSI enabled
pcim_release
pci_free_irq_vectors
pci_disable_msix # MSI-X
if (!dev->msix_enabled)
return
pci_msix_shutdown
dev->msix_enabled = 0 # MSI-X disabled
free_msi_irqs
list_for_each_entry_safe(..., msi_list, ...)
free_msi_entry
kfree(msi_desc->affinity) <--- free
kfree(msi_desc) <--- free
pci_disable_msi # MSI
if (!dev->msi_enabled)
return
pci_msi_shutdown
dev->msi_enabled = 0 # MSI disabled
free_msi_irqs <--- freeSo I *think* (correct me if I'm wrong):
- If a driver calls pcim_enable_device(), we will call pcim_release() when the last reference to the device is dropped.
- pci_alloc_irq_vectors() allocates msi_desc and irq_affinity_desc structures via msix_setup_entries() or msi_setup_entry().
- pcim_release() will free those msi_desc and irq_affinity_desc structures.
- Even before this series, pcim_release() frees msi_desc and irq_affinity_desc structures by calling pci_disable_msi() and pci_disable_msix().
- Calling pci_free_irq_vectors() (or pci_disable_msi() or pci_disable_msix()) twice is unnecessary but probably harmless because they bail out early.
So this series actually does not fix any problems whatsoever.
It *does* remove unnecessary pci_free_irq_vectors() calls from i2c-designware-pcidrv.c.
But because pci_alloc_irq_vectors() and related interfaces are *already* managed as soon as a driver calls pcim_enable_device(), we can simply remove the pci_free_irq_vectors() without doing anything else.
I don't think we *should* do anything else. There are many callers of pcim_enable_device() that also call pci_alloc_irq_vectors(), pci_enable_msix_range(), etc. We don't have pcim_enable_msix_range(), pcim_enable_msi(), pcim_alloc_irq_vectors_affinity(), etc. I don't think it's worth the churn of adding all those and changing all the callers to use pcim_*() (as in patch 4/4 here).
Browsing the output of this:
git grep -En "pcim_enable_device|pci_alloc_irq_vectors|pci_enable_msix_|pci_free_irq_vectors|pci_disable_msi"
leads me to believe there are similar calls of pci_free_irq_vectors() that could be removed here:
mtip_pci_probe
sp_pci_probe
dw_edma_pcie_probe
hisi_dma_probe
ioat_pci_probe
plx_dma_probe
cci_pci_probe
hibmc_pci_probe
...
and many more, but I got tired of looking.
Quoted 56 lines
Quoted 27 lines
Quoted 12 lines
include/linux/pci.h +12
-0+/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +* include/linux/pci.h pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, · line 1850
Quoted 10 lines
include/linux/pci.h +10
-0+* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags);This is great, but can you explain how
pci_alloc_irq_vectors()magically becomes a managed interface if we've already calledpcim_enable_device()?Quoted 6 lines
I certainly believe it does; I'd just like to put a hint in the commit log since my 5 minutes of grepping around didn't make it obvious to me.
I see that
pcim_enable_device()setspdev->is_managed, but I didn't find the connection between that andpci_alloc_irq_vectors().One needs to read and understand the code, I agree. The explanation is spread between
pcim_release()and __pci_enable_msi/x_range().The call chain is
msi_capability_init()/msix_capability_init()
...
<- __pci_enable_msi/x_range()<- pci_alloc_irq_vectors_affinity() <- pci_alloc_irq_vectors()where device
msi_enabled/msix_enabledis set.So, it may deserve to be explained in the commit message.
Quoted 1 line
Quoted 1 line
+}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Andy Shevchenko
reviewerRe: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
Dejin, why Christoph's email suddenly disappeared during updating?
Quoted 31 lines · Bjorn Helgaas
Quoted 27 lines · Andy Shevchenko
Quoted 8 lines · Bjorn Helgaas
Quoted 7 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function....
Quoted 4 lines
Quoted 4 lines
drivers/pci/pci.c +0
-0@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i;Quoted 10 lines
drivers/pci/pci.c static void pcim_release(struct device *gendev, void *res) · line 1992
Quoted 5 lines
drivers/pci/pci.c +1
-4-if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);If I understand correctly, this hunk is a nice simplification, but actually has nothing to do with making
pcim_alloc_irq_vectors(). I have it split to a separate patch in my local tree. Or am I wrong about that?Quoted 2 lines
It's a good simplification that had to be done when
pci_free_irq_vectors()appeared.
Quoted 6 lines
Sorry to be pedantic. You say the simplification "had to be done," but AFAICT there was no actual *requirement* for this simplification to be done since
pci_free_irq_vectors()is functionally identical to the previous code.
I think we should do it because it's a little
simpler, but not because it *fixes* anything.
It makes things more straightforward. So it definitely "fixes" something, but not the code in this case, rather how we maintain this code.
Quoted 58 lines
Quoted 3 lines
But here is the fact that indirectly it's related to the pcim_*() APIs, i.e.
pcim_alloc_irq_vectors(), because you may noticed this is insidepcim_release().Yes. For posterity, my notes about the call chain (after applying this patch):
pci_alloc_irq_vectors
pci_alloc_irq_vectors_affinity
__pci_enable_msix_range# MSI-X path
__pci_enable_msix
msix_capability_init
msix_setup_entries
for (...)
entry =alloc_msi_entry
kzalloc(msi_desc)<--- alloc
kmemdup(msi_desc->affinity)<--- alloc
dev->msix_enabled= 1 # MSI-X enabled
__pci_enable_msi_range# MSI path
msi_capability_init
msi_setup_entry
alloc_msi_entry<--- alloc
dev->msi_enabled= 1 # MSI enabled
pcim_releasepci_free_irq_vectors pci_disable_msix # MSI-X if (!dev->msix_enabled) return pci_msix_shutdown dev->msix_enabled = 0 # MSI-X disabled free_msi_irqs list_for_each_entry_safe(..., msi_list, ...) free_msi_entry kfree(msi_desc->affinity) <--- free kfree(msi_desc) <--- free pci_disable_msi # MSI if (!dev->msi_enabled) return pci_msi_shutdown dev->msi_enabled = 0 # MSI disabled free_msi_irqs <--- freeSo I *think* (correct me if I'm wrong):
- If a driver calls
pcim_enable_device(), we will callpcim_release()when the last reference to the device is dropped.-
pci_alloc_irq_vectors()allocatesmsi_descandirq_affinity_descstructures viamsix_setup_entries()ormsi_setup_entry().-
pcim_release()will free thosemsi_descandirq_affinity_descstructures.- Even before this series,
pcim_release()freesmsi_descandirq_affinity_descstructures by callingpci_disable_msi()andpci_disable_msix().
Quoted 5 lines
- Calling
pci_free_irq_vectors()(orpci_disable_msi()orpci_disable_msix()) twice is unnecessary but probably harmless because they bail out early.So this series actually does not fix any problems whatsoever.
I tend to disagree.
The PCI managed API is currently inconsistent and what you got is what I already know and had been using until (see below) Christoph told not to do [1].
Even do you as PCI maintainer it took some time to figure this out. But current APIs make it hard for mere users who wants to use it in the drivers.
So, main point of fix here is _API inconsistency_ [0].
But hey, I believe you have been Cc'ed to the initial submission of the pci_*_irq_vector*() rework done by Christoph [2] (hmm... don't see your name there). And he updated documentation as well [3].
Moreover, he insisted to use pci_free_irq_vectors() whenever we are using pci_alloc_irq_vectors(). And he suggested if we want to avoid this we have to make pcim_ variant of the API (see [1] again).
Maybe you, guys, should got some agreement and clarify it in the documentation?
[0]: We have a few functions with pcim_ prefix, few without and some from the
latter group imply to behave _differently_ when pcim_enable_device() had been called.
[1]: I'm not able to find the archive of the mailing, but I remember that it
was something like that IIRC during 8250_lpss.c development.
[2]: https://lore.kernel.org/linux-pci/[email protected]/
[3]: https://www.kernel.org/doc/html/latest/PCI/msi-howto.html#using-msi
Quoted 9 lines
It *does* remove unnecessary
pci_free_irq_vectors()calls fromi2c-designware-pcidrv.c.But because
pci_alloc_irq_vectors()and related interfaces are *already* managed as soon as a driver callspcim_enable_device(), we can simply remove thepci_free_irq_vectors()without doing anything else.I don't think we *should* do anything else.
See above.
Quoted 76 lines
There are many callers of
pcim_enable_device()that also callpci_alloc_irq_vectors(),pci_enable_msix_range(), etc. We don't havepcim_enable_msix_range(),pcim_enable_msi(),pcim_alloc_irq_vectors_affinity(), etc. I don't think it's worth the churn of adding all those and changing all the callers to use pcim_*() (as in patch 4/4 here).Browsing the output of this:
git grep -En "pcim_enable_device|pci_alloc_irq_vectors|pci_enable_msix_|pci_free_irq_vectors|pci_disable_msi"
leads me to believe there are similar calls of
pci_free_irq_vectors()that could be removed here:
mtip_pci_probe
sp_pci_probe
dw_edma_pcie_probe
hisi_dma_probe
ioat_pci_probe
plx_dma_probe
cci_pci_probe
hibmc_pci_probe
...and many more, but I got tired of looking.
Quoted 50 lines
Quoted 27 lines
Quoted 12 lines
include/linux/pci.h +12
-0+/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +* include/linux/pci.h pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, · line 1850
Quoted 10 lines
include/linux/pci.h +10
-0+* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags);This is great, but can you explain how
pci_alloc_irq_vectors()magically becomes a managed interface if we've already calledpcim_enable_device()?Quoted 6 lines
I certainly believe it does; I'd just like to put a hint in the commit log since my 5 minutes of grepping around didn't make it obvious to me.
I see that
pcim_enable_device()setspdev->is_managed, but I didn't find the connection between that andpci_alloc_irq_vectors().One needs to read and understand the code, I agree. The explanation is spread between
pcim_release()and __pci_enable_msi/x_range().The call chain is
msi_capability_init()/msix_capability_init()
...
<- __pci_enable_msi/x_range()<- pci_alloc_irq_vectors_affinity() <- pci_alloc_irq_vectors()where device
msi_enabled/msix_enabledis set.So, it may deserve to be explained in the commit message.
Quoted 1 line
Quoted 1 line
+}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
Quoted 118 lines · Andy Shevchenko
Quoted 31 lines · Bjorn Helgaas
Quoted 27 lines · Andy Shevchenko
Quoted 8 lines · Bjorn Helgaas
Quoted 7 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function....
Quoted 4 lines
Quoted 4 lines
drivers/pci/pci.c +0
-0@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i;Quoted 10 lines
drivers/pci/pci.c static void pcim_release(struct device *gendev, void *res) · line 1992
Quoted 5 lines
drivers/pci/pci.c +1
-4-if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);If I understand correctly, this hunk is a nice simplification, but actually has nothing to do with making
pcim_alloc_irq_vectors(). I have it split to a separate patch in my local tree. Or am I wrong about that?Quoted 2 lines
It's a good simplification that had to be done when
pci_free_irq_vectors()appeared.Quoted 6 lines
Sorry to be pedantic. You say the simplification "had to be done," but AFAICT there was no actual *requirement* for this simplification to be done since
pci_free_irq_vectors()is functionally identical to the previous code.
I think we should do it because it's a little
simpler, but not because it *fixes* anything.It makes things more straightforward. So it definitely "fixes" something, but not the code in this case, rather how we maintain this code.
Quoted 58 lines
Quoted 3 lines
But here is the fact that indirectly it's related to the pcim_*() APIs, i.e.
pcim_alloc_irq_vectors(), because you may noticed this is insidepcim_release().Yes. For posterity, my notes about the call chain (after applying this patch):
pci_alloc_irq_vectors
pci_alloc_irq_vectors_affinity
__pci_enable_msix_range# MSI-X path
__pci_enable_msix
msix_capability_init
msix_setup_entries
for (...)
entry =alloc_msi_entry
kzalloc(msi_desc)<--- alloc
kmemdup(msi_desc->affinity)<--- alloc
dev->msix_enabled= 1 # MSI-X enabled
__pci_enable_msi_range# MSI path
msi_capability_init
msi_setup_entry
alloc_msi_entry<--- alloc
dev->msi_enabled= 1 # MSI enabled
pcim_releasepci_free_irq_vectors pci_disable_msix # MSI-X if (!dev->msix_enabled) return pci_msix_shutdown dev->msix_enabled = 0 # MSI-X disabled free_msi_irqs list_for_each_entry_safe(..., msi_list, ...) free_msi_entry kfree(msi_desc->affinity) <--- free kfree(msi_desc) <--- free pci_disable_msi # MSI if (!dev->msi_enabled) return pci_msi_shutdown dev->msi_enabled = 0 # MSI disabled free_msi_irqs <--- freeSo I *think* (correct me if I'm wrong):
- If a driver calls
pcim_enable_device(), we will callpcim_release()when the last reference to the device is dropped.-
pci_alloc_irq_vectors()allocatesmsi_descandirq_affinity_descstructures viamsix_setup_entries()ormsi_setup_entry().-
pcim_release()will free thosemsi_descandirq_affinity_descstructures.- Even before this series,
pcim_release()freesmsi_descandirq_affinity_descstructures by callingpci_disable_msi()andpci_disable_msix().Quoted 5 lines
- Calling
pci_free_irq_vectors()(orpci_disable_msi()orpci_disable_msix()) twice is unnecessary but probably harmless because they bail out early.So this series actually does not fix any problems whatsoever.
I tend to disagree.
The PCI managed API is currently inconsistent and what you got is what I already know and had been using until (see below) Christoph told not to do [1].
Even do you as PCI maintainer it took some time to figure this out. But current APIs make it hard for mere users who wants to use it in the drivers.
So, main point of fix here is
_APIinconsistency_[0].
Quoted 7 lines
But hey, I believe you have been Cc'ed to the initial submission of the pci_*_irq_vector*() rework done by Christoph [2] (hmm... don't see your name there). And he updated documentation as well [3].
Moreover, he insisted to use
pci_free_irq_vectors()whenever we are usingpci_alloc_irq_vectors(). And he suggested if we want to avoid this we have to makepcim_variant of the API (see [1] again).
I'd like to consider this, but it's hard without a reference :)
I do think it would be helpful to have clear guidance about when drivers need to use pci_free_irq_vectors(). The existing text in msi-howto.rst doesn't address pcim_ at all.
Quoted 2 lines
Maybe you, guys, should got some agreement and clarify it in the documentation?
I agree that the pcim_*() API is confusing at best and it would be nice to improve it and document it, but I don't think this series really does it.
There are several MSI-related interfaces that use alloc_msi_entry() and hence magically become managed if we call pcim_enable_device():
pci_alloc_irq_vectors() # ~150 callers pci_alloc_irq_vectors_affinity() # ~10 callers pci_enable_msix_exact() # ~20 callers (deprecated) pci_enable_msix_range() # ~50 callers (deprecated) pci_enable_msi() # ~100 callers (deprecated)
This series adds pcim_alloc_irq_vectors(), which sort of fixes *one* of them and makes this sequence look nice:
pcim_enable_device(); pcim_alloc_irq_vectors();
but all the others are still potentially managed even though the name doesn't indicate it. And it really doesn't improve the documentation.
Possible steps forward:
- Add comments in include/linux/pci.h to indicate deprecation (AFAICS, deprecation is currently only mentioned in msi-howto.rst).
- Migrate callers away from deprecated interfaces (a lot of work).
- Remove deprecated interfaces.
- Add pcim_ variants of remaining interfaces (I think only pci_alloc_*()). Consider returning error for pci_alloc_*() usage by managed drivers.
- Convert managed callers from pci_alloc_*() to pcim_alloc_*() and remove usage of pci_free_irq_vectors(), pci_disable_msi(), pci_disable_msix().
Quoted 102 lines
[0]: We have a few functions with
pcim_prefix, few without and some from the
latter group imply to behave _differently_ whenpcim_enable_device()had been called.
[1]: I'm not able to find the archive of the mailing, but I remember that it
was something like that IIRC during8250_lpss.cdevelopment.
[2]: https://lore.kernel.org/linux-pci/[email protected]/
[3]: https://www.kernel.org/doc/html/latest/PCI/msi-howto.html#using-msiQuoted 9 lines
It *does* remove unnecessary
pci_free_irq_vectors()calls fromi2c-designware-pcidrv.c.But because
pci_alloc_irq_vectors()and related interfaces are *already* managed as soon as a driver callspcim_enable_device(), we can simply remove thepci_free_irq_vectors()without doing anything else.I don't think we *should* do anything else.
See above.
Quoted 76 lines
There are many callers of
pcim_enable_device()that also callpci_alloc_irq_vectors(),pci_enable_msix_range(), etc. We don't havepcim_enable_msix_range(),pcim_enable_msi(),pcim_alloc_irq_vectors_affinity(), etc. I don't think it's worth the churn of adding all those and changing all the callers to use pcim_*() (as in patch 4/4 here).Browsing the output of this:
git grep -En "pcim_enable_device|pci_alloc_irq_vectors|pci_enable_msix_|pci_free_irq_vectors|pci_disable_msi"
leads me to believe there are similar calls of
pci_free_irq_vectors()that could be removed here:
mtip_pci_probe
sp_pci_probe
dw_edma_pcie_probe
hisi_dma_probe
ioat_pci_probe
plx_dma_probe
cci_pci_probe
hibmc_pci_probe
...and many more, but I got tired of looking.
Quoted 50 lines
Quoted 27 lines
Quoted 12 lines
include/linux/pci.h +12
-0+/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +* include/linux/pci.h pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, · line 1850
Quoted 10 lines
include/linux/pci.h +10
-0+* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags);This is great, but can you explain how
pci_alloc_irq_vectors()magically becomes a managed interface if we've already calledpcim_enable_device()?Quoted 6 lines
I certainly believe it does; I'd just like to put a hint in the commit log since my 5 minutes of grepping around didn't make it obvious to me.
I see that
pcim_enable_device()setspdev->is_managed, but I didn't find the connection between that andpci_alloc_irq_vectors().One needs to read and understand the code, I agree. The explanation is spread between
pcim_release()and __pci_enable_msi/x_range().The call chain is
msi_capability_init()/msix_capability_init()
...
<- __pci_enable_msi/x_range()<- pci_alloc_irq_vectors_affinity() <- pci_alloc_irq_vectors()where device
msi_enabled/msix_enabledis set.So, it may deserve to be explained in the commit message.
Quoted 1 line
Quoted 1 line
+}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Andy Shevchenko
reviewerRe: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
Quoted 12 lines · Bjorn Helgaas
Quoted 11 lines · Andy Shevchenko
Quoted 10 lines · Bjorn Helgaas
Quoted 9 lines · Andy Shevchenko
Quoted 8 lines · Bjorn Helgaas
Quoted 7 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function.
...
Quoted 108 lines
Quoted 108 lines
Quoted 18 lines
Quoted 15 lines
Quoted 4 lines
Quoted 4 lines
drivers/pci/pci.c +0
-0@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i;Quoted 10 lines
drivers/pci/pci.c static void pcim_release(struct device *gendev, void *res) · line 1992
Quoted 5 lines
drivers/pci/pci.c +1
-4-if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);If I understand correctly, this hunk is a nice simplification, but actually has nothing to do with making
pcim_alloc_irq_vectors(). I have it split to a separate patch in my local tree. Or am I wrong about that?Quoted 2 lines
It's a good simplification that had to be done when
pci_free_irq_vectors()appeared.Quoted 6 lines
Sorry to be pedantic. You say the simplification "had to be done," but AFAICT there was no actual *requirement* for this simplification to be done since
pci_free_irq_vectors()is functionally identical to the previous code.
I think we should do it because it's a little
simpler, but not because it *fixes* anything.It makes things more straightforward. So it definitely "fixes" something, but not the code in this case, rather how we maintain this code.
Quoted 58 lines
Quoted 3 lines
But here is the fact that indirectly it's related to the pcim_*() APIs, i.e.
pcim_alloc_irq_vectors(), because you may noticed this is insidepcim_release().Yes. For posterity, my notes about the call chain (after applying this patch):
pci_alloc_irq_vectors
pci_alloc_irq_vectors_affinity
__pci_enable_msix_range# MSI-X path
__pci_enable_msix
msix_capability_init
msix_setup_entries
for (...)
entry =alloc_msi_entry
kzalloc(msi_desc)<--- alloc
kmemdup(msi_desc->affinity)<--- alloc
dev->msix_enabled= 1 # MSI-X enabled
__pci_enable_msi_range# MSI path
msi_capability_init
msi_setup_entry
alloc_msi_entry<--- alloc
dev->msi_enabled= 1 # MSI enabled
pcim_releasepci_free_irq_vectors pci_disable_msix # MSI-X if (!dev->msix_enabled) return pci_msix_shutdown dev->msix_enabled = 0 # MSI-X disabled free_msi_irqs list_for_each_entry_safe(..., msi_list, ...) free_msi_entry kfree(msi_desc->affinity) <--- free kfree(msi_desc) <--- free pci_disable_msi # MSI if (!dev->msi_enabled) return pci_msi_shutdown dev->msi_enabled = 0 # MSI disabled free_msi_irqs <--- freeSo I *think* (correct me if I'm wrong):
- If a driver calls
pcim_enable_device(), we will callpcim_release()when the last reference to the device is dropped.-
pci_alloc_irq_vectors()allocatesmsi_descandirq_affinity_descstructures viamsix_setup_entries()ormsi_setup_entry().-
pcim_release()will free thosemsi_descandirq_affinity_descstructures.- Even before this series,
pcim_release()freesmsi_descandirq_affinity_descstructures by callingpci_disable_msi()andpci_disable_msix().Quoted 5 lines
- Calling
pci_free_irq_vectors()(orpci_disable_msi()orpci_disable_msix()) twice is unnecessary but probably harmless because they bail out early.So this series actually does not fix any problems whatsoever.
I tend to disagree.
The PCI managed API is currently inconsistent and what you got is what I already know and had been using until (see below) Christoph told not to do [1].
Even do you as PCI maintainer it took some time to figure this out. But current APIs make it hard for mere users who wants to use it in the drivers.
So, main point of fix here is
_APIinconsistency_[0].But hey, I believe you have been Cc'ed to the initial submission of the pci_*_irq_vector*() rework done by Christoph [2] (hmm... don't see your name there). And he updated documentation as well [3].
Quoted 5 lines
Quoted 3 lines
Moreover, he insisted to use
pci_free_irq_vectors()whenever we are usingpci_alloc_irq_vectors(). And he suggested if we want to avoid this we have to makepcim_variant of the API (see [1] again).I'd like to consider this, but it's hard without a reference :)
Sorry it took a bit too long to answer here.
https://lore.kernel.org/linux-serial/[email protected]/T/#u
Quoted 3 lines
I do think it would be helpful to have clear guidance about when drivers need to use
pci_free_irq_vectors(). The existing text inmsi-howto.rstdoesn't addresspcim_at all.
Christoph suggested to create an explicit managed API. For now it may be looking the same as non-managed, but by design it will require different approaches in case it divert.
Quoted 27 lines
Quoted 2 lines
Maybe you, guys, should got some agreement and clarify it in the documentation?
I agree that the pcim_*() API is confusing at best and it would be nice to improve it and document it, but I don't think this series really does it.
There are several MSI-related interfaces that use
alloc_msi_entry()and hence magically become managed if we callpcim_enable_device():pci_alloc_irq_vectors() # ~150 callers pci_alloc_irq_vectors_affinity() # ~10 callers pci_enable_msix_exact() # ~20 callers (deprecated) pci_enable_msix_range() # ~50 callers (deprecated) pci_enable_msi() # ~100 callers (deprecated)This series adds
pcim_alloc_irq_vectors(), which sort of fixes *one* of them and makes this sequence look nice:pcim_enable_device(); pcim_alloc_irq_vectors();but all the others are still potentially managed even though the name doesn't indicate it.
And it really doesn't improve the documentation.
Quoted 7 lines
Possible steps forward:
- Add comments in
include/linux/pci.hto indicate deprecation (AFAICS, deprecation is currently only mentioned inmsi-howto.rst).- Migrate callers away from deprecated interfaces (a lot of work).
AFAIU you the proposal is to convert all drivers to use explicit error handling for pci_alloc_irq_vectors() and then undo that after introducing pcim_alloc_irq_vectors().
Why not having less churn by applying this series and then clean up things? We have a lot of unneeded churn now because of this rather lexicographical issue.
Quoted 9 lines
- Remove deprecated interfaces.
- Add
pcim_variants of remaining interfaces (I think only pci_alloc_*()). Consider returning error for pci_alloc_*() usage by managed drivers.- Convert managed callers from pci_alloc_*() to pcim_alloc_*() and remove usage of
pci_free_irq_vectors(),pci_disable_msi(),pci_disable_msix().
Seems to me a lot of useless churn, but maybe I'm missing the point?
Quoted 96 lines
Quoted 96 lines
[0]: We have a few functions with
pcim_prefix, few without and some from the
latter group imply to behave _differently_ whenpcim_enable_device()had been called.
[1]: I'm not able to find the archive of the mailing, but I remember that it
was something like that IIRC during8250_lpss.cdevelopment.
[2]: https://lore.kernel.org/linux-pci/[email protected]/
[3]: https://www.kernel.org/doc/html/latest/PCI/msi-howto.html#using-msiQuoted 9 lines
It *does* remove unnecessary
pci_free_irq_vectors()calls fromi2c-designware-pcidrv.c.But because
pci_alloc_irq_vectors()and related interfaces are *already* managed as soon as a driver callspcim_enable_device(), we can simply remove thepci_free_irq_vectors()without doing anything else.I don't think we *should* do anything else.
See above.
Quoted 76 lines
There are many callers of
pcim_enable_device()that also callpci_alloc_irq_vectors(),pci_enable_msix_range(), etc. We don't havepcim_enable_msix_range(),pcim_enable_msi(),pcim_alloc_irq_vectors_affinity(), etc. I don't think it's worth the churn of adding all those and changing all the callers to use pcim_*() (as in patch 4/4 here).Browsing the output of this:
git grep -En "pcim_enable_device|pci_alloc_irq_vectors|pci_enable_msix_|pci_free_irq_vectors|pci_disable_msi"
leads me to believe there are similar calls of
pci_free_irq_vectors()that could be removed here:
mtip_pci_probe
sp_pci_probe
dw_edma_pcie_probe
hisi_dma_probe
ioat_pci_probe
plx_dma_probe
cci_pci_probe
hibmc_pci_probe
...and many more, but I got tired of looking.
Quoted 50 lines
Quoted 27 lines
Quoted 12 lines
include/linux/pci.h +12
-0+/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +* include/linux/pci.h pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, · line 1850
Quoted 10 lines
include/linux/pci.h +10
-0+* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags);This is great, but can you explain how
pci_alloc_irq_vectors()magically becomes a managed interface if we've already calledpcim_enable_device()?Quoted 6 lines
I certainly believe it does; I'd just like to put a hint in the commit log since my 5 minutes of grepping around didn't make it obvious to me.
I see that
pcim_enable_device()setspdev->is_managed, but I didn't find the connection between that andpci_alloc_irq_vectors().One needs to read and understand the code, I agree. The explanation is spread between
pcim_release()and __pci_enable_msi/x_range().The call chain is
msi_capability_init()/msix_capability_init()
...
<- __pci_enable_msi/x_range()<- pci_alloc_irq_vectors_affinity() <- pci_alloc_irq_vectors()where device
msi_enabled/msix_enabledis set.So, it may deserve to be explained in the commit message.
Quoted 1 line
Quoted 1 line
+}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
In reply to Andy ShevchenkoQuoted 2 lines · Andy Shevchenko
Dejin, why Christoph's email suddenly disappeared during updating?
Due to my negligence, I forgot to add Christoph to mail list.
Hi Christoph,
I can't tell you how sorry I am, I will be more careful in the future��
BR��
Dejin
Quoted 228 lines · Bjorn Helgaas
Quoted 31 lines · Andy Shevchenko
Quoted 27 lines · Bjorn Helgaas
Quoted 8 lines · Dejin Zheng
Quoted 7 lines
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.And use
pci_free_irq_vectors()to replace some code inpcim_release(), they are equivalent, and no functional change. It is more explicit thatpcim_alloc_irq_vectors()is a device-managed function....
Quoted 4 lines
Quoted 4 lines
drivers/pci/pci.c +0
-0@@ -1989,10 +1989,7 @@ static void pcim_release(struct device *gendev, void *res)struct pci_devres *this = res;int i;Quoted 10 lines
drivers/pci/pci.c static void pcim_release(struct device *gendev, void *res) · line 1992
Quoted 5 lines
drivers/pci/pci.c +1
-4-if (dev->msi_enabled) -pci_disable_msi (dev); -if (dev->msix_enabled) -pci_disable_msix (dev); +pci_free_irq_vectors (dev);If I understand correctly, this hunk is a nice simplification, but actually has nothing to do with making
pcim_alloc_irq_vectors(). I have it split to a separate patch in my local tree. Or am I wrong about that?Quoted 2 lines
It's a good simplification that had to be done when
pci_free_irq_vectors()appeared.Quoted 6 lines
Sorry to be pedantic. You say the simplification "had to be done," but AFAICT there was no actual *requirement* for this simplification to be done since
pci_free_irq_vectors()is functionally identical to the previous code.
I think we should do it because it's a little
simpler, but not because it *fixes* anything.It makes things more straightforward. So it definitely "fixes" something, but not the code in this case, rather how we maintain this code.
Quoted 58 lines
Quoted 3 lines
But here is the fact that indirectly it's related to the pcim_*() APIs, i.e.
pcim_alloc_irq_vectors(), because you may noticed this is insidepcim_release().Yes. For posterity, my notes about the call chain (after applying this patch):
pci_alloc_irq_vectors
pci_alloc_irq_vectors_affinity
__pci_enable_msix_range# MSI-X path
__pci_enable_msix
msix_capability_init
msix_setup_entries
for (...)
entry =alloc_msi_entry
kzalloc(msi_desc)<--- alloc
kmemdup(msi_desc->affinity)<--- alloc
dev->msix_enabled= 1 # MSI-X enabled
__pci_enable_msi_range# MSI path
msi_capability_init
msi_setup_entry
alloc_msi_entry<--- alloc
dev->msi_enabled= 1 # MSI enabled
pcim_releasepci_free_irq_vectors pci_disable_msix # MSI-X if (!dev->msix_enabled) return pci_msix_shutdown dev->msix_enabled = 0 # MSI-X disabled free_msi_irqs list_for_each_entry_safe(..., msi_list, ...) free_msi_entry kfree(msi_desc->affinity) <--- free kfree(msi_desc) <--- free pci_disable_msi # MSI if (!dev->msi_enabled) return pci_msi_shutdown dev->msi_enabled = 0 # MSI disabled free_msi_irqs <--- freeSo I *think* (correct me if I'm wrong):
- If a driver calls
pcim_enable_device(), we will callpcim_release()when the last reference to the device is dropped.-
pci_alloc_irq_vectors()allocatesmsi_descandirq_affinity_descstructures viamsix_setup_entries()ormsi_setup_entry().-
pcim_release()will free thosemsi_descandirq_affinity_descstructures.- Even before this series,
pcim_release()freesmsi_descandirq_affinity_descstructures by callingpci_disable_msi()andpci_disable_msix().Quoted 5 lines
- Calling
pci_free_irq_vectors()(orpci_disable_msi()orpci_disable_msix()) twice is unnecessary but probably harmless because they bail out early.So this series actually does not fix any problems whatsoever.
I tend to disagree.
The PCI managed API is currently inconsistent and what you got is what I already know and had been using until (see below) Christoph told not to do [1].
Even do you as PCI maintainer it took some time to figure this out. But current APIs make it hard for mere users who wants to use it in the drivers.
So, main point of fix here is
_APIinconsistency_[0].But hey, I believe you have been Cc'ed to the initial submission of the pci_*_irq_vector*() rework done by Christoph [2] (hmm... don't see your name there). And he updated documentation as well [3].
Moreover, he insisted to use
pci_free_irq_vectors()whenever we are usingpci_alloc_irq_vectors(). And he suggested if we want to avoid this we have to makepcim_variant of the API (see [1] again).Maybe you, guys, should got some agreement and clarify it in the documentation?
[0]: We have a few functions with
pcim_prefix, few without and some from the
latter group imply to behave _differently_ whenpcim_enable_device()had been called.
[1]: I'm not able to find the archive of the mailing, but I remember that it
was something like that IIRC during8250_lpss.cdevelopment.
[2]: https://lore.kernel.org/linux-pci/[email protected]/
[3]: https://www.kernel.org/doc/html/latest/PCI/msi-howto.html#using-msiQuoted 9 lines
It *does* remove unnecessary
pci_free_irq_vectors()calls fromi2c-designware-pcidrv.c.But because
pci_alloc_irq_vectors()and related interfaces are *already* managed as soon as a driver callspcim_enable_device(), we can simply remove thepci_free_irq_vectors()without doing anything else.I don't think we *should* do anything else.
See above.
Quoted 76 lines
There are many callers of
pcim_enable_device()that also callpci_alloc_irq_vectors(),pci_enable_msix_range(), etc. We don't havepcim_enable_msix_range(),pcim_enable_msi(),pcim_alloc_irq_vectors_affinity(), etc. I don't think it's worth the churn of adding all those and changing all the callers to use pcim_*() (as in patch 4/4 here).Browsing the output of this:
git grep -En "pcim_enable_device|pci_alloc_irq_vectors|pci_enable_msix_|pci_free_irq_vectors|pci_disable_msi"
leads me to believe there are similar calls of
pci_free_irq_vectors()that could be removed here:
mtip_pci_probe
sp_pci_probe
dw_edma_pcie_probe
hisi_dma_probe
ioat_pci_probe
plx_dma_probe
cci_pci_probe
hibmc_pci_probe
...and many more, but I got tired of looking.
Quoted 50 lines
Quoted 27 lines
Quoted 12 lines
include/linux/pci.h +12
-0+/** +* pcim_alloc_irq_vectors - a device-managed pci_alloc_irq_vectors() +* @dev: PCI device to operate on +* @min_vecs: minimum number of vectors required (must be >= 1) +* @max_vecs: maximum (desired) number of vectors +* @flags: flags or quirks for the allocation +* +* Return the number of vectors allocated, (which might be smaller than +* @max_vecs) if successful, or a negative error code on error. If less +* than @min_vecs interrupt vectors are available for @dev the function +* will fail with -ENOSPC. +* include/linux/pci.h pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, · line 1850
Quoted 10 lines
include/linux/pci.h +10
-0+* It depends on calling pcim_enable_device() to make IRQ resources +* manageable. +*/ +static inline int +pcim_alloc_irq_vectors (struct pci_dev *dev,unsigned int min_vecs, +unsigned int max_vecs,unsigned int flags) +{ +if (!pci_is_managed (dev)) +return -EINVAL ; +return pci_alloc_irq_vectors (dev, min_vecs, max_vecs, flags);This is great, but can you explain how
pci_alloc_irq_vectors()magically becomes a managed interface if we've already calledpcim_enable_device()?Quoted 6 lines
I certainly believe it does; I'd just like to put a hint in the commit log since my 5 minutes of grepping around didn't make it obvious to me.
I see that
pcim_enable_device()setspdev->is_managed, but I didn't find the connection between that andpci_alloc_irq_vectors().One needs to read and understand the code, I agree. The explanation is spread between
pcim_release()and __pci_enable_msi/x_range().The call chain is
msi_capability_init()/msix_capability_init()
...
<- __pci_enable_msi/x_range()<- pci_alloc_irq_vectors_affinity() <- pci_alloc_irq_vectors()where device
msi_enabled/msix_enabledis set.So, it may deserve to be explained in the commit message.
Quoted 1 line
Quoted 1 line
+}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Re: [PATCH v7 1/4] PCI: Introduce pcim_alloc_irq_vectors()
In reply to Dejin ZhengQuoted 3 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). Introducing this function can simplify the error handling path in many drivers.
How does it do that when it just is a trivial wrapper erroring out for the unmanaged case?
PATCH v7 2/4 Documentation: devres: Add pcim_alloc_irq_vectors()
In reply to Dejin ZhengAdd pcim_alloc_irq_vectors(), a device-managed version of pci_alloc_irq_vectors(). introducing this function can simplify the error handling path in many drivers.
---
v6 -> v7:
- rebase to PCI next branch
v5 -> v6:
- rebase to 5.13-rc4
v4 -> v5:
- No change
v3 -> v4:
- No change
v2 -> v3:
- No change
v1 -> v2:
- Modify some commit messages.
Documentation/driver-api/driver-model/devres.rst | 1 + 1 file changed, 1 insertion(+)
Documentation/driver-api/driver-model/devres.rst +1 -0
@@ -382,6 +382,7 @@ PCI devm_pci_alloc_host_bridge() : managed PCI host bridge allocation devm_pci_remap_cfgspace() : ioremap PCI configuration space devm_pci_remap_cfg_resource() : ioremap PCI configuration space resource + pcim_alloc_irq_vectors() : managed IRQ vectors allocation pcim_enable_device() : after success, all PCI ops become managed pcim_pin_device() : keep PCI device enabled after release
Signature · 1 line
2.30.1
Re: [PATCH v7 2/4] Documentation: devres: Add pcim_alloc_irq_vectors()
Quoted 3 lines · Dejin Zheng
Add
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(). introducing this function can simplify the error handling path in many drivers.
This is good one, thanks.
Quoted 34 lines
Reviewed-by Robert Richter <[email protected]>Signed-off-by Dejin Zheng <[email protected]>---
v6 -> v7:
- rebase to PCI next branch
v5 -> v6:
- rebase to 5.13-rc4
v4 -> v5:
- No change
v3 -> v4:
- No change
v2 -> v3:
- No change
v1 -> v2:
- Modify some commit messages.Documentation/driver-api/driver-model/devres.rst | 1 + 1 file changed, 1 insertion(+)Documentation/driver-api/driver-model/devres.rst +1
-0@@ -382,6 +382,7 @@ PCI devm_pci_alloc_host_bridge() : managed PCI host bridge allocation devm_pci_remap_cfgspace() : ioremap PCI configuration space devm_pci_remap_cfg_resource() : ioremap PCI configuration space resource + pcim_alloc_irq_vectors() : managed IRQ vectors allocation pcim_enable_device() : after success, all PCI ops become managed pcim_pin_device() : keep PCI device enabled after releaseSignature · 1 line
2.30.1
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v7 3/4 i2c: designware: Use pcim_alloc_irq_vectors() to allocate IRQ vectors
In reply to Dejin ZhengThe pcim_alloc_irq_vectors() function, an explicit device-managed version of pci_alloc_irq_vectors(). If pcim_enable_device() has been called before, then pci_alloc_irq_vectors() is actually a device-managed function. It is used here as a device-managed function, So replace it with pcim_alloc_irq_vectors(). At the same time, Remove the pci_free_irq_vectors() function to simplify the error handling path. the freeing resources will take automatically when device is gone.
---
v6 -> v7:
- rebase to PCI next branch
v5 -> v6:
- rebase to 5.13-rc4
v4 -> v5:
- Modify the subject name.
v3 -> v4:
- add some commit comments.
v2 -> v3:
- simplify the error handling path.
v1 -> v2:
- Modify some commit messages.
drivers/i2c/busses/i2c-designware-pcidrv.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-)
drivers/i2c/busses/i2c-designware-pcidrv.c +4 -11
@@ -268,7 +268,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,if (!dev)return -ENOMEM ; - r =pci_alloc_irq_vectors (pdev,1 ,1 ,PCI_IRQ_ALL_TYPES ); + r =pcim_alloc_irq_vectors (pdev,1 ,1 ,PCI_IRQ_ALL_TYPES );if (r <0 )return r;
@@ -283,10 +283,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,if (controller->setup) { r = controller->setup (pdev, controller); -if (r) { -pci_free_irq_vectors (pdev); +if (r)return r; - } }i2c_dw_adjust_bus_speed (dev);
@@ -295,10 +293,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,i2c_dw_acpi_configure (&pdev->dev); r =i2c_dw_validate_speed (dev); -if (r) { -pci_free_irq_vectors (pdev); +if (r)return r; - }i2c_dw_configure (dev);
@@ -318,10 +314,8 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, adap->nr = controller->bus_num; r =i2c_dw_probe (dev); -if (r) { -pci_free_irq_vectors (pdev); +if (r)return r; - }if ((dev->flags &MODEL_MASK ) ==MODEL_AMD_NAVI_GPU ) { r =navi_amd_register_client (dev);
@@ -349,7 +343,6 @@ static void i2c_dw_pci_remove(struct pci_dev *pdev)i2c_del_adapter (&dev->adapter);devm_free_irq (&pdev->dev, dev->irq, dev); -pci_free_irq_vectors (pdev); }/* work with hotplug and coldplug */
Signature · 1 line
2.30.1
Re: [PATCH v7 3/4] i2c: designware: Use pcim_alloc_irq_vectors() to allocate IRQ vectors
Quoted 8 lines · Dejin Zheng
The
pcim_alloc_irq_vectors()function, an explicit device-managed version ofpci_alloc_irq_vectors(). Ifpcim_enable_device()has been called before, thenpci_alloc_irq_vectors()is actually a device-managed function. It is used here as a device-managed function, So replace it withpcim_alloc_irq_vectors(). At the same time, Remove thepci_free_irq_vectors()function to simplify the error handling path. the freeing resources will take automatically when device is gone.
Quoted 4 lines
Reviewed-by Robert Richter <[email protected]>Acked-by Andy Shevchenko <[email protected]>Acked-by Jarkko Nikula <[email protected]>Signed-off-by Dejin Zheng <[email protected]>
Dunno the status of this series, but if it ever goes upstream, I am fine with the I2C changes:
PATCH v7 4/4 i2c: thunderx: Use pcim_alloc_irq_vectors() to allocate IRQ vectors
In reply to Dejin ZhengThe pcim_alloc_irq_vectors() function, an explicit device-managed version of pci_alloc_irq_vectors(). If pcim_enable_device() has been called before, then pci_alloc_irq_vectors() is actually a device-managed function. It is used here as a device-managed function, So replace it with pcim_alloc_irq_vectors().
---
v6 -> v7:
- rebase to PCI next branch
v5 -> v6:
- rebase to 5.13-rc4
v4 -> v5:
- Modify the subject name.
v3 -> v4:
- No change.
v2 -> v3:
- No change.
v1 -> v2:
- Modify some commit messages.
drivers/i2c/busses/i2c-thunderx-pcidrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/i2c/busses/i2c-thunderx-pcidrv.c +1 -1
@@ -192,7 +192,7 @@ static int thunder_i2c_probe_pci(struct pci_dev *pdev, i2c->hlc_int_enable = thunder_i2c_hlc_int_enable; i2c->hlc_int_disable = thunder_i2c_hlc_int_disable; - ret =pci_alloc_irq_vectors (pdev,1 ,1 ,PCI_IRQ_MSIX ); + ret =pcim_alloc_irq_vectors (pdev,1 ,1 ,PCI_IRQ_MSIX );if (ret <0 ) goto error;
Signature · 1 line
2.30.1
Re: [PATCH v7 4/4] i2c: thunderx: Use pcim_alloc_irq_vectors() to allocate IRQ vectors
Quoted 8 lines · Dejin Zheng
The
pcim_alloc_irq_vectors()function, an explicit device-managed version ofpci_alloc_irq_vectors(). Ifpcim_enable_device()has been called before, thenpci_alloc_irq_vectors()is actually a device-managed function. It is used here as a device-managed function, So replace it withpcim_alloc_irq_vectors().Acked-by Robert Richter <[email protected]>Signed-off-by Dejin Zheng <[email protected]>
Andy Shevchenko
reviewer+Cc: Philipp (JFYI)
Quoted 29 lines · Dejin Zheng
Introduce
pcim_alloc_irq_vectors(), a device-managed version ofpci_alloc_irq_vectors(), In some i2c drivers, Ifpcim_enable_device()has been called before, thenpci_alloc_irq_vectors()is actually a device-managed function. It is used as a device-managed function, So replace it withpcim_alloc_irq_vectors().Changelog
---------
v6 -> v7:
- rebase to PCI next branch
- add a stub forpci_is_managed()when disable PCI for fix build error in sparc architecture.
v5 -> v6:
- rebase to 5.13-rc4
v4 -> v5:
- Remove the check of enable device inpcim_alloc_irq_vectors()and make it as a static line function.
- Modify the subject name in patch 3 and patch 4.
v3 -> v4:
- add some commit comments for patch 3
v2 -> v3:
- Add some commit comments for replace some codes inpcim_release()bypci_free_irq_vectors().
- Simplify the error handling path in i2c designware driver.
v1 -> v2:
- Usepci_free_irq_vectors()to replace some code inpcim_release().
- Modify some commit messages.
Signature · 2 lines
With Best Regards, Andy Shevchenko