* Re: annoying prinkts during vmemmap initialization
From: Stephen Rothwell @ 2007-11-21 22:41 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: linuxppc-dev
In-Reply-To: <20071121153526.GA23589@lst.de>
[-- Attachment #1: Type: text/plain, Size: 861 bytes --]
Hi Christoph,
On Wed, 21 Nov 2007 16:35:26 +0100 Christoph Hellwig <hch@lst.de> wrote:
>
> Hi Andi,
>
> your patch 'ppc64: SPARSEMEM_VMEMMAP support' adds the following two lines:
>
> + printk(KERN_WARNING "vmemmap %08lx allocated at %p, "
> + "physical %p.\n", start, p, __pa(p));
>
> in a loop around basically every page. That's a lot of flooding (with
> the wrong printk level, btw) and really slows down booting my cell blade
> a lot (these only have a very slow serial over lan console).
>
> Any reason to keep this? And if yes can we please make it conditional
> on some kind of vmemmap_debug boot option?
These have been changed to pr_debug() in 2.6.24-rc3 kernel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* [PATCH/RFC 5/6]: phyp dump: register the dump area
From: Linas Vepstas @ 2007-11-21 22:43 UTC (permalink / raw)
To: linuxppc-dev; +Cc: mahuja, lkessler, strosake, mahuja
In-Reply-To: <20071121223639.GB4374@austin.ibm.com>
Set up the actual dump header, register it with the hypervisor.
Signed-off-by: Manish Ahuja <mahuja@us.ibm.com>
Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
------
arch/powerpc/platforms/pseries/phyp_dump.c | 169 +++++++++++++++++++++++++++--
1 file changed, 163 insertions(+), 6 deletions(-)
Index: linux-2.6.24-rc3-git1/arch/powerpc/platforms/pseries/phyp_dump.c
===================================================================
--- linux-2.6.24-rc3-git1.orig/arch/powerpc/platforms/pseries/phyp_dump.c 2007-11-21 15:55:37.000000000 -0600
+++ linux-2.6.24-rc3-git1/arch/powerpc/platforms/pseries/phyp_dump.c 2007-11-21 16:06:52.000000000 -0600
@@ -30,6 +30,134 @@ struct phyp_dump *phyp_dump_info = &phyp
static int ibm_configure_kernel_dump;
/* ------------------------------------------------- */
+/* RTAS interfaces to declare the dump regions */
+
+struct dump_section {
+ u32 dump_flags;
+ u16 source_type;
+ u16 error_flags;
+ u64 source_address;
+ u64 source_length;
+ u64 length_copied;
+ u64 destination_address;
+};
+
+struct phyp_dump_header {
+ u32 version;
+ u16 num_of_sections;
+ u16 status;
+
+ u32 first_offset_section;
+ u32 dump_disk_section;
+ u64 block_num_dd;
+ u64 num_of_blocks_dd;
+ u32 offset_dd;
+ u32 maxtime_to_auto;
+ /* No dump disk path string used */
+
+ struct dump_section cpu_data;
+ struct dump_section hpte_data;
+ struct dump_section kernel_data;
+};
+
+/* The dump header *must be* in low memory, so .bss it */
+static struct phyp_dump_header phdr;
+
+#define NUM_DUMP_SECTIONS 3
+#define DUMP_HEADER_VERSION 0x1
+#define DUMP_REQUEST_FLAG 0x1
+#define DUMP_SOURCE_CPU 0x0001
+#define DUMP_SOURCE_HPTE 0x0002
+#define DUMP_SOURCE_RMO 0x0011
+
+/**
+ * init_dump_header() - initialize the header declaring a dump
+ * Returns: length of dump save area.
+ *
+ * When the hypervisor saves crashed state, it needs to put
+ * it somewhere. The dump header tells the hypervisor where
+ * the data can be saved.
+ */
+static unsigned long init_dump_header(struct phyp_dump_header *ph)
+{
+ struct device_node *rtas;
+ const unsigned int *sizes;
+ int len;
+ unsigned long cpu_state_size = 0;
+ unsigned long hpte_region_size = 0;
+ unsigned long addr_offset = 0;
+
+ /* Get the required dump region sizes */
+ rtas = of_find_node_by_path("/rtas");
+ sizes = of_get_property(rtas, "ibm,configure-kernel-dump-sizes", &len);
+ if (!sizes || len < 20)
+ return 0;
+
+ if (sizes[0] == 1)
+ cpu_state_size = *((unsigned long *) &sizes[1]);
+
+ if (sizes[3] == 2)
+ hpte_region_size = *((unsigned long *) &sizes[4]);
+
+ /* Set up the dump header */
+ ph->version = DUMP_HEADER_VERSION;
+ ph->num_of_sections = NUM_DUMP_SECTIONS;
+ ph->status = 0;
+
+ ph->first_offset_section =
+ (u32) &(((struct phyp_dump_header *) 0)->cpu_data);
+ ph->dump_disk_section = 0;
+ ph->block_num_dd = 0;
+ ph->num_of_blocks_dd = 0;
+ ph->offset_dd = 0;
+
+ ph->maxtime_to_auto = 0; /* disabled */
+
+ /* The first two sections are mandatory */
+ ph->cpu_data.dump_flags = DUMP_REQUEST_FLAG;
+ ph->cpu_data.source_type = DUMP_SOURCE_CPU;
+ ph->cpu_data.source_address = 0;
+ ph->cpu_data.source_length = cpu_state_size;
+ ph->cpu_data.destination_address = addr_offset;
+ addr_offset += cpu_state_size;
+
+ ph->hpte_data.dump_flags = DUMP_REQUEST_FLAG;
+ ph->hpte_data.source_type = DUMP_SOURCE_HPTE;
+ ph->hpte_data.source_address = 0;
+ ph->hpte_data.source_length = hpte_region_size;
+ ph->hpte_data.destination_address = addr_offset;
+ addr_offset += hpte_region_size;
+
+ /* This section describes the low kernel region */
+ ph->kernel_data.dump_flags = DUMP_REQUEST_FLAG;
+ ph->kernel_data.source_type = DUMP_SOURCE_RMO;
+ ph->kernel_data.source_address = PHYP_DUMP_RMR_START;
+ ph->kernel_data.source_length = PHYP_DUMP_RMR_END;
+ ph->kernel_data.destination_address = addr_offset;
+ addr_offset += ph->kernel_data.source_length;
+
+ return addr_offset;
+}
+
+static void register_dump_area(struct phyp_dump_header *ph, unsigned long addr)
+{
+ int rc;
+ ph->cpu_data.destination_address += addr;
+ ph->hpte_data.destination_address += addr;
+ ph->kernel_data.destination_address += addr;
+
+ do {
+ rc = rtas_call(ibm_configure_kernel_dump, 3, 1, NULL,
+ 1, ph, sizeof(struct phyp_dump_header));
+ } while (rtas_busy_delay(rc));
+
+ if (rc)
+ {
+ printk (KERN_ERR "phyp-dump: unexpected error (%d) on register\n", rc);
+ }
+}
+
+/* ------------------------------------------------- */
/**
* release_memory_range -- release memory previously lmb_reserved
* @start_pfn: starting physical frame number
@@ -125,7 +253,11 @@ static void release_all (void)
static int __init phyp_dump_setup(void)
{
struct device_node *rtas;
- const int *dump_header;
+ const struct phyp_dump_header *dump_header;
+ unsigned long dump_area_start;
+ unsigned long dump_area_length;
+ unsigned long free_area_length;
+ unsigned long start_pfn, nr_pages;
int header_len = 0;
int rc;
@@ -140,22 +272,47 @@ static int __init phyp_dump_setup(void)
return -ENOSYS;
}
- /* Is there dump data waiting for us? */
+ /* Is there dump data waiting for us? If there isn't,
+ * then register a new dump area, and release all of
+ * the rest of the reserved ram.
+ *
+ * The /rtas/ibm,kernel-dump rtas node is present only
+ * if there is dump data waiting for us.
+ */
rtas = of_find_node_by_path("/rtas");
dump_header = of_get_property(rtas, "ibm,kernel-dump", &header_len);
+
+ dump_area_length = init_dump_header (&phdr);
+ free_area_length = phyp_dump_info->init_reserve_size - dump_area_length;
+ dump_area_start = phyp_dump_info->init_reserve_start + free_area_length;
+ dump_area_start = dump_area_start & PAGE_MASK; /* align down */
+ free_area_length = dump_area_start - phyp_dump_info->init_reserve_start;
+
if (dump_header == NULL) {
- release_all();
- return 0;
+ register_dump_area (&phdr, dump_area_start);
+ goto release_mem;
}
+ /* Don't allow user to release the 256MB scratch area */
+ phyp_dump_info->init_reserve_size = free_area_length;
+
/* Should we create a dump_subsys, analogous to s390/ipl.c ? */
rc = subsys_create_file(&kernel_subsys, &rr);
if (rc) {
printk (KERN_ERR "phyp-dump: unable to create sysfs file (%d)\n", rc);
- release_all();
- return 0;
+ goto release_mem;
}
+ /* ToDo: re-register the dump area, for next time. */
+
+ return 0;
+
+release_mem:
+ /* release everything except the top 256 MB scratch area */
+ start_pfn = PFN_DOWN(phyp_dump_info->init_reserve_start);
+ nr_pages = PFN_DOWN(free_area_length);
+ release_memory_range(start_pfn, nr_pages);
+
return 0;
}
^ permalink raw reply
* [PATCH/RFC 6/6]: phyp dump: debugging print routines.
From: Linas Vepstas @ 2007-11-21 22:45 UTC (permalink / raw)
To: linuxppc-dev; +Cc: mahuja, lkessler, strosake
In-Reply-To: <20071121223639.GB4374@austin.ibm.com>
Provide some basic debugging support.
Signed-off-by: Manish Ahuja <mahuja@us.ibm.com>
Signed-off-by: Linas Vepsts <linas@austin.ibm.com>
-----
arch/powerpc/platforms/pseries/phyp_dump.c | 51 +++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
Index: linux-2.6.24-rc3-git1/arch/powerpc/platforms/pseries/phyp_dump.c
===================================================================
--- linux-2.6.24-rc3-git1.orig/arch/powerpc/platforms/pseries/phyp_dump.c 2007-11-21 16:12:21.000000000 -0600
+++ linux-2.6.24-rc3-git1/arch/powerpc/platforms/pseries/phyp_dump.c 2007-11-21 16:12:46.000000000 -0600
@@ -139,6 +139,51 @@ static unsigned long init_dump_header(st
return addr_offset;
}
+#ifdef DEBUG
+static void print_dump_header(const struct phyp_dump_header *ph)
+{
+ printk(KERN_INFO "dump header:\n");
+ /* setup some ph->sections required */
+ printk(KERN_INFO "version = %d\n", ph->version);
+ printk(KERN_INFO "Sections = %d\n", ph->num_of_sections);
+ printk(KERN_INFO "Status = 0x%x\n", ph->status);
+
+ /* No ph->disk, so all should be set to 0 */
+ printk(KERN_INFO "Offset to first section 0x%x\n", ph->first_offset_section);
+ printk(KERN_INFO "dump disk sections should be zero\n");
+ printk(KERN_INFO "dump disk section = %d\n",ph->dump_disk_section);
+ printk(KERN_INFO "block num = %ld\n",ph->block_num_dd);
+ printk(KERN_INFO "number of blocks = %ld\n",ph->num_of_blocks_dd);
+ printk(KERN_INFO "dump disk offset = %d\n",ph->offset_dd);
+ printk(KERN_INFO "Max auto time= %d\n",ph->maxtime_to_auto);
+
+ /*set cpu state and hpte states as well scratch pad area */
+ printk(KERN_INFO " CPU AREA \n");
+ printk(KERN_INFO "cpu dump_flags =%d\n",ph->cpu_data.dump_flags);
+ printk(KERN_INFO "cpu source_type =%d\n",ph->cpu_data.source_type);
+ printk(KERN_INFO "cpu error_flags =%d\n",ph->cpu_data.error_flags);
+ printk(KERN_INFO "cpu source_address =%lx\n",ph->cpu_data.source_address);
+ printk(KERN_INFO "cpu source_length =%lx\n",ph->cpu_data.source_length);
+ printk(KERN_INFO "cpu length_copied =%lx\n",ph->cpu_data.length_copied);
+
+ printk(KERN_INFO " HPTE AREA \n");
+ printk(KERN_INFO "HPTE dump_flags =%d\n",ph->hpte_data.dump_flags);
+ printk(KERN_INFO "HPTE source_type =%d\n",ph->hpte_data.source_type);
+ printk(KERN_INFO "HPTE error_flags =%d\n",ph->hpte_data.error_flags);
+ printk(KERN_INFO "HPTE source_address =%lx\n",ph->hpte_data.source_address);
+ printk(KERN_INFO "HPTE source_length =%lx\n",ph->hpte_data.source_length);
+ printk(KERN_INFO "HPTE length_copied =%lx\n",ph->hpte_data.length_copied);
+
+ printk(KERN_INFO " SRSD AREA \n");
+ printk(KERN_INFO "SRSD dump_flags =%d\n",ph->kernel_data.dump_flags);
+ printk(KERN_INFO "SRSD source_type =%d\n",ph->kernel_data.source_type);
+ printk(KERN_INFO "SRSD error_flags =%d\n",ph->kernel_data.error_flags);
+ printk(KERN_INFO "SRSD source_address =%lx\n",ph->kernel_data.source_address);
+ printk(KERN_INFO "SRSD source_length =%lx\n",ph->kernel_data.source_length);
+ printk(KERN_INFO "SRSD length_copied =%lx\n",ph->kernel_data.length_copied);
+}
+#endif
+
static void register_dump_area(struct phyp_dump_header *ph, unsigned long addr)
{
int rc;
@@ -154,6 +199,9 @@ static void register_dump_area(struct ph
if (rc)
{
printk (KERN_ERR "phyp-dump: unexpected error (%d) on register\n", rc);
+#ifdef DEBUG
+ print_dump_header (ph);
+#endif
}
}
@@ -292,6 +340,9 @@ static int __init phyp_dump_setup(void)
register_dump_area (&phdr, dump_area_start);
goto release_mem;
}
+#ifdef DEBUG
+ print_dump_header (dump_header);
+#endif
/* Don't allow user to release the 256MB scratch area */
phyp_dump_info->init_reserve_size = free_area_length;
^ permalink raw reply
* Re: annoying prinkts during vmemmap initialization
From: Christoph Hellwig @ 2007-11-21 22:49 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linuxppc-dev, Christoph Hellwig
In-Reply-To: <20071122094145.e79e1084.sfr@canb.auug.org.au>
On Thu, Nov 22, 2007 at 09:41:45AM +1100, Stephen Rothwell wrote:
> > Any reason to keep this? And if yes can we please make it conditional
> > on some kind of vmemmap_debug boot option?
>
> These have been changed to pr_debug() in 2.6.24-rc3 kernel.
Ah, sorry for not checking. Looks like the spufs tree lags a little
behind.
^ permalink raw reply
* Re: 2.6.24-rc3-mm1- powerpc link failure
From: Stephen Rothwell @ 2007-11-21 22:52 UTC (permalink / raw)
To: Kamalesh Babulal; +Cc: linuxppc-dev, Andrew Morton, Balbir Singh, linux-kernel
In-Reply-To: <4743E706.6010504@linux.vnet.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 681 bytes --]
On Wed, 21 Nov 2007 13:36:30 +0530 Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> wrote:
>
> The kernel build fails on powerpc while linking,
Only for allyesconfig (or maybe some other config that builds a lot of
stuff in.
> AS .tmp_kallsyms3.o
> LD vmlinux.o
> ld: TOC section size exceeds 64k
> make: *** [vmlinux.o] Error 1
>
> The patch posted at http://lkml.org/lkml/2007/11/13/414, solves this
> failure.
However, that patch needs more testing especially to figure out what
performance effects it has. i.e. not for merging, yet.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply
* Re: [RFC/PATCH 12/14] powerpc: Add early udbg support for 40x processors
From: David Gibson @ 2007-11-21 22:58 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
In-Reply-To: <20071121061720.83D5ADEBE3@ozlabs.org>
On Wed, Nov 21, 2007 at 05:16:30PM +1100, Benjamin Herrenschmidt wrote:
> This adds some basic real mode based early udbg support for 40x
> in order to debug things more easily
Shouldn't we be able to share code with the Maple realmode udbg()?
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Re: [PATCH 12/14] powerpc: Add early udbg support for 40x processors
From: Grant Likely @ 2007-11-21 23:47 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
In-Reply-To: <20071121061555.55B06DDFA8@ozlabs.org>
On 11/20/07, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> This adds some basic real mode based early udbg support for 40x
> in order to debug things more easily
>
> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> --- linux-work.orig/arch/powerpc/platforms/Kconfig.cputype 2007-11-21 12:50:16.000000000 +1100
> +++ linux-work/arch/powerpc/platforms/Kconfig.cputype 2007-11-21 12:50:18.000000000 +1100
> @@ -43,6 +43,7 @@ config 40x
> bool "AMCC 40x"
> select PPC_DCR_NATIVE
> select WANT_DEVICE_TREE
> + select PPC_UDBG_16550
Unfortunately, this isn't always true. The Xilinx Virtex parts us
config 40x, but not all FPGA bitstreams have a 16550 serial port.
Sometimes it's a uartlite instead.
Cheers,
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195
^ permalink raw reply
* Re: [PATCH 12/14] powerpc: Add early udbg support for 40x processors
From: Benjamin Herrenschmidt @ 2007-11-22 0:00 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev
In-Reply-To: <fa686aa40711211547nf9d58c4t1bc7a512c699cb02@mail.gmail.com>
On Wed, 2007-11-21 at 16:47 -0700, Grant Likely wrote:
> On 11/20/07, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> > This adds some basic real mode based early udbg support for 40x
> > in order to debug things more easily
> >
> > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > ---
> > --- linux-work.orig/arch/powerpc/platforms/Kconfig.cputype 2007-11-21 12:50:16.000000000 +1100
> > +++ linux-work/arch/powerpc/platforms/Kconfig.cputype 2007-11-21 12:50:18.000000000 +1100
> > @@ -43,6 +43,7 @@ config 40x
> > bool "AMCC 40x"
> > select PPC_DCR_NATIVE
> > select WANT_DEVICE_TREE
> > + select PPC_UDBG_16550
>
> Unfortunately, this isn't always true. The Xilinx Virtex parts us
> config 40x, but not all FPGA bitstreams have a 16550 serial port.
> Sometimes it's a uartlite instead.
What does uartlite looks like ?
Ben.
^ permalink raw reply
* Re: [RFC/PATCH 12/14] powerpc: Add early udbg support for 40x processors
From: Benjamin Herrenschmidt @ 2007-11-22 0:00 UTC (permalink / raw)
To: David Gibson; +Cc: linuxppc-dev
In-Reply-To: <20071121225838.GC19445@localhost.localdomain>
On Thu, 2007-11-22 at 09:58 +1100, David Gibson wrote:
> On Wed, Nov 21, 2007 at 05:16:30PM +1100, Benjamin Herrenschmidt wrote:
> > This adds some basic real mode based early udbg support for 40x
> > in order to debug things more easily
>
> Shouldn't we be able to share code with the Maple realmode udbg()?
Do you really care ?
Ben.
^ permalink raw reply
* Re: [PATCH 12/14] powerpc: Add early udbg support for 40x processors
From: Grant Likely @ 2007-11-22 0:20 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev
In-Reply-To: <1195689601.6970.115.camel@pasglop>
On 11/21/07, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
> On Wed, 2007-11-21 at 16:47 -0700, Grant Likely wrote:
> > On 11/20/07, Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> > > This adds some basic real mode based early udbg support for 40x
> > > in order to debug things more easily
> > >
> > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> > > ---
> > > --- linux-work.orig/arch/powerpc/platforms/Kconfig.cputype 2007-11-21 12:50:16.000000000 +1100
> > > +++ linux-work/arch/powerpc/platforms/Kconfig.cputype 2007-11-21 12:50:18.000000000 +1100
> > > @@ -43,6 +43,7 @@ config 40x
> > > bool "AMCC 40x"
> > > select PPC_DCR_NATIVE
> > > select WANT_DEVICE_TREE
> > > + select PPC_UDBG_16550
> >
> > Unfortunately, this isn't always true. The Xilinx Virtex parts us
> > config 40x, but not all FPGA bitstreams have a 16550 serial port.
> > Sometimes it's a uartlite instead.
>
> What does uartlite looks like ?
fixed speed
4 registers: rx, tx, status & control
rx & tx are... well... rx and tx registers
status has a number of bits reporting fifos full/empty etc.
control has three bits; reset tx, reset rx and interrupt enable.
See the top of drivers/serial/uartlite.c
Very simple stuff; but definitely not 16550.
g.
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195
^ permalink raw reply
* Re: [RFC/PATCH 12/14] powerpc: Add early udbg support for 40x processors
From: David Gibson @ 2007-11-22 0:22 UTC (permalink / raw)
To: Benjamin Herrenschmidt; +Cc: linuxppc-dev
In-Reply-To: <1195689615.6970.117.camel@pasglop>
On Thu, Nov 22, 2007 at 11:00:15AM +1100, Benjamin Herrenschmidt wrote:
>
> On Thu, 2007-11-22 at 09:58 +1100, David Gibson wrote:
> > On Wed, Nov 21, 2007 at 05:16:30PM +1100, Benjamin Herrenschmidt wrote:
> > > This adds some basic real mode based early udbg support for 40x
> > > in order to debug things more easily
> >
> > Shouldn't we be able to share code with the Maple realmode udbg()?
>
> Do you really care ?
Not very much, no.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* dtc: Merge refs and labels into single "markers" list
From: David Gibson @ 2007-11-22 0:37 UTC (permalink / raw)
To: Jon Loeliger; +Cc: linuxppc-dev
Currently, every 'data' object, used to represent property values, has
two lists of fixup structures - one for labels and one for references.
Sometimes we want to look at them separately, but other times we need
to consider both types of fixup.
I'm planning to implement string references, where a full path rather
than a phandle is substituted into a property value. Adding yet
another list of fixups for that would start to get messy. So, this
patch merges the "refs" and "labels" lists into a single list of
"markers", each of which has a type field indicating if it represents
a label or a phandle reference. String references or any other new
type of in-data marker will then just need a new type value - merging
data blocks and other common manipulations will just work.
While I was at it I made some cleanups to the handling of fixups which
simplify things further.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
Applies after my patch with the new checking/fixup infrastructure.
checks.c | 22 +++++-------
data.c | 101 ++++++++++++++++-------------------------------------------
dtc-parser.y | 11 +++---
dtc.h | 24 +++++++++-----
flattree.c | 11 +++---
treesource.c | 62 ++++++++++++++++++------------------
6 files changed, 98 insertions(+), 133 deletions(-)
Index: dtc/checks.c
===================================================================
--- dtc.orig/checks.c 2007-11-22 10:04:46.000000000 +1100
+++ dtc/checks.c 2007-11-22 10:30:40.000000000 +1100
@@ -224,33 +224,29 @@
static void fixup_references(struct check *c, struct node *dt,
struct node *node, struct property *prop)
{
- struct fixup *f = prop->val.refs;
+ struct marker *m = prop->val.markers;
struct node *refnode;
cell_t phandle;
- while (f) {
- if (f->ref[0] == '/') {
+ for_each_marker_of_type(m, REF_PHANDLE) {
+ if (m->ref[0] == '/') {
/* Reference to full path */
- refnode = get_node_by_path(dt, f->ref);
+ refnode = get_node_by_path(dt, m->ref);
if (! refnode)
FAIL(c, "Reference to non-existent node \"%s\"\n",
- f->ref);
+ m->ref);
} else {
- refnode = get_node_by_label(dt, f->ref);
+ refnode = get_node_by_label(dt, m->ref);
if (! refnode)
FAIL(c, "Reference to non-existent node label \"%s\"\n",
- f->ref);
+ m->ref);
}
phandle = get_node_phandle(dt, refnode);
- assert(f->offset + sizeof(cell_t) <= prop->val.len);
+ assert(m->offset + sizeof(cell_t) <= prop->val.len);
- *((cell_t *)(prop->val.val + f->offset)) = cpu_to_be32(phandle);
-
- prop->val.refs = f->next;
- fixup_free(f);
- f = prop->val.refs;
+ *((cell_t *)(prop->val.val + m->offset)) = cpu_to_be32(phandle);
}
}
CHECK(references, NULL, NULL, fixup_references, NULL, ERROR,
Index: dtc/data.c
===================================================================
--- dtc.orig/data.c 2007-11-21 17:55:50.000000000 +1100
+++ dtc/data.c 2007-11-22 10:51:09.000000000 +1100
@@ -20,28 +20,16 @@
#include "dtc.h"
-void fixup_free(struct fixup *f)
-{
- free(f->ref);
- free(f);
-}
-
void data_free(struct data d)
{
- struct fixup *f, *nf;
+ struct marker *m, *nm;
- f = d.refs;
- while (f) {
- nf = f->next;
- fixup_free(f);
- f = nf;
- }
-
- f = d.labels;
- while (f) {
- nf = f->next;
- fixup_free(f);
- f = nf;
+ m = d.markers;
+ while (m) {
+ nm = m->next;
+ free(m->ref);
+ free(m);
+ m = nm;
}
assert(!d.val || d.asize);
@@ -214,37 +202,29 @@
return d;
}
-void fixup_merge(struct fixup **fd, struct fixup **fd2, int d1_len)
+struct data data_append_markers(struct data d, struct marker *m)
{
- struct fixup **ff;
- struct fixup *f, *f2;
-
- /* Extract d2's fixups */
- f2 = *fd2;
- *fd2 = NULL;
-
- /* Tack them onto d's list of fixups */
- ff = fd;
- while (*ff)
- ff = &((*ff)->next);
- *ff = f2;
-
- /* And correct them for their new position */
- for (f = f2; f; f = f->next)
- f->offset += d1_len;
-
+ struct marker **mp = &d.markers;
+ /* Find the end of the markerlist */
+ while (*mp)
+ mp = &((*mp)->next);
+ *mp = m;
+ return d;
}
struct data data_merge(struct data d1, struct data d2)
{
struct data d;
+ struct marker *m2 = d2.markers;
- d = data_append_data(d1, d2.val, d2.len);
+ d = data_append_markers(data_append_data(d1, d2.val, d2.len), m2);
- fixup_merge(&d.refs, &d2.refs, d1.len);
- fixup_merge(&d.labels, &d2.labels, d1.len);
+ /* Adjust for the length of d1 */
+ for_each_marker(m2)
+ m2->offset += d1.len;
+ d2.markers = NULL; /* So data_free() doesn't clobber them */
data_free(d2);
return d;
@@ -294,42 +274,17 @@
return data_append_zeroes(d, newlen - d.len);
}
-struct data data_add_fixup(struct data d, char *ref)
+struct data data_add_marker(struct data d, enum markertype type, char *ref)
{
- struct fixup *f;
- struct data nd;
+ struct marker *m;
- f = xmalloc(sizeof(*f));
- f->offset = d.len;
- f->ref = ref;
- f->next = d.refs;
+ m = xmalloc(sizeof(*m));
+ m->offset = d.len;
+ m->type = type;
+ m->ref = ref;
+ m->next = NULL;
- nd = d;
- nd.refs = f;
-
- return nd;
-}
-
-struct data data_add_label(struct data d, char *label)
-{
- struct fixup *f, **p;
- struct data nd;
-
- f = xmalloc(sizeof(*f));
- f->offset = d.len;
- f->ref = label;
-
- nd = d;
- p = &nd.labels;
-
- /* adding to end keeps them sorted */
- while (*p)
- p = &((*p)->next);
-
- f->next = *p;
- *p = f;
-
- return nd;
+ return data_append_markers(d, m);
}
int data_is_one_string(struct data d)
Index: dtc/dtc-parser.y
===================================================================
--- dtc.orig/dtc-parser.y 2007-11-21 17:55:50.000000000 +1100
+++ dtc/dtc-parser.y 2007-11-22 10:24:17.000000000 +1100
@@ -194,7 +194,7 @@
}
| propdata DT_LABEL
{
- $$ = data_add_label($1, $2);
+ $$ = data_add_marker($1, LABEL, $2);
}
;
@@ -209,7 +209,7 @@
}
| propdataprefix DT_LABEL
{
- $$ = data_add_label($1, $2);
+ $$ = data_add_marker($1, LABEL, $2);
}
;
@@ -224,11 +224,12 @@
}
| celllist DT_REF
{
- $$ = data_append_cell(data_add_fixup($1, $2), -1);
+ $$ = data_append_cell(data_add_marker($1, REF_PHANDLE,
+ $2), -1);
}
| celllist DT_LABEL
{
- $$ = data_add_label($1, $2);
+ $$ = data_add_marker($1, LABEL, $2);
}
;
@@ -262,7 +263,7 @@
}
| bytestring DT_LABEL
{
- $$ = data_add_label($1, $2);
+ $$ = data_add_marker($1, LABEL, $2);
}
;
Index: dtc/dtc.h
===================================================================
--- dtc.orig/dtc.h 2007-11-22 10:04:46.000000000 +1100
+++ dtc/dtc.h 2007-11-22 10:52:01.000000000 +1100
@@ -101,23 +101,34 @@
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
/* Data blobs */
-struct fixup {
+enum markertype {
+ REF_PHANDLE,
+ LABEL,
+};
+
+struct marker {
+ enum markertype type;
int offset;
char *ref;
- struct fixup *next;
+ struct marker *next;
};
struct data {
int len;
char *val;
int asize;
- struct fixup *refs;
- struct fixup *labels;
+ struct marker *markers;
};
+
#define empty_data ((struct data){ /* all .members = 0 or NULL */ })
-void fixup_free(struct fixup *f);
+#define for_each_marker(m) \
+ for (; (m); (m) = (m)->next)
+#define for_each_marker_of_type(m, t) \
+ for_each_marker(m) \
+ if ((m)->type == (t))
+
void data_free(struct data d);
struct data data_grow_for(struct data d, int xlen);
@@ -135,8 +146,7 @@
struct data data_append_zeroes(struct data d, int len);
struct data data_append_align(struct data d, int align);
-struct data data_add_fixup(struct data d, char *ref);
-struct data data_add_label(struct data d, char *label);
+struct data data_add_marker(struct data d, enum markertype type, char *ref);
int data_is_one_string(struct data d);
Index: dtc/flattree.c
===================================================================
--- dtc.orig/flattree.c 2007-11-21 17:55:50.000000000 +1100
+++ dtc/flattree.c 2007-11-22 10:04:48.000000000 +1100
@@ -162,12 +162,13 @@
{
FILE *f = e;
int off = 0;
- struct fixup *l;
+ struct marker *m;
- l = d.labels;
- while (l) {
- emit_offset_label(f, l->ref, l->offset);
- l = l->next;
+ m = d.markers;
+ while (m) {
+ if (m->type == LABEL)
+ emit_offset_label(f, m->ref, m->offset);
+ m = m->next;
}
while ((d.len - off) >= sizeof(u32)) {
Index: dtc/treesource.c
===================================================================
--- dtc.orig/treesource.c 2007-11-21 17:55:50.000000000 +1100
+++ dtc/treesource.c 2007-11-22 10:52:59.000000000 +1100
@@ -61,7 +61,7 @@
char *str = val.val;
int i;
int newchunk = 1;
- struct fixup *l = val.labels;
+ struct marker *m = val.markers;
assert(str[val.len-1] == '\0');
@@ -69,10 +69,12 @@
char c = str[i];
if (newchunk) {
- while (l && (l->offset <= i)) {
- assert(l->offset == i);
- fprintf(f, "%s: ", l->ref);
- l = l->next;
+ while (m && (m->offset <= i)) {
+ if (m->type == LABEL) {
+ assert(m->offset == i);
+ fprintf(f, "%s: ", m->ref);
+ }
+ m = m->next;
}
fprintf(f, "\"");
newchunk = 0;
@@ -120,10 +122,9 @@
fprintf(f, "\"");
/* Wrap up any labels at the end of the value */
- while (l) {
- assert (l->offset == val.len);
- fprintf(f, " %s:", l->ref);
- l = l->next;
+ for_each_marker_of_type(m, LABEL) {
+ assert (m->offset == val.len);
+ fprintf(f, " %s:", m->ref);
}
}
@@ -131,14 +132,16 @@
{
void *propend = val.val + val.len;
cell_t *cp = (cell_t *)val.val;
- struct fixup *l = val.labels;
+ struct marker *m = val.markers;
fprintf(f, "<");
for (;;) {
- while (l && (l->offset <= ((char *)cp - val.val))) {
- assert(l->offset == ((char *)cp - val.val));
- fprintf(f, "%s: ", l->ref);
- l = l->next;
+ while (m && (m->offset <= ((char *)cp - val.val))) {
+ if (m->type == LABEL) {
+ assert(m->offset == ((char *)cp - val.val));
+ fprintf(f, "%s: ", m->ref);
+ }
+ m = m->next;
}
fprintf(f, "0x%x", be32_to_cpu(*cp++));
@@ -148,10 +151,9 @@
}
/* Wrap up any labels at the end of the value */
- while (l) {
- assert (l->offset == val.len);
- fprintf(f, " %s:", l->ref);
- l = l->next;
+ for_each_marker_of_type(m, LABEL) {
+ assert (m->offset == val.len);
+ fprintf(f, " %s:", m->ref);
}
fprintf(f, ">");
}
@@ -160,13 +162,14 @@
{
void *propend = val.val + val.len;
char *bp = val.val;
- struct fixup *l = val.labels;
+ struct marker *m = val.markers;
fprintf(f, "[");
for (;;) {
- while (l && (l->offset == (bp-val.val))) {
- fprintf(f, "%s: ", l->ref);
- l = l->next;
+ while (m && (m->offset == (bp-val.val))) {
+ if (m->type == LABEL)
+ fprintf(f, "%s: ", m->ref);
+ m = m->next;
}
fprintf(f, "%02hhx", *bp++);
@@ -176,10 +179,9 @@
}
/* Wrap up any labels at the end of the value */
- while (l) {
- assert (l->offset == val.len);
- fprintf(f, " %s:", l->ref);
- l = l->next;
+ for_each_marker_of_type(m, LABEL) {
+ assert (m->offset == val.len);
+ fprintf(f, " %s:", m->ref);
}
fprintf(f, "]");
}
@@ -188,7 +190,7 @@
{
int len = prop->val.len;
char *p = prop->val.val;
- struct fixup *l;
+ struct marker *m = prop->val.markers;
int nnotstring = 0, nnul = 0;
int nnotstringlbl = 0, nnotcelllbl = 0;
int i;
@@ -205,10 +207,10 @@
nnul++;
}
- for (l = prop->val.labels; l; l = l->next) {
- if ((l->offset > 0) && (prop->val.val[l->offset - 1] != '\0'))
+ for_each_marker_of_type(m, LABEL) {
+ if ((m->offset > 0) && (prop->val.val[m->offset - 1] != '\0'))
nnotstringlbl++;
- if ((l->offset % sizeof(cell_t)) != 0)
+ if ((m->offset % sizeof(cell_t)) != 0)
nnotcelllbl++;
}
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Re: [PATCH 3/3] [POWERPC] Add docs for Freescale DMA & DMA channel device tree nodes
From: Timur Tabi @ 2007-11-22 0:48 UTC (permalink / raw)
To: Kumar Gala; +Cc: linuxppc-dev
In-Reply-To: <E9CED991-4E10-44AE-A446-B6CB151FB9EE@kernel.crashing.org>
Kumar Gala wrote:
>> Shouldn't we put some text somewhere that we're calling it the Elo
>> controller even though that word isn't used in the reference manual?
>
> we don't really have a place to put that. its effectively documented
> right here.
I still think we need something. Otherwise, people are going to be confused.
I know I would. I'd be searching the RM for the string "ELO" and wonder why
it wasn't there.
>>> + Example:
>>> + dma@21000 {
>>
>> Shouldn't this be dma@21300?
>
> its an example that has not basis is reality :)
Eh?
>> The DMA controller and the DMA channels need a "device-id", so that
>> they can be identified by number. Some peripherals, like the SSI, can
>> only use the controller and channel number. This is what I have in my
>> 8610 DTS:
>
> Why not use reg for this? I don't see any reason to add another "unique
> id" when there is already one.
There isn't one. Why should the driver assume that reg/80 == channel #?
Besides, I still can't differentiate between DMA controller 0 and DMA
controller 1 that way. No, we need a device-id.
--
Timur Tabi
Linux Kernel Developer @ Freescale
^ permalink raw reply
* Re: [PATCH 3/3] [POWERPC] Add docs for Freescale DMA & DMA channel device tree nodes
From: Timur Tabi @ 2007-11-22 0:49 UTC (permalink / raw)
To: Scott Wood; +Cc: linuxppc-dev
In-Reply-To: <20071121173540.GC4413@loki.buserror.net>
Scott Wood wrote:
> I don't see any justification for having such a property in the parent node,
> though.
The SSI needs to know which DMA controller is #0 and which one is #1.
I literally program the SSI and the GUTS registers with the DMA controller and
channels numbers. I need to know which one is which!
--
Timur Tabi
Linux Kernel Developer @ Freescale
^ permalink raw reply
* Re: [PATCH 3/3] [POWERPC] Add docs for Freescale DMA & DMA channel device tree nodes
From: Timur Tabi @ 2007-11-22 0:51 UTC (permalink / raw)
To: Scott Wood, Kumar Gala, linuxppc-dev
In-Reply-To: <20071121222822.GB19445@localhost.localdomain>
David Gibson wrote:
> Indeed, indexing or writing into shared registers is exactly what
> cell-index is for.
I don't care whether it's cell-index or device-id, but I need to know which
DMA controller is #0 and which one is #1, and I need to know which channel is
#0, which one is #1, etc. Dividing register offsets by 0x80 is not
acceptable, because what if we have an elo-plus-plus that has 0x100 bytes per
register, where the additional 0x20 bytes are for enhanced features?
--
Timur Tabi
Linux Kernel Developer @ Freescale
^ permalink raw reply
* Re: [PATCH 12/14] powerpc: Add early udbg support for 40x processors
From: Benjamin Herrenschmidt @ 2007-11-22 0:52 UTC (permalink / raw)
To: Grant Likely; +Cc: linuxppc-dev
In-Reply-To: <fa686aa40711211620q4450f3c2g2450157e37eb7c9@mail.gmail.com>
> fixed speed
> 4 registers: rx, tx, status & control
>
> rx & tx are... well... rx and tx registers
> status has a number of bits reporting fifos full/empty etc.
> control has three bits; reset tx, reset rx and interrupt enable.
>
> See the top of drivers/serial/uartlite.c
>
> Very simple stuff; but definitely not 16550.
Yuck, they could have made it look like 16550 at least...
Oh well, that's allright, select'ing it wont break anything anyway.
Ultimately, we can if we want have a list of all support 40x (and 4xx)
variants and select what we want in a given kernel build. Those variants
would themselves select the individual bits they care about...
Ben.
^ permalink raw reply
* dtc: Flexible tree checking infrastructure (v2)
From: David Gibson @ 2007-11-22 3:38 UTC (permalink / raw)
To: Jon Loeliger, linuxppc-dev
In-Reply-To: <20071121053851.GA17801@localhost.localdomain>
dtc: Flexible tree checking infrastructure
Here, at last, is a substantial start on revising dtc's infrastructure
for checking the tree; this is the rework I've been saying was
necessary practically since dtc was first release.
In the new model, we have a table of "check" structures, each with a
name, references to checking functions, and status variables. Each
check can (in principle) be individually switched off or on (as either
a warning or error). Checks have a list of prerequisites, so if
checks need to rely on results from earlier checks to make sense (or
even to avoid crashing) they just need to list the relevant other
checks there.
For now, only the "structural" checks and the fixups for phandle
references are converted to the new mechanism. The rather more
involved semantic checks (which is where this new mechanism will
really be useful) will have to be converted in future patches.
At present, there's no user interface for turning on/off the checks -
the -f option now forces output even if "error" level checks fail.
Again, future patches will be needed to add the fine-grained control,
but that should be quite straightforward with the infrastructure
implemented here.
Also adds a testcase for the handling of bad references, which catches
a bug encountered while developing this patch.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
Oops, the original version had a bug: processing a bad reference would
cause dtc to SEGV. Plus the sense was backwards when checking the
value of 'quiet' to suppress errors/warnings. Fixed here and some
other small changes:
- cleanups to reference processing code
- cleanups to error/warning message printing code
- added a tracing mechanism (compile time option) useful for
debugging problems with the checks
Index: dtc/checks.c
===================================================================
--- dtc.orig/checks.c 2007-11-22 13:03:05.000000000 +1100
+++ dtc/checks.c 2007-11-22 14:02:26.000000000 +1100
@@ -20,104 +20,293 @@
#include "dtc.h"
-/*
- * Structural check functions
- */
+#ifdef TRACE_CHECKS
+#define TRACE(c, ...) \
+ do { \
+ fprintf(stderr, "=== %s: ", (c)->name); \
+ fprintf(stderr, __VA_ARGS__); \
+ fprintf(stderr, "\n"); \
+ } while (0)
+#else
+#define TRACE(c, fmt, ...) do { } while (0)
+#endif
+
+enum checklevel {
+ IGNORE = 0,
+ WARN = 1,
+ ERROR = 2,
+};
-#define ERRMSG(...) if (quiet < 2) fprintf(stderr, "ERROR: " __VA_ARGS__)
-#define WARNMSG(...) if (quiet < 1) fprintf(stderr, "Warning: " __VA_ARGS__)
+enum checkstatus {
+ UNCHECKED = 0,
+ PREREQ,
+ PASSED,
+ FAILED,
+};
-#define DO_ERR(...) do {ERRMSG(__VA_ARGS__); ok = 0; } while (0)
+struct check;
-static int check_names(struct node *tree)
-{
- struct node *child, *child2;
- struct property *prop, *prop2;
- int len = strlen(tree->name);
- int ok = 1;
+typedef void (*tree_check_fn)(struct check *c, struct node *dt);
+typedef void (*node_check_fn)(struct check *c, struct node *dt, struct node *node);
+typedef void (*prop_check_fn)(struct check *c, struct node *dt,
+ struct node *node, struct property *prop);
+
+struct check {
+ const char *name;
+ tree_check_fn tree_fn;
+ node_check_fn node_fn;
+ prop_check_fn prop_fn;
+ void *data;
+ enum checklevel level;
+ enum checkstatus status;
+ int inprogress;
+ int num_prereqs;
+ struct check **prereq;
+};
- if (len == 0 && tree->parent)
- DO_ERR("Empty, non-root nodename at %s\n", tree->fullpath);
+#define CHECK(nm, tfn, nfn, pfn, d, lvl, ...) \
+ static struct check *nm##_prereqs[] = { __VA_ARGS__ }; \
+ static struct check nm = { \
+ .name = #nm, \
+ .tree_fn = (tfn), \
+ .node_fn = (nfn), \
+ .prop_fn = (pfn), \
+ .data = (d), \
+ .level = (lvl), \
+ .status = UNCHECKED, \
+ .num_prereqs = ARRAY_SIZE(nm##_prereqs), \
+ .prereq = nm##_prereqs, \
+ };
+
+#define TREE_CHECK(nm, d, lvl, ...) \
+ CHECK(nm, check_##nm, NULL, NULL, d, lvl, __VA_ARGS__)
+#define NODE_CHECK(nm, d, lvl, ...) \
+ CHECK(nm, NULL, check_##nm, NULL, d, lvl, __VA_ARGS__)
+#define PROP_CHECK(nm, d, lvl, ...) \
+ CHECK(nm, NULL, NULL, check_##nm, d, lvl, __VA_ARGS__)
+#define BATCH_CHECK(nm, lvl, ...) \
+ CHECK(nm, NULL, NULL, NULL, NULL, lvl, __VA_ARGS__)
+
+static inline void check_msg(struct check *c, const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+
+ if ((c->level < WARN) || (c->level <= quiet))
+ return; /* Suppress message */
+
+ fprintf(stderr, "%s (%s): ",
+ (c->level == ERROR) ? "ERROR" : "Warning", c->name);
+ vfprintf(stderr, fmt, ap);
+ fprintf(stderr, "\n");
+}
- if (len > MAX_NODENAME_LEN)
- WARNMSG("Overlength nodename at %s\n", tree->fullpath);
+#define FAIL(c, fmt, ...) \
+ do { \
+ TRACE((c), "\t\tFAILED at %s:%d", __FILE__, __LINE__); \
+ (c)->status = FAILED; \
+ check_msg((c), fmt, __VA_ARGS__); \
+ } while (0)
- for_each_property(tree, prop) {
- /* check for duplicates */
- /* FIXME: do this more efficiently */
- for (prop2 = prop->next; prop2; prop2 = prop2->next) {
- if (streq(prop->name, prop2->name)) {
- DO_ERR("Duplicate propertyname %s in node %s\n",
- prop->name, tree->fullpath);
- }
+static void check_nodes_props(struct check *c, struct node *dt, struct node *node)
+{
+ struct node *child;
+ struct property *prop;
+
+ TRACE(c, "%s", node->fullpath);
+ if (c->node_fn)
+ c->node_fn(c, dt, node);
+
+ if (c->prop_fn)
+ for_each_property(node, prop) {
+ TRACE(c, "%s\t'%s'", node->fullpath, prop->name);
+ c->prop_fn(c, dt, node, prop);
}
- /* check name length */
- if (strlen(prop->name) > MAX_PROPNAME_LEN)
- WARNMSG("Property name %s is too long in %s\n",
- prop->name, tree->fullpath);
+ for_each_child(node, child)
+ check_nodes_props(c, dt, child);
+}
+
+static int run_check(struct check *c, struct node *dt)
+{
+ int error = 0;
+ int i;
+
+ assert(!c->inprogress);
+
+ if (c->status != UNCHECKED)
+ goto out;
+
+ c->inprogress = 1;
+
+ for (i = 0; i < c->num_prereqs; i++) {
+ struct check *prq = c->prereq[i];
+ error |= run_check(prq, dt);
+ if (prq->status != PASSED) {
+ c->status = PREREQ;
+ check_msg(c, "Failed prerequisite '%s'",
+ c->prereq[i]->name);
+ }
}
- for_each_child(tree, child) {
- /* Check for duplicates */
+ if (c->status != UNCHECKED)
+ goto out;
+
+ if (c->node_fn || c->prop_fn)
+ check_nodes_props(c, dt, dt);
+
+ if (c->tree_fn)
+ c->tree_fn(c, dt);
+ if (c->status == UNCHECKED)
+ c->status = PASSED;
+
+ TRACE(c, "\tCompleted, status %d", c->status);
+
+out:
+ c->inprogress = 0;
+ if ((c->status != PASSED) && (c->level == ERROR))
+ error = 1;
+ return error;
+}
+
+/*
+ * Structural check functions
+ */
+
+static void check_duplicate_node_names(struct check *c, struct node *dt,
+ struct node *node)
+{
+ struct node *child, *child2;
+ for_each_child(node, child)
for (child2 = child->next_sibling;
child2;
- child2 = child2->next_sibling) {
+ child2 = child2->next_sibling)
if (streq(child->name, child2->name))
- DO_ERR("Duplicate node name %s\n",
- child->fullpath);
- }
- if (! check_names(child))
- ok = 0;
- }
+ FAIL(c, "Duplicate node name %s",
+ child->fullpath);
+}
+NODE_CHECK(duplicate_node_names, NULL, ERROR);
- return ok;
+static void check_duplicate_property_names(struct check *c, struct node *dt,
+ struct node *node)
+{
+ struct property *prop, *prop2;
+
+ for_each_property(node, prop)
+ for (prop2 = prop->next; prop2; prop2 = prop2->next)
+ if (streq(prop->name, prop2->name))
+ FAIL(c, "Duplicate property name %s in %s",
+ prop->name, node->fullpath);
}
+NODE_CHECK(duplicate_property_names, NULL, ERROR);
-static int check_phandles(struct node *root, struct node *node)
+static void check_explicit_phandles(struct check *c, struct node *root,
+ struct node *node)
{
struct property *prop;
- struct node *child, *other;
+ struct node *other;
cell_t phandle;
- int ok = 1;
prop = get_property(node, "linux,phandle");
- if (prop) {
- phandle = propval_cell(prop);
- if ((phandle == 0) || (phandle == -1)) {
- DO_ERR("%s has invalid linux,phandle %x\n",
- node->fullpath, phandle);
- } else {
- other = get_node_by_phandle(root, phandle);
- if (other)
- DO_ERR("%s has duplicated phandle %x (seen before at %s)\n",
- node->fullpath, phandle, other->fullpath);
+ if (! prop)
+ return; /* No phandle, that's fine */
- node->phandle = phandle;
- }
+ if (prop->val.len != sizeof(cell_t)) {
+ FAIL(c, "%s has bad length (%d) linux,phandle property",
+ node->fullpath, prop->val.len);
+ return;
}
- for_each_child(node, child)
- ok = ok && check_phandles(root, child);
+ phandle = propval_cell(prop);
+ if ((phandle == 0) || (phandle == -1)) {
+ FAIL(c, "%s has invalid linux,phandle value 0x%x",
+ node->fullpath, phandle);
+ return;
+ }
- return ok;
+ other = get_node_by_phandle(root, phandle);
+ if (other) {
+ FAIL(c, "%s has duplicated phandle 0x%x (seen before at %s)",
+ node->fullpath, phandle, other->fullpath);
+ return;
+ }
+
+ node->phandle = phandle;
}
+NODE_CHECK(explicit_phandles, NULL, ERROR);
+
+/*
+ * Reference fixup functions
+ */
-int check_structure(struct node *dt)
+static void fixup_phandle_references(struct check *c, struct node *dt,
+ struct node *node, struct property *prop)
{
- int ok = 1;
+ struct fixup *f = prop->val.refs;
+ struct node *refnode;
+ cell_t phandle;
+
+ while (f) {
+ assert(f->offset + sizeof(cell_t) <= prop->val.len);
+
+ refnode = get_node_by_ref(dt, f->ref);
+ if (! refnode) {
+ FAIL(c, "Reference to non-existent node or label \"%s\"\n",
+ f->ref);
+ } else {
+ phandle = get_node_phandle(dt, refnode);
+
+ *((cell_t *)(prop->val.val + f->offset)) = cpu_to_be32(phandle);
+ }
+
+ prop->val.refs = f->next;
+ fixup_free(f);
+ f = prop->val.refs;
+ }
+}
+CHECK(phandle_references, NULL, NULL, fixup_phandle_references, NULL, ERROR,
+ &duplicate_node_names, &explicit_phandles);
+
+static struct check *check_table[] = {
+ &duplicate_node_names, &duplicate_property_names,
+ &explicit_phandles,
+ &phandle_references,
+};
- ok = ok && check_names(dt);
- ok = ok && check_phandles(dt, dt);
+void process_checks(int force, struct node *dt)
+{
+ int i;
+ int error = 0;
- return ok;
+ for (i = 0; i < ARRAY_SIZE(check_table); i++) {
+ struct check *c = check_table[i];
+
+ if (c->level != IGNORE)
+ error = error || run_check(c, dt);
+ }
+
+ if (error) {
+ if (!force) {
+ fprintf(stderr, "ERROR: Input tree has errors, aborting "
+ "(use -f to force output)\n");
+ exit(2);
+ } else if (quiet < 3) {
+ fprintf(stderr, "Warning: Input tree has errors, "
+ "output forced\n");
+ }
+ }
}
/*
* Semantic check functions
*/
+#define ERRMSG(...) if (quiet < 2) fprintf(stderr, "ERROR: " __VA_ARGS__)
+#define WARNMSG(...) if (quiet < 1) fprintf(stderr, "Warning: " __VA_ARGS__)
+
+#define DO_ERR(...) do {ERRMSG(__VA_ARGS__); ok = 0; } while (0)
+
static int must_be_one_cell(struct property *prop, struct node *node)
{
if (prop->val.len != sizeof(cell_t)) {
Index: dtc/dtc.c
===================================================================
--- dtc.orig/dtc.c 2007-11-22 13:03:05.000000000 +1100
+++ dtc/dtc.c 2007-11-22 13:03:21.000000000 +1100
@@ -193,17 +193,7 @@
if (! bi || ! bi->dt)
die("Couldn't read input tree\n");
- structure_ok = check_structure(bi->dt);
- if (!structure_ok) {
- if (!force) {
- fprintf(stderr, "ERROR: Input tree has structural errors, aborting (use -f to force output)\n");
- exit(2);
- } else if (quiet < 3) {
- fprintf(stderr, "Warning: Input tree has structural errors, output forced\n");
- }
- }
-
- fixup_references(bi->dt);
+ process_checks(force, bi->dt);
if (check) {
if (!structure_ok) {
Index: dtc/dtc.h
===================================================================
--- dtc.orig/dtc.h 2007-11-22 13:03:05.000000000 +1100
+++ dtc/dtc.h 2007-11-22 13:54:57.000000000 +1100
@@ -193,9 +193,11 @@
struct property *get_property(struct node *node, char *propname);
cell_t propval_cell(struct property *prop);
struct node *get_subnode(struct node *node, char *nodename);
+struct node *get_node_by_path(struct node *tree, char *path);
+struct node *get_node_by_label(struct node *tree, const char *label);
struct node *get_node_by_phandle(struct node *tree, cell_t phandle);
-
-void fixup_references(struct node *dt);
+struct node *get_node_by_ref(struct node *tree, char *ref);
+cell_t get_node_phandle(struct node *root, struct node *node);
/* Boot info (tree plus memreserve information */
@@ -224,7 +226,7 @@
/* Checks */
-int check_structure(struct node *dt);
+void process_checks(int force, struct node *dt);
int check_semantics(struct node *dt, int outversion, int boot_cpuid_phys);
/* Flattened trees */
Index: dtc/livetree.c
===================================================================
--- dtc.orig/livetree.c 2007-11-22 13:03:05.000000000 +1100
+++ dtc/livetree.c 2007-11-22 13:23:08.000000000 +1100
@@ -216,7 +216,7 @@
return NULL;
}
-static struct node *get_node_by_path(struct node *tree, char *path)
+struct node *get_node_by_path(struct node *tree, char *path)
{
char *p;
struct node *child;
@@ -239,7 +239,7 @@
return NULL;
}
-static struct node *get_node_by_label(struct node *tree, const char *label)
+struct node *get_node_by_label(struct node *tree, const char *label)
{
struct node *child, *node;
@@ -275,7 +275,15 @@
return NULL;
}
-static cell_t get_node_phandle(struct node *root, struct node *node)
+struct node *get_node_by_ref(struct node *tree, char *ref)
+{
+ if (ref[0] == '/')
+ return get_node_by_path(tree, ref);
+ else
+ return get_node_by_label(tree, ref);
+}
+
+cell_t get_node_phandle(struct node *root, struct node *node)
{
static cell_t phandle = 1; /* FIXME: ick, static local */
@@ -295,56 +303,3 @@
return node->phandle;
}
-
-/*
- * Reference fixup functions
- */
-
-static void apply_fixup(struct node *root, struct property *prop,
- struct fixup *f)
-{
- struct node *refnode;
- cell_t phandle;
-
- if (f->ref[0] == '/') {
- /* Reference to full path */
- refnode = get_node_by_path(root, f->ref);
- if (! refnode)
- die("Reference to non-existent node \"%s\"\n", f->ref);
- } else {
- refnode = get_node_by_label(root, f->ref);
- if (! refnode)
- die("Reference to non-existent node label \"%s\"\n", f->ref);
- }
-
- phandle = get_node_phandle(root, refnode);
-
- assert(f->offset + sizeof(cell_t) <= prop->val.len);
-
- *((cell_t *)(prop->val.val + f->offset)) = cpu_to_be32(phandle);
-}
-
-static void fixup_phandles(struct node *root, struct node *node)
-{
- struct property *prop;
- struct node *child;
-
- for_each_property(node, prop) {
- struct fixup *f = prop->val.refs;
-
- while (f) {
- apply_fixup(root, prop, f);
- prop->val.refs = f->next;
- fixup_free(f);
- f = prop->val.refs;
- }
- }
-
- for_each_child(node, child)
- fixup_phandles(root, child);
-}
-
-void fixup_references(struct node *dt)
-{
- fixup_phandles(dt, dt);
-}
Index: dtc/tests/nonexist-label-ref.dts
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ dtc/tests/nonexist-label-ref.dts 2007-11-22 13:03:45.000000000 +1100
@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/ {
+ ref = <&label>;
+ badref = <&nosuchlabel>;
+ label: node {
+ };
+};
Index: dtc/tests/nonexist-node-ref.dts
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ dtc/tests/nonexist-node-ref.dts 2007-11-22 13:03:45.000000000 +1100
@@ -0,0 +1,8 @@
+/dts-v1/;
+
+/ {
+ ref = < &/node >;
+ badref = < &/nosuchnode >;
+ label: node {
+ };
+};
Index: dtc/tests/run_tests.sh
===================================================================
--- dtc.orig/tests/run_tests.sh 2007-11-22 13:03:20.000000000 +1100
+++ dtc/tests/run_tests.sh 2007-11-22 13:54:56.000000000 +1100
@@ -158,6 +158,8 @@
run_test dtc-checkfails.sh -I dts -O dtb dup-phandle.dts
run_test dtc-checkfails.sh -I dts -O dtb zero-phandle.dts
run_test dtc-checkfails.sh -I dts -O dtb minusone-phandle.dts
+ run_test dtc-checkfails.sh -I dts -O dtb nonexist-node-ref.dts
+ run_test dtc-checkfails.sh -I dts -O dtb nonexist-label-ref.dts
}
while getopts "vt:m" ARG ; do
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* dtc: Merge refs and labels into single "markers" list (v2)
From: David Gibson @ 2007-11-22 3:39 UTC (permalink / raw)
To: Jon Loeliger, linuxppc-dev
In-Reply-To: <20071122003707.GF19445@localhost.localdomain>
Currently, every 'data' object, used to represent property values, has
two lists of fixup structures - one for labels and one for references.
Sometimes we want to look at them separately, but other times we need
to consider both types of fixup.
I'm planning to implement string references, where a full path rather
than a phandle is substituted into a property value. Adding yet
another list of fixups for that would start to get silly. So, this
patch merges the "refs" and "labels" lists into a single list of
"markers", each of which has a type field indicating if it represents
a label or a phandle reference. String references or any other new
type of in-data marker will then just need a new type value - merging
data blocks and other common manipulations will just work.
While I was at it I made some cleanups to the handling of fixups which
simplify things further.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
Updated to apply on top of the new version of the checking
infrastructure patch.
checks.c | 20 ++++-------
data.c | 101 ++++++++++++++++-------------------------------------------
dtc-parser.y | 11 +++---
dtc.h | 24 +++++++++-----
flattree.c | 11 +++---
treesource.c | 62 ++++++++++++++++++------------------
6 files changed, 97 insertions(+), 132 deletions(-)
Index: dtc/checks.c
===================================================================
--- dtc.orig/checks.c 2007-11-22 14:02:26.000000000 +1100
+++ dtc/checks.c 2007-11-22 14:38:39.000000000 +1100
@@ -243,26 +243,22 @@
static void fixup_phandle_references(struct check *c, struct node *dt,
struct node *node, struct property *prop)
{
- struct fixup *f = prop->val.refs;
+ struct marker *m = prop->val.markers;
struct node *refnode;
cell_t phandle;
- while (f) {
- assert(f->offset + sizeof(cell_t) <= prop->val.len);
+ for_each_marker_of_type(m, REF_PHANDLE) {
+ assert(m->offset + sizeof(cell_t) <= prop->val.len);
- refnode = get_node_by_ref(dt, f->ref);
+ refnode = get_node_by_ref(dt, m->ref);
if (! refnode) {
FAIL(c, "Reference to non-existent node or label \"%s\"\n",
- f->ref);
- } else {
- phandle = get_node_phandle(dt, refnode);
-
- *((cell_t *)(prop->val.val + f->offset)) = cpu_to_be32(phandle);
+ m->ref);
+ continue;
}
- prop->val.refs = f->next;
- fixup_free(f);
- f = prop->val.refs;
+ phandle = get_node_phandle(dt, refnode);
+ *((cell_t *)(prop->val.val + m->offset)) = cpu_to_be32(phandle);
}
}
CHECK(phandle_references, NULL, NULL, fixup_phandle_references, NULL, ERROR,
Index: dtc/data.c
===================================================================
--- dtc.orig/data.c 2007-11-22 13:54:57.000000000 +1100
+++ dtc/data.c 2007-11-22 14:38:39.000000000 +1100
@@ -20,28 +20,16 @@
#include "dtc.h"
-void fixup_free(struct fixup *f)
-{
- free(f->ref);
- free(f);
-}
-
void data_free(struct data d)
{
- struct fixup *f, *nf;
+ struct marker *m, *nm;
- f = d.refs;
- while (f) {
- nf = f->next;
- fixup_free(f);
- f = nf;
- }
-
- f = d.labels;
- while (f) {
- nf = f->next;
- fixup_free(f);
- f = nf;
+ m = d.markers;
+ while (m) {
+ nm = m->next;
+ free(m->ref);
+ free(m);
+ m = nm;
}
assert(!d.val || d.asize);
@@ -214,37 +202,29 @@
return d;
}
-void fixup_merge(struct fixup **fd, struct fixup **fd2, int d1_len)
+struct data data_append_markers(struct data d, struct marker *m)
{
- struct fixup **ff;
- struct fixup *f, *f2;
-
- /* Extract d2's fixups */
- f2 = *fd2;
- *fd2 = NULL;
-
- /* Tack them onto d's list of fixups */
- ff = fd;
- while (*ff)
- ff = &((*ff)->next);
- *ff = f2;
-
- /* And correct them for their new position */
- for (f = f2; f; f = f->next)
- f->offset += d1_len;
-
+ struct marker **mp = &d.markers;
+ /* Find the end of the markerlist */
+ while (*mp)
+ mp = &((*mp)->next);
+ *mp = m;
+ return d;
}
struct data data_merge(struct data d1, struct data d2)
{
struct data d;
+ struct marker *m2 = d2.markers;
- d = data_append_data(d1, d2.val, d2.len);
+ d = data_append_markers(data_append_data(d1, d2.val, d2.len), m2);
- fixup_merge(&d.refs, &d2.refs, d1.len);
- fixup_merge(&d.labels, &d2.labels, d1.len);
+ /* Adjust for the length of d1 */
+ for_each_marker(m2)
+ m2->offset += d1.len;
+ d2.markers = NULL; /* So data_free() doesn't clobber them */
data_free(d2);
return d;
@@ -294,42 +274,17 @@
return data_append_zeroes(d, newlen - d.len);
}
-struct data data_add_fixup(struct data d, char *ref)
+struct data data_add_marker(struct data d, enum markertype type, char *ref)
{
- struct fixup *f;
- struct data nd;
+ struct marker *m;
- f = xmalloc(sizeof(*f));
- f->offset = d.len;
- f->ref = ref;
- f->next = d.refs;
+ m = xmalloc(sizeof(*m));
+ m->offset = d.len;
+ m->type = type;
+ m->ref = ref;
+ m->next = NULL;
- nd = d;
- nd.refs = f;
-
- return nd;
-}
-
-struct data data_add_label(struct data d, char *label)
-{
- struct fixup *f, **p;
- struct data nd;
-
- f = xmalloc(sizeof(*f));
- f->offset = d.len;
- f->ref = label;
-
- nd = d;
- p = &nd.labels;
-
- /* adding to end keeps them sorted */
- while (*p)
- p = &((*p)->next);
-
- f->next = *p;
- *p = f;
-
- return nd;
+ return data_append_markers(d, m);
}
int data_is_one_string(struct data d)
Index: dtc/dtc-parser.y
===================================================================
--- dtc.orig/dtc-parser.y 2007-11-22 13:54:57.000000000 +1100
+++ dtc/dtc-parser.y 2007-11-22 14:38:39.000000000 +1100
@@ -194,7 +194,7 @@
}
| propdata DT_LABEL
{
- $$ = data_add_label($1, $2);
+ $$ = data_add_marker($1, LABEL, $2);
}
;
@@ -209,7 +209,7 @@
}
| propdataprefix DT_LABEL
{
- $$ = data_add_label($1, $2);
+ $$ = data_add_marker($1, LABEL, $2);
}
;
@@ -224,11 +224,12 @@
}
| celllist DT_REF
{
- $$ = data_append_cell(data_add_fixup($1, $2), -1);
+ $$ = data_append_cell(data_add_marker($1, REF_PHANDLE,
+ $2), -1);
}
| celllist DT_LABEL
{
- $$ = data_add_label($1, $2);
+ $$ = data_add_marker($1, LABEL, $2);
}
;
@@ -262,7 +263,7 @@
}
| bytestring DT_LABEL
{
- $$ = data_add_label($1, $2);
+ $$ = data_add_marker($1, LABEL, $2);
}
;
Index: dtc/dtc.h
===================================================================
--- dtc.orig/dtc.h 2007-11-22 13:54:57.000000000 +1100
+++ dtc/dtc.h 2007-11-22 14:38:39.000000000 +1100
@@ -101,23 +101,34 @@
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
/* Data blobs */
-struct fixup {
+enum markertype {
+ REF_PHANDLE,
+ LABEL,
+};
+
+struct marker {
+ enum markertype type;
int offset;
char *ref;
- struct fixup *next;
+ struct marker *next;
};
struct data {
int len;
char *val;
int asize;
- struct fixup *refs;
- struct fixup *labels;
+ struct marker *markers;
};
+
#define empty_data ((struct data){ /* all .members = 0 or NULL */ })
-void fixup_free(struct fixup *f);
+#define for_each_marker(m) \
+ for (; (m); (m) = (m)->next)
+#define for_each_marker_of_type(m, t) \
+ for_each_marker(m) \
+ if ((m)->type == (t))
+
void data_free(struct data d);
struct data data_grow_for(struct data d, int xlen);
@@ -135,8 +146,7 @@
struct data data_append_zeroes(struct data d, int len);
struct data data_append_align(struct data d, int align);
-struct data data_add_fixup(struct data d, char *ref);
-struct data data_add_label(struct data d, char *label);
+struct data data_add_marker(struct data d, enum markertype type, char *ref);
int data_is_one_string(struct data d);
Index: dtc/flattree.c
===================================================================
--- dtc.orig/flattree.c 2007-11-22 13:54:57.000000000 +1100
+++ dtc/flattree.c 2007-11-22 14:02:49.000000000 +1100
@@ -162,12 +162,13 @@
{
FILE *f = e;
int off = 0;
- struct fixup *l;
+ struct marker *m;
- l = d.labels;
- while (l) {
- emit_offset_label(f, l->ref, l->offset);
- l = l->next;
+ m = d.markers;
+ while (m) {
+ if (m->type == LABEL)
+ emit_offset_label(f, m->ref, m->offset);
+ m = m->next;
}
while ((d.len - off) >= sizeof(u32)) {
Index: dtc/treesource.c
===================================================================
--- dtc.orig/treesource.c 2007-11-22 13:54:57.000000000 +1100
+++ dtc/treesource.c 2007-11-22 14:02:49.000000000 +1100
@@ -61,7 +61,7 @@
char *str = val.val;
int i;
int newchunk = 1;
- struct fixup *l = val.labels;
+ struct marker *m = val.markers;
assert(str[val.len-1] == '\0');
@@ -69,10 +69,12 @@
char c = str[i];
if (newchunk) {
- while (l && (l->offset <= i)) {
- assert(l->offset == i);
- fprintf(f, "%s: ", l->ref);
- l = l->next;
+ while (m && (m->offset <= i)) {
+ if (m->type == LABEL) {
+ assert(m->offset == i);
+ fprintf(f, "%s: ", m->ref);
+ }
+ m = m->next;
}
fprintf(f, "\"");
newchunk = 0;
@@ -120,10 +122,9 @@
fprintf(f, "\"");
/* Wrap up any labels at the end of the value */
- while (l) {
- assert (l->offset == val.len);
- fprintf(f, " %s:", l->ref);
- l = l->next;
+ for_each_marker_of_type(m, LABEL) {
+ assert (m->offset == val.len);
+ fprintf(f, " %s:", m->ref);
}
}
@@ -131,14 +132,16 @@
{
void *propend = val.val + val.len;
cell_t *cp = (cell_t *)val.val;
- struct fixup *l = val.labels;
+ struct marker *m = val.markers;
fprintf(f, "<");
for (;;) {
- while (l && (l->offset <= ((char *)cp - val.val))) {
- assert(l->offset == ((char *)cp - val.val));
- fprintf(f, "%s: ", l->ref);
- l = l->next;
+ while (m && (m->offset <= ((char *)cp - val.val))) {
+ if (m->type == LABEL) {
+ assert(m->offset == ((char *)cp - val.val));
+ fprintf(f, "%s: ", m->ref);
+ }
+ m = m->next;
}
fprintf(f, "0x%x", be32_to_cpu(*cp++));
@@ -148,10 +151,9 @@
}
/* Wrap up any labels at the end of the value */
- while (l) {
- assert (l->offset == val.len);
- fprintf(f, " %s:", l->ref);
- l = l->next;
+ for_each_marker_of_type(m, LABEL) {
+ assert (m->offset == val.len);
+ fprintf(f, " %s:", m->ref);
}
fprintf(f, ">");
}
@@ -160,13 +162,14 @@
{
void *propend = val.val + val.len;
char *bp = val.val;
- struct fixup *l = val.labels;
+ struct marker *m = val.markers;
fprintf(f, "[");
for (;;) {
- while (l && (l->offset == (bp-val.val))) {
- fprintf(f, "%s: ", l->ref);
- l = l->next;
+ while (m && (m->offset == (bp-val.val))) {
+ if (m->type == LABEL)
+ fprintf(f, "%s: ", m->ref);
+ m = m->next;
}
fprintf(f, "%02hhx", *bp++);
@@ -176,10 +179,9 @@
}
/* Wrap up any labels at the end of the value */
- while (l) {
- assert (l->offset == val.len);
- fprintf(f, " %s:", l->ref);
- l = l->next;
+ for_each_marker_of_type(m, LABEL) {
+ assert (m->offset == val.len);
+ fprintf(f, " %s:", m->ref);
}
fprintf(f, "]");
}
@@ -188,7 +190,7 @@
{
int len = prop->val.len;
char *p = prop->val.val;
- struct fixup *l;
+ struct marker *m = prop->val.markers;
int nnotstring = 0, nnul = 0;
int nnotstringlbl = 0, nnotcelllbl = 0;
int i;
@@ -205,10 +207,10 @@
nnul++;
}
- for (l = prop->val.labels; l; l = l->next) {
- if ((l->offset > 0) && (prop->val.val[l->offset - 1] != '\0'))
+ for_each_marker_of_type(m, LABEL) {
+ if ((m->offset > 0) && (prop->val.val[m->offset - 1] != '\0'))
nnotstringlbl++;
- if ((l->offset % sizeof(cell_t)) != 0)
+ if ((m->offset % sizeof(cell_t)) != 0)
nnotcelllbl++;
}
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* reboot of mpc8270 sometimes fails
From: lobo fan @ 2007-11-22 4:24 UTC (permalink / raw)
To: linuxppc-embedded@ozlabs.org
[-- Attachment #1: Type: text/plain, Size: 114 bytes --]
Hi Theo,
Could you please give me the patch? I am very interested in your patch.
--
Thanks.
Best Regards,
Lobo
[-- Attachment #2: Type: text/html, Size: 167 bytes --]
^ permalink raw reply
* dtc: RFC: Fix some lexical problems with references
From: David Gibson @ 2007-11-22 6:10 UTC (permalink / raw)
To: Jon Loeliger; +Cc: linuxppc-dev
The recent change to the lexer to only recognize property and node
names in the appropriate context removed a number of lexical warts in
our language that would have gotten ugly as we add expression support
and so forth.
But there's one nasty one remaining: references can contain a full
path, including the various problematic node name characters (',', '+'
and '-', for example). This would cause trouble with expressions, and
it also causes trouble with the patch I'm working on to allow
expanding references to paths rather than phandles. This patch
therefore reworks the lexer to mitigate these problems.
- References to labels cause no problems. These are now
recognized separately from references to full paths. No syntax change
here.
- References to full paths, including problematic characters
are allowed by "quoting" the path with braces
e.g. &{/pci@10000/somedevice@3,8000}. The braces protect any internal
problematic characters from being confused with operators or whatever.
- For compatibility with existing dts files, in v0 dts files
we allow bare references to paths as before &/foo/bar/whatever - but
*only* if the path contains no troublesome characters. Specifically
only [a-zA-Z0-9_@/] are allowed.
This is an incompatible change to the dts-v1 format, but since AFAIK
no-one has yet switched to dts-v1 files, I think we can get away with
it. Better to make the transition when people to convert to v1, and
get rid of the problematic old syntax.
Strictly speaking, it's also an incompatible change to the v0 format,
since some path references that were allowed before are no longer
allowed. I suspect no-one has been using the no-longer-supported
forms (certainly none of the kernel dts files will cause trouble). We
might need to think about this harder, though.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Index: dtc/dtc-lexer.l
===================================================================
--- dtc.orig/dtc-lexer.l 2007-11-22 16:33:47.000000000 +1100
+++ dtc/dtc-lexer.l 2007-11-22 16:40:48.000000000 +1100
@@ -25,12 +25,12 @@
%x PROPNODENAME
%s V1
-PROPCHAR [a-zA-Z0-9,._+*#?-]
-UNITCHAR [0-9a-f,]
+PROPNODECHAR [a-zA-Z0-9,._+*#?@-]
+PATHCHAR ({PROPNODECHAR}|[/])
+LEGACYPATHCHAR [a-zA-Z0-9_@/]
+LABEL [a-zA-Z_][a-zA-Z0-9_]*
WS [[:space:]]
-REFCHAR ({PROPCHAR}|{UNITCHAR}|[/@])
-
%{
#include "dtc.h"
#include "srcpos.h"
@@ -102,7 +102,7 @@
return DT_MEMRESERVE;
}
-<*>[a-zA-Z_][a-zA-Z0-9_]*: {
+<*>{LABEL}: {
yylloc.filenum = srcpos_filenum;
yylloc.first_line = yylineno;
DPRINT("Label: %s\n", yytext);
@@ -142,7 +142,24 @@
return DT_LITERAL;
}
-\&{REFCHAR}* {
+\&{LABEL} { /* label reference */
+ yylloc.filenum = srcpos_filenum;
+ yylloc.first_line = yylineno;
+ DPRINT("Ref: %s\n", yytext+1);
+ yylval.labelref = strdup(yytext+1);
+ return DT_REF;
+ }
+
+"&{/"{PATHCHAR}+\} { /* new-style path reference */
+ yylloc.filenum = srcpos_filenum;
+ yylloc.first_line = yylineno;
+ yytext[yyleng-1] = '\0';
+ DPRINT("Ref: %s\n", yytext+2);
+ yylval.labelref = strdup(yytext+2);
+ return DT_REF;
+ }
+
+<INITIAL>"&/"{LEGACYPATHCHAR}+ { /* old-style path reference */
yylloc.filenum = srcpos_filenum;
yylloc.first_line = yylineno;
DPRINT("Ref: %s\n", yytext+1);
@@ -166,7 +183,7 @@
return ']';
}
-<PROPNODENAME>{PROPCHAR}+(@{UNITCHAR}+)? {
+<PROPNODENAME>{PROPNODECHAR}+ {
yylloc.filenum = srcpos_filenum;
yylloc.first_line = yylineno;
DPRINT("PropNodeName: %s\n", yytext);
Index: dtc/tests/nonexist-node-ref.dts
===================================================================
--- dtc.orig/tests/nonexist-node-ref.dts 2007-11-22 16:33:47.000000000 +1100
+++ dtc/tests/nonexist-node-ref.dts 2007-11-22 16:34:12.000000000 +1100
@@ -1,8 +1,8 @@
/dts-v1/;
/ {
- ref = < &/node >;
- badref = < &/nosuchnode >;
+ ref = < &{/node} >;
+ badref = < &{/nosuchnode} >;
label: node {
};
};
Index: dtc/tests/references.dts
===================================================================
--- dtc.orig/tests/references.dts 2007-11-22 16:33:47.000000000 +1100
+++ dtc/tests/references.dts 2007-11-22 16:34:12.000000000 +1100
@@ -4,18 +4,18 @@
/* Explicit phandles */
n1: node1 {
linux,phandle = <0x2000>;
- ref = <&/node2>; /* reference precedes target */
+ ref = <&{/node2}>; /* reference precedes target */
lref = <&n2>;
};
n2: node2 {
linux,phandle = <0x1>;
- ref = <&/node1>; /* reference after target */
+ ref = <&{/node1}>; /* reference after target */
lref = <&n1>;
};
/* Implicit phandles */
n3: node3 {
- ref = <&/node4>;
+ ref = <&{/node4}>;
lref = <&n4>;
};
n4: node4 {
Index: dtc/tests/references_dts0.dts
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ dtc/tests/references_dts0.dts 2007-11-22 16:34:12.000000000 +1100
@@ -0,0 +1,21 @@
+/ {
+ /* Explicit phandles */
+ n1: node1 {
+ linux,phandle = <2000>;
+ ref = <&/node2>; /* reference precedes target */
+ lref = <&n2>;
+ };
+ n2: node2 {
+ linux,phandle = <1>;
+ ref = <&/node1>; /* reference after target */
+ lref = <&n1>;
+ };
+
+ /* Implicit phandles */
+ n3: node3 {
+ ref = <&/node4>;
+ lref = <&n4>;
+ };
+ n4: node4 {
+ };
+};
Index: dtc/tests/run_tests.sh
===================================================================
--- dtc.orig/tests/run_tests.sh 2007-11-22 16:33:47.000000000 +1100
+++ dtc/tests/run_tests.sh 2007-11-22 16:34:12.000000000 +1100
@@ -145,6 +145,9 @@
run_test dtc.sh -I dts -O dtb -o dtc_references.test.dtb references.dts
run_test references dtc_references.test.dtb
+ run_test dtc.sh -I dts -O dtb -o dtc_references_dts0.test.dtb references_dts0.dts
+ run_test references dtc_references_dts0.test.dtb
+
# Check -Odts mode preserve all dtb information
for tree in test_tree1.dtb dtc_tree1.test.dtb dtc_escapes.test.dtb ; do
run_test dtc.sh -I dtb -O dts -o odts_$tree.test.dts $tree
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* #PPC: timeout while waiting for freeze
From: Bheemappa @ 2007-11-22 6:11 UTC (permalink / raw)
To: linuxppc-embedded
Hello
I am using BDI2000 debugger to debug our custom board which has
MPC7457 processor and Marvell's discovery-ii(MV64360) as host bridge. I
have
connectd target board to BDI using JTAG.I am getting the BDI prompt and
also its reading PVR number correctly, but when I am trying to access
any memory location i.e 0xf1000000 using below command its giving below
error.
BDI> md 0xf1000000
#PPC: timeout while waiting for freeze
Why this error is coming ? , can you give us more detailed description
for this error message , so that we can trace the source of error mssage.
Below is my mail id plz send any suggestions.
bheemappa@rasstechnologies.com
Regards
Bheema
RASS Tech Pvt Ltd
Bangalore
^ permalink raw reply
* Re: dtc: RFC: Fix some lexical problems with references
From: David Gibson @ 2007-11-22 6:23 UTC (permalink / raw)
To: Jon Loeliger, linuxppc-dev
In-Reply-To: <20071122061007.GA22888@localhost.localdomain>
On Thu, Nov 22, 2007 at 05:10:07PM +1100, David Gibson wrote:
> The recent change to the lexer to only recognize property and node
> names in the appropriate context removed a number of lexical warts in
> our language that would have gotten ugly as we add expression support
> and so forth.
>
> But there's one nasty one remaining: references can contain a full
> path, including the various problematic node name characters (',', '+'
> and '-', for example). This would cause trouble with expressions, and
> it also causes trouble with the patch I'm working on to allow
> expanding references to paths rather than phandles. This patch
> therefore reworks the lexer to mitigate these problems.
>
> - References to labels cause no problems. These are now
> recognized separately from references to full paths. No syntax change
> here.
>
> - References to full paths, including problematic characters
> are allowed by "quoting" the path with braces
> e.g. &{/pci@10000/somedevice@3,8000}. The braces protect any internal
> problematic characters from being confused with operators or whatever.
>
> - For compatibility with existing dts files, in v0 dts files
> we allow bare references to paths as before &/foo/bar/whatever - but
> *only* if the path contains no troublesome characters. Specifically
> only [a-zA-Z0-9_@/] are allowed.
>
> This is an incompatible change to the dts-v1 format, but since AFAIK
> no-one has yet switched to dts-v1 files, I think we can get away with
> it. Better to make the transition when people to convert to v1, and
> get rid of the problematic old syntax.
>
> Strictly speaking, it's also an incompatible change to the v0 format,
> since some path references that were allowed before are no longer
> allowed. I suspect no-one has been using the no-longer-supported
> forms (certainly none of the kernel dts files will cause trouble). We
> might need to think about this harder, though.
Just to note: we need to do something here, but there are approaches
other than the one above (hence the RFC). For example, if we just
separate the lexical recognition of refs-to-labels from refs-to-paths
then we can continue to recognize full bare path references. However,
in some circumstances it might be necessary to add whitespace in the
dts to correctly mark the end of the path (in the case '/' and ' '
would essentially take the place of the braces for delimiting the
path). That maintains full compatibility, and avoids the arguably
ugly &{/foo} syntax, but it does mean there are some odd situations
like the fact that (once string references are implemented):
&label1, &label2
and &label1 , &label2
would be equivalent, but the following two:
&/node1, &/node2
&/node1 , &/node2
would not be equivalent (depending on context one or both of them
could be syntax errors). The first is a reference to the node
"/node1," then a reference to the node "/node2", the second is a
reference to the node "/node1" then a comma then a reference to the
node "/node2".
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
^ permalink raw reply
* Initramfs problem on virtex4fx
From: schardt @ 2007-11-22 8:18 UTC (permalink / raw)
To: Linux PPC Linux PPC
Hi all,
i try to run linux from flash with the initramfs as root filesystem.
i wrote a simple hello_world as init to test the initramfs.
the kernel boots normaly, but instead of the complete "Hello World" i
see only "He"
and the system hangs.
Does anyone have similar problems ? And solved it ? ;)
Regards
Georg
-------------------------------------------------------------------
-------------------------------------------------------------------
Forschungszentrum Jülich GmbH
52425 Jülich
Sitz der Gesellschaft: Jülich
Eingetragen im Handelsregister des Amtsgerichts Düren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDirig'in Bärbel Brumme-Bothe
Geschäftsführung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Dr. Sebastian M. Schmidt
-------------------------------------------------------------------
-------------------------------------------------------------------
^ permalink raw reply
* Re: Firmware Support for USB Hub
From: Misbah khan @ 2007-11-22 9:53 UTC (permalink / raw)
To: linuxppc-embedded
In-Reply-To: <474468C5.8080402@freescale.com>
Thank you for your reply.
Even i think that there is only out-of-tree driver for CPM USB. i would like
to know that some body used this driver and what is the problem that could
come and how could we customize for our requirement for the PPC-8248.
Could you tell me what is the reason for not using inbuilt USB controler for
8248 than going for External controller.
If any body has already done USB driver than could you please share your
experience.
----misbah <><
Scott Wood-2 wrote:
>
> Misbah khan wrote:
>> Hi all,
>>
>> I am using a 8248 processor which has a USB controller and i need to
>> connect
>> a USB Hub to it, iam using Montavista Linux .I need to know that what are
>> the support i need form Montavista or Open source to have an interface
>> with
>> Usb hub. ???
>>
>> Is there any driver that we need to make if so what type ???
>
> I don't believe a driver currently exists for CPM USB.
>
> -Scott
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>
>
--
View this message in context: http://www.nabble.com/Firmware-Support-for-USB-Hub-tf4850180.html#a13893889
Sent from the linuxppc-embedded mailing list archive at Nabble.com.
^ permalink raw reply
* Re: Initramfs problem on virtex4fx
From: schardt @ 2007-11-22 10:01 UTC (permalink / raw)
To: schardt; +Cc: Linux PPC Linux PPC
In-Reply-To: <47453B63.6010100@fz-juelich.de>
additional i tried a initramfs rootfs with busybox
Freeing unused kernel memory: 1944k init
init started: BusyBox v1.7.0 (2007-11-07 14:29:33 CET)
starting pid 152eth0: XTemac: Options: 0xb8f2
eth0: XTemac: We renegotiated the speed to: 1000
eth0: XTemac: speed set to 1000Mb/s
, tty '': '/etc/init.d/
this looks very strange to me....
Georg
schardt wrote:
> Hi all,
>
> i try to run linux from flash with the initramfs as root filesystem.
> i wrote a simple hello_world as init to test the initramfs.
>
> the kernel boots normaly, but instead of the complete "Hello World" i
> see only "He"
> and the system hangs.
>
> Does anyone have similar problems ? And solved it ? ;)
>
> Regards
> Georg
>
>
> -------------------------------------------------------------------
> -------------------------------------------------------------------
> Forschungszentrum J=FClich GmbH
> 52425 J=FClich
>
> Sitz der Gesellschaft: J=FClich
> Eingetragen im Handelsregister des Amtsgerichts D=FCren Nr. HR B 3498
> Vorsitzende des Aufsichtsrats: MinDirig'in B=E4rbel Brumme-Bothe
> Gesch=E4ftsf=FChrung: Prof. Dr. Achim Bachem (Vorsitzender),
> Dr. Ulrich Krafft (stellv. Vorsitzender), Dr. Sebastian M. Schmidt
> -------------------------------------------------------------------
> -------------------------------------------------------------------
> _______________________________________________
> Linuxppc-embedded mailing list
> Linuxppc-embedded@ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-embedded
>
> =20
-------------------------------------------------------------------
-------------------------------------------------------------------
Forschungszentrum J=FClich GmbH
52425 J=FClich
Sitz der Gesellschaft: J=FClich
Eingetragen im Handelsregister des Amtsgerichts D=FCren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDirig'in B=E4rbel Brumme-Bothe
Gesch=E4ftsf=FChrung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Dr. Sebastian M. Schmidt
-------------------------------------------------------------------
-------------------------------------------------------------------
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox