mainline/master build: 212 builds: 2 failed, 210 passed, 2 errors, 55 warnings (v4.14-rc1-9-g0666f560b71b)
Subsystems (2)
Quoted 2 lines · kernelci.org bot
Errors summary:
1arch/mips/pmcs-msp71xx/msp_smp.c:72:2: error: implicit declaration of function 'set_vi_handler' [-Werror=implicit-function-declaration]
Sent a patch now
Quoted 3 lines
Warnings summary:
19fs/cifs/smb2ops.c:563:1: warning: 'smb2_set_ea' defined but not used [-Wunused-function] 19fs/cifs/smb2ops.c:513:1: warning: 'smb2_query_eas' defined but not used [-Wunused-function]
Steve French merged my patch, should be upstream soon.
Quoted 1 line
6
include/linux/kernel.h:60:38: warning: division by zero [-Wdiv-by-zero]
Geert sent a patch last week.
Quoted 3 lines
1 arch/arm/configs/zeus_defconfig:115:warning: symbol value 'm' invalid for
FRAMEBUFFER_CONSOLE1 arch/arm/configs/viper_defconfig:116:warning: symbol value 'm' invalid forFRAMEBUFFER_CONSOLE1 arch/arm/configs/pxa_defconfig:474:warning: symbol value 'm' invalid forFRAMEBUFFER_CONSOLE
Sent a patch now
Quoted 3 lines
Section mismatches summary:
27 WARNING: modpost: Found 1 section mismatch(es). 6 WARNING: modpost: Found 2 section mismatch(es).
These are all MIPS warnings caused by Lorenzo's
04c81c7293df ("MIPS: PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks")
The problem is that now we can reference pci_fixup_irqs from a function that is not marked __init, and probably should not be, since pcibios_scanbus() itself can be called at any time. Even before Lorenzo's change, having pcibios_map_irq as an __init function was problematic AFAICT on any platform that has hotplug-capable PCIe slots, or that can have a PCI host bridge driver in a loadable module.
The safe fix would be to remove all the __init annotations as well as the __initdata and __initconst annotations on data referenced by the map_irq functions.
Arnd
On Mon, Sep 18, 2017 at 05:56:02PM +0200, Arnd Bergmann wrote:
[...]
Quoted 17 lines
Quoted 3 lines
Section mismatches summary:
27 WARNING: modpost: Found 1 section mismatch(es). 6 WARNING: modpost: Found 2 section mismatch(es).These are all MIPS warnings caused by Lorenzo's
04c81c7293df("MIPS: PCI: Replacepci_fixup_irqs()call with host bridge IRQ mapping hooks")The problem is that now we can reference
pci_fixup_irqsfrom a function that is not marked__init, and probably should not be, sincepcibios_scanbus()itself can be called at any time. Even before Lorenzo's change, havingpcibios_map_irqas an__initfunction was problematic AFAICT on any platform that has hotplug-capable PCIe slots, or that can have a PCI host bridge driver in a loadable module.
Quoted 3 lines
The safe fix would be to remove all the
__initannotations as well as the__initdataand__initconstannotations on data referenced by themap_irqfunctions.
Right. Patch below, I will send it out tomorrow (I certainly missed some annotations) please let me know if that's reasonable.
Lorenzo
-- >8 --
Subject: [PATCH] MIPS: Fix PCI host bridge map_irq() hook section mismatches
Commit 04c81c7293df ("MIPS: PCI: Replace pci_fixup_irqs() call with host bridge IRQ mapping hooks") allowed to move the PCI irq fixup to the new host bridge map/swizzle_irq() hooks mechanism. Those hooks can also be called after boot therefore functions called by them (and the data they refer to) must not be marked as __init/__initdata/__initconst lest compilation triggers section mismatches warnings.
Fix all the boards files map_irq() hooks by simply removing the respective __init/__initdata/__initconst section markers.
bridge IRQ mapping hooks")
--- arch/mips/ath79/pci.c | 12 ++++++------ arch/mips/pci/fixup-capcella.c | 4 ++-- arch/mips/pci/fixup-cobalt.c | 8 ++++---- arch/mips/pci/fixup-emma2rh.c | 4 ++-- arch/mips/pci/fixup-fuloong2e.c | 2 +- arch/mips/pci/fixup-ip32.c | 4 ++-- arch/mips/pci/fixup-jmr3927.c | 2 +- arch/mips/pci/fixup-lantiq.c | 2 +- arch/mips/pci/fixup-lemote2f.c | 4 ++-- arch/mips/pci/fixup-loongson3.c | 2 +- arch/mips/pci/fixup-malta.c | 4 ++-- arch/mips/pci/fixup-mpc30x.c | 6 +++--- arch/mips/pci/fixup-pmcmsp.c | 8 ++++---- arch/mips/pci/fixup-rbtx4927.c | 2 +- arch/mips/pci/fixup-rbtx4938.c | 2 +- arch/mips/pci/fixup-sni.c | 12 ++++++------ arch/mips/pci/fixup-tb0219.c | 2 +- arch/mips/pci/fixup-tb0226.c | 2 +- arch/mips/pci/fixup-tb0287.c | 2 +- arch/mips/pci/pci-alchemy.c | 2 +- arch/mips/pci/pci-bcm47xx.c | 2 +- arch/mips/pci/pci-lasat.c | 2 +- arch/mips/pci/pci-mt7620.c | 2 +- arch/mips/pci/pci-octeon.c | 5 ++--- arch/mips/pci/pci-rt2880.c | 2 +- arch/mips/pci/pci-rt3883.c | 2 +- arch/mips/pci/pci-tx4939.c | 4 ++-- arch/mips/pci/pci-xlp.c | 2 +- arch/mips/pci/pci-xlr.c | 2 +- arch/mips/txx9/generic/setup.c | 2 +- arch/mips/txx9/jmr3927/setup.c | 2 +- arch/mips/txx9/rbtx4927/setup.c | 4 ++-- arch/mips/txx9/rbtx4938/setup.c | 2 +- arch/mips/txx9/rbtx4939/setup.c | 2 +- 34 files changed, 60 insertions(+), 61 deletions(-)
arch/mips/ath79/pci.c +6 -6
@@ -22,10 +22,10 @@#include "pci.h" static int (*ath79_pci_plat_dev_init)(struct pci_dev *dev); -static const struct ath79_pci_irq *ath79_pci_irq_map__initdata ; -static unsigned ath79_pci_nr_irqs__initdata ; +static const struct ath79_pci_irq *ath79_pci_irq_map; +static unsigned ath79_pci_nr_irqs; -static const struct ath79_pci_irq ar71xx_pci_irq_map[]__initconst = { +static const struct ath79_pci_irq ar71xx_pci_irq_map[] = { { .slot =17 , .pin =1 ,
@@ -41,7 +41,7 @@ static const struct ath79_pci_irq ar71xx_pci_irq_map[] __initconst = { } }; -static const struct ath79_pci_irq ar724x_pci_irq_map[]__initconst = { +static const struct ath79_pci_irq ar724x_pci_irq_map[] = { { .slot =0 , .pin =1 ,
@@ -49,7 +49,7 @@ static const struct ath79_pci_irq ar724x_pci_irq_map[] __initconst = { } }; -static const struct ath79_pci_irq qca955x_pci_irq_map[]__initconst = { +static const struct ath79_pci_irq qca955x_pci_irq_map[] = { { .bus =0 , .slot =0 ,
@@ -64,7 +64,7 @@ static const struct ath79_pci_irq qca955x_pci_irq_map[] __initconst = { }, }; -int __init pcibios_map_irq (const struct pci_dev *dev,uint8_t slot,uint8_t pin) +int pcibios_map_irq (const struct pci_dev *dev,uint8_t slot,uint8_t pin) {int irq =-1 ;int i;
arch/mips/pci/fixup-capcella.c +2 -2
@@ -32,13 +32,13 @@#define INTC PC104PLUS_INTC_IRQ#define INTD PC104PLUS_INTD_IRQ -static char irq_tab_capcella[][5 ]__initdata = { +static char irq_tab_capcella[][5 ] = { [11 ] = {-1 ,INT1 ,INT1 ,INT1 ,INT1 }, [12 ] = {-1 ,INT2 ,INT2 ,INT2 ,INT2 }, [14 ] = {-1 ,INTA ,INTB ,INTC ,INTD } }; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {return irq_tab_capcella[slot][pin]; }
arch/mips/pci/fixup-cobalt.c +4 -4
@@ -147,7 +147,7 @@ static void qube_raq_via_board_id_fixup(struct pci_dev *dev)DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_VIA ,PCI_DEVICE_ID_VIA_82C586_0 , qube_raq_via_board_id_fixup); -static char irq_tab_qube1[]__initdata = { +static char irq_tab_qube1[] = { [COBALT_PCICONF_CPU ] =0 , [COBALT_PCICONF_ETH0 ] =QUBE1_ETH0_IRQ , [COBALT_PCICONF_RAQSCSI ] =SCSI_IRQ ,
@@ -156,7 +156,7 @@ static char irq_tab_qube1[] __initdata = { [COBALT_PCICONF_ETH1 ] =0 }; -static char irq_tab_cobalt[]__initdata = { +static char irq_tab_cobalt[] = { [COBALT_PCICONF_CPU ] =0 , [COBALT_PCICONF_ETH0 ] =ETH0_IRQ , [COBALT_PCICONF_RAQSCSI ] =SCSI_IRQ ,
@@ -165,7 +165,7 @@ static char irq_tab_cobalt[] __initdata = { [COBALT_PCICONF_ETH1 ] =ETH1_IRQ }; -static char irq_tab_raq2[]__initdata = { +static char irq_tab_raq2[] = { [COBALT_PCICONF_CPU ] =0 , [COBALT_PCICONF_ETH0 ] =ETH0_IRQ , [COBALT_PCICONF_RAQSCSI ] =RAQ2_SCSI_IRQ ,
@@ -174,7 +174,7 @@ static char irq_tab_raq2[] __initdata = { [COBALT_PCICONF_ETH1] = ETH1_IRQ }; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {if (cobalt_board_id <=COBALT_BRD_ID_QUBE1 )return irq_tab_qube1[slot];
arch/mips/pci/fixup-emma2rh.c +2 -2
@@ -43,7 +43,7 @@*/ #define MAX_SLOT_NUM 10 -static unsigned char irq_map[][5 ]__initdata = { +static unsigned char irq_map[][5 ] = { [3 ] = {0 ,MARKEINS_PCI_IRQ_INTB ,MARKEINS_PCI_IRQ_INTC ,MARKEINS_PCI_IRQ_INTD ,0 ,}, [4 ] = {0 ,MARKEINS_PCI_IRQ_INTA ,0 ,0 ,0 ,},
@@ -85,7 +85,7 @@ static void emma2rh_pci_host_fixup(struct pci_dev *dev)DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_NEC ,PCI_DEVICE_ID_NEC_EMMA2RH , emma2rh_pci_host_fixup); -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {return irq_map[slot][pin]; }
arch/mips/pci/fixup-fuloong2e.c +1 -1
@@ -19,7 +19,7 @@/* South bridge slot number is set by the pci probe process */ static u8 sb_slot =5 ; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {int irq =0 ;
arch/mips/pci/fixup-ip32.c +2 -2
@@ -21,7 +21,7 @@#define INTB MACEPCI_SHARED0_IRQ#define INTC MACEPCI_SHARED1_IRQ#define INTD MACEPCI_SHARED2_IRQ -static char irq_tab_mace[][5 ]__initdata = { +static char irq_tab_mace[][5 ] = {/* Dummy INT#A INT#B INT#C INT#D */ {0 ,0 ,0 ,0 ,0 },/* This is placeholder row - never used */ {0 ,SCSI0 ,SCSI0 ,SCSI0 ,SCSI0 },
@@ -39,7 +39,7 @@ static char irq_tab_mace[][5] __initdata = {* irqs. I suppose a device without a pin A will thank us for doing it * right if there exists such a broken piece of crap. */ -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {return irq_tab_mace[slot][pin]; }
arch/mips/pci/fixup-jmr3927.c +1 -1
@@ -31,7 +31,7 @@#include <asm/txx9/pci.h> #include <asm/txx9/jmr3927.h> -int __init jmr3927_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int jmr3927_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {unsigned char irq = pin;
arch/mips/pci/fixup-lantiq.c +1 -1
@@ -23,7 +23,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)return 0 ; } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {return of_irq_parse_and_map_pci (dev, slot, pin); }
arch/mips/pci/fixup-lemote2f.c +2 -2
@@ -30,7 +30,7 @@#define PCID 7/* all the pci device has the PCIA pin, check the datasheet. */ -static char irq_tab[][5 ]__initdata = { +static char irq_tab[][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* 11: Unused */ {0 ,0 ,0 ,0 ,0 },/* 12: Unused */
@@ -51,7 +51,7 @@ static char irq_tab[][5] __initdata = { {0, 0, 0, 0, 0}, /* 27: Unused */ }; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {int virq;
arch/mips/pci/fixup-loongson3.c +1 -1
@@ -32,7 +32,7 @@ static void print_fixup_info(const struct pci_dev *pdev) pdev->vendor, pdev->device, pdev->irq); } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {print_fixup_info (dev);return dev->irq;
arch/mips/pci/fixup-malta.c +2 -2
@@ -12,7 +12,7 @@static char pci_irq[5 ] = { }; -static char irq_tab[][5 ]__initdata = { +static char irq_tab[][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* 0: GT64120 PCI bridge */ {0 ,0 ,0 ,0 ,0 },/* 1: Unused */
@@ -38,7 +38,7 @@ static char irq_tab[][5] __initdata = { {0, PCID, PCIA, PCIB, PCIC } /* 21: PCI Slot 4 */ }; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {int virq; virq = irq_tab[slot][pin];
arch/mips/pci/fixup-mpc30x.c +3 -3
@@ -22,19 +22,19 @@#include <asm/vr41xx/mpc30x.h> -static const int internal_func_irqs[]__initconst = { +static const int internal_func_irqs[] = {VRC4173_CASCADE_IRQ ,VRC4173_AC97_IRQ ,VRC4173_USB_IRQ , }; -static const int irq_tab_mpc30x[]__initconst = { +static const int irq_tab_mpc30x[] = { [12 ] =VRC4173_PCMCIA1_IRQ , [13 ] =VRC4173_PCMCIA2_IRQ , [29 ] =MQ200_IRQ , }; -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {if (slot ==30 )return internal_func_irqs[PCI_FUNC (dev->devfn)];
arch/mips/pci/fixup-pmcmsp.c +4 -4
@@ -47,7 +47,7 @@#if defined(CONFIG_PMC_MSP7120_GW )/* Garibaldi Board IRQ wiring to PCI slots */ -static char irq_tab[][5 ]__initdata = { +static char irq_tab[][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* (AD[0]): Unused */ {0, 0, 0, 0, 0 }, /* (AD[1]): Unused */
@@ -86,7 +86,7 @@ static char irq_tab[][5] __initdata = {#elif defined(CONFIG_PMC_MSP7120_EVAL )/* MSP7120 Eval Board IRQ wiring to PCI slots */ -static char irq_tab[][5 ]__initdata = { +static char irq_tab[][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* (AD[0]): Unused */ {0, 0, 0, 0, 0 }, /* (AD[1]): Unused */
@@ -125,7 +125,7 @@ static char irq_tab[][5] __initdata = {#else /* Unknown board -- don't assign any IRQs */ -static char irq_tab[][5 ]__initdata = { +static char irq_tab[][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* (AD[0]): Unused */ {0, 0, 0, 0, 0 }, /* (AD[1]): Unused */
@@ -202,7 +202,7 @@ int pcibios_plat_dev_init(struct pci_dev *dev)* RETURNS: IRQ number * ****************************************************************************/ -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {#if !defined(CONFIG_PMC_MSP7120_GW ) && !defined(CONFIG_PMC_MSP7120_EVAL )printk (KERN_WARNING "PCI: unknown board, no PCI IRQs assigned.\n" );
arch/mips/pci/fixup-rbtx4927.c +1 -1
@@ -36,7 +36,7 @@#include <asm/txx9/pci.h> #include <asm/txx9/rbtx4927.h> -int __init rbtx4927_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int rbtx4927_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {unsigned char irq = pin;
arch/mips/pci/fixup-rbtx4938.c +1 -1
@@ -13,7 +13,7 @@#include <asm/txx9/pci.h> #include <asm/txx9/rbtx4938.h> -int __init rbtx4938_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int rbtx4938_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {int irq =tx4938_pcic1_map_irq (dev, slot);
arch/mips/pci/fixup-sni.c +6 -6
@@ -40,7 +40,7 @@* seem to be a documentation error. At least on my RM200C the Cirrus * Logic CL-GD5434 VGA is device 3. */ -static char irq_tab_rm200[8 ][5 ]__initdata = { +static char irq_tab_rm200[8 ][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* EISA bridge */ {SCSI ,SCSI ,SCSI ,SCSI ,SCSI },/* SCSI */
@@ -57,7 +57,7 @@ static char irq_tab_rm200[8][5] __initdata = {* * The VGA card is optional for RM300 systems. */ -static char irq_tab_rm300d[8 ][5 ]__initdata = { +static char irq_tab_rm300d[8 ][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* EISA bridge */ {SCSI ,SCSI ,SCSI ,SCSI ,SCSI },/* SCSI */
@@ -69,7 +69,7 @@ static char irq_tab_rm300d[8][5] __initdata = { { 0, INTD, INTA, INTB, INTC }, /* Slot 4 */ }; -static char irq_tab_rm300e[5 ][5 ]__initdata = { +static char irq_tab_rm300e[5 ][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* HOST bridge */ { SCSI, SCSI, SCSI, SCSI, SCSI }, /* SCSI */
@@ -96,7 +96,7 @@ static char irq_tab_rm300e[5][5] __initdata = {#define INTC PCIT_IRQ_INTC#define INTD PCIT_IRQ_INTD -static char irq_tab_pcit[13 ][5 ]__initdata = { +static char irq_tab_pcit[13 ][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* HOST bridge */ {SCSI0 ,SCSI0 ,SCSI0 ,SCSI0 ,SCSI0 },/* SCSI */
@@ -113,7 +113,7 @@ static char irq_tab_pcit[13][5] __initdata = { { 0, INTA, INTB, INTC, INTD }, /* Slot 5 */ }; -static char irq_tab_pcit_cplus[13 ][5 ]__initdata = { +static char irq_tab_pcit_cplus[13 ][5 ] = {/* INTA INTB INTC INTD */ {0 ,0 ,0 ,0 ,0 },/* HOST bridge */ { 0, INTB, INTC, INTD, INTA }, /* PCI Slot 9 */
@@ -130,7 +130,7 @@ static inline int is_rm300_revd(void)return (csmsr &0xa0 ) ==0x20 ; } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {switch (sni_brd_type) {case SNI_BRD_PCI_TOWER_CPLUS :
arch/mips/pci/fixup-tb0219.c +1 -1
@@ -23,7 +23,7 @@#include <asm/vr41xx/tb0219.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {int irq =-1 ;
arch/mips/pci/fixup-tb0226.c +1 -1
@@ -23,7 +23,7 @@#include <asm/vr41xx/giu.h> #include <asm/vr41xx/tb0226.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {int irq =-1 ;
arch/mips/pci/fixup-tb0287.c +1 -1
@@ -22,7 +22,7 @@#include <asm/vr41xx/tb0287.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {unsigned char bus;int irq =-1 ;
arch/mips/pci/pci-alchemy.c +1 -1
@@ -522,7 +522,7 @@ static int __init alchemy_pci_init(void)arch_initcall (alchemy_pci_init); -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {struct alchemy_pci_context *ctx = dev->sysdata;if (ctx && ctx->board_map_irq)
arch/mips/pci/pci-bcm47xx.c +1 -1
@@ -28,7 +28,7 @@#include <linux/bcma/bcma.h> #include <bcm47xx.h> -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {return 0 ; }
arch/mips/pci/pci-lasat.c +1 -1
@@ -61,7 +61,7 @@ arch_initcall(lasat_pci_setup);#define LASAT_IRQ_PCIC (LASAT_IRQ_BASE + 7)#define LASAT_IRQ_PCID (LASAT_IRQ_BASE + 8) -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {switch (slot) {case 1 :
arch/mips/pci/pci-mt7620.c +1 -1
@@ -361,7 +361,7 @@ static int mt7620_pci_probe(struct platform_device *pdev)return 0 ; } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {u16 cmd;u32 val;
arch/mips/pci/pci-octeon.c +2 -3
@@ -59,8 +59,7 @@ union octeon_pci_address { } s; }; -int __initconst (*octeon_pcibios_map_irq)(const struct pci_dev *dev, -u8 slot,u8 pin); +int (*octeon_pcibios_map_irq)(const struct pci_dev *dev,u8 slot,u8 pin);enum octeon_dma_bar_type octeon_dma_bar_type =OCTEON_DMA_BAR_TYPE_INVALID ;/**
@@ -74,7 +73,7 @@ enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID;* as it goes through each bridge. * Returns Interrupt number for the device */ -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {if (octeon_pcibios_map_irq)return octeon_pcibios_map_irq (dev, slot, pin);
arch/mips/pci/pci-rt2880.c +1 -1
@@ -181,7 +181,7 @@ static inline void rt2880_pci_write_u32(unsigned long reg, u32 val)spin_unlock_irqrestore (&rt2880_pci_lock, flags); } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {u16 cmd;int irq =-1 ;
arch/mips/pci/pci-rt3883.c +1 -1
@@ -564,7 +564,7 @@ static int rt3883_pci_probe(struct platform_device *pdev)return err; } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {return of_irq_parse_and_map_pci (dev, slot, pin); }
arch/mips/pci/pci-tx4939.c +2 -2
@@ -48,7 +48,7 @@ void __init tx4939_report_pci1clk(void) ((pciclk + 50000) / 100000) % 10); } -int __init tx4939_pcic1_map_irq (const struct pci_dev *dev,u8 slot) +int tx4939_pcic1_map_irq (const struct pci_dev *dev,u8 slot) {if (get_tx4927_pcicptr (dev->bus->sysdata) == tx4939_pcic1ptr) {switch (slot) {
@@ -68,7 +68,7 @@ int __init tx4939_pcic1_map_irq(const struct pci_dev *dev, u8 slot)return -1 ; } -int __init tx4939_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int tx4939_pci_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {int irq =tx4939_pcic1_map_irq (dev, slot);
arch/mips/pci/pci-xlp.c +1 -1
@@ -205,7 +205,7 @@ int xlp_socdev_to_node(const struct pci_dev *lnkdev)return PCI_SLOT (lnkdev->devfn) /8 ; } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {struct pci_dev *lnkdev;int lnkfunc, node;
arch/mips/pci/pci-xlr.c +1 -1
@@ -315,7 +315,7 @@ static void xls_pcie_ack_b(struct irq_data *d) } } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) {return get_irq_vector (dev); }
arch/mips/txx9/generic/setup.c +1 -1
@@ -88,7 +88,7 @@ int txx9_ccfg_toeon __initdata = 1;#include <asm/txx9/boards.h> #undef BOARD_VEC -struct txx9_board_vec *txx9_board_vec__initdata ; +struct txx9_board_vec *txx9_board_vec;static char txx9_system_type[32 ];static struct txx9_board_vec *board_vecs[]__initdata = {
arch/mips/txx9/jmr3927/setup.c +1 -1
@@ -209,7 +209,7 @@ static void __init jmr3927_arch_init(void)gpio_request (10 ,"dipsw2" ); } -struct txx9_board_vec jmr3927_vec__initdata = { +struct txx9_board_vec jmr3927_vec = { .system ="Toshiba JMR_TX3927" , .prom_init = jmr3927_prom_init, .mem_setup = jmr3927_mem_setup,
arch/mips/txx9/rbtx4927/setup.c +2 -2
@@ -354,7 +354,7 @@ static void __init rbtx4927_device_init(void)rbtx4927_gpioled_init (); } -struct txx9_board_vec rbtx4927_vec__initdata = { +struct txx9_board_vec rbtx4927_vec = { .system ="Toshiba RBTX4927" , .prom_init = rbtx4927_prom_init, .mem_setup = rbtx4927_mem_setup,
@@ -366,7 +366,7 @@ struct txx9_board_vec rbtx4927_vec __initdata = { .pci_map_irq = rbtx4927_pci_map_irq,#endif }; -struct txx9_board_vec rbtx4937_vec__initdata = { +struct txx9_board_vec rbtx4937_vec = { .system ="Toshiba RBTX4937" , .prom_init = rbtx4927_prom_init, .mem_setup = rbtx4927_mem_setup,
arch/mips/txx9/rbtx4938/setup.c +1 -1
@@ -358,7 +358,7 @@ static void __init rbtx4938_device_init(void)txx9_iocled_init (RBTX4938_LED_ADDR -IO_BASE ,-1 ,8 ,1 ,"green" ,NULL ); } -struct txx9_board_vec rbtx4938_vec__initdata = { +struct txx9_board_vec rbtx4938_vec = { .system ="Toshiba RBTX4938" , .prom_init = rbtx4938_prom_init, .mem_setup = rbtx4938_mem_setup,
arch/mips/txx9/rbtx4939/setup.c +1 -1
@@ -540,7 +540,7 @@ static void __init rbtx4939_setup(void)tx4939_sio_init (TX4939_SCLK0 (txx9_master_clock),0 ); } -struct txx9_board_vec rbtx4939_vec__initdata = { +struct txx9_board_vec rbtx4939_vec = { .system ="Toshiba RBTX4939" , .prom_init = rbtx4939_prom_init, .mem_setup = rbtx4939_setup,
Signature · 1 line
2.10.0
Quoted 21 lines · Lorenzo Pieralisi
On Mon, Sep 18, 2017 at 05:56:02PM +0200, Arnd Bergmann wrote:
[...]
Quoted 17 lines
Quoted 3 lines
Section mismatches summary:
27 WARNING: modpost: Found 1 section mismatch(es). 6 WARNING: modpost: Found 2 section mismatch(es).These are all MIPS warnings caused by Lorenzo's
04c81c7293df("MIPS: PCI: Replacepci_fixup_irqs()call with host bridge IRQ mapping hooks")The problem is that now we can reference
pci_fixup_irqsfrom a function that is not marked__init, and probably should not be, sincepcibios_scanbus()itself can be called at any time. Even before Lorenzo's change, havingpcibios_map_irqas an__initfunction was problematic AFAICT on any platform that has hotplug-capable PCIe slots, or that can have a PCI host bridge driver in a loadable module.
Quoted 6 lines
Quoted 3 lines
The safe fix would be to remove all the
__initannotations as well as the__initdataand__initconstannotations on data referenced by themap_irqfunctions.Right. Patch below, I will send it out tomorrow (I certainly missed some annotations) please let me know if that's reasonable.
I tried the same thing, but ran into a problem at this point:
arch/mips/txx9/rbtx4927/setup.c static void __init rbtx4927_device_init(void) · line 360
Quoted 13 lines
arch/mips/txx9/rbtx4927/setup.c +1
-1@@ -354,7 +354,7 @@ static void __init rbtx4927_device_init(void)rbtx4927_gpioled_init (); } -struct txx9_board_vec rbtx4927_vec__initdata = { +struct txx9_board_vec rbtx4927_vec = { .system ="Toshiba RBTX4927" , .prom_init = rbtx4927_prom_init, .mem_setup = rbtx4927_mem_setup,
Now we have the next problem with the pointers inside of rbtx4927_vec that kbuild complains about pointing to __init functions. I think the txx9_board_vec structures all have to remain __initdata or __initconst, with some other way to get the pointer at runtime.
something like this maybe:
arch/mips/txx9/generic/pci.c +6 -2
@@ -386,9 +386,11 @@ int pcibios_plat_dev_init(struct pci_dev *dev)return 0 ; } -int __init pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) +static int (*txx9_pci_map_irq)(const struct pci_dev *dev,u8 slot,u8 pin); + +int pcibios_map_irq (const struct pci_dev *dev,u8 slot,u8 pin) { -return txx9_board_vec->pci_map_irq (dev, slot, pin); +return txx9_pci_map_irq (dev, slot, pin); }char * (*txx9_board_pcibios_setup)(char *str)__initdata ;
@@ -424,5 +426,7 @@ char *__init txx9_pcibios_setup(char *str) txx9_pci_err_action =TXX9_PCI_ERR_IGNORE ;return NULL ; } + txx9_pci_map_irq = txx9_board_vec->pci_map_irq; +return str; }
Arnd