Skip to contentSkip to conversation

drivers/pci: use builtin_platform_driver in renesas

PATCH In review Paul Gortmaker 3 participants 7 messages Dec 22, 2015 – Jan 19, 2016

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover drivers/pci: use builtin_platform_driver in renesas

These two commits are extracted from what was a larger series[1] of demodularization in PCI host code that was bool Kconfig.

With the other commits, there was some mixed opinions whether we should make it explicitly non-modular or move towards making it functionally working as a tristate in order to reduce the size of built-in code for multi-platform kernels.

However with the renesas changes, there was no ".remove" and no "module_exit" code stripped out ; it is just a straight 1:1 mapping of the modular macros onto what they become in the non-modular case anyway -- meaning the runtime remains unchanged.

Given that, and the several Ack rec'd, it makes sense to at least get these two in and out of my queue while we consider what to do with the other PCI host code drivers that do have some modularity already coded into them.

Build testing was done on pci/next, using an ARCH=arm allmodconfig and then explicitly building the files changed in this series.

Paul.
---

[1] https://lkml.kernel.org/r/[email protected]

Cc Bjorn Helgaas <[email protected]>
Cc Phil Edworthy <[email protected]>
Cc Simon Horman <[email protected]>
Cc Valentine Barshak <[email protected]>

Paul Gortmaker (2):
drivers/pci: make host/pcie-rcar.c explicitly non-modular drivers/pci: make host/pci-rcar-gen2.c explicitly non-modular

 drivers/pci/host/pci-rcar-gen2.c | 12 +++---------
 drivers/pci/host/pcie-rcar.c     | 11 ++++-------
 2 files changed, 7 insertions(+), 16 deletions(-)
Signature · 1 line
2.6.1
#1 lore raw

PATCH 1/2 drivers/pci: make host/pcie-rcar.c explicitly non-modular

The Kconfig currently controlling compilation of this code is:

drivers/pci/host/Kconfig:config PCI_RCAR_GEN2_PCIE
drivers/pci/host/Kconfig: bool "Renesas R-Car PCIe controller"

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only.

Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit.

We don't have to disallow a driver unbind, since that is already done for us in this driver.

Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.

We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments.

---
 drivers/pci/host/pcie-rcar.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/pci/host/pcie-rcar.c +4 -7
index 5c2962646b17..a8ff4a7383e0 100644
@@ -7,6 +7,8 @@
  *  arch/sh/drivers/pci/ops-sh7786.c
  *  Copyright (C) 2009 - 2011  Paul Mundt
  *
+ * Module Author: Phil Edworthy <[email protected]>
+ *
  * This file is licensed under the terms of the GNU General Public
  * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
@@ -18,7 +20,7 @@
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -921,7 +923,6 @@ static const struct of_device_id rcar_pcie_of_match[] = {
 	{ .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init },
 	{},
 };
-MODULE_DEVICE_TABLE(of, rcar_pcie_of_match);
 
 static void rcar_pcie_release_of_pci_ranges(struct rcar_pcie *pci)
 {
@@ -1039,8 +1040,4 @@ static struct platform_driver rcar_pcie_driver = {
 	},
 	.probe = rcar_pcie_probe,
 };
