From: helgaas@kernel.org (Bjorn Helgaas)
To: linux-arm-kernel@lists.infradead.org
Subject: [RFC PATCH V5 1/5] PCI: Embed pci_ecam_ops in pci_config_window structure
Date: Thu, 1 Sep 2016 13:23:45 -0500 [thread overview]
Message-ID: <20160901182345.GA18461@localhost> (raw)
In-Reply-To: <1470661541-26270-2-git-send-email-tn@semihalf.com>
On Mon, Aug 08, 2016 at 03:05:37PM +0200, Tomasz Nowicki wrote:
> pci_config_window keeps pointer to pci_ecam_ops and every time
> we want to deallocate pci_config_window (pci_ecam_free()) we need to make
> sure to free pci_ecam_ops in case it was dynamically allocated prior to
> pci_ecam_create() call.
I think this is a theoretical problem, right? All the current callers
pass a pointer to a static pci_ecam_ops struct that does not need to
be deallocated.
I see that the next patch uses a pci_ecam_ops struct on the stack,
which would definitely cause issues without this patch, so I agree we
need something like this; I'm just trying to make the changelog make
more sense.
> To avoid that extra effort, embed pci_ecam_ops in pci_config_window,
> instead of just a pointer.
>
> Signed-off-by: Tomasz Nowicki <tn@semihalf.com>
> To: Jayachandran C <jchandra@broadcom.com>
This looks like an editing mistake?
> ---
> arch/arm64/kernel/pci.c | 2 +-
> drivers/pci/ecam.c | 6 +++---
> include/linux/pci-ecam.h | 2 +-
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
> index acf3872..981e828 100644
> --- a/arch/arm64/kernel/pci.c
> +++ b/arch/arm64/kernel/pci.c
> @@ -183,7 +183,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
> return NULL;
> }
>
> - acpi_pci_root_ops.pci_ops = &ri->cfg->ops->pci_ops;
> + acpi_pci_root_ops.pci_ops = &ri->cfg->ops.pci_ops;
> bus = acpi_pci_root_create(root, &acpi_pci_root_ops, &ri->common,
> ri->cfg);
> if (!bus)
> diff --git a/drivers/pci/ecam.c b/drivers/pci/ecam.c
> index 43ed08d..24242f0 100644
> --- a/drivers/pci/ecam.c
> +++ b/drivers/pci/ecam.c
> @@ -52,7 +52,7 @@ struct pci_config_window *pci_ecam_create(struct device *dev,
> return ERR_PTR(-ENOMEM);
>
> cfg->parent = dev;
> - cfg->ops = ops;
> + cfg->ops = *ops;
> cfg->busr.start = busr->start;
> cfg->busr.end = busr->end;
> cfg->busr.flags = IORESOURCE_BUS;
> @@ -138,7 +138,7 @@ void __iomem *pci_ecam_map_bus(struct pci_bus *bus, unsigned int devfn,
> int where)
> {
> struct pci_config_window *cfg = bus->sysdata;
> - unsigned int devfn_shift = cfg->ops->bus_shift - 8;
> + unsigned int devfn_shift = cfg->ops.bus_shift - 8;
> unsigned int busn = bus->number;
> void __iomem *base;
>
> @@ -149,7 +149,7 @@ void __iomem *pci_ecam_map_bus(struct pci_bus *bus, unsigned int devfn,
> if (per_bus_mapping)
> base = cfg->winp[busn];
> else
> - base = cfg->win + (busn << cfg->ops->bus_shift);
> + base = cfg->win + (busn << cfg->ops.bus_shift);
> return base + (devfn << devfn_shift) + where;
> }
>
> diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h
> index 7adad20..0ce2920 100644
> --- a/include/linux/pci-ecam.h
> +++ b/include/linux/pci-ecam.h
> @@ -39,7 +39,7 @@ struct pci_config_window {
> struct resource res;
> struct resource busr;
> void *priv;
> - struct pci_ecam_ops *ops;
> + struct pci_ecam_ops ops;
> union {
> void __iomem *win; /* 64-bit single mapping */
> void __iomem **winp; /* 32-bit per-bus mapping */
> --
> 1.9.1
>
next prev parent reply other threads:[~2016-09-01 18:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-08 13:05 [RFC PATCH V5 0/5] ECAM quirks handling for ARM64 platforms Tomasz Nowicki
2016-08-08 13:05 ` [RFC PATCH V5 1/5] PCI: Embed pci_ecam_ops in pci_config_window structure Tomasz Nowicki
2016-09-01 18:23 ` Bjorn Helgaas [this message]
2016-09-02 15:38 ` Lorenzo Pieralisi
2016-09-05 2:22 ` Bjorn Helgaas
2016-08-08 13:05 ` [RFC PATCH V5 2/5] PCI/ACPI: Move ACPI ECAM mapping to generic MCFG driver Tomasz Nowicki
2016-09-05 2:22 ` Bjorn Helgaas
2016-09-06 18:04 ` Tomasz Nowicki
2016-08-08 13:05 ` [RFC PATCH V5 3/5] PCI: Check platform specific ECAM quirks Tomasz Nowicki
2016-08-08 15:34 ` Mark Salter
2016-08-09 6:10 ` Tomasz Nowicki
2016-09-05 2:25 ` Bjorn Helgaas
2016-09-06 17:49 ` Tomasz Nowicki
2016-09-06 19:14 ` Arnd Bergmann
2016-09-05 2:59 ` Bjorn Helgaas
2016-08-08 13:05 ` [RFC PATCH V5 4/5] ARM64/PCI: Start using quirks handling for ACPI based PCI host controller Tomasz Nowicki
2016-09-05 2:27 ` Bjorn Helgaas
2016-08-08 13:05 ` [RFC PATCH V5 5/5] PCI: thunder-pem: Support quirky configuration space access " Tomasz Nowicki
2016-08-09 11:04 ` Robert Richter
2016-09-05 2:34 ` Bjorn Helgaas
2016-09-06 18:01 ` Tomasz Nowicki
2016-08-08 15:13 ` [RFC PATCH V5 0/5] ECAM quirks handling for ARM64 platforms Graeme Gregory
2016-08-08 19:44 ` Mark Salter
2016-08-09 9:20 ` Dongdong Liu
2016-08-09 10:29 ` Robert Richter
2016-08-09 14:20 ` Duc Dang
-- strict thread matches above, loose matches on Subject: below --
2016-08-08 12:56 Tomasz Nowicki
2016-08-08 12:56 ` [RFC PATCH V5 1/5] PCI: Embed pci_ecam_ops in pci_config_window structure Tomasz Nowicki
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=20160901182345.GA18461@localhost \
--to=helgaas@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).