* [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks
@ 2018-02-15 6:08 Andre Heider
2018-02-15 6:08 ` [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs Andre Heider
2018-02-15 8:59 ` [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks Lukasz Majewski
0 siblings, 2 replies; 8+ messages in thread
From: Andre Heider @ 2018-02-15 6:08 UTC (permalink / raw)
To: u-boot
Cosmetic change.
Signed-off-by: Andre Heider <a.heider@gmail.com>
---
cmd/usb_gadget_sdp.c | 4 ++--
common/spl/spl_sdp.c | 4 ++--
drivers/usb/gadget/f_sdp.c | 14 +++++++-------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index ae4d73c125..97d00ec545 100644
--- a/cmd/usb_gadget_sdp.c
+++ b/cmd/usb_gadget_sdp.c
@@ -28,13 +28,13 @@ static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
ret = sdp_init(controller_index);
if (ret) {
- pr_err("SDP init failed: %d", ret);
+ pr_err("SDP init failed: %d\n", ret);
goto exit;
}
/* This command typically does not return but jumps to an image */
sdp_handle(controller_index);
- pr_err("SDP ended");
+ pr_err("SDP ended\n");
exit:
g_dnl_unregister();
diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index 333d518f4d..0c4603a3db 100644
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -24,13 +24,13 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,
ret = sdp_init(controller_index);
if (ret) {
- pr_err("SDP init failed: %d", ret);
+ pr_err("SDP init failed: %d\n", ret);
return -ENODEV;
}
/* This command typically does not return but jumps to an image */
sdp_handle(controller_index);
- pr_err("SDP ended");
+ pr_err("SDP ended\n");
return -EINVAL;
}
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index dd7b9cddb1..6da0530095 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -238,12 +238,12 @@ static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)
u8 report = data[0];
if (status != 0) {
- pr_err("Status: %d", status);
+ pr_err("Status: %d\n", status);
return;
}
if (report != 1) {
- pr_err("Unexpected report %d", report);
+ pr_err("Unexpected report %d\n", report);
return;
}
@@ -323,12 +323,12 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req)
int datalen = req->length - 1;
if (status != 0) {
- pr_err("Status: %d", status);
+ pr_err("Status: %d\n", status);
return;
}
if (report != 2) {
- pr_err("Unexpected report %d", report);
+ pr_err("Unexpected report %d\n", report);
return;
}
@@ -361,7 +361,7 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req)
sdp->state = SDP_STATE_TX_SEC_CONF;
break;
default:
- pr_err("Invalid state: %d", sdp->state);
+ pr_err("Invalid state: %d\n", sdp->state);
}
}
@@ -371,7 +371,7 @@ static void sdp_tx_complete(struct usb_ep *ep, struct usb_request *req)
int status = req->status;
if (status != 0) {
- pr_err("Status: %d", status);
+ pr_err("Status: %d\n", status);
return;
}
@@ -394,7 +394,7 @@ static void sdp_tx_complete(struct usb_ep *ep, struct usb_request *req)
sdp->state = SDP_STATE_IDLE;
break;
default:
- pr_err("Wrong State: %d", sdp->state);
+ pr_err("Wrong State: %d\n", sdp->state);
sdp->state = SDP_STATE_IDLE;
break;
}
--
2.16.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs
2018-02-15 6:08 [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks Andre Heider
@ 2018-02-15 6:08 ` Andre Heider
2018-02-15 8:49 ` Lukasz Majewski
2018-02-15 9:17 ` [U-Boot] [PATCH v2 2/2] usb: gadget: sdp: fix pointer cast warnings " Andre Heider
2018-02-15 8:59 ` [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks Lukasz Majewski
1 sibling, 2 replies; 8+ messages in thread
From: Andre Heider @ 2018-02-15 6:08 UTC (permalink / raw)
To: u-boot
The SDP protocol contains multiple 32bit pointers. Add a helper function
to get a valid pointer from these values and use it.
Signed-off-by: Andre Heider <a.heider@gmail.com>
---
drivers/usb/gadget/f_sdp.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 6da0530095..43c5cfbb77 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -230,6 +230,11 @@ static struct usb_gadget_strings *sdp_generic_strings[] = {
NULL,
};
+static inline void *sdp_ptr(u32 val)
+{
+ return (void *)(uintptr_t)val;
+}
+
static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)
{
struct f_sdp *sdp = req->context;
@@ -344,7 +349,7 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req)
}
if (sdp->state == SDP_STATE_RX_FILE_DATA) {
- memcpy((void *)sdp->dnl_address, req->buf + 1, datalen);
+ memcpy(sdp_ptr(sdp->dnl_address), req->buf + 1, datalen);
sdp->dnl_address += datalen;
}
@@ -622,7 +627,7 @@ static u32 sdp_jump_imxheader(void *address)
}
printf("Jumping to 0x%08x\n", headerv2->entry);
- entry = (void *)headerv2->entry;
+ entry = sdp_ptr(headerv2->entry);
entry();
/* The image probably never returns hence we won't reach that point */
@@ -665,7 +670,7 @@ static void sdp_handle_in_ep(void)
if (datalen > 64)
datalen = 64;
- memcpy(&data[1], (void *)sdp_func->dnl_address, datalen);
+ memcpy(&data[1], sdp_ptr(sdp_func->dnl_address), datalen);
sdp_func->in_req->length = 65;
sdp_func->dnl_bytes_remaining -= datalen;
@@ -676,7 +681,7 @@ static void sdp_handle_in_ep(void)
break;
case SDP_STATE_JUMP:
printf("Jumping to header at 0x%08x\n", sdp_func->jmp_address);
- status = sdp_jump_imxheader((void *)sdp_func->jmp_address);
+ status = sdp_jump_imxheader(sdp_ptr(sdp_func->jmp_address));
/* If imx header fails, try some U-Boot specific headers */
if (status) {
--
2.16.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs
2018-02-15 6:08 ` [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs Andre Heider
@ 2018-02-15 8:49 ` Lukasz Majewski
2018-02-15 8:58 ` Andre Heider
2018-02-15 9:17 ` [U-Boot] [PATCH v2 2/2] usb: gadget: sdp: fix pointer cast warnings " Andre Heider
1 sibling, 1 reply; 8+ messages in thread
From: Lukasz Majewski @ 2018-02-15 8:49 UTC (permalink / raw)
To: u-boot
Hi Andre,
> The SDP protocol contains multiple 32bit pointers. Add a helper
> function to get a valid pointer from these values and use it.
Is there any special rationale behind this?
>
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
> drivers/usb/gadget/f_sdp.c | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
> index 6da0530095..43c5cfbb77 100644
> --- a/drivers/usb/gadget/f_sdp.c
> +++ b/drivers/usb/gadget/f_sdp.c
> @@ -230,6 +230,11 @@ static struct usb_gadget_strings
> *sdp_generic_strings[] = { NULL,
> };
>
> +static inline void *sdp_ptr(u32 val)
> +{
> + return (void *)(uintptr_t)val;
> +}
From what I see from the code the (void *) cast shall be enough.
> +
> static void sdp_rx_command_complete(struct usb_ep *ep, struct
> usb_request *req) {
> struct f_sdp *sdp = req->context;
> @@ -344,7 +349,7 @@ static void sdp_rx_data_complete(struct usb_ep
> *ep, struct usb_request *req) }
>
> if (sdp->state == SDP_STATE_RX_FILE_DATA) {
> - memcpy((void *)sdp->dnl_address, req->buf + 1,
> datalen);
> + memcpy(sdp_ptr(sdp->dnl_address), req->buf + 1,
> datalen); sdp->dnl_address += datalen;
> }
>
> @@ -622,7 +627,7 @@ static u32 sdp_jump_imxheader(void *address)
> }
>
> printf("Jumping to 0x%08x\n", headerv2->entry);
> - entry = (void *)headerv2->entry;
> + entry = sdp_ptr(headerv2->entry);
> entry();
>
> /* The image probably never returns hence we won't reach
> that point */ @@ -665,7 +670,7 @@ static void sdp_handle_in_ep(void)
> if (datalen > 64)
> datalen = 64;
>
> - memcpy(&data[1], (void *)sdp_func->dnl_address,
> datalen);
> + memcpy(&data[1], sdp_ptr(sdp_func->dnl_address),
> datalen); sdp_func->in_req->length = 65;
>
> sdp_func->dnl_bytes_remaining -= datalen;
> @@ -676,7 +681,7 @@ static void sdp_handle_in_ep(void)
> break;
> case SDP_STATE_JUMP:
> printf("Jumping to header at 0x%08x\n",
> sdp_func->jmp_address);
> - status = sdp_jump_imxheader((void
> *)sdp_func->jmp_address);
> + status =
> sdp_jump_imxheader(sdp_ptr(sdp_func->jmp_address));
> /* If imx header fails, try some U-Boot specific
> headers */ if (status) {
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180215/e1fa5bc7/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs
2018-02-15 8:49 ` Lukasz Majewski
@ 2018-02-15 8:58 ` Andre Heider
2018-02-15 9:06 ` Lukasz Majewski
0 siblings, 1 reply; 8+ messages in thread
From: Andre Heider @ 2018-02-15 8:58 UTC (permalink / raw)
To: u-boot
Hi Lukasz,
On 15/02/18 09:49, Lukasz Majewski wrote:
> Hi Andre,
>
>> The SDP protocol contains multiple 32bit pointers. Add a helper
>> function to get a valid pointer from these values and use it.
>
> Is there any special rationale behind this?
It's been a while, but if i remember correctly SDP worked on 64bit.
This fixes at least warnings on 64bit:
warning: cast to pointer from integer of different size
[-Wint-to-pointer-cast]
Should I reword that?
Thanks,
Andre
>
>>
>> Signed-off-by: Andre Heider <a.heider@gmail.com>
>> ---
>> drivers/usb/gadget/f_sdp.c | 13 +++++++++----
>> 1 file changed, 9 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
>> index 6da0530095..43c5cfbb77 100644
>> --- a/drivers/usb/gadget/f_sdp.c
>> +++ b/drivers/usb/gadget/f_sdp.c
>> @@ -230,6 +230,11 @@ static struct usb_gadget_strings
>> *sdp_generic_strings[] = { NULL,
>> };
>>
>> +static inline void *sdp_ptr(u32 val)
>> +{
>> + return (void *)(uintptr_t)val;
>> +}
>
> From what I see from the code the (void *) cast shall be enough.
>
>> +
>> static void sdp_rx_command_complete(struct usb_ep *ep, struct
>> usb_request *req) {
>> struct f_sdp *sdp = req->context;
>> @@ -344,7 +349,7 @@ static void sdp_rx_data_complete(struct usb_ep
>> *ep, struct usb_request *req) }
>>
>> if (sdp->state == SDP_STATE_RX_FILE_DATA) {
>> - memcpy((void *)sdp->dnl_address, req->buf + 1,
>> datalen);
>> + memcpy(sdp_ptr(sdp->dnl_address), req->buf + 1,
>> datalen); sdp->dnl_address += datalen;
>> }
>>
>> @@ -622,7 +627,7 @@ static u32 sdp_jump_imxheader(void *address)
>> }
>>
>> printf("Jumping to 0x%08x\n", headerv2->entry);
>> - entry = (void *)headerv2->entry;
>> + entry = sdp_ptr(headerv2->entry);
>> entry();
>>
>> /* The image probably never returns hence we won't reach
>> that point */ @@ -665,7 +670,7 @@ static void sdp_handle_in_ep(void)
>> if (datalen > 64)
>> datalen = 64;
>>
>> - memcpy(&data[1], (void *)sdp_func->dnl_address,
>> datalen);
>> + memcpy(&data[1], sdp_ptr(sdp_func->dnl_address),
>> datalen); sdp_func->in_req->length = 65;
>>
>> sdp_func->dnl_bytes_remaining -= datalen;
>> @@ -676,7 +681,7 @@ static void sdp_handle_in_ep(void)
>> break;
>> case SDP_STATE_JUMP:
>> printf("Jumping to header at 0x%08x\n",
>> sdp_func->jmp_address);
>> - status = sdp_jump_imxheader((void
>> *)sdp_func->jmp_address);
>> + status =
>> sdp_jump_imxheader(sdp_ptr(sdp_func->jmp_address));
>> /* If imx header fails, try some U-Boot specific
>> headers */ if (status) {
>
>
>
>
> Best regards,
>
> Lukasz Majewski
>
> --
>
> DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks
2018-02-15 6:08 [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks Andre Heider
2018-02-15 6:08 ` [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs Andre Heider
@ 2018-02-15 8:59 ` Lukasz Majewski
2018-02-15 9:15 ` Stefan Agner
1 sibling, 1 reply; 8+ messages in thread
From: Lukasz Majewski @ 2018-02-15 8:59 UTC (permalink / raw)
To: u-boot
On Thu, 15 Feb 2018 07:08:55 +0100
Andre Heider <a.heider@gmail.com> wrote:
> Cosmetic change.
>
> Signed-off-by: Andre Heider <a.heider@gmail.com>
> ---
> cmd/usb_gadget_sdp.c | 4 ++--
> common/spl/spl_sdp.c | 4 ++--
> drivers/usb/gadget/f_sdp.c | 14 +++++++-------
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
> index ae4d73c125..97d00ec545 100644
> --- a/cmd/usb_gadget_sdp.c
> +++ b/cmd/usb_gadget_sdp.c
> @@ -28,13 +28,13 @@ static int do_sdp(cmd_tbl_t *cmdtp, int flag, int
> argc, char * const argv[])
> ret = sdp_init(controller_index);
> if (ret) {
> - pr_err("SDP init failed: %d", ret);
> + pr_err("SDP init failed: %d\n", ret);
> goto exit;
> }
>
> /* This command typically does not return but jumps to an
> image */ sdp_handle(controller_index);
> - pr_err("SDP ended");
> + pr_err("SDP ended\n");
>
> exit:
> g_dnl_unregister();
> diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
> index 333d518f4d..0c4603a3db 100644
> --- a/common/spl/spl_sdp.c
> +++ b/common/spl/spl_sdp.c
> @@ -24,13 +24,13 @@ static int spl_sdp_load_image(struct
> spl_image_info *spl_image,
> ret = sdp_init(controller_index);
> if (ret) {
> - pr_err("SDP init failed: %d", ret);
> + pr_err("SDP init failed: %d\n", ret);
> return -ENODEV;
> }
>
> /* This command typically does not return but jumps to an
> image */ sdp_handle(controller_index);
> - pr_err("SDP ended");
> + pr_err("SDP ended\n");
>
> return -EINVAL;
> }
> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
> index dd7b9cddb1..6da0530095 100644
> --- a/drivers/usb/gadget/f_sdp.c
> +++ b/drivers/usb/gadget/f_sdp.c
> @@ -238,12 +238,12 @@ static void sdp_rx_command_complete(struct
> usb_ep *ep, struct usb_request *req) u8 report = data[0];
>
> if (status != 0) {
> - pr_err("Status: %d", status);
> + pr_err("Status: %d\n", status);
> return;
> }
>
> if (report != 1) {
> - pr_err("Unexpected report %d", report);
> + pr_err("Unexpected report %d\n", report);
> return;
> }
>
> @@ -323,12 +323,12 @@ static void sdp_rx_data_complete(struct usb_ep
> *ep, struct usb_request *req) int datalen = req->length - 1;
>
> if (status != 0) {
> - pr_err("Status: %d", status);
> + pr_err("Status: %d\n", status);
> return;
> }
>
> if (report != 2) {
> - pr_err("Unexpected report %d", report);
> + pr_err("Unexpected report %d\n", report);
> return;
> }
>
> @@ -361,7 +361,7 @@ static void sdp_rx_data_complete(struct usb_ep
> *ep, struct usb_request *req) sdp->state = SDP_STATE_TX_SEC_CONF;
> break;
> default:
> - pr_err("Invalid state: %d", sdp->state);
> + pr_err("Invalid state: %d\n", sdp->state);
> }
> }
>
> @@ -371,7 +371,7 @@ static void sdp_tx_complete(struct usb_ep *ep,
> struct usb_request *req) int status = req->status;
>
> if (status != 0) {
> - pr_err("Status: %d", status);
> + pr_err("Status: %d\n", status);
> return;
> }
>
> @@ -394,7 +394,7 @@ static void sdp_tx_complete(struct usb_ep *ep,
> struct usb_request *req) sdp->state = SDP_STATE_IDLE;
> break;
> default:
> - pr_err("Wrong State: %d", sdp->state);
> + pr_err("Wrong State: %d\n", sdp->state);
> sdp->state = SDP_STATE_IDLE;
> break;
> }
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180215/2223037f/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs
2018-02-15 8:58 ` Andre Heider
@ 2018-02-15 9:06 ` Lukasz Majewski
0 siblings, 0 replies; 8+ messages in thread
From: Lukasz Majewski @ 2018-02-15 9:06 UTC (permalink / raw)
To: u-boot
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="windows-1254", Size: 3764 bytes --]
Hi Andre,
> Hi Lukasz,
>
> On 15/02/18 09:49, Lukasz Majewski wrote:
> > Hi Andre,
> >
> >> The SDP protocol contains multiple 32bit pointers. Add a helper
> >> function to get a valid pointer from these values and use it.
> >
> > Is there any special rationale behind this?
>
> It's been a while, but if i remember correctly SDP worked on 64bit.
>
> This fixes at least warnings on 64bit:
> warning: cast to pointer from integer of different size
> [-Wint-to-pointer-cast]
>
> Should I reword that?
Yes, please.
Also please add the info regarding the warning, which we try to remove.
Best regards,
Łukasz Majewski
>
> Thanks,
> Andre
>
> >
> >>
> >> Signed-off-by: Andre Heider <a.heider@gmail.com>
> >> ---
> >> drivers/usb/gadget/f_sdp.c | 13 +++++++++----
> >> 1 file changed, 9 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/drivers/usb/gadget/f_sdp.c
> >> b/drivers/usb/gadget/f_sdp.c index 6da0530095..43c5cfbb77 100644
> >> --- a/drivers/usb/gadget/f_sdp.c
> >> +++ b/drivers/usb/gadget/f_sdp.c
> >> @@ -230,6 +230,11 @@ static struct usb_gadget_strings
> >> *sdp_generic_strings[] = { NULL,
> >> };
> >>
> >> +static inline void *sdp_ptr(u32 val)
> >> +{
> >> + return (void *)(uintptr_t)val;
> >> +}
> >
> > From what I see from the code the (void *) cast shall be enough.
> >
> >> +
> >> static void sdp_rx_command_complete(struct usb_ep *ep, struct
> >> usb_request *req) {
> >> struct f_sdp *sdp = req->context;
> >> @@ -344,7 +349,7 @@ static void sdp_rx_data_complete(struct usb_ep
> >> *ep, struct usb_request *req) }
> >>
> >> if (sdp->state == SDP_STATE_RX_FILE_DATA) {
> >> - memcpy((void *)sdp->dnl_address, req->buf + 1,
> >> datalen);
> >> + memcpy(sdp_ptr(sdp->dnl_address), req->buf + 1,
> >> datalen); sdp->dnl_address += datalen;
> >> }
> >>
> >> @@ -622,7 +627,7 @@ static u32 sdp_jump_imxheader(void *address)
> >> }
> >>
> >> printf("Jumping to 0x%08x\n", headerv2->entry);
> >> - entry = (void *)headerv2->entry;
> >> + entry = sdp_ptr(headerv2->entry);
> >> entry();
> >>
> >> /* The image probably never returns hence we won't reach
> >> that point */ @@ -665,7 +670,7 @@ static void
> >> sdp_handle_in_ep(void) if (datalen > 64)
> >> datalen = 64;
> >>
> >> - memcpy(&data[1], (void *)sdp_func->dnl_address,
> >> datalen);
> >> + memcpy(&data[1], sdp_ptr(sdp_func->dnl_address),
> >> datalen); sdp_func->in_req->length = 65;
> >>
> >> sdp_func->dnl_bytes_remaining -= datalen;
> >> @@ -676,7 +681,7 @@ static void sdp_handle_in_ep(void)
> >> break;
> >> case SDP_STATE_JUMP:
> >> printf("Jumping to header at 0x%08x\n",
> >> sdp_func->jmp_address);
> >> - status = sdp_jump_imxheader((void
> >> *)sdp_func->jmp_address);
> >> + status =
> >> sdp_jump_imxheader(sdp_ptr(sdp_func->jmp_address));
> >> /* If imx header fails, try some U-Boot specific
> >> headers */ if (status) {
> >
> >
> >
> >
> > Best regards,
> >
> > Lukasz Majewski
> >
> > --
> >
> > DENX Software Engineering GmbH, Managing Director: Wolfgang
> > Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell,
> > Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email:
> > wd at denx.de
>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180215/8ea5398d/attachment.sig>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks
2018-02-15 8:59 ` [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks Lukasz Majewski
@ 2018-02-15 9:15 ` Stefan Agner
0 siblings, 0 replies; 8+ messages in thread
From: Stefan Agner @ 2018-02-15 9:15 UTC (permalink / raw)
To: u-boot
On 15.02.2018 09:59, Lukasz Majewski wrote:
> On Thu, 15 Feb 2018 07:08:55 +0100
> Andre Heider <a.heider@gmail.com> wrote:
>
>> Cosmetic change.
Hm, this got introduced by
commit 9b643e312d52 ("treewide: replace with error() with pr_err()")
error() did print the newline...
Acked-by: Stefan Agner <stefan.agner@toradex.com>
Best regards,
Stefan
>>
>> Signed-off-by: Andre Heider <a.heider@gmail.com>
>> ---
>> cmd/usb_gadget_sdp.c | 4 ++--
>> common/spl/spl_sdp.c | 4 ++--
>> drivers/usb/gadget/f_sdp.c | 14 +++++++-------
>> 3 files changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
>> index ae4d73c125..97d00ec545 100644
>> --- a/cmd/usb_gadget_sdp.c
>> +++ b/cmd/usb_gadget_sdp.c
>> @@ -28,13 +28,13 @@ static int do_sdp(cmd_tbl_t *cmdtp, int flag, int
>> argc, char * const argv[])
>> ret = sdp_init(controller_index);
>> if (ret) {
>> - pr_err("SDP init failed: %d", ret);
>> + pr_err("SDP init failed: %d\n", ret);
>> goto exit;
>> }
>>
>> /* This command typically does not return but jumps to an
>> image */ sdp_handle(controller_index);
>> - pr_err("SDP ended");
>> + pr_err("SDP ended\n");
>>
>> exit:
>> g_dnl_unregister();
>> diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
>> index 333d518f4d..0c4603a3db 100644
>> --- a/common/spl/spl_sdp.c
>> +++ b/common/spl/spl_sdp.c
>> @@ -24,13 +24,13 @@ static int spl_sdp_load_image(struct
>> spl_image_info *spl_image,
>> ret = sdp_init(controller_index);
>> if (ret) {
>> - pr_err("SDP init failed: %d", ret);
>> + pr_err("SDP init failed: %d\n", ret);
>> return -ENODEV;
>> }
>>
>> /* This command typically does not return but jumps to an
>> image */ sdp_handle(controller_index);
>> - pr_err("SDP ended");
>> + pr_err("SDP ended\n");
>>
>> return -EINVAL;
>> }
>> diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
>> index dd7b9cddb1..6da0530095 100644
>> --- a/drivers/usb/gadget/f_sdp.c
>> +++ b/drivers/usb/gadget/f_sdp.c
>> @@ -238,12 +238,12 @@ static void sdp_rx_command_complete(struct
>> usb_ep *ep, struct usb_request *req) u8 report = data[0];
>>
>> if (status != 0) {
>> - pr_err("Status: %d", status);
>> + pr_err("Status: %d\n", status);
>> return;
>> }
>>
>> if (report != 1) {
>> - pr_err("Unexpected report %d", report);
>> + pr_err("Unexpected report %d\n", report);
>> return;
>> }
>>
>> @@ -323,12 +323,12 @@ static void sdp_rx_data_complete(struct usb_ep
>> *ep, struct usb_request *req) int datalen = req->length - 1;
>>
>> if (status != 0) {
>> - pr_err("Status: %d", status);
>> + pr_err("Status: %d\n", status);
>> return;
>> }
>>
>> if (report != 2) {
>> - pr_err("Unexpected report %d", report);
>> + pr_err("Unexpected report %d\n", report);
>> return;
>> }
>>
>> @@ -361,7 +361,7 @@ static void sdp_rx_data_complete(struct usb_ep
>> *ep, struct usb_request *req) sdp->state = SDP_STATE_TX_SEC_CONF;
>> break;
>> default:
>> - pr_err("Invalid state: %d", sdp->state);
>> + pr_err("Invalid state: %d\n", sdp->state);
>> }
>> }
>>
>> @@ -371,7 +371,7 @@ static void sdp_tx_complete(struct usb_ep *ep,
>> struct usb_request *req) int status = req->status;
>>
>> if (status != 0) {
>> - pr_err("Status: %d", status);
>> + pr_err("Status: %d\n", status);
>> return;
>> }
>>
>> @@ -394,7 +394,7 @@ static void sdp_tx_complete(struct usb_ep *ep,
>> struct usb_request *req) sdp->state = SDP_STATE_IDLE;
>> break;
>> default:
>> - pr_err("Wrong State: %d", sdp->state);
>> + pr_err("Wrong State: %d\n", sdp->state);
>> sdp->state = SDP_STATE_IDLE;
>> break;
>> }
>
> Reviewed-by: Lukasz Majewski <lukma@denx.de>
>
> Best regards,
>
> Lukasz Majewski
>
> --
>
> DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
> HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
> Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
^ permalink raw reply [flat|nested] 8+ messages in thread
* [U-Boot] [PATCH v2 2/2] usb: gadget: sdp: fix pointer cast warnings for 64bit archs
2018-02-15 6:08 ` [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs Andre Heider
2018-02-15 8:49 ` Lukasz Majewski
@ 2018-02-15 9:17 ` Andre Heider
1 sibling, 0 replies; 8+ messages in thread
From: Andre Heider @ 2018-02-15 9:17 UTC (permalink / raw)
To: u-boot
The SDP protocol contains multiple 32bit pointers. Add a helper function
to get a valid pointer from these values and use it.
This fixes the following warnings:
drivers/usb/gadget/f_sdp.c: In function ‘sdp_rx_data_complete’:
drivers/usb/gadget/f_sdp.c:347:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
memcpy((void *)sdp->dnl_address, req->buf + 1, datalen);
^
drivers/usb/gadget/f_sdp.c: In function ‘sdp_jump_imxheader’:
drivers/usb/gadget/f_sdp.c:625:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
entry = (void *)headerv2->entry;
^
drivers/usb/gadget/f_sdp.c: In function ‘sdp_handle_in_ep’:
drivers/usb/gadget/f_sdp.c:668:20: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
memcpy(&data[1], (void *)sdp_func->dnl_address, datalen);
^
drivers/usb/gadget/f_sdp.c:679:31: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
status = sdp_jump_imxheader((void *)sdp_func->jmp_address);
^
Signed-off-by: Andre Heider <a.heider@gmail.com>
---
drivers/usb/gadget/f_sdp.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 6da0530095..43c5cfbb77 100644
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -230,6 +230,11 @@ static struct usb_gadget_strings *sdp_generic_strings[] = {
NULL,
};
+static inline void *sdp_ptr(u32 val)
+{
+ return (void *)(uintptr_t)val;
+}
+
static void sdp_rx_command_complete(struct usb_ep *ep, struct usb_request *req)
{
struct f_sdp *sdp = req->context;
@@ -344,7 +349,7 @@ static void sdp_rx_data_complete(struct usb_ep *ep, struct usb_request *req)
}
if (sdp->state == SDP_STATE_RX_FILE_DATA) {
- memcpy((void *)sdp->dnl_address, req->buf + 1, datalen);
+ memcpy(sdp_ptr(sdp->dnl_address), req->buf + 1, datalen);
sdp->dnl_address += datalen;
}
@@ -622,7 +627,7 @@ static u32 sdp_jump_imxheader(void *address)
}
printf("Jumping to 0x%08x\n", headerv2->entry);
- entry = (void *)headerv2->entry;
+ entry = sdp_ptr(headerv2->entry);
entry();
/* The image probably never returns hence we won't reach that point */
@@ -665,7 +670,7 @@ static void sdp_handle_in_ep(void)
if (datalen > 64)
datalen = 64;
- memcpy(&data[1], (void *)sdp_func->dnl_address, datalen);
+ memcpy(&data[1], sdp_ptr(sdp_func->dnl_address), datalen);
sdp_func->in_req->length = 65;
sdp_func->dnl_bytes_remaining -= datalen;
@@ -676,7 +681,7 @@ static void sdp_handle_in_ep(void)
break;
case SDP_STATE_JUMP:
printf("Jumping to header at 0x%08x\n", sdp_func->jmp_address);
- status = sdp_jump_imxheader((void *)sdp_func->jmp_address);
+ status = sdp_jump_imxheader(sdp_ptr(sdp_func->jmp_address));
/* If imx header fails, try some U-Boot specific headers */
if (status) {
--
2.16.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-02-15 9:17 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-15 6:08 [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks Andre Heider
2018-02-15 6:08 ` [U-Boot] [PATCH 2/2] usb: gadget: sdp: fix pointer casts for 64bit archs Andre Heider
2018-02-15 8:49 ` Lukasz Majewski
2018-02-15 8:58 ` Andre Heider
2018-02-15 9:06 ` Lukasz Majewski
2018-02-15 9:17 ` [U-Boot] [PATCH v2 2/2] usb: gadget: sdp: fix pointer cast warnings " Andre Heider
2018-02-15 8:59 ` [U-Boot] [PATCH 1/2] usb: gadget: sdp: add missing line breaks Lukasz Majewski
2018-02-15 9:15 ` Stefan Agner
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.