From patchwork Fri Mar 10 19:47:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Gardner X-Patchwork-Id: 737556 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3vfyTh5Dzyz9s7x; Sat, 11 Mar 2017 06:47:36 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical-com.20150623.gappssmtp.com header.i=@canonical-com.20150623.gappssmtp.com header.b="RUjXInLo"; dkim-atps=neutral Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1cmQVh-0002kV-7G; Fri, 10 Mar 2017 19:47:33 +0000 Received: from mail-it0-f49.google.com ([209.85.214.49]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1cmQVc-0002kL-6q for kernel-team@lists.ubuntu.com; Fri, 10 Mar 2017 19:47:28 +0000 Received: by mail-it0-f49.google.com with SMTP id m27so2645036iti.1 for ; Fri, 10 Mar 2017 11:47:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=+taJeZfuGEPWeaOBo0RZ1GO+DDU+HW6WiC6/rRC4kuI=; b=RUjXInLowXrQDBGTwgZQfRAAocObNX5ROSOzeP6HNXDjvv9O1S4V30yEXD6T8oJZTS 9Oll1pBrP4RveQJ7jmmwXouGfzeuSycnVz6zOu93xc7uq+8skfdeaGTuD3ywcjYatuGT XRALnF4pSd3lyT12/O9HyM9bcYComalk69RWg0OMl+ERaSZX+FjPj3s/lDEmjGo51MQf Yp59FzzL79/6Zurxu/BeXX4ikmSPCM3dK6ESBRa8tBupUkDBsHa7Fje+Ghk3y7NXmx+H hqzdiXVlz6zjssWglyyaXBOewv/rAc0MuBe9AuYZhONrmS3vJBlcUtT2wb3GR/8Z3SCb 1Itw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=+taJeZfuGEPWeaOBo0RZ1GO+DDU+HW6WiC6/rRC4kuI=; b=CqNsUtDNkBIB7BoaLTqYqbQPW1gzQ3tb+m39aV0beUemS+IB4x8HNLwWa6XpHkHn5q N6hC3z8ylZhIgtQt3HttOrDZ6hgCiwV63jlNrE17hH+VWmZDOxjYkSMSgPk4grogXyOi AlUNnfWrYqrKRy8xSBB2yeQNcrSxj5ff/bOoZzd0ejpefzIz9+uOOIhhz7R8hD0k3+QM H/C3xnJlUWVo4bxZdVB1ivBk8nO96J59RLub8Fn3nuyffSl6kwFrpT1q8OqaJvfyqLUF XfJk9QlgxaOqj9GANYPPcyIMz4uPWQbAKXj1rBOW8L8e2McMEGWPsnCweU76cYL79YJ4 B2Ww== X-Gm-Message-State: AFeK/H3imcx5XImOfqV2vBTPaRUXzBTnP7Jy6CLWymnVJ8C2FHs5HW6EHjyPjuBl1EbSYBXv X-Received: by 10.36.224.130 with SMTP id c124mr737621ith.18.1489175246877; Fri, 10 Mar 2017 11:47:26 -0800 (PST) Received: from localhost.localdomain (host-98-127-250-84.bln-mt.client.bresnan.net. [98.127.250.84]) by smtp.gmail.com with ESMTPSA id k186sm161589ita.30.2017.03.10.11.47.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Mar 2017 11:47:26 -0800 (PST) From: Tim Gardner To: kernel-team@lists.ubuntu.com Subject: [PATCH Yakkety SRU] powerpc/64: Fix checksum folding in csum_add() Date: Fri, 10 Mar 2017 12:47:22 -0700 Message-Id: <1489175242-29020-1-git-send-email-tim.gardner@canonical.com> X-Mailer: git-send-email 2.7.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Shile Zhang BugLink: http://bugs.launchpad.net/bugs/1670247 Paul's patch to fix checksum folding, commit b492f7e4e07a ("powerpc/64: Fix checksum folding in csum_tcpudp_nofold and ip_fast_csum_nofold") missed a case in csum_add(). Fix it. Signed-off-by: Shile Zhang Acked-by: Paul Mackerras Signed-off-by: Michael Ellerman (cherry picked from commit 6ad966d7303b70165228dba1ee8da1a05c10eefe) Signed-off-by: Tim Gardner --- arch/powerpc/include/asm/checksum.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/checksum.h b/arch/powerpc/include/asm/checksum.h index 1e8fceb..a67bb09 100644 --- a/arch/powerpc/include/asm/checksum.h +++ b/arch/powerpc/include/asm/checksum.h @@ -100,7 +100,7 @@ static inline __wsum csum_add(__wsum csum, __wsum addend) #ifdef __powerpc64__ res += (__force u64)addend; - return (__force __wsum)((u32)res + (res >> 32)); + return (__force __wsum) from64to32(res); #else asm("addc %0,%0,%1;" "addze %0,%0;"