From: Bjorn Helgaas <helgaas@kernel.org>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Marek Vasut <marek.vasut@gmail.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Geert Uytterhoeven <geert@linux-m68k.org>,
linux-pci <linux-pci@vger.kernel.org>,
Stephen Boyd <sboyd@kernel.org>, Wolfram Sang <wsa@the-dreams.de>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Linux-Renesas <linux-renesas-soc@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>
Subject: Re: [PATCH] PCI: rcar: Add missing COMMON_CLK dependency
Date: Wed, 29 Sep 2021 11:32:50 -0500 [thread overview]
Message-ID: <20210929163250.GA773921@bhelgaas> (raw)
In-Reply-To: <20210929145509.GA20495@lpieralisi>
On Wed, Sep 29, 2021 at 03:55:09PM +0100, Lorenzo Pieralisi wrote:
> On Wed, Sep 22, 2021 at 01:13:11AM +0200, Marek Vasut wrote:
> > On 9/21/21 6:08 PM, Geert Uytterhoeven wrote:
> >
> > [...]
> >
> > > > diff --git a/drivers/pci/controller/Kconfig b/drivers/pci/controller/Kconfig
> > > > index 326f7d13024f..ee6f5e525d3a 100644
> > > > --- a/drivers/pci/controller/Kconfig
> > > > +++ b/drivers/pci/controller/Kconfig
> > > > @@ -66,6 +66,7 @@ config PCI_RCAR_GEN2
> > > > config PCIE_RCAR_HOST
> > > > bool "Renesas R-Car PCIe host controller"
> > > > depends on ARCH_RENESAS || COMPILE_TEST
> > > > + depends on COMMON_CLK
> > >
> > > This part is OK.
> >
> > This part is also identical in the patch from Arnd, so you can just pick
> > that one as a fix and be done with it:
> >
> > [PATCH] PCI: rcar: add COMMON_CLK dependency
> > https://patchwork.kernel.org/project/linux-pci/patch/20210920095730.1216692-1-arnd@kernel.org/
>
> It is not strictly identical (Arnd's patch only touches the COMPILE_TEST
> option).
>
> Bjorn, shall we pick Arnd's patch up then ? We should be fixing this in
> one of the upcoming -rcs since we introduced it in the last merge
> window.
IIUC, a115b1bd3af0 ("PCI: rcar: Add L1 link state fix into data abort
hook") appeared in v5.15-rc1 and added a use of __clk_is_enabled(),
which is only available when COMMON_CLK=y.
PCIE_RCAR_HOST depends on ARCH_RENESAS || COMPILE_TEST. ARCH_RENESAS
is an ARM64 platform, so when COMPILE_TEST is not set, I think we get
COMMON_CLK=y via this:
config ARM64
select COMMON_CLK
But when ARCH_RENESAS is not set and COMPILE_TEST=y, there's nothing
that enforces the dependency on COMMON_CLK. Personally I like the
first hunk of Marek's patch at [1] because the dependency on
COMMON_CLK is explicit:
config PCIE_RCAR_HOST
depends on ARCH_RENESAS || COMPILE_TEST
depends on COMMON_CLK
Whereas Arnd's patch [2] implicitly depends on the fact that the platform
selects COMMON_CLK:
config PCIE_RCAR_HOST
depends on ARCH_RENESAS || (COMMON_CLK && COMPILE_TEST)
But either is fine and I agree we should fix it soonish.
Bjorn
[1] https://lore.kernel.org/all/20210907144512.5238-1-marek.vasut@gmail.com/
[2] https://lore.kernel.org/all/20210920095730.1216692-1-arnd@kernel.org/
next prev parent reply other threads:[~2021-09-29 16:32 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-07 14:45 [PATCH] PCI: rcar: Add missing COMMON_CLK dependency marek.vasut
2021-09-13 12:39 ` Lorenzo Pieralisi
2021-09-21 16:08 ` Geert Uytterhoeven
2021-09-21 23:13 ` Marek Vasut
2021-09-29 14:55 ` Lorenzo Pieralisi
2021-09-29 16:32 ` Bjorn Helgaas [this message]
2021-09-29 18:55 ` Arnd Bergmann
2021-09-29 19:08 ` Geert Uytterhoeven
2021-09-29 19:11 ` Bjorn Helgaas
2021-09-30 5:30 ` Stephen Boyd
2021-09-30 8:01 ` Geert Uytterhoeven
2021-09-30 18:16 ` Stephen Boyd
2021-09-30 18:31 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210929163250.GA773921@bhelgaas \
--to=helgaas@kernel.org \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=geert@linux-m68k.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=marek.vasut@gmail.com \
--cc=sboyd@kernel.org \
--cc=wsa@the-dreams.de \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).