powerpc: Better machine descriptions and kill magic numbers
Subsystems (11)
PATCH 1/1 powerpc: Better machine descriptions and kill magic numbers
This patch does the long awaited change of the machine descriptions so that:
- Both 32 and 64 bits now rely on a probe() entrypoint in ppc_md which
is supposed to use the flat device-tree to identify the board. In addition, I've added a couple of functions to make things easier to retreive the root of the flat device-tree and to test the "compatible" property of a node in the flat tree
- Machines are defined entirely locally to the machine setup*.c file. A
macro is used to define the ppc_md structure for the board and adds it to a specific ELF section. It will automatically get probed.
- Machines/Platforms magic numbers are gone, _machine is gone too, you
can now use the machine_is(name) macro to check if you are running on a givem board, this macro works by testing which of the machine descriptions was selected at boot.
- I kept the !MULTIPLAFORM case available for 32 bits (in which case
you still have to provide a platform_init() routine) but I would like that to go. I recommend that any new and/or embedded board ported to ARCH=powerpc gets added to the MULTIPLATFORM case. If necessary, Kconfig should be fixed to enable MULTIPLATFORM for other CPU types.
Tested on 32 and 64 bits powermacs and pseries. Build tested on iseries chrp and maple.
arch/powerpc/kernel/prom.c +39 -17
@@ -383,14 +383,14 @@ static int __devinit finish_node_interru/* Apple uses bits in there in a different way, let's * only keep the real sense bit on macs */ -if (_machine ==PLATFORM_POWERMAC ) +if (machine_is (powermac)) sense &=0x1 ; np->intrs[intrcount].sense = map_mpic_senses[sense]; }#ifdef CONFIG_PPC64 /* We offset irq numbers for the u3 MPIC by 128 in PowerMac */ -if (_machine ==PLATFORM_POWERMAC && ic && ic->parent) { +if (machine_is (powermac) && ic && ic->parent) {char *name =get_property (ic->parent,"name" ,NULL );if (name && !strcmp (name,"u3" )) np->intrs[intrcount].line +=128 ;
@@ -565,6 +565,18 @@ int __init of_scan_flat_dt(int (*it)(unsreturn rc; } +unsigned long __init of_get_flat_dt_root (void ) +{ +unsigned long p = ((unsigned long )initial_boot_params) + + initial_boot_params->off_dt_struct; + +while (*((u32 *)p) ==OF_DT_NOP ) + p +=4 ; +BUG_ON (*((u32 *)p) !=OF_DT_BEGIN_NODE ); + p +=4 ; +return _ALIGN (p +strlen ((char *)p) +1 ,4 ); +} +/** * This function can be used within scan_flattened_dt callback to get * access to properties
@@ -607,6 +619,25 @@ void* __init of_get_flat_dt_prop(unsigne }while (1 ); } +int __init of_flat_dt_is_compatible (unsigned long node,const char *compat) +{ +const char * cp; +unsigned long cplen, l; + + cp =of_get_flat_dt_prop (node,"compatible" , &cplen); +if (cp ==NULL ) +return 0 ; +while (cplen >0 ) { +if (strncasecmp (cp, compat,strlen (compat)) ==0 ) +return 1 ; + l =strlen (cp) +1 ; + cp += l; + cplen -= l; + } + +return 0 ; +} +static void *__init unflatten_dt_alloc (unsigned long *mem,unsigned long size,unsigned long align) {
@@ -681,7 +712,7 @@ static unsigned long __init unflatten_dt#ifdef DEBUG if ((strlen (p) + l +1 ) != allocl) {DBG ("%s: p: %d, l: %d, a: %d\n" , - pathp,strlen (p), l, allocl); + pathp, (int )strlen (p), l, allocl); }#endif p +=strlen (p);
@@ -933,7 +964,6 @@ static int __init early_init_dt_scan_cpustatic int __init early_init_dt_scan_chosen (unsigned long node,const char *uname,int depth,void *data) { -u32 *prop;unsigned long *lprop;DBG ("search \"chosen\", depth: %d, uname: %s\n" , depth, uname);
@@ -942,14 +972,6 @@ static int __init early_init_dt_scan_cho (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))return 0 ; -/* get platform type */ - prop = (u32 *)of_get_flat_dt_prop (node,"linux,platform" ,NULL ); -if (prop ==NULL ) -return 0 ; -#ifdef CONFIG_PPC_MULTIPLATFORM - _machine = *prop; -#endif -#ifdef CONFIG_PPC64 /* check if iommu is forced on or off */ if (of_get_flat_dt_prop (node,"linux,iommu-off" ,NULL ) !=NULL )
@@ -976,15 +998,15 @@ static int __init early_init_dt_scan_cho* set of RTAS infos now if available */ { -u64 *basep, *entryp; +u64 *basep, *entryp, *sizep; basep =of_get_flat_dt_prop (node,"linux,rtas-base" ,NULL ); entryp =of_get_flat_dt_prop (node,"linux,rtas-entry" ,NULL ); - prop =of_get_flat_dt_prop (node,"linux,rtas-size" ,NULL ); -if (basep && entryp && prop) { + sizep =of_get_flat_dt_prop (node,"linux,rtas-size" ,NULL ); +if (basep && entryp && sizep) { rtas.base = *basep; rtas.entry = *entryp; - rtas.size = *prop; + rtas.size = *sizep; } }#endif /* CONFIG_PPC_RTAS */
@@ -1727,7 +1749,7 @@ static int of_finish_dynamic_node(struct/* We don't support that function on PowerMac, at least * not yet */ -if (_machine ==PLATFORM_POWERMAC ) +if (machine_is (powermac))return -ENODEV ;/* fix up new node's linux_phandle field */
arch/powerpc/kernel/setup-common.c +40 -7
80 lines not on this page · raw message
arch/powerpc/kernel/setup_32.c +5 -53
87 lines not on this page · raw message
arch/powerpc/kernel/setup_64.c +4 -51
95 lines not on this page · raw message
arch/powerpc/kernel/vmlinux.lds.S +180 -199
424 lines not on this page · raw message
arch/powerpc/platforms/cell/setup.c +4 -3
@@ -195,9 +195,10 @@ static void __init cell_init_early(void) } -static int __init cell_probe (int platform) +static int __init cell_probe (void ) { -if (platform !=PLATFORM_CELL ) +unsigned long root =of_get_flat_dt_root (); +if (!of_flat_dt_is_compatible (root,"IBM,CPB" ))return 0 ;return 1 ;
@@ -212,7 +213,7 @@ static int cell_check_legacy_ioport(unsireturn -ENODEV ; } -struct machdep_calls __initdata cell_md = { +define_machine (cell) { .probe = cell_probe, .setup_arch = cell_setup_arch, .init_early = cell_init_early,
arch/powerpc/platforms/iseries/setup.c +9 -4
@@ -706,9 +706,13 @@ static void iseries_dedicated_idle(void)void __init iSeries_init_IRQ (void ) { }#endif -static int __init iseries_probe (int platform) +static int __init iseries_probe (void ) { -if (PLATFORM_ISERIES_LPAR != platform) +char *model =of_get_flat_dt_prop (of_get_flat_dt_root (), +"model" ,NULL ); +if (model ==NULL ) +return 0 ; +if (strcmp (model,"ibm,iSeries" ))return 0 ; ppc64_firmware_features |=FW_FEATURE_ISERIES ;
@@ -717,7 +721,8 @@ static int __init iseries_probe(int platreturn 1 ; } -struct machdep_calls __initdata iseries_md = { +define_machine (iseries) { + .name = "iSeries", .setup_arch = iSeries_setup_arch, .show_cpuinfo = iSeries_show_cpuinfo, .init_IRQ = iSeries_init_IRQ,
@@ -930,6 +935,7 @@ void build_flat_dt(struct iseries_flat_ddt_prop_u32 (dt,"#address-cells" ,2 );dt_prop_u32 (dt,"#size-cells" ,2 ); +dt_prop_str (dt,"model" ,"ibm,iSeries" );/* /memory */ dt_start_node (dt,"memory@0" );
@@ -942,7 +948,6 @@ void build_flat_dt(struct iseries_flat_d/* /chosen */ dt_start_node (dt,"chosen" ); -dt_prop_u32 (dt,"linux,platform" ,PLATFORM_ISERIES_LPAR );if (cmd_mem_limit)dt_prop_u64 (dt,"linux,memory-limit" , cmd_mem_limit);dt_end_node (dt);
arch/powerpc/platforms/maple/setup.c +5 -3
@@ -259,9 +259,10 @@ static void __init maple_progress(char */* * Called very early, MMU is off, device-tree isn't unflattened */ -static int __init maple_probe (int platform) +static int __init maple_probe (void ) { -if (platform !=PLATFORM_MAPLE ) +unsigned long root =of_get_flat_dt_root (); +if (!of_flat_dt_is_compatible (root,"Momentum,Maple" ))return 0 ;/* * On U3, the DART (iommu) must be allocated now since it
@@ -274,7 +275,8 @@ static int __init maple_probe(int platforeturn 1 ; } -struct machdep_calls __initdata maple_md = { +define_machine (maple_md) { + .name = "Maple", .probe = maple_probe, .setup_arch = maple_setup_arch, .init_early = maple_init_early,
arch/powerpc/platforms/powermac/pci.c +3 -2
@@ -1204,7 +1204,7 @@ void __init pmac_pcibios_after_init(void#ifdef CONFIG_PPC32 void pmac_pci_fixup_cardbus (struct pci_dev * dev) { -if (_machine != _MACH_Pmac) +if (!machine_is (powermac))return ;/* * Fix the interrupt routing on the various cardbus bridges
@@ -1247,8 +1247,9 @@ void pmac_pci_fixup_pciata(struct pci_de* On PowerMacs, we try to switch any PCI ATA controller to * fully native mode */ -if (_machine != _MACH_Pmac) +if (!machine_is (powermac))return ; +/* Some controllers don't have the class IDE */ if (dev->vendor ==PCI_VENDOR_ID_PROMISE )switch (dev->device) {
arch/powerpc/platforms/powermac/setup.c +41 -31
115 lines not on this page · raw message
arch/powerpc/platforms/pseries/setup.c +28 -9
@@ -426,22 +426,40 @@ static int pSeries_check_legacy_ioport(u*/ extern struct machdep_calls pSeries_md; -static int __init pSeries_probe (int platform) +static int __init pSeries_probe_hypertas (unsigned long node, +const char *uname,int depth, +void *data) { -if (platform !=PLATFORM_PSERIES && - platform !=PLATFORM_PSERIES_LPAR ) +if (depth !=1 || + (strcmp (uname,"rtas" ) !=0 &&strcmp (uname,"rtas@0" ) !=0 ))return 0 ; -/* if we have some ppc_md fixups for LPAR to do, do -* it here ... -*/ - -if (platform ==PLATFORM_PSERIES_LPAR ) +if (of_get_flat_dt_prop (node,"ibm,hypertas-functions" ,NULL ) !=NULL ) ppc64_firmware_features |=FW_FEATURE_LPAR ;return 1 ; } +static int __init pSeries_probe (void ) +{ +char *dtype =of_get_flat_dt_prop (of_get_flat_dt_root (), +"device_type" ,NULL ); +if (dtype ==NULL ) +return 0 ; +if (strcmp (dtype,"chrp" )) +return 0 ; + +DBG ("pSeries detected, looking for LPAR capability...\n" ); + +/* Now try to figure out if we are running on LPAR */ +of_scan_flat_dt (pSeries_probe_hypertas,NULL ); + +DBG ("Machine is%s LPAR !\n" , + (ppc64_firmware_features &FW_FEATURE_LPAR ) ?"" :" not" ); + +return 1 ; +} + DECLARE_PER_CPU(unsigned long, smt_snooze_delay);static inline void dedicated_idle_sleep (unsigned int cpu)
@@ -606,7 +624,8 @@ static void pseries_kexec_cpu_down(int c }#endif -struct machdep_calls __initdata pSeries_md = { +define_machine (pseries) { + .name = "pSeries", .probe = pSeries_probe, .setup_arch = pSeries_setup_arch, .init_early = pSeries_init_early,
include/asm-powerpc/machdep.h +22 -4
@@ -47,6 +47,7 @@ struct smp_ops_t {#endif struct machdep_calls { +char *name;#ifdef CONFIG_PPC64 void (*hpte_invalidate)(unsigned long slot, unsigned long va,
@@ -85,9 +86,9 @@ struct machdep_calls {void (*iommu_dev_setup)(struct pci_dev *dev);void (*iommu_bus_setup)(struct pci_bus *bus);void (*irq_bus_setup)(struct pci_bus *bus); -#endif +#endif /* CONFIG_PPC64 */ -int (*probe)(int platform); +int (*probe)(void );void (*setup_arch)(void );void (*init_early)(void );/* Optional, may be NULL. */
@@ -208,8 +209,6 @@ struct machdep_calls {/* Called at then very end of pcibios_init() */ void (*pcibios_after_init)(void ); -/* this is for modules, since _machine can be a define -- Cort */ -int ppc_machine;#endif /* CONFIG_PPC32 */ /* Called to shutdown machine specific hardware not already controlled
@@ -245,7 +244,26 @@ struct machdep_calls {extern void default_idle (void );extern void native_idle (void ); +/* +* ppc_md contains a copy of the machine description structure for the +* current platform. machine_id contains the initial address where the +* description was found during boot. +*/ extern struct machdep_calls ppc_md; +extern struct machdep_calls *machine_id; + +#define __machine_desc __attribute__ ((__section__ (".machine.desc"))) + +#define define_machine (name) struct machdep_calls mach_##name __machine_desc = +#define machine_is (name) \ + ({ \ + extern struct machdep_calls mach_##name \ + __attribute__((weak)); \ + machine_id == &mach_##name; \ + }) + +extern void probe_machine (void ); +extern char cmd_line[COMMAND_LINE_SIZE ];#ifdef CONFIG_PPC_PMAC
include/asm-powerpc/processor.h +2 -32
@@ -22,22 +22,6 @@* -- BenH. */ -/* Platforms codes (to be obsoleted) */ -#define PLATFORM_PSERIES 0x0100 -#define PLATFORM_PSERIES_LPAR 0x0101 -#define PLATFORM_ISERIES_LPAR 0x0201 -#define PLATFORM_LPAR 0x0001 -#define PLATFORM_POWERMAC 0x0400 -#define PLATFORM_MAPLE 0x0500 -#define PLATFORM_PREP 0x0600 -#define PLATFORM_CHRP 0x0700 -#define PLATFORM_CELL 0x1000 - -/* Compat platform codes for 32 bits */ -#define _MACH_prep PLATFORM_PREP -#define _MACH_Pmac PLATFORM_POWERMAC -#define _MACH_chrp PLATFORM_CHRP -/* PREP sub-platform types see residual.h for these */ #define _PREP_Motorola 0x01/* motorola prep */ #define _PREP_Firm 0x02/* firmworks prep */
@@ -50,13 +34,7 @@#define _CHRP_Pegasos 0x06/* Genesi/bplan's Pegasos and Pegasos2 */ #ifdef __KERNEL__ -#define platform_is_pseries () (_machine == PLATFORM_PSERIES || \ - _machine == PLATFORM_PSERIES_LPAR) - -#if defined(CONFIG_PPC_MULTIPLATFORM ) -extern int _machine; - -#ifdef CONFIG_PPC32 +#if defined(CONFIG_PPC_MULTIPLATFORM ) && defined(CONFIG_PPC32 )/* what kind of prep workstation we are */ extern int _prep_type;
@@ -71,16 +49,8 @@ extern unsigned char ucBoardRev;extern unsigned char ucBoardRevMaj, ucBoardRevMin;#endif /* CONFIG_PPC32 */ - -#elif defined(CONFIG_PPC_ISERIES ) -/* -* iSeries is soon to become MULTIPLATFORM hopefully ... -*/ -#define _machine PLATFORM_ISERIES_LPAR -#else -#define _machine 0 -#endif /* CONFIG_PPC_MULTIPLATFORM */ #endif /* __KERNEL__ */ +/* * Default implementation of macro that returns current * instruction pointer ("program counter").
include/asm-powerpc/prom.h +8 -6
@@ -139,12 +139,14 @@ extern struct device_node *of_node_get(sextern void of_node_put (struct device_node *node);/* For scanning the flat device-tree at boot time */ -int __init of_scan_flat_dt (int (*it)(unsigned long node, -const char *uname,int depth, -void *data), -void *data); -void *__init of_get_flat_dt_prop (unsigned long node,const char *name, -unsigned long *size); +extern int __init of_scan_flat_dt (int (*it)(unsigned long node, +const char *uname,int depth, +void *data), +void *data); +extern void *__init of_get_flat_dt_prop (unsigned long node,const char *name, +unsigned long *size); +extern int __init of_flat_dt_is_compatible (unsigned long node,const char *name); +extern unsigned long __init of_get_flat_dt_root (void );/* For updating the device tree at runtime */ extern void of_attach_node (struct device_node *);
arch/powerpc/kernel/nvram_64.c +2 -2
@@ -160,7 +160,7 @@ static int dev_nvram_ioctl(struct inodecase IOC_NVRAM_GET_OFFSET : {int part, offset; -if (_machine !=PLATFORM_POWERMAC ) +if (!machine_is (powermac))return -EINVAL ;if (copy_from_user (&part, (void __user *)arg,sizeof (part)) !=0 )return -EFAULT ;
@@ -443,7 +443,7 @@ static int nvram_setup_partition(void)* in our nvram, as Apple defined partitions use pretty much * all of the space */ -if (_machine ==PLATFORM_POWERMAC ) +if (machine_is (powermac))return -ENOSPC ;/* see if we have an OS partition that meets our needs.
arch/powerpc/kernel/proc_ppc64.c +2 -1
@@ -23,6 +23,7 @@#include <linux/slab.h> #include <linux/kernel.h> +#include <asm/machdep.h> #include <asm/vdso_datapage.h> #include <asm/rtas.h> #include <asm/uaccess.h>
@@ -51,7 +52,7 @@ static int __init proc_ppc64_create(voidif (!root)return 1 ; -if (!(platform_is_pseries () || _machine ==PLATFORM_CELL )) +if (!machine_is (pseries) && !machine_is (cell))return 0 ;if (!proc_mkdir ("rtas" , root))
arch/powerpc/kernel/rtas-proc.c +1 -1
@@ -258,7 +258,7 @@ static int __init proc_rtas_init(void) {struct proc_dir_entry *entry; -if (_machine !=PLATFORM_PSERIES && _machine !=PLATFORM_PSERIES_LPAR ) +if (!machine_is (pseries))return 1 ; rtas_node =of_find_node_by_name (NULL ,"rtas" );
arch/powerpc/kernel/rtas.c +2 -1
@@ -24,6 +24,7 @@#include <asm/rtas.h> #include <asm/semaphore.h> #include <asm/machdep.h> +#include <asm/firmware.h> #include <asm/page.h> #include <asm/param.h> #include <asm/system.h>
@@ -675,7 +676,7 @@ void __init rtas_initialize(void)* the stop-self token if any */ #ifdef CONFIG_PPC64 -if (_machine ==PLATFORM_PSERIES_LPAR ) +if (machine_is (pseries) &&firmware_has_feature (FW_FEATURE_LPAR )) rtas_region =min (lmb.rmo_size,RTAS_INSTANTIATE_MAX );#endif rtas_rmo_buf =lmb_alloc_base (RTAS_RMOBUF_MAX ,PAGE_SIZE , rtas_region);
arch/powerpc/kernel/traps.c +3 -32
@@ -97,7 +97,6 @@ static DEFINE_SPINLOCK(die_lock);int die (const char *str,struct pt_regs *regs,long err) {static int die_counter, crash_dump_start =0 ; -int nl =0 ;if (debugger (regs))return 1 ;
@@ -106,7 +105,7 @@ int die(const char *str, struct pt_regsspin_lock_irq (&die_lock);bust_spinlocks (1 );#ifdef CONFIG_PMAC_BACKLIGHT -if (_machine == _MACH_Pmac) { +if (machine_is (powermac)) {set_backlight_enable (1 );set_backlight_level (BACKLIGHT_MAX ); }
@@ -114,46 +113,18 @@ int die(const char *str, struct pt_regsprintk ("Oops: %s, sig: %ld [#%d]\n" , str, err, ++die_counter);#ifdef CONFIG_PREEMPT printk ("PREEMPT " ); - nl =1 ;#endif #ifdef CONFIG_SMP printk ("SMP NR_CPUS=%d " ,NR_CPUS ); - nl =1 ;#endif #ifdef CONFIG_DEBUG_PAGEALLOC printk ("DEBUG_PAGEALLOC " ); - nl =1 ;#endif #ifdef CONFIG_NUMA printk ("NUMA " ); - nl =1 ;#endif -#ifdef CONFIG_PPC64 -switch (_machine) { -case PLATFORM_PSERIES : -printk ("PSERIES " ); - nl =1 ; -break ; -case PLATFORM_PSERIES_LPAR : -printk ("PSERIES LPAR " ); - nl =1 ; -break ; -case PLATFORM_ISERIES_LPAR : -printk ("ISERIES LPAR " ); - nl =1 ; -break ; -case PLATFORM_POWERMAC : -printk ("POWERMAC " ); - nl =1 ; -break ; -case PLATFORM_CELL : -printk ("CELL " ); - nl =1 ; -break ; - } -#endif -if (nl) -printk ("\n" ); +printk ("%s\n" , ppc_md.name ?"" : ppc_md.name); +print_modules ();show_regs (regs);bust_spinlocks (0 );
arch/powerpc/platforms/powermac/feature.c +1 -1
@@ -2954,7 +2954,7 @@ static void *pmac_early_vresume_data;void pmac_set_early_video_resume (void (*proc)(void *data),void *data) { -if (_machine != _MACH_Pmac) +if (!machine_is (powermac))return ;preempt_disable (); pmac_early_vresume_proc = proc;
arch/powerpc/platforms/powermac/nvram.c +1 -1
@@ -599,7 +599,7 @@ int __init pmac_nvram_init(void) }#ifdef CONFIG_PPC32 -if (_machine == _MACH_chrp && nvram_naddrs ==1 ) { +if (machine_is (chrp) && nvram_naddrs ==1 ) { nvram_data =ioremap (r1.start, s1); nvram_mult =1 ; ppc_md.nvram_read_val = direct_nvram_read_byte;
arch/powerpc/platforms/pseries/eeh.c +1 -1
@@ -1004,7 +1004,7 @@ static int __init eeh_init_proc(void) {struct proc_dir_entry *e; -if (platform_is_pseries ()) { +if (machine_is (pseries)) { e =create_proc_entry ("ppc64/eeh" ,0 ,NULL );if (e) e->proc_fops = &proc_eeh_operations;
arch/powerpc/platforms/pseries/pci.c +1 -1
@@ -122,7 +122,7 @@ static void fixup_winbond_82c105(structint i;unsigned int reg; -if (!platform_is_pseries ()) +if (!machine_is (pseries))return ;printk ("Using INTC for W82c105 IDE controller.\n" );
arch/powerpc/platforms/pseries/reconfig.c +3 -2
@@ -17,8 +17,9 @@#include <linux/proc_fs.h> #include <asm/prom.h> -#include <asm/pSeries_reconfig.h> +#include <asm/machdep.h> #include <asm/uaccess.h> +#include <asm/pSeries_reconfig.h>
@@ -408,7 +409,7 @@ static int proc_ppc64_create_ofdt(void) {struct proc_dir_entry *ent; -if (!platform_is_pseries ()) +if (!machine_is (pseries))return 0 ; ent =create_proc_entry ("ppc64/ofdt" ,S_IWUSR ,NULL );
arch/powerpc/platforms/pseries/rtasd.c +2 -1
@@ -27,6 +27,7 @@#include <asm/prom.h> #include <asm/nvram.h> #include <asm/atomic.h> +#include <asm/machdep.h> #if 0 #define DEBUG(A...) printk(KERN_ERR A)
@@ -481,7 +482,7 @@ static int __init rtas_init(void) {struct proc_dir_entry *entry; -if (!platform_is_pseries ()) +if (!machine_is (pseries))return 0 ;/* No RTAS */
arch/powerpc/platforms/Makefile +4 -1
@@ -9,7 +9,10 @@ obj-$(CONFIG_PPC_CHRP) += chrp/ obj-$(CONFIG_4xx) += 4xx/ obj-$(CONFIG_PPC_83xx) += 83xx/ obj-$(CONFIG_85xx) += 85xx/ -obj-$(CONFIG_PPC_PSERIES) += pseries/ obj-$(CONFIG_PPC_ISERIES) += iseries/ obj-$(CONFIG_PPC_MAPLE) += maple/ obj-$(CONFIG_PPC_CELL) += cell/ + +# Keep pSeries last in link order as it's probing is a bit weak and might +# match some of the other platforms incorrectly +obj-$(CONFIG_PPC_PSERIES) += pseries/
include/asm-powerpc/vdso_datapage.h +3 -0
@@ -55,6 +55,9 @@ struct vdso_data {__u32 minor;/* Minor number 0x14 */ } version; +/* Note about the platform flags: it now only contains the lpar +* bit. The actual platform number is dead and burried +*/ __u32 platform;/* Platform flags 0x18 */ __u32 processor;/* Processor type 0x1C */ __u64 processorCount;/* # of physical processors 0x20 */
arch/powerpc/kernel/vdso.c +8 -1
@@ -35,6 +35,7 @@#include <asm/machdep.h> #include <asm/cputable.h> #include <asm/sections.h> +#include <asm/firmware.h> #include <asm/vdso.h> #include <asm/vdso_datapage.h>
@@ -669,7 +670,13 @@ void __init vdso_init(void) vdso_data->version.major =SYSTEMCFG_MAJOR ; vdso_data->version.minor =SYSTEMCFG_MINOR ; vdso_data->processor =mfspr (SPRN_PVR ); - vdso_data->platform = _machine; +/* +* Fake the old platform number for pSeries and iSeries and add +* in LPAR bit if necessary +*/ + vdso_data->platform =machine_is (iseries) ?0x200 :0x100 ; +if (firmware_has_feature (FW_FEATURE_LPAR )) + vdso_data->platform |=1 ; vdso_data->physicalMemorySize =lmb_phys_mem_size (); vdso_data->dcache_size = ppc64_caches.dsize; vdso_data->dcache_line_size = ppc64_caches.dline_size;
arch/powerpc/kernel/asm-offsets.c +0 -2
@@ -106,8 +106,6 @@ int main(void)DEFINE (ICACHEL1LINESIZE , offsetof(struct ppc64_caches , iline_size));DEFINE (ICACHEL1LOGLINESIZE , offsetof(struct ppc64_caches , log_iline_size));DEFINE (ICACHEL1LINESPERPAGE , offsetof(struct ppc64_caches , ilines_per_page)); -DEFINE (PLATFORM_LPAR ,PLATFORM_LPAR ); -/* paca */ DEFINE (PACA_SIZE ,sizeof (struct paca_struct ));DEFINE (PACAPACAINDEX , offsetof(struct paca_struct , paca_index));
arch/powerpc/kernel/prom_init.c +11 -4
@@ -180,6 +180,17 @@ static unsigned long __initdata prom_tcestatic unsigned long __initdata prom_tce_alloc_end;#endif +/* Platforms codes (to be obsoleted). Now only used within this +* file and ultimately gone too +*/ +#define PLATFORM_PSERIES 0x0100 +#define PLATFORM_PSERIES_LPAR 0x0101 +#define PLATFORM_LPAR 0x0001 +#define PLATFORM_POWERMAC 0x0400 +#define PLATFORM_MAPLE 0x0500 +#define PLATFORM_CHRP 0x0700 +#define PLATFORM_CELL 0x1000 +static int __initdata of_platform;static char __initdata prom_cmd_line[COMMAND_LINE_SIZE ];
@@ -2066,7 +2077,6 @@ unsigned long __init prom_init(unsigned {struct prom_t *_prom;unsigned long hdr; -u32 getprop_rval;unsigned long offset =reloc_offset ();#ifdef CONFIG_PPC32
@@ -2107,9 +2117,6 @@ unsigned long __init prom_init(unsigned* between pSeries SMP and pSeries LPAR */ RELOC (of_platform) =prom_find_machine_type (); - getprop_rval =RELOC (of_platform); -prom_setprop (_prom->chosen,"/chosen" ,"linux,platform" , - &getprop_rval,sizeof (getprop_rval));#ifdef CONFIG_PPC_PSERIES /*
arch/powerpc/mm/hash_utils_64.c +3 -4
@@ -166,7 +166,7 @@ int htab_bolt_mapping(unsigned long vsta* normal insert callback here. */ #ifdef CONFIG_PPC_ISERIES -if (_machine ==PLATFORM_ISERIES_LPAR ) +if (machine_is (iseries)) ret = iSeries_hpte_insert(hpteg, va, virt_to_abs(paddr), tmp_mode,
@@ -175,7 +175,7 @@ int htab_bolt_mapping(unsigned long vsta else#endif #ifdef CONFIG_PPC_PSERIES -if (_machine &PLATFORM_LPAR ) +if (machine_is (pseries) &&firmware_has_feature (FW_FEATURE_LPAR )) ret = pSeries_lpar_hpte_insert(hpteg, va, virt_to_abs(paddr), tmp_mode,
@@ -294,8 +294,7 @@ static void __init htab_init_page_sizes(* Not in the device-tree, let's fallback on known size * list for 16M capable GP & GR */ -if ((_machine !=PLATFORM_ISERIES_LPAR ) && -cpu_has_feature (CPU_FTR_16M_PAGE )) +if (cpu_has_feature (CPU_FTR_16M_PAGE ) && !machine_is (iseries))memcpy (mmu_psize_defs, mmu_psize_defaults_gp,sizeof (mmu_psize_defaults_gp)); found:
drivers/char/generic_nvram.c +4 -1
@@ -22,6 +22,9 @@#include <linux/smp_lock.h> #include <asm/uaccess.h> #include <asm/nvram.h> +#ifdef CONFIG_PPC_PMAC +#include <asm/machdep.h> +#endif #define NVRAM_SIZE 8192
@@ -92,7 +95,7 @@ static int nvram_ioctl(struct inode *inocase IOC_NVRAM_GET_OFFSET : {int part, offset; -if (_machine != _MACH_Pmac) +if (!machine_is (powermac))return -EINVAL ;if (copy_from_user (&part, (void __user *)arg,sizeof (part)) !=0 )return -EFAULT ;
drivers/ide/pci/via82cxxx.c +1 -1
@@ -440,7 +440,7 @@ static void __devinit init_hwif_via82cxx#if defined(CONFIG_PPC_CHRP ) && defined(CONFIG_PPC32 ) -if (_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) { +if (machine_is (chrp) && _chrp_type == _CHRP_Pegasos) { hwif->irq = hwif->channel ?15 :14 ; }#endif
drivers/ide/ppc/pmac.c +1 -1
@@ -1677,7 +1677,7 @@ MODULE_DEVICE_TABLE(pci, pmac_ide_pci_mavoid __init pmac_ide_probe (void ) { -if (_machine != _MACH_Pmac) +if (!machine_is (powermac))return ;#ifdef CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST
drivers/ieee1394/ohci1394.c +2 -2
@@ -3526,7 +3526,7 @@ static void ohci1394_pci_remove(struct pstatic int ohci1394_pci_resume (struct pci_dev *pdev) {#ifdef CONFIG_PPC_PMAC -if (_machine == _MACH_Pmac) { +if (machine_is (powermac)) {struct device_node *of_node;/* Re-enable 1394 */
@@ -3545,7 +3545,7 @@ static int ohci1394_pci_resume (struct pstatic int ohci1394_pci_suspend (struct pci_dev *pdev,pm_message_t state) {#ifdef CONFIG_PPC_PMAC -if (_machine == _MACH_Pmac) { +if (machine_is (powermac)) {struct device_node *of_node;/* Disable 1394 */
drivers/macintosh/adb.c +2 -1
@@ -42,6 +42,7 @@#include <asm/semaphore.h> #ifdef CONFIG_PPC #include <asm/prom.h> +#include <asm/machdep.h> #endif
@@ -294,7 +295,7 @@ int __init adb_init(void)int i;#ifdef CONFIG_PPC32 -if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) ) +if (!machine_is (chrp) && !machine_is (powermac))return 0 ;#endif #ifdef CONFIG_MAC
drivers/macintosh/adbhid.c +2 -2
@@ -1206,8 +1206,8 @@ init_ms_a3(int id)static int __init adbhid_init (void ) {#ifndef CONFIG_MAC -if ( (_machine != _MACH_chrp) && (_machine != _MACH_Pmac) ) -return 0 ; +if (!machine_is (chrp) && !machine_is (powermac)) +return 0 ;#endif led_request.complete =1 ;
drivers/macintosh/mediabay.c +2 -2
@@ -839,8 +839,8 @@ static int __init media_bay_init(void) media_bays[i].cd_index =-1 ;#endif } -if (_machine != _MACH_Pmac) -return -ENODEV ; +if (!machine_is (powermac)) +return 0 ;macio_register_driver (&media_bay_driver);
drivers/media/video/planb.c +1 -1
@@ -2156,7 +2156,7 @@ static int find_planb(void)struct pci_dev *pdev;int rc; -if (_machine != _MACH_Pmac) +if (!machine_is (powermac))return 0 ; planb_devices =find_devices ("planb" );
drivers/scsi/mesh.c +1 -1
@@ -1748,7 +1748,7 @@ static int mesh_host_reset(struct scsi_cstatic void set_mesh_power (struct mesh_state *ms,int state) { -if (_machine != _MACH_Pmac) +if (!machine_is (powermac))return ;if (state) {pmac_call_feature (PMAC_FTR_MESH_ENABLE ,macio_get_of_node (ms->mdev),0 ,1 );
drivers/usb/core/hcd-pci.c +2 -2
@@ -291,7 +291,7 @@ done:#ifdef CONFIG_PPC_PMAC /* Disable ASIC clocks for USB */ -if (_machine == _MACH_Pmac) { +if (machine_is (powermac)) {struct device_node *of_node; of_node =pci_device_to_OF_node (dev);
@@ -326,7 +326,7 @@ int usb_hcd_pci_resume (struct pci_dev *#ifdef CONFIG_PPC_PMAC /* Reenable ASIC clocks for USB */ -if (_machine == _MACH_Pmac) { +if (machine_is (powermac)) {struct device_node *of_node; of_node =pci_device_to_OF_node (dev);
drivers/video/aty/aty128fb.c +4 -3
@@ -67,6 +67,7 @@#include <asm/io.h> #ifdef CONFIG_PPC_PMAC +#include <asm/machdep.h> #include <asm/pmac_feature.h> #include <asm/prom.h> #include <asm/pci-bridge.h>
@@ -1748,7 +1749,7 @@ static int __init aty128_init(struct pci var = default_var;#ifdef CONFIG_PPC_PMAC -if (_machine == _MACH_Pmac) { +if (machine_is (powermac)) {/* Indicate sleep capability */ if (par->chip_gen == rage_M3) {pmac_call_feature (PMAC_FTR_DEVICE_CAN_WAKE ,NULL ,0 ,1 );
@@ -2011,7 +2012,7 @@ static int aty128fb_blank(int blank, strreturn 0 ;#ifdef CONFIG_PMAC_BACKLIGHT -if ((_machine == _MACH_Pmac) && blank) +if (machine_is (powermac) && blank)set_backlight_enable (0 );#endif /* CONFIG_PMAC_BACKLIGHT */
@@ -2029,7 +2030,7 @@ static int aty128fb_blank(int blank, straty128_set_lcd_enable (par, par->lcd_on && !blank); }#ifdef CONFIG_PMAC_BACKLIGHT -if ((_machine == _MACH_Pmac) && !blank) +if (machine_is (powermac) && !blank)set_backlight_enable (1 );#endif /* CONFIG_PMAC_BACKLIGHT */ return 0 ;
drivers/video/aty/atyfb_base.c +4 -3
@@ -75,6 +75,7 @@#include "ati_ids.h" #ifdef __powerpc__ +#include <asm/machdep.h> #include <asm/prom.h> #include "../macmodes.h" #endif
@@ -2518,7 +2519,7 @@ static int __init aty_init(struct fb_infmemset (&var,0 ,sizeof (var));#ifdef CONFIG_PPC -if (_machine == _MACH_Pmac) { +if (machine_is (powermac)) {/* * FIXME: The NVRAM stuff should be put in a Mac-specific file, as it * applies to all Mac video cards
@@ -2673,7 +2674,7 @@ static int atyfb_blank(int blank, structreturn 0 ;#ifdef CONFIG_PMAC_BACKLIGHT -if ((_machine == _MACH_Pmac) && blank >FB_BLANK_NORMAL ) +if (machine_is (powermac) && blank >FB_BLANK_NORMAL )set_backlight_enable (0 );#elif defined(CONFIG_FB_ATY_GENERIC_LCD ) if (par->lcd_table && blank > FB_BLANK_NORMAL &&
@@ -2705,7 +2706,7 @@ static int atyfb_blank(int blank, structaty_st_le32 (CRTC_GEN_CNTL , gen_cntl, par);#ifdef CONFIG_PMAC_BACKLIGHT -if ((_machine == _MACH_Pmac) && blank <=FB_BLANK_NORMAL ) +if (machine_is (powermac) && blank <=FB_BLANK_NORMAL )set_backlight_enable (1 );#elif defined(CONFIG_FB_ATY_GENERIC_LCD ) if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
drivers/video/aty/radeon_pm.c +2 -2
@@ -20,7 +20,7 @@#include <linux/agp_backend.h> #ifdef CONFIG_PPC_PMAC -#include <asm/processor.h> +#include <asm/machdep.h> #include <asm/prom.h> #include <asm/pmac_feature.h> #endif
@@ -2735,7 +2735,7 @@ void radeonfb_pm_init(struct radeonfb_in* reason. --BenH */ #if defined(CONFIG_PM ) && defined(CONFIG_PPC_OF ) -if (_machine == _MACH_Pmac && rinfo->of_node) { +if (machine_is (powermac) && rinfo->of_node) {if (rinfo->is_mobility && rinfo->pm_reg && rinfo->family <=CHIP_FAMILY_RV250 ) rinfo->pm_mode |= radeon_pm_d2;
drivers/video/cirrusfb.c +2 -2
@@ -60,8 +60,8 @@#include <asm/amigahw.h> #endif #ifdef CONFIG_PPC_PREP -#include <asm/processor.h> -#define isPReP (_machine == _MACH_prep) +#include <asm/machdep.h> +#define isPReP (machine_is(prep))#else #define isPReP 0#endif
drivers/video/matrox/matroxfb_base.c +2 -1
@@ -116,6 +116,7 @@#include <asm/uaccess.h> #ifdef CONFIG_PPC_PMAC +#include <asm/machdep.h> unsigned char nvram_read_byte (int );static int default_vmode =VMODE_NVRAM ;static int default_cmode =CMODE_NVRAM ;
@@ -1835,7 +1836,7 @@ static int initMatrox2(WPMINFO struct bo/* FIXME: Where to move this?! */ #if defined(CONFIG_PPC_PMAC) #ifndef MODULE - if (_machine == _MACH_Pmac) { + if (machine_is(powermac)) { struct fb_var_screeninfo var; if (default_vmode <= 0 || default_vmode > VMODE_MAX) default_vmode = VMODE_640_480_60;
drivers/video/nvidia/nvidia.c +3 -2
@@ -29,6 +29,7 @@#include <asm/pci-bridge.h> #endif #ifdef CONFIG_PMAC_BACKLIGHT +#include <asm/machdep.h> #include <asm/backlight.h> #endif
@@ -1351,7 +1352,7 @@ static int nvidiafb_blank(int blank, strNVWriteCrtc (par,0x1a , vesa);#ifdef CONFIG_PMAC_BACKLIGHT -if (par->FlatPanel && _machine == _MACH_Pmac) { +if (par->FlatPanel &&machine_is (powermac)) {set_backlight_enable (!blank); }#endif
@@ -1686,7 +1687,7 @@ static int __devinit nvidiafb_probe(stru info->fix.id, par->FbMapSize / (1024 * 1024), info->fix.smem_start);#ifdef CONFIG_PMAC_BACKLIGHT -if (par->FlatPanel && _machine == _MACH_Pmac) +if (par->FlatPanel &&machine_is (powermac))register_backlight_controller (&nvidia_backlight_controller, par,"mnca" );#endif
drivers/video/radeonfb.c +1 -1
@@ -1596,7 +1596,7 @@ static int radeonfb_blank (int blank, streturn 0 ;#ifdef CONFIG_PMAC_BACKLIGHT -if (rinfo->dviDisp_type ==MT_LCD && _machine == _MACH_Pmac) { +if (rinfo->dviDisp_type ==MT_LCD &&machine_is (powermac)) {set_backlight_enable (!blank);return 0 ; }
drivers/video/riva/fbdev.c +5 -4
@@ -49,6 +49,7 @@#include <asm/pci-bridge.h> #endif #ifdef CONFIG_PMAC_BACKLIGHT +#include <asm/machdep.h> #include <asm/backlight.h> #endif
@@ -1247,7 +1248,7 @@ static int rivafb_blank(int blank, strucCRTCout (par,0x1a , vesa);#ifdef CONFIG_PMAC_BACKLIGHT -if ( par->FlatPanel && _machine == _MACH_Pmac) { +if ( par->FlatPanel &&machine_is (powermac)) {set_backlight_enable (!blank); }#endif
@@ -2037,9 +2038,9 @@ static int __devinit rivafb_probe(struct info->fix.smem_len / (1024 *1024 ), info->fix.smem_start);#ifdef CONFIG_PMAC_BACKLIGHT -if (default_par->FlatPanel && _machine == _MACH_Pmac) -register_backlight_controller (&riva_backlight_controller, - default_par,"mnca" ); +if (default_par->FlatPanel &&machine_is (powermac)) +register_backlight_controller (&riva_backlight_controller, + default_par,"mnca" );#endif NVTRACE_LEAVE ();return 0 ;
include/asm-powerpc/pmac_feature.h +1 -1
@@ -305,7 +305,7 @@ extern void pmac_feature_init(void);extern void pmac_set_early_video_resume (void (*proc)(void *data),void *data);extern void pmac_call_early_video_resume (void ); -#define PMAC_FTR_DEF (x) ((_MACH_Pmac << 16) | (x)) +#define PMAC_FTR_DEF (x) ((0x6660000) | (x))/* The AGP driver registers itself here */ extern void pmac_register_agp_pm(struct pci_dev *bridge,
arch/powerpc/platforms/powermac/low_i2c.c +3 -0
@@ -1458,6 +1458,9 @@ int __init pmac_i2c_init(void)return 0 ; i2c_inited =1 ; +if (!machine_is (powermac)) +return 0 ; +/* Probe keywest-i2c busses */ kw_i2c_probe ();
arch/powerpc/platforms/powermac/pfunc_base.c +2 -0
@@ -331,6 +331,8 @@ int __init pmac_pfunc_base_install(void)return 0 ; pfbase_inited =1 ; +if (!machine_is (powermac)) +return 0 ;DBG ("Installing base platform functions...\n" );
fs/partitions/mac.c +2 -1
@@ -12,6 +12,7 @@#include "mac.h" #ifdef CONFIG_PPC_PMAC +#include <asm/machdep.h> extern void note_bootable_part (dev_t dev,int part,int goodness);#endif
@@ -79,7 +80,7 @@ int mac_partition(struct parsed_partitio* If this is the first bootable partition, tell the * setup code, in case it wants to make this the root. */ -if (_machine == _MACH_Pmac) { +if (machine_is (powermac)) {int goodness =0 ;mac_fix_string (part->processor,16 );
sound/oss/dmasound/dmasound_awacs.c +1 -1
@@ -2816,7 +2816,7 @@ int __init dmasound_awacs_init(void)struct device_node *io =NULL , *info =NULL ;int vol, res; -if (_machine != _MACH_Pmac) +if (!machine_is (powermac))return -ENODEV ; awacs_subframe =0 ;
sound/ppc/pmac.c +1 -1
@@ -869,7 +869,7 @@ static int __init snd_pmac_detect(structu32 layout_id =0 ; -if (_machine != _MACH_Pmac) +if (!machine_is (powermac))return -ENODEV ; chip->subframe =0 ;
arch/powerpc/platforms/chrp/setup.c +30 -21
70 lines not on this page · raw message
arch/powerpc/platforms/powermac/bootx_init.c +1 -3
@@ -161,9 +161,7 @@ static void __init bootx_dt_add_prop(chastatic void __init bootx_add_chosen_props (unsigned long base,unsigned long *mem_end) { -u32 val = _MACH_Pmac; - -bootx_dt_add_prop ("linux,platform" , &val,4 , mem_end); +u32 val;if (bootx_info->kernelParamsOffset) { char *args = (char *)((unsigned long)bootx_info) +
arch/powerpc/platforms/powermac/smp.c +1 -1
@@ -435,7 +435,7 @@ struct smp_ops_t psurge_smp_ops = {*/ static void (*pmac_tb_freeze)(int freeze); -static unsigned long timebase; +static u64 timebase;static int tb_req;static void smp_core99_give_timebase (void )
arch/powerpc/platforms/powermac/time.c +2 -2
@@ -336,10 +336,10 @@ static struct pmu_sleep_notifier time_sl*/ void __init pmac_calibrate_decr (void ) { -#ifdef CONFIG_PM +#if defined(CONFIG_PM ) && defined(CONFIG_ADB_PMU )/* XXX why here? */ pmu_register_sleep_notifier (&time_sleep_notifier); -#endif /* CONFIG_PM */ +#endif generic_calibrate_decr ();
arch/ppc/kernel/pci.c +2 -2
@@ -787,7 +787,7 @@ pci_busdev_to_OF_node(struct pci_bus *bu* fix has to be done by making the remapping per-host and always * filling the pci_to_OF map. --BenH */ -if (_machine == _MACH_Pmac && busnr >=0xf0 ) +if (machine_is (powermac) && busnr >=0xf0 ) busnr -=0xf0 ; else#endif
@@ -1728,7 +1728,7 @@ long sys_pciconfig_iobase(long which, un* (bus 0 is HT root), we return the AGP one instead. */ #ifdef CONFIG_PPC_PMAC -if (_machine == _MACH_Pmac &&machine_is_compatible ("MacRISC4" )) +if (machine_is (powermac) &&machine_is_compatible ("MacRISC4" ))if (bus ==0 ) bus =0xf0 ;#endif /* CONFIG_PPC_PMAC */
drivers/net/tulip/de4x5.c +1 -1
@@ -4160,7 +4160,7 @@ get_hw_addr(struct net_device *dev)** If the address starts with 00 a0, we have to bit-reverse ** each byte of the address. */ -if ( (_machine & _MACH_Pmac) && +if (machine_is (powermac) && (dev->dev_addr[0 ] ==0 ) && (dev->dev_addr[1 ] ==0xa0 ) ) {
Quoted 4 lines · Benjamin Herrenschmidt
- Machines/Platforms magic numbers are gone,
_machineis gone too, you
can now use themachine_is(name)macro to check if you are running on a givem board, this macro works by testing which of the machine descriptions was selected at boot.
Nice! Overall I like this. It removes some of the kexec limitations of having to play with platform numbers when booting a newer kernel that detects platforms differently (or renumbered) too.
I do have a couple of comments on the implementation:
I got complaints when I did this for cpu features, where I first used a cpu_has_feature(<x>) syntax instead of cpu_has_feature(CPU_FTR_<x>). I think I agree with some of the reasoning for that too: someone searching for "powermac" when looking for the "machine_is(powermac)" logic won't find it.
Because of this, I suggest keeping the mach_ part in the syntax, i.e, to use:
machine_is(mach_powermac) instead, and not do preprocessor mangling of the label name. The same would go for define_machine().
It would seem to make some sense to keep the platform types looking like defines (i.e. MACH_POWERMAC instead of mach_powermac) to keep it consistent with the CPU and firmware feature testing, but the way it's implemented that doesn't make much sense. That's a bit of a shame.
In the probe loop, ppc_md is copied over for each probe, that seems wasteful. Shouldn't the probe routines use and modify their own machdep_calls instead of ppc_md, so the copying can be done only once, after a match is found?
-Olof
Quoted 11 lines
Because of this, I suggest keeping the
mach_part in the syntax, i.e, to use:
machine_is(mach_powermac)instead, and not do preprocessor mangling of the label name. The same would go fordefine_machine().It would seem to make some sense to keep the platform types looking like defines (i.e.
MACH_POWERMACinstead ofmach_powermac) to keep it consistent with the CPU and firmware feature testing, but the way it's implemented that doesn't make much sense. That's a bit of a shame.
I'm not sure about these ... I'm definitely not fan of going uppercase (and it makes no sense vs. the implementation as it's not macros). I also don't get your problem with grep... the "mach_" construct is totally invisible, so people wouldn't grep for it, but for "powermac" alone.
Or do you mean a grep on "powermac" might return too many things unrelated ?
It should be easy enough in this case to grep for machine_is(powermac) instead then, after all, that's the only possible use...
Quoted 2 lines
In the probe loop,
ppc_mdis copied over for each probe, that seems wasteful.
I changed that from the old way indeed to allow the probe() function to override things in ppc_md.
Quoted 3 lines
Shouldn't the probe routines use and modify their own
machdep_callsinstead ofppc_md, so the copying can be done only once, after a match is found?
I don't like modifying their own machdep calls because the name of the structure is hidden. In general, I prefer that things continue to only access ppc_md. and not their own machine structure that goes away. That means that the code "patching" it can be moved away etc... without special case instead of having a special case in probe() that has to reference the machine specific copy...
I doubt the memcpy per machine at boot will cause any kind of significant performance issue ...
Ben.
Quoted 7 lines · Benjamin Herrenschmidt
Quoted 7 lines
Because of this, I suggest keeping the
mach_part in the syntax, i.e, to use:
machine_is(mach_powermac)instead, and not do preprocessor mangling of the label name. The same would go fordefine_machine().
Quoted 7 lines
Quoted 4 lines
It would seem to make some sense to keep the platform types looking like defines (i.e.
MACH_POWERMACinstead ofmach_powermac) to keep it consistent with the CPU and firmware feature testing, but the way it's implemented that doesn't make much sense. That's a bit of a shame.I'm not sure about these ... I'm definitely not fan of going uppercase (and it makes no sense vs. the implementation as it's not macros). I also don't
Yeah, that's what I meant with doesn't make sense in this case. I was just thinking out loud.
Quoted 7 lines
get your problem with grep... the "
mach_" construct is totally invisible, so people wouldn't grep for it, but for "powermac" alone.Or do you mean a grep on "powermac" might return too many things unrelated ?
It should be easy enough in this case to grep for
machine_is(powermac)instead then, after all, that's the only possible use...
One drawback is that source navigation tools like tags and cscope probably won't find it, and the base strings are quite generic (powermac, cbe/cell, etc). A stringbased grep will, sure.
Quoted 10 lines
Quoted 2 lines
In the probe loop,
ppc_mdis copied over for each probe, that seems wasteful.I changed that from the old way indeed to allow the
probe()function to override things inppc_md.Quoted 3 lines
Shouldn't the probe routines use and modify their own
machdep_callsinstead ofppc_md, so the copying can be done only once, after a match is found?
Quoted 6 lines
I don't like modifying their own machdep calls because the name of the structure is hidden. In general, I prefer that things continue to only access
ppc_md. and not their own machine structure that goes away. That means that the code "patching" it can be moved away etc... without special case instead of having a special case inprobe()that has to reference the machine specific copy...
Ok.
Quoted 2 lines
I doubt the memcpy per machine at boot will cause any kind of significant performance issue ...
Yeah, that's why I said it seemed wasteful, not that it'd be a performance issue.