DPDK patches and discussions
 help / color / mirror / Atom feed
From: "Ouyang, Changchun" <changchun.ouyang@intel.com>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: "dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] [RFC 01/10] virtio: rearrange resource initialization
Date: Tue, 26 Aug 2014 07:14:31 +0000
Message-ID: <F52918179C57134FAEC9EA62FA2F96251183B1F2@shsmsx102.ccr.corp.intel.com> (raw)
In-Reply-To: <20140826020837.898427212@networkplumber.org>

Acked-by: Changchun Ouyang <Changchun.ouyang@intel.com>

> -----Original Message-----
> From: Stephen Hemminger [mailto:stephen@networkplumber.org]
> Sent: Tuesday, August 26, 2014 10:08 AM
> To: Ouyang, Changchun
> Cc: dev@dpdk.org
> Subject: [RFC 01/10] virtio: rearrange resource initialization
> 
> For clarity make the setup of PCI resources for Linux into a function rather
> than block of code #ifdef'd in middle of dev_init.
> 
> ---
>  lib/librte_pmd_virtio/virtio_ethdev.c |   76 +++++++++++++++++++----------
> -----
>  1 file changed, 43 insertions(+), 33 deletions(-)
> 
> --- a/lib/librte_pmd_virtio/virtio_ethdev.c	2014-08-25
> 19:00:03.622515574 -0700
> +++ b/lib/librte_pmd_virtio/virtio_ethdev.c	2014-08-25
> 19:00:03.622515574 -0700
> @@ -706,6 +706,41 @@ virtio_has_msix(const struct rte_pci_add
> 
>  	return (d != NULL);
>  }
> +
> +/* Extract I/O port numbers from sysfs */ static int
> +virtio_resource_init(struct rte_pci_device *pci_dev) {
> +	char dirname[PATH_MAX];
> +	char filename[PATH_MAX];
> +	unsigned long start, size;
> +
> +	if (get_uio_dev(&pci_dev->addr, dirname, sizeof(dirname)) < 0)
> +		return -1;
> +
> +	/* get portio size */
> +	snprintf(filename, sizeof(filename),
> +		     "%s/portio/port0/size", dirname);
> +	if (parse_sysfs_value(filename, &size) < 0) {
> +		PMD_INIT_LOG(ERR, "%s(): cannot parse size",
> +			     __func__);
> +		return -1;
> +	}
> +
> +	/* get portio start */
> +	snprintf(filename, sizeof(filename),
> +		 "%s/portio/port0/start", dirname);
> +	if (parse_sysfs_value(filename, &start) < 0) {
> +		PMD_INIT_LOG(ERR, "%s(): cannot parse portio start",
> +			     __func__);
> +		return -1;
> +	}
> +	pci_dev->mem_resource[0].addr = (void *)(uintptr_t)start;
> +	pci_dev->mem_resource[0].len =  (uint64_t)size;
> +	PMD_INIT_LOG(DEBUG,
> +		     "PCI Port IO found start=0x%lx with size=0x%lx",
> +		     start, size);
> +	return 0;
> +}
>  #else
>  static int
>  virtio_has_msix(const struct rte_pci_addr *loc __rte_unused) @@ -713,6
> +748,12 @@ virtio_has_msix(const struct rte_pci_add
>  	/* nic_uio does not enable interrupts, return 0 (false). */
>  	return 0;
>  }
> +
> +static int virtio_resource_init(struct rte_pci_device *pci_dev
> +__rte_unused) {
> +	/* no setup required */
> +	return 0;
> +}
>  #endif
> 
>  /*
> @@ -749,40 +790,9 @@ eth_virtio_dev_init(__rte_unused struct
>  		return 0;
> 
>  	pci_dev = eth_dev->pci_dev;
> +	if (virtio_resource_init(pci_dev) < 0)
> +		return -1;
> 
> -#ifdef RTE_EXEC_ENV_LINUXAPP
> -	{
> -		char dirname[PATH_MAX];
> -		char filename[PATH_MAX];
> -		unsigned long start, size;
> -
> -		if (get_uio_dev(&pci_dev->addr, dirname, sizeof(dirname))
> < 0)
> -			return -1;
> -
> -		/* get portio size */
> -		snprintf(filename, sizeof(filename),
> -			     "%s/portio/port0/size", dirname);
> -		if (parse_sysfs_value(filename, &size) < 0) {
> -			PMD_INIT_LOG(ERR, "%s(): cannot parse size",
> -				     __func__);
> -			return -1;
> -		}
> -
> -		/* get portio start */
> -		snprintf(filename, sizeof(filename),
> -			     "%s/portio/port0/start", dirname);
> -		if (parse_sysfs_value(filename, &start) < 0) {
> -			PMD_INIT_LOG(ERR, "%s(): cannot parse portio
> start",
> -				     __func__);
> -			return -1;
> -		}
> -		pci_dev->mem_resource[0].addr = (void *)(uintptr_t)start;
> -		pci_dev->mem_resource[0].len =  (uint64_t)size;
> -		PMD_INIT_LOG(DEBUG,
> -			     "PCI Port IO found start=0x%lx with size=0x%lx",
> -			     start, size);
> -	}
> -#endif
>  	hw->use_msix = virtio_has_msix(&pci_dev->addr);
>  	hw->io_base = (uint32_t)(uintptr_t)pci_dev-
> >mem_resource[0].addr;
> 


  reply	other threads:[~2014-08-26  7:10 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-26  2:07 [dpdk-dev] [RFC 00/10] virtio patches Stephen Hemminger
2014-08-26  2:07 ` [dpdk-dev] [RFC 01/10] virtio: rearrange resource initialization Stephen Hemminger
2014-08-26  7:14   ` Ouyang, Changchun [this message]
2014-08-26  2:07 ` [dpdk-dev] [RFC 02/10] virtio: use weak barriers Stephen Hemminger
2014-08-26  2:07 ` [dpdk-dev] [RFC 03/10] virtio: allow starting with link down Stephen Hemminger
2014-08-26  2:07 ` [dpdk-dev] [RFC 04/10] virtio: add support for Link State interrupt Stephen Hemminger
2014-08-26  2:07 ` [dpdk-dev] [RFC 05/10] ether: add soft vlan encap/decap functions Stephen Hemminger
2014-08-26  2:07 ` [dpdk-dev] [RFC 06/10] virtio: use software vlan stripping Stephen Hemminger
2014-08-26  8:37   ` Ouyang, Changchun
2014-08-26 16:24     ` Stephen Hemminger
2014-08-27  5:42       ` Ouyang, Changchun
2014-08-27 18:04         ` Stephen Hemminger
2014-08-26  2:07 ` [dpdk-dev] [RFC 07/10] virtio: remove unnecessary adapter structure Stephen Hemminger
2014-08-26  6:43   ` Ouyang, Changchun
2014-08-26  2:07 ` [dpdk-dev] [RFC 08/10] virtio: remove redundant vq_alignment Stephen Hemminger
2014-08-26  8:41   ` Ouyang, Changchun
2014-08-26  2:07 ` [dpdk-dev] [RFC 09/10] virtio: fix how states are handled during initialization Stephen Hemminger
2014-08-26  2:07 ` [dpdk-dev] [RFC 10/10] virtio: add support for promiscious and multicast Stephen Hemminger
2014-08-26  6:55   ` Ouyang, Changchun

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=F52918179C57134FAEC9EA62FA2F96251183B1F2@shsmsx102.ccr.corp.intel.com \
    --to=changchun.ouyang@intel.com \
    --cc=dev@dpdk.org \
    --cc=stephen@networkplumber.org \
    /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

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git