staging: sm750fb: make fix_id array fully const
Subsystems (2)
PATCH v2 1/1 staging: sm750fb: make fix_id array fully const
The fix_id array contains constant string literals, but the array itself is currently mutable. Make the array const so that the compiler can place it in the .rodata section.
This fixes the checkpatch warning:
static const char * array should probably be static const char * const
--- drivers/staging/sm750fb/sm750.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/sm750fb/sm750.c +1 -1
@@ -740,7 +740,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) "kernel HELPERS prepared vesa_modes", }; -static const char *fix_id[2 ] = { +static const char *const fix_id[2 ] = {"sm750_fb1" ,"sm750_fb2" , };
Signature · 1 line
2.43.0
PATCH v2 1/1 staging: sm750fb: replace magic number with jiffies timeout
The hardware wait loop in hw_sm750_de_wait used a hardcoded loop counter (0x10000000), which depends on CPU speed and is unreliable.
Replace the loop counter with a jiffies-based timeout (1 second) using time_before(). This ensures consistent delays across architectures.
---
Changes in v2:
- Switched from loop counter to jiffies + cpu_relax() as requested by Greg KH.
--- drivers/staging/sm750fb/sm750_hw.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)
drivers/staging/sm750fb/sm750_hw.c +17 -4
@@ -523,19 +523,32 @@ int hw_sm750le_de_wait(void)int hw_sm750_de_wait (void ) { -int i =0x10000000 ; +/* Wait for 1 second (HZ) */ +unsigned long timeout = jiffies +HZ ;unsigned int mask =SYSTEM_CTRL_DE_STATUS_BUSY |SYSTEM_CTRL_DE_FIFO_EMPTY |SYSTEM_CTRL_DE_MEM_FIFO_EMPTY ; +unsigned int val; -while (i--) { -unsigned int val =peek32 (SYSTEM_CTRL ); +/* Run while Current Time is BEFORE the Deadline */ +while (time_before (jiffies, timeout)) { + val =peek32 (SYSTEM_CTRL ); +/* If Not Busy (0) AND Buffers Empty (1), we are good */ if ((val & mask) == (SYSTEM_CTRL_DE_FIFO_EMPTY |SYSTEM_CTRL_DE_MEM_FIFO_EMPTY ))return 0 ; + +/* Polite pause to save power */ +cpu_relax (); } -/* timeout error */ + +/* Final check in case we succeeded at the last millisecond */ + val =peek32 (SYSTEM_CTRL ); +if ((val & mask) == + (SYSTEM_CTRL_DE_FIFO_EMPTY |SYSTEM_CTRL_DE_MEM_FIFO_EMPTY )) +return 0 ; +return -1 ; }
Signature · 1 line
2.43.0
Greg KH
maintainerRe: [PATCH v2] staging: sm750fb: replace magic number with jiffies timeout
Quoted 19 lines · Madhumitha Sundar
The hardware wait loop in
hw_sm750_de_waitused a hardcoded loop counter (0x10000000), which depends on CPU speed and is unreliable.Replace the loop counter with a jiffies-based timeout (1 second) using
time_before(). This ensures consistent delays across architectures.Signed-off-by Madhumitha Sundar <[email protected]>---
Changes in v2:
- Switched from loop counter to jiffies +cpu_relax()as requested by Greg KH.--- drivers/staging/sm750fb/sm750_hw.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-)drivers/staging/sm750fb/sm750_hw.c +0
-0
drivers/staging/sm750fb/sm750_hw.c int hw_sm750le_de_wait(void) · line 526
Quoted 5 lines
drivers/staging/sm750fb/sm750_hw.c +1
-1@@ -523,19 +523,32 @@ int hw_sm750le_de_wait(void)int hw_sm750_de_wait (void ) { -int i =0x10000000 ; +/* Wait for 1 second (HZ) */
No need for a comment, right?
drivers/staging/sm750fb/sm750_hw.c int hw_sm750le_de_wait(void) · line 527
Quoted 1 line
drivers/staging/sm750fb/sm750_hw.c +1
-0+unsigned long timeout = jiffies +HZ ;
Why is a variable needed?
And are you sure 1 second is ok? How short was the original timeout?
drivers/staging/sm750fb/sm750_hw.c int hw_sm750le_de_wait(void) · line 531
Quoted 4 lines
drivers/staging/sm750fb/sm750_hw.c +1
-0unsigned int mask =SYSTEM_CTRL_DE_STATUS_BUSY |SYSTEM_CTRL_DE_FIFO_EMPTY |SYSTEM_CTRL_DE_MEM_FIFO_EMPTY ; +unsigned int val;
Why move this?
drivers/staging/sm750fb/sm750_hw.c int hw_sm750le_de_wait(void) · line 533
Quoted 3 lines
drivers/staging/sm750fb/sm750_hw.c +1
-2-while (i--) { -unsigned int val =peek32 (SYSTEM_CTRL ); +/* Run while Current Time is BEFORE the Deadline */
Run what?
drivers/staging/sm750fb/sm750_hw.c int hw_sm750le_de_wait(void) · line 543
Quoted 10 lines
drivers/staging/sm750fb/sm750_hw.c +6
-0+while (time_before (jiffies, timeout)) { + val =peek32 (SYSTEM_CTRL ); +/* If Not Busy (0) AND Buffers Empty (1), we are good */ if ((val & mask) == (SYSTEM_CTRL_DE_FIFO_EMPTY |SYSTEM_CTRL_DE_MEM_FIFO_EMPTY ))return 0 ; + +/* Polite pause to save power */ +cpu_relax ();
Are you sure you can sleep here?
drivers/staging/sm750fb/sm750_hw.c int hw_sm750le_de_wait(void) · line 546
Quoted 4 lines
drivers/staging/sm750fb/sm750_hw.c +2
-1} -/* timeout error */ + +/* Final check in case we succeeded at the last millisecond */
I do not understand this, why would this matter?
drivers/staging/sm750fb/sm750_hw.c int hw_sm750le_de_wait(void) · line 551
Quoted 5 lines
drivers/staging/sm750fb/sm750_hw.c +5
-0+ val =peek32 (SYSTEM_CTRL ); +if ((val & mask) == + (SYSTEM_CTRL_DE_FIFO_EMPTY |SYSTEM_CTRL_DE_MEM_FIFO_EMPTY )) +return 0 ; +
Was this tested on real hardware?
thanks,
greg k-h
A message that is not in the archive (sent off-list or not yet received): CAPn_1uMTAJYCWE08qd-abag77pDUu52yFsNu_x5=zGPL5b8n+g@mail.gmail.com
Greg KH
maintainerRe: [PATCH v2] staging: sm750fb: replace magic number with jiffies timeout
Quoted 9 lines · MADHU ANAND
My apologies for the private reply and the top-posting. I am resending my responses to the list now and will ensure correct formatting going forward.
You're absolutely right. I over-engineered the implementation and added redundant comments that shouldn't be there.
To address your points:
1.
Sorry, I don't have much context here, you seem to have removed my responses and the original patch entirely :(
Remember, some of us get over 1000 emails a day and context in an email matters to know what is going on.
Quoted 2 lines
I used 1 second (HZ) as a safe upper bound, but since I don't have the hardware to verify the original loop's speed, this was an assumption.
If you are changing timing loops, testing on the real hardware is essencial. Please don't do any sort of logic changes like this without being able to do so.
thanks,
greg k-h
Greg KH
maintainerQuoted 28 lines · Madhumitha Sundar
The
fix_idarray contains constant string literals, but the array itself is currently mutable. Make the array const so that the compiler can place it in the .rodata section.This fixes the checkpatch warning:
static const char * array should probably be static const char * constSigned-off-by Madhumitha Sundar <[email protected]>--- drivers/staging/sm750fb/sm750.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/sm750fb/sm750.c +1
-1@@ -740,7 +740,7 @@ static int lynxfb_set_fbinfo(struct fb_info *info, int index) "kernel HELPERS prepared vesa_modes", }; -static const char *fix_id[2 ] = { +static const char *const fix_id[2 ] = {"sm750_fb1" ,"sm750_fb2" , };Signature · 1 line
2.43.0
Hi,
This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him a patch that has triggered this response. He used to manually respond to these common problems, but in order to save his sanity (he kept writing the same thing over and over, yet to different people), I was created. Hopefully you will not take offence and will fix the problem in your patch and resubmit it so that it can be accepted into the Linux kernel tree.
You are receiving this message because of the following common error(s) as indicated below:
- This looks like a new version of a previously submitted patch, but you did not list below the --- line any changes from the previous version. Please read the section entitled "The canonical patch format" in the kernel file, Documentation/process/submitting-patches.rst for what needs to be done here to properly describe this.
If you wish to discuss this problem further, or you have questions about how to resolve this issue, please feel free to respond to this email and Greg will reply once he has dug out from the pending patches received from other developers.
thanks,
greg k-h's patch email bot