staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd

horiag · gregkh · commit 11270059e8d0 · 2017-04-28T17:51:54.000+02:00
While dpaa2_fd.simple structure fields are marked __leXX, corresponding cpu_to_leXX / leXX_to_cpu conversions are missing. While here, fix dpaa2_fd_{get,set}_bpid such that BMT, IVP bits sharing the 16-bit field with BPID are not affected. Fixes: d3269bd ("bus: fsl-mc: dpio: add frame descriptor and scatter/gather APIs") Signed-off-by: Horia Geantă <horia.geanta@nxp.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/staging/fsl-mc/include/dpaa2-fd.h b/drivers/staging/fsl-mc/include/dpaa2-fd.h
@@ -81,6 +81,7 @@ struct dpaa2_fd {
 #define FD_OFFSET_MASK		0x0FFF
 #define FD_FORMAT_MASK		0x3
 #define FD_FORMAT_SHIFT		12
+#define FD_BPID_MASK		0x3FFF
 #define SG_SHORT_LEN_FLAG_MASK	0x1
 #define SG_SHORT_LEN_FLAG_SHIFT	14
 #define SG_SHORT_LEN_MASK	0x1FFFF
@@ -105,7 +106,7 @@ enum dpaa2_fd_format {
  */
 static inline dma_addr_t dpaa2_fd_get_addr(const struct dpaa2_fd *fd)
 {
-	return (dma_addr_t)fd->simple.addr;
+	return (dma_addr_t)le64_to_cpu(fd->simple.addr);
 }
 
 /**
@@ -115,7 +116,7 @@ static inline dma_addr_t dpaa2_fd_get_addr(const struct dpaa2_fd *fd)
  */
 static inline void dpaa2_fd_set_addr(struct dpaa2_fd *fd, dma_addr_t addr)
 {
-	fd->simple.addr = addr;
+	fd->simple.addr = cpu_to_le64(addr);
 }
 
 /**
@@ -126,7 +127,7 @@ static inline void dpaa2_fd_set_addr(struct dpaa2_fd *fd, dma_addr_t addr)
  */
 static inline u32 dpaa2_fd_get_frc(const struct dpaa2_fd *fd)
 {
-	return fd->simple.frc;
+	return le32_to_cpu(fd->simple.frc);
 }
 
 /**
@@ -136,7 +137,7 @@ static inline u32 dpaa2_fd_get_frc(const struct dpaa2_fd *fd)
  */
 static inline void dpaa2_fd_set_frc(struct dpaa2_fd *fd, u32 frc)
 {
-	fd->simple.frc = frc;
+	fd->simple.frc = cpu_to_le32(frc);
 }
 
 /**
@@ -147,7 +148,7 @@ static inline void dpaa2_fd_set_frc(struct dpaa2_fd *fd, u32 frc)
  */
 static inline u32 dpaa2_fd_get_ctrl(const struct dpaa2_fd *fd)
 {
-	return fd->simple.ctrl;
+	return le32_to_cpu(fd->simple.ctrl);
 }
 
 /**
@@ -157,7 +158,7 @@ static inline u32 dpaa2_fd_get_ctrl(const struct dpaa2_fd *fd)
  */
 static inline void dpaa2_fd_set_ctrl(struct dpaa2_fd *fd, u32 ctrl)
 {
-	fd->simple.ctrl = ctrl;
+	fd->simple.ctrl = cpu_to_le32(ctrl);
 }
 
 /**
@@ -168,7 +169,7 @@ static inline void dpaa2_fd_set_ctrl(struct dpaa2_fd *fd, u32 ctrl)
  */
 static inline dma_addr_t dpaa2_fd_get_flc(const struct dpaa2_fd *fd)
 {
-	return (dma_addr_t)fd->simple.flc;
+	return (dma_addr_t)le64_to_cpu(fd->simple.flc);
 }
 
 /**
@@ -178,13 +179,13 @@ static inline dma_addr_t dpaa2_fd_get_flc(const struct dpaa2_fd *fd)
  */
 static inline void dpaa2_fd_set_flc(struct dpaa2_fd *fd,  dma_addr_t flc_addr)
 {
-	fd->simple.flc = flc_addr;
+	fd->simple.flc = cpu_to_le64(flc_addr);
 }
 
 static inline bool dpaa2_fd_short_len(const struct dpaa2_fd *fd)
 {
-	return !!((fd->simple.format_offset >> FD_SHORT_LEN_FLAG_SHIFT)
-		& FD_SHORT_LEN_FLAG_MASK);
+	return !!((le16_to_cpu(fd->simple.format_offset) >>
+		  FD_SHORT_LEN_FLAG_SHIFT) & FD_SHORT_LEN_FLAG_MASK);
 }
 
 /**
@@ -196,9 +197,9 @@ static inline bool dpaa2_fd_short_len(const struct dpaa2_fd *fd)
 static inline u32 dpaa2_fd_get_len(const struct dpaa2_fd *fd)
 {
 	if (dpaa2_fd_short_len(fd))
-		return fd->simple.len & FD_SHORT_LEN_MASK;
+		return le32_to_cpu(fd->simple.len) & FD_SHORT_LEN_MASK;
 
-	return fd->simple.len;
+	return le32_to_cpu(fd->simple.len);
 }
 
 /**
@@ -208,7 +209,7 @@ static inline u32 dpaa2_fd_get_len(const struct dpaa2_fd *fd)
  */
 static inline void dpaa2_fd_set_len(struct dpaa2_fd *fd, u32 len)
 {
-	fd->simple.len = len;
+	fd->simple.len = cpu_to_le32(len);
 }
 
 /**
@@ -219,7 +220,7 @@ static inline void dpaa2_fd_set_len(struct dpaa2_fd *fd, u32 len)
  */
 static inline uint16_t dpaa2_fd_get_offset(const struct dpaa2_fd *fd)
 {
-	return fd->simple.format_offset & FD_OFFSET_MASK;
+	return le16_to_cpu(fd->simple.format_offset) & FD_OFFSET_MASK;
 }
 
 /**
@@ -229,8 +230,8 @@ static inline uint16_t dpaa2_fd_get_offset(const struct dpaa2_fd *fd)
  */
 static inline void dpaa2_fd_set_offset(struct dpaa2_fd *fd, uint16_t offset)
 {
-	fd->simple.format_offset &= ~FD_OFFSET_MASK;
-	fd->simple.format_offset |= offset;
+	fd->simple.format_offset &= cpu_to_le16(~FD_OFFSET_MASK);
+	fd->simple.format_offset |= cpu_to_le16(offset);
 }
 
 /**
@@ -242,7 +243,7 @@ static inline void dpaa2_fd_set_offset(struct dpaa2_fd *fd, uint16_t offset)
 static inline enum dpaa2_fd_format dpaa2_fd_get_format(
 						const struct dpaa2_fd *fd)
 {
-	return (enum dpaa2_fd_format)((fd->simple.format_offset
+	return (enum dpaa2_fd_format)((le16_to_cpu(fd->simple.format_offset)
 				      >> FD_FORMAT_SHIFT) & FD_FORMAT_MASK);
 }
 
@@ -254,8 +255,9 @@ static inline enum dpaa2_fd_format dpaa2_fd_get_format(
 static inline void dpaa2_fd_set_format(struct dpaa2_fd *fd,
 				       enum dpaa2_fd_format format)
 {
-	fd->simple.format_offset &= ~(FD_FORMAT_MASK << FD_FORMAT_SHIFT);
-	fd->simple.format_offset |= format << FD_FORMAT_SHIFT;
+	fd->simple.format_offset &=
+		cpu_to_le16(~(FD_FORMAT_MASK << FD_FORMAT_SHIFT));
+	fd->simple.format_offset |= cpu_to_le16(format << FD_FORMAT_SHIFT);
 }
 
 /**
@@ -266,7 +268,7 @@ static inline void dpaa2_fd_set_format(struct dpaa2_fd *fd,
  */
 static inline uint16_t dpaa2_fd_get_bpid(const struct dpaa2_fd *fd)
 {
-	return fd->simple.bpid;
+	return le16_to_cpu(fd->simple.bpid) & FD_BPID_MASK;
 }
 
 /**
@@ -276,7 +278,8 @@ static inline uint16_t dpaa2_fd_get_bpid(const struct dpaa2_fd *fd)
  */
 static inline void dpaa2_fd_set_bpid(struct dpaa2_fd *fd, uint16_t bpid)
 {
-	fd->simple.bpid = bpid;
+	fd->simple.bpid &= cpu_to_le16(~(FD_BPID_MASK));
+	fd->simple.bpid |= cpu_to_le16(bpid);
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ struct dpaa2_fd {`
`81`	`81`	`#define FD_OFFSET_MASK 0x0FFF`
`82`	`82`	`#define FD_FORMAT_MASK 0x3`
`83`	`83`	`#define FD_FORMAT_SHIFT 12`
	`84`	`+#define FD_BPID_MASK 0x3FFF`
`84`	`85`	`#define SG_SHORT_LEN_FLAG_MASK 0x1`
`85`	`86`	`#define SG_SHORT_LEN_FLAG_SHIFT 14`
`86`	`87`	`#define SG_SHORT_LEN_MASK 0x1FFFF`
`@@ -105,7 +106,7 @@ enum dpaa2_fd_format {`
`105`	`106`	`*/`
`106`	`107`	`static inline dma_addr_t dpaa2_fd_get_addr(const struct dpaa2_fd *fd)`
`107`	`108`	`{`
`108`		`- return (dma_addr_t)fd->simple.addr;`
	`109`	`+ return (dma_addr_t)le64_to_cpu(fd->simple.addr);`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`/**`
`@@ -115,7 +116,7 @@ static inline dma_addr_t dpaa2_fd_get_addr(const struct dpaa2_fd *fd)`
`115`	`116`	`*/`
`116`	`117`	`static inline void dpaa2_fd_set_addr(struct dpaa2_fd *fd, dma_addr_t addr)`
`117`	`118`	`{`
`118`		`- fd->simple.addr = addr;`
	`119`	`+ fd->simple.addr = cpu_to_le64(addr);`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`/**`
`@@ -126,7 +127,7 @@ static inline void dpaa2_fd_set_addr(struct dpaa2_fd *fd, dma_addr_t addr)`
`126`	`127`	`*/`
`127`	`128`	`static inline u32 dpaa2_fd_get_frc(const struct dpaa2_fd *fd)`
`128`	`129`	`{`
`129`		`- return fd->simple.frc;`
	`130`	`+ return le32_to_cpu(fd->simple.frc);`
`130`	`131`	`}`
`131`	`132`
`132`	`133`	`/**`
`@@ -136,7 +137,7 @@ static inline u32 dpaa2_fd_get_frc(const struct dpaa2_fd *fd)`
`136`	`137`	`*/`
`137`	`138`	`static inline void dpaa2_fd_set_frc(struct dpaa2_fd *fd, u32 frc)`
`138`	`139`	`{`
`139`		`- fd->simple.frc = frc;`
	`140`	`+ fd->simple.frc = cpu_to_le32(frc);`
`140`	`141`	`}`
`141`	`142`
`142`	`143`	`/**`
`@@ -147,7 +148,7 @@ static inline void dpaa2_fd_set_frc(struct dpaa2_fd *fd, u32 frc)`
`147`	`148`	`*/`
`148`	`149`	`static inline u32 dpaa2_fd_get_ctrl(const struct dpaa2_fd *fd)`
`149`	`150`	`{`
`150`		`- return fd->simple.ctrl;`
	`151`	`+ return le32_to_cpu(fd->simple.ctrl);`
`151`	`152`	`}`
`152`	`153`
`153`	`154`	`/**`
`@@ -157,7 +158,7 @@ static inline u32 dpaa2_fd_get_ctrl(const struct dpaa2_fd *fd)`
`157`	`158`	`*/`
`158`	`159`	`static inline void dpaa2_fd_set_ctrl(struct dpaa2_fd *fd, u32 ctrl)`
`159`	`160`	`{`
`160`		`- fd->simple.ctrl = ctrl;`
	`161`	`+ fd->simple.ctrl = cpu_to_le32(ctrl);`
`161`	`162`	`}`
`162`	`163`
`163`	`164`	`/**`
`@@ -168,7 +169,7 @@ static inline void dpaa2_fd_set_ctrl(struct dpaa2_fd *fd, u32 ctrl)`
`168`	`169`	`*/`
`169`	`170`	`static inline dma_addr_t dpaa2_fd_get_flc(const struct dpaa2_fd *fd)`
`170`	`171`	`{`
`171`		`- return (dma_addr_t)fd->simple.flc;`
	`172`	`+ return (dma_addr_t)le64_to_cpu(fd->simple.flc);`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`/**`
`@@ -178,13 +179,13 @@ static inline dma_addr_t dpaa2_fd_get_flc(const struct dpaa2_fd *fd)`
`178`	`179`	`*/`
`179`	`180`	`static inline void dpaa2_fd_set_flc(struct dpaa2_fd *fd, dma_addr_t flc_addr)`
`180`	`181`	`{`
`181`		`- fd->simple.flc = flc_addr;`
	`182`	`+ fd->simple.flc = cpu_to_le64(flc_addr);`
`182`	`183`	`}`
`183`	`184`
`184`	`185`	`static inline bool dpaa2_fd_short_len(const struct dpaa2_fd *fd)`
`185`	`186`	`{`
`186`		`- return !!((fd->simple.format_offset >> FD_SHORT_LEN_FLAG_SHIFT)`
`187`		`- & FD_SHORT_LEN_FLAG_MASK);`
	`187`	`+ return !!((le16_to_cpu(fd->simple.format_offset) >>`
	`188`	`+ FD_SHORT_LEN_FLAG_SHIFT) & FD_SHORT_LEN_FLAG_MASK);`
`188`	`189`	`}`
`189`	`190`
`190`	`191`	`/**`
`@@ -196,9 +197,9 @@ static inline bool dpaa2_fd_short_len(const struct dpaa2_fd *fd)`
`196`	`197`	`static inline u32 dpaa2_fd_get_len(const struct dpaa2_fd *fd)`
`197`	`198`	`{`
`198`	`199`	`if (dpaa2_fd_short_len(fd))`
`199`		`- return fd->simple.len & FD_SHORT_LEN_MASK;`
	`200`	`+ return le32_to_cpu(fd->simple.len) & FD_SHORT_LEN_MASK;`
`200`	`201`
`201`		`- return fd->simple.len;`
	`202`	`+ return le32_to_cpu(fd->simple.len);`
`202`	`203`	`}`
`203`	`204`
`204`	`205`	`/**`
`@@ -208,7 +209,7 @@ static inline u32 dpaa2_fd_get_len(const struct dpaa2_fd *fd)`
`208`	`209`	`*/`
`209`	`210`	`static inline void dpaa2_fd_set_len(struct dpaa2_fd *fd, u32 len)`
`210`	`211`	`{`
`211`		`- fd->simple.len = len;`
	`212`	`+ fd->simple.len = cpu_to_le32(len);`
`212`	`213`	`}`
`213`	`214`
`214`	`215`	`/**`
`@@ -219,7 +220,7 @@ static inline void dpaa2_fd_set_len(struct dpaa2_fd *fd, u32 len)`
`219`	`220`	`*/`
`220`	`221`	`static inline uint16_t dpaa2_fd_get_offset(const struct dpaa2_fd *fd)`
`221`	`222`	`{`
`222`		`- return fd->simple.format_offset & FD_OFFSET_MASK;`
	`223`	`+ return le16_to_cpu(fd->simple.format_offset) & FD_OFFSET_MASK;`
`223`	`224`	`}`
`224`	`225`
`225`	`226`	`/**`
`@@ -229,8 +230,8 @@ static inline uint16_t dpaa2_fd_get_offset(const struct dpaa2_fd *fd)`
`229`	`230`	`*/`
`230`	`231`	`static inline void dpaa2_fd_set_offset(struct dpaa2_fd *fd, uint16_t offset)`
`231`	`232`	`{`
`232`		`- fd->simple.format_offset &= ~FD_OFFSET_MASK;`
`233`		`- fd->simple.format_offset \|= offset;`
	`233`	`+ fd->simple.format_offset &= cpu_to_le16(~FD_OFFSET_MASK);`
	`234`	`+ fd->simple.format_offset \|= cpu_to_le16(offset);`
`234`	`235`	`}`
`235`	`236`
`236`	`237`	`/**`
`@@ -242,7 +243,7 @@ static inline void dpaa2_fd_set_offset(struct dpaa2_fd *fd, uint16_t offset)`
`242`	`243`	`static inline enum dpaa2_fd_format dpaa2_fd_get_format(`
`243`	`244`	`const struct dpaa2_fd *fd)`
`244`	`245`	`{`
`245`		`- return (enum dpaa2_fd_format)((fd->simple.format_offset`
	`246`	`+ return (enum dpaa2_fd_format)((le16_to_cpu(fd->simple.format_offset)`
`246`	`247`	`>> FD_FORMAT_SHIFT) & FD_FORMAT_MASK);`
`247`	`248`	`}`
`248`	`249`
`@@ -254,8 +255,9 @@ static inline enum dpaa2_fd_format dpaa2_fd_get_format(`
`254`	`255`	`static inline void dpaa2_fd_set_format(struct dpaa2_fd *fd,`
`255`	`256`	`enum dpaa2_fd_format format)`
`256`	`257`	`{`
`257`		`- fd->simple.format_offset &= ~(FD_FORMAT_MASK << FD_FORMAT_SHIFT);`
`258`		`- fd->simple.format_offset \|= format << FD_FORMAT_SHIFT;`
	`258`	`+ fd->simple.format_offset &=`
	`259`	`+ cpu_to_le16(~(FD_FORMAT_MASK << FD_FORMAT_SHIFT));`
	`260`	`+ fd->simple.format_offset \|= cpu_to_le16(format << FD_FORMAT_SHIFT);`
`259`	`261`	`}`
`260`	`262`
`261`	`263`	`/**`
`@@ -266,7 +268,7 @@ static inline void dpaa2_fd_set_format(struct dpaa2_fd *fd,`
`266`	`268`	`*/`
`267`	`269`	`static inline uint16_t dpaa2_fd_get_bpid(const struct dpaa2_fd *fd)`
`268`	`270`	`{`
`269`		`- return fd->simple.bpid;`
	`271`	`+ return le16_to_cpu(fd->simple.bpid) & FD_BPID_MASK;`
`270`	`272`	`}`
`271`	`273`
`272`	`274`	`/**`
`@@ -276,7 +278,8 @@ static inline uint16_t dpaa2_fd_get_bpid(const struct dpaa2_fd *fd)`
`276`	`278`	`*/`
`277`	`279`	`static inline void dpaa2_fd_set_bpid(struct dpaa2_fd *fd, uint16_t bpid)`
`278`	`280`	`{`
`279`		`- fd->simple.bpid = bpid;`
	`281`	`+ fd->simple.bpid &= cpu_to_le16(~(FD_BPID_MASK));`
	`282`	`+ fd->simple.bpid \|= cpu_to_le16(bpid);`
`280`	`283`	`}`
`281`	`284`
`282`	`285`	`/**`