PCI: rcar: Add the initialization of PCIe link in resume_noirq
Subsystems (4)
PATCH v2 1/1 PCI: rcar: Add the initialization of PCIe link in resume_noirq
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the resume_noirq, thus the link must be reestablished in the resume_noirq callback of the driver.
---
V2: - Use BIT() macro for (1 << n)
- Since polling in rcar_pcie_wait_for_dl() uses udelay(), do not add extra changes to this function anymore
- Make resume_noirq return early and clean up parenthesis therein
--- drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
drivers/pci/controller/pcie-rcar.c +20 -0
@@ -46,6 +46,7 @@/* Transfer control */ #define PCIETCTLR 0x02000 +#define DL_DOWN BIT(3)#define CFINIT 1#define PCIETSTR 0x02004#define DATA_LINK_ACTIVE 1
@@ -1130,6 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->dev = dev; +platform_set_drvdata (pdev, pcie); err =pci_parse_request_of_pci_ranges (dev, &pcie->resources,NULL );if (err)
@@ -1221,10 +1223,28 @@ static int rcar_pcie_probe(struct platform_device *pdev)return err; } +static int rcar_pcie_resume_noirq (struct device *dev) +{ +struct rcar_pcie *pcie =dev_get_drvdata (dev); + +if (rcar_pci_read_reg (pcie,PMSR ) && + !(rcar_pci_read_reg (pcie,PCIETCTLR ) &DL_DOWN )) +return 0 ; + +/* Re-establish the PCIe link */ +rcar_pci_write_reg (pcie,CFINIT ,PCIETCTLR ); +return rcar_pcie_wait_for_dl (pcie); +} + +static const struct dev_pm_ops rcar_pcie_pm_ops = { + .resume_noirq = rcar_pcie_resume_noirq, +}; +static struct platform_driver rcar_pcie_driver = { .driver = { .name ="rcar-pcie" , .of_match_table = rcar_pcie_of_match, + .pm = &rcar_pcie_pm_ops, .suppress_bind_attrs = true, }, .probe = rcar_pcie_probe,
Signature · 1 line
2.19.2
Quoted 11 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>
I am not a deep PCI expert. Still, the patch looks good to me and I double checked with the documentation.
Minor nit would be 'CONFIG_PM' protection around the new code. But I have no strong opinion on that.
Simon Horman
Reviewed-byQuoted 13 lines · Wolfram Sang
Quoted 11 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>
Quoted 7 lines
I am not a deep PCI expert. Still, the patch looks good to me and I double checked with the documentation.
Acked-by Wolfram Sang <[email protected]>Minor nit would be '
CONFIG_PM' protection around the new code. But I have no strong opinion on that.
I agree that would be a nice enhancement but I also do not feel strongly about it.
Quoted 30 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>---
V2: - UseBIT()macro for (1 << n)
- Since polling inrcar_pcie_wait_for_dl()usesudelay(), do not add extra changes to this function anymore
- Makeresume_noirqreturn early and clean up parenthesis therein--- drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)drivers/pci/controller/pcie-rcar.c +0
-0
drivers/pci/controller/pcie-rcar.c line 50
Quoted 5 lines
drivers/pci/controller/pcie-rcar.c +1
-0@@ -46,6 +46,7 @@/* Transfer control */ #define PCIETCTLR 0x02000 +#define DL_DOWN BIT(3)#define CFINIT 1
I saw discussion after the V1 patch about using BIT() and making similar constants also use BIT() for consistency. That makes sense to me, and I think the best way would be:
1) in *this* patch, use "#define DL_DOWN 8"
2) in a followup patch, convert them all to BIT()
That way each revision of pcie-rcar.c is self-consistent.
Quoted 20 lines
drivers/pci/controller/pcie-rcar.c +7
-0#define PCIETSTR 0x02004#define DATA_LINK_ACTIVE 1@@ -1130,6 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->dev = dev; +platform_set_drvdata (pdev, pcie); err =pci_parse_request_of_pci_ranges (dev, &pcie->resources,NULL );if (err)@@ -1221,10 +1223,28 @@ static int rcar_pcie_probe(struct platform_device *pdev)return err; } +static int rcar_pcie_resume_noirq (struct device *dev) +{ +struct rcar_pcie *pcie =dev_get_drvdata (dev); + +if (rcar_pci_read_reg (pcie,PMSR ) && + !(rcar_pci_read_reg (pcie,PCIETCTLR ) &DL_DOWN ))
drivers/pci/controller/pcie-rcar.c static int rcar_pcie_probe(struct platform_device *pdev) · line 1241
Quoted 10 lines
drivers/pci/controller/pcie-rcar.c +10
-0+return 0 ; + +/* Re-establish the PCIe link */ +rcar_pci_write_reg (pcie,CFINIT ,PCIETCTLR ); +return rcar_pcie_wait_for_dl (pcie); +} + +static const struct dev_pm_ops rcar_pcie_pm_ops = { + .resume_noirq = rcar_pcie_resume_noirq, +};
I think there's the beginning of a convention to use #ifdef CONFIG_PM_SLEEP around the ops themselves [1]. Otherwise I think we'll get a warning about unused code when CONFIG_PM_SLEEP is unset.
Quoted 11 lines
drivers/pci/controller/pcie-rcar.c +1
-0static struct platform_driver rcar_pcie_driver = { .driver = { .name ="rcar-pcie" , .of_match_table = rcar_pcie_of_match, + .pm = &rcar_pcie_pm_ops, .suppress_bind_attrs = true, }, .probe = rcar_pcie_probe,Signature · 1 line
2.19.2
Quoted 41 lines · Bjorn Helgaas
Quoted 30 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>---
V2: - UseBIT()macro for (1 << n)
- Since polling inrcar_pcie_wait_for_dl()usesudelay(), do not add extra changes to this function anymore
- Makeresume_noirqreturn early and clean up parenthesis therein--- drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)drivers/pci/controller/pcie-rcar.c +0
-0drivers/pci/controller/pcie-rcar.c line 50
Quoted 5 lines
drivers/pci/controller/pcie-rcar.c +1
-0@@ -46,6 +46,7 @@/* Transfer control */ #define PCIETCTLR 0x02000 +#define DL_DOWN BIT(3)#define CFINIT 1I saw discussion after the V1 patch about using
BIT()and making similar constants also useBIT()for consistency. That makes sense to me, and I think the best way would be:
Quoted 4 lines
1) in *this* patch, use "#define
DL_DOWN8"
2) in a followup patch, convert them all toBIT()That way each revision of
pcie-rcar.cis self-consistent.
But the BIT() macros are already cleaned , see commit 0ee40820989b330e24926d82953ffb9e1c7a8425
PCI: rcar: Clean up the macros
Quoted 26 lines
Quoted 26 lines
drivers/pci/controller/pcie-rcar.c +13
-0#define PCIETSTR 0x02004#define DATA_LINK_ACTIVE 1@@ -1130,6 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->dev = dev; +platform_set_drvdata (pdev, pcie); err =pci_parse_request_of_pci_ranges (dev, &pcie->resources,NULL );if (err)@@ -1221,10 +1223,28 @@ static int rcar_pcie_probe(struct platform_device *pdev)return err; } +static int rcar_pcie_resume_noirq (struct device *dev) +{ +struct rcar_pcie *pcie =dev_get_drvdata (dev); + +if (rcar_pci_read_reg (pcie,PMSR ) && + !(rcar_pci_read_reg (pcie,PCIETCTLR ) &DL_DOWN )) +return 0 ; + +/* Re-establish the PCIe link */ +rcar_pci_write_reg (pcie,CFINIT ,PCIETCTLR ); +return rcar_pcie_wait_for_dl (pcie); +}
Quoted 8 lines
drivers/pci/controller/pcie-rcar.c static int rcar_pcie_probe(struct platform_device *pdev) · line 1241
Quoted 4 lines
drivers/pci/controller/pcie-rcar.c +4
-0+ +static const struct dev_pm_ops rcar_pcie_pm_ops = { + .resume_noirq = rcar_pcie_resume_noirq, +};I think there's the beginning of a convention to use #ifdef
CONFIG_PM_SLEEParound the ops themselves [1]. Otherwise I think we'll get a warning about unused code whenCONFIG_PM_SLEEPis unset.
Only if I used SET_NOIRQ_SYSTEM_SLEEP_PM_OPS() , but I set the resume_noirq directly.
Quoted 14 lines
Quoted 11 lines
drivers/pci/controller/pcie-rcar.c +1
-0static struct platform_driver rcar_pcie_driver = { .driver = { .name ="rcar-pcie" , .of_match_table = rcar_pcie_of_match, + .pm = &rcar_pcie_pm_ops, .suppress_bind_attrs = true, }, .probe = rcar_pcie_probe,Signature · 1 line
2.19.2
Signature · 2 lines
Best regards, Marek Vasut
[+cc linux-pm, Rafael for SET_NOIRQ_SYSTEM_SLEEP_PM_OPS question at the end]
Quoted 45 lines · Marek Vasut
Quoted 44 lines · Bjorn Helgaas
Quoted 30 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>---
V2: - UseBIT()macro for (1 << n)
- Since polling inrcar_pcie_wait_for_dl()usesudelay(), do not add extra changes to this function anymore
- Makeresume_noirqreturn early and clean up parenthesis therein--- drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)drivers/pci/controller/pcie-rcar.c +0
-0drivers/pci/controller/pcie-rcar.c line 50
Quoted 5 lines
drivers/pci/controller/pcie-rcar.c +1
-0@@ -46,6 +46,7 @@/* Transfer control */ #define PCIETCTLR 0x02000 +#define DL_DOWN BIT(3)#define CFINIT 1I saw discussion after the V1 patch about using
BIT()and making similar constants also useBIT()for consistency. That makes sense to me, and I think the best way would be:1) in *this* patch, use "#define
DL_DOWN8"
2) in a followup patch, convert them all toBIT()
Quoted 6 lines
Quoted 1 line
That way each revision of
pcie-rcar.cis self-consistent.But the
BIT()macros are already cleaned , see commit0ee40820989b330e24926d82953ffb9e1c7a8425PCI: rcar: Clean up the macros
Hmmm. Maybe I'm missing something, but it looks like 0ee40820989b didn't touch CFINIT, DATA_LINK_ACTIVE, or MSIFE. Arguably, LINK_SPEED_2_5GTS and LINK_SPEED_5_0GTS could use BIT() also.
I guess I'm just old-school, but in my personal opinion, BIT() is more trouble than it's worth. I'd rather see a complete bitmask because I can easily match it with the typical pictures in a spec, multi-bit fields are easy (you don't have to mix BIT() and GENMASK()), it gives a hint about the register width, it's easy to match with a hexdump, etc, e.g.,
#define DL_DOWN 0x00000008 #define CFINIT 0x00000001
But I'm not suggesting that you get rid of BIT() in this driver. I'm fine with it as long as it's used consistently.
BTW, while we're looking at it, I think rcar_pci_read_reg() and rcar_pci_write_reg() really should use "u32" instead of "unsigned long", since they deal with hardware registers that are explicitly 32 bits wide.
Quoted 35 lines
Quoted 26 lines
Quoted 26 lines
drivers/pci/controller/pcie-rcar.c +13
-0#define PCIETSTR 0x02004#define DATA_LINK_ACTIVE 1@@ -1130,6 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->dev = dev; +platform_set_drvdata (pdev, pcie); err =pci_parse_request_of_pci_ranges (dev, &pcie->resources,NULL );if (err)@@ -1221,10 +1223,28 @@ static int rcar_pcie_probe(struct platform_device *pdev)return err; } +static int rcar_pcie_resume_noirq (struct device *dev) +{ +struct rcar_pcie *pcie =dev_get_drvdata (dev); + +if (rcar_pci_read_reg (pcie,PMSR ) && + !(rcar_pci_read_reg (pcie,PCIETCTLR ) &DL_DOWN )) +return 0 ; + +/* Re-establish the PCIe link */ +rcar_pci_write_reg (pcie,CFINIT ,PCIETCTLR ); +return rcar_pcie_wait_for_dl (pcie); +}Quoted 8 lines
drivers/pci/controller/pcie-rcar.c static int rcar_pcie_probe(struct platform_device *pdev) · line 1241
Quoted 4 lines
drivers/pci/controller/pcie-rcar.c +4
-0+ +static const struct dev_pm_ops rcar_pcie_pm_ops = { + .resume_noirq = rcar_pcie_resume_noirq, +};I think there's the beginning of a convention to use #ifdef
CONFIG_PM_SLEEParound the ops themselves [1]. Otherwise I think we'll get a warning about unused code whenCONFIG_PM_SLEEPis unset.
Quoted 2 lines
Only if I used
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(), but I set theresume_noirqdirectly.
Fair enough. I guess in this case if CONFIG_PM_SLEEP is unset, you set the pointer, which avoids the "unused function" warning, but we just never use that function pointer.
My intent is to avoid needless differences when possible, so when I review things like this I look at how other drivers do things. It looks like all the other controllers use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS() or similar:
git grep -A3 "static.*dev_pm_ops" drivers/pci/controller
In the rcar case you only need the resume_fn, not the suspend_fn, so SET_NOIRQ_SYSTEM_SLEEP_PM_OPS() does a little more than you need and you'd have to pass NULL for suspend_fn. I didn't check them all (suspend_noirq, freeze_noirq, poweroff_noirq), but at least for suspend_noirq, all users check for NULL before calling through the .suspend_noirq() function pointer, so I think that should be safe.
This *does* raise the question of whether you should be setting .thaw_noirq and .restore_noirq in addition to .resume_noirq, as SET_NOIRQ_SYSTEM_SLEEP_PM_OPS() would. I'm not a PM person, but maybe Rafael or others will chime in.
Bjorn
Quoted 69 lines · Bjorn Helgaas
[+cc linux-pm, Rafael for
SET_NOIRQ_SYSTEM_SLEEP_PM_OPSquestion at the end]Quoted 45 lines · Marek Vasut
Quoted 44 lines · Bjorn Helgaas
Quoted 30 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>---
V2: - UseBIT()macro for (1 << n)
- Since polling inrcar_pcie_wait_for_dl()usesudelay(), do not add extra changes to this function anymore
- Makeresume_noirqreturn early and clean up parenthesis therein--- drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)drivers/pci/controller/pcie-rcar.c +0
-0drivers/pci/controller/pcie-rcar.c line 50
Quoted 5 lines
drivers/pci/controller/pcie-rcar.c +1
-0@@ -46,6 +46,7 @@/* Transfer control */ #define PCIETCTLR 0x02000 +#define DL_DOWN BIT(3)#define CFINIT 1I saw discussion after the V1 patch about using
BIT()and making similar constants also useBIT()for consistency. That makes sense to me, and I think the best way would be:1) in *this* patch, use "#define
DL_DOWN8"
2) in a followup patch, convert them all toBIT()Quoted 6 lines
Quoted 1 line
That way each revision of
pcie-rcar.cis self-consistent.But the
BIT()macros are already cleaned , see commit0ee40820989b330e24926d82953ffb9e1c7a8425PCI: rcar: Clean up the macros
Hmmm. Maybe I'm missing something, but it looks like
0ee40820989bdidn't touch CFINIT,DATA_LINK_ACTIVE, or MSIFE. Arguably,LINK_SPEED_2_5GTSandLINK_SPEED_5_0GTScould useBIT()also.I guess I'm just old-school, but in my personal opinion,
BIT()is more trouble than it's worth. I'd rather see a complete bitmask because I can easily match it with the typical pictures in a spec, multi-bit fields are easy (you don't have to mixBIT()andGENMASK()), it gives a hint about the register width, it's easy to match with a hexdump, etc, e.g.,#define DL_DOWN 0x00000008 #define CFINIT 0x00000001
Quoted 7 lines
But I'm not suggesting that you get rid of
BIT()in this driver. I'm fine with it as long as it's used consistently.BTW, while we're looking at it, I think
rcar_pci_read_reg()andrcar_pci_write_reg()really should use "u32" instead of "unsigned long", since they deal with hardware registers that are explicitly 32 bits wide.
OK, I can send those as separate patches.
Quoted 56 lines
Quoted 35 lines
Quoted 26 lines
Quoted 26 lines
drivers/pci/controller/pcie-rcar.c +13
-0#define PCIETSTR 0x02004#define DATA_LINK_ACTIVE 1@@ -1130,6 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->dev = dev; +platform_set_drvdata (pdev, pcie); err =pci_parse_request_of_pci_ranges (dev, &pcie->resources,NULL );if (err)@@ -1221,10 +1223,28 @@ static int rcar_pcie_probe(struct platform_device *pdev)return err; } +static int rcar_pcie_resume_noirq (struct device *dev) +{ +struct rcar_pcie *pcie =dev_get_drvdata (dev); + +if (rcar_pci_read_reg (pcie,PMSR ) && + !(rcar_pci_read_reg (pcie,PCIETCTLR ) &DL_DOWN )) +return 0 ; + +/* Re-establish the PCIe link */ +rcar_pci_write_reg (pcie,CFINIT ,PCIETCTLR ); +return rcar_pcie_wait_for_dl (pcie); +}Quoted 8 lines
drivers/pci/controller/pcie-rcar.c static int rcar_pcie_probe(struct platform_device *pdev) · line 1241
Quoted 4 lines
drivers/pci/controller/pcie-rcar.c +4
-0+ +static const struct dev_pm_ops rcar_pcie_pm_ops = { + .resume_noirq = rcar_pcie_resume_noirq, +};I think there's the beginning of a convention to use #ifdef
CONFIG_PM_SLEEParound the ops themselves [1]. Otherwise I think we'll get a warning about unused code whenCONFIG_PM_SLEEPis unset.Quoted 2 lines
Only if I used
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(), but I set theresume_noirqdirectly.Fair enough. I guess in this case if
CONFIG_PM_SLEEPis unset, you set the pointer, which avoids the "unused function" warning, but we just never use that function pointer.My intent is to avoid needless differences when possible, so when I review things like this I look at how other drivers do things. It looks like all the other controllers use
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS()or similar:git grep -A3 "static.*dev_pm_ops"
drivers/pci/controllerIn the rcar case you only need the
resume_fn, not thesuspend_fn, soSET_NOIRQ_SYSTEM_SLEEP_PM_OPS()does a little more than you need and you'd have to pass NULL forsuspend_fn. I didn't check them all (suspend_noirq,freeze_noirq,poweroff_noirq), but at least forsuspend_noirq, all users check for NULL before calling through the .suspend_noirq() function pointer, so I think that should be safe.
Quoted 4 lines
This *does* raise the question of whether you should be setting .thaw_noirq and .restore_noirq in addition to .resume_noirq, as
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS()would. I'm not a PM person, but maybe Rafael or others will chime in.
OK, let's wait for the feedback ...
Signature · 2 lines
Best regards, Marek Vasut
Quoted 73 lines · CET Marek Vasut
Quoted 72 lines · Bjorn Helgaas
[+cc linux-pm, Rafael for
SET_NOIRQ_SYSTEM_SLEEP_PM_OPSquestion at the end]Quoted 45 lines · Marek Vasut
Quoted 44 lines · Bjorn Helgaas
Quoted 30 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>---
V2: - UseBIT()macro for (1 << n)
- Since polling inrcar_pcie_wait_for_dl()usesudelay(), do not add extra changes to this function anymore
- Makeresume_noirqreturn early and clean up parenthesis therein--- drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)drivers/pci/controller/pcie-rcar.c +0
-0drivers/pci/controller/pcie-rcar.c line 50
Quoted 5 lines
drivers/pci/controller/pcie-rcar.c +1
-0@@ -46,6 +46,7 @@/* Transfer control */ #define PCIETCTLR 0x02000 +#define DL_DOWN BIT(3)#define CFINIT 1I saw discussion after the V1 patch about using
BIT()and making similar constants also useBIT()for consistency. That makes sense to me, and I think the best way would be:1) in *this* patch, use "#define
DL_DOWN8"
2) in a followup patch, convert them all toBIT()Quoted 6 lines
Quoted 1 line
That way each revision of
pcie-rcar.cis self-consistent.But the
BIT()macros are already cleaned , see commit0ee40820989b330e24926d82953ffb9e1c7a8425PCI: rcar: Clean up the macros
Hmmm. Maybe I'm missing something, but it looks like
0ee40820989bdidn't touch CFINIT,DATA_LINK_ACTIVE, or MSIFE. Arguably,LINK_SPEED_2_5GTSandLINK_SPEED_5_0GTScould useBIT()also.I guess I'm just old-school, but in my personal opinion,
BIT()is more trouble than it's worth. I'd rather see a complete bitmask because I can easily match it with the typical pictures in a spec, multi-bit fields are easy (you don't have to mixBIT()andGENMASK()), it gives a hint about the register width, it's easy to match with a hexdump, etc, e.g.,#define DL_DOWN 0x00000008 #define CFINIT 0x00000001But I'm not suggesting that you get rid of
BIT()in this driver. I'm fine with it as long as it's used consistently.
Quoted 62 lines
Quoted 4 lines
BTW, while we're looking at it, I think
rcar_pci_read_reg()andrcar_pci_write_reg()really should use "u32" instead of "unsigned long", since they deal with hardware registers that are explicitly 32 bits wide.OK, I can send those as separate patches.
Quoted 55 lines
Quoted 35 lines
Quoted 26 lines
Quoted 26 lines
drivers/pci/controller/pcie-rcar.c +13
-0#define PCIETSTR 0x02004#define DATA_LINK_ACTIVE 1@@ -1130,6 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->dev = dev; +platform_set_drvdata (pdev, pcie); err =pci_parse_request_of_pci_ranges (dev, &pcie->resources,NULL );if (err)@@ -1221,10 +1223,28 @@ static int rcar_pcie_probe(struct platform_device *pdev)return err; } +static int rcar_pcie_resume_noirq (struct device *dev) +{ +struct rcar_pcie *pcie =dev_get_drvdata (dev); + +if (rcar_pci_read_reg (pcie,PMSR ) && + !(rcar_pci_read_reg (pcie,PCIETCTLR ) &DL_DOWN )) +return 0 ; + +/* Re-establish the PCIe link */ +rcar_pci_write_reg (pcie,CFINIT ,PCIETCTLR ); +return rcar_pcie_wait_for_dl (pcie); +}Quoted 8 lines
drivers/pci/controller/pcie-rcar.c static int rcar_pcie_probe(struct platform_device *pdev) · line 1241
Quoted 4 lines
drivers/pci/controller/pcie-rcar.c +4
-0+ +static const struct dev_pm_ops rcar_pcie_pm_ops = { + .resume_noirq = rcar_pcie_resume_noirq, +};I think there's the beginning of a convention to use #ifdef
CONFIG_PM_SLEEParound the ops themselves [1]. Otherwise I think we'll get a warning about unused code whenCONFIG_PM_SLEEPis unset.Quoted 2 lines
Only if I used
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(), but I set theresume_noirqdirectly.Fair enough. I guess in this case if
CONFIG_PM_SLEEPis unset, you set the pointer, which avoids the "unused function" warning, but we just never use that function pointer.My intent is to avoid needless differences when possible, so when I review things like this I look at how other drivers do things. It looks like all the other controllers use
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS()or similar:git grep -A3 "static.*dev_pm_ops"
drivers/pci/controllerIn the rcar case you only need the
resume_fn, not thesuspend_fn, soSET_NOIRQ_SYSTEM_SLEEP_PM_OPS()does a little more than you need and you'd have to pass NULL forsuspend_fn. I didn't check them all (suspend_noirq,freeze_noirq,poweroff_noirq), but at least forsuspend_noirq, all users check for NULL before calling through the .suspend_noirq() function pointer, so I think that should be safe.
Yes, this should be safe from the NULL pointer checks perspective.
Quoted 4 lines
Quoted 4 lines
This *does* raise the question of whether you should be setting .thaw_noirq and .restore_noirq in addition to .resume_noirq, as
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS()would. I'm not a PM person, but maybe Rafael or others will chime in.
That depends on what happens during hibernation/restore.
The driver may not need to do anything before the memory snapshot is taken or before the restore kernel jumps back to the image kernel. In that case you don't need freeze/thaw/restore_noirq at all.
However, chances are that it needs to do something and in that case doing the same thing as during system-wide suspend/resume generally works, even though it may not be particularly energy-efficient. That's why it very ofther is done.
On Fri, Mar 08, 2019 at 11:17:38AM -0600, Bjorn Helgaas wrote:
[...]
Quoted 33 lines
Quoted 21 lines
Quoted 12 lines
Quoted 12 lines
drivers/pci/controller/pcie-rcar.c +12
-0+static int rcar_pcie_resume_noirq (struct device *dev) +{ +struct rcar_pcie *pcie =dev_get_drvdata (dev); + +if (rcar_pci_read_reg (pcie,PMSR ) && + !(rcar_pci_read_reg (pcie,PCIETCTLR ) &DL_DOWN )) +return 0 ; + +/* Re-establish the PCIe link */ +rcar_pci_write_reg (pcie,CFINIT ,PCIETCTLR ); +return rcar_pcie_wait_for_dl (pcie); +}Quoted 8 lines
drivers/pci/controller/pcie-rcar.c static int rcar_pcie_probe(struct platform_device *pdev) · line 1241
Quoted 4 lines
drivers/pci/controller/pcie-rcar.c +4
-0+ +static const struct dev_pm_ops rcar_pcie_pm_ops = { + .resume_noirq = rcar_pcie_resume_noirq, +};I think there's the beginning of a convention to use #ifdef
CONFIG_PM_SLEEParound the ops themselves [1]. Otherwise I think we'll get a warning about unused code whenCONFIG_PM_SLEEPis unset.Quoted 2 lines
Only if I used
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(), but I set theresume_noirqdirectly.Fair enough. I guess in this case if
CONFIG_PM_SLEEPis unset, you set the pointer, which avoids the "unused function" warning, but we just never use that function pointer.My intent is to avoid needless differences when possible, so when I review things like this I look at how other drivers do things. It looks like all the other controllers use
SET_NOIRQ_SYSTEM_SLEEP_PM_OPS()or similar:
Quoted 8 lines
git grep -A3 "static.*dev_pm_ops"
drivers/pci/controllerIn the rcar case you only need the
resume_fn, not thesuspend_fn, soSET_NOIRQ_SYSTEM_SLEEP_PM_OPS()does a little more than you need and you'd have to pass NULL forsuspend_fn. I didn't check them all (suspend_noirq,freeze_noirq,poweroff_noirq), but at least forsuspend_noirq, all users check for NULL before calling through the .suspend_noirq() function pointer, so I think that should be safe.
It is a matter of consistency across drivers, yes, but that's something I can easily solve with a clean-up patch on top of Marek's one.
I would merge this patch as-is and convert all the drivers to a uniform convention (which one I shall see).
On a side note, this patch looks like a fix to me (even though it is not trivial for me to add a sensible Fixes: tag) and should be treated as such, so it should go in one of the upcoming -rc* (and I float the idea of sending it to stable kernels on which S2R is basically broken).
Lorenzo
Quoted 4 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses
Hi Marek, Kazufumi,
Apologies for the delay.
Just as a clarification, when you state "in case it went down" isn't this supposed to happen for every suspend cycle ? Let me know and I will add a comment to the patch commit log.
Quoted 4 lines
can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.
Quoted 8 lines
Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>
This looks like a fix (most likely fixing initial S2R support, please help me chase the commit ID), should we consider it for stable kernels ?
Without it I understand S2R is actually broken on platforms with this host bridge.
Thanks,
Lorenzo
Quoted 61 lines
---
V2: - UseBIT()macro for (1 << n)
- Since polling inrcar_pcie_wait_for_dl()usesudelay(), do not add extra changes to this function anymore
- Makeresume_noirqreturn early and clean up parenthesis therein--- drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)drivers/pci/controller/pcie-rcar.c +20
-0@@ -46,6 +46,7 @@/* Transfer control */ #define PCIETCTLR 0x02000 +#define DL_DOWN BIT(3)#define CFINIT 1#define PCIETSTR 0x02004#define DATA_LINK_ACTIVE 1@@ -1130,6 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->dev = dev; +platform_set_drvdata (pdev, pcie); err =pci_parse_request_of_pci_ranges (dev, &pcie->resources,NULL );if (err)@@ -1221,10 +1223,28 @@ static int rcar_pcie_probe(struct platform_device *pdev)return err; } +static int rcar_pcie_resume_noirq (struct device *dev) +{ +struct rcar_pcie *pcie =dev_get_drvdata (dev); + +if (rcar_pci_read_reg (pcie,PMSR ) && + !(rcar_pci_read_reg (pcie,PCIETCTLR ) &DL_DOWN )) +return 0 ; + +/* Re-establish the PCIe link */ +rcar_pci_write_reg (pcie,CFINIT ,PCIETCTLR ); +return rcar_pcie_wait_for_dl (pcie); +} + +static const struct dev_pm_ops rcar_pcie_pm_ops = { + .resume_noirq = rcar_pcie_resume_noirq, +}; +static struct platform_driver rcar_pcie_driver = { .driver = { .name ="rcar-pcie" , .of_match_table = rcar_pcie_of_match, + .pm = &rcar_pcie_pm_ops, .suppress_bind_attrs = true, }, .probe = rcar_pcie_probe,Signature · 1 line
2.19.2
Quoted 7 lines · Lorenzo Pieralisi
Quoted 4 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses
Hi Marek, Kazufumi,
Hi,
Quoted 5 lines
Apologies for the delay.
Just as a clarification, when you state "in case it went down" isn't this supposed to happen for every suspend cycle ? Let me know and I will add a comment to the patch commit log.
It does happen on every suspend/resume cycle and if you manually put a remote endpoint into non-L0 state.
Quoted 13 lines
Quoted 4 lines
can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Quoted 8 lines
Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>
Quoted 5 lines
This looks like a fix (most likely fixing initial S2R support, please help me chase the commit ID), should we consider it for stable kernels ?
Without it I understand S2R is actually broken on platforms with this host bridge.
I don't think this ever worked, so it's hard to find a Fixes: commit for this.
Signature · 2 lines
Best regards, Marek Vasut
Quoted 11 lines · Marek Vasut
Quoted 7 lines · Lorenzo Pieralisi
Quoted 4 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses
Hi Marek, Kazufumi,
Hi,
Quoted 8 lines
Quoted 5 lines
Apologies for the delay.
Just as a clarification, when you state "in case it went down" isn't this supposed to happen for every suspend cycle ? Let me know and I will add a comment to the patch commit log.
It does happen on every suspend/resume cycle and if you manually put a remote endpoint into non-L0 state.
Ok I will update the log then.
Quoted 13 lines
Quoted 13 lines
Quoted 12 lines
can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>
Quoted 7 lines
Quoted 5 lines
This looks like a fix (most likely fixing initial S2R support, please help me chase the commit ID), should we consider it for stable kernels ?
Without it I understand S2R is actually broken on platforms with this host bridge.
I don't think this ever worked, so it's hard to find a Fixes: commit for this.
If we want to send it to stable kernels we have to select which versions we are covering. I think the only options for a Fixes: tag are either the initial S2R support commit for the platforms this driver runs on or the initial driver commit that harks back to v3.16 AFAICS.
I will queue it next week so there is some time to think about it.
Thanks,
Lorenzo
Hi Lorenzo, Marek,
Quoted 16 lines · Lorenzo Pieralisi
Quoted 15 lines · Marek Vasut
Quoted 14 lines · Lorenzo Pieralisi
Quoted 7 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.This looks like a fix (most likely fixing initial S2R support, please help me chase the commit ID), should we consider it for stable kernels ?
Without it I understand S2R is actually broken on platforms with this host bridge.
Quoted 7 lines
Quoted 2 lines
I don't think this ever worked, so it's hard to find a Fixes: commit for this.
If we want to send it to stable kernels we have to select which versions we are covering. I think the only options for a Fixes: tag are either the initial S2R support commit for the platforms this driver runs on or the initial driver commit that harks back to v3.16 AFAICS.
This only started to become an issue when support for arm64 platforms was added, where PSCI may power down the SoC, right?
Hence:
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
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
Quoted 1 line · Geert Uytterhoeven
Hi Lorenzo, Marek,
Hi,
Quoted 21 lines
Quoted 19 lines · Lorenzo Pieralisi
Quoted 17 lines · Marek Vasut
Quoted 9 lines · Lorenzo Pieralisi
Quoted 7 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Quoted 5 lines
This looks like a fix (most likely fixing initial S2R support, please help me chase the commit ID), should we consider it for stable kernels ?
Without it I understand S2R is actually broken on platforms with this host bridge.
I don't think this ever worked, so it's hard to find a Fixes: commit for this.
Quoted 7 lines
Quoted 4 lines
If we want to send it to stable kernels we have to select which versions we are covering. I think the only options for a Fixes: tag are either the initial S2R support commit for the platforms this driver runs on or the initial driver commit that harks back to v3.16 AFAICS.
This only started to become an issue when support for arm64 platforms was added, where PSCI may power down the SoC, right?
Wouldn't you also hit this on ARM32 LPAE ones ?
Quoted 7 lines
Hence:
Fixes e015f88c368da1e6 ("PCI: rcar: Add support for R-Car H3 to pcie-rcar")Gr{oetje,eeting}s,
Geert
Signature · 2 lines
Best regards, Marek Vasut
Hi Marek,
Quoted 27 lines · Marek Vasut
Quoted 26 lines · Geert Uytterhoeven
Quoted 23 lines · Lorenzo Pieralisi
Quoted 10 lines · Marek Vasut
Quoted 9 lines · Lorenzo Pieralisi
Quoted 7 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Quoted 7 lines
Quoted 5 lines
This looks like a fix (most likely fixing initial S2R support, please help me chase the commit ID), should we consider it for stable kernels ?
Without it I understand S2R is actually broken on platforms with this host bridge.
I don't think this ever worked, so it's hard to find a Fixes: commit for this.
If we want to send it to stable kernels we have to select which versions we are covering. I think the only options for a Fixes: tag are either the initial S2R support commit for the platforms this driver runs on or the initial driver commit that harks back to v3.16 AFAICS.
Quoted 4 lines
Quoted 2 lines
This only started to become an issue when support for arm64 platforms was added, where PSCI may power down the SoC, right?
Wouldn't you also hit this on ARM32 LPAE ones ?
This is about the PCI link issue on system resume, right?
Quoted 2 lines
Quoted 2 lines
Hence:
Fixes e015f88c368da1e6 ("PCI: rcar: Add support for R-Car H3 to pcie-rcar")
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
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
Quoted 1 line · Geert Uytterhoeven
Hi Marek,
Hi,
Quoted 28 lines · Marek Vasut
Quoted 27 lines · Geert Uytterhoeven
Quoted 26 lines
Quoted 23 lines · Lorenzo Pieralisi
Quoted 10 lines · Marek Vasut
Quoted 9 lines · Lorenzo Pieralisi
Quoted 7 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Quoted 7 lines
Quoted 5 lines
This looks like a fix (most likely fixing initial S2R support, please help me chase the commit ID), should we consider it for stable kernels ?
Without it I understand S2R is actually broken on platforms with this host bridge.
I don't think this ever worked, so it's hard to find a Fixes: commit for this.
If we want to send it to stable kernels we have to select which versions we are covering. I think the only options for a Fixes: tag are either the initial S2R support commit for the platforms this driver runs on or the initial driver commit that harks back to v3.16 AFAICS.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
This only started to become an issue when support for arm64 platforms was added, where PSCI may power down the SoC, right?
Wouldn't you also hit this on ARM32 LPAE ones ?
This is about the PCI link issue on system resume, right?
Forget what I said, yes, I mixed this with the MSI 64bit patch.
Quoted 7 lines
Quoted 2 lines
Quoted 2 lines
Hence:
Fixes e015f88c368da1e6 ("PCI: rcar: Add support for R-Car H3 to pcie-rcar")Gr{oetje,eeting}s,
Geert
Signature · 2 lines
Best regards, Marek Vasut
Quoted 16 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>
Quoted 8 lines
---
V2: - UseBIT()macro for (1 << n)
- Since polling inrcar_pcie_wait_for_dl()usesudelay(), do not add extra changes to this function anymore
- Makeresume_noirqreturn early and clean up parenthesis therein--- drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
I applied it to pci/controller-fixes but the kbot barfed at it so we need to rework it.
Thanks,
Lorenzo
Quoted 52 lines
drivers/pci/controller/pcie-rcar.c +20
-0@@ -46,6 +46,7 @@/* Transfer control */ #define PCIETCTLR 0x02000 +#define DL_DOWN BIT(3)#define CFINIT 1#define PCIETSTR 0x02004#define DATA_LINK_ACTIVE 1@@ -1130,6 +1131,7 @@ static int rcar_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->dev = dev; +platform_set_drvdata (pdev, pcie); err =pci_parse_request_of_pci_ranges (dev, &pcie->resources,NULL );if (err)@@ -1221,10 +1223,28 @@ static int rcar_pcie_probe(struct platform_device *pdev)return err; } +static int rcar_pcie_resume_noirq (struct device *dev) +{ +struct rcar_pcie *pcie =dev_get_drvdata (dev); + +if (rcar_pci_read_reg (pcie,PMSR ) && + !(rcar_pci_read_reg (pcie,PCIETCTLR ) &DL_DOWN )) +return 0 ; + +/* Re-establish the PCIe link */ +rcar_pci_write_reg (pcie,CFINIT ,PCIETCTLR ); +return rcar_pcie_wait_for_dl (pcie); +} + +static const struct dev_pm_ops rcar_pcie_pm_ops = { + .resume_noirq = rcar_pcie_resume_noirq, +}; +static struct platform_driver rcar_pcie_driver = { .driver = { .name ="rcar-pcie" , .of_match_table = rcar_pcie_of_match, + .pm = &rcar_pcie_pm_ops, .suppress_bind_attrs = true, }, .probe = rcar_pcie_probe,Signature · 1 line
2.19.2
Quoted 26 lines · Lorenzo Pieralisi
Quoted 16 lines · On Sun, Feb 17, 2019 at 02:24:41PM +0100, [email protected] wrote:
From: Kazufumi Ikeda <[email protected]>
Reestablish the PCIe link very early in the resume process in case it went down to prevent PCI accesses from hanging the bus. Such accesses can happen early in the PCI resume process, in the
resume_noirq, thus the link must be reestablished in theresume_noirqcallback of the driver.Signed-off-by Kazufumi Ikeda <[email protected]>Signed-off-by Gaku Inami <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Geert Uytterhoeven <[email protected]>Cc Phil Edworthy <[email protected]>Cc Simon Horman <[email protected]>Cc Wolfram Sang <[email protected]>Quoted 8 lines
---
V2: - UseBIT()macro for (1 << n)
- Since polling inrcar_pcie_wait_for_dl()usesudelay(), do not add extra changes to this function anymore
- Makeresume_noirqreturn early and clean up parenthesis therein--- drivers/pci/controller/pcie-rcar.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
Quoted 2 lines
I applied it to pci/controller-fixes but the kbot barfed at it so we need to rework it.
Right, PMSR definition added, updated commit message retained, patch resubmitted as V3.
Signature · 2 lines
Best regards, Marek Vasut