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

Commit 143a2759 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix building of COFF zImages
  [POWERPC] spufs: Fix error handling in spufs_fill_dir()
  [POWERPC] Add table of contents to booting-without-of.txt
  [POWERPC] spufs: Don't yield nosched context
  [POWERPC] Fix typo in booting-without-of-txt section numbering
  [POWERPC] scc_sio: Fix link failure
  [POWERPC] cbe_cpufreq: Limit frequency via cpufreq notifier chain
  [POWERPC] Fix pci_setup_phb_io_dynamic for pci_iomap
  [POWERPC] spufs scheduler: Fix wakeup races
  [POWERPC] spufs: Synchronize pte invalidation vs ps close
  [POWERPC] spufs: Free mm if spufs_fill_dir() failed
  [POWERPC] spufs: Fix gang destroy leaks
  [POWERPC] spufs: Hook up spufs_release_mem
  [POWERPC] spufs: Refuse to load the module when not running on cell
  [POWERPC] pasemi: Fix iommu + 64K PAGE_SIZE bug
parents b74d0deb f40e524e

Documentation/powerpc/booting-without-of.txt

+57 −2
Original line number Diff line number Diff line 
           Booting the Linux/ppc kernel without Open Firmware

           --------------------------------------------------





(c) 2005 Benjamin Herrenschmidt <benh at kernel.crashing.org>,

    IBM Corp.

(c) 2005 Becky Bruce <becky.bruce at freescale.com>,
@@ -9,6 +8,62 @@ 
(c) 2006 MontaVista Software, Inc.

    Flash chip node definition



Table of Contents

=================



  I - Introduction

    1) Entry point for arch/powerpc

    2) Board support



  II - The DT block format

    1) Header

    2) Device tree generalities

    3) Device tree "structure" block

    4) Device tree "strings" block



  III - Required content of the device tree

    1) Note about cells and address representation

    2) Note about "compatible" properties

    3) Note about "name" properties

    4) Note about node and property names and character set

    5) Required nodes and properties

      a) The root node

      b) The /cpus node

      c) The /cpus/* nodes

      d) the /memory node(s)

      e) The /chosen node

      f) the /soc<SOCname> node



  IV - "dtc", the device tree compiler



  V - Recommendations for a bootloader



  VI - System-on-a-chip devices and nodes

    1) Defining child nodes of an SOC

    2) Representing devices without a current OF specification

      a) MDIO IO device

      c) PHY nodes

      b) Gianfar-compatible ethernet nodes

      d) Interrupt controllers

      e) I2C

      f) Freescale SOC USB controllers

      g) Freescale SOC SEC Security Engines

      h) Board Control and Status (BCSR)

      i) Freescale QUICC Engine module (QE)

      g) Flash chip nodes



  VII - Specifying interrupt information for devices

    1) interrupts property

    2) interrupt-parent property

    3) OpenPIC Interrupt Controllers

    4) ISA Interrupt Controllers



  Appendix A - Sample SOC node for MPC8540





Revision Information

====================



   May 18, 2005: Rev 0.1 - Initial draft, no chapter III yet.



   May 19, 2005: Rev 0.2 - Add chapter III and bits & pieces here or
@@ -1687,7 +1742,7 @@ platforms are moved over to use the flattened-device-tree model. 
		};

	};



    g) Flash chip nodes

    j) Flash chip nodes



    Flash chips (Memory Technology Devices) are often used for solid state

    file systems on embedded devices.

arch/powerpc/boot/crt0.S

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


	.text

	/* a procedure descriptor used when booting this as a COFF file */

	.globl	_zimage_start_opd

_zimage_start_opd:

	.long	_zimage_start, 0, 0, 0

