PCI: dwc: Wait for link up only if link is started
PATCH v2 1/1 PCI: dwc: Wait for link up only if link is started
In dw_pcie_host_init() regardless of whether the link has been started or not, the code waits for the link to come up. Even in cases where start_link() is not defined the code ends up spinning in a loop for 1 second. Since in some systems dw_pcie_host_init() gets called during probe, this one second loop for each pcie interface instance ends up extending the boot time.
Call trace when start_link() is not defined:dw_pcie_wait_for_link << spins in a loop for 1 second dw_pcie_host_init
--- drivers/pci/controller/dwc/pcie-designware-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pci/controller/dwc/pcie-designware-host.c +3 -3
@@ -489,10 +489,10 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) ret =dw_pcie_start_link (pci);if (ret) goto err_remove_edma; - } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); +/* Ignore errors, the link may come up later */ +dw_pcie_wait_for_link (pci); + } bridge->sysdata = pp;
Signature · 1 line
2.39.2.722.g9855ee24e9-goog
Quoted 8 lines · Sajid Dalvi
In
dw_pcie_host_init()regardless of whether the link has been started or not, the code waits for the link to come up. Even in cases wherestart_link()is not defined the code ends up spinning in a loop for 1 second. Since in some systemsdw_pcie_host_init()gets called during probe, this one second loop for each pcie interface instance ends up extending the boot time.
Quoted 5 lines
Call trace when
start_link()is not defined:dw_pcie_wait_for_link<< spins in a loop for 1 seconddw_pcie_host_initSigned-off-by Sajid Dalvi <[email protected]>
(CC'ed Krzysztof Kozlowski)
It looks good to me. I also checked the previous thread. I agree with Krzysztof's opinion that we should include only hardware-related features into DT.
Thank you.
Best regards,
Jingoo Han
Quoted 25 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +3
-4@@ -489,10 +489,10 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) ret =dw_pcie_start_link (pci);if (ret) goto err_remove_edma; - } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); +/* Ignore errors, the link may come up later */ +dw_pcie_wait_for_link (pci); + } bridge->sysdata = pp; --2.39.2.722.g9855ee24e9-goog
Thanks for your review Jingoo.
Sajid
Quoted 53 lines · Han Jingoo
Quoted 8 lines · Sajid Dalvi
In
dw_pcie_host_init()regardless of whether the link has been started or not, the code waits for the link to come up. Even in cases wherestart_link()is not defined the code ends up spinning in a loop for 1 second. Since in some systemsdw_pcie_host_init()gets called during probe, this one second loop for each pcie interface instance ends up extending the boot time.Quoted 5 lines
Call trace when
start_link()is not defined:dw_pcie_wait_for_link<< spins in a loop for 1 seconddw_pcie_host_initSigned-off-by Sajid Dalvi <[email protected]>(CC'ed Krzysztof Kozlowski)
Acked-by Jingoo Han <[email protected]>It looks good to me. I also checked the previous thread. I agree with Krzysztof's opinion that we should include only hardware-related features into DT.
Thank you.Best regards,
Jingoo HanQuoted 25 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +3
-4@@ -489,10 +489,10 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) ret =dw_pcie_start_link (pci);if (ret) goto err_remove_edma; - } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); +/* Ignore errors, the link may come up later */ +dw_pcie_wait_for_link (pci); + } bridge->sysdata = pp; --2.39.2.722.g9855ee24e9-goog
Quoted 53 lines · Sajid Dalvi
Thanks for your review Jingoo.
SajidQuoted 48 lines · Han Jingoo
Quoted 8 lines · Sajid Dalvi
In
dw_pcie_host_init()regardless of whether the link has been started or not, the code waits for the link to come up. Even in cases wherestart_link()is not defined the code ends up spinning in a loop for 1 second. Since in some systemsdw_pcie_host_init()gets called during probe, this one second loop for each pcie interface instance ends up extending the boot time.Quoted 5 lines
Call trace when
start_link()is not defined:dw_pcie_wait_for_link<< spins in a loop for 1 seconddw_pcie_host_initSigned-off-by Sajid Dalvi <[email protected]>(CC'ed Krzysztof Kozlowski)
Acked-by Jingoo Han <[email protected]>It looks good to me. I also checked the previous thread. I agree with Krzysztof's opinion that we should include only hardware-related features into DT.
Thank you.Best regards,
Jingoo HanQuoted 20 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +3
-3@@ -489,10 +489,10 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) ret =dw_pcie_start_link (pci);if (ret) goto err_remove_edma; - } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); +/* Ignore errors, the link may come up later */ +dw_pcie_wait_for_link (pci); + }
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/pci/controller/dwc/pcie-designware-host.c +0
-1bridge->sysdata = pp; --2.39.2.722.g9855ee24e9-goog
@bhelgaas Can this be picked up in your tree:
https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/
Thanks
Sajid
Lorenzo Pieralisi
maintainerQuoted 54 lines · Sajid Dalvi
Quoted 53 lines · Sajid Dalvi
Thanks for your review Jingoo.
SajidQuoted 48 lines · Han Jingoo
Quoted 8 lines · Sajid Dalvi
In
dw_pcie_host_init()regardless of whether the link has been started or not, the code waits for the link to come up. Even in cases wherestart_link()is not defined the code ends up spinning in a loop for 1 second. Since in some systemsdw_pcie_host_init()gets called during probe, this one second loop for each pcie interface instance ends up extending the boot time.Quoted 5 lines
Call trace when
start_link()is not defined:dw_pcie_wait_for_link<< spins in a loop for 1 seconddw_pcie_host_initSigned-off-by Sajid Dalvi <[email protected]>(CC'ed Krzysztof Kozlowski)
Acked-by Jingoo Han <[email protected]>It looks good to me. I also checked the previous thread. I agree with Krzysztof's opinion that we should include only hardware-related features into DT.
Thank you.Best regards,
Jingoo HanQuoted 20 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +3
-3@@ -489,10 +489,10 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) ret =dw_pcie_start_link (pci);if (ret) goto err_remove_edma; - } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); +/* Ignore errors, the link may come up later */ +dw_pcie_wait_for_link (pci); + }
Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/pci/controller/dwc/pcie-designware-host.c +0
-1bridge->sysdata = pp; --2.39.2.722.g9855ee24e9-goog
@bhelgaas Can this be picked up in your tree:
https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/
This patch seems fine to me. The question I have though is why the *current* code is written the way it is. Perhaps it is just the way it is, I wonder whether this change can trigger a regression though.
I guess the only way to know is merging this path and check the fallout.
Lorenzo
Quoted 64 lines · Lorenzo Pieralisi
Quoted 54 lines · Sajid Dalvi
Quoted 53 lines · Sajid Dalvi
Thanks for your review Jingoo.
SajidQuoted 48 lines · Han Jingoo
Quoted 8 lines · Sajid Dalvi
In
dw_pcie_host_init()regardless of whether the link has been started or not, the code waits for the link to come up. Even in cases wherestart_link()is not defined the code ends up spinning in a loop for 1 second. Since in some systemsdw_pcie_host_init()gets called during probe, this one second loop for each pcie interface instance ends up extending the boot time.Quoted 5 lines
Call trace when
start_link()is not defined:dw_pcie_wait_for_link<< spins in a loop for 1 seconddw_pcie_host_initSigned-off-by Sajid Dalvi <[email protected]>(CC'ed Krzysztof Kozlowski)
Acked-by Jingoo Han <[email protected]>It looks good to me. I also checked the previous thread. I agree with Krzysztof's opinion that we should include only hardware-related features into DT.
Thank you.Best regards,
Jingoo HanQuoted 20 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +3
-3@@ -489,10 +489,10 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) ret =dw_pcie_start_link (pci);if (ret) goto err_remove_edma; - } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); +/* Ignore errors, the link may come up later */ +dw_pcie_wait_for_link (pci); + }Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/pci/controller/dwc/pcie-designware-host.c +0
-1bridge->sysdata = pp; --2.39.2.722.g9855ee24e9-goog
@bhelgaas Can this be picked up in your tree:
https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/
Quoted 3 lines
This patch seems fine to me. The question I have though is why the *current* code is written the way it is. Perhaps it is just the way it is, I wonder whether this change can trigger a regression though.
The new code will look basically like this:
if (!dw_pcie_link_up(pci)) {
dw_pcie_start_link(pci);
dw_pcie_wait_for_link(pci);
}If the link is already up by the time we get here, this change means we won't get this message emitted by dw_pcie_wait_for_link():
dev_info(pci->dev, "PCIe Gen.%u x%u link up\n", ...)
I don't know how important that is, but I bet somebody cares about it.
From the commit log, I expected the patch to do something based on whether ->start_link() was defined, but there really isn't a direct connection, so maybe the log could be refined.
Bjorn
Quoted 81 lines · Bjorn Helgaas
Quoted 64 lines · Lorenzo Pieralisi
Quoted 54 lines · Sajid Dalvi
Quoted 53 lines · Sajid Dalvi
Thanks for your review Jingoo.
SajidQuoted 48 lines · Han Jingoo
Quoted 8 lines · Sajid Dalvi
In
dw_pcie_host_init()regardless of whether the link has been started or not, the code waits for the link to come up. Even in cases wherestart_link()is not defined the code ends up spinning in a loop for 1 second. Since in some systemsdw_pcie_host_init()gets called during probe, this one second loop for each pcie interface instance ends up extending the boot time.Quoted 5 lines
Call trace when
start_link()is not defined:dw_pcie_wait_for_link<< spins in a loop for 1 seconddw_pcie_host_initSigned-off-by Sajid Dalvi <[email protected]>(CC'ed Krzysztof Kozlowski)
Acked-by Jingoo Han <[email protected]>It looks good to me. I also checked the previous thread. I agree with Krzysztof's opinion that we should include only hardware-related features into DT.
Thank you.Best regards,
Jingoo HanQuoted 20 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +3
-3@@ -489,10 +489,10 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) ret =dw_pcie_start_link (pci);if (ret) goto err_remove_edma; - } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); +/* Ignore errors, the link may come up later */ +dw_pcie_wait_for_link (pci); + }Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/pci/controller/dwc/pcie-designware-host.c +0
-1bridge->sysdata = pp; --2.39.2.722.g9855ee24e9-goog
@bhelgaas Can this be picked up in your tree:
https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/Quoted 3 lines
This patch seems fine to me. The question I have though is why the *current* code is written the way it is. Perhaps it is just the way it is, I wonder whether this change can trigger a regression though.
The new code will look basically like this:
if (!dw_pcie_link_up(pci)) { dw_pcie_start_link(pci); dw_pcie_wait_for_link(pci); }If the link is already up by the time we get here, this change means we won't get this message emitted by
dw_pcie_wait_for_link():
dev_info(pci->dev, "PCIe Gen.%u x%u link up\n", ...)
Quoted 11 lines
I don't know how important that is, but I bet somebody cares about it.
From the commit log, I expected the patch to do something based on whether ->start_link() was defined, but there really isn't a direct connection, so maybe the log could be refined.
Bjorn
Signature · 1 line
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
After taking a deeper dive into this patch, I found that [1] changes the original intent which was to skip the call to dw_pcie_wait_for_link() when pci->ops->start_link is NULL. I talked to Sajid offline and he agreed we should put back the start_link NULL check. The updated patch should look like this:
if (!dw_pcie_link_up(pci) && pci->ops && pci->ops->start_link) {
ret = dw_pcie_start_link(pci);
if (ret)
goto err_free_msi;
dw_pcie_wait_for_link(pci);
}...which will ensure that we don't call dw_pcie_wait_for_link() when pci->ops->start_link is NULL.
With regards to the log, I think there are 2 ways to solve this:
1) We could also call dw_pcie_wait_for_link() in a new else if dw_pcie_link_up() returns 1.
2) We could add this to the top of dw_pcie_wait_for_link() and leave the code as is:
if (!pci->ops || !pci->ops->start_link)
return 0;I kind of like (2) since that solves both Sajid's original issue and will keep the original log.
[1] https://lore.kernel.org/all/[email protected]/
Regards,
Will
Quoted 121 lines · William McVicker
Quoted 81 lines · Bjorn Helgaas
Quoted 64 lines · Lorenzo Pieralisi
Quoted 54 lines · Sajid Dalvi
Quoted 53 lines · Sajid Dalvi
Thanks for your review Jingoo.
SajidQuoted 48 lines · Han Jingoo
Quoted 8 lines · Sajid Dalvi
In
dw_pcie_host_init()regardless of whether the link has been started or not, the code waits for the link to come up. Even in cases wherestart_link()is not defined the code ends up spinning in a loop for 1 second. Since in some systemsdw_pcie_host_init()gets called during probe, this one second loop for each pcie interface instance ends up extending the boot time.Quoted 5 lines
Call trace when
start_link()is not defined:dw_pcie_wait_for_link<< spins in a loop for 1 seconddw_pcie_host_initSigned-off-by Sajid Dalvi <[email protected]>(CC'ed Krzysztof Kozlowski)
Acked-by Jingoo Han <[email protected]>It looks good to me. I also checked the previous thread. I agree with Krzysztof's opinion that we should include only hardware-related features into DT.
Thank you.Best regards,
Jingoo HanQuoted 20 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +3
-3@@ -489,10 +489,10 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) ret =dw_pcie_start_link (pci);if (ret) goto err_remove_edma; - } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); +/* Ignore errors, the link may come up later */ +dw_pcie_wait_for_link (pci); + }Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/pci/controller/dwc/pcie-designware-host.c +0
-1bridge->sysdata = pp; --2.39.2.722.g9855ee24e9-goog
@bhelgaas Can this be picked up in your tree:
https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/Quoted 3 lines
This patch seems fine to me. The question I have though is why the *current* code is written the way it is. Perhaps it is just the way it is, I wonder whether this change can trigger a regression though.
The new code will look basically like this:
if (!dw_pcie_link_up(pci)) { dw_pcie_start_link(pci); dw_pcie_wait_for_link(pci); }If the link is already up by the time we get here, this change means we won't get this message emitted by
dw_pcie_wait_for_link():
dev_info(pci->dev, "PCIe Gen.%u x%u link up\n", ...)Quoted 11 lines
I don't know how important that is, but I bet somebody cares about it.
From the commit log, I expected the patch to do something based on whether ->start_link() was defined, but there really isn't a direct connection, so maybe the log could be refined.
Bjorn
Signature · 1 line
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].After taking a deeper dive into this patch, I found that [1] changes the original intent which was to skip the call to
dw_pcie_wait_for_link()whenpci->ops->start_linkis NULL. I talked to Sajid offline and he agreed we should put back thestart_linkNULL check. The updated patch should look like this:if (!dw_pcie_link_up(pci) && pci->ops && pci->ops->start_link) { ret = dw_pcie_start_link(pci); if (ret) goto err_free_msi; dw_pcie_wait_for_link(pci); }...which will ensure that we don't call
dw_pcie_wait_for_link()whenpci->ops->start_linkis NULL.With regards to the log, I think there are 2 ways to solve this:
1) We could also call
dw_pcie_wait_for_link()in a new else ifdw_pcie_link_up()returns 1.
2) We could add this to the top ofdw_pcie_wait_for_link()and leave the code as is:if (!pci->ops || !pci->ops->start_link) return 0;
Quoted 7 lines
I kind of like (2) since that solves both Sajid's original issue and will keep the original log.
[1] https://lore.kernel.org/all/[email protected]/
Regards,
Will
Below is what I'm thinking will do the job. I verified on a Pixel 6 (which doesn't have start_link() defined) that we don't have the 1 second wait from dw_pcie_wait_for_link() during probe.
drivers/pci/controller/dwc/pcie-designware.c +7 -4
@@ -648,13 +648,16 @@ int dw_pcie_wait_for_link(struct dw_pcie *pci) {u32 offset, val;int retries; +int link_up =dw_pcie_link_up (pci); -/* Check if the link is up or not */ -for (retries =0 ; retries <LINK_WAIT_MAX_RETRIES ; retries++) { -if (dw_pcie_link_up (pci)) -break ; +if (!link_up && !(pci->ops && pci->ops->start_link)) +return 0 ; +/* Check if the link is up or not */ +for (retries =0 ; !link_up && retries <LINK_WAIT_MAX_RETRIES ; retries++) {usleep_range (LINK_WAIT_USLEEP_MIN ,LINK_WAIT_USLEEP_MAX ); + + link_up =dw_pcie_link_up (pci); }if (retries >=LINK_WAIT_MAX_RETRIES ) {
Quoted 140 lines · William McVicker
Quoted 121 lines · William McVicker
Quoted 81 lines · Bjorn Helgaas
Quoted 64 lines · Lorenzo Pieralisi
Quoted 54 lines · Sajid Dalvi
Quoted 53 lines · Sajid Dalvi
Thanks for your review Jingoo.
SajidQuoted 48 lines · Han Jingoo
Quoted 8 lines · Sajid Dalvi
In
dw_pcie_host_init()regardless of whether the link has been started or not, the code waits for the link to come up. Even in cases wherestart_link()is not defined the code ends up spinning in a loop for 1 second. Since in some systemsdw_pcie_host_init()gets called during probe, this one second loop for each pcie interface instance ends up extending the boot time.Quoted 5 lines
Call trace when
start_link()is not defined:dw_pcie_wait_for_link<< spins in a loop for 1 seconddw_pcie_host_initSigned-off-by Sajid Dalvi <[email protected]>(CC'ed Krzysztof Kozlowski)
Acked-by Jingoo Han <[email protected]>It looks good to me. I also checked the previous thread. I agree with Krzysztof's opinion that we should include only hardware-related features into DT.
Thank you.Best regards,
Jingoo HanQuoted 20 lines
--- drivers/pci/controller/dwc/pcie-designware-host.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/pci/controller/dwc/pcie-designware-host.c +3
-3@@ -489,10 +489,10 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp) ret =dw_pcie_start_link (pci);if (ret) goto err_remove_edma; - } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); +/* Ignore errors, the link may come up later */ +dw_pcie_wait_for_link (pci); + }Quoted 8 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/pci/controller/dwc/pcie-designware-host.c +0
-1bridge->sysdata = pp; --2.39.2.722.g9855ee24e9-goog
@bhelgaas Can this be picked up in your tree:
https://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git/Quoted 3 lines
This patch seems fine to me. The question I have though is why the *current* code is written the way it is. Perhaps it is just the way it is, I wonder whether this change can trigger a regression though.
The new code will look basically like this:
if (!dw_pcie_link_up(pci)) { dw_pcie_start_link(pci); dw_pcie_wait_for_link(pci); }If the link is already up by the time we get here, this change means we won't get this message emitted by
dw_pcie_wait_for_link():
dev_info(pci->dev, "PCIe Gen.%u x%u link up\n", ...)Quoted 11 lines
I don't know how important that is, but I bet somebody cares about it.
From the commit log, I expected the patch to do something based on whether ->start_link() was defined, but there really isn't a direct connection, so maybe the log could be refined.
Bjorn
Signature · 1 line
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].After taking a deeper dive into this patch, I found that [1] changes the original intent which was to skip the call to
dw_pcie_wait_for_link()whenpci->ops->start_linkis NULL. I talked to Sajid offline and he agreed we should put back thestart_linkNULL check. The updated patch should look like this:if (!dw_pcie_link_up(pci) && pci->ops && pci->ops->start_link) { ret = dw_pcie_start_link(pci); if (ret) goto err_free_msi; dw_pcie_wait_for_link(pci); }...which will ensure that we don't call
dw_pcie_wait_for_link()whenpci->ops->start_linkis NULL.With regards to the log, I think there are 2 ways to solve this:
1) We could also call
dw_pcie_wait_for_link()in a new else ifdw_pcie_link_up()returns 1.
2) We could add this to the top ofdw_pcie_wait_for_link()and leave the code as is:if (!pci->ops || !pci->ops->start_link) return 0;Quoted 7 lines
I kind of like (2) since that solves both Sajid's original issue and will keep the original log.
[1] https://lore.kernel.org/all/[email protected]/
Regards,
WillBelow is what I'm thinking will do the job. I verified on a Pixel 6 (which doesn't have
start_link()defined) that we don't have the 1 second wait fromdw_pcie_wait_for_link()during probe.drivers/pci/controller/dwc/pcie-designware.c +0
-0@@ -648,13 +648,16 @@ int dw_pcie_wait_for_link(struct dw_pcie *pci) {
drivers/pci/controller/dwc/pcie-designware.c int dw_pcie_wait_for_link(struct dw_pcie *pci) · line 654
Quoted 10 lines
drivers/pci/controller/dwc/pcie-designware.c +3
-4u32 offset, val;int retries; +int link_up =dw_pcie_link_up (pci); -/* Check if the link is up or not */ -for (retries =0 ; retries <LINK_WAIT_MAX_RETRIES ; retries++) { -if (dw_pcie_link_up (pci)) -break ; +if (!link_up && !(pci->ops && pci->ops->start_link)) +return 0 ;
There is a problem with this approach. A platform driver could enable link training internally, i.e., it does not have the start_link() pointer defined. Then it could call dw_pcie_wait_for_link to wait for the link to come up. (See pcie-intel-gw.c for an example of such a platform). Your logic will end up regressing this driver by exiting early.
drivers/pci/controller/dwc/pcie-designware.c int dw_pcie_wait_for_link(struct dw_pcie *pci)
Quoted 10 lines
drivers/pci/controller/dwc/pcie-designware.c +4
-0+/* Check if the link is up or not */ +for (retries =0 ; !link_up && retries <LINK_WAIT_MAX_RETRIES ; retries++) {usleep_range (LINK_WAIT_USLEEP_MIN ,LINK_WAIT_USLEEP_MAX ); + + link_up =dw_pcie_link_up (pci); }if (retries >=LINK_WAIT_MAX_RETRIES ) {
The problem of the log is still not solved for a platform which could have the link up by default, i.e., it does not need to explicitly enable link training.
Here is my attempt at a patch which can satisfy all the requirements (Ideally, I did not want to use pci->ops in the host driver but I could not figure out any other way):
(quoted diff) +0 -0
b/drivers/pci/controller/dwc/pcie-designware-host.c index 9952057c8819..39c7219ec7c9 100644
drivers/pci/controller/dwc/pcie-designware-host.c +9 -6
@@ -485,15 +485,18 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp)if (ret) goto err_remove_edma; -if (!dw_pcie_link_up (pci)) { - ret =dw_pcie_start_link (pci); + ret =dw_pcie_start_link (pci); +if (ret) + goto err_remove_edma; + +if (dw_pcie_link_up (pci)) { +dw_pcie_print_link_status (pci); + }else if (pci->ops && pci->ops->start_link) { + ret =dw_pcie_wait_for_link (pci);if (ret) - goto err_remove_edma; + goto err_stop_link; } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); - bridge->sysdata = pp; ret =pci_host_probe (bridge);
drivers/pci/controller/dwc/pcie-designware.c +13 -7
@@ -644,9 +644,20 @@ void dw_pcie_disable_atu(struct dw_pcie *pci, u32 dir, int index)dw_pcie_writel_atu (pci, dir, index,PCIE_ATU_REGION_CTRL2 ,0 ); } -int dw_pcie_wait_for_link (struct dw_pcie *pci) +void dw_pcie_print_link_status (struct dw_pcie *pci) {u32 offset, val; + + offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); + val =dw_pcie_readw_dbi (pci, offset +PCI_EXP_LNKSTA ); + +dev_info (pci->dev,"PCIe Gen.%u x%u link up\n" , +FIELD_GET (PCI_EXP_LNKSTA_CLS , val), +FIELD_GET (PCI_EXP_LNKSTA_NLW , val)); +} + +int dw_pcie_wait_for_link (struct dw_pcie *pci) +{int retries;/* Check if the link is up or not */
@@ -662,12 +673,7 @@ int dw_pcie_wait_for_link(struct dw_pcie *pci)return -ETIMEDOUT ; } - offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); - val =dw_pcie_readw_dbi (pci, offset +PCI_EXP_LNKSTA ); - -dev_info (pci->dev,"PCIe Gen.%u x%u link up\n" , -FIELD_GET (PCI_EXP_LNKSTA_CLS , val), -FIELD_GET (PCI_EXP_LNKSTA_NLW , val)); +dw_pcie_print_link_status (pci);return 0 ; }
drivers/pci/controller/dwc/pcie-designware.h +1 -0
@@ -429,6 +429,7 @@ void dw_pcie_setup(struct dw_pcie *pci);void dw_pcie_iatu_detect (struct dw_pcie *pci);int dw_pcie_edma_detect (struct dw_pcie *pci);void dw_pcie_edma_remove (struct dw_pcie *pci); +void dw_pcie_print_link_status (struct dw_pcie *pci);static inline void dw_pcie_writel_dbi (struct dw_pcie *pci,u32 reg,u32 val) {
Quoted 90 lines · Ajay Agarwal' via kernel-team
Here is my attempt at a patch which can satisfy all the requirements (Ideally, I did not want to use
pci->opsin the host driver but I could not figure out any other way):drivers/pci/controller/dwc/pcie-designware-host.c +9
-6@@ -485,15 +485,18 @@ int dw_pcie_host_init(struct dw_pcie_rp *pp)if (ret) goto err_remove_edma; -if (!dw_pcie_link_up (pci)) { - ret =dw_pcie_start_link (pci); + ret =dw_pcie_start_link (pci); +if (ret) + goto err_remove_edma; + +if (dw_pcie_link_up (pci)) { +dw_pcie_print_link_status (pci); + }else if (pci->ops && pci->ops->start_link) { + ret =dw_pcie_wait_for_link (pci);if (ret) - goto err_remove_edma; + goto err_stop_link; } -/* Ignore errors, the link may come up later */ -dw_pcie_wait_for_link (pci); - bridge->sysdata = pp; ret =pci_host_probe (bridge);drivers/pci/controller/dwc/pcie-designware.c +13
-7@@ -644,9 +644,20 @@ void dw_pcie_disable_atu(struct dw_pcie *pci, u32 dir, int index)dw_pcie_writel_atu (pci, dir, index,PCIE_ATU_REGION_CTRL2 ,0 ); } -int dw_pcie_wait_for_link (struct dw_pcie *pci) +void dw_pcie_print_link_status (struct dw_pcie *pci) {u32 offset, val; + + offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); + val =dw_pcie_readw_dbi (pci, offset +PCI_EXP_LNKSTA ); + +dev_info (pci->dev,"PCIe Gen.%u x%u link up\n" , +FIELD_GET (PCI_EXP_LNKSTA_CLS , val), +FIELD_GET (PCI_EXP_LNKSTA_NLW , val)); +} + +int dw_pcie_wait_for_link (struct dw_pcie *pci) +{int retries;/* Check if the link is up or not */ @@ -662,12 +673,7 @@ int dw_pcie_wait_for_link(struct dw_pcie *pci)return -ETIMEDOUT ; } - offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); - val =dw_pcie_readw_dbi (pci, offset +PCI_EXP_LNKSTA ); - -dev_info (pci->dev,"PCIe Gen.%u x%u link up\n" , -FIELD_GET (PCI_EXP_LNKSTA_CLS , val), -FIELD_GET (PCI_EXP_LNKSTA_NLW , val)); +dw_pcie_print_link_status (pci);return 0 ; }drivers/pci/controller/dwc/pcie-designware.h +1
-0@@ -429,6 +429,7 @@ void dw_pcie_setup(struct dw_pcie *pci);void dw_pcie_iatu_detect (struct dw_pcie *pci);int dw_pcie_edma_detect (struct dw_pcie *pci);void dw_pcie_edma_remove (struct dw_pcie *pci); +void dw_pcie_print_link_status (struct dw_pcie *pci);static inline void dw_pcie_writel_dbi (struct dw_pcie *pci,u32 reg,u32 val) {Signature · 2 lines
-- To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
Thanks Ajay for the follow-up patch! I've tested it out on a Pixel 6 and it's working as intended for me. Probing the PCIe RC device now only take 0.02s vs ~1.02s. If others don't object, please send it as a v3 patch.
Thanks,
Will