[dpdk-stable] patch 'net/sfc/base: fix SAL annotation for input buffers' has been queued to LTS release 17.11.5

[Yongseok Koh]

Hi,

FYI, your patch has been queued to LTS release 17.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/01/18. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the patch applied
to the branch. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Yongseok

---
>From f93359831a5c13261db9da15285297400d353306 Mon Sep 17 00:00:00 2001
From: Martin Harvey <mharvey at solarflare.com>
Date: Mon, 10 Sep 2018 10:33:04 +0100
Subject: [PATCH] net/sfc/base: fix SAL annotation for input buffers

[ upstream commit d0e22de5bd4da4c28dafc4b09e9631b37d302b21 ]

Fixes: d96a34d165b1 ("net/sfc/base: import NVRAM support")

Signed-off-by: Martin Harvey <mharvey at solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
---
 drivers/net/sfc/base/ef10_impl.h  | 2 +-
 drivers/net/sfc/base/ef10_nvram.c | 2 +-
 drivers/net/sfc/base/efx_impl.h   | 2 +-
 drivers/net/sfc/base/efx_nvram.c  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
index 8f9eb7a39..d573a81f7 100644
--- a/drivers/net/sfc/base/ef10_impl.h
+++ b/drivers/net/sfc/base/ef10_impl.h
@@ -454,7 +454,7 @@ ef10_nvram_partn_write(
 	__in			efx_nic_t *enp,
 	__in			uint32_t partn,
 	__in			unsigned int offset,
-	__out_bcount(size)	caddr_t data,
+	__in_bcount(size)	caddr_t data,
 	__in			size_t size);
 
 extern	__checkReturn		efx_rc_t
diff --git a/drivers/net/sfc/base/ef10_nvram.c b/drivers/net/sfc/base/ef10_nvram.c
index 3f9d37503..b020d482d 100644
--- a/drivers/net/sfc/base/ef10_nvram.c
+++ b/drivers/net/sfc/base/ef10_nvram.c
@@ -1994,7 +1994,7 @@ ef10_nvram_partn_write(
 	__in			efx_nic_t *enp,
 	__in			uint32_t partn,
 	__in			unsigned int offset,
-	__out_bcount(size)	caddr_t data,
+	__in_bcount(size)	caddr_t data,
 	__in			size_t size)
 {
 	size_t chunk;
diff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h
index 53fa37ac5..bec20f7fb 100644
--- a/drivers/net/sfc/base/efx_impl.h
+++ b/drivers/net/sfc/base/efx_impl.h
@@ -556,7 +556,7 @@ efx_mcdi_nvram_write(
 	__in			efx_nic_t *enp,
 	__in			uint32_t partn,
 	__in			uint32_t offset,
-	__out_bcount(size)	caddr_t data,
+	__in_bcount(size)	caddr_t data,
 	__in			size_t size);
 
 	__checkReturn		efx_rc_t
diff --git a/drivers/net/sfc/base/efx_nvram.c b/drivers/net/sfc/base/efx_nvram.c
index 6ee2a71d6..7ea307b6d 100644
--- a/drivers/net/sfc/base/efx_nvram.c
+++ b/drivers/net/sfc/base/efx_nvram.c
@@ -854,7 +854,7 @@ efx_mcdi_nvram_write(
 	__in			efx_nic_t *enp,
 	__in			uint32_t partn,
 	__in			uint32_t offset,
-	__out_bcount(size)	caddr_t data,
+	__in_bcount(size)	caddr_t data,
 	__in			size_t size)
 {
 	efx_mcdi_req_t req;
-- 
2.11.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-11-29 15:01:45.960275235 -0800
+++ 0015-net-sfc-base-fix-SAL-annotation-for-input-buffers.patch	2018-11-29 15:01:44.995961000 -0800
@@ -1,10 +1,11 @@
-From d0e22de5bd4da4c28dafc4b09e9631b37d302b21 Mon Sep 17 00:00:00 2001
+From f93359831a5c13261db9da15285297400d353306 Mon Sep 17 00:00:00 2001
 From: Martin Harvey <mharvey at solarflare.com>
 Date: Mon, 10 Sep 2018 10:33:04 +0100
 Subject: [PATCH] net/sfc/base: fix SAL annotation for input buffers
 
+[ upstream commit d0e22de5bd4da4c28dafc4b09e9631b37d302b21 ]
+
 Fixes: d96a34d165b1 ("net/sfc/base: import NVRAM support")
-Cc: stable at dpdk.org
 
 Signed-off-by: Martin Harvey <mharvey at solarflare.com>
 Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
@@ -16,10 +17,10 @@
  4 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/sfc/base/ef10_impl.h b/drivers/net/sfc/base/ef10_impl.h
-index 4751faf16..fb0d98875 100644
+index 8f9eb7a39..d573a81f7 100644
 --- a/drivers/net/sfc/base/ef10_impl.h
 +++ b/drivers/net/sfc/base/ef10_impl.h
-@@ -453,7 +453,7 @@ ef10_nvram_partn_write(
+@@ -454,7 +454,7 @@ ef10_nvram_partn_write(
  	__in			efx_nic_t *enp,
  	__in			uint32_t partn,
  	__in			unsigned int offset,
@@ -29,10 +30,10 @@
  
  extern	__checkReturn		efx_rc_t
 diff --git a/drivers/net/sfc/base/ef10_nvram.c b/drivers/net/sfc/base/ef10_nvram.c
-index 0d885ccdf..46838dd75 100644
+index 3f9d37503..b020d482d 100644
 --- a/drivers/net/sfc/base/ef10_nvram.c
 +++ b/drivers/net/sfc/base/ef10_nvram.c
-@@ -2000,7 +2000,7 @@ ef10_nvram_partn_write(
+@@ -1994,7 +1994,7 @@ ef10_nvram_partn_write(
  	__in			efx_nic_t *enp,
  	__in			uint32_t partn,
  	__in			unsigned int offset,
@@ -42,10 +43,10 @@
  {
  	size_t chunk;
 diff --git a/drivers/net/sfc/base/efx_impl.h b/drivers/net/sfc/base/efx_impl.h
-index 548834f90..637e31e0c 100644
+index 53fa37ac5..bec20f7fb 100644
 --- a/drivers/net/sfc/base/efx_impl.h
 +++ b/drivers/net/sfc/base/efx_impl.h
-@@ -583,7 +583,7 @@ efx_mcdi_nvram_write(
+@@ -556,7 +556,7 @@ efx_mcdi_nvram_write(
  	__in			efx_nic_t *enp,
  	__in			uint32_t partn,
  	__in			uint32_t offset,
@@ -55,10 +56,10 @@
  
  	__checkReturn		efx_rc_t
 diff --git a/drivers/net/sfc/base/efx_nvram.c b/drivers/net/sfc/base/efx_nvram.c
-index be409c3af..f3107bbb5 100644
+index 6ee2a71d6..7ea307b6d 100644
 --- a/drivers/net/sfc/base/efx_nvram.c
 +++ b/drivers/net/sfc/base/efx_nvram.c
-@@ -865,7 +865,7 @@ efx_mcdi_nvram_write(
+@@ -854,7 +854,7 @@ efx_mcdi_nvram_write(
  	__in			efx_nic_t *enp,
  	__in			uint32_t partn,
  	__in			uint32_t offset,