1. Patchew
  2. linux
  3. View series

[PATCH] PCI: endpoint: Return error code when callback is not implemented

Rick Wertenbroek posted 1 patch 2 years, 4 months ago 
drivers/pci/endpoint/pci-epc-core.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
[PATCH] PCI: endpoint: Return error code when callback is not implemented
Posted by Rick Wertenbroek 2 years, 4 months ago 
Return an error code when the callback for an endpoint controller
function is not implemented (is null). Among all the functions, only
map_msi_irq() had an error returned if the callback was null. Extend
this error handling to other functions as well.

Signed-off-by: Rick Wertenbroek <rick.wertenbroek@gmail.com>
---
 drivers/pci/endpoint/pci-epc-core.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
index 5a4a8b0be626..14f4256b9410 100644
--- a/drivers/pci/endpoint/pci-epc-core.c
+++ b/drivers/pci/endpoint/pci-epc-core.c
@@ -196,7 +196,7 @@ int pci_epc_start(struct pci_epc *epc)
 		return -EINVAL;
 
 	if (!epc->ops->start)
-		return 0;
+		return -EINVAL;
 
 	mutex_lock(&epc->lock);
 	ret = epc->ops->start(epc);
@@ -228,7 +228,7 @@ int pci_epc_raise_irq(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
 		return -EINVAL;
 
 	if (!epc->ops->raise_irq)
-		return 0;
+		return -EINVAL;
 
 	mutex_lock(&epc->lock);
 	ret = epc->ops->raise_irq(epc, func_no, vfunc_no, type, interrupt_num);
@@ -340,7 +340,7 @@ int pci_epc_set_msi(struct pci_epc *epc, u8 func_no, u8 vfunc_no, u8 interrupts)
 		return -EINVAL;
 
 	if (!epc->ops->set_msi)
-		return 0;
+		return -EINVAL;
 
 	encode_int = order_base_2(interrupts);
 
@@ -408,7 +408,7 @@ int pci_epc_set_msix(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
 		return -EINVAL;
 
 	if (!epc->ops->set_msix)
-		return 0;
+		return -EINVAL;
 
 	mutex_lock(&epc->lock);
 	ret = epc->ops->set_msix(epc, func_no, vfunc_no, interrupts - 1, bir,
@@ -469,7 +469,7 @@ int pci_epc_map_addr(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
 		return -EINVAL;
 
 	if (!epc->ops->map_addr)
-		return 0;
+		return -EINVAL;
 
 	mutex_lock(&epc->lock);
 	ret = epc->ops->map_addr(epc, func_no, vfunc_no, phys_addr, pci_addr,
@@ -537,7 +537,7 @@ int pci_epc_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
 		return -EINVAL;
 
 	if (!epc->ops->set_bar)
-		return 0;
+		return -EINVAL;
 
 	mutex_lock(&epc->lock);
 	ret = epc->ops->set_bar(epc, func_no, vfunc_no, epf_bar);
@@ -575,7 +575,7 @@ int pci_epc_write_header(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
 		return -EINVAL;
 
 	if (!epc->ops->write_header)
-		return 0;
+		return -EINVAL;
 
 	mutex_lock(&epc->lock);
 	ret = epc->ops->write_header(epc, func_no, vfunc_no, header);
-- 
2.25.1
Re: [PATCH] PCI: endpoint: Return error code when callback is not implemented
Posted by Damien Le Moal 2 years, 4 months ago 
On 2023/08/17 22:33, Rick Wertenbroek wrote:
> Return an error code when the callback for an endpoint controller
> function is not implemented (is null). Among all the functions, only
> map_msi_irq() had an error returned if the callback was null. Extend
> this error handling to other functions as well.
> 
> Signed-off-by: Rick Wertenbroek <rick.wertenbroek@gmail.com>

We should check for the mandatory ops definition in pci_epf_register_driver()
for function drivers and in __pci_epc_create() for controller drivers.

> ---
>  drivers/pci/endpoint/pci-epc-core.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
> index 5a4a8b0be626..14f4256b9410 100644
> --- a/drivers/pci/endpoint/pci-epc-core.c
> +++ b/drivers/pci/endpoint/pci-epc-core.c
> @@ -196,7 +196,7 @@ int pci_epc_start(struct pci_epc *epc)
>  		return -EINVAL;
>  
>  	if (!epc->ops->start)
> -		return 0;
> +		return -EINVAL;
>  
>  	mutex_lock(&epc->lock);
>  	ret = epc->ops->start(epc);
> @@ -228,7 +228,7 @@ int pci_epc_raise_irq(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>  		return -EINVAL;
>  
>  	if (!epc->ops->raise_irq)
> -		return 0;
> +		return -EINVAL;

ENOTSUPP ?

>  
>  	mutex_lock(&epc->lock);
>  	ret = epc->ops->raise_irq(epc, func_no, vfunc_no, type, interrupt_num);
> @@ -340,7 +340,7 @@ int pci_epc_set_msi(struct pci_epc *epc, u8 func_no, u8 vfunc_no, u8 interrupts)
>  		return -EINVAL;
>  
>  	if (!epc->ops->set_msi)
> -		return 0;
> +		return -EINVAL;

ENOTSUPP ?

>  
>  	encode_int = order_base_2(interrupts);
>  
> @@ -408,7 +408,7 @@ int pci_epc_set_msix(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>  		return -EINVAL;
>  
>  	if (!epc->ops->set_msix)
> -		return 0;
> +		return -EINVAL;

ENOTSUPP ?

>  
>  	mutex_lock(&epc->lock);
>  	ret = epc->ops->set_msix(epc, func_no, vfunc_no, interrupts - 1, bir,
> @@ -469,7 +469,7 @@ int pci_epc_map_addr(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>  		return -EINVAL;
>  
>  	if (!epc->ops->map_addr)
> -		return 0;
> +		return -EINVAL;

This one is definitely mandatory and should always be defined. So check in
__pci_epc_create() ?

>  
>  	mutex_lock(&epc->lock);
>  	ret = epc->ops->map_addr(epc, func_no, vfunc_no, phys_addr, pci_addr,
> @@ -537,7 +537,7 @@ int pci_epc_set_bar(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>  		return -EINVAL;
>  
>  	if (!epc->ops->set_bar)
> -		return 0;
> +		return -EINVAL;

Same.

>  
>  	mutex_lock(&epc->lock);
>  	ret = epc->ops->set_bar(epc, func_no, vfunc_no, epf_bar);
> @@ -575,7 +575,7 @@ int pci_epc_write_header(struct pci_epc *epc, u8 func_no, u8 vfunc_no,
>  		return -EINVAL;
>  
>  	if (!epc->ops->write_header)
> -		return 0;
> +		return -EINVAL;

Same.

>  
>  	mutex_lock(&epc->lock);
>  	ret = epc->ops->write_header(epc, func_no, vfunc_no, header);

-- 
Damien Le Moal
Western Digital Research

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.