From: "Jingoo Han" <jingoohan1@gmail.com>
To: "'Bjorn Helgaas'" <bhelgaas@google.com>,
"'Lorenzo Pieralisi'" <lorenzo.pieralisi@arm.com>
Cc: "'Thomas Petazzoni'" <thomas.petazzoni@free-electrons.com>,
"'Jayachandran C'" <jchandra@broadcom.com>,
"'Pratyush Anand'" <pratyush.anand@gmail.com>,
"'Russell King'" <linux@arm.linux.org.uk>,
"'Arnd Bergmann'" <arnd@arndb.de>,
"'Gabriele Paoloni'" <gabriele.paoloni@huawei.com>,
"'Marc Zyngier'" <marc.zyngier@arm.com>,
<linux-pci@vger.kernel.org>, "'Duc Dang'" <dhdang@apm.com>,
"'Michal Simek'" <michal.simek@xilinx.com>,
"'Simon Horman'" <horms@verge.net.au>,
"'James Morse'" <james.morse@arm.com>,
"'Tanmay Inamdar'" <tinamdar@apm.com>,
"'Thierry Reding'" <thierry.reding@gmail.com>,
<linux-arm-kernel@lists.infradead.org>,
"'Jason Cooper'" <jason@lakedaemon.net>,
"'Jingoo Han'" <jingoohan1@gmail.com>
Subject: Re: [PATCH v5 4/9] ARM/PCI: Remove msi_controller from struct pci_sys_data
Date: Thu, 6 Aug 2015 23:51:24 +0900 [thread overview]
Message-ID: <000601d0d057$63c40fb0$2b4c2f10$@com> (raw)
In-Reply-To: <20150804215420.9189.22914.stgit@bhelgaas-glaptop2.roam.corp.google.com>
On Wednesday, August 05, 2015 6:54 AM, Bjorn Helgaas wrote:
>
> From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>
> ARM now uses pci_bus->msi to store the msi_controller pointer, so we don't
> need to save it in struct pci_sys_data, and we don't need to implement
> pcibios_msi_controller() to get it out of pci_sys_data.
>
> Remove msi_controller from struct pci_sys_data and
> pcibios_msi_controller().
>
> [bhelgaas: changelog, split into separate patch]
> Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Jingoo Han <jingoohan1@gmail.com>
Best regards,
Jingoo Han
> ---
> arch/arm/include/asm/mach/pci.h | 3 ---
> arch/arm/kernel/bios32.c | 12 ------------
> 2 files changed, 15 deletions(-)
>
> diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
> index c074e7a..8857d28 100644
> --- a/arch/arm/include/asm/mach/pci.h
> +++ b/arch/arm/include/asm/mach/pci.h
> @@ -40,9 +40,6 @@ struct hw_pci {
> * Per-controller structure
> */
> struct pci_sys_data {
> -#ifdef CONFIG_PCI_MSI
> - struct msi_controller *msi_ctrl;
> -#endif
> struct list_head node;
> int busnr; /* primary bus number */
> u64 mem_offset; /* bus->cpu memory mapping offset */
> diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
> index 283bc1c..874e182 100644
> --- a/arch/arm/kernel/bios32.c
> +++ b/arch/arm/kernel/bios32.c
> @@ -18,15 +18,6 @@
>
> static int debug_pci;
>
> -#ifdef CONFIG_PCI_MSI
> -struct msi_controller *pcibios_msi_controller(struct pci_dev *dev)
> -{
> - struct pci_sys_data *sysdata = dev->bus->sysdata;
> -
> - return sysdata->msi_ctrl;
> -}
> -#endif
> -
> /*
> * We can't use pci_get_device() here since we are
> * called from interrupt context.
> @@ -462,9 +453,6 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
> if (WARN(!sys, "PCI: unable to allocate sys data!"))
> break;
>
> -#ifdef CONFIG_PCI_MSI
> - sys->msi_ctrl = hw->msi_ctrl;
> -#endif
> sys->busnr = busnr;
> sys->swizzle = hw->swizzle;
> sys->map_irq = hw->map_irq;
next prev parent reply other threads:[~2015-08-06 14:51 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-04 21:53 [PATCH v5 0/9] ARM: PCI: kill pcibios_msi_controller() Bjorn Helgaas
2015-08-04 21:53 ` [PATCH v5 1/9] ARM/PCI: Replace panic with WARN messages on failures Bjorn Helgaas
2015-08-06 14:46 ` Jingoo Han
2015-08-04 21:54 ` [PATCH v5 2/9] PCI: Add pci_scan_root_bus_msi() Bjorn Helgaas
2015-08-06 14:47 ` Jingoo Han
2015-08-04 21:54 ` [PATCH v5 3/9] ARM/PCI, designware, xilinx: Use pci_scan_root_bus_msi() Bjorn Helgaas
2015-08-06 14:49 ` Jingoo Han
2015-08-04 21:54 ` [PATCH v5 4/9] ARM/PCI: Remove msi_controller from struct pci_sys_data Bjorn Helgaas
2015-08-06 14:51 ` Jingoo Han [this message]
2015-08-04 21:54 ` [PATCH v5 5/9] PCI/MSI: Remove unused pcibios_msi_controller() hook Bjorn Helgaas
2015-08-04 21:54 ` [PATCH v5 6/9] PCI: Drop references acquired by of_parse_phandle() Bjorn Helgaas
2015-08-10 21:39 ` Bjorn Helgaas
2015-08-10 22:19 ` Rob Herring
2015-08-12 11:24 ` Lorenzo Pieralisi
2015-08-04 21:54 ` [PATCH v5 7/9] PCI: xgene: Set msi_controller->dev to platform_device, not pci_bus Bjorn Helgaas
2015-08-04 22:58 ` Bjorn Helgaas
2015-08-04 21:54 ` [PATCH v5 8/9] PCI: xgene: Look for OF "msi-parent" in host controller, not root bus Bjorn Helgaas
2015-08-04 21:54 ` [PATCH v5 9/9] PCI: xgene: Use pci_scan_root_bus_msi() Bjorn Helgaas
2015-08-06 15:26 ` Marc Zyngier
2015-08-06 16:41 ` Ley Foon Tan
2015-08-06 16:53 ` Marc Zyngier
2015-08-07 2:18 ` Ley Foon Tan
2015-08-10 22:04 ` Bjorn Helgaas
2015-08-10 22:28 ` Duc Dang
2015-08-04 23:00 ` [PATCH v5 0/9] ARM: PCI: kill pcibios_msi_controller() Bjorn Helgaas
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='000601d0d057$63c40fb0$2b4c2f10$@com' \
--to=jingoohan1@gmail.com \
--cc=arnd@arndb.de \
--cc=bhelgaas@google.com \
--cc=dhdang@apm.com \
--cc=gabriele.paoloni@huawei.com \
--cc=horms@verge.net.au \
--cc=james.morse@arm.com \
--cc=jason@lakedaemon.net \
--cc=jchandra@broadcom.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=lorenzo.pieralisi@arm.com \
--cc=marc.zyngier@arm.com \
--cc=michal.simek@xilinx.com \
--cc=pratyush.anand@gmail.com \
--cc=thierry.reding@gmail.com \
--cc=thomas.petazzoni@free-electrons.com \
--cc=tinamdar@apm.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).