powerpc/fsl_uli1575: Cleanups
Subsystems (2)
cover powerpc/fsl_uli1575: Cleanups
This patch series contains cleanups for fsl_uli1575 driver.
This patch series is prerequisity for another patch series:
"powerpc/85xx: p2020: Create one unified machine description"
Christophe Leroy (1):
powerpc/fsl_uli1575: Misc cleanup
Pali Rohár (7):
powerpc/85xx: mpc85xx_ds: Simplify mpc85xx_exclude_device() function powerpc/fsl_uli1575: Simplify uli_exclude_device() usage powerpc/85xx: mpc85xx_ds: Move uli_init() code into its own driver
file
powerpc/mpc85xx: mpc85xx_rdb: Do not automatically select FSL_ULI1575 powerpc/fsl_uli1575: Allow to disable FSL_ULI1575 support powerpc/mpc86xx: mpc86xx_hpcn: Call uli_init() instead of explicit
ppc_md assignment
powerpc/fsl_uli1575: Mark uli_exclude_device() as static
arch/powerpc/include/asm/ppc-pci.h | 8 +++++ arch/powerpc/platforms/85xx/Kconfig | 1 - arch/powerpc/platforms/85xx/mpc85xx_ds.c | 39 ++-------------------- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 20 ++--------- arch/powerpc/platforms/Kconfig | 2 +- arch/powerpc/platforms/fsl_uli1575.c | 29 +++++++++++++--- 6 files changed, 38 insertions(+), 61 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/8 powerpc/fsl_uli1575: Misc cleanup
From: Christophe Leroy <[email protected]>
Use a single line for uli_exclude_device().
Add uli_exclude_device() prototype in ppc-pci.h and guard it.
Remove that prototype from mpc85xx_ds.c and mpc86xx_hpcn.c files.
Make uli_pirq_to_irq[] static as it is used only in that file.
--- arch/powerpc/include/asm/ppc-pci.h | 8 ++++++++ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 4 +--- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 4 +--- arch/powerpc/platforms/fsl_uli1575.c | 6 +++--- 4 files changed, 13 insertions(+), 9 deletions(-)
arch/powerpc/include/asm/ppc-pci.h +8 -0
@@ -57,11 +57,19 @@ void eeh_sysfs_remove_device(struct pci_dev *pdev);#endif /* CONFIG_EEH */ +#ifdef CONFIG_FSL_ULI1575 +int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn); +#endif /* CONFIG_FSL_ULI1575 */ +#define PCI_BUSNO (bdfn) ((bdfn >> 8) & 0xff)#else /* CONFIG_PCI */ static inline void init_pci_config_tokens (void ) { }#endif /* !CONFIG_PCI */ +#if !defined(CONFIG_PCI ) || !defined(CONFIG_FSL_ULI1575 ) +static inline int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn) {return PCIBIOS_SUCCESSFUL ; } +#endif /* !defined(CONFIG_PCI) || !defined(CONFIG_FSL_ULI1575) */ +#endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_PPC_PCI_H */
arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 -3
@@ -26,6 +26,7 @@#include <asm/mpic.h> #include <asm/i8259.h> #include <asm/swiotlb.h> +#include <asm/ppc-pci.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h>
@@ -107,9 +108,6 @@ void __init mpc85xx_ds_pic_init(void) }#ifdef CONFIG_PCI -extern int uli_exclude_device (struct pci_controller *hose, -u_char bus,u_char devfn); -static struct device_node *pci_with_uli; static int mpc85xx_exclude_device(struct pci_controller *hose,
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +1 -3
@@ -22,6 +22,7 @@#include <mm/mmu_decl.h> #include <asm/udbg.h> #include <asm/swiotlb.h> +#include <asm/ppc-pci.h> #include <asm/mpic.h>
@@ -39,9 +40,6 @@#endif #ifdef CONFIG_PCI -extern int uli_exclude_device (struct pci_controller *hose, -u_char bus,u_char devfn); -static int mpc86xx_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn) {
arch/powerpc/platforms/fsl_uli1575.c +3 -3
@@ -13,6 +13,7 @@#include <linux/of_irq.h> #include <asm/pci-bridge.h> +#include <asm/ppc-pci.h> #define ULI_PIRQA 0x08#define ULI_PIRQB 0x09
@@ -36,7 +37,7 @@#define ULI_8259_IRQ14 0x0d#define ULI_8259_IRQ15 0x0f -u8 uli_pirq_to_irq[8 ] = { +static u8 uli_pirq_to_irq[8 ] = {ULI_8259_IRQ9 ,/* PIRQA */ ULI_8259_IRQ10 ,/* PIRQB */ ULI_8259_IRQ11 ,/* PIRQC */
@@ -341,8 +342,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5288, hpcd_quirk_uli5288);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AL ,0x5229 , hpcd_quirk_uli5229);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AL ,0x5288 , hpcd_final_uli5288); -int uli_exclude_device (struct pci_controller *hose, -u_char bus,u_char devfn) +int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn) {if (bus == (hose->first_busno +2 )) {/* exclude Modem controller */
Signature · 1 line
2.20.1
kernel test robot
build botRe: [PATCH 1/8] powerpc/fsl_uli1575: Misc cleanup
kernel test robot noticed the following build errors:
Hi Pali,
kernel test robot noticed the following build errors:
[auto build test ERROR on powerpc/next]
[also build test ERROR on powerpc/fixes linus/master v6.3-rc5 next-20230406] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Pali-Roh-r/powerpc-fsl_uli1575-Misc-cleanup/20230408-212610 base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next patch link: https://lore.kernel.org/r/20230408132151.8902-2-pali%40kernel.org patch subject: [PATCH 1/8] powerpc/fsl_uli1575: Misc cleanup config: powerpc-allnoconfig (https://download.01.org/0day-ci/archive/20230408/[email protected]/config) compiler: powerpc-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/4d3f86e2ae53d180d2cbbe556355ff5b03d4251b
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Pali-Roh-r/powerpc-fsl_uli1575-Misc-cleanup/20230408-212610
git checkout 4d3f86e2ae53d180d2cbbe556355ff5b03d4251b
# save the config file
mkdir build_dir && cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=powerpc olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=powerpc SHELL=/bin/bash arch/powerpc/kernel/
If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
In file included from arch/powerpc/kernel/sys_ppc32.c:56:
arch/powerpc/include/asm/ppc-pci.h:71:45: error: 'struct pci_controller' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
71 | static inline int uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) { return PCIBIOS_SUCCESSFUL; }
| ^~~~~~~~~~~~~~
arch/powerpc/include/asm/ppc-pci.h: In function 'uli_exclude_device':
>> arch/powerpc/include/asm/ppc-pci.h:71:102: error: 'PCIBIOS_SUCCESSFUL' undeclared (first use in this function)
71 | static inline int uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) { return PCIBIOS_SUCCESSFUL; }
| ^~~~~~~~~~~~~~~~~~ arch/powerpc/include/asm/ppc-pci.h:71:102: note: each undeclared identifier is reported only once for each function it appears in
cc1: all warnings being treated as errors
vim +/PCIBIOS_SUCCESSFUL +71 arch/powerpc/include/asm/ppc-pci.h
69
70 #if !defined(CONFIG_PCI) || !defined(CONFIG_FSL_ULI1575)
> 71 static inline int uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) { return PCIBIOS_SUCCESSFUL; }
72 #endif /* !defined(CONFIG_PCI) || !defined(CONFIG_FSL_ULI1575) */
73 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
Re: [PATCH 1/8] powerpc/fsl_uli1575: Misc cleanup
Quoted 46 lines · On Saturday 08 April 2023 23:24:07 kernel test robot wrote:
Hi Pali,
kernel test robot noticed the following build errors:
[auto build test ERROR on powerpc/next]
[also build test ERROR on powerpc/fixes linus/master v6.3-rc5 next-20230406] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]url: https://github.com/intel-lab-lkp/linux/commits/Pali-Roh-r/powerpc-fsl_uli1575-Misc-cleanup/20230408-212610 base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next patch link: https://lore.kernel.org/r/20230408132151.8902-2-pali%40kernel.org patch subject: [PATCH 1/8] powerpc/fsl_uli1575: Misc cleanup config: powerpc-allnoconfig (https://download.01.org/0day-ci/archive/20230408/[email protected]/config) compiler: powerpc-linux-gcc (GCC) 12.1.0reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/intel-lab-lkp/linux/commit/4d3f86e2ae53d180d2cbbe556355ff5b03d4251b
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Pali-Roh-r/powerpc-fsl_uli1575-Misc-cleanup/20230408-212610
git checkout4d3f86e2ae53d180d2cbbe556355ff5b03d4251b
# save the config file
mkdirbuild_dir&& cp config build_dir/.config
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=powerpc olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=powerpc SHELL=/bin/basharch/powerpc/kernel/If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/All errors (new ones prefixed by >>):
In file included from
arch/powerpc/kernel/sys_ppc32.c:56:
arch/powerpc/include/asm/ppc-pci.h:71:45: error: 'structpci_controller' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]71 | static inline int uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) { return PCIBIOS_SUCCESSFUL; } | ^~~~~~~~~~~~~~
arch/powerpc/include/asm/ppc-pci.h: In function 'uli_exclude_device':Quoted 1 line
Quoted 1 line
arch/powerpc/include/asm/ppc-pci.h:71:102: error: 'PCIBIOS_SUCCESSFUL' undeclared (first use in this function)71 | static inline int uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) { return PCIBIOS_SUCCESSFUL; } | ^~~~~~~~~~~~~~~~~~
arch/powerpc/include/asm/ppc-pci.h:71:102: note: each undeclared identifier is reported only once for each function it appears in
cc1: all warnings being treated as errors
Quoted 11 lines
vim +/PCIBIOS_SUCCESSFUL +71
arch/powerpc/include/asm/ppc-pci.h69 70 #if !defined(CONFIG_PCI) || !defined(CONFIG_FSL_ULI1575)Quoted 1 line
71 static inline int
uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn){ returnPCIBIOS_SUCCESSFUL; }72 #endif /* !defined(CONFIG_PCI) || !defined(CONFIG_FSL_ULI1575) */ 73Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests
Fixed in V2:
https://lore.kernel.org/linuxppc-dev/[email protected]/T/#t
PATCH 2/8 powerpc/85xx: mpc85xx_ds: Simplify mpc85xx_exclude_device() function
In reply to Pali RohárFunction mpc85xx_exclude_device() is installed and used only when pci_with_uli is fsl_pci_primary. So replace check for pci_with_uli by fsl_pci_primary in mpc85xx_exclude_device() and move pci_with_uli variable declaration into function mpc85xx_ds_uli_init() where it is used.
--- arch/powerpc/platforms/85xx/mpc85xx_ds.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/powerpc/platforms/85xx/mpc85xx_ds.c +2 -3
@@ -108,12 +108,10 @@ void __init mpc85xx_ds_pic_init(void) }#ifdef CONFIG_PCI -static struct device_node *pci_with_uli; -static int mpc85xx_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn) { -if (hose->dn == pci_with_uli) +if (hose->dn == fsl_pci_primary)return uli_exclude_device (hose, bus, devfn);return PCIBIOS_SUCCESSFUL ;
@@ -124,6 +122,7 @@ static void __init mpc85xx_ds_uli_init(void) {#ifdef CONFIG_PCI struct device_node *node; +struct device_node *pci_with_uli;/* See if we have a ULI under the primary */
Signature · 1 line
2.20.1
PATCH 3/8 powerpc/fsl_uli1575: Simplify uli_exclude_device() usage
In reply to Pali RohárFunction uli_exclude_device() is called only from mpc86xx_exclude_device() and mpc85xx_exclude_device() functions. Both those functions are same, so merge its logic directly into the uli_exclude_device() function.
--- arch/powerpc/platforms/85xx/mpc85xx_ds.c | 13 +------------ arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 13 +------------ arch/powerpc/platforms/fsl_uli1575.c | 4 +++- 3 files changed, 5 insertions(+), 25 deletions(-)
arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 -12
@@ -107,17 +107,6 @@ void __init mpc85xx_ds_pic_init(void)#endif /* CONFIG_PPC_I8259 */ } -#ifdef CONFIG_PCI -static int mpc85xx_exclude_device (struct pci_controller *hose, -u_char bus,u_char devfn) -{ -if (hose->dn == fsl_pci_primary) -return uli_exclude_device (hose, bus, devfn); - -return PCIBIOS_SUCCESSFUL ; -} -#endif /* CONFIG_PCI */ -static void __init mpc85xx_ds_uli_init (void ) {#ifdef CONFIG_PCI
@@ -132,7 +121,7 @@ static void __init mpc85xx_ds_uli_init(void) node = pci_with_uli;if (pci_with_uli == fsl_pci_primary) { - ppc_md.pci_exclude_device = mpc85xx_exclude_device; + ppc_md.pci_exclude_device = uli_exclude_device;break ; } }
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +1 -12
@@ -39,17 +39,6 @@ #define DBG(fmt...) do { } while(0)#endif -#ifdef CONFIG_PCI -static int mpc86xx_exclude_device (struct pci_controller *hose, -u_char bus,u_char devfn) -{ -if (hose->dn == fsl_pci_primary) -return uli_exclude_device (hose, bus, devfn); - -return PCIBIOS_SUCCESSFUL ; -} -#endif /* CONFIG_PCI */ -static void __init mpc86xx_hpcn_setup_arch (void )
@@ -58,7 +47,7 @@ mpc86xx_hpcn_setup_arch(void) ppc_md.progress ("mpc86xx_hpcn_setup_arch()" ,0 );#ifdef CONFIG_PCI - ppc_md.pci_exclude_device = mpc86xx_exclude_device; + ppc_md.pci_exclude_device = uli_exclude_device;#endif printk ("MPC86xx HPCN board from Freescale Semiconductor\n" );
arch/powerpc/platforms/fsl_uli1575.c +3 -1
@@ -15,6 +15,8 @@#include <asm/pci-bridge.h> #include <asm/ppc-pci.h> +#include <sysdev/fsl_pci.h> +#define ULI_PIRQA 0x08#define ULI_PIRQB 0x09#define ULI_PIRQC 0x0a
@@ -344,7 +346,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AL, 0x5288, hpcd_final_uli5288);int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn) { -if (bus == (hose->first_busno +2 )) { +if (hose->dn == fsl_pci_primary && bus == (hose->first_busno +2 )) {/* exclude Modem controller */ if ((PCI_SLOT (devfn) ==29 ) && (PCI_FUNC (devfn) ==1 ))return PCIBIOS_DEVICE_NOT_FOUND ;
Signature · 1 line
2.20.1
PATCH 4/8 powerpc/85xx: mpc85xx_ds: Move uli_init() code into its own driver file
In reply to Pali RohárMove uli_init() function into existing driver fsl_uli1575.c file in order to share its code between more platforms and board files.
--- arch/powerpc/include/asm/ppc-pci.h | 2 ++ arch/powerpc/platforms/85xx/mpc85xx_ds.c | 23 +---------------------- arch/powerpc/platforms/fsl_uli1575.c | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+), 22 deletions(-)
arch/powerpc/include/asm/ppc-pci.h +2 -0
@@ -59,6 +59,7 @@ void eeh_sysfs_remove_device(struct pci_dev *pdev);#ifdef CONFIG_FSL_ULI1575 int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn); +void __init uli_init (void );#endif /* CONFIG_FSL_ULI1575 */ #define PCI_BUSNO (bdfn) ((bdfn >> 8) & 0xff)
@@ -69,6 +70,7 @@ static inline void init_pci_config_tokens(void) { }#if !defined(CONFIG_PCI ) || !defined(CONFIG_FSL_ULI1575 )static inline int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn) {return PCIBIOS_SUCCESSFUL ; } +static inline void __init uli_init (void ) {}#endif /* !defined(CONFIG_PCI) || !defined(CONFIG_FSL_ULI1575) */ #endif /* __KERNEL__ */
arch/powerpc/platforms/85xx/mpc85xx_ds.c +1 -22
@@ -107,27 +107,6 @@ void __init mpc85xx_ds_pic_init(void)#endif /* CONFIG_PPC_I8259 */ } -static void __init mpc85xx_ds_uli_init (void ) -{ -#ifdef CONFIG_PCI -struct device_node *node; -struct device_node *pci_with_uli; - -/* See if we have a ULI under the primary */ - - node =of_find_node_by_name (NULL ,"uli1575" ); -while ((pci_with_uli =of_get_parent (node))) { -of_node_put (node); - node = pci_with_uli; - -if (pci_with_uli == fsl_pci_primary) { - ppc_md.pci_exclude_device = uli_exclude_device; -break ; - } - } -#endif -} -/* * Setup the architecture */
@@ -138,7 +117,7 @@ static void __init mpc85xx_ds_setup_arch(void)swiotlb_detect_4g ();fsl_pci_assign_primary (); -mpc85xx_ds_uli_init (); +uli_init ();mpc85xx_smp_init ();printk ("MPC85xx DS board from Freescale Semiconductor\n" );
arch/powerpc/platforms/fsl_uli1575.c +19 -0
@@ -358,3 +358,22 @@ int uli_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn)return PCIBIOS_SUCCESSFUL ; } + +void __init uli_init (void ) +{ +struct device_node *node; +struct device_node *pci_with_uli; + +/* See if we have a ULI under the primary */ + + node =of_find_node_by_name (NULL ,"uli1575" ); +while ((pci_with_uli =of_get_parent (node))) { +of_node_put (node); + node = pci_with_uli; + +if (pci_with_uli == fsl_pci_primary) { + ppc_md.pci_exclude_device = uli_exclude_device; +break ; + } + } +}
Signature · 1 line
2.20.1
PATCH 5/8 powerpc/mpc85xx: mpc85xx_rdb: Do not automatically select FSL_ULI1575
In reply to Pali RohárBoards provided by CONFIG_MPC85xx_RDB option do not initialize fsl_uli1575.c driver. So remove explicit select dependency on it.
--- arch/powerpc/platforms/85xx/Kconfig | 1 - 1 file changed, 1 deletion(-)
arch/powerpc/platforms/85xx/Kconfig +0 -1
@@ -90,7 +90,6 @@ config MPC85xx_RDB bool "Freescale P102x MBG/UTM/RDB and P2020 RDB" select PPC_I8259 select DEFAULT_UIMAGE - select FSL_ULI1575 if PCI select SWIOTLB help This option enables support for the P1020 MBG PC, P1020 UTM PC,
Signature · 1 line
2.20.1
PATCH 6/8 powerpc/fsl_uli1575: Allow to disable FSL_ULI1575 support
In reply to Pali RohárULI1575 PCIe south bridge exists only on some Freescale boards. Allow to disable CONFIG_FSL_ULI1575 symbol when it is not explicitly selected and only implied.
--- arch/powerpc/platforms/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/platforms/Kconfig +1 -1
@@ -261,7 +261,7 @@ config CPM2 on it (826x, 827x, 8560). config FSL_ULI1575 - bool + bool "ULI1575 PCIe south bridge support" select GENERIC_ISA_DMA help Supports for the ULI1575 PCIe south bridge that exists on some
Signature · 1 line
2.20.1
PATCH 7/8 powerpc/mpc86xx: mpc86xx_hpcn: Call uli_init() instead of explicit ppc_md assignment
In reply to Pali RohárAfter calling fsl_pci_assign_primary(), it is possible to use uli_init() to conditionally initialize ppc_md.pci_exclude_device callback based on the uli1575 detection.
--- arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c +1 -4
@@ -46,10 +46,6 @@ mpc86xx_hpcn_setup_arch(void)if (ppc_md.progress) ppc_md.progress ("mpc86xx_hpcn_setup_arch()" ,0 ); -#ifdef CONFIG_PCI - ppc_md.pci_exclude_device = uli_exclude_device; -#endif -printk ("MPC86xx HPCN board from Freescale Semiconductor\n" );#ifdef CONFIG_SMP
@@ -57,6 +53,7 @@ mpc86xx_hpcn_setup_arch(void)#endif fsl_pci_assign_primary (); +uli_init ();swiotlb_detect_4g (); }
Signature · 1 line
2.20.1
PATCH 8/8 powerpc/fsl_uli1575: Mark uli_exclude_device() as static
In reply to Pali RohárFunction uli_exclude_device() is not used outside of the fsl_uli1575.c source file anymore. So mark it as static and remove public prototype.
--- arch/powerpc/include/asm/ppc-pci.h | 2 -- arch/powerpc/platforms/fsl_uli1575.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-)
arch/powerpc/include/asm/ppc-pci.h +0 -2
@@ -58,7 +58,6 @@ void eeh_sysfs_remove_device(struct pci_dev *pdev);#endif /* CONFIG_EEH */ #ifdef CONFIG_FSL_ULI1575 -int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn);void __init uli_init (void );#endif /* CONFIG_FSL_ULI1575 */
@@ -69,7 +68,6 @@ static inline void init_pci_config_tokens(void) { }#endif /* !CONFIG_PCI */ #if !defined(CONFIG_PCI ) || !defined(CONFIG_FSL_ULI1575 ) -static inline int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn) {return PCIBIOS_SUCCESSFUL ; }static inline void __init uli_init (void ) {}#endif /* !defined(CONFIG_PCI) || !defined(CONFIG_FSL_ULI1575) */
arch/powerpc/platforms/fsl_uli1575.c +1 -1
@@ -344,7 +344,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AL, 0x5288, hpcd_quirk_uli5288);DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_AL ,0x5229 , hpcd_quirk_uli5229);DECLARE_PCI_FIXUP_FINAL (PCI_VENDOR_ID_AL ,0x5288 , hpcd_final_uli5288); -int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn) +static int uli_exclude_device (struct pci_controller *hose,u_char bus,u_char devfn) {if (hose->dn == fsl_pci_primary && bus == (hose->first_busno +2 )) {/* exclude Modem controller */
Signature · 1 line
2.20.1