Skip to contentSkip to conversation

PCI: altera: Allow building as module

PATCH Applied Ley Foon Tan 4 participants 10 messages Apr 24, 2019 – Jun 11, 2019

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

PATCH 1/1 PCI: altera: Allow building as module

Altera PCIe Rootport IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load PCIe driver module.

---
 drivers/pci/controller/Kconfig       |  2 +-
 drivers/pci/controller/pcie-altera.c | 28 ++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)
drivers/pci/controller/Kconfig +1 -1
index 6012f3059acd..4b550f9cdd56 100644
@@ -174,7 +174,7 @@ config PCIE_IPROC_MSI
 	  PCIe controller
 
 config PCIE_ALTERA
-	bool "Altera PCIe controller"
+	tristate "Altera PCIe controller"
 	depends on ARM || NIOS2 || ARM64 || COMPILE_TEST
 	help
 	  Say Y here if you want to enable PCIe controller support on Altera
drivers/pci/controller/pcie-altera.c +26 -2
index 27edcebd1726..6c86bc69ace8 100644
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
@@ -705,6 +706,13 @@ static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)
 	return 0;
 }
 
+static int altera_pcie_irq_teardown(struct altera_pcie *pcie)
+{
+	irq_set_chained_handler_and_data(pcie->irq, NULL, NULL);
+	irq_domain_remove(pcie->irq_domain);
+	irq_dispose_mapping(pcie->irq);
+}
+
 static int altera_pcie_parse_dt(struct altera_pcie *pcie)
 {
 	struct device *dev = &pcie->pdev->dev;
@@ -798,6 +806,7 @@ static int altera_pcie_probe(struct platform_device *pdev)
 
 	pcie = pci_host_bridge_priv(bridge);
 	pcie->pdev = pdev;
+	platform_set_drvdata(pdev, pcie);
 
 	match = of_match_device(altera_pcie_of_match, &pdev->dev);
 	if (!match)
@@ -855,13 +864,28 @@ static int altera_pcie_probe(struct platform_device *pdev)
 	return ret;
 }
 
+static int altera_pcie_remove(struct platform_device *pdev)
+{
+	struct altera_pcie *pcie = platform_get_drvdata(pdev);
+	struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
+
+	pci_stop_root_bus(bridge->bus);
+	pci_remove_root_bus(bridge->bus);
+	pci_free_resource_list(&pcie->resources);
+	altera_pcie_irq_teardown(pcie);
+
+	return 0;
+}
+
 static struct platform_driver altera_pcie_driver = {
 	.probe		= altera_pcie_probe,
+	.remove		= altera_pcie_remove,
 	.driver = {
 		.name	= "altera-pcie",
 		.of_match_table = altera_pcie_of_match,
-		.suppress_bind_attrs = true,
 	},
 };
 
-builtin_platform_driver(altera_pcie_driver);
+MODULE_DEVICE_TABLE(of, altera_pcie_of_match);
+module_platform_driver(altera_pcie_driver);
+MODULE_LICENSE("GPL v2");
Signature · 1 line
2.19.0
#1 lore raw

PATCH 1/1 PCI: altera-msi: Allow building as module

Altera MSI IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load MSI driver module.

---
 drivers/pci/controller/Kconfig           |  2 +-
 drivers/pci/controller/pcie-altera-msi.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/pci/controller/Kconfig +1 -1
index 4b550f9cdd56..920546cb84e2 100644
@@ -181,7 +181,7 @@ config PCIE_ALTERA
 	  FPGA.
 
 config PCIE_ALTERA_MSI
-	bool "Altera PCIe MSI feature"
+	tristate "Altera PCIe MSI feature"
 	depends on PCIE_ALTERA
 	depends on PCI_MSI_IRQ_DOMAIN
 	help
drivers/pci/controller/pcie-altera-msi.c +10 -0
index 025ef7d9a046..16d938920ca5 100644
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -288,4 +289,13 @@ static int __init altera_msi_init(void)
 {
 	return platform_driver_register(&altera_msi_driver);
 }
+
+static void __exit altera_msi_exit(void)
+{
+	platform_driver_unregister(&altera_msi_driver);
+}
+
 subsys_initcall(altera_msi_init);
+MODULE_DEVICE_TABLE(of, altera_msi_of_match);
+module_exit(altera_msi_exit);
+MODULE_LICENSE("GPL v2");
Signature · 1 line
2.19.0
#2 lore raw

Re: [PATCH] PCI: altera-msi: Allow building as module

Quoted 54 lines · Ley Foon Tan

Altera MSI IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load MSI driver module.

