From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A9B9BC43381 for ; Thu, 21 Feb 2019 14:49:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E7A920700 for ; Thu, 21 Feb 2019 14:49:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550760599; bh=MjDAR62XqSdMTS9Bn+X4cKAwr40BXJffvvfsBlCYIcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Qu9gXN3gIeB1v104FIDZWdi7zyKgLTwJzq2JfXr1qQsxP9yKS3gz9ioBgDLtl1Ztq WS/IEU5oP1NXnhumdQ7lqa2TaNEeWrRCye6s/Q2k/cOuiuXl2WYo+UMVVV7IQCpuMX CaOBh8lz9eYtTsYT/SDWO3mRoLSkS3t0abC5Xz+o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728791AbfBUOt6 (ORCPT ); Thu, 21 Feb 2019 09:49:58 -0500 Received: from mail.kernel.org ([198.145.29.99]:60860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728301AbfBUOiz (ORCPT ); Thu, 21 Feb 2019 09:38:55 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D7D702084D; Thu, 21 Feb 2019 14:38:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550759935; bh=MjDAR62XqSdMTS9Bn+X4cKAwr40BXJffvvfsBlCYIcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EwOu3/i2tgLw6BhqJ4qXgwOo6xSeSdrtHxx9JCsvaMQQT3MzXycvPQ7HUaWk3jI3M cLbvSK1mt4wpnP/GTW3KHwLrOcxWsqa/32rgVsMBt4kHpxjUJHto84kH/X9zskOPEF UzeCXIewhgZeuabx8PLNy625/kOg+dhWTeyES+fg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexandre Torgue , "David S. Miller" Subject: [PATCH 4.9 06/20] net: stmmac: handle endianness in dwmac4_get_timestamp Date: Thu, 21 Feb 2019 15:35:44 +0100 Message-Id: <20190221125243.078416311@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190221125242.153179182@linuxfoundation.org> References: <20190221125242.153179182@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexandre Torgue [ Upstream commit 224babd62d6f19581757a6d8bae3bf9501fc10de ] GMAC IP is little-endian and used on several kind of CPU (big or little endian). Main callbacks functions of the stmmac drivers take care about it. It was not the case for dwmac4_get_timestamp function. Fixes: ba1ffd74df74 ("stmmac: fix PTP support for GMAC4") Signed-off-by: Alexandre Torgue Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c @@ -237,15 +237,18 @@ static inline u64 dwmac4_get_timestamp(v static int dwmac4_rx_check_timestamp(void *desc) { struct dma_desc *p = (struct dma_desc *)desc; + unsigned int rdes0 = le32_to_cpu(p->des0); + unsigned int rdes1 = le32_to_cpu(p->des1); + unsigned int rdes3 = le32_to_cpu(p->des3); u32 own, ctxt; int ret = 1; - own = p->des3 & RDES3_OWN; - ctxt = ((p->des3 & RDES3_CONTEXT_DESCRIPTOR) + own = rdes3 & RDES3_OWN; + ctxt = ((rdes3 & RDES3_CONTEXT_DESCRIPTOR) >> RDES3_CONTEXT_DESCRIPTOR_SHIFT); if (likely(!own && ctxt)) { - if ((p->des0 == 0xffffffff) && (p->des1 == 0xffffffff)) + if ((rdes0 == 0xffffffff) && (rdes1 == 0xffffffff)) /* Corrupted value */ ret = -EINVAL; else