PCI: Add power sequencing driver for PCI slots
PATCH 1/1 PCI: Add power sequencing driver for PCI slots
Extend the PCI bridge driver to enable resources associated with PCI slots like clocks, power rails, and resets. This is modeled off of the PCI power control subsystem in Linux. The traditional compatible for PCI slots in U-Boot is pci-bridge, but Linux uses the more-systematic pciclass,0604 so add that as an option.
---
drivers/pci/Kconfig | 8 ++++++ drivers/pci/pci-uclass.c | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+)
drivers/pci/Kconfig +8 -0
@@ -100,6 +100,14 @@ config PCI_ENHANCED_ALLOCATION Enable support for Enhanced Allocation which can be used by supported devices in place of traditional BARS for allocation of resources. +config PCI_PWRCTRL_SLOT + bool "PCI slot power control" + help + This is a generic driver that controls the power state of different + PCI slots. The clocks and resets for the PCI slots are expected to be + defined in the devicetree node of the PCI bridge. Say N if your PCI + busses don't have software-controlled clocks or power rails. + config PCI_ARID bool "Enable Alternate Routing-ID support for PCI" help
drivers/pci/pci-uclass.c +55 -0
80 lines not on this page · raw message
Signature · 4 lines
2.35.1.1320.gc452695387.dirty base-commit: 38ace442b630c5ddf049af83e8db229c012ed355 branch: pci_pwrseq
Quoted 5 lines · Sean Anderson
Extend the PCI bridge driver to enable resources associated with PCI slots like clocks, power rails, and resets. This is modeled off of the PCI power control subsystem in Linux. The traditional compatible for PCI slots in U-Boot is pci-bridge, but Linux uses the more-systematic pciclass,0604 so add that as an option.
Oh, nice :)
drivers/pci/pci-uclass.c static const struct dm_pci_ops pci_bridge_ops = { · line 1911
Quoted 10 lines
drivers/pci/pci-uclass.c +10
-0+static int __maybe_unused pci_bridge_probe (struct udevice *dev) +{ +struct clk clk; +struct gpio_desc perst; + +if (!clk_get_by_index (dev,0 , &clk)) { +int ret =clk_enable (&clk); + +if (ret) +return log_msg_ret ("clk" , ret);
Should we use dev_err() instead ?
drivers/pci/pci-uclass.c static const struct dm_pci_ops pci_bridge_ops = { · line 1917
Quoted 5 lines
drivers/pci/pci-uclass.c +5
-0+/* Delay for T_PERST-CLK (100 us for all slot types) */ +udelay (100 ); + } + +if (!gpio_request_by_name (dev,"reset-gpios" ,0 , &perst,0 )) {
Invert conditional, reduce indent.
Quoted 6 lines
drivers/pci/pci-uclass.c +6
-0+unsigned long delay =0 ; +int ret; + +/* +* If PERST is inactive, the following call to dm_gpio_clrset_flags +* will be the first time we assert it and we will need to
drivers/pci/pci-uclass.c static const struct dm_pci_ops pci_bridge_ops = { · line 1933
Quoted 10 lines
drivers/pci/pci-uclass.c +10
-0+* delay for T_PERST. +*/ +if (dm_gpio_get_value (&perst) !=1 ) + delay =100 ; + + ret =dm_gpio_clrset_flags (&perst,GPIOD_MASK_DIR , +GPIOD_IS_OUT |GPIOD_IS_OUT_ACTIVE ); +if (ret) +return log_msg_ret ("set" , ret); +mdelay (delay);
Maybe set a flag and avoid calling mdelay() altogether ?
Quoted 12 lines
drivers/pci/pci-uclass.c +12
-0+ ret =dm_gpio_set_value (&perst,0 ); +if (ret) +return log_msg_ret ("clr" , ret); + +/* +* PCIe section 6.6.1: +* > ... software must wait a minimum of 100 ms before sending a +* > Configuration Request to the device immediately below that +* > Port. +*/ +mdelay (100 ); + }
drivers/pci/pci-uclass.c static const struct dm_pci_ops pci_bridge_ops = { · line 1956
Quoted 10 lines
drivers/pci/pci-uclass.c +6
-0+ +return 0 ; +} +U_BOOT_DRIVER (pci_bridge_drv) = { .name ="pci_bridge_drv" , .id =UCLASS_PCI , .of_match = pci_bridge_ids, +#if CONFIG_IS_ENABLED(PCI_PWRCTRL_SLOT) + .probe = pci_bridge_probe,
.probe = CONFIG_IS_ENABLED(PCI_PWRCTRL_SLOT, pci_bridge_probe, NULL),
Thanks !
Quoted 9 lines · Marek Vasut
Quoted 5 lines · Sean Anderson
Extend the PCI bridge driver to enable resources associated with PCI slots like clocks, power rails, and resets. This is modeled off of the PCI power control subsystem in Linux. The traditional compatible for PCI slots in U-Boot is pci-bridge, but Linux uses the more-systematic pciclass,0604 so add that as an option.
Oh, nice :)
Quoted 12 lines
drivers/pci/pci-uclass.c static const struct dm_pci_ops pci_bridge_ops = { · line 1911
Quoted 10 lines
drivers/pci/pci-uclass.c +10
-0+static int __maybe_unused pci_bridge_probe (struct udevice *dev) +{ + struct clk clk; + struct gpio_desc perst; + + if (!clk_get_by_index(dev, 0, &clk)) { + int ret = clk_enable(&clk); + + if (ret) + return log_msg_ret("clk", ret);Should we use
dev_err()instead ?
I thought we weren't supposed to log by default in device drivers to reduce text size?
Quoted 7 lines
Quoted 5 lines
+ /* Delay for T_PERST-CLK (100 us for all slot types) */ + udelay(100);
+ }
+
+ if (!gpio_request_by_name(dev, "reset-gpios", 0, &perst, 0)) {Invert conditional, reduce indent.
OK
Quoted 10 lines
Quoted 10 lines
+ unsigned long delay = 0;
+ int ret;
+
+ /*
+ * If PERST is inactive, the following call todm_gpio_clrset_flags+ * will be the first time we assert it and we will need to + * delay forT_PERST.
+ */
+ if (dm_gpio_get_value(&perst)!= 1)
+ delay = 100;
Quoted 8 lines
Quoted 6 lines
+
+ ret = dm_gpio_clrset_flags(&perst,GPIOD_MASK_DIR, +GPIOD_IS_OUT|GPIOD_IS_OUT_ACTIVE); + if (ret)
+ returnlog_msg_ret("set", ret);
+ mdelay(delay);Maybe set a flag and avoid calling
mdelay()altogether ?
OK
--Sean
Quoted 26 lines
Quoted 16 lines
+ ret =
dm_gpio_set_value(&perst, 0);
+ if (ret)
+ returnlog_msg_ret("clr", ret);drivers/pci/pci-uclass.c +13
-0+ + /* + * PCIe section 6.6.1: + * > ... software must wait a minimum of 100 ms before sending a + * > Configuration Request to the device immediately below that + * > Port. + */ + mdelay(100); + } + + return 0; +} +Quoted 6 lines
U_BOOT_DRIVER(pci_bridge_drv)= {
.name = "pci_bridge_drv",
.id =UCLASS_PCI,
.of_match =pci_bridge_ids,
+#ifCONFIG_IS_ENABLED(PCI_PWRCTRL_SLOT)
+ .probe =pci_bridge_probe,.probe =
CONFIG_IS_ENABLED(PCI_PWRCTRL_SLOT, pci_bridge_probe, NULL),Thanks !
Quoted 23 lines · Sean Anderson
Quoted 9 lines · Marek Vasut
Quoted 5 lines · Sean Anderson
Extend the PCI bridge driver to enable resources associated with PCI slots like clocks, power rails, and resets. This is modeled off of the PCI power control subsystem in Linux. The traditional compatible for PCI slots in U-Boot is pci-bridge, but Linux uses the more-systematic pciclass,0604 so add that as an option.
Oh, nice :)
Quoted 12 lines
drivers/pci/pci-uclass.c static const struct dm_pci_ops pci_bridge_ops = { · line 1911
Quoted 10 lines
drivers/pci/pci-uclass.c +10
-0+static int __maybe_unused pci_bridge_probe (struct udevice *dev) +{ + struct clk clk; + struct gpio_desc perst; + + if (!clk_get_by_index(dev, 0, &clk)) { + int ret = clk_enable(&clk); + + if (ret) + return log_msg_ret("clk", ret);Should we use
dev_err()instead ?
Quoted 1 line
I thought we weren't supposed to log by default in device drivers to reduce text size?
Tom had a different take on it, lets wait for him. Me personally, I like the dev_* functions as they are compatible with Linux ones, which is nice and non-confusing.
Quoted 24 lines · Marek Vasut
Quoted 23 lines · Sean Anderson
Quoted 21 lines · Marek Vasut
Quoted 5 lines · Sean Anderson
Extend the PCI bridge driver to enable resources associated with PCI slots like clocks, power rails, and resets. This is modeled off of the PCI power control subsystem in Linux. The traditional compatible for PCI slots in U-Boot is pci-bridge, but Linux uses the more-systematic pciclass,0604 so add that as an option.
Oh, nice :)
drivers/pci/pci-uclass.c static const struct dm_pci_ops pci_bridge_ops = { · line 1911
Quoted 10 lines
drivers/pci/pci-uclass.c +10
-0+static int __maybe_unused pci_bridge_probe (struct udevice *dev) +{ + struct clk clk; + struct gpio_desc perst; + + if (!clk_get_by_index(dev, 0, &clk)) { + int ret = clk_enable(&clk); + + if (ret) + return log_msg_ret("clk", ret);Should we use
dev_err()instead ?
Quoted 4 lines
Quoted 1 line
I thought we weren't supposed to log by default in device drivers to reduce text size?
Tom had a different take on it, lets wait for him. Me personally, I like the dev_* functions as they are compatible with Linux ones, which is nice and non-confusing.
I think consistency within a file is the first thing to worry about, and so log_msg_ret(...) to match the rest of the file makes the most sense.
Signature · 1 line
Tom
Hi Sean,
Quoted 5 lines
Extend the PCI bridge driver to enable resources associated with PCI slots like clocks, power rails, and resets. This is modeled off of the PCI power control subsystem in Linux. The traditional compatible for PCI slots in U-Boot is pci-bridge, but Linux uses the more-systematic pciclass,0604 so add that as an option.
Not sure if you're aware but upstream is doing a big rework of the pwctrl stuff[1], I'm not sure if this would need to be adjusted to take any of those changes into account but might be worth considering reviewing the issues being addressed by that rework too.
Peter
[1] https://lore.kernel.org/linux-pci/[email protected]/T/#t
Quoted 118 lines
Signed-off-by Sean Anderson <[email protected]>---
drivers/pci/Kconfig | 8 ++++++ drivers/pci/pci-uclass.c | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+)drivers/pci/Kconfig +8
-0@@ -100,6 +100,14 @@ config PCI_ENHANCED_ALLOCATION Enable support for Enhanced Allocation which can be used by supported devices in place of traditional BARS for allocation of resources. +config PCI_PWRCTRL_SLOT + bool "PCI slot power control" + help + This is a generic driver that controls the power state of different + PCI slots. The clocks and resets for the PCI slots are expected to be + defined in the devicetree node of the PCI bridge. Say N if your PCI + busses don't have software-controlled clocks or power rails. + config PCI_ARID bool "Enable Alternate Routing-ID support for PCI" helpdrivers/pci/pci-uclass.c +55
-1@@ -6,6 +6,7 @@#define LOG_CATEGORY UCLASS_PCI +#include <clk.h> #include <dm.h> #include <errno.h> #include <init.h> @@ -14,6 +15,7 @@#include <pci.h> #include <spl.h> #include <asm/global_data.h> +#include <asm/gpio.h> #include <asm/io.h> #include <dm/device-internal.h> #include <dm/lists.h> @@ -1893,13 +1895,66 @@ static const struct dm_pci_ops pci_bridge_ops = {static const struct udevice_id pci_bridge_ids[] = { { .compatible ="pci-bridge" }, + { .compatible ="pciclass,0604" }, { } }; +static int __maybe_unused pci_bridge_probe (struct udevice *dev) +{ +struct clk clk; +struct gpio_desc perst; + +if (!clk_get_by_index (dev,0 , &clk)) { +int ret =clk_enable (&clk); + +if (ret) +return log_msg_ret ("clk" , ret); + +/* Delay for T_PERST-CLK (100 us for all slot types) */ +udelay (100 ); + } + +if (!gpio_request_by_name (dev,"reset-gpios" ,0 , &perst,0 )) { +unsigned long delay =0 ; +int ret; + +/* +* If PERST is inactive, the following call to dm_gpio_clrset_flags +* will be the first time we assert it and we will need to +* delay for T_PERST. +*/ +if (dm_gpio_get_value (&perst) !=1 ) + delay =100 ; + + ret =dm_gpio_clrset_flags (&perst,GPIOD_MASK_DIR , +GPIOD_IS_OUT |GPIOD_IS_OUT_ACTIVE ); +if (ret) +return log_msg_ret ("set" , ret); +mdelay (delay); + + ret =dm_gpio_set_value (&perst,0 ); +if (ret) +return log_msg_ret ("clr" , ret); + +/* +* PCIe section 6.6.1: +* > ... software must wait a minimum of 100 ms before sending a +* > Configuration Request to the device immediately below that +* > Port. +*/ +mdelay (100 ); + } + +return 0 ; +} +U_BOOT_DRIVER (pci_bridge_drv) = { .name ="pci_bridge_drv" , .id =UCLASS_PCI , .of_match = pci_bridge_ids, +#if CONFIG_IS_ENABLED(PCI_PWRCTRL_SLOT) + .probe = pci_bridge_probe, +#endif .ops = &pci_bridge_ops, }; --2.35.1.1320.gc452695387.dirty
base-commit:
38ace442b630c5ddf049af83e8db229c012ed355
branch:pci_pwrseq
Quoted 8 lines · Peter Robinson
Hi Sean,
Quoted 5 lines
Extend the PCI bridge driver to enable resources associated with PCI slots like clocks, power rails, and resets. This is modeled off of the PCI power control subsystem in Linux. The traditional compatible for PCI slots in U-Boot is pci-bridge, but Linux uses the more-systematic pciclass,0604 so add that as an option.
Quoted 4 lines
Not sure if you're aware but upstream is doing a big rework of the pwctrl stuff[1], I'm not sure if this would need to be adjusted to take any of those changes into account but might be worth considering reviewing the issues being addressed by that rework too.
Yes, I saw that (and commented on v2 [1]). But the devicetree stuff is the same, and we can use a much simpler model in U-Boot because device probing is synchronous. That series is also not merged yet.
--Sean
[1] https://lore.kernel.org/linux-pci/[email protected]/
Quoted 121 lines
[1] https://lore.kernel.org/linux-pci/[email protected]/T/#t
Quoted 118 lines
Signed-off-by Sean Anderson <[email protected]>---
drivers/pci/Kconfig | 8 ++++++ drivers/pci/pci-uclass.c | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+)drivers/pci/Kconfig +8
-0@@ -100,6 +100,14 @@ config PCI_ENHANCED_ALLOCATION Enable support for Enhanced Allocation which can be used by supported devices in place of traditional BARS for allocation of resources. +config PCI_PWRCTRL_SLOT + bool "PCI slot power control" + help + This is a generic driver that controls the power state of different + PCI slots. The clocks and resets for the PCI slots are expected to be + defined in the devicetree node of the PCI bridge. Say N if your PCI + busses don't have software-controlled clocks or power rails. + config PCI_ARID bool "Enable Alternate Routing-ID support for PCI" helpdrivers/pci/pci-uclass.c +55
-1@@ -6,6 +6,7 @@#define LOG_CATEGORY UCLASS_PCI +#include <clk.h> #include <dm.h> #include <errno.h> #include <init.h> @@ -14,6 +15,7 @@#include <pci.h> #include <spl.h> #include <asm/global_data.h> +#include <asm/gpio.h> #include <asm/io.h> #include <dm/device-internal.h> #include <dm/lists.h> @@ -1893,13 +1895,66 @@ static const struct dm_pci_ops pci_bridge_ops = {static const struct udevice_id pci_bridge_ids[] = { { .compatible ="pci-bridge" }, + { .compatible ="pciclass,0604" }, { } }; +static int __maybe_unused pci_bridge_probe (struct udevice *dev) +{ +struct clk clk; +struct gpio_desc perst; + +if (!clk_get_by_index (dev,0 , &clk)) { +int ret =clk_enable (&clk); + +if (ret) +return log_msg_ret ("clk" , ret); + +/* Delay for T_PERST-CLK (100 us for all slot types) */ +udelay (100 ); + } + +if (!gpio_request_by_name (dev,"reset-gpios" ,0 , &perst,0 )) { +unsigned long delay =0 ; +int ret; + +/* +* If PERST is inactive, the following call to dm_gpio_clrset_flags +* will be the first time we assert it and we will need to +* delay for T_PERST. +*/ +if (dm_gpio_get_value (&perst) !=1 ) + delay =100 ; + + ret =dm_gpio_clrset_flags (&perst,GPIOD_MASK_DIR , +GPIOD_IS_OUT |GPIOD_IS_OUT_ACTIVE ); +if (ret) +return log_msg_ret ("set" , ret); +mdelay (delay); + + ret =dm_gpio_set_value (&perst,0 ); +if (ret) +return log_msg_ret ("clr" , ret); + +/* +* PCIe section 6.6.1: +* > ... software must wait a minimum of 100 ms before sending a +* > Configuration Request to the device immediately below that +* > Port. +*/ +mdelay (100 ); + } + +return 0 ; +} +U_BOOT_DRIVER (pci_bridge_drv) = { .name ="pci_bridge_drv" , .id =UCLASS_PCI , .of_match = pci_bridge_ids, +#if CONFIG_IS_ENABLED(PCI_PWRCTRL_SLOT) + .probe = pci_bridge_probe, +#endif .ops = &pci_bridge_ops, }; --2.35.1.1320.gc452695387.dirty
base-commit:
38ace442b630c5ddf049af83e8db229c012ed355
branch:pci_pwrseq