linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ben Dooks <ben.dooks@codethink.co.uk>
To: Magnus Damm <magnus.damm@gmail.com>
Cc: linux-pci@vger.kernel.org, linux-sh@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	valentine.barshak@cogentembedded.com, horms@verge.net.au,
	bhelgaas@google.com
Subject: Re: [PATCH 01/04] PCI: rcar: Register each instance independently
Date: Wed, 05 Feb 2014 08:29:46 +0000	[thread overview]
Message-ID: <52F1F67A.6070509@codethink.co.uk> (raw)
In-Reply-To: <20140205065254.29445.77939.sendpatchset@w520>

On 05/02/14 06:52, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
>
> Convert the code to allow per-device probe() like other device
> drivers. This also delays driver registration due to change from
> subsys_initcall() to regular module_platform_driver().
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
>
>   drivers/pci/host/pci-rcar-gen2.c |   74 ++++++++------------------------------
>   1 file changed, 16 insertions(+), 58 deletions(-)
>
> --- 0001/drivers/pci/host/pci-rcar-gen2.c
> +++ work/drivers/pci/host/pci-rcar-gen2.c	2014-02-04 16:38:46.000000000 +0900
> @@ -74,9 +74,6 @@
>
>   #define RCAR_PCI_UNIT_REV_REG		(RCAR_AHBPCI_PCICOM_OFFSET + 0x48)
>
> -/* Number of internal PCI controllers */
> -#define RCAR_PCI_NR_CONTROLLERS		3
> -
>   struct rcar_pci_priv {
>   	struct device *dev;
>   	void __iomem *reg;
> @@ -228,6 +225,8 @@ static int __init rcar_pci_setup(int nr,
>   	pci_add_resource(&sys->resources, &priv->io_res);
>   	pci_add_resource(&sys->resources, &priv->mem_res);
>
> +	/* Setup bus number based on platform device id */
> +	sys->busnr = to_platform_device(priv->dev)->id;
>   	return 1;
>   }
>
> @@ -236,48 +235,12 @@ static struct pci_ops rcar_pci_ops = {
>   	.write	= rcar_pci_write_config,
>   };
>
> -static struct hw_pci rcar_hw_pci __initdata = {
> -	.map_irq	= rcar_pci_map_irq,
> -	.ops		= &rcar_pci_ops,
> -	.setup		= rcar_pci_setup,
> -};
> -
> -static int rcar_pci_count __initdata;
> -
> -static int __init rcar_pci_add_controller(struct rcar_pci_priv *priv)
> -{
> -	void **private_data;
> -	int count;
> -
> -	if (rcar_hw_pci.nr_controllers < rcar_pci_count)
> -		goto add_priv;
> -
> -	/* (Re)allocate private data pointer array if needed */
> -	count = rcar_pci_count + RCAR_PCI_NR_CONTROLLERS;
> -	private_data = kzalloc(count * sizeof(void *), GFP_KERNEL);
> -	if (!private_data)
> -		return -ENOMEM;
> -
> -	rcar_pci_count = count;
> -	if (rcar_hw_pci.private_data) {
> -		memcpy(private_data, rcar_hw_pci.private_data,
> -		       rcar_hw_pci.nr_controllers * sizeof(void *));
> -		kfree(rcar_hw_pci.private_data);
> -	}
> -
> -	rcar_hw_pci.private_data = private_data;
> -
> -add_priv:
> -	/* Add private data pointer to the array */
> -	rcar_hw_pci.private_data[rcar_hw_pci.nr_controllers++] = priv;
> -	return 0;
> -}
> -
> -static int __init rcar_pci_probe(struct platform_device *pdev)
> +static int rcar_pci_probe(struct platform_device *pdev)
>   {
>   	struct resource *cfg_res, *mem_res;
>   	struct rcar_pci_priv *priv;
>   	void __iomem *reg;
> +	struct hw_pci hw;
>
>   	cfg_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
>   	reg = devm_ioremap_resource(&pdev->dev, cfg_res);
> @@ -308,31 +271,26 @@ static int __init rcar_pci_probe(struct
>   	priv->reg = reg;
>   	priv->dev = &pdev->dev;
>
> -	return rcar_pci_add_controller(priv);
> +	memset(&hw, 0, sizeof(hw));
> +	hw.nr_controllers = 1;
> +	hw.private_data = (void **)&priv;
> +	hw.map_irq = rcar_pci_map_irq;
> +	hw.ops = &rcar_pci_ops;
> +	hw.setup = rcar_pci_setup;
> +	pci_common_init_dev(&pdev->dev, &hw);
> +	return 0;
>   }

Do we really want to explicitly set the bus number here?

>
>   static struct platform_driver rcar_pci_driver = {
>   	.driver = {
>   		.name = "pci-rcar-gen2",
> +		.owner = THIS_MODULE,
> +		.suppress_bind_attrs = true,
>   	},
> +	.probe = rcar_pci_probe,
>   };


-- 
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

  parent reply	other threads:[~2014-02-05  8:29 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-05  6:52 [PATCH 00/04] PCI: rcar: Driver model and physical address space update Magnus Damm
2014-02-05  6:52 ` [PATCH 01/04] PCI: rcar: Register each instance independently Magnus Damm
2014-02-05  8:02   ` Geert Uytterhoeven
2014-02-05  8:39     ` Magnus Damm
2014-02-05  8:29   ` Ben Dooks [this message]
2014-02-05  8:43     ` Magnus Damm
2014-02-05  6:53 ` [PATCH 02/04] PCI: rcar: Break out window size handling Magnus Damm
2014-02-05  6:53 ` [PATCH 03/04] PCI: rcar: Add DMABOUNCE support Magnus Damm
2014-02-05  6:53 ` [PATCH 04/04] PCI: rcar: Enable BOUNCE in case of HIGHMEM Magnus Damm
2014-02-05  8:33 ` [PATCH 00/04] PCI: rcar: Driver model and physical address space update Ben Dooks
2014-02-05  9:00   ` Magnus Damm
2014-02-05  9:25     ` Ben Dooks
2014-02-05  9:40       ` Magnus Damm
2014-02-05 10:12         ` Ben Dooks
2014-02-12 20:59 ` Bjorn Helgaas
2014-02-13  4:37   ` Simon Horman

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=52F1F67A.6070509@codethink.co.uk \
    --to=ben.dooks@codethink.co.uk \
    --cc=bhelgaas@google.com \
    --cc=horms@verge.net.au \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux-sh@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=valentine.barshak@cogentembedded.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).