fdtdec: Use fdt_setprop_u32() for fdtdec_set_phandle()
PATCH 1/2 fdtdec: Use fdt_setprop_u32() for fdtdec_set_phandle()
From: Thierry Reding <[email protected]>
The fdt_setprop_u32() function does everything that we need, so we really only use the function as a convenience wrapper, in which case it can simply be a static inline function.
--- include/fdtdec.h | 5 ++++- lib/fdtdec.c | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-)
include/fdtdec.h +4 -1
@@ -1029,7 +1029,10 @@ int fdtdec_setup_memory_banksize(void);* @param phandle phandle to set for the given node * @return 0 on success or a negative error code on failure */ -int fdtdec_set_phandle (void *blob,int node,uint32_t phandle); +static inline int fdtdec_set_phandle (void *blob,int node,uint32_t phandle) +{ +return fdt_setprop_u32 (blob, node,"phandle" , phandle); +}/** * fdtdec_add_reserved_memory() - add or find a reserved-memory node
lib/fdtdec.c +0 -7
@@ -1261,13 +1261,6 @@ __weak void *board_fdt_blob_setup(void) }#endif -int fdtdec_set_phandle (void *blob,int node,uint32_t phandle) -{ -fdt32_t value =cpu_to_fdt32 (phandle); - -return fdt_setprop (blob, node,"phandle" , &value,sizeof (value)); -} -static int fdtdec_init_reserved_memory (void *blob) {int na, ns, node, err;
Signature · 1 line
2.21.0
PATCH 1/2 fdtdec: Use fdt_setprop_u32() for fdtdec_set_phandle()
Quoted 11 lines · Thierry Reding
From: Thierry Reding <[email protected]>
The
fdt_setprop_u32()function does everything that we need, so we really only use the function as a convenience wrapper, in which case it can simply be a static inline function.Signed-off-by Thierry Reding <[email protected]>--- include/fdtdec.h | 5 ++++- lib/fdtdec.c | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-)
Hi Simon,
gentle reminder on these. These are the two follow-up patches that you had suggested I make on top of the other fdtdec series that you applied a couple of weeks ago.
Thierry
Quoted 37 lines
include/fdtdec.h +4
-1@@ -1029,7 +1029,10 @@ int fdtdec_setup_memory_banksize(void);* @param phandle phandle to set for the given node * @return 0 on success or a negative error code on failure */ -int fdtdec_set_phandle (void *blob,int node,uint32_t phandle); +static inline int fdtdec_set_phandle (void *blob,int node,uint32_t phandle) +{ +return fdt_setprop_u32 (blob, node,"phandle" , phandle); +}/** * fdtdec_add_reserved_memory() - add or find a reserved-memory node lib/fdtdec.c +0
-7@@ -1261,13 +1261,6 @@ __weak void *board_fdt_blob_setup(void) }#endif -int fdtdec_set_phandle (void *blob,int node,uint32_t phandle) -{ -fdt32_t value =cpu_to_fdt32 (phandle); - -return fdt_setprop (blob, node,"phandle" , &value,sizeof (value)); -} -static int fdtdec_init_reserved_memory (void *blob) {int na, ns, node, err;Signature · 1 line
2.21.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190425/de82259d/attachment.sig>
PATCH 1/2 fdtdec: Use fdt_setprop_u32() for fdtdec_set_phandle()
Hi Thierry,
Quoted 14 lines · Thierry Reding
Quoted 11 lines · Thierry Reding
From: Thierry Reding <[email protected]>
The
fdt_setprop_u32()function does everything that we need, so we really only use the function as a convenience wrapper, in which case it can simply be a static inline function.Signed-off-by Thierry Reding <[email protected]>--- include/fdtdec.h | 5 ++++- lib/fdtdec.c | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-)
Quoted 5 lines
Hi Simon,
gentle reminder on these. These are the two follow-up patches that you had suggested I make on top of the other fdtdec series that you applied a couple of weeks ago.
I think this is applied now?
Regards,
Simon
PATCH 1/2 fdtdec: Use fdt_setprop_u32() for fdtdec_set_phandle()
Quoted 17 lines · Simon Glass
Hi Thierry,
Quoted 14 lines · Thierry Reding
Quoted 11 lines · Thierry Reding
From: Thierry Reding <[email protected]>
The
fdt_setprop_u32()function does everything that we need, so we really only use the function as a convenience wrapper, in which case it can simply be a static inline function.Signed-off-by Thierry Reding <[email protected]>--- include/fdtdec.h | 5 ++++- lib/fdtdec.c | 7 ------- 2 files changed, 4 insertions(+), 8 deletions(-)
Quoted 7 lines
Quoted 5 lines
Hi Simon,
gentle reminder on these. These are the two follow-up patches that you had suggested I make on top of the other fdtdec series that you applied a couple of weeks ago.
I think this is applied now?
Yes, I can see this in origin/master now.
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190507/dc191840/attachment.sig>
PATCH 2/2 fdtdec: Remove fdt_{addr,size}_unpack()
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
U-Boot already defines the {upper,lower}_32_bits() macros that have the same purpose. Use the existing macros instead of defining new APIs.
--- include/fdtdec.h | 24 ------------------------ lib/fdtdec.c | 8 ++++++-- lib/fdtdec_test.c | 8 ++++++-- 3 files changed, 12 insertions(+), 28 deletions(-)
include/fdtdec.h +0 -24
@@ -24,30 +24,6 @@typedef phys_addr_t fdt_addr_t ;typedef phys_size_t fdt_size_t ; -static inline fdt32_t fdt_addr_unpack (fdt_addr_t addr,fdt32_t *upper) -{ -if (upper) -#ifdef CONFIG_PHYS_64BIT - *upper = addr >>32 ; -#else - *upper =0 ; -#endif - -return addr; -} - -static inline fdt32_t fdt_size_unpack (fdt_size_t size,fdt32_t *upper) -{ -if (upper) -#ifdef CONFIG_PHYS_64BIT - *upper = size >>32 ; -#else - *upper =0 ; -#endif - -return size; -} -#ifdef CONFIG_PHYS_64BIT #define FDT_ADDR_T_NONE (-1U)#define fdt_addr_to_cpu (reg) be64_to_cpu(reg)
lib/fdtdec.c +6 -2
@@ -1300,6 +1300,7 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,fdt32_t cells[4 ] = {}, *ptr = cells;uint32_t upper, lower, phandle;int parent, node, na, ns, err; +fdt_size_t size;char name[64 ];/* create an empty /reserved-memory node if one doesn't exist */
@@ -1340,7 +1341,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,* Unpack the start address and generate the name of the new node * base on the basename and the unit-address. */ - lower =fdt_addr_unpack (carveout->start, &upper); + upper =upper_32_bits (carveout->start); + lower =lower_32_bits (carveout->start);if (na >1 && upper >0 ) snprintf(name, sizeof(name), "%s@%x,%x", basename, upper,
@@ -1374,7 +1376,9 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, *ptr++ =cpu_to_fdt32 (lower);/* store one or two size cells */ - lower =fdt_size_unpack (carveout->end - carveout->start +1 , &upper); + size = carveout->end - carveout->start +1 ; + upper =upper_32_bits (size); + lower =lower_32_bits (size);if (ns >1 ) *ptr++ =cpu_to_fdt32 (upper);
lib/fdtdec_test.c +6 -2
@@ -155,11 +155,13 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns) };fdt32_t cells[4 ], *ptr = cells;uint32_t upper, lower; +fdt_size_t size;char name[32 ];int offset;/* store one or two address cells */ - lower =fdt_addr_unpack (carveout.start, &upper); + upper =upper_32_bits (carveout.start); + lower =lower_32_bits (carveout.start);if (na >1 && upper >0 ) snprintf(name, sizeof(name), "%s@%x,%x", basename, upper,
@@ -173,7 +175,9 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns) *ptr++ =cpu_to_fdt32 (lower);/* store one or two size cells */ - lower =fdt_size_unpack (carveout.end - carveout.start +1 , &upper); + size = carveout.end - carveout.start +1 ; + upper =upper_32_bits (size); + lower =lower_32_bits (size);if (ns >1 ) *ptr++ =cpu_to_fdt32 (upper);
Signature · 1 line
2.21.0
PATCH 2/2 fdtdec: Remove fdt_{addr,size}_unpack()
Quoted 11 lines · Thierry Reding
From: Thierry Reding <[email protected]>
U-Boot already defines the {upper,lower}_32_bits() macros that have the same purpose. Use the existing macros instead of defining new APIs.
Signed-off-by Thierry Reding <[email protected]>--- include/fdtdec.h | 24 ------------------------ lib/fdtdec.c | 8 ++++++-- lib/fdtdec_test.c | 8 ++++++-- 3 files changed, 12 insertions(+), 28 deletions(-)
Hi Simon,
you picked up patch 1/2 of this set. Did you have any comments on v2, or did you overlook it?
Thierry
Quoted 101 lines
include/fdtdec.h +0
-24@@ -24,30 +24,6 @@typedef phys_addr_t fdt_addr_t ;typedef phys_size_t fdt_size_t ; -static inline fdt32_t fdt_addr_unpack (fdt_addr_t addr,fdt32_t *upper) -{ -if (upper) -#ifdef CONFIG_PHYS_64BIT - *upper = addr >>32 ; -#else - *upper =0 ; -#endif - -return addr; -} - -static inline fdt32_t fdt_size_unpack (fdt_size_t size,fdt32_t *upper) -{ -if (upper) -#ifdef CONFIG_PHYS_64BIT - *upper = size >>32 ; -#else - *upper =0 ; -#endif - -return size; -} -#ifdef CONFIG_PHYS_64BIT #define FDT_ADDR_T_NONE (-1U)#define fdt_addr_to_cpu (reg) be64_to_cpu(reg)lib/fdtdec.c +6
-2@@ -1300,6 +1300,7 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,fdt32_t cells[4 ] = {}, *ptr = cells;uint32_t upper, lower, phandle;int parent, node, na, ns, err; +fdt_size_t size;char name[64 ];/* create an empty /reserved-memory node if one doesn't exist */ @@ -1340,7 +1341,8 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename,* Unpack the start address and generate the name of the new node * base on the basename and the unit-address. */ - lower =fdt_addr_unpack (carveout->start, &upper); + upper =upper_32_bits (carveout->start); + lower =lower_32_bits (carveout->start);if (na >1 && upper >0 ) snprintf(name, sizeof(name), "%s@%x,%x", basename, upper,@@ -1374,7 +1376,9 @@ int fdtdec_add_reserved_memory(void *blob, const char *basename, *ptr++ =cpu_to_fdt32 (lower);/* store one or two size cells */ - lower =fdt_size_unpack (carveout->end - carveout->start +1 , &upper); + size = carveout->end - carveout->start +1 ; + upper =upper_32_bits (size); + lower =lower_32_bits (size);if (ns >1 ) *ptr++ =cpu_to_fdt32 (upper);lib/fdtdec_test.c +6
-2@@ -155,11 +155,13 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns) };fdt32_t cells[4 ], *ptr = cells;uint32_t upper, lower; +fdt_size_t size;char name[32 ];int offset;/* store one or two address cells */ - lower =fdt_addr_unpack (carveout.start, &upper); + upper =upper_32_bits (carveout.start); + lower =lower_32_bits (carveout.start);if (na >1 && upper >0 ) snprintf(name, sizeof(name), "%s@%x,%x", basename, upper,@@ -173,7 +175,9 @@ static int make_fdt_carveout_device(void *fdt, uint32_t na, uint32_t ns) *ptr++ =cpu_to_fdt32 (lower);/* store one or two size cells */ - lower =fdt_size_unpack (carveout.end - carveout.start +1 , &upper); + size = carveout.end - carveout.start +1 ; + upper =upper_32_bits (size); + lower =lower_32_bits (size);if (ns >1 ) *ptr++ =cpu_to_fdt32 (upper);Signature · 1 line
2.21.0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190426/89d896b3/attachment.sig>
PATCH 2/2 fdtdec: Remove fdt_{addr,size}_unpack()
Hi Thierry,
Quoted 14 lines · Thierry Reding
Quoted 11 lines · Thierry Reding
From: Thierry Reding <[email protected]>
U-Boot already defines the {upper,lower}_32_bits() macros that have the same purpose. Use the existing macros instead of defining new APIs.
Signed-off-by Thierry Reding <[email protected]>--- include/fdtdec.h | 24 ------------------------ lib/fdtdec.c | 8 ++++++-- lib/fdtdec_test.c | 8 ++++++-- 3 files changed, 12 insertions(+), 28 deletions(-)
Quoted 4 lines
Hi Simon,
you picked up patch 1/2 of this set. Did you have any comments on v2, or did you overlook it?
I marked it as superseded.
http://patchwork.ozlabs.org/patch/1085480/
Is that incorrect?
Regards,
Simon
PATCH 2/2 fdtdec: Remove fdt_{addr,size}_unpack()
Quoted 19 lines · Simon Glass
Hi Thierry,
Quoted 16 lines · Thierry Reding
Quoted 11 lines · Thierry Reding
From: Thierry Reding <[email protected]>
U-Boot already defines the {upper,lower}_32_bits() macros that have the same purpose. Use the existing macros instead of defining new APIs.
Signed-off-by Thierry Reding <[email protected]>--- include/fdtdec.h | 24 ------------------------ lib/fdtdec.c | 8 ++++++-- lib/fdtdec_test.c | 8 ++++++-- 3 files changed, 12 insertions(+), 28 deletions(-)Hi Simon,
Quoted 8 lines
Quoted 2 lines
you picked up patch 1/2 of this set. Did you have any comments on v2, or did you overlook it?
I marked it as superseded.
http://patchwork.ozlabs.org/patch/1085480/
Is that incorrect?
I think I messed up my earlier email. What I meant to say was whether you had any comments on patch 2/2. There's no v2 of this patch and it hasn't been applied. It's also not superseeded by anything. So I think this should still be applied.
Thierry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190507/69ec294b/attachment.sig>