| Message ID | 1605792621-6268-1-git-send-email-zhangchangzhong@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] bnxt_en: fix error return code in bnxt_init_board() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On Thu, Nov 19, 2020 at 5:29 AM Zhang Changzhong <zhangchangzhong@huawei.com> wrote: > Fix to return a negative error code from the error handling > case instead of 0, as done elsewhere in this function. > > Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> > --- > drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > index 7c21aaa8..11d0542 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c > @@ -11590,6 +11590,7 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev) > if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) != 0 && > dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)) != 0) { > dev_err(&pdev->dev, "System does not support DMA, aborting\n"); > + rc = -EIO; > goto init_err_disable; > } > > -- > 2.9.5 Reviewed-by: Edwin Peer <edwin.peer@broadcom.com> Regards, Edwin Peer
On Thu, 19 Nov 2020 10:53:23 -0800 Edwin Peer wrote: > > Fix to return a negative error code from the error handling > > case instead of 0, as done elsewhere in this function. > > > > Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.") > > Reported-by: Hulk Robot <hulkci@huawei.com> > > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> > > if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) != 0 && > > dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)) != 0) { > > dev_err(&pdev->dev, "System does not support DMA, aborting\n"); > > + rc = -EIO; > > goto init_err_disable; Edwin, please double check if this shouldn't jump to pci_release_regions() (or maybe it's harmless 'cause PCI likes to magically release things on its own). > > } > > Reviewed-by: Edwin Peer <edwin.peer@broadcom.com> Applied thanks!
On Thu, Nov 19, 2020 at 9:53 PM Jakub Kicinski <kuba@kernel.org> wrote: > > On Thu, 19 Nov 2020 10:53:23 -0800 Edwin Peer wrote: > > > Fix to return a negative error code from the error handling > > > case instead of 0, as done elsewhere in this function. > > > > > > Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.") > > > Reported-by: Hulk Robot <hulkci@huawei.com> > > > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> > > > > if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) != 0 && > > > dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)) != 0) { > > > dev_err(&pdev->dev, "System does not support DMA, aborting\n"); > > > + rc = -EIO; > > > goto init_err_disable; > > Edwin, please double check if this shouldn't jump to > pci_release_regions() (or maybe it's harmless 'cause > PCI likes to magically release things on its own). Good point. We definitely should call pci_release_regions() for correctness. I will send out the patch shortly. Thanks.
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 7c21aaa8..11d0542 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -11590,6 +11590,7 @@ static int bnxt_init_board(struct pci_dev *pdev, struct net_device *dev) if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)) != 0 && dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)) != 0) { dev_err(&pdev->dev, "System does not support DMA, aborting\n"); + rc = -EIO; goto init_err_disable; }
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: c0c050c58d84 ("bnxt_en: New Broadcom ethernet driver.") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + 1 file changed, 1 insertion(+)