From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Russell King <rmk+kernel@armlinux.org.uk>,
Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.14 34/49] ARM: footbridge: fix PCI interrupt mapping
Date: Mon, 26 Apr 2021 09:29:30 +0200 [thread overview]
Message-ID: <20210426072820.887501756@linuxfoundation.org> (raw)
In-Reply-To: <20210426072819.721586742@linuxfoundation.org>
From: Russell King <rmk+kernel@armlinux.org.uk>
[ Upstream commit 30e3b4f256b4e366a61658c294f6a21b8626dda7 ]
Since commit 30fdfb929e82 ("PCI: Add a call to pci_assign_irq() in
pci_device_probe()"), the PCI code will call the IRQ mapping function
whenever a PCI driver is probed. If these are marked as __init, this
causes an oops if a PCI driver is loaded or bound after the kernel has
initialised.
Fixes: 30fdfb929e82 ("PCI: Add a call to pci_assign_irq() in pci_device_probe()")
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
| 4 ++--
| 4 ++--
| 2 +-
| 5 ++---
4 files changed, 7 insertions(+), 8 deletions(-)
--git a/arch/arm/mach-footbridge/cats-pci.c b/arch/arm/mach-footbridge/cats-pci.c
index 0b2fd7e2e9b4..90b1e9be430e 100644
--- a/arch/arm/mach-footbridge/cats-pci.c
+++ b/arch/arm/mach-footbridge/cats-pci.c
@@ -15,14 +15,14 @@
#include <asm/mach-types.h>
/* cats host-specific stuff */
-static int irqmap_cats[] __initdata = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };
+static int irqmap_cats[] = { IRQ_PCI, IRQ_IN0, IRQ_IN1, IRQ_IN3 };
static u8 cats_no_swizzle(struct pci_dev *dev, u8 *pin)
{
return 0;
}
-static int __init cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+static int cats_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
if (dev->irq >= 255)
return -1; /* not a valid interrupt. */
--git a/arch/arm/mach-footbridge/ebsa285-pci.c b/arch/arm/mach-footbridge/ebsa285-pci.c
index 6f28aaa9ca79..c3f280d08fa7 100644
--- a/arch/arm/mach-footbridge/ebsa285-pci.c
+++ b/arch/arm/mach-footbridge/ebsa285-pci.c
@@ -14,9 +14,9 @@
#include <asm/mach/pci.h>
#include <asm/mach-types.h>
-static int irqmap_ebsa285[] __initdata = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI };
+static int irqmap_ebsa285[] = { IRQ_IN3, IRQ_IN1, IRQ_IN0, IRQ_PCI };
-static int __init ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+static int ebsa285_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
if (dev->vendor == PCI_VENDOR_ID_CONTAQ &&
dev->device == PCI_DEVICE_ID_CONTAQ_82C693)
--git a/arch/arm/mach-footbridge/netwinder-pci.c b/arch/arm/mach-footbridge/netwinder-pci.c
index 9473aa0305e5..e8304392074b 100644
--- a/arch/arm/mach-footbridge/netwinder-pci.c
+++ b/arch/arm/mach-footbridge/netwinder-pci.c
@@ -18,7 +18,7 @@
* We now use the slot ID instead of the device identifiers to select
* which interrupt is routed where.
*/
-static int __init netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+static int netwinder_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
switch (slot) {
case 0: /* host bridge */
--git a/arch/arm/mach-footbridge/personal-pci.c b/arch/arm/mach-footbridge/personal-pci.c
index 4391e433a4b2..9d19aa98a663 100644
--- a/arch/arm/mach-footbridge/personal-pci.c
+++ b/arch/arm/mach-footbridge/personal-pci.c
@@ -14,13 +14,12 @@
#include <asm/mach/pci.h>
#include <asm/mach-types.h>
-static int irqmap_personal_server[] __initdata = {
+static int irqmap_personal_server[] = {
IRQ_IN0, IRQ_IN1, IRQ_IN2, IRQ_IN3, 0, 0, 0,
IRQ_DOORBELLHOST, IRQ_DMA1, IRQ_DMA2, IRQ_PCI
};
-static int __init personal_server_map_irq(const struct pci_dev *dev, u8 slot,
- u8 pin)
+static int personal_server_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
unsigned char line;
--
2.30.2
next prev parent reply other threads:[~2021-04-26 7:39 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 7:28 [PATCH 4.14 00/49] 4.14.232-rc1 review Greg Kroah-Hartman
2021-04-26 7:28 ` [PATCH 4.14 01/49] net/sctp: fix race condition in sctp_destroy_sock Greg Kroah-Hartman
2021-04-26 7:28 ` [PATCH 4.14 02/49] Input: nspire-keypad - enable interrupts only when opened Greg Kroah-Hartman
2021-04-26 7:28 ` [PATCH 4.14 03/49] dmaengine: dw: Make it dependent to HAS_IOMEM Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 04/49] ARM: dts: Fix moving mmc devices with aliases for omap4 & 5 Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 05/49] arc: kernel: Return -EFAULT if copy_to_user() fails Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 06/49] neighbour: Disregard DEAD dst in neigh_update Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 07/49] ARM: keystone: fix integer overflow warning Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 08/49] ASoC: fsl_esai: Fix TDM slot setup for I2S mode Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 09/49] scsi: scsi_transport_srp: Dont block target in SRP_PORT_LOST state Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 10/49] net: ieee802154: stop dump llsec keys for monitors Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 11/49] net: ieee802154: stop dump llsec devs " Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 12/49] net: ieee802154: forbid monitor for add llsec dev Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 13/49] net: ieee802154: stop dump llsec devkeys for monitors Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 14/49] net: ieee802154: forbid monitor for add llsec devkey Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 15/49] net: ieee802154: stop dump llsec seclevels for monitors Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 16/49] net: ieee802154: forbid monitor for add llsec seclevel Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 17/49] pcnet32: Use pci_resource_len to validate PCI resource Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 18/49] usbip: Fix incorrect double assignment to udc->ud.tcp_rx Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 19/49] mac80211: clear sta->fast_rx when STA removed from 4-addr VLAN Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 20/49] Input: i8042 - fix Pegatron C15B ID entry Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 21/49] HID: wacom: set EV_KEY and EV_ABS only for non-HID_GENERIC type of devices Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 22/49] readdir: make sure to verify directory entry for legacy interfaces too Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 23/49] arm64: fix inline asm in load_unaligned_zeropad() Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 24/49] arm64: alternatives: Move length validation in alternative_{insn, endif} Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 25/49] scsi: libsas: Reset num_scatter if libata marks qc as NODATA Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 26/49] netfilter: conntrack: do not print icmpv6 as unknown via /proc Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 27/49] netfilter: nft_limit: avoid possible divide error in nft_limit_init Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 28/49] net: davicom: Fix regulator not turned off on failed probe Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 29/49] net: sit: Unregister catch-all devices Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 30/49] i40e: fix the panic when running bpf in xdpdrv mode Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 31/49] ibmvnic: avoid calling napi_disable() twice Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 32/49] ibmvnic: remove duplicate napi_schedule call in do_reset function Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 33/49] ibmvnic: remove duplicate napi_schedule call in open function Greg Kroah-Hartman
2021-04-26 7:29 ` Greg Kroah-Hartman [this message]
2021-04-26 7:29 ` [PATCH 4.14 35/49] ARM: 9071/1: uprobes: Dont hook on thumb instructions Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 36/49] gup: document and work around "COW can break either way" issue Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 37/49] net: hso: fix null-ptr-deref during tty device unregistration Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 38/49] ext4: correct error label in ext4_rename() Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 39/49] pinctrl: lewisburg: Update number of pins in community Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 40/49] HID: alps: fix error return code in alps_input_configured() Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 41/49] HID: wacom: Assign boolean values to a bool variable Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 42/49] ARM: dts: Fix swapped mmc order for omap3 Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 43/49] net: geneve: check skb is large enough for IPv4/IPv6 header Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 44/49] s390/entry: save the caller of psw_idle Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 45/49] xen-netback: Check for hotplug-status existence before watching Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 46/49] cavium/liquidio: Fix duplicate argument Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 47/49] ia64: fix discontig.c section mismatches Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 48/49] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Greg Kroah-Hartman
2021-04-26 7:29 ` [PATCH 4.14 49/49] x86/crash: Fix crash_setup_memmap_entries() out-of-bounds access Greg Kroah-Hartman
2021-04-26 18:33 ` [PATCH 4.14 00/49] 4.14.232-rc1 review Guenter Roeck
2021-04-27 6:58 ` Naresh Kamboju
2021-04-27 9:26 ` Samuel Zou
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=20210426072820.887501756@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.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).