Re: [PATCH 01/04] PCI: rcar: Register each instance independently

Ben Dooks
2014-02-05T08:29:52Z

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