From patchwork Fri Jan 26 12:53:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 10185567 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9C5DD602C8 for ; Fri, 26 Jan 2018 12:53:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E7A8289DA for ; Fri, 26 Jan 2018 12:53:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81815290E3; Fri, 26 Jan 2018 12:53:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 314A9289DA for ; Fri, 26 Jan 2018 12:53:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751993AbeAZMxY (ORCPT ); Fri, 26 Jan 2018 07:53:24 -0500 Received: from smtpbg65.qq.com ([103.7.28.233]:30280 "EHLO smtpbg65.qq.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751458AbeAZMxX (ORCPT ); Fri, 26 Jan 2018 07:53:23 -0500 X-QQ-mid: bizesmtp14t1516971191tkfe55p7 Received: from software.domain.org (unknown [222.92.8.142]) by esmtp4.qq.com (ESMTP) with id ; Fri, 26 Jan 2018 20:52:46 +0800 (CST) X-QQ-SSF: 01100000004000F0FOF2B00A0000000 X-QQ-FEAT: nSUdqPGu3ttrBdCs0J2QvfqFx8u1wrs3FKMAvT0N735PLHEP7vuiODuH2Gk2w pTRNSL+rQPu/8iPKw3lXKdY5Tg5o8s2TjWKpeOJpyEbvZWFh3iXrLxbMH8M82RaccKda5Si 7facuD6xDVwJA7m7fjhKAntXgKRc4UNeAh05e+lPWNEpnpU+O9/H69DK3xn5e2dxznA+nUH 5sIXdtf71XbFBtB38iN4TE3HgRYkNvW2L7e9AKi+vvtO473IgNcGgKM2hJlOqwuCYCdP+x0 EyK1nozbqG4AGlZuYBNB9zOJBHz6/rHNQ47w== X-QQ-GoodBg: 0 From: Huacai Chen To: James Smart , Dick Kennedy Cc: "James E . J . Bottomley" , "Martin K . Petersen" , Fuxin Zhang , linux-scsi@vger.kernel.org, Huacai Chen , stable@vger.kernel.org Subject: [PATCH] scsi: lpfc: Switch memcpy_fromio() to __read32_copy() Date: Fri, 26 Jan 2018 20:53:06 +0800 Message-Id: <1516971186-20372-1-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:lemote.com:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In commit bc73905abf770192 ("[SCSI] lpfc 8.3.16: SLI Additions, updates, and code cleanup"), lpfc_memcpy_to_slim() have switched memcpy_toio() to __write32_copy() in order to prevent unaligned 64 bit copy. Recently, we found that lpfc_memcpy_from_slim() have similar issues, so let it switch memcpy_fromio() to __read32_copy(). Cc: stable@vger.kernel.org Signed-off-by: Huacai Chen --- drivers/scsi/lpfc/lpfc_compat.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_compat.h b/drivers/scsi/lpfc/lpfc_compat.h index 6b32b0a..47d4fad 100644 --- a/drivers/scsi/lpfc/lpfc_compat.h +++ b/drivers/scsi/lpfc/lpfc_compat.h @@ -91,8 +91,8 @@ lpfc_memcpy_to_slim( void __iomem *dest, void *src, unsigned int bytes) static inline void lpfc_memcpy_from_slim( void *dest, void __iomem *src, unsigned int bytes) { - /* actually returns 1 byte past dest */ - memcpy_fromio( dest, src, bytes); + /* convert bytes in argument list to word count for copy function */ + __ioread32_copy(dest, src, bytes / sizeof(uint32_t)); } #endif /* __BIG_ENDIAN */