From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Gibson Subject: Re: [PATCH v4] Implement the -a option to pad dtb aligned Date: Thu, 7 Jul 2016 14:45:12 +1000 Message-ID: <20160707044512.GS14675@voom.fritz.box> References: <1467365408-923-1-git-send-email-timwang@asrmicro.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="kVhvBuyIzNBvw9vr" Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1467866606; bh=RXHUVBoNcEZz7nTxQDNOH7YLi3l5cAJgSbyrOjF/opI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=L7eYPFKhH4PnRjhybJdOz+dfi/B1Fz2v8+RSgjwFiayn3ky/0nEgWjrEBBa8YKEY7 XI6CkVRbhSZLhokx/KnbTaqXT3ldr44H/G3NuGknCTfdtn+f4yNzxBzk8LXjhFfDRv iKcMkKVMVNuSZDuYeWkmI9vBD7FYEkPkZAkWthyw= Content-Disposition: inline In-Reply-To: <1467365408-923-1-git-send-email-timwang-XOWFcpiLszpWk0Htik3J/w@public.gmane.org> Sender: devicetree-compiler-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: To: Tim Wang Cc: devicetree-compiler-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, wtt_usst-9Onoh4P/yGk@public.gmane.org --kVhvBuyIzNBvw9vr Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jul 01, 2016 at 05:30:08PM +0800, Tim Wang wrote: > There is one condition that need cat the dtb files > into one dtb.img which can support several boards > use same SoC platform. >=20 > And the original dtb file size is not aligned to any base. > This may cause "Synchronous Abort" when load from a unligned > address on some SoC machine, such as ARM. >=20 > So this patch implement the -a option to > pad zero at the end of dtb files and make the dtb size aligned > to . >=20 > Then, the aligned dtbs can cat together and load without "Synchronous > Abort". >=20 > Signed-off-by: Tim Wang > --- > dtc.c | 17 ++++++++++++++++- > dtc.h | 1 + > flattree.c | 10 +++++++++- > 3 files changed, 26 insertions(+), 2 deletions(-) >=20 > diff --git a/dtc.c b/dtc.c > index 5fa23c4..d47089e 100644 > --- a/dtc.c > +++ b/dtc.c > @@ -30,8 +30,14 @@ int quiet; /* Level of quietness */ > int reservenum; /* Number of memory reservation slots */ > int minsize; /* Minimum blob size */ > int padsize; /* Additional padding to blob */ > +int alignsize; /* Additional padding to blob accroding to the alignsize= */ > int phandle_format =3D PHANDLE_BOTH; /* Use linux,phandle or phandle pro= perties */ > =20 > +static int is_power_of_2(int x) > +{ > + return (x > 0) && ((x & (x - 1)) =3D=3D 0); > +} > + > static void fill_fullpaths(struct node *tree, const char *prefix) > { > struct node *child; > @@ -53,7 +59,7 @@ static void fill_fullpaths(struct node *tree, const cha= r *prefix) > #define FDT_VERSION(version) _FDT_VERSION(version) > #define _FDT_VERSION(version) #version > static const char usage_synopsis[] =3D "dtc [options] "; > -static const char usage_short_opts[] =3D "qI:O:o:V:d:R:S:p:fb:i:H:sW:E:h= v"; > +static const char usage_short_opts[] =3D "qI:O:o:V:d:R:S:p:a:fb:i:H:sW:E= :hv"; > static struct option const usage_long_opts[] =3D { > {"quiet", no_argument, NULL, 'q'}, > {"in-format", a_argument, NULL, 'I'}, > @@ -64,6 +70,7 @@ static struct option const usage_long_opts[] =3D { > {"reserve", a_argument, NULL, 'R'}, > {"space", a_argument, NULL, 'S'}, > {"pad", a_argument, NULL, 'p'}, > + {"align", a_argument, NULL, 'a'}, > {"boot-cpu", a_argument, NULL, 'b'}, > {"force", no_argument, NULL, 'f'}, > {"include", a_argument, NULL, 'i'}, > @@ -91,6 +98,7 @@ static const char * const usage_opts_help[] =3D { > "\n\tMake space for reserve map entries (for dtb and asm outpu= t)", > "\n\tMake the blob at least long (extra space)", > "\n\tAdd padding to the blob of long (extra space)", > + "\n\tMake the blob align to the (extra space)", > "\n\tSet the physical boot cpu", > "\n\tTry to produce output even if the input tree has errors", > "\n\tAdd a path to search for include files", > @@ -169,6 +177,7 @@ int main(int argc, char *argv[]) > reservenum =3D 0; > minsize =3D 0; > padsize =3D 0; > + alignsize =3D 0; > =20 > while ((opt =3D util_getopt_long()) !=3D EOF) { > switch (opt) { > @@ -196,6 +205,12 @@ int main(int argc, char *argv[]) > case 'p': > padsize =3D strtol(optarg, NULL, 0); > break; > + case 'a': > + alignsize =3D strtol(optarg, NULL, 0); > + if (!is_power_of_2(alignsize)) > + die("Invalid argument \"%s\" to -H option\n", You have the wrong option name here. Also, since the argument isn't a string, I wouldn't suggest the \"s. > + optarg); > + break; > case 'f': > force =3D true; > break; > diff --git a/dtc.h b/dtc.h > index 56212c8..32009bc 100644 > --- a/dtc.h > +++ b/dtc.h > @@ -53,6 +53,7 @@ extern int quiet; /* Level of quietness */ > extern int reservenum; /* Number of memory reservation slots */ > extern int minsize; /* Minimum blob size */ > extern int padsize; /* Additional padding to blob */ > +extern int alignsize; /* Additional padding to blob accroding to the al= ignsize */ > extern int phandle_format; /* Use linux,phandle or phandle properties */ > =20 > #define PHANDLE_LEGACY 0x1 > diff --git a/flattree.c b/flattree.c > index ec14954..1cdd426 100644 > --- a/flattree.c > +++ b/flattree.c > @@ -398,15 +398,21 @@ void dt_to_blob(FILE *f, struct boot_info *bi, int = version) > */ > if (minsize > 0) { > padlen =3D minsize - fdt32_to_cpu(fdt.totalsize); > - if ((padlen < 0) && (quiet < 1)) > + if ((padlen < 0) && (quiet < 1)) { > fprintf(stderr, > "Warning: blob size %d >=3D minimum size %d\n", > fdt32_to_cpu(fdt.totalsize), minsize); > + padlen =3D 0; Here, your behaviour will change if you add the -q option, which is incorrect. You'll need to split the if condition. > + } > } > =20 > if (padsize > 0) > padlen =3D padsize; > =20 > + if (alignsize > 0) > + padlen =3D ALIGN(fdt32_to_cpu(fdt.totalsize) + padlen, alignsize) > + - fdt32_to_cpu(fdt.totalsize); > + This looks correct now. > if (padlen > 0) { > int tsize =3D fdt32_to_cpu(fdt.totalsize); > tsize +=3D padlen; > @@ -572,6 +578,8 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int ver= sion) > if (padsize > 0) { > fprintf(f, "\t.space\t%d, 0\n", padsize); > } > + if (alignsize > 0) > + asm_emit_align(f, alignsize); > emit_label(f, symprefix, "blob_abs_end"); > =20 > data_free(strbuf); --=20 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 --kVhvBuyIzNBvw9vr Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXfd5YAAoJEGw4ysog2bOSaXwQAIAmNzq05rybiHR2jyWLSyt1 VJmxoFOXYK8WT67vRevFy4gsKF9Ywkx4hKlM6dRSmh0JReKHz1H0llxxfTQnSIQW nKx2KDqDcm0gLB7AnSUk5Gr+QTzflQgUPqRE/LPdjhcGxLSP4qBTIDjwGHIStfVT X5XmtgrlHCRJNiYSs/THDrnxqLE3QcFSegemg9bMHGppGTo/5i5tQ5bb237utSQt vH1PxKqqN2ztsXlwDXyE8610Z7N7L3IJ+HPsCT7aUJVveOgR2HB/r1CK17a+1B9/ UlhgMXKygcwdkH8Pc+K4vGYqpi3hvLKvO9ZvVQAqYS9ECB+KeFn/BeBLZvdGEP1r rUFCQQR2qCPsEvRG2VLR5MVm6VGRF7VpTj4UAjuTwIhIGjds1CLc0iq1XxQsE8Gr 0L5RraQhlT8W4MLQvqFp+nUoAwYHqiGfZlHg+0WmFOsdFcEAHiFyagdRD+gT4zYT +LoY56aD8sY5AQvPER4gs440XPPbxtRqm7X2SxClBA/BX1M9sfFLVHZA3qCUlkrX gd1ZuD3ThaTzgBPBe6DKwg0pPFkHHfShLdeOZDVQR2zTBORveux6UKdcAqB0BbKE kbrI8eNniIkRyHTi+eVEbrieMDT2QHWuBH4iXTtc3uTrgd48WdiQbTKZMAsbF8GL xbJN194XoOvvXQSBk9mi =4LTL -----END PGP SIGNATURE----- --kVhvBuyIzNBvw9vr--