[PATCH] pcnet32: fix a logic error with pci_set_dma_mask

[PATCH] pcnet32: fix a logic error with pci_set_dma_mask

[Geliang Tang]

pcnet32 can't work on my machine recently. It says "architecture
does not support 32bit PCI busmaster DMA". There is a logic error
in it: pci_set_dma_mask() return 0 means return successfully.

Signed-off-by: Geliang Tang <geliangtang@163.com>
---
 drivers/net/ethernet/amd/pcnet32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index e2afabf..2d9d216 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -1500,7 +1500,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
 		return -ENODEV;
 	}
 
-	if (!pci_set_dma_mask(pdev, PCNET32_DMA_MASK)) {
+	if (pci_set_dma_mask(pdev, PCNET32_DMA_MASK)) {
 		if (pcnet32_debug & NETIF_MSG_PROBE)
 			pr_err("architecture does not support 32bit PCI busmaster DMA\n");
 		return -ENODEV;
-- 
1.9.1

Re: [PATCH] pcnet32: fix a logic error with pci_set_dma_mask

[David Miller]

From: Geliang Tang <geliangtang@163.com>
Date: Fri,  9 Oct 2015 03:45:39 -0700

> pcnet32 can't work on my machine recently. It says "architecture
> does not support 32bit PCI busmaster DMA". There is a logic error
> in it: pci_set_dma_mask() return 0 means return successfully.
> 
> Signed-off-by: Geliang Tang <geliangtang@163.com>

This driver doesn't call pci_set_dma_mask() in any of my tree(s).

Re: [PATCH] pcnet32: fix a logic error with pci_set_dma_mask

[Geliang Tang]

On Mon, Oct 12, 2015 at 05:38:14AM -0700, David Miller wrote:
> From: Geliang Tang <geliangtang@163.com>
> Date: Fri,  9 Oct 2015 03:45:39 -0700
> 
> > pcnet32 can't work on my machine recently. It says "architecture
> > does not support 32bit PCI busmaster DMA". There is a logic error
> > in it: pci_set_dma_mask() return 0 means return successfully.
> > 
> > Signed-off-by: Geliang Tang <geliangtang@163.com>
> 
> This driver doesn't call pci_set_dma_mask() in any of my tree(s).

This patch is against linux-next tree. It was introduced by commit
9c034d4 'pcnet32: use pci_set_dma_mask insted of pci_dma_supported'.

Re: [PATCH] pcnet32: fix a logic error with pci_set_dma_mask

[Don Fry]

On Mon, 2015-10-12 at 05:38 -0700, David Miller wrote:
> From: Geliang Tang <geliangtang@163.com>
> Date: Fri,  9 Oct 2015 03:45:39 -0700
> 
> > pcnet32 can't work on my machine recently. It says "architecture
> > does not support 32bit PCI busmaster DMA". There is a logic error
> > in it: pci_set_dma_mask() return 0 means return successfully.
> > 
> > Signed-off-by: Geliang Tang <geliangtang@163.com>
> 
> This driver doesn't call pci_set_dma_mask() in any of my tree(s).
I failed.  My system with pcnet32 boards was down with a dead power
supply and a visual review was not good enough.  I missed that
pci_dma_supported returns 1 on success and pci_set_dma_mask returns 0 on
success.  The original patch needs to have the ! removed as Geliang Tang
points out.

Acked-by:  Don Fry <pcnet32@frontier.com>

Re: [PATCH] pcnet32: fix a logic error with pci_set_dma_mask

[Geliang Tang]

On Wed, Oct 21, 2015 at 09:01:26PM -0700, Don Fry wrote:
> On Mon, 2015-10-12 at 05:38 -0700, David Miller wrote:
> > From: Geliang Tang <geliangtang@163.com>
> > Date: Fri,  9 Oct 2015 03:45:39 -0700
> > 
> > > pcnet32 can't work on my machine recently. It says "architecture
> > > does not support 32bit PCI busmaster DMA". There is a logic error
> > > in it: pci_set_dma_mask() return 0 means return successfully.
> > > 
> > > Signed-off-by: Geliang Tang <geliangtang@163.com>
> > 
> > This driver doesn't call pci_set_dma_mask() in any of my tree(s).
> I failed.  My system with pcnet32 boards was down with a dead power
> supply and a visual review was not good enough.  I missed that
> pci_dma_supported returns 1 on success and pci_set_dma_mask returns 0 on
> success.  The original patch needs to have the ! removed as Geliang Tang
> points out.
> 
> Acked-by:  Don Fry <pcnet32@frontier.com>

Hi:

It has been a month since I submitted this patch. I'm wondering is it
still valid and wether it will be applied? 

A recent commit targeting at the same problem (commit 1a47de6 various:
fix pci_set_dma_mask return value checking) has been applied. But my
commit, which I reported and submitted earlier, hasn't been applied. I'd
like to know if there's anything wrong with it? 

Thank you!

- Geliang Tang