PCI: Align return values of PCIe capability and PCI accessors
Subsystems (7)
v2 cover PCI: Align return values of PCIe capability and PCI accessors
From: Bolarinwa Olayemi Saheed <[email protected]>
PATCH 1/8 to 7/8:PCIBIOS_ error codes have positive values and they are passed down the call heirarchy from accessors. For functions which are meant to return only a negative value on failure, passing on this value is a bug. To mitigate this, call pcibios_err_to_errno() before passing on return value from PCIe capability accessors call heirarchy. This function converts any positive PCIBIOS_ error codes to negative generic error values.
PATCH 8/8:
The PCIe capability accessors can return 0, -EINVAL, or any PCIBIOS_ error code. The pci accessor on the other hand can only return 0 or any PCIBIOS_ error code.This inconsistency among these accessor makes it harder for callers to check for errors.
Return PCIBIOS_BAD_REGISTER_NUMBER instead of -EINVAL in all PCIe capability accessors.
MERGING:
These may all be merged via the PCI tree, since it is a collection of similar fixes. This way they all get merged at once.
Version 2:
* cc to maintainers and mailing lists
* Edit the Subject to conform with previous style
* reorder "Signed by" and "Suggested by"
* made spelling corrections
* fixed redundant initialisation in PATCH 3/8
* include missing call to pcibios_err_to_errno() in PATCH 6/8 and 7/8
Bolarinwa Olayemi Saheed (8):
dmaengine: ioatdma: Convert PCIBIOS_* errors to generic -E* errors IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors
PCI: Convert PCIBIOS_* errors to generic -E* errors
scsi: smartpqi: Convert PCIBIOS_* errors to generic -E* errors PCI/AER: Convert PCIBIOS_* errors to generic -E* errors PCI/AER: Convert PCIBIOS_* errors to generic -E* errors
PCI: Align return values of PCIe capability and PCI accessorss
drivers/dma/ioat/init.c | 4 ++-- drivers/infiniband/hw/hfi1/pcie.c | 18 +++++++++++++----- drivers/pci/access.c | 8 ++++---- drivers/pci/pci.c | 10 ++++++++-- drivers/pci/pcie/aer.c | 12 ++++++++++-- drivers/scsi/smartpqi/smartpqi_init.c | 6 +++++- 6 files changed, 42 insertions(+), 16 deletions(-)
Signature · 1 line
2.18.2
PATCH v2 1/8 dmaengine: ioatdma: Convert PCIBIOS_* errors to generic -E* errors
From: Bolarinwa Olayemi Saheed <[email protected]>
ioat3_dma_probe() returns PCIBIOS_ error codes from PCIe capability accessors.
PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure.
Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values.
--- drivers/dma/ioat/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/dma/ioat/init.c +2 -2
@@ -1195,13 +1195,13 @@ static int ioat3_dma_probe(struct ioatdma_device *ioat_dma, int dca)/* disable relaxed ordering */ err =pcie_capability_read_word (pdev,IOAT_DEVCTRL_OFFSET , &val16);if (err) -return err; +return pcibios_err_to_errno (err);/* clear relaxed ordering enable */ val16 &= ~IOAT_DEVCTRL_ROE ; err =pcie_capability_write_word (pdev,IOAT_DEVCTRL_OFFSET , val16);if (err) -return err; +return pcibios_err_to_errno (err);if (ioat_dma->cap &IOAT_CAP_DPS ) writeb(ioat_pending_level + 1,
Signature · 6 lines
2.18.2 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v2 2/8 IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors
In reply to [email protected]From: Bolarinwa Olayemi Saheed <[email protected]>
pcie_speeds() returns PCIBIOS_ error codes from PCIe capability accessors.
PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure.
Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values.
--- drivers/infiniband/hw/hfi1/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hfi1/pcie.c +1 -1
@@ -306,7 +306,7 @@ int pcie_speeds(struct hfi1_devdata *dd) ret =pcie_capability_read_dword (dd->pcidev,PCI_EXP_LNKCAP , &linkcap);if (ret) {dd_dev_err (dd,"Unable to read from PCI config\n" ); -return ret; +return pcibios_err_to_errno (ret); }if ((linkcap &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_8_0GB ) {
Signature · 6 lines
2.18.2 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Re: [PATCH v2 2/8] IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors
Quoted 23 lines · On 6/15/2020 3:32 AM, [email protected] wrote:
From: Bolarinwa Olayemi Saheed <[email protected]>
pcie_speeds()returnsPCIBIOS_error codes from PCIe capability accessors.
PCIBIOS_error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure.Before passing on the return value of PCIe capability accessors, call
pcibios_err_to_errno()to convert any positivePCIBIOS_error codes to negative generic error values.Suggested-by Bjorn Helgaas <[email protected]>Signed-off-by Bolarinwa Olayemi Saheed <[email protected]>--- drivers/infiniband/hw/hfi1/pcie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/infiniband/hw/hfi1/pcie.c +0
-0
drivers/infiniband/hw/hfi1/pcie.c int pcie_speeds(struct hfi1_devdata *dd) · line 312
Quoted 8 lines
drivers/infiniband/hw/hfi1/pcie.c +1
-1@@ -306,7 +306,7 @@ int pcie_speeds(struct hfi1_devdata *dd) ret =pcie_capability_read_dword (dd->pcidev,PCI_EXP_LNKCAP , &linkcap);if (ret) {dd_dev_err (dd,"Unable to read from PCI config\n" ); -return ret; +return pcibios_err_to_errno (ret); }if ((linkcap &PCI_EXP_LNKCAP_SLS ) !=PCI_EXP_LNKCAP_SLS_8_0GB ) {
PATCH v2 3/8 IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors
In reply to [email protected]From: Bolarinwa Olayemi Saheed <[email protected]>
restore_pci_variables() and save_pci_variables() return PCIBIOS_ error codes from PCIe capability accessors.
PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure.
Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values.
Fix redundant initialisation.
--- drivers/infiniband/hw/hfi1/pcie.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)
drivers/infiniband/hw/hfi1/pcie.c +14 -6
@@ -334,10 +334,14 @@ int pcie_speeds(struct hfi1_devdata *dd)return 0 ; } -/* restore command and BARs after a reset has wiped them out */ +/** +* Restore command and BARs after a reset has wiped them out +* +* Returns 0 on success, otherwise a negative error value +*/ int restore_pci_variables (struct hfi1_devdata *dd) { -int ret =0 ; +int ret; ret =pci_write_config_word (dd->pcidev,PCI_COMMAND , dd->pci_command);if (ret)
@@ -386,13 +390,17 @@ int restore_pci_variables(struct hfi1_devdata *dd) error:dd_dev_err (dd,"Unable to write to PCI config\n" ); -return ret; +return pcibios_err_to_errno (ret); } -/* Save BARs and command to rewrite after device reset */ +/** +* Save BARs and command to rewrite after device reset +* +* Returns 0 on success, otherwise a negative error value +*/ int save_pci_variables (struct hfi1_devdata *dd) { -int ret =0 ; +int ret; ret =pci_read_config_dword (dd->pcidev,PCI_BASE_ADDRESS_0 , &dd->pcibar0);
@@ -441,7 +449,7 @@ int save_pci_variables(struct hfi1_devdata *dd) error:dd_dev_err (dd,"Unable to read from PCI config\n" ); -return ret; +return pcibios_err_to_errno (ret); }/*
Signature · 6 lines
2.18.2 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Re: [PATCH v2 3/8] IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors
Quoted 8 lines · On 6/15/2020 3:32 AM, [email protected] wrote:
From: Bolarinwa Olayemi Saheed <[email protected]>
restore_pci_variables()andsave_pci_variables()returnPCIBIOS_error codes from PCIe capability accessors.
PCIBIOS_error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure.
Quoted 8 lines
Before passing on the return value of PCIe capability accessors, call
pcibios_err_to_errno()to convert any positivePCIBIOS_error codes to negative generic error values.Fix redundant initialisation.
Suggested-by Bjorn Helgaas <[email protected]>Signed-off-by Bolarinwa Olayemi Saheed <[email protected]>
Looks like we may have had a problem when calling pci_read_config_dword() from the init dd path and doing a check for < 0 to bail. So this looks like goodness to me.
_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v2 4/8 PCI: Convert PCIBIOS_* errors to generic -E* errors
In reply to [email protected]From: Bolarinwa Olayemi Saheed <[email protected]>
Both pcie_set_readrq() and pcie_set_readrq() return PCIBIOS_ error codes which were passed down the call heirarchy from PCIe capability accessors.
PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure.
Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values.
--- drivers/pci/pci.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/pci/pci.c +8 -2
@@ -5698,6 +5698,7 @@ EXPORT_SYMBOL(pcie_get_readrq);int pcie_set_readrq (struct pci_dev *dev,int rq) {u16 v; +int ret;if (rq <128 || rq >4096 || !is_power_of_2 (rq))return -EINVAL ;
@@ -5716,8 +5717,10 @@ int pcie_set_readrq(struct pci_dev *dev, int rq) v = (ffs (rq) -8 ) <<12 ; -return pcie_capability_clear_and_set_word (dev,PCI_EXP_DEVCTL , + ret =pcie_capability_clear_and_set_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_DEVCTL_READRQ , v); + +return pcibios_err_to_errno (ret); }EXPORT_SYMBOL (pcie_set_readrq);
@@ -5748,6 +5751,7 @@ EXPORT_SYMBOL(pcie_get_mps);int pcie_set_mps (struct pci_dev *dev,int mps) {u16 v; +int ret;if (mps <128 || mps >4096 || !is_power_of_2 (mps))return -EINVAL ;
@@ -5757,8 +5761,10 @@ int pcie_set_mps(struct pci_dev *dev, int mps)return -EINVAL ; v <<=5 ; -return pcie_capability_clear_and_set_word (dev,PCI_EXP_DEVCTL , + ret =pcie_capability_clear_and_set_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_DEVCTL_PAYLOAD , v); + +return pcibios_err_to_errno (ret); }EXPORT_SYMBOL (pcie_set_mps);
Signature · 6 lines
2.18.2 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v2 5/8 scsi: smartpqi: Convert PCIBIOS_* errors to generic -E* errors
In reply to [email protected]From: Bolarinwa Olayemi Saheed <[email protected]>
pqi_set_pcie_completion_timeout() return PCIBIOS_ error codes which were passed on down the call heirarchy from PCIe capability accessors.
PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure.
Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values.
--- drivers/scsi/smartpqi/smartpqi_init.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/scsi/smartpqi/smartpqi_init.c +5 -1
@@ -7423,8 +7423,12 @@ static int pqi_ctrl_init_resume(struct pqi_ctrl_info *ctrl_info)static inline int pqi_set_pcie_completion_timeout (struct pci_dev *pci_dev,u16 timeout) { -return pcie_capability_clear_and_set_word (pci_dev,PCI_EXP_DEVCTL2 , +int rc; + + rc =pcie_capability_clear_and_set_word (pci_dev,PCI_EXP_DEVCTL2 ,PCI_EXP_DEVCTL2_COMP_TIMEOUT , timeout); + +return pcibios_err_to_errno (rc); }static int pqi_pci_init (struct pqi_ctrl_info *ctrl_info)
Signature · 1 line
2.18.2
PATCH v2 6/8 PCI/AER: Convert PCIBIOS_* errors to generic -E* errors
In reply to [email protected]From: Bolarinwa Olayemi Saheed <[email protected]>
pci_enable_pcie_error_reporting() return PCIBIOS_ error codes which were passed on down the call heirarchy from PCIe capability accessors.
PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure.
Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative generic error values.
--- drivers/pci/pcie/aer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pci/pcie/aer.c +5 -1
@@ -349,13 +349,17 @@ bool aer_acpi_firmware_first(void)int pci_enable_pcie_error_reporting (struct pci_dev *dev) { +int rc; +if (pcie_aer_get_firmware_first (dev))return -EIO ;if (!dev->aer_cap)return -EIO ; -return pcie_capability_set_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_AER_FLAGS ); + rc =pcie_capability_set_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_AER_FLAGS ); + +return pcibios_err_to_errno (rc); }EXPORT_SYMBOL_GPL (pci_enable_pcie_error_reporting);
Signature · 6 lines
2.18.2 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v2 7/8 PCI/AER: Convert PCIBIOS_* errors to generic -E* errors
In reply to [email protected]From: Bolarinwa Olayemi Saheed <[email protected]>
pci_disable_pcie_error_reporting() returns PCIBIOS_ error code which were passed down the call heirarchy from PCIe capability accessors.
PCIBIOS_ error codes have positive values. Passing on these values is inconsistent with functions which return only a negative value on failure.
Before passing on the return value of PCIe capability accessors, call pcibios_err_to_errno() to convert any positive PCIBIOS_ error codes to negative error values.
--- drivers/pci/pcie/aer.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/pci/pcie/aer.c +5 -1
@@ -365,11 +365,15 @@ EXPORT_SYMBOL_GPL(pci_enable_pcie_error_reporting);int pci_disable_pcie_error_reporting (struct pci_dev *dev) { +int rc; +if (pcie_aer_get_firmware_first (dev))return -EIO ; -return pcie_capability_clear_word (dev,PCI_EXP_DEVCTL , + rc =pcie_capability_clear_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_AER_FLAGS ); + +return pcibios_err_to_errno (rc); }EXPORT_SYMBOL_GPL (pci_disable_pcie_error_reporting);
Signature · 6 lines
2.18.2 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
PATCH v2 8/8 PCI: Align return values of PCIe capability and PCI accessors
In reply to [email protected]From: Bolarinwa Olayemi Saheed <[email protected]>
The PCIe capability accessors can return 0, -EINVAL, or any PCIBIOS_ error code. PCIBIOS_ error codes have positive values. The PCI accessor on the other hand can only return 0 or any PCIBIOS_ error code. This inconsistency among these accessor makes it harder for callers to check for errors.
Return PCIBIOS_BAD_REGISTER_NUMBER instead of -EINVAL in all PCIe capability accessors.
--- drivers/pci/access.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pci/access.c +4 -4
@@ -409,7 +409,7 @@ int pcie_capability_read_word(struct pci_dev *dev, int pos, u16 *val) *val =0 ;if (pos &1 ) -return -EINVAL ; +return PCIBIOS_BAD_REGISTER_NUMBER ;if (pcie_capability_reg_implemented (dev, pos)) { ret =pci_read_config_word (dev,pci_pcie_cap (dev) + pos, val);
@@ -444,7 +444,7 @@ int pcie_capability_read_dword(struct pci_dev *dev, int pos, u32 *val) *val =0 ;if (pos &3 ) -return -EINVAL ; +return PCIBIOS_BAD_REGISTER_NUMBER ;if (pcie_capability_reg_implemented (dev, pos)) { ret =pci_read_config_dword (dev,pci_pcie_cap (dev) + pos, val);
@@ -469,7 +469,7 @@ EXPORT_SYMBOL(pcie_capability_read_dword);int pcie_capability_write_word (struct pci_dev *dev,int pos,u16 val) {if (pos &1 ) -return -EINVAL ; +return PCIBIOS_BAD_REGISTER_NUMBER ;if (!pcie_capability_reg_implemented (dev, pos))return 0 ;
@@ -481,7 +481,7 @@ EXPORT_SYMBOL(pcie_capability_write_word);int pcie_capability_write_dword (struct pci_dev *dev,int pos,u32 val) {if (pos &3 ) -return -EINVAL ; +return PCIBIOS_BAD_REGISTER_NUMBER ;if (!pcie_capability_reg_implemented (dev, pos))return 0 ;
Signature · 6 lines
2.18.2 _______________________________________________ Linux-kernel-mentees mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
Quoted 20 lines · On Mon, Jun 15, 2020 at 09:32:17AM +0200, [email protected] wrote:
From: Bolarinwa Olayemi Saheed <[email protected]>
PATCH 1/8 to 7/8:
PCIBIOS_error codes have positive values and they are passed down the call heirarchy from accessors. For functions which are meant to return only a negative value on failure, passing on this value is a bug. To mitigate this, callpcibios_err_to_errno()before passing on return value from PCIe capability accessors call heirarchy. This function converts any positivePCIBIOS_error codes to negative generic error values.PATCH 8/8:
The PCIe capability accessors can return 0,-EINVAL, or anyPCIBIOS_error code. The pci accessor on the other hand can only return 0 or anyPCIBIOS_error code.This inconsistency among these accessor makes it harder for callers to check for errors.
ReturnPCIBIOS_BAD_REGISTER_NUMBERinstead of-EINVALin all PCIe capability accessors.
Quoted 3 lines
MERGING:
These may all be merged via the PCI tree, since it is a collection of similar fixes. This way they all get merged at once.
I prefer this not happen for active trees, it just risks needless merge conflicts.
I will take the hfi1 patches at least, let me know when they are reviewed
Thanks,
Jason
Quoted 43 lines · On Mon, Jun 15, 2020 at 09:32:17AM +0200, [email protected] wrote:
From: Bolarinwa Olayemi Saheed <[email protected]>
PATCH 1/8 to 7/8:
PCIBIOS_error codes have positive values and they are passed down the call heirarchy from accessors. For functions which are meant to return only a negative value on failure, passing on this value is a bug. To mitigate this, callpcibios_err_to_errno()before passing on return value from PCIe capability accessors call heirarchy. This function converts any positivePCIBIOS_error codes to negative generic error values.PATCH 8/8:
The PCIe capability accessors can return 0,-EINVAL, or anyPCIBIOS_error code. The pci accessor on the other hand can only return 0 or anyPCIBIOS_error code.This inconsistency among these accessor makes it harder for callers to check for errors.
ReturnPCIBIOS_BAD_REGISTER_NUMBERinstead of-EINVALin all PCIe capability accessors.MERGING:
These may all be merged via the PCI tree, since it is a collection of similar fixes. This way they all get merged at once.Version 2:
* cc to maintainers and mailing lists
* Edit the Subject to conform with previous style
* reorder "Signed by" and "Suggested by"
* made spelling corrections
* fixed redundant initialisation in PATCH 3/8
* include missing call topcibios_err_to_errno()in PATCH 6/8 and 7/8Bolarinwa Olayemi Saheed (8):
dmaengine: ioatdma: Convert PCIBIOS_* errors to generic -E* errors IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors
PCI: Convert PCIBIOS_* errors to generic -E* errors
scsi: smartpqi: Convert PCIBIOS_* errors to generic -E* errors PCI/AER: Convert PCIBIOS_* errors to generic -E* errors PCI/AER: Convert PCIBIOS_* errors to generic -E* errors
PCI: Align return values of PCIe capability and PCI accessorss
Quoted 7 lines
drivers/dma/ioat/init.c | 4 ++-- drivers/infiniband/hw/hfi1/pcie.c | 18 +++++++++++++----- drivers/pci/access.c | 8 ++++---- drivers/pci/pci.c | 10 ++++++++-- drivers/pci/pcie/aer.c | 12 ++++++++++-- drivers/scsi/smartpqi/smartpqi_init.c | 6 +++++- 6 files changed, 42 insertions(+), 16 deletions(-)
Since these are really fixing a single PCI API problem, not individual driver-related problems, I squashed the pcibios_err_to_errno() patches together (except IB/hfi1, since Jason will take those separately) and applied them to pci/misc, thanks!
The squashed patch as applied is:
commit d20df83b66cc ("PCI: Convert PCIe capability PCIBIOS errors to errno")
Author: Bolarinwa Olayemi Saheed <[email protected]> Date: Mon Jun 15 09:32:18 2020 +0200
PCI: Convert PCIe capability PCIBIOS errors to errno
The PCI config accessors (pci_read_config_word(), et al) return PCIBIOS_SUCCESSFUL (zero) or positive error values like PCIBIOS_FUNC_NOT_SUPPORTED.
The PCIe capability accessors (pcie_capability_read_word(), et al) similarly return PCIBIOS errors, but some callers assume they return generic errno values like -EINVAL.
For example, the Myri-10G probe function returns a positive PCIBIOS error if the pcie_capability_clear_and_set_word() in pcie_set_readrq() fails:
myri10ge_probe
status = pcie_set_readrq
return pcie_capability_clear_and_set_word
if (status)
return status
A positive return from a PCI driver probe function would cause a "Driver probe function unexpectedly returned" warning from local_pci_probe() instead of the desired probe failure.
Convert PCIBIOS errors to generic errno for all callers of:
pcie_capability_read_word
pcie_capability_read_dword
pcie_capability_write_word
pcie_capability_write_dword
pcie_capability_set_word
pcie_capability_set_dword
pcie_capability_clear_word
pcie_capability_clear_dword
pcie_capability_clear_and_set_word
pcie_capability_clear_and_set_dword
that check the return code for anything other than zero.
drivers/dma/ioat/init.c +2 -2
@@ -1195,13 +1195,13 @@ static int ioat3_dma_probe(struct ioatdma_device *ioat_dma, int dca)/* disable relaxed ordering */ err =pcie_capability_read_word (pdev,IOAT_DEVCTRL_OFFSET , &val16);if (err) -return err; +return pcibios_err_to_errno (err);/* clear relaxed ordering enable */ val16 &= ~IOAT_DEVCTRL_ROE ; err =pcie_capability_write_word (pdev,IOAT_DEVCTRL_OFFSET , val16);if (err) -return err; +return pcibios_err_to_errno (err);if (ioat_dma->cap &IOAT_CAP_DPS ) writeb(ioat_pending_level + 1,
drivers/pci/pci.c +8 -2
@@ -5688,6 +5688,7 @@ EXPORT_SYMBOL(pcie_get_readrq);int pcie_set_readrq (struct pci_dev *dev,int rq) {u16 v; +int ret;if (rq <128 || rq >4096 || !is_power_of_2 (rq))return -EINVAL ;
@@ -5706,8 +5707,10 @@ int pcie_set_readrq(struct pci_dev *dev, int rq) v = (ffs (rq) -8 ) <<12 ; -return pcie_capability_clear_and_set_word (dev,PCI_EXP_DEVCTL , + ret =pcie_capability_clear_and_set_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_DEVCTL_READRQ , v); + +return pcibios_err_to_errno (ret); }EXPORT_SYMBOL (pcie_set_readrq);
@@ -5738,6 +5741,7 @@ EXPORT_SYMBOL(pcie_get_mps);int pcie_set_mps (struct pci_dev *dev,int mps) {u16 v; +int ret;if (mps <128 || mps >4096 || !is_power_of_2 (mps))return -EINVAL ;
@@ -5747,8 +5751,10 @@ int pcie_set_mps(struct pci_dev *dev, int mps)return -EINVAL ; v <<=5 ; -return pcie_capability_clear_and_set_word (dev,PCI_EXP_DEVCTL , + ret =pcie_capability_clear_and_set_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_DEVCTL_PAYLOAD , v); + +return pcibios_err_to_errno (ret); }EXPORT_SYMBOL (pcie_set_mps);
drivers/pci/pcie/aer.c +8 -3
@@ -224,20 +224,25 @@ int pcie_aer_is_native(struct pci_dev *dev)int pci_enable_pcie_error_reporting (struct pci_dev *dev) { +int rc; +if (!pcie_aer_is_native (dev))return -EIO ; -return pcie_capability_set_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_AER_FLAGS ); + rc =pcie_capability_set_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_AER_FLAGS ); +return pcibios_err_to_errno (rc); }EXPORT_SYMBOL_GPL (pci_enable_pcie_error_reporting);int pci_disable_pcie_error_reporting (struct pci_dev *dev) { +int rc; +if (!pcie_aer_is_native (dev))return -EIO ; -return pcie_capability_clear_word (dev,PCI_EXP_DEVCTL , -PCI_EXP_AER_FLAGS ); + rc =pcie_capability_clear_word (dev,PCI_EXP_DEVCTL ,PCI_EXP_AER_FLAGS ); +return pcibios_err_to_errno (rc); }EXPORT_SYMBOL_GPL (pci_disable_pcie_error_reporting);
drivers/scsi/smartpqi/smartpqi_init.c +5 -1
@@ -7423,8 +7423,12 @@ static int pqi_ctrl_init_resume(struct pqi_ctrl_info *ctrl_info)static inline int pqi_set_pcie_completion_timeout (struct pci_dev *pci_dev,u16 timeout) { -return pcie_capability_clear_and_set_word (pci_dev,PCI_EXP_DEVCTL2 , +int rc; + + rc =pcie_capability_clear_and_set_word (pci_dev,PCI_EXP_DEVCTL2 ,PCI_EXP_DEVCTL2_COMP_TIMEOUT , timeout); + +return pcibios_err_to_errno (rc); }static int pqi_pci_init (struct pqi_ctrl_info *ctrl_info)
Quoted 3 lines · On Mon, Jun 15, 2020 at 09:32:17AM +0200, [email protected] wrote:
Bolarinwa Olayemi Saheed (8):
IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors IB/hfi1: Convert PCIBIOS_* errors to generic -E* errors
Applied to rdma for-next thanks
Jason