[PATCH 2/2] net: pcnet: Switch to PCI memory access

[Daniel Schwierzeck]

+cc Paul

Am 18.04.20 um 05:15 schrieb Marek Vasut:
> Replace the PCI IO access with PCI memory access, the card
> supports both, but the former does not work with QEMU SH4.
> 
> Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>
> Cc: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
> Cc: Joe Hershberger <joe.hershberger at ni.com>
> ---
> Note: It would be good to test this on the mips malta

I can only test with Qemu. Maybe Paul could ack or test?

> ---
>  drivers/net/pcnet.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
> index e7d6c8d714..34a5a16cfe 100644
> --- a/drivers/net/pcnet.c
> +++ b/drivers/net/pcnet.c
> @@ -179,14 +179,14 @@ int pcnet_initialize(bd_t *bis)
>  		/*
>  		 * Setup the PCI device.
>  		 */
> -		pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_0, &bar);
> -		dev->iobase = pci_io_to_phys(devbusfn, bar);
> +		pci_read_config_dword(devbusfn, PCI_BASE_ADDRESS_1, &bar);
> +		dev->iobase = pci_mem_to_phys(devbusfn, bar);
>  		dev->iobase &= ~0xf;
>  
>  		PCNET_DEBUG1("%s: devbusfn=0x%x iobase=0x%lx: ",
>  			     dev->name, devbusfn, (unsigned long)dev->iobase);
>  
> -		command = PCI_COMMAND_IO | PCI_COMMAND_MASTER;
> +		command = PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
>  		pci_write_config_word(devbusfn, PCI_COMMAND, command);
>  		pci_read_config_word(devbusfn, PCI_COMMAND, &status);
>  		if ((status & command) != command) {
> 

-- 
- Daniel