| Message ID | 1572951089-19956-2-git-send-email-yoshihiro.shimoda.uh@renesas.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | PCI: rcar: Fix missing MACCTLR register setting (take2) | expand |
On Tue, Nov 05, 2019 at 07:51:28PM +0900, Yoshihiro Shimoda wrote: > This reverts commit 175cc093888ee74a17c4dd5f99ba9a6bc86de5be. > > The commit description/code don't follow the manual accurately, > it's difficult to understand. So, this patch reverts the commit. > > Fixes: 175cc093888e ("PCI: rcar: Fix missing MACCTLR register setting in rcar_pcie_hw_init()" This patch is not in the mainline, I will just drop it. > Cc: <stable@vger.kernel.org> This is valid for any fix: there is no reason to send to stable a fix for a patch that is not in the mainline yet. Lorenzo > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> > Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- > drivers/pci/controller/pcie-rcar.c | 4 ---- > 1 file changed, 4 deletions(-) > > diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c > index 0dadccb..40d8c54 100644 > --- a/drivers/pci/controller/pcie-rcar.c > +++ b/drivers/pci/controller/pcie-rcar.c > @@ -91,7 +91,6 @@ > #define LINK_SPEED_2_5GTS (1 << 16) > #define LINK_SPEED_5_0GTS (2 << 16) > #define MACCTLR 0x011058 > -#define MACCTLR_RESERVED BIT(0) > #define SPEED_CHANGE BIT(24) > #define SCRAMBLE_DISABLE BIT(27) > #define PMSR 0x01105c > @@ -614,8 +613,6 @@ static int rcar_pcie_hw_init(struct rcar_pcie *pcie) > if (IS_ENABLED(CONFIG_PCI_MSI)) > rcar_pci_write_reg(pcie, 0x801f0000, PCIEMSITXR); > > - rcar_rmw32(pcie, MACCTLR, MACCTLR_RESERVED, 0); > - > /* Finish initialization - establish a PCI Express link */ > rcar_pci_write_reg(pcie, CFINIT, PCIETCTLR); > > @@ -1238,7 +1235,6 @@ static int rcar_pcie_resume_noirq(struct device *dev) > return 0; > > /* Re-establish the PCIe link */ > - rcar_rmw32(pcie, MACCTLR, MACCTLR_RESERVED, 0); > rcar_pci_write_reg(pcie, CFINIT, PCIETCTLR); > return rcar_pcie_wait_for_dl(pcie); > } > -- > 2.7.4 >
Hi Lorenzo, > From: Lorenzo Pieralisi, Sent: Monday, November 11, 2019 11:39 PM > > On Tue, Nov 05, 2019 at 07:51:28PM +0900, Yoshihiro Shimoda wrote: > > This reverts commit 175cc093888ee74a17c4dd5f99ba9a6bc86de5be. > > > > The commit description/code don't follow the manual accurately, > > it's difficult to understand. So, this patch reverts the commit. > > > > Fixes: 175cc093888e ("PCI: rcar: Fix missing MACCTLR register setting in rcar_pcie_hw_init()" > > This patch is not in the mainline, I will just drop it. I got it. > > Cc: <stable@vger.kernel.org> > > This is valid for any fix: there is no reason to send to stable a fix > for a patch that is not in the mainline yet. I understood it. So, I'll drop both tags on v5 patches. Best regards, Yoshihiro Shimoda
diff --git a/drivers/pci/controller/pcie-rcar.c b/drivers/pci/controller/pcie-rcar.c index 0dadccb..40d8c54 100644 --- a/drivers/pci/controller/pcie-rcar.c +++ b/drivers/pci/controller/pcie-rcar.c @@ -91,7 +91,6 @@ #define LINK_SPEED_2_5GTS (1 << 16) #define LINK_SPEED_5_0GTS (2 << 16) #define MACCTLR 0x011058 -#define MACCTLR_RESERVED BIT(0) #define SPEED_CHANGE BIT(24) #define SCRAMBLE_DISABLE BIT(27) #define PMSR 0x01105c @@ -614,8 +613,6 @@ static int rcar_pcie_hw_init(struct rcar_pcie *pcie) if (IS_ENABLED(CONFIG_PCI_MSI)) rcar_pci_write_reg(pcie, 0x801f0000, PCIEMSITXR); - rcar_rmw32(pcie, MACCTLR, MACCTLR_RESERVED, 0); - /* Finish initialization - establish a PCI Express link */ rcar_pci_write_reg(pcie, CFINIT, PCIETCTLR); @@ -1238,7 +1235,6 @@ static int rcar_pcie_resume_noirq(struct device *dev) return 0; /* Re-establish the PCIe link */ - rcar_rmw32(pcie, MACCTLR, MACCTLR_RESERVED, 0); rcar_pci_write_reg(pcie, CFINIT, PCIETCTLR); return rcar_pcie_wait_for_dl(pcie); }
This reverts commit 175cc093888ee74a17c4dd5f99ba9a6bc86de5be. The commit description/code don't follow the manual accurately, it's difficult to understand. So, this patch reverts the commit. Fixes: 175cc093888e ("PCI: rcar: Fix missing MACCTLR register setting in rcar_pcie_hw_init()" Cc: <stable@vger.kernel.org> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/pci/controller/pcie-rcar.c | 4 ---- 1 file changed, 4 deletions(-)