arch/powerpc/kernel/of_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ static int __devinit of_pci_phb_probe(struct of_device *dev, 
	 * Note also that we don't do ISA, this will also be fixed with a

	 * more massive rework.

	 */

	pci_setup_phb_io(phb, 0);

	pci_setup_phb_io(phb, pci_io_base == 0);



	/* Init pci_dn data structures */

	pci_devs_phb_init_dynamic(phb);

arch/powerpc/platforms/cell/cbe_cpufreq.c

+27 −6
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static u64 MIC_Slow_Next_Timer_table[] = { 
	0x00003FC000000000ull,

};



static unsigned int pmi_frequency_limit = 0;

/*

 * hardware specific functions

 */
@@ -164,7 +165,6 @@ static int set_pmode(int cpu, unsigned int slow_mode) { 


static void cbe_cpufreq_handle_pmi(struct of_device *dev, pmi_message_t pmi_msg)

{

	struct cpufreq_policy policy;

	u8 cpu;

	u8 cbe_pmode_new;
@@ -173,15 +173,27 @@ static void cbe_cpufreq_handle_pmi(struct of_device *dev, pmi_message_t pmi_msg) 
	cpu = cbe_node_to_cpu(pmi_msg.data1);

	cbe_pmode_new = pmi_msg.data2;



	cpufreq_get_policy(&policy, cpu);

	pmi_frequency_limit = cbe_freqs[cbe_pmode_new].frequency;



	policy.max = min(policy.max, cbe_freqs[cbe_pmode_new].frequency);

	policy.min = min(policy.min, policy.max);

	pr_debug("cbe_handle_pmi: max freq=%d\n", pmi_frequency_limit);

}



static int pmi_notifier(struct notifier_block *nb,

				       unsigned long event, void *data)

{

	struct cpufreq_policy *policy = data;



	pr_debug("cbe_handle_pmi: new policy.min=%d policy.max=%d\n", policy.min, policy.max);

	cpufreq_set_policy(&policy);

	if (event != CPUFREQ_INCOMPATIBLE)

		return 0;



	cpufreq_verify_within_limits(policy, 0, pmi_frequency_limit);

	return 0;

}



static struct notifier_block pmi_notifier_block = {

	.notifier_call = pmi_notifier,

};



static struct pmi_handler cbe_pmi_handler = {

	.type			= PMI_TYPE_FREQ_CHANGE,

	.handle_pmi_message	= cbe_cpufreq_handle_pmi,
@@ -238,12 +250,21 @@ static int cbe_cpufreq_cpu_init(struct cpufreq_policy *policy) 


	cpufreq_frequency_table_get_attr(cbe_freqs, policy->cpu);



	if (pmi_dev) {

		/* frequency might get limited later, initialize limit with max_freq */

		pmi_frequency_limit = max_freq;

		cpufreq_register_notifier(&pmi_notifier_block, CPUFREQ_POLICY_NOTIFIER);

	}



	/* this ensures that policy->cpuinfo_min and policy->cpuinfo_max are set correctly */

	return cpufreq_frequency_table_cpuinfo(policy, cbe_freqs);

}



static int cbe_cpufreq_cpu_exit(struct cpufreq_policy *policy)

{

	if (pmi_dev)

		cpufreq_unregister_notifier(&pmi_notifier_block, CPUFREQ_POLICY_NOTIFIER);



	cpufreq_frequency_table_put_attr(policy->cpu);

	return 0;

}

arch/powerpc/platforms/cell/spufs/context.c

+3 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang) 
	if (spu_init_csa(&ctx->csa))

		goto out_free;

	spin_lock_init(&ctx->mmio_lock);

	spin_lock_init(&ctx->mapping_lock);

	mutex_init(&ctx->mapping_lock);

	kref_init(&ctx->kref);

	mutex_init(&ctx->state_mutex);

	mutex_init(&ctx->run_mutex);
@@ -103,6 +103,7 @@ void spu_forget(struct spu_context *ctx) 


void spu_unmap_mappings(struct spu_context *ctx)

{

	mutex_lock(&ctx->mapping_lock);

	if (ctx->local_store)

		unmap_mapping_range(ctx->local_store, 0, LS_SIZE, 1);

	if (ctx->mfc)
@@ -117,6 +118,7 @@ void spu_unmap_mappings(struct spu_context *ctx) 
		unmap_mapping_range(ctx->mss, 0, 0x1000, 1);

	if (ctx->psmap)

		unmap_mapping_range(ctx->psmap, 0, 0x20000, 1);

	mutex_unlock(&ctx->mapping_lock);

}



/**