-module_platform_driver(rcar_pcie_driver);
-
-MODULE_AUTHOR("Phil Edworthy <[email protected]>");
-MODULE_DESCRIPTION("Renesas R-Car PCIe driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(rcar_pcie_driver);
Signature · 1 line
2.6.1
#2 lore raw

Re: [PATCH 1/2] drivers/pci: make host/pcie-rcar.c explicitly non-modular

Hi Paul,

Quoted 2 lines · Paul Gortmaker

We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments.

The MODULE_* tags are easier to parse by automated tools. Do we want to make the work of e.g. the SPDX people harder?

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#3 lore raw

Re: [PATCH 1/2] drivers/pci: make host/pcie-rcar.c explicitly non-modular

Quoted 9 lines · Geert Uytterhoeven

Hi Paul,

Quoted 2 lines · Paul Gortmaker

We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments.

The MODULE_* tags are easier to parse by automated tools. Do we want to make the work of e.g. the SPDX people harder?

As JoeP pointed out, the AUTHOR tags are routinely out of date and not used by get_maintainer.pl by default, and I've found a lot of LICENCE tags that say GPL while the text at the top says GPLv2. On top of that, they are not present all the time since proper non-modular drivers don't have them. So, no I have no problems whatsoever in removing them from non-modular code.

If you want to make the case for tags that are module/non-module agnostic, and you think there is genuine value in it and you can get buy in on that, then feel free.

Paul.
--

Quoted 12 lines

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#4 lore raw

PATCH 2/2 drivers/pci: make host/pci-rcar-gen2.c explicitly non-modular

In reply to Paul Gortmaker

The Kconfig currently controlling compilation of this code is:

drivers/pci/host/Kconfig:config PCI_RCAR_GEN2
drivers/pci/host/Kconfig: bool "Renesas R-Car Gen2 Internal PCI controller"

...meaning that it currently is not being built as a module by anyone.

Lets remove the modular code that is essentially orphaned, so that when reading the driver there is no doubt it is builtin-only.

We don't have to disallow a driver unbind, since that is already done for us in this driver.

Since module_platform_driver() uses the same init level priority as builtin_platform_driver() the init ordering remains unchanged with this commit.

We don't replace module.h with init.h since the file already has that.

Also note that MODULE_DEVICE_TABLE is a no-op for non-modular code.

We also delete the MODULE_LICENSE tag etc. since all that information was (or is now) contained at the top of the file in the comments.

---
 drivers/pci/host/pci-rcar-gen2.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/pci/host/pci-rcar-gen2.c +3 -9
index 9980a4bdae7e..8df9c36458e9 100644
@@ -4,6 +4,8 @@
  * Copyright (C) 2013 Renesas Solutions Corp.
  * Copyright (C) 2013 Cogent Embedded, Inc.
  *
+ * Module Author: Valentine Barshak <[email protected]>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -14,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
 #include <linux/pci.h>
@@ -437,8 +438,6 @@ static struct of_device_id rcar_pci_of_match[] = {
 	{ },
 };
 
-MODULE_DEVICE_TABLE(of, rcar_pci_of_match);
-
 static struct platform_driver rcar_pci_driver = {
 	.driver = {
 		.name = "pci-rcar-gen2",
@@ -447,9 +446,4 @@ static struct platform_driver rcar_pci_driver = {
 	},
 	.probe = rcar_pci_probe,
 };
-
-module_platform_driver(rcar_pci_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("Renesas R-Car Gen2 internal PCI");
-MODULE_AUTHOR("Valentine Barshak <[email protected]>");
+builtin_platform_driver(rcar_pci_driver);
Signature · 1 line
2.6.1
#5 lore raw
In reply to Paul Gortmaker
Quoted 8 lines · Paul Gortmaker

These two commits are extracted from what was a larger series[1] of demodularization in PCI host code that was bool Kconfig.

With the other commits, there was some mixed opinions whether we should make it explicitly non-modular or move towards making it functionally working as a tristate in order to reduce the size of built-in code for multi-platform kernels.

Quoted 4 lines

However with the renesas changes, there was no ".remove" and no "module_exit" code stripped out ; it is just a straight 1:1 mapping of the modular macros onto what they become in the non-modular case anyway -- meaning the runtime remains unchanged.

Is there any reason these drivers can't be made modular? I'd rather do that, if we can.

Bjorn

#6 lore raw
Quoted 9 lines · [Re: [PATCH 0/2] drivers/pci: use builtin_platform_driver in renesas] On…
Quoted 8 lines · Paul Gortmaker

These two commits are extracted from what was a larger series[1] of demodularization in PCI host code that was bool Kconfig.

With the other commits, there was some mixed opinions whether we should make it explicitly non-modular or move towards making it functionally working as a tristate in order to reduce the size of built-in code for multi-platform kernels.

Quoted 7 lines
Quoted 4 lines

However with the renesas changes, there was no ".remove" and no "module_exit" code stripped out ; it is just a straight 1:1 mapping of the modular macros onto what they become in the non-modular case anyway -- meaning the runtime remains unchanged.

Is there any reason these drivers can't be made modular? I'd rather do that, if we can.

Per the above comments, the renesas drivers were a no-op and and got
Ack: from appropriate people hence why I forked them out of the earlier bigger series, in thinking they were OK'd and done as-is.

That said, if "be modular, or die trying" is the desired approach for PCI code, I can do my best to work within that constraint. It just won't be the no-op 1:1 mapping that the original proposed changes were.

P.
--

Quoted 2 lines

Bjorn