From: Michal Kalderon Date: Sun, 21 Oct 2018 08:56:18 +0000 (+0300) Subject: qed: Fix shmem structure inconsistency between driver and the mfw. X-Git-Tag: vofed-4.17-rc2~4 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2cc885d2bf63c9c563662b1a0e33c5fdd5233ad2;p=compat-rdma%2Fcompat-rdma.git qed: Fix shmem structure inconsistency between driver and the mfw. The structure shared between driver and the management FW (mfw) differ in sizes. This would lead to issues when driver try to access the structure members which are not-aligned with the mfw copy e.g., data_ptr usage in the case of mfw_tlv request. Align the driver structure with mfw copy, add reserved field(s) to driver structure for the members not used by the driver. Fixes: dd006921d67f ("qed: Add MFW interfaces for TLV request support.) Signed-off-by: Sudarsana Reddy Kalluru Signed-off-by: Michal Kalderon --- diff --git a/linux-next-cherry-picks/0047-qed-Fix-shmem-structure-inconsistency-between-driver.patch b/linux-next-cherry-picks/0047-qed-Fix-shmem-structure-inconsistency-between-driver.patch new file mode 100644 index 0000000..06c104b --- /dev/null +++ b/linux-next-cherry-picks/0047-qed-Fix-shmem-structure-inconsistency-between-driver.patch @@ -0,0 +1,35 @@ +From 5f672090e44f4951084c5e1d6b0668a5fc422af8 Mon Sep 17 00:00:00 2001 +From: Sudarsana Reddy Kalluru +Date: Thu, 27 Sep 2018 04:12:10 -0700 +Subject: [PATCH] qed: Fix shmem structure inconsistency between driver and the + mfw. + +The structure shared between driver and the management FW (mfw) differ in +sizes. This would lead to issues when driver try to access the structure +members which are not-aligned with the mfw copy e.g., data_ptr usage in the +case of mfw_tlv request. +Align the driver structure with mfw copy, add reserved field(s) to driver +structure for the members not used by the driver. + +Fixes: dd006921d67f ("qed: Add MFW interfaces for TLV request support.) +Signed-off-by: Sudarsana Reddy Kalluru +Signed-off-by: Michal Kalderon +--- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/ethernet/qlogic/qed/qed_hsi.h b/drivers/net/ethernet/qlogic/qed/qed_hsi.h +index 9b3ef00e..a713826 100644 +--- a/drivers/net/ethernet/qlogic/qed/qed_hsi.h ++++ b/drivers/net/ethernet/qlogic/qed/qed_hsi.h +@@ -11987,6 +11987,7 @@ struct public_global { + u32 running_bundle_id; + s32 external_temperature; + u32 mdump_reason; ++ u64 reserved; + u32 data_ptr; + u32 data_size; + }; +-- +1.8.3.1 +