---
 drivers/pci/controller/Kconfig           |  2 +-
 drivers/pci/controller/pcie-altera-msi.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/pci/controller/Kconfig +1 -1
index 4b550f9cdd56..920546cb84e2 100644
@@ -181,7 +181,7 @@ config PCIE_ALTERA
          FPGA.
 
 config PCIE_ALTERA_MSI
-       bool "Altera PCIe MSI feature"
+       tristate "Altera PCIe MSI feature"
        depends on PCIE_ALTERA
        depends on PCI_MSI_IRQ_DOMAIN
        help
drivers/pci/controller/pcie-altera-msi.c +10 -1
index 025ef7d9a046..16d938920ca5 100644
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -288,4 +289,13 @@ static int __init altera_msi_init(void)
 {
        return platform_driver_register(&altera_msi_driver);
 }
+
+static void __exit altera_msi_exit(void)
+{
+       platform_driver_unregister(&altera_msi_driver);
+}
+
 subsys_initcall(altera_msi_init);
+MODULE_DEVICE_TABLE(of, altera_msi_of_match);
+module_exit(altera_msi_exit);
+MODULE_LICENSE("GPL v2");
--
Quoted 2 lines

2.19.0

Hi

Any comment for this patch?

Regards
Ley Foon

#3 lore raw

Re: [PATCH] PCI: altera-msi: Allow building as module

Quoted 59 lines · Ley Foon Tan
Quoted 54 lines · Ley Foon Tan

Altera MSI IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load MSI driver module.

---
 drivers/pci/controller/Kconfig           |  2 +-
 drivers/pci/controller/pcie-altera-msi.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/pci/controller/Kconfig +1 -1
index 4b550f9cdd56..920546cb84e2 100644
@@ -181,7 +181,7 @@ config PCIE_ALTERA
          FPGA.
 
 config PCIE_ALTERA_MSI
-       bool "Altera PCIe MSI feature"
+       tristate "Altera PCIe MSI feature"
        depends on PCIE_ALTERA
        depends on PCI_MSI_IRQ_DOMAIN
        help
drivers/pci/controller/pcie-altera-msi.c +10 -1
index 025ef7d9a046..16d938920ca5 100644
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -288,4 +289,13 @@ static int __init altera_msi_init(void)
 {
        return platform_driver_register(&altera_msi_driver);
 }
+
+static void __exit altera_msi_exit(void)
+{
+       platform_driver_unregister(&altera_msi_driver);
+}
+
 subsys_initcall(altera_msi_init);
+MODULE_DEVICE_TABLE(of, altera_msi_of_match);
+module_exit(altera_msi_exit);
+MODULE_LICENSE("GPL v2");
--
Quoted 2 lines

2.19.0

Hi

Quoted 1 line

Any comment for this patch?

I will get to these patches for the next merge window, thanks.

Lorenzo

#4 lore raw

Re: [PATCH] PCI: altera-msi: Allow building as module

Quoted 61 lines · Lorenzo Pieralisi
Quoted 59 lines · Ley Foon Tan
Quoted 54 lines · Ley Foon Tan

Altera MSI IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load MSI driver module.

---
 drivers/pci/controller/Kconfig           |  2 +-
 drivers/pci/controller/pcie-altera-msi.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/pci/controller/Kconfig +1 -1
index 4b550f9cdd56..920546cb84e2 100644
@@ -181,7 +181,7 @@ config PCIE_ALTERA
          FPGA.
 
 config PCIE_ALTERA_MSI
-       bool "Altera PCIe MSI feature"
+       tristate "Altera PCIe MSI feature"
        depends on PCIE_ALTERA
        depends on PCI_MSI_IRQ_DOMAIN
        help
drivers/pci/controller/pcie-altera-msi.c +10 -1
index 025ef7d9a046..16d938920ca5 100644
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -288,4 +289,13 @@ static int __init altera_msi_init(void)
 {
        return platform_driver_register(&altera_msi_driver);
 }
+
+static void __exit altera_msi_exit(void)
+{
+       platform_driver_unregister(&altera_msi_driver);
+}
+
 subsys_initcall(altera_msi_init);
+MODULE_DEVICE_TABLE(of, altera_msi_of_match);
+module_exit(altera_msi_exit);
+MODULE_LICENSE("GPL v2");
--
Quoted 2 lines

2.19.0

Hi

Quoted 3 lines
Quoted 1 line

Any comment for this patch?

I will get to these patches for the next merge window, thanks.

Thanks.

Regards
Ley Foon

#5 lore raw

Re: [PATCH] PCI: altera-msi: Allow building as module

In reply to Ley Foon Tan
Quoted 7 lines · Ley Foon Tan

Altera MSI IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load MSI driver module.

Quoted 5 lines
---
 drivers/pci/controller/Kconfig           |  2 +-
 drivers/pci/controller/pcie-altera-msi.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

Applied to pci/altera for v5.3, thanks.

Lorenzo

Quoted 42 lines
drivers/pci/controller/Kconfig +1 -1
index 4b550f9cdd56..920546cb84e2 100644
@@ -181,7 +181,7 @@ config PCIE_ALTERA
 	  FPGA.
 
 config PCIE_ALTERA_MSI
-	bool "Altera PCIe MSI feature"
+	tristate "Altera PCIe MSI feature"
 	depends on PCIE_ALTERA
 	depends on PCI_MSI_IRQ_DOMAIN
 	help
drivers/pci/controller/pcie-altera-msi.c +10 -0
index 025ef7d9a046..16d938920ca5 100644
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -288,4 +289,13 @@ static int __init altera_msi_init(void)
 {
 	return platform_driver_register(&altera_msi_driver);
 }
+
+static void __exit altera_msi_exit(void)
+{
+	platform_driver_unregister(&altera_msi_driver);
+}
+
 subsys_initcall(altera_msi_init);
+MODULE_DEVICE_TABLE(of, altera_msi_of_match);
+module_exit(altera_msi_exit);
+MODULE_LICENSE("GPL v2");
Signature · 1 line
2.19.0
#6 lore raw
In reply to Ley Foon Tan
Quoted 93 lines · Ley Foon Tan

Altera PCIe Rootport IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load PCIe driver module.

---
 drivers/pci/controller/Kconfig       |  2 +-
 drivers/pci/controller/pcie-altera.c | 28 ++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)
drivers/pci/controller/Kconfig +1 -1
index 6012f3059acd..4b550f9cdd56 100644
@@ -174,7 +174,7 @@ config PCIE_IPROC_MSI
          PCIe controller
 
 config PCIE_ALTERA
-       bool "Altera PCIe controller"
+       tristate "Altera PCIe controller"
        depends on ARM || NIOS2 || ARM64 || COMPILE_TEST
        help
          Say Y here if you want to enable PCIe controller support on Altera
drivers/pci/controller/pcie-altera.c +26 -3
index 27edcebd1726..6c86bc69ace8 100644
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
@@ -705,6 +706,13 @@ static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)
        return 0;
 }
 
+static int altera_pcie_irq_teardown(struct altera_pcie *pcie)
+{
+       irq_set_chained_handler_and_data(pcie->irq, NULL, NULL);
+       irq_domain_remove(pcie->irq_domain);
+       irq_dispose_mapping(pcie->irq);
+}
+
 static int altera_pcie_parse_dt(struct altera_pcie *pcie)
 {
        struct device *dev = &pcie->pdev->dev;
@@ -798,6 +806,7 @@ static int altera_pcie_probe(struct platform_device *pdev)
 
        pcie = pci_host_bridge_priv(bridge);
        pcie->pdev = pdev;
+       platform_set_drvdata(pdev, pcie);
 
        match = of_match_device(altera_pcie_of_match, &pdev->dev);
        if (!match)
@@ -855,13 +864,28 @@ static int altera_pcie_probe(struct platform_device *pdev)
        return ret;
 }
 
+static int altera_pcie_remove(struct platform_device *pdev)
+{
+       struct altera_pcie *pcie = platform_get_drvdata(pdev);
+       struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
+
+       pci_stop_root_bus(bridge->bus);
+       pci_remove_root_bus(bridge->bus);
+       pci_free_resource_list(&pcie->resources);
+       altera_pcie_irq_teardown(pcie);
+
+       return 0;
+}
+
 static struct platform_driver altera_pcie_driver = {
        .probe          = altera_pcie_probe,
+       .remove         = altera_pcie_remove,
        .driver = {
                .name   = "altera-pcie",
                .of_match_table = altera_pcie_of_match,
-               .suppress_bind_attrs = true,
        },
 };
 
-builtin_platform_driver(altera_pcie_driver);
+MODULE_DEVICE_TABLE(of, altera_pcie_of_match);
+module_platform_driver(altera_pcie_driver);
+MODULE_LICENSE("GPL v2");
--
Quoted 2 lines

2.19.0

Hi

Any comment for this patch?

Regards
Ley Foon

#7 lore raw
Quoted 98 lines · Ley Foon Tan
Quoted 93 lines · Ley Foon Tan

Altera PCIe Rootport IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load PCIe driver module.

---
 drivers/pci/controller/Kconfig       |  2 +-
 drivers/pci/controller/pcie-altera.c | 28 ++++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)
drivers/pci/controller/Kconfig +1 -1
index 6012f3059acd..4b550f9cdd56 100644
@@ -174,7 +174,7 @@ config PCIE_IPROC_MSI
          PCIe controller
 
 config PCIE_ALTERA
-       bool "Altera PCIe controller"
+       tristate "Altera PCIe controller"
        depends on ARM || NIOS2 || ARM64 || COMPILE_TEST
        help
          Say Y here if you want to enable PCIe controller support on Altera
drivers/pci/controller/pcie-altera.c +26 -3
index 27edcebd1726..6c86bc69ace8 100644
@@ -10,6 +10,7 @@
 #include <linux/interrupt.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_device.h>
 #include <linux/of_irq.h>
@@ -705,6 +706,13 @@ static int altera_pcie_init_irq_domain(struct altera_pcie *pcie)
        return 0;
 }
 
+static int altera_pcie_irq_teardown(struct altera_pcie *pcie)
+{
+       irq_set_chained_handler_and_data(pcie->irq, NULL, NULL);
+       irq_domain_remove(pcie->irq_domain);
+       irq_dispose_mapping(pcie->irq);
+}
+
 static int altera_pcie_parse_dt(struct altera_pcie *pcie)
 {
        struct device *dev = &pcie->pdev->dev;
@@ -798,6 +806,7 @@ static int altera_pcie_probe(struct platform_device *pdev)
 
        pcie = pci_host_bridge_priv(bridge);
        pcie->pdev = pdev;
+       platform_set_drvdata(pdev, pcie);
 
        match = of_match_device(altera_pcie_of_match, &pdev->dev);
        if (!match)
@@ -855,13 +864,28 @@ static int altera_pcie_probe(struct platform_device *pdev)
        return ret;
 }
 
+static int altera_pcie_remove(struct platform_device *pdev)
+{
+       struct altera_pcie *pcie = platform_get_drvdata(pdev);
+       struct pci_host_bridge *bridge = pci_host_bridge_from_priv(pcie);
+
+       pci_stop_root_bus(bridge->bus);
+       pci_remove_root_bus(bridge->bus);
+       pci_free_resource_list(&pcie->resources);
+       altera_pcie_irq_teardown(pcie);
+
+       return 0;
+}
+
 static struct platform_driver altera_pcie_driver = {
        .probe          = altera_pcie_probe,
+       .remove         = altera_pcie_remove,
        .driver = {
                .name   = "altera-pcie",
                .of_match_table = altera_pcie_of_match,
-               .suppress_bind_attrs = true,
        },
 };
 
-builtin_platform_driver(altera_pcie_driver);
+MODULE_DEVICE_TABLE(of, altera_pcie_of_match);
+module_platform_driver(altera_pcie_driver);
+MODULE_LICENSE("GPL v2");
--
Quoted 2 lines

2.19.0

Hi

Quoted 1 line

Any comment for this patch?

Applied to pci/altera for v5.3, thanks.

Lorenzo

#8 lore raw
In reply to Ley Foon Tan
Quoted 6 lines · Ley Foon Tan

Altera PCIe Rootport IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load PCIe driver module.

I'm not objecting to these patches, but help me understand how this works. The "usual" scenario is that if a driver is loaded before a matching device is available, i.e., either the driver is built statically or it is loaded before a device is hot-added, the event of the device being available causes the driver's probe method to be called.

This seems to be a more manual process of programming the FPGA which results in a new "altera-pcie" platform device. And then apparently you need to load the appropriate module by hand? Is there no "hot-add" type of event for this platform device that automatically looks for the driver?

Bjorn

#9 lore raw
Quoted 16 lines · Bjorn Helgaas
Quoted 6 lines · Ley Foon Tan

Altera PCIe Rootport IP is a soft IP and is only available after FPGA image is programmed.

Make driver modulable to support use case FPGA image is programmed after kernel is booted. User proram FPGA image in kernel then only load PCIe driver module.

I'm not objecting to these patches, but help me understand how this works. The "usual" scenario is that if a driver is loaded before a matching device is available, i.e., either the driver is built statically or it is loaded before a device is hot-added, the event of the device being available causes the driver's probe method to be called.

Quoted 5 lines

This seems to be a more manual process of programming the FPGA which results in a new "altera-pcie" platform device. And then apparently you need to load the appropriate module by hand? Is there no "hot-add" type of event for this platform device that automatically looks for the driver?

Yes, we need load module manually now.

Regards
Ley Foon