powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers
Subsystems (3)
PATCH 1/11 powerpc/mpc8xxx_gpio: Add support for 'qoriq-gpio' controllers
Add 'fsl,qoriq-gpio' compatiable to the list we search for to bind against for mpc8xxx_gpio. This compatiable will be used on P1-P5xxx QorIQ devices like P4080.
--- arch/powerpc/sysdev/mpc8xxx_gpio.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/powerpc/sysdev/mpc8xxx_gpio.c +3 -0
@@ -330,6 +330,9 @@ static int __init mpc8xxx_add_gpiochips(void)for_each_compatible_node (np,NULL ,"fsl,mpc8610-gpio" )mpc8xxx_add_controller (np); +for_each_compatible_node (np,NULL ,"fsl,qoriq-gpio" ) +mpc8xxx_add_controller (np); +return 0 ; }arch_initcall (mpc8xxx_add_gpiochips);
Signature · 1 line
1.7.2.3
PATCH 2/11 oprofile/fsl emb: Don't set MSR[PMM] until after clearing the interrupt.
From: Scott Wood <[email protected]>
On an arch 2.06 hypervisor, a pending perfmon interrupt will be delivered to the hypervisor at any point the guest is running, regardless of MSR[EE]. In order to reflect this interrupt, the hypervisor has to mask the interrupt in PMGC0 -- and set MSRP[PMMP] to intercept futher guest accesses to the PMRs to detect when to unmask (and prevent the guest from unmasking early, or seeing inconsistent state).
This has the side effect of ignoring any changes the guest makes to MSR[PMM], so wait until after the interrupt is clear, and thus the hypervisor should have cleared MSRP[PMMP], before setting MSR[PMM]. The counters wil not actually run until PMGC0[FAC] is cleared in pmc_start_ctrs(), so this will not reduce the effectiveness of PMM.
--- arch/powerpc/oprofile/op_model_fsl_emb.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-)
arch/powerpc/oprofile/op_model_fsl_emb.c +8 -7
@@ -2,7 +2,7 @@* Freescale Embedded oprofile support, based on ppc64 oprofile support * Copyright (C) 2004 Anton Blanchard <[email protected]>, IBM * -* Copyright (c) 2004 Freescale Semiconductor, Inc +* Copyright (c) 2004, 2010 Freescale Semiconductor, Inc * * Author: Andy Fleming * Maintainer: Kumar Gala <[email protected]>
@@ -321,9 +321,6 @@ static void fsl_emb_handle_interrupt(struct pt_regs *regs,int val;int i; -/* set the PMM bit (see comment below) */ -mtmsr (mfmsr () |MSR_PMM ); - pc = regs->nip; is_kernel =is_kernel_addr (pc);
@@ -340,9 +337,13 @@ static void fsl_emb_handle_interrupt(struct pt_regs *regs, }/* The freeze bit was set by the interrupt. */ -/* Clear the freeze bit, and reenable the interrupt. -* The counters won't actually start until the rfi clears -* the PMM bit */ +/* Clear the freeze bit, and reenable the interrupt. The +* counters won't actually start until the rfi clears the PMM +* bit. The PMM bit should not be set until after the interrupt +* is cleared to avoid it getting lost in some hypervisor +* environments. +*/ +mtmsr (mfmsr () |MSR_PMM );pmc_start_ctrs (1 ); }
Signature · 1 line
1.7.2.3
PATCH 3/11 powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
--- arch/powerpc/sysdev/fsl_pci.c | 8 ++++++++ include/linux/pci_ids.h | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)
arch/powerpc/sysdev/fsl_pci.c +8 -0
@@ -417,10 +417,18 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2010E, quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P2010 , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P2020E , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P2020 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P2040E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P2040 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P3041E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P3041 , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P4040E , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P4040 , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P4080E , quirk_fsl_pcie_header);DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P4080 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P5010E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P5010 , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P5020E , quirk_fsl_pcie_header); +DECLARE_PCI_FIXUP_HEADER (0x1957 ,PCI_DEVICE_ID_P5020 , quirk_fsl_pcie_header);#endif /* CONFIG_FSL_SOC_BOOKE || CONFIG_PPC_86xx */ #if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x)
include/linux/pci_ids.h +8 -0
@@ -2312,6 +2312,14 @@#define PCI_DEVICE_ID_P4080 0x0401#define PCI_DEVICE_ID_P4040E 0x0408#define PCI_DEVICE_ID_P4040 0x0409 +#define PCI_DEVICE_ID_P2040E 0x0410 +#define PCI_DEVICE_ID_P2040 0x0411 +#define PCI_DEVICE_ID_P3041E 0x041E +#define PCI_DEVICE_ID_P3041 0x041F +#define PCI_DEVICE_ID_P5020E 0x0420 +#define PCI_DEVICE_ID_P5020 0x0421 +#define PCI_DEVICE_ID_P5010E 0x0428 +#define PCI_DEVICE_ID_P5010 0x0429#define PCI_DEVICE_ID_MPC8641 0x7010#define PCI_DEVICE_ID_MPC8641D 0x7011#define PCI_DEVICE_ID_MPC8610 0x7018
Signature · 1 line
1.7.2.3
PATCH 4/11 powerpc/fsl-booke: Add p3041 DS board support
The P3041DS is in the same family of boards as the P4080DS and thus shares the corenet_ds code.
--- arch/powerpc/platforms/85xx/Kconfig | 12 ++++++ arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/p3041_ds.c | 64 ++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 0 deletions(-) create mode 100644 arch/powerpc/platforms/85xx/p3041_ds.c
arch/powerpc/platforms/85xx/Kconfig +12 -0
@@ -153,6 +153,18 @@ config SBC8560 help This option enables support for the Wind River SBC8560 board +config P3041_DS + bool "Freescale P3041 DS" + select DEFAULT_UIMAGE + select PPC_FSL_BOOK3E + select PPC_E500MC + select PHYS_64BIT + select SWIOTLB + select MPC8xxx_GPIO + select HAS_RAPIDIO + help + This option enables support for the P3041 DS board + config P4080_DS bool "Freescale P4080 DS" select DEFAULT_UIMAGE
arch/powerpc/platforms/85xx/Makefile +1 -0
@@ -11,6 +11,7 @@ obj-$(CONFIG_MPC85xx_DS) += mpc85xx_ds.o obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o obj-$(CONFIG_P1022_DS) += p1022_ds.o +obj-$(CONFIG_P3041_DS) += p3041_ds.o corenet_ds.o obj-$(CONFIG_P4080_DS) += p4080_ds.o corenet_ds.o obj-$(CONFIG_STX_GP3) += stx_gp3.o obj-$(CONFIG_TQM85xx) += tqm85xx.o
arch/powerpc/platforms/85xx/p3041_ds.c new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 5/11 powerpc: Fix compile error with paca code on ppc64e
arch/powerpc/kernel/paca.c: In function 'allocate_lppacas':arch/powerpc/kernel/paca.c:111:1: error: parameter name omitted arch/powerpc/kernel/paca.c:111:1: error: parameter name omitted
--- arch/powerpc/kernel/paca.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/powerpc/kernel/paca.c +1 -1
@@ -108,7 +108,7 @@ static void free_lppacas(void)#else -static inline void allocate_lppacas (int ,unsigned long ) { } +static inline void allocate_lppacas (int nr_cpus,unsigned long limit) { }static inline void free_lppacas (void ) { }#endif /* CONFIG_PPC_BOOK3S */
Signature · 1 line
1.7.2.3
PATCH 6/11 powerpc/ppc64e: Fix link problem when building ppc64e_defconfig
arch/powerpc/platforms/built-in.o:(.toc1+0x18): undefined reference to `__early_start'
This is due to the 85xx/smp.c not handling the 64-bit side properly. We need to set the entry point for secondary cores on ppc64e to generic_secondary_smp_init instead of __early_start that we due on ppc32.
--- arch/powerpc/platforms/85xx/smp.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
arch/powerpc/platforms/85xx/smp.c +7 -0
@@ -80,6 +80,7 @@ smp_85xx_kick_cpu(int nr)local_irq_save (flags);out_be32 (bptr_vaddr +BOOT_ENTRY_PIR , nr); +#ifdef CONFIG_PPC32 out_be32 (bptr_vaddr +BOOT_ENTRY_ADDR_LOWER ,__pa (__early_start));if (!ioremappable)
@@ -89,6 +90,12 @@ smp_85xx_kick_cpu(int nr)/* Wait a bit for the CPU to ack. */ while ((__secondary_hold_acknowledge != nr) && (++n <1000 ))mdelay (1 ); +#else +out_be64 ((u64 *)(bptr_vaddr +BOOT_ENTRY_ADDR_UPPER ), +__pa ((u64)*((unsigned long long *) generic_secondary_smp_init))); + +smp_generic_kick_cpu (nr); +#endif local_irq_restore (flags);
Signature · 1 line
1.7.2.3
PATCH 7/11 powerpc/fsl-booke: Add support for FSL 64-bit e5500 core
The new e5500 core is similar to the e500mc core but adds 64-bit support. We support running it in 32-bit mode as it is identical to the e500mc.
--- arch/powerpc/include/asm/cache.h | 2 +- arch/powerpc/include/asm/reg_booke.h | 3 ++- arch/powerpc/kernel/Makefile | 1 + arch/powerpc/kernel/cpu_setup_fsl_booke.S | 15 +++++++++++++++ arch/powerpc/kernel/cputable.c | 26 +++++++++++++++++++++++++- arch/powerpc/kernel/traps.c | 8 +++++++- arch/powerpc/platforms/85xx/Kconfig | 4 ++++ arch/powerpc/platforms/Kconfig.cputype | 22 ++++++++++++++++------ 8 files changed, 71 insertions(+), 10 deletions(-)
arch/powerpc/include/asm/cache.h +1 -1
@@ -8,7 +8,7 @@#if defined(CONFIG_8xx) || defined(CONFIG_403GCX )#define L1_CACHE_SHIFT 4#define MAX_COPY_PREFETCH 1 -#elif defined(CONFIG_PPC_E500MC ) +#elif defined(CONFIG_PPC_E500MC ) || defined(CONFIG_PPC_E5500 )#define L1_CACHE_SHIFT 6#define MAX_COPY_PREFETCH 4#elif defined(CONFIG_PPC32 )
arch/powerpc/include/asm/reg_booke.h +2 -1
@@ -203,7 +203,8 @@#define PPC47x_MCSR_FPR 0x00800000/* FPR parity error */ #define PPC47x_MCSR_IPR 0x00400000/* Imprecise Machine Check Exception */ -#ifdef CONFIG_E500 +#if defined(CONFIG_E500 ) || defined(CONFIG_PPC_E500MC ) \ + || defined(CONFIG_PPC_BOOK3E_64 )/* All e500 */ #define MCSR_MCP 0x80000000UL/* Machine Check Input Pin */ #define MCSR_ICPERR 0x40000000UL/* I-Cache Parity Error */
arch/powerpc/kernel/Makefile +1 -0
@@ -36,6 +36,7 @@ obj-$(CONFIG_PPC64) += setup_64.o sys_ppc32.o \ paca.o nvram_64.o firmware.o obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_ppc970.o cpu_setup_pa6t.o +obj-$(CONFIG_PPC_BOOK3E_64) += cpu_setup_fsl_booke.o obj64-$(CONFIG_RELOCATABLE) += reloc_64.o obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o idle_book3e.o obj-$(CONFIG_PPC64) += vdso64/
arch/powerpc/kernel/cpu_setup_fsl_booke.S +15 -0
@@ -51,6 +51,7 @@ _GLOBAL(__e500_dcache_setup) isync blr +#ifdef CONFIG_PPC32 _GLOBAL(__setup_cpu_e200) /* enable dedicated debug exception handling resources (Debug APU) */ mfspr r3,SPRN_HID0
@@ -72,3 +73,17 @@ _GLOBAL(__setup_cpu_e500mc) bl __setup_e500mc_ivors mtlr r4 blr +#endif +/* Right now, restore and setup are the same thing */ +_GLOBAL(__restore_cpu_e5500) +_GLOBAL(__setup_cpu_e5500) + mflr r4 + bl __e500_icache_setup + bl __e500_dcache_setup +#ifdef CONFIG_PPC_BOOK3E_64 + bl .__setup_base_ivors +#else + bl __setup_e500mc_ivors +#endif + mtlr r4 + blr
arch/powerpc/kernel/cputable.c +25 -1
@@ -66,6 +66,10 @@ extern void __restore_cpu_ppc970(void);extern void __setup_cpu_power7 (unsigned long offset,struct cpu_spec * spec);extern void __restore_cpu_power7 (void );#endif /* CONFIG_PPC64 */ +#if defined(CONFIG_PPC_BOOK3E_64 ) || defined(CONFIG_E500 ) +extern void __setup_cpu_e5500 (unsigned long offset,struct cpu_spec * spec); +extern void __restore_cpu_e5500 (void ); +#endif /* CONFIG_PPC_BOOK3E_64 || CONFIG_E500 */ /* This table only contains "desktop" CPUs, it need to be filled with embedded * ones as well...
@@ -1891,6 +1895,27 @@ static struct cpu_spec __initdata cpu_specs[] = { .platform = "ppc5554", }#endif /* CONFIG_E200 */ +#endif /* CONFIG_PPC32 */ +#if defined(CONFIG_PPC_BOOK3E_64 ) || defined(CONFIG_E500 ) + {/* e5500 */ + .pvr_mask = 0xffff0000, + .pvr_value = 0x80240000, + .cpu_name = "e5500", + .cpu_features = CPU_FTRS_E500MC, + .cpu_user_features = COMMON_USER_BOOKE, + .mmu_features =MMU_FTR_TYPE_FSL_E |MMU_FTR_BIG_PHYS | + MMU_FTR_USE_TLBILX, + .icache_bsize = 64, + .dcache_bsize = 64, + .num_pmcs = 4, + .oprofile_cpu_type = "ppc/e500mc", + .oprofile_type = PPC_OPROFILE_FSL_EMB, + .cpu_setup = __setup_cpu_e5500, + .cpu_restore = __restore_cpu_e5500, + .machine_check = machine_check_e500mc, + .platform ="ppce5500" , + }, +#endif #ifdef CONFIG_E500 { /* e500 */ .pvr_mask = 0xffff0000,
@@ -1961,7 +1986,6 @@ static struct cpu_spec __initdata cpu_specs[] = { .platform = "powerpc", }#endif /* CONFIG_E500 */ -#endif /* CONFIG_PPC32 */ #ifdef CONFIG_PPC_BOOK3E_64 {/* This is a default entry to get going, to be replaced by
arch/powerpc/kernel/traps.c +7 -1
@@ -418,7 +418,8 @@ int machine_check_47x(struct pt_regs *regs) return 0; } -#elif defined(CONFIG_E500) +#elif defined(CONFIG_E500) || defined(CONFIG_PPC_E500MC) \ + || defined(CONFIG_PPC_BOOK3E_64)int machine_check_e500mc (struct pt_regs *regs) {unsigned long mcsr =mfspr (SPRN_MCSR );
@@ -538,6 +539,11 @@ int machine_check_e500(struct pt_regs *regs) return 0; } + +int machine_check_generic (struct pt_regs *regs) +{ +return 0 ; +}#elif defined(CONFIG_E200)int machine_check_e200 (struct pt_regs *regs) {
arch/powerpc/platforms/85xx/Kconfig +4 -0
@@ -11,6 +11,8 @@ menuconfig FSL_SOC_BOOKE if FSL_SOC_BOOKE +if PPC32 + config MPC8540_ADS bool "Freescale MPC8540 ADS" select DEFAULT_UIMAGE
@@ -177,6 +179,8 @@ config P4080_DS help This option enables support for the P4080 DS board +endif # PPC32 + endif # FSL_SOC_BOOKE config TQM85xx
arch/powerpc/platforms/Kconfig.cputype +16 -6
@@ -132,13 +132,18 @@ config PPC_E500MC select PPC_FPU depends on E500 +config PPC_E5500 + bool + select PPC_FPU + select PPC_E500MC if PPC32 + config PPC_FPU bool default y if PPC64 config FSL_EMB_PERFMON bool "Freescale Embedded Perfmon" - depends on E500 || PPC_83xx + depends on E500 || PPC_E5500 || PPC_83xx help This is the Performance Monitor support found on the e500 core and some e300 cores (c3 and c4). Select this only if your
@@ -151,7 +156,7 @@ config FSL_EMB_PERF_EVENT config FSL_EMB_PERF_EVENT_E500 bool - depends on FSL_EMB_PERF_EVENT && E500 + depends on FSL_EMB_PERF_EVENT && (E500 || PPC_E5500) default y config 4xx
@@ -161,7 +166,7 @@ config 4xx config BOOKE bool - depends on E200 || E500 || 44x || PPC_BOOK3E + depends on E200 || E500 || PPC_E5500 || 44x || PPC_BOOK3E default y config FSL_BOOKE
@@ -169,15 +174,20 @@ config FSL_BOOKE depends on E200 || E500 default y +# this is for common code between PPC32 & PPC64 FSL BOOKE +config PPC_FSL_BOOK3E + bool + select FSL_EMB_PERFMON + default y if FSL_BOOKE config PTE_64BIT bool - depends on 44x || E500 || PPC_86xx + depends on 44x || E500 || PPC_E5500 || PPC_86xx default y if PHYS_64BIT config PHYS_64BIT - bool 'Large physical address support' if E500 || PPC_86xx - depends on (44x || E500 || PPC_86xx) && !PPC_83xx && !PPC_82xx + bool 'Large physical address support' if E500 || PPC_E5500 || PPC_86xx + depends on (44x || E500 || PPC_E5500 || PPC_86xx) && !PPC_83xx && !PPC_82xx ---help--- This option enables kernel support for larger than 32-bit physical addresses. This feature may not be available on all cores.
Signature · 1 line
1.7.2.3
PATCH 8/11 powerpc/fsl-booke: Add support for FSL Arch v1.0 MMU in setup_page_sizes
Update setup_page_sizes() to support for a MMU v1.0 FSL style MMU implementation. In such a processor, we don't have TLB0PS or EPTCFG registers (and access to these registers may cause exceptions). We need to parse the older format of TLBnCFG for page size support. Additionaly, assume since we are an FSL implementation that we have 2 TLB arrays and the second array contains the variable size pages.
--- arch/powerpc/include/asm/mmu-book3e.h | 15 +++++++++++ arch/powerpc/mm/tlb_nohash.c | 42 ++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 3 deletions(-)
arch/powerpc/include/asm/mmu-book3e.h +15 -0
@@ -114,6 +114,17 @@#define MAS7_RPN 0xFFFFFFFF +/* Bit definitions for MMUCFG */ +#define MMUCFG_MAVN 0x00000003/* MMU Architecture Version Number */ +#define MMUCFG_MAVN_V1 0x00000000/* v1.0 */ +#define MMUCFG_MAVN_V2 0x00000001/* v2.0 */ +#define MMUCFG_NTLBS 0x0000000c/* Number of TLBs */ +#define MMUCFG_PIDSIZE 0x000007c0/* PID Reg Size */ +#define MMUCFG_TWC 0x00008000/* TLB Write Conditional (v2.0) */ +#define MMUCFG_LRAT 0x00010000/* LRAT Supported (v2.0) */ +#define MMUCFG_RASIZE 0x00fe0000/* Real Addr Size */ +#define MMUCFG_LPIDSIZE 0x0f000000/* LPID Reg Size */ +/* Bit definitions for MMUCSR0 */ #define MMUCSR0_TLB1FI 0x00000002/* TLB1 Flash invalidate */ #define MMUCSR0_TLB0FI 0x00000004/* TLB0 Flash invalidate */
@@ -133,6 +144,10 @@#define TLBnCFG_GTWE 0x00010000/* Guest can write */ #define TLBnCFG_IND 0x00020000/* IND entries supported */ #define TLBnCFG_PT 0x00040000/* Can load from page table */ +#define TLBnCFG_MINSIZE 0x00f00000/* Minimum Page Size (v1.0) */ +#define TLBnCFG_MINSIZE_SHIFT 20 +#define TLBnCFG_MAXSIZE 0x000f0000/* Maximum Page Size (v1.0) */ +#define TLBnCFG_MAXSIZE_SHIFT 16#define TLBnCFG_ASSOC 0xff000000/* Associativity */ /* TLBnPS encoding */
arch/powerpc/mm/tlb_nohash.c +39 -3
50 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 9/11 powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips
On Freescale parts typically have TLB array for large mappings that we can bolt the linear mapping into. We utilize the code that already exists on PPC32 on the 64-bit side to setup the linear mapping to be cover by bolted TLB entries. We utilize a quarter of the variable size TLB array for this purpose.
Additionally, we limit the amount of memory to what we can cover via bolted entries so we don't get secondary faults in the TLB miss handlers. We should fix this limitation in the future.
--- arch/powerpc/kernel/asm-offsets.c | 4 ++-- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/fsl_booke_mmu.c | 12 +++++++----- arch/powerpc/mm/mmu_decl.h | 5 ++++- arch/powerpc/mm/tlb_nohash.c | 14 ++++++++++++++ arch/powerpc/mm/tlb_nohash_low.S | 2 +- 6 files changed, 29 insertions(+), 10 deletions(-)
arch/powerpc/kernel/asm-offsets.c +2 -2
@@ -61,7 +61,7 @@#endif #endif -#if defined(CONFIG_FSL_BOOKE ) +#if defined(CONFIG_PPC_FSL_BOOK3E )#include "../mm/mmu_decl.h" #endif
@@ -470,7 +470,7 @@ int main(void)DEFINE (PGD_T_LOG2 ,PGD_T_LOG2 );DEFINE (PTE_T_LOG2 ,PTE_T_LOG2 );#endif -#ifdef CONFIG_FSL_BOOKE +#ifdef CONFIG_PPC_FSL_BOOK3E DEFINE (TLBCAM_SIZE ,sizeof (struct tlbcam ));DEFINE (TLBCAM_MAS0 , offsetof(struct tlbcam , MAS0));DEFINE (TLBCAM_MAS1 , offsetof(struct tlbcam , MAS1));
arch/powerpc/mm/Makefile +1 -1
@@ -25,7 +25,7 @@ obj-$(CONFIG_PPC_STD_MMU) += hash_low_$(CONFIG_WORD_SIZE).o \ mmu_context_hash$(CONFIG_WORD_SIZE).o obj-$(CONFIG_40x) += 40x_mmu.o obj-$(CONFIG_44x) += 44x_mmu.o -obj-$(CONFIG_FSL_BOOKE) += fsl_booke_mmu.o +obj-$(CONFIG_PPC_FSL_BOOK3E) += fsl_booke_mmu.o obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o obj-$(CONFIG_PPC_MM_SLICES) += slice.o ifeq ($(CONFIG_HUGETLB_PAGE),y)
arch/powerpc/mm/fsl_booke_mmu.c +7 -5
@@ -56,11 +56,6 @@unsigned int tlbcam_index; - -#if defined(CONFIG_LOWMEM_CAM_NUM_BOOL ) && (CONFIG_LOWMEM_CAM_NUM >=NUM_TLBCAMS ) -#error "LOWMEM_CAM_NUM must be less than NUM_TLBCAMS" -#endif -#define NUM_TLBCAMS (64)struct tlbcam TLBCAM [NUM_TLBCAMS ];
@@ -185,6 +180,12 @@ unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx)return amount_mapped; } +#ifdef CONFIG_PPC32 + +#if defined(CONFIG_LOWMEM_CAM_NUM_BOOL ) && (CONFIG_LOWMEM_CAM_NUM >=NUM_TLBCAMS ) +#error "LOWMEM_CAM_NUM must be less than NUM_TLBCAMS" +#endif +unsigned long __init mmu_mapin_ram (unsigned long top) {return tlbcam_addrs[tlbcam_index -1 ].limit -PAGE_OFFSET +1 ;
@@ -216,3 +217,4 @@ void __init adjust_total_lowmem(void) __initial_memory_limit_addr = memstart_addr + __max_low_memory; } +#endif
arch/powerpc/mm/mmu_decl.h +4 -1
@@ -140,10 +140,13 @@ extern void wii_memory_fixups(void);extern void MMU_init_hw (void );extern unsigned long mmu_mapin_ram (unsigned long top); -#elif defined(CONFIG_FSL_BOOKE ) +#elif defined(CONFIG_PPC_FSL_BOOK3E ) +extern unsigned long map_mem_in_cams (unsigned long ram,int max_cam_idx); +#ifdef CONFIG_PPC32 extern void MMU_init_hw (void );extern unsigned long mmu_mapin_ram (unsigned long top);extern void adjust_total_lowmem (void ); +#endif extern void loadcam_entry (unsigned int index); struct tlbcam {
arch/powerpc/mm/tlb_nohash.c +14 -0
@@ -541,6 +541,20 @@ static void __early_init_mmu(int boot_cpu)*/ linear_map_top =memblock_end_of_DRAM (); +#ifdef CONFIG_PPC_FSL_BOOK3E +if (mmu_has_feature (MMU_FTR_TYPE_FSL_E )) { +unsigned int num_cams; + +/* use a quarter of the TLBCAM for bolted linear map */ + num_cams = (mfspr (SPRN_TLB1CFG ) & TLBnCFG_N_ENTRY) /4 ; + linear_map_top =map_mem_in_cams (linear_map_top, num_cams); + +/* limit memory so we dont have linear faults */ +memblock_enforce_memory_limit (linear_map_top); +memblock_analyze (); + } +#endif +/* A sync won't hurt us after mucking around with * the MMU configuration */
arch/powerpc/mm/tlb_nohash_low.S +1 -1
@@ -367,7 +367,7 @@ _GLOBAL(set_context) #error Unsupported processor type ! #endif -#if defined(CONFIG_FSL_BOOKE) +#if defined(CONFIG_PPC_FSL_BOOK3E) /* * extern void loadcam_entry(unsigned int index) *
Signature · 1 line
1.7.2.3
PATCH 10/11 powerpc/fsl-booke: Add p5020 DS board support
The P5020DS is in the same family of boards as the P4080 DS and thus shares the corenet_ds code.
--- arch/powerpc/platforms/85xx/Kconfig | 12 ++++++ arch/powerpc/platforms/85xx/Makefile | 1 + arch/powerpc/platforms/85xx/p5020_ds.c | 69 ++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 0 deletions(-) create mode 100644 arch/powerpc/platforms/85xx/p5020_ds.c
arch/powerpc/platforms/85xx/Kconfig +12 -0
@@ -181,6 +181,18 @@ config P4080_DS endif # PPC32 +config P5020_DS + bool "Freescale P5020 DS" + select DEFAULT_UIMAGE + select PPC_FSL_BOOK3E + select PPC_E5500 + select PHYS_64BIT + select SWIOTLB + select MPC8xxx_GPIO + select HAS_RAPIDIO + help + This option enables support for the P5020 DS board + endif # FSL_SOC_BOOKE config TQM85xx
arch/powerpc/platforms/85xx/Makefile +1 -0
@@ -13,6 +13,7 @@ obj-$(CONFIG_MPC85xx_RDB) += mpc85xx_rdb.o obj-$(CONFIG_P1022_DS) += p1022_ds.o obj-$(CONFIG_P3041_DS) += p3041_ds.o corenet_ds.o obj-$(CONFIG_P4080_DS) += p4080_ds.o corenet_ds.o +obj-$(CONFIG_P5020_DS) += p5020_ds.o corenet_ds.o obj-$(CONFIG_STX_GP3) += stx_gp3.o obj-$(CONFIG_TQM85xx) += tqm85xx.o obj-$(CONFIG_SBC8560) += sbc8560.o
arch/powerpc/platforms/85xx/p5020_ds.c new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
1.7.2.3
PATCH 11/11 powerpc/fsl-booke: Add e55xx (64-bit) smp defconfig
The p5020 SoC from Freescale is the first 64-bit Book-E processor and utilizes the two e5500 cores. Adding a defconfig that enables basic kernel for e5500 based processors.
Also added the p5020 / e5500 support to the ppc64e defconfig.
--- arch/powerpc/configs/e55xx_smp_defconfig | 84 ++++++++++++++++++++++++++++++ arch/powerpc/configs/ppc64e_defconfig | 4 +- 2 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 arch/powerpc/configs/e55xx_smp_defconfig
arch/powerpc/configs/e55xx_smp_defconfig new file +84 -0
@@ -0,0 +1,84 @@ +CONFIG_PPC64=y +CONFIG_PPC_BOOK3E_64=y +# CONFIG_VIRT_CPU_ACCOUNTING is not set +CONFIG_SMP=y +CONFIG_NR_CPUS=2 +CONFIG_EXPERIMENTAL=y +CONFIG_SYSVIPC=y +CONFIG_BSD_PROCESS_ACCT=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_BLK_DEV_INITRD=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_EMBEDDED=y +CONFIG_KALLSYMS_ALL=y +CONFIG_KALLSYMS_EXTRA_PASS=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +CONFIG_MODVERSIONS=y +# CONFIG_BLK_DEV_BSG is not set +CONFIG_P5020_DS=y +# CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set +CONFIG_NO_HZ=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_BINFMT_MISC=m +CONFIG_SPARSE_IRQ=y +# CONFIG_PCI is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_PROC_DEVICETREE=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=131072 +CONFIG_EEPROM_LEGACY=y +CONFIG_INPUT_FF_MEMLESS=m +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set +CONFIG_SERIO_LIBPS2=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_DETECT_IRQ=y +CONFIG_SERIAL_8250_RSA=y +CONFIG_I2C=y +# CONFIG_HWMON is not set +CONFIG_VIDEO_OUTPUT_CONTROL=y +# CONFIG_HID_SUPPORT is not set +# CONFIG_USB_SUPPORT is not set +CONFIG_DMADEVICES=y +CONFIG_FSL_DMA=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +CONFIG_PROC_KCORE=y +CONFIG_TMPFS=y +# CONFIG_MISC_FILESYSTEMS is not set +CONFIG_PARTITION_ADVANCED=y +CONFIG_MAC_PARTITION=y +CONFIG_NLS=y +CONFIG_NLS_UTF8=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m +CONFIG_LIBCRC32C=m +CONFIG_FRAME_WARN=1024 +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_KERNEL=y +CONFIG_DETECT_HUNG_TASK=y +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_DEBUG_INFO=y +# CONFIG_RCU_CPU_STALL_DETECTOR is not set +CONFIG_SYSCTL_SYSCALL_CHECK=y +CONFIG_VIRQ_DEBUG=y +CONFIG_CRYPTO=y +CONFIG_CRYPTO_CBC=y +CONFIG_CRYPTO_PCBC=m +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_SHA1=m +CONFIG_CRYPTO_DES=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_DEV_TALITOS=y
arch/powerpc/configs/ppc64e_defconfig +1 -3
@@ -18,6 +18,7 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_P5020_DS=y CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -256,7 +257,6 @@ CONFIG_HID_ZEROPLUS=y CONFIG_USB=y CONFIG_USB_DEVICEFS=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_TT_NEWSCHED=y # CONFIG_USB_EHCI_HCD_PPC_OF is not set CONFIG_USB_OHCI_HCD=y CONFIG_USB_STORAGE=m
@@ -290,7 +290,6 @@ CONFIG_JFS_POSIX_ACL=y CONFIG_JFS_SECURITY=y CONFIG_XFS_FS=m CONFIG_XFS_POSIX_ACL=y -CONFIG_INOTIFY=y CONFIG_AUTOFS4_FS=m CONFIG_ISO9660_FS=y CONFIG_UDF_FS=m
@@ -384,7 +383,6 @@ CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_AES=m CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_KHAZAD=m
Signature · 1 line
1.7.2.3
Re: [PATCH 09/11] powerpc/fsl-booke64: Use TLB CAMs to cover linear mapping on FSL 64-bit chips
In reply to Kumar GalaQuoted 9 lines · Kumar Gala
On Freescale parts typically have TLB array for large mappings that we can bolt the linear mapping into. We utilize the code that already exists on PPC32 on the 64-bit side to setup the linear mapping to be cover by bolted TLB entries. We utilize a quarter of the variable size TLB array for this purpose.
Additionally, we limit the amount of memory to what we can cover via bolted entries so we don't get secondary faults in the TLB miss handlers. We should fix this limitation in the future.
It might be worth investigating then doing simpler TLB miss handlers.
Currently, you use my virtually linear scheme which involves a recursion to fault in the virtual mappings for the page tables, which means quite a bit of code to save/restore state for every TLB miss.
With a bolted linear mapping, if you go for a simple tree walk (which wouldn't fault), you can remove all that prolog/epilog etc...
It may or may not be faster ... depends. You get less code but more loads, so it depends how well they end up being cached.
Cheers,
Ben.
Quoted 136 lines
Signed-off-by Kumar Gala <[email protected]>--- arch/powerpc/kernel/asm-offsets.c | 4 ++-- arch/powerpc/mm/Makefile | 2 +- arch/powerpc/mm/fsl_booke_mmu.c | 12 +++++++----- arch/powerpc/mm/mmu_decl.h | 5 ++++- arch/powerpc/mm/tlb_nohash.c | 14 ++++++++++++++ arch/powerpc/mm/tlb_nohash_low.S | 2 +- 6 files changed, 29 insertions(+), 10 deletions(-)arch/powerpc/kernel/asm-offsets.c +2
-2@@ -61,7 +61,7 @@#endif #endif -#if defined(CONFIG_FSL_BOOKE ) +#if defined(CONFIG_PPC_FSL_BOOK3E )#include "../mm/mmu_decl.h" #endif @@ -470,7 +470,7 @@ int main(void)DEFINE (PGD_T_LOG2 ,PGD_T_LOG2 );DEFINE (PTE_T_LOG2 ,PTE_T_LOG2 );#endif -#ifdef CONFIG_FSL_BOOKE +#ifdef CONFIG_PPC_FSL_BOOK3E DEFINE (TLBCAM_SIZE ,sizeof (struct tlbcam ));DEFINE (TLBCAM_MAS0 , offsetof(struct tlbcam , MAS0));DEFINE (TLBCAM_MAS1 , offsetof(struct tlbcam , MAS1));arch/powerpc/mm/Makefile +1
-1@@ -25,7 +25,7 @@ obj-$(CONFIG_PPC_STD_MMU) += hash_low_$(CONFIG_WORD_SIZE).o \ mmu_context_hash$(CONFIG_WORD_SIZE).o obj-$(CONFIG_40x) += 40x_mmu.o obj-$(CONFIG_44x) += 44x_mmu.o -obj-$(CONFIG_FSL_BOOKE) += fsl_booke_mmu.o +obj-$(CONFIG_PPC_FSL_BOOK3E) += fsl_booke_mmu.o obj-$(CONFIG_NEED_MULTIPLE_NODES) += numa.o obj-$(CONFIG_PPC_MM_SLICES) += slice.o ifeq ($(CONFIG_HUGETLB_PAGE),y)arch/powerpc/mm/fsl_booke_mmu.c +7
-5@@ -56,11 +56,6 @@unsigned int tlbcam_index; - -#if defined(CONFIG_LOWMEM_CAM_NUM_BOOL ) && (CONFIG_LOWMEM_CAM_NUM >=NUM_TLBCAMS ) -#error "LOWMEM_CAM_NUM must be less than NUM_TLBCAMS" -#endif -#define NUM_TLBCAMS (64)struct tlbcam TLBCAM [NUM_TLBCAMS ];@@ -185,6 +180,12 @@ unsigned long map_mem_in_cams(unsigned long ram, int max_cam_idx)return amount_mapped; } +#ifdef CONFIG_PPC32 + +#if defined(CONFIG_LOWMEM_CAM_NUM_BOOL ) && (CONFIG_LOWMEM_CAM_NUM >=NUM_TLBCAMS ) +#error "LOWMEM_CAM_NUM must be less than NUM_TLBCAMS" +#endif +unsigned long __init mmu_mapin_ram (unsigned long top) {return tlbcam_addrs[tlbcam_index -1 ].limit -PAGE_OFFSET +1 ;@@ -216,3 +217,4 @@ void __init adjust_total_lowmem(void) __initial_memory_limit_addr = memstart_addr + __max_low_memory; } +#endif arch/powerpc/mm/mmu_decl.h +4
-1@@ -140,10 +140,13 @@ extern void wii_memory_fixups(void);extern void MMU_init_hw (void );extern unsigned long mmu_mapin_ram (unsigned long top); -#elif defined(CONFIG_FSL_BOOKE ) +#elif defined(CONFIG_PPC_FSL_BOOK3E ) +extern unsigned long map_mem_in_cams (unsigned long ram,int max_cam_idx); +#ifdef CONFIG_PPC32 extern void MMU_init_hw (void );extern unsigned long mmu_mapin_ram (unsigned long top);extern void adjust_total_lowmem (void ); +#endif extern void loadcam_entry (unsigned int index); struct tlbcam {arch/powerpc/mm/tlb_nohash.c +14
-0@@ -541,6 +541,20 @@ static void __early_init_mmu(int boot_cpu)*/ linear_map_top =memblock_end_of_DRAM (); +#ifdef CONFIG_PPC_FSL_BOOK3E +if (mmu_has_feature (MMU_FTR_TYPE_FSL_E )) { +unsigned int num_cams; + +/* use a quarter of the TLBCAM for bolted linear map */ + num_cams = (mfspr (SPRN_TLB1CFG ) & TLBnCFG_N_ENTRY) /4 ; + linear_map_top =map_mem_in_cams (linear_map_top, num_cams); + +/* limit memory so we dont have linear faults */ +memblock_enforce_memory_limit (linear_map_top); +memblock_analyze (); + } +#endif +/* A sync won't hurt us after mucking around with * the MMU configuration */ arch/powerpc/mm/tlb_nohash_low.S +1
-1@@ -367,7 +367,7 @@ _GLOBAL(set_context) #error Unsupported processor type ! #endif -#if defined(CONFIG_FSL_BOOKE) +#if defined(CONFIG_PPC_FSL_BOOK3E) /* * extern void loadcam_entry(unsigned int index) *
Re: [PATCH 07/11] powerpc/fsl-booke: Add support for FSL 64-bit e5500 core
In reply to Kumar Galaarch/powerpc/platforms/Kconfig.cputype config PPC_E500MC · line 138
Quoted 12 lines · On Fri, 8 Oct 2010 14:06:49 -0500 Kumar Gala <[email protected]> wrote:
arch/powerpc/platforms/Kconfig.cputype +4
-0@@ -132,13 +132,18 @@ config PPC_E500MC select PPC_FPU depends on E500 +config PPC_E5500 + bool + select PPC_FPU + select PPC_E500MC if PPC32
Currently E500MC implies E500. With this, E5500 would not imply E500 -- hence all the ifdefs with E500 || E5500 that this adds. When would we want to ifdef E500 or E500MC but not E5500?
Given how similar e500mc and e5500 are, I think we should just use CONFIG_E500MC for it. Any 32/64-bit distinctions would just check CONFIG_PPC64, CONFIG_BOOK3E_64, or similar.
-Scott
Re: [PATCH 03/11] powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
In reply to Kumar GalaOn Fri, Oct 8, 2010 at 2:06 PM, Kumar Gala <[email protected]> wrot= e:
arch/powerpc/sysdev/fsl_pci.=
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.= renamed from arch/powerpc/sysdev/fsl_pci.c +0
-0
c
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P201=
Quoted 4 lines
index 32012a2..4d0b249 100644
arch/powerpc/sysdev/fsl_pci.c +0
-0@@ -417,10 +417,18 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P201=
0E, quirk_fsl_pcie_header);
Quoted 1 line
=A0DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P2010, quirk_fsl_pcie_h=
eader);
Quoted 1 line
=A0DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P2020E, quirk_fsl_pcie_=
header);
Quoted 1 line
=A0DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P2020, quirk_fsl_pcie_h=
eader);
Quoted 1 line
+DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P2040E, quirk_fsl_pcie_he=
ader);
Quoted 1 line
+DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P2040, quirk_fsl_pcie_hea=
der);
Quoted 1 line
+DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P3041E, quirk_fsl_pcie_he=
ader);
Quoted 1 line
+DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P3041, quirk_fsl_pcie_hea=
der);
Quoted 1 line
=A0DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P4040E, quirk_fsl_pcie_=
header);
Quoted 1 line
=A0DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P4040, quirk_fsl_pcie_h=
eader);
Quoted 1 line
=A0DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P4080E, quirk_fsl_pcie_=
header);
Quoted 1 line
=A0DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P4080, quirk_fsl_pcie_h=
eader);
Quoted 1 line
+DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P5010E, quirk_fsl_pcie_he=
ader);
Quoted 1 line
+DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P5010, quirk_fsl_pcie_hea=
der);
Quoted 1 line
+DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P5020E, quirk_fsl_pcie_he=
ader);
Quoted 1 line
+DECLARE_PCI_FIXUP_HEADER(0x1957,
PCI_DEVICE_ID_P5020, quirk_fsl_pcie_hea=
der);
Do we really need to add an entry for each new chip? This table now has almost three dozen entries, and they all same the same thing. Can't we just assume that if the vendor ID is 0x1957, that we should default to quirk_fsl_pcie_header unless there's another entry somewhere else?
--=20
Timur Tabi
Linux kernel developer at Freescale
Re: [PATCH 03/11] powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
Quoted 1 line · Timur Tabi
On Fri, Oct 8, 2010 at 2:06 PM, Kumar Gala <[email protected]> =
Quoted 2 lines · wrote:
=20
=
Quoted 1 line
= renamed from arch/powerpc/sysdev/fsl_pci.c +0
-0
b/arch/powerpc/sysdev/fsl_pci.c
Quoted 4 lines
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, =
Quoted 4 lines
index 32012a2..4d0b249 100644
arch/powerpc/sysdev/fsl_pci.c +0
-0@@ -417,10 +417,18 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, =
PCI_DEVICE_ID_P2010E, quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 417
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +0
-0DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2010, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 418
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +0
-0DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020E, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 419
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +0
-0DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2020, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 420
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +1
-0+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2040E, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 421
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +1
-0+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P2040, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 422
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +1
-0+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P3041E, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 423
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +1
-0+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P3041, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 424
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +0
-0DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P4040E, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 425
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +0
-0DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P4040, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 426
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +0
-0DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P4080E, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 427
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +0
-0DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P4080, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 428
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +1
-0+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P5010E, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 429
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +1
-0+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P5010, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 430
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +1
-0+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P5020E, =
quirk_fsl_pcie_header);
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c DECLARE_PCI_FIXUP_HEADER(0x1957, = · line 431
Quoted 1 line
arch/powerpc/sysdev/fsl_pci.c +1
-0+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_P5020, =
quirk_fsl_pcie_header);
Quoted 6 lines
=20
Do we really need to add an entry for each new chip? This table now has almost three dozen entries, and they all same the same thing. Can't we just assume that if the vendor ID is0x1957, that we should default toquirk_fsl_pcie_headerunless there's another entry somewhere else?
Unfortunately we can't assume if 0x1957 is other FSL devices that are = not PPC SoC would use that Vendor ID.
I'll ponder if we can handle this some other more generic way to do = detection, but for now we'll keep adding to the list.
- k=
Kumar Gala
AppliedRe: [PATCH 03/11] powerpc/fsl-booke: Add PCI device ids for P2040/P3041/P5010/P5020 QoirQ chips
In reply to Kumar GalaQuoted 5 lines · Kumar Gala
Signed-off-by Kumar Gala <[email protected]>---
arch/powerpc/sysdev/fsl_pci.c | 8 ++++++++ include/linux/pci_ids.h | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-)
applied to next
- k
Kumar Gala
AppliedQuoted 8 lines · Kumar Gala
Add 'fsl,qoriq-gpio' compatiable to the list we search for to bind against for
mpc8xxx_gpio. This compatiable will be used on P1-P5xxx QorIQ devices like P4080.Signed-off-by Kumar Gala <[email protected]>---
arch/powerpc/sysdev/mpc8xxx_gpio.c| 3 +++1 files changed, 3 insertions(+), 0 deletions(-)
applied to next
- k