* [PATCH] PCI: endpoint: Return error code when callback is not implemented
@ 2023-08-17 13:33 Rick Wertenbroek
2023-08-18 2:51 ` Damien Le Moal
0 siblings, 1 reply; 2+ messages in thread
From: Rick Wertenbroek @ 2023-08-17 13:33 UTC (permalink / raw)
To: rick.wertenbroek
Cc: dlemoal, Rick Wertenbroek, Lorenzo Pieralisi,
Krzysztof Wilczyński, Manivannan Sadhasivam,
Kishon Vijay Abraham I, Bjorn Helgaas, linux-pci, linux-kernel
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] PCI: endpoint: Return error code when callback is not implemented
2023-08-17 13:33 [PATCH] PCI: endpoint: Return error code when callback is not implemented Rick Wertenbroek
@ 2023-08-18 2:51 ` Damien Le Moal
0 siblings, 0 replies; 2+ messages in thread
From: Damien Le Moal @ 2023-08-18 2:51 UTC (permalink / raw)
To: Rick Wertenbroek, rick.wertenbroek
Cc: Lorenzo Pieralisi, Krzysztof Wilczyński,
Manivannan Sadhasivam, Kishon Vijay Abraham I, Bjorn Helgaas,
linux-pci, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-08-18 2:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-17 13:33 [PATCH] PCI: endpoint: Return error code when callback is not implemented Rick Wertenbroek
2023-08-18 2:51 ` Damien Le Moal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).