Skip to contentSkip to conversation

staging: most: Using macro DIV_ROUND_UP

PATCH Superseded simran singhal 3 participants 5 messages Feb 22, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 2/7 staging: most: Using macro DIV_ROUND_UP

The macro DIV_ROUND_UP performs the computation (((n) + (d) - 1) /(d)). It clarifies the divisor calculations. This occurence was detected using the coccinelle script:

@@
expression e1;
expression e2;
@@
(
- ((e1) + e2 - 1) / (e2)
+ DIV_ROUND_UP(e1,e2)
|
- ((e1) + (e2 - 1)) / (e2)
+ DIV_ROUND_UP(e1,e2)
)

---

v2:
-Included kernel.h as DIV_ROUND_UP is defined in it,
before it was giving compilation error.

 drivers/staging/most/hdm-dim2/dim2_hal.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/staging/most/hdm-dim2/dim2_hal.c +4 -3
index 0b9816c..d604ec09 100644
@@ -18,6 +18,7 @@
 #include "dim2_errors.h"
 #include "dim2_reg.h"
 #include <linux/stddef.h>
+#include <linux/kernel.h>
 
 /*
  * Size factor for isochronous DBR buffer.
@@ -49,7 +50,7 @@
 #define DBR_SIZE  (16 * 1024) /* specified by IP */
 #define DBR_BLOCK_SIZE  (DBR_SIZE / 32 / DBR_MAP_SIZE)
 
-#define ROUND_UP_TO(x, d)  (((x) + (d) - 1) / (d) * (d))
+#define ROUND_UP_TO(x, d)  (DIV_ROUND_UP(x, (d)) * (d))
 
 /* -------------------------------------------------------------------------- */
 /* generic helper functions and macros */
@@ -117,7 +118,7 @@ static int alloc_dbr(u16 size)
 		return DBR_SIZE; /* out of memory */
 
 	for (i = 0; i < DBR_MAP_SIZE; i++) {
-		u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / DBR_BLOCK_SIZE;
+		u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
 		u32 mask = ~((~(u32)0) << blocks);
 
 		do {
@@ -137,7 +138,7 @@ static int alloc_dbr(u16 size)
 static void free_dbr(int offs, int size)
 {
 	int block_idx = offs / DBR_BLOCK_SIZE;
-	u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / DBR_BLOCK_SIZE;
+	u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
 	u32 mask = ~((~(u32)0) << blocks);
 
 	mask <<= block_idx % 32;
Signature · 1 line
2.7.4
#1 lore raw

drivers/staging/most/hdm-dim2/dim2_hal.c static int alloc_dbr(u16 size) · line 122

Quoted 7 lines
drivers/staging/most/hdm-dim2/dim2_hal.c +1 -1
@@ -117,7 +118,7 @@ static int alloc_dbr(u16 size)
 		return DBR_SIZE; /* out of memory */
 
 	for (i = 0; i < DBR_MAP_SIZE; i++) {
-		u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / DBR_BLOCK_SIZE;
+		u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
 		u32 mask = ~((~(u32)0) << blocks);

Totally unrelated to DIV_ROUND_UP, would this code be a candidate for GENMASK?

julia

Quoted 21 lines
drivers/staging/most/hdm-dim2/dim2_hal.c +1 -2
 		do {
@@ -137,7 +138,7 @@ static int alloc_dbr(u16 size)
 static void free_dbr(int offs, int size)
 {
 	int block_idx = offs / DBR_BLOCK_SIZE;
-	u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / DBR_BLOCK_SIZE;
+	u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
 	u32 mask = ~((~(u32)0) << blocks);
 
 	mask <<= block_idx % 32;
--

2.7.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20170222091015.GA11058%40singhal-Inspiron-5558.
For more options, visit https://groups.google.com/d/optout.

#2 lore raw
Quoted 10 lines · Julia Lawall

drivers/staging/most/hdm-dim2/dim2_hal.c static int alloc_dbr(u16 size) · line 122

Quoted 7 lines
drivers/staging/most/hdm-dim2/dim2_hal.c +1 -1
@@ -117,7 +118,7 @@ static int alloc_dbr(u16 size)
 		return DBR_SIZE; /* out of memory */
 
 	for (i = 0; i < DBR_MAP_SIZE; i++) {
-		u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / DBR_BLOCK_SIZE;
+		u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
 		u32 mask = ~((~(u32)0) << blocks);

Totally unrelated to DIV_ROUND_UP, would this code be a candidate for GENMASK?

Maybe "(1 << blocks) - 1" would be more intelligible.

#3 lore raw
In reply to Julia Lawall
Quoted 10 lines · Julia Lawall

drivers/staging/most/hdm-dim2/dim2_hal.c static int alloc_dbr(u16 size) · line 120

Quoted 6 lines
drivers/staging/most/hdm-dim2/dim2_hal.c +0 -1
@@ -117,7 +118,7 @@ static int alloc_dbr(u16 size) 
                 return DBR_SIZE; /* out of memory */ 
 
         for (i = 0; i < DBR_MAP_SIZE; i++) { 
-                u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / 

DBR_BLOCK_SIZE;

Review static int alloc_dbr(u16 size) · line 122

Quoted 2 lines
(quoted diff) +1 -0
+                u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE); 
                 u32 mask = ~((~(u32)0) << blocks); 
Quoted 7 lines

Totally unrelated to DIV_ROUND_UP, would this code be a candidate for GENMASK?

Not sure, what you are trying to say.

julia

Quoted 29 lines

drivers/staging/most/hdm-dim2/dim2_hal.c static int alloc_dbr(u16 size) · line 140

Quoted 8 lines
drivers/staging/most/hdm-dim2/dim2_hal.c +0 -1
                 do { 
@@ -137,7 +138,7 @@ static int alloc_dbr(u16 size) 
 static void free_dbr(int offs, int size) 
 { 
         int block_idx = offs / DBR_BLOCK_SIZE; 
-        u32 const blocks = (size + DBR_BLOCK_SIZE - 1) / 

DBR_BLOCK_SIZE;

Quoted 9 lines
drivers/staging/most/hdm-dim2/dim2_hal.c +1 -0
+        u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE); 
         u32 mask = ~((~(u32)0) << blocks); 
 
         mask <<= block_idx % 32; 
Signature · 4 lines
2.7.4 

-- 
You received this message because you are subscribed to the Google 

Groups "outreachy-kernel" group.

Quoted 1 line

To unsubscribe from this group and stop receiving emails from it, send

an email to [email protected] <javascript:>.

Quoted 1 line

To post to this group, send email to [email protected]

<javascript:>.

Quoted 1 line

To view this discussion on the web visit

https://groups.google.com/d/msgid/outreachy-kernel/20170222091015.GA11058%40singhal-Inspiron-5558.

Quoted 2 lines

For more options, visit https://groups.google.com/d/optout.

#4 lore raw
Quoted 13 lines · SIMRAN SINGHAL

On Wednesday, February 22, 2017 at 2:57:17 PM UTC+5:30, Julia Lawall wrote:
> @@ -117,7 +118,7 @@ static int alloc_dbr(u16 size)
>                  return DBR_SIZE; /* out of memory */
>
>          for (i = 0; i < DBR_MAP_SIZE; i++) {
> -                u32 const blocks = (size + DBR_BLOCK_SIZE -
1) / DBR_BLOCK_SIZE;
> +                u32 const blocks = DIV_ROUND_UP(size, DBR_BLOCK_SIZE);
>                  u32 mask = ~((~(u32)0) << blocks);

Quoted 6 lines

Totally unrelated to DIV_ROUND_UP, would this code be a candidate for
GENMASK?


Not sure, what you are trying to say.

There was a discussion on the list recently about GENMASK, which allows to create a mask containing a sequence of 1s, like 000011110000. It looks like that is what is being done here, because ~0 is 11111111 and then it ie being shifted left and all the bits inverted. But Joe had another suggestion. One could double check that his suggestion gives the right result.

julia

Quoted 44 lines

      julia

      >
      >                  do {
      > @@ -137,7 +138,7 @@ static int alloc_dbr(u16 size)
      >  static void free_dbr(int offs, int size)
      >  {
      >          int block_idx = offs / DBR_BLOCK_SIZE;
      > -        u32 const blocks = (size + DBR_BLOCK_SIZE - 1) /
      DBR_BLOCK_SIZE;
      > +        u32 const blocks = DIV_ROUND_UP(size,
      DBR_BLOCK_SIZE);
      >          u32 mask = ~((~(u32)0) << blocks);
      >
      >          mask <<= block_idx % 32;
      > --
      > 2.7.4
      >
      > --
      > You received this message because you are subscribed to the
      Google Groups "outreachy-kernel" group.
      > To unsubscribe from this group and stop receiving emails from
      it, send an email to [email protected].
      > To post to this group, send email to
      [email protected].
      > To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/20170222091015.GA11058%4
      0singhal-Inspiron-5558.
      > For more options, visit https://groups.google.com/d/optout.
      >

--
You received this message because you are subscribed to the Google Groups
"outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an
email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visithttps://groups.google.com/d/msgid/outreachy-kernel/d1716b00-a408-4f3c-8c17- 04a70acca4dd%40googlegroups.com.
For more options, visit https://groups.google.com/d/optout.