From: Baoquan He <bhe@redhat•com>
To: Andy Shevchenko <andy.shevchenko@gmail•com>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Andrew Morton" <akpm@linux-foundation•org>,
"Rob Herring" <robh+dt@kernel•org>,
"Dan Williams" <dan.j.williams@intel•com>,
"Nicolas Pitre" <nicolas.pitre@linaro•org>,
"Josh Triplett" <josh@joshtriplett•org>,
"kbuild test robot" <fengguang.wu@intel•com>,
"Borislav Petkov" <bp@suse•de>,
"Patrik Jakobsson" <patrik.r.jakobsson@gmail•com>,
"David Airlie" <airlied@linux•ie>,
"KY Srinivasan" <kys@microsoft•com>,
"Haiyang Zhang" <haiyangz@microsoft•com>,
"Stephen Hemminger" <sthemmin@microsoft•com>,
"Dmitry Torokhov" <dmitry.torokhov@gmail•com>,
"Frank Rowand" <frowand.list@gmail•com>,
"Keith Busch" <keith.busch@intel•com>,
"Jon Derrick" <jonathan.derrick@intel•com>,
"Lorenzo Pieralisi" <lorenzo.pieralisi@arm•com>,
"Bjorn Helgaas" <bhelgaas@google•com>,
"Thomas Gleixner" <tglx@linutronix•de>,
brijesh.singh@amd•com, "Jérôme Glisse" <jglisse@redhat•com>,
"Tom Lendacky" <thomas.lendacky@amd•com>,
"Greg Kroah-Hartman" <gregkh@linuxfoundation•org>,
baiyaowei@cmss•chinamobile.com, richard.weiyang@gmail•com,
devel@linuxdriverproject•org,
linux-input <linux-input@vger•kernel.org>,
linux-nvdimm@lists•01.org,
devicetree <devicetree@vger•kernel.org>,
linux-pci@vger•kernel.org,
"Eric Biederman" <ebiederm@xmission•com>,
"Vivek Goyal" <vgoyal@redhat•com>,
"Dave Young" <dyoung@redhat•com>,
"Yinghai Lu" <yinghai@kernel•org>,
kexec@lists•infradead.org, "Michal Simek" <monstr@monstr•eu>,
"David S. Miller" <davem@davemloft•net>,
"Chris Zankel" <chris@zankel•net>,
"Max Filippov" <jcmvbkbc@gmail•com>,
"Gustavo Padovan" <gustavo@padovan•org>,
"Maarten Lankhorst" <maarten.lankhorst@linux•intel.com>,
"Sean Paul" <seanpaul@chromium•org>,
linux-parisc@vger•kernel.org,
"open list:LINUX FOR POWERPC PA SEMI PWRFICIENT"
<linuxppc-dev@lists•ozlabs.org>
Subject: Re: [PATCH v6 1/4] resource: Move reparent_resources() to kernel/resource.c and make it public
Date: Thu, 5 Jul 2018 18:09:39 +0800 [thread overview]
Message-ID: <20180705100939.GD1225@MiWiFi-R3L-srv> (raw)
In-Reply-To: <CAHp75VfWLcQq4XGM3RyfO_ENx=3=WrCEhtOw+a0Sfwz_OpQ0UQ@mail.gmail.com>
On 07/04/18 at 07:46pm, Andy Shevchenko wrote:
> On Wed, Jul 4, 2018 at 7:10 AM, Baoquan He <bhe@redhat•com> wrote:
> > reparent_resources() is duplicated in arch/microblaze/pci/pci-common.c
> > and arch/powerpc/kernel/pci-common.c, so move it to kernel/resource.c
> > so that it's shared.
>
> With couple of comments below,
Sure, will fix these and repost with your reviewed-by, thanks. Should be
after I reproduce and fix those issues reported by test robot.
>
> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail•com>
>
> P.S. In some commit message in this series you used 'likt' instead of 'like'.
>
> >
> > Signed-off-by: Baoquan He <bhe@redhat•com>
> > ---
> > arch/microblaze/pci/pci-common.c | 37 -------------------------------------
> > arch/powerpc/kernel/pci-common.c | 35 -----------------------------------
> > include/linux/ioport.h | 1 +
> > kernel/resource.c | 39 +++++++++++++++++++++++++++++++++++++++
> > 4 files changed, 40 insertions(+), 72 deletions(-)
> >
> > diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
> > index f34346d56095..7899bafab064 100644
> > --- a/arch/microblaze/pci/pci-common.c
> > +++ b/arch/microblaze/pci/pci-common.c
> > @@ -619,43 +619,6 @@ int pcibios_add_device(struct pci_dev *dev)
> > EXPORT_SYMBOL(pcibios_add_device);
> >
> > /*
> > - * Reparent resource children of pr that conflict with res
> > - * under res, and make res replace those children.
> > - */
> > -static int __init reparent_resources(struct resource *parent,
> > - struct resource *res)
> > -{
> > - struct resource *p, **pp;
> > - struct resource **firstpp = NULL;
> > -
> > - for (pp = &parent->child; (p = *pp) != NULL; pp = &p->sibling) {
> > - if (p->end < res->start)
> > - continue;
> > - if (res->end < p->start)
> > - break;
> > - if (p->start < res->start || p->end > res->end)
> > - return -1; /* not completely contained */
> > - if (firstpp == NULL)
> > - firstpp = pp;
> > - }
> > - if (firstpp == NULL)
> > - return -1; /* didn't find any conflicting entries? */
> > - res->parent = parent;
> > - res->child = *firstpp;
> > - res->sibling = *pp;
> > - *firstpp = res;
> > - *pp = NULL;
> > - for (p = res->child; p != NULL; p = p->sibling) {
> > - p->parent = res;
> > - pr_debug("PCI: Reparented %s [%llx..%llx] under %s\n",
> > - p->name,
> > - (unsigned long long)p->start,
> > - (unsigned long long)p->end, res->name);
> > - }
> > - return 0;
> > -}
> > -
> > -/*
> > * Handle resources of PCI devices. If the world were perfect, we could
> > * just allocate all the resource regions and do nothing more. It isn't.
> > * On the other hand, we cannot just re-allocate all devices, as it would
> > diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
> > index fe9733ffffaa..926035bb378d 100644
> > --- a/arch/powerpc/kernel/pci-common.c
> > +++ b/arch/powerpc/kernel/pci-common.c
> > @@ -1088,41 +1088,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
> > EXPORT_SYMBOL(pcibios_align_resource);
> >
> > /*
> > - * Reparent resource children of pr that conflict with res
> > - * under res, and make res replace those children.
> > - */
> > -static int reparent_resources(struct resource *parent,
> > - struct resource *res)
> > -{
> > - struct resource *p, **pp;
> > - struct resource **firstpp = NULL;
> > -
> > - for (pp = &parent->child; (p = *pp) != NULL; pp = &p->sibling) {
> > - if (p->end < res->start)
> > - continue;
> > - if (res->end < p->start)
> > - break;
> > - if (p->start < res->start || p->end > res->end)
> > - return -1; /* not completely contained */
> > - if (firstpp == NULL)
> > - firstpp = pp;
> > - }
> > - if (firstpp == NULL)
> > - return -1; /* didn't find any conflicting entries? */
> > - res->parent = parent;
> > - res->child = *firstpp;
> > - res->sibling = *pp;
> > - *firstpp = res;
> > - *pp = NULL;
> > - for (p = res->child; p != NULL; p = p->sibling) {
> > - p->parent = res;
> > - pr_debug("PCI: Reparented %s %pR under %s\n",
> > - p->name, p, res->name);
> > - }
> > - return 0;
> > -}
> > -
> > -/*
> > * Handle resources of PCI devices. If the world were perfect, we could
> > * just allocate all the resource regions and do nothing more. It isn't.
> > * On the other hand, we cannot just re-allocate all devices, as it would
> > diff --git a/include/linux/ioport.h b/include/linux/ioport.h
> > index da0ebaec25f0..dfdcd0bfe54e 100644
> > --- a/include/linux/ioport.h
> > +++ b/include/linux/ioport.h
> > @@ -192,6 +192,7 @@ extern int allocate_resource(struct resource *root, struct resource *new,
> > struct resource *lookup_resource(struct resource *root, resource_size_t start);
> > int adjust_resource(struct resource *res, resource_size_t start,
> > resource_size_t size);
> > +int reparent_resources(struct resource *parent, struct resource *res);
> > resource_size_t resource_alignment(struct resource *res);
> > static inline resource_size_t resource_size(const struct resource *res)
> > {
> > diff --git a/kernel/resource.c b/kernel/resource.c
> > index 30e1bc68503b..d1cbf4b50e17 100644
> > --- a/kernel/resource.c
> > +++ b/kernel/resource.c
> > @@ -983,6 +983,45 @@ int adjust_resource(struct resource *res, resource_size_t start,
> > }
> > EXPORT_SYMBOL(adjust_resource);
> >
> > +/*
>
> /** ?
>
> > + * reparent_resources - reparent resource children of parent that res covers
> > + * @parent: parent resource descriptor
> > + * @res: resource descriptor desired by caller
> > + *
> > + * Reparent resource children of 'parent' that conflict with 'res'
> > + * under 'res', and make 'res' replace those children.
>
> Describe error codes, please.
>
> > + */
> > +int reparent_resources(struct resource *parent, struct resource *res)
> > +{
> > + struct resource *p, **pp;
> > + struct resource **firstpp = NULL;
> > +
> > + for (pp = &parent->child; (p = *pp) != NULL; pp = &p->sibling) {
> > + if (p->end < res->start)
> > + continue;
> > + if (res->end < p->start)
> > + break;
> > + if (p->start < res->start || p->end > res->end)
> > + return -ENOTSUPP; /* not completely contained */
> > + if (firstpp == NULL)
> > + firstpp = pp;
> > + }
> > + if (firstpp == NULL)
> > + return -ECANCELED; /* didn't find any conflicting entries? */
> > + res->parent = parent;
> > + res->child = *firstpp;
> > + res->sibling = *pp;
> > + *firstpp = res;
> > + *pp = NULL;
> > + for (p = res->child; p != NULL; p = p->sibling) {
> > + p->parent = res;
> > + pr_debug("PCI: Reparented %s %pR under %s\n",
> > + p->name, p, res->name);
> > + }
> > + return 0;
> > +}
> > +EXPORT_SYMBOL(reparent_resources);
> > +
> > static void __init __reserve_region_with_split(struct resource *root,
> > resource_size_t start, resource_size_t end,
> > const char *name)
> > --
> > 2.13.6
> >
>
>
>
> --
> With Best Regards,
> Andy Shevchenko
next prev parent reply other threads:[~2018-07-05 10:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-04 4:10 [PATCH v6 0/4] resource: Use list_head to link sibling resource Baoquan He
2018-07-04 4:10 ` [PATCH v6 1/4] resource: Move reparent_resources() to kernel/resource.c and make it public Baoquan He
2018-07-04 16:46 ` Andy Shevchenko
2018-07-05 10:09 ` Baoquan He [this message]
2018-07-04 4:10 ` [PATCH v6 2/4] resource: Use list_head to link sibling resource Baoquan He
2018-07-04 17:00 ` kbuild test robot
2018-07-08 2:59 ` Baoquan He
2018-07-08 17:48 ` Andy Shevchenko
2018-07-09 3:04 ` Baoquan He
2018-07-10 0:59 ` [kbuild-all] " Ye Xiaolong
2018-07-10 3:10 ` Baoquan He
2018-07-04 17:00 ` kbuild test robot
2018-07-04 4:10 ` [PATCH v6 3/4] resource: add walk_system_ram_res_rev() Baoquan He
2018-07-04 4:10 ` [PATCH v6 4/4] kexec_file: Load kernel at top of system RAM if required Baoquan He
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=20180705100939.GD1225@MiWiFi-R3L-srv \
--to=bhe@redhat$(echo .)com \
--cc=airlied@linux$(echo .)ie \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andy.shevchenko@gmail$(echo .)com \
--cc=baiyaowei@cmss$(echo .)chinamobile.com \
--cc=bhelgaas@google$(echo .)com \
--cc=bp@suse$(echo .)de \
--cc=brijesh.singh@amd$(echo .)com \
--cc=chris@zankel$(echo .)net \
--cc=dan.j.williams@intel$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=devel@linuxdriverproject$(echo .)org \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=dmitry.torokhov@gmail$(echo .)com \
--cc=dyoung@redhat$(echo .)com \
--cc=ebiederm@xmission$(echo .)com \
--cc=fengguang.wu@intel$(echo .)com \
--cc=frowand.list@gmail$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=gustavo@padovan$(echo .)org \
--cc=haiyangz@microsoft$(echo .)com \
--cc=jcmvbkbc@gmail$(echo .)com \
--cc=jglisse@redhat$(echo .)com \
--cc=jonathan.derrick@intel$(echo .)com \
--cc=josh@joshtriplett$(echo .)org \
--cc=keith.busch@intel$(echo .)com \
--cc=kexec@lists$(echo .)infradead.org \
--cc=kys@microsoft$(echo .)com \
--cc=linux-input@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-nvdimm@lists$(echo .)01.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-pci@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=lorenzo.pieralisi@arm$(echo .)com \
--cc=maarten.lankhorst@linux$(echo .)intel.com \
--cc=monstr@monstr$(echo .)eu \
--cc=nicolas.pitre@linaro$(echo .)org \
--cc=patrik.r.jakobsson@gmail$(echo .)com \
--cc=richard.weiyang@gmail$(echo .)com \
--cc=robh+dt@kernel$(echo .)org \
--cc=seanpaul@chromium$(echo .)org \
--cc=sthemmin@microsoft$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=thomas.lendacky@amd$(echo .)com \
--cc=vgoyal@redhat$(echo .)com \
--cc=yinghai@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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