* [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators @ 2022-01-12 1:31 Jim Quinlan 2022-01-12 17:51 ` Bjorn Helgaas 2022-01-12 19:47 ` Bjorn Helgaas 0 siblings, 2 replies; 7+ messages in thread From: Jim Quinlan @ 2022-01-12 1:31 UTC (permalink / raw) To: Bjorn Helgaas, Lorenzo Pieralisi, jim2101024, james.quinlan Cc: linux-pci, bcm-kernel-feedback-list --- drivers/pci/controller/pcie-brcmstb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index 8a3321314b74..4134f01acd87 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) err_reset: reset_control_rearm(pcie->rescal); err_regulator: - regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); + if (pcie->sr) + regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); err_disable_clk: clk_disable_unprepare(pcie->clk); return ret; -- 2.17.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators 2022-01-12 1:31 [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators Jim Quinlan @ 2022-01-12 17:51 ` Bjorn Helgaas 2022-01-12 18:00 ` Lorenzo Pieralisi 2022-01-12 19:47 ` Bjorn Helgaas 1 sibling, 1 reply; 7+ messages in thread From: Bjorn Helgaas @ 2022-01-12 17:51 UTC (permalink / raw) To: Jim Quinlan Cc: Bjorn Helgaas, Lorenzo Pieralisi, james.quinlan, linux-pci, bcm-kernel-feedback-list On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote: What's this connected to? Is this a fix for a patch that has already been merged? If so, which one? If it's a standalone thing, it needs a commit log and a Signed-off-by. Actually, that would be good in any case. Maybe a lore link to the relevant patch? > --- > drivers/pci/controller/pcie-brcmstb.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 8a3321314b74..4134f01acd87 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) > err_reset: > reset_control_rearm(pcie->rescal); > err_regulator: > - regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > + if (pcie->sr) > + regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > err_disable_clk: > clk_disable_unprepare(pcie->clk); > return ret; > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators 2022-01-12 17:51 ` Bjorn Helgaas @ 2022-01-12 18:00 ` Lorenzo Pieralisi 2022-01-12 18:57 ` Jim Quinlan 2022-01-12 21:50 ` Lukas Wunner 0 siblings, 2 replies; 7+ messages in thread From: Lorenzo Pieralisi @ 2022-01-12 18:00 UTC (permalink / raw) To: Bjorn Helgaas, Jim Quinlan Cc: james.quinlan, linux-pci, bcm-kernel-feedback-list On Wed, Jan 12, 2022 at 11:51:06AM -0600, Bjorn Helgaas wrote: > On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote: > > What's this connected to? Is this a fix for a patch that has already > been merged? If so, which one? If it's a standalone thing, it needs > a commit log and a Signed-off-by. Actually, that would be good in any > case. Maybe a lore link to the relevant patch? I was about to reply. It is a fixup for one of the branches I am queueing for v5.17 (pci/brcmstb), I can either squash that it myself or you can do it, provided that Jim gives us the commit id this is actually fixing (or a lore link to the patch posting so that we can infer the commit to fix). Lorenzo > > --- > > drivers/pci/controller/pcie-brcmstb.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > > index 8a3321314b74..4134f01acd87 100644 > > --- a/drivers/pci/controller/pcie-brcmstb.c > > +++ b/drivers/pci/controller/pcie-brcmstb.c > > @@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) > > err_reset: > > reset_control_rearm(pcie->rescal); > > err_regulator: > > - regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > > + if (pcie->sr) > > + regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > > err_disable_clk: > > clk_disable_unprepare(pcie->clk); > > return ret; > > -- > > 2.17.1 > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators 2022-01-12 18:00 ` Lorenzo Pieralisi @ 2022-01-12 18:57 ` Jim Quinlan 2022-01-12 21:50 ` Lukas Wunner 1 sibling, 0 replies; 7+ messages in thread From: Jim Quinlan @ 2022-01-12 18:57 UTC (permalink / raw) To: Lorenzo Pieralisi Cc: Bjorn Helgaas, Jim Quinlan, open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS, maintainer:BROADCOM BCM7XXX ARM ARCHITECTURE On Wed, Jan 12, 2022 at 1:00 PM Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> wrote: > > On Wed, Jan 12, 2022 at 11:51:06AM -0600, Bjorn Helgaas wrote: > > On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote: > > > > What's this connected to? Is this a fix for a patch that has already > > been merged? If so, which one? If it's a standalone thing, it needs > > a commit log and a Signed-off-by. Actually, that would be good in any > > case. Maybe a lore link to the relevant patch? > > I was about to reply. It is a fixup for one of the branches I am > queueing for v5.17 (pci/brcmstb), I can either squash that it myself or > you can do it, provided that Jim gives us the commit id this is actually > fixing (or a lore link to the patch posting so that we can infer the > commit to fix). Hi, Sorry, I am unfamiliar with the proper process of sending a fixup like this. The Lore URL is https://lore.kernel.org/linux-pci/20220106160332.2143-7-jim2101024@gmail.com/T/#m3da60632bd79330cfdfc99ae7bac4367200f5ae5 And the target commit for the fixup is 6/7 Regards, Jim Quinlan Broadcom STB > > Lorenzo > > > > --- > > > drivers/pci/controller/pcie-brcmstb.c | 3 ++- > > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > > > index 8a3321314b74..4134f01acd87 100644 > > > --- a/drivers/pci/controller/pcie-brcmstb.c > > > +++ b/drivers/pci/controller/pcie-brcmstb.c > > > @@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) > > > err_reset: > > > reset_control_rearm(pcie->rescal); > > > err_regulator: > > > - regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > > > + if (pcie->sr) > > > + regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > > > err_disable_clk: > > > clk_disable_unprepare(pcie->clk); > > > return ret; > > > -- > > > 2.17.1 > > > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators 2022-01-12 18:00 ` Lorenzo Pieralisi 2022-01-12 18:57 ` Jim Quinlan @ 2022-01-12 21:50 ` Lukas Wunner 2022-01-12 21:55 ` Bjorn Helgaas 1 sibling, 1 reply; 7+ messages in thread From: Lukas Wunner @ 2022-01-12 21:50 UTC (permalink / raw) To: Lorenzo Pieralisi Cc: Bjorn Helgaas, Jim Quinlan, james.quinlan, linux-pci, bcm-kernel-feedback-list On Wed, Jan 12, 2022 at 06:00:11PM +0000, Lorenzo Pieralisi wrote: > On Wed, Jan 12, 2022 at 11:51:06AM -0600, Bjorn Helgaas wrote: > > On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote: > > What's this connected to? Is this a fix for a patch that has already > > been merged? If so, which one? If it's a standalone thing, it needs > > a commit log and a Signed-off-by. Actually, that would be good in any > > case. Maybe a lore link to the relevant patch? > > I was about to reply. It is a fixup for one of the branches I am > queueing for v5.17 (pci/brcmstb), I can either squash that it myself or > you can do it, provided that Jim gives us the commit id this is actually > fixing (or a lore link to the patch posting so that we can infer the > commit to fix). If you apply the patch to the pci/host/brcmstb branch with "git am" as usual, then execute "git rebase --autosquash v5.16-rc1", git will automatically figure out the commit id this patch is fixing, fold it into the commit and rebase the remainder of the branch on top of it. Thanks, Lukas ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators 2022-01-12 21:50 ` Lukas Wunner @ 2022-01-12 21:55 ` Bjorn Helgaas 0 siblings, 0 replies; 7+ messages in thread From: Bjorn Helgaas @ 2022-01-12 21:55 UTC (permalink / raw) To: Lukas Wunner Cc: Lorenzo Pieralisi, Jim Quinlan, james.quinlan, linux-pci, bcm-kernel-feedback-list On Wed, Jan 12, 2022 at 10:50:00PM +0100, Lukas Wunner wrote: > On Wed, Jan 12, 2022 at 06:00:11PM +0000, Lorenzo Pieralisi wrote: > > On Wed, Jan 12, 2022 at 11:51:06AM -0600, Bjorn Helgaas wrote: > > > On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote: > > > What's this connected to? Is this a fix for a patch that has already > > > been merged? If so, which one? If it's a standalone thing, it needs > > > a commit log and a Signed-off-by. Actually, that would be good in any > > > case. Maybe a lore link to the relevant patch? > > > > I was about to reply. It is a fixup for one of the branches I am > > queueing for v5.17 (pci/brcmstb), I can either squash that it myself or > > you can do it, provided that Jim gives us the commit id this is actually > > fixing (or a lore link to the patch posting so that we can infer the > > commit to fix). > > If you apply the patch to the pci/host/brcmstb branch with "git am" > as usual, then execute "git rebase --autosquash v5.16-rc1", > git will automatically figure out the commit id this patch is fixing, > fold it into the commit and rebase the remainder of the branch on top > of it. Wow! That's ... amazing. Or something :) I already did it the old-fashioned way, but I'll try to remember this trick for next time. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators 2022-01-12 1:31 [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators Jim Quinlan 2022-01-12 17:51 ` Bjorn Helgaas @ 2022-01-12 19:47 ` Bjorn Helgaas 1 sibling, 0 replies; 7+ messages in thread From: Bjorn Helgaas @ 2022-01-12 19:47 UTC (permalink / raw) To: Jim Quinlan Cc: Bjorn Helgaas, Lorenzo Pieralisi, james.quinlan, linux-pci, bcm-kernel-feedback-list On Tue, Jan 11, 2022 at 08:31:00PM -0500, Jim Quinlan wrote: > --- > drivers/pci/controller/pcie-brcmstb.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Thanks, to expedite this since we're in the merge window, I cloned Lorenzo's branch and squashed this into pci/host/brcmstb for v5.17. > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 8a3321314b74..4134f01acd87 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -1392,7 +1392,8 @@ static int brcm_pcie_resume(struct device *dev) > err_reset: > reset_control_rearm(pcie->rescal); > err_regulator: > - regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > + if (pcie->sr) > + regulator_bulk_disable(pcie->sr->num_supplies, pcie->sr->supplies); > err_disable_clk: > clk_disable_unprepare(pcie->clk); > return ret; > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-12 21:55 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-01-12 1:31 [PATCH] fixup! PCI: brcmstb: Add control of subdevice voltage regulators Jim Quinlan 2022-01-12 17:51 ` Bjorn Helgaas 2022-01-12 18:00 ` Lorenzo Pieralisi 2022-01-12 18:57 ` Jim Quinlan 2022-01-12 21:50 ` Lukas Wunner 2022-01-12 21:55 ` Bjorn Helgaas 2022-01-12 19:47 ` Bjorn Helgaas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).