Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ababe11 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[PATCH] ppc64: create firmware_has_feature() 



Create the firmware_has_feature() inline and move the firmware feature
stuff into its own header file.

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 7a6af5e3

arch/ppc64/kernel/cputable.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/module.h>



#include <asm/cputable.h>

#include <asm/firmware.h>



struct cpu_spec* cur_cpu_spec = NULL;

EXPORT_SYMBOL(cur_cpu_spec);

arch/ppc64/kernel/lparcfg.c

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <asm/iSeries/HvLpConfig.h>

#include <asm/lppaca.h>

#include <asm/hvcall.h>

#include <asm/cputable.h>

#include <asm/firmware.h>

#include <asm/rtas.h>

#include <asm/system.h>

#include <asm/time.h>
@@ -377,7 +377,7 @@ static int lparcfg_data(struct seq_file *m, void *v) 


	partition_active_processors = lparcfg_count_active_processors();



	if (ppc64_firmware_features & FW_FEATURE_SPLPAR) {

	if (firmware_has_feature(FW_FEATURE_SPLPAR)) {

		unsigned long h_entitled, h_unallocated;

		unsigned long h_aggregation, h_resource;

		unsigned long pool_idle_time, pool_procs;
@@ -571,7 +571,7 @@ int __init lparcfg_init(void) 
	mode_t mode = S_IRUSR;



	/* Allow writing if we have FW_FEATURE_SPLPAR */

	if (ppc64_firmware_features & FW_FEATURE_SPLPAR) {

	if (firmware_has_feature(FW_FEATURE_SPLPAR)) {

		lparcfg_fops.write = lparcfg_write;

		mode |= S_IWUSR;

	}

arch/ppc64/kernel/pSeries_iommu.c

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <asm/plpar_wrappers.h>

#include <asm/pSeries_reconfig.h>

#include <asm/systemcfg.h>

#include <asm/firmware.h>

#include "pci.h"



#define DBG(fmt...)
@@ -546,7 +547,7 @@ void iommu_init_early_pSeries(void) 
	}



	if (systemcfg->platform & PLATFORM_LPAR) {

		if (ppc64_firmware_features & FW_FEATURE_MULTITCE) {

		if (firmware_has_feature(FW_FEATURE_MULTITCE)) {

			ppc_md.tce_build = tce_buildmulti_pSeriesLP;

			ppc_md.tce_free	 = tce_freemulti_pSeriesLP;

		} else {

arch/ppc64/kernel/pSeries_setup.c

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#include <asm/nvram.h>

#include <asm/plpar_wrappers.h>

#include <asm/xics.h>

#include <asm/cputable.h>

#include <asm/firmware.h>



#include "i8259.h"

#include "mpic.h"
@@ -231,11 +231,11 @@ static void __init pSeries_setup_arch(void) 


	pSeries_nvram_init();



	if (ppc64_firmware_features & FW_FEATURE_SPLPAR)

	if (firmware_has_feature(FW_FEATURE_SPLPAR))

		vpa_init(boot_cpuid);



	/* Choose an idle loop */

	if (ppc64_firmware_features & FW_FEATURE_SPLPAR) {

	if (firmware_has_feature(FW_FEATURE_SPLPAR)) {

		if (get_paca()->lppaca.shared_proc) {

			printk(KERN_INFO "Using shared processor idle loop\n");

			ppc_md.idle_loop = pseries_shared_idle;

arch/ppc64/kernel/pSeries_smp.c

+2 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <asm/machdep.h>

#include <asm/xics.h>

#include <asm/cputable.h>

#include <asm/firmware.h>

#include <asm/system.h>

#include <asm/rtas.h>

#include <asm/plpar_wrappers.h>
@@ -326,7 +327,7 @@ static void __devinit smp_xics_setup_cpu(int cpu) 
	if (cpu != boot_cpuid)

		xics_setup_cpu();



	if (ppc64_firmware_features & FW_FEATURE_SPLPAR)

	if (firmware_has_feature(FW_FEATURE_SPLPAR))

		vpa_init(cpu);



	cpu_clear(cpu, of_spin_map);