From patchwork Mon Oct 30 13:38:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gilad Ben-Yossef X-Patchwork-Id: 117487 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp2661597edm; Mon, 30 Oct 2017 06:38:16 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SdA10zYSsj//sLkdB1A0l3K+xdtiEa0v00ey7fH3wQM2pqo/VO+FULkN9p89aswTFv24bz X-Received: by 10.98.159.210 with SMTP id v79mr9020757pfk.162.1509370696434; Mon, 30 Oct 2017 06:38:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509370696; cv=none; d=google.com; s=arc-20160816; b=apt1kw9gBb5hHXl4AUr989tf69PROPe0yqvTLmgyTwTjLC/q+p1sGrQ8rkmHwwDq5u CDtxjyU5EmQevOQbP9+Q8tg2XHhq+UXCdH9SACD+gBwFWOaq6LPuFZ4RXPLewfjObNpD eAXes1wE3hVN/FHL6YTIjHYF0eRIQ6aezINPJsgcPK3BVm17gPHia5x6fXvZhVZWP6Ae T3NAZtMKjCdbg+2CxAyMwig4cUs8cME6W+27HsQoEnFp06piKPDnX/b4zz8V++szqqhA yzMnlkhguA2RD7dtKT7Ok0fnSe8VW8GQu1VPN7OdV0OtiRlyGixwRwplfcBMnwbqNcYj CznA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=iXo7tcki3H+l+v811zw9+fHF81NulQ+SSXY2W+F25iY=; b=ZBQPHIf4N/kH/yJr4kib0qbjaGpvS6xC+tF/+hYld7qUT3ex9Tsw4wwtkp84MdZaW+ AOWfi+CVxEdLdZeQjgmS9kg2ldln+N34VejHMoqAN+/IIMmsxwOzvxP3lTlvxzJtUddK 5+V57+iiUiKeYb8TddrTYDpR1Zjz/B9q71dQM0spVL3xivcXP+hH4vN1+GRqmQ+lQFeH mEDPU2fUt1IMH3tV80bOaS9oys/KGAoP03MeAKolWbq56+58fz1msu/Kr1XIcNpPXuEu +/uMpV2KpCcn3QkvbGk2Bw4WJv6ZYDcrdfqnivFAQ3+IFH5s/Ms+QYnE41QHxhlM2JyW hq5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m184si10842178pfb.484.2017.10.30.06.38.15; Mon, 30 Oct 2017 06:38:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751746AbdJ3NiO (ORCPT + 9 others); Mon, 30 Oct 2017 09:38:14 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:52544 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751532AbdJ3NiO (ORCPT ); Mon, 30 Oct 2017 09:38:14 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B25121529; Mon, 30 Oct 2017 06:38:13 -0700 (PDT) Received: from sugar.kfn.arm.com (unknown [10.45.48.167]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 38BC33F25D; Mon, 30 Oct 2017 06:38:11 -0700 (PDT) From: Gilad Ben-Yossef To: Greg Kroah-Hartman Cc: Ofir Drang , Stuart Yoder , stable@vger.kernel.org, linux-crypto@vger.kernel.org, driverdev-devel@linuxdriverproject.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: ccree: fix 64 bit scatter/gather DMA ops Date: Mon, 30 Oct 2017 13:38:03 +0000 Message-Id: <1509370683-10725-1-git-send-email-gilad@benyossef.com> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Fix a wrong offset used in splitting a 64 DMA address to MSB/LSB parts needed for scatter/gather HW descriptors causing operations relying on them to fail on 64 bit platforms. Fixes: c6f7f2f4591f ("staging: ccree: refactor LLI access macros") Reported-by: Stuart Yoder Signed-off-by: Gilad Ben-Yossef Cc: stable@vger.kernel.org --- drivers/staging/ccree/cc_lli_defs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/staging/ccree/cc_lli_defs.h b/drivers/staging/ccree/cc_lli_defs.h index 851d390..a9c417b 100644 --- a/drivers/staging/ccree/cc_lli_defs.h +++ b/drivers/staging/ccree/cc_lli_defs.h @@ -59,7 +59,7 @@ static inline void cc_lli_set_addr(u32 *lli_p, dma_addr_t addr) lli_p[LLI_WORD0_OFFSET] = (addr & U32_MAX); #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT lli_p[LLI_WORD1_OFFSET] &= ~LLI_HADDR_MASK; - lli_p[LLI_WORD1_OFFSET] |= FIELD_PREP(LLI_HADDR_MASK, (addr >> 16)); + lli_p[LLI_WORD1_OFFSET] |= FIELD_PREP(LLI_HADDR_MASK, (addr >> 32)); #endif /* CONFIG_ARCH_DMA_ADDR_T_64BIT */ }