LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jeff Garzik <jeff@garzik.org>
To: Jiri Slaby <jirislaby@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	linux-kernel@vger.kernel.org, auke-jan.h.kok@intel.com,
	jesse.brandeburg@intel.com, jeffrey.t.kirsher@intel.com,
	john.ronciak@intel.com, e1000-devel@lists.sourceforge.net,
	venkatesh.pallipadi@intel.com
Subject: Re: [PATCH 1/1] Net: e100, fix iomap mem accesses
Date: Fri, 18 Jan 2008 14:38:51 -0500	[thread overview]
Message-ID: <4791004B.50408@garzik.org> (raw)
In-Reply-To: <1200608900-3507-1-git-send-email-jirislaby@gmail.com>

Jiri Slaby wrote:
> readX functions are not permitted on iomap-ped space change to ioreadX,
> also pci_unmap pci_map-ped space on exit (instead of iounmap).
> 
> Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
> ---
>  drivers/net/e100.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/e100.c b/drivers/net/e100.c
> index 51cf577..47548ef 100644
> --- a/drivers/net/e100.c
> +++ b/drivers/net/e100.c
> @@ -1836,7 +1836,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
>  		if ((le16_to_cpu(rfd->command) & cb_el) &&
>  		    (RU_RUNNING == nic->ru_running))
>  
> -			if (readb(&nic->csr->scb.status) & rus_no_res)
> +			if (ioread8(&nic->csr->scb.status) & rus_no_res)
>  				nic->ru_running = RU_SUSPENDED;
>  		return -ENODATA;
>  	}
> @@ -1859,7 +1859,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
>  	if ((le16_to_cpu(rfd->command) & cb_el) &&
>  	    (RU_RUNNING == nic->ru_running)) {
>  
> -	    if (readb(&nic->csr->scb.status) & rus_no_res)
> +	    if (ioread8(&nic->csr->scb.status) & rus_no_res)
>  		nic->ru_running = RU_SUSPENDED;
>  	}
>  
> @@ -1958,7 +1958,7 @@ static void e100_rx_clean(struct nic *nic, unsigned int *work_done,
>  
>  	if(restart_required) {
>  		// ack the rnr?
> -		writeb(stat_ack_rnr, &nic->csr->scb.stat_ack);
> +		iowrite8(stat_ack_rnr, &nic->csr->scb.stat_ack);
>  		e100_start_receiver(nic, nic->rx_to_clean);
>  		if(work_done)
>  			(*work_done)++;
> @@ -2774,7 +2774,7 @@ static void __devexit e100_remove(struct pci_dev *pdev)
>  		struct nic *nic = netdev_priv(netdev);
>  		unregister_netdev(netdev);
>  		e100_free(nic);
> -		iounmap(nic->csr);
> +		pci_iounmap(pdev, nic->csr);
>  		free_netdev(netdev);
>  		pci_release_regions(pdev);

ACK, but patch doesn't seem to apply...



  reply	other threads:[~2008-01-18 19:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-17 22:28 [PATCH 1/1] Net: e100, fix iomap mem accesses Jiri Slaby
2008-01-18 19:38 ` Jeff Garzik [this message]
2008-01-18 19:41   ` Jiri Slaby
2008-01-28  5:33   ` Andrew Morton
2008-01-28 22:31     ` Kok, Auke
2008-01-28 23:45       ` Jiri Slaby
2008-01-29 21:43         ` Kok, Auke
2008-01-29 21:48           ` Jiri Slaby
2008-01-29 21:49           ` Jiri Slaby
2008-01-30 16:28             ` Kok, Auke
2008-02-01 18:53             ` Jeff Garzik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4791004B.50408@garzik.org \
    --to=jeff@garzik.org \
    --cc=akpm@linux-foundation.org \
    --cc=auke-jan.h.kok@intel.com \
    --cc=e1000-devel@lists.sourceforge.net \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=jesse.brandeburg@intel.com \
    --cc=jirislaby@gmail.com \
    --cc=john.ronciak@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=venkatesh.pallipadi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).