On Sun, 2020-05-24 at 22:32 +0200, Mark Kettenis wrote:
> The vpcie*-supply properties are optional and these are absent on
> boards like the ROCKPro64 and Firefly RK3399 where the voltage is
> supplied by always-on regulators that are already enabled upon
> boot. Make these regulators optional and properly check their
> presence before attempting to enable them.
>
> Makes PCIe work on un U-Boot on the boards mentioned above.
>
> Signed-off-by: Mark Kettenis <kette...@openbsd.org>
Tested by: Kurt Miller <k...@intricatesoftware.com>
Model: Pine64 RockPro64 v2.1
=> pci
Scanning PCI devices on bus 0
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
00.00.00 0x1d87 0x0100 Bridge device 0x04
=> pci 1
Scanning PCI devices on bus 1
BusDevFun VendorId DeviceId Device Class Sub-Class
_____________________________________________________________
01.00.00 0x1b4b 0x9128 Mass storage controller 0x06
> ---
> drivers/pci/pcie_rockchip.c | 33 ++++++++++++++++++++-------------
> 1 file changed, 20 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c
> index 82a8396e42..0edc2464a8 100644
> --- a/drivers/pci/pcie_rockchip.c
> +++ b/drivers/pci/pcie_rockchip.c
> @@ -322,7 +322,7 @@ static int rockchip_pcie_set_vpcie(struct udevice *dev)
> struct rockchip_pcie *priv = dev_get_priv(dev);
> int ret;
>
> - if (!IS_ERR(priv->vpcie3v3)) {
> + if (priv->vpcie3v3) {
> ret = regulator_set_enable(priv->vpcie3v3, true);
> if (ret) {
> dev_err(dev, "failed to enable vpcie3v3 (ret=%d)\n",
> @@ -331,24 +331,31 @@ static int rockchip_pcie_set_vpcie(struct udevice *dev)
> }
> }
>
> - ret = regulator_set_enable(priv->vpcie1v8, true);
> - if (ret) {
> - dev_err(dev, "failed to enable vpcie1v8 (ret=%d)\n", ret);
> - goto err_disable_3v3;
> + if (priv->vpcie1v8) {
> + ret = regulator_set_enable(priv->vpcie1v8, true);
> + if (ret) {
> + dev_err(dev, "failed to enable vpcie1v8 (ret=%d)\n",
> + ret);
> + goto err_disable_3v3;
> + }
> }
>
> - ret = regulator_set_enable(priv->vpcie0v9, true);
> - if (ret) {
> - dev_err(dev, "failed to enable vpcie0v9 (ret=%d)\n", ret);
> - goto err_disable_1v8;
> + if (priv->vpcie0v9) {
> + ret = regulator_set_enable(priv->vpcie0v9, true);
> + if (ret) {
> + dev_err(dev, "failed to enable vpcie0v9 (ret=%d)\n",
> + ret);
> + goto err_disable_1v8;
> + }
> }
>
> return 0;
>
> err_disable_1v8:
> - regulator_set_enable(priv->vpcie1v8, false);
> + if (priv->vpcie1v8)
> + regulator_set_enable(priv->vpcie1v8, false);
> err_disable_3v3:
> - if (!IS_ERR(priv->vpcie3v3))
> + if (priv->vpcie3v3)
> regulator_set_enable(priv->vpcie3v3, false);
> return ret;
> }
> @@ -424,14 +431,14 @@ static int rockchip_pcie_parse_dt(struct udevice *dev)
>
> ret = device_get_supply_regulator(dev, "vpcie1v8-supply",
> &priv->vpcie1v8);
> - if (ret) {
> + if (ret && ret != -ENOENT) {
> dev_err(dev, "failed to get vpcie1v8 supply (ret=%d)\n", ret);
> return ret;
> }
>
> ret = device_get_supply_regulator(dev, "vpcie0v9-supply",
> &priv->vpcie0v9);
> - if (ret) {
> + if (ret && ret != -ENOENT) {
> dev_err(dev, "failed to get vpcie0v9 supply (ret=%d)\n", ret);
> return ret;
> }
