From patchwork Fri Aug 19 13:04:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Buchsbaum X-Patchwork-Id: 660859 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3sG39w5XtZz9t1F for ; Fri, 19 Aug 2016 23:05:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=M5687wrG; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755241AbcHSNFu (ORCPT ); Fri, 19 Aug 2016 09:05:50 -0400 Received: from mail-wm0-f68.google.com ([74.125.82.68]:33166 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754305AbcHSNFK (ORCPT ); Fri, 19 Aug 2016 09:05:10 -0400 Received: by mail-wm0-f68.google.com with SMTP id o80so3386085wme.0 for ; Fri, 19 Aug 2016 06:05:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FnMxflw8b1rSoYW2eOORHv5Q1L8wIU52OvlsaFm7rMA=; b=M5687wrGpQjCpMVCKZoabkcd9k/ZHU/3HKseLOul7v1ihhqIK+PRXdMZD3SKLOiB2e 8g0WO7FfEY+OlZd0QWiqA75c6B7tFzWKY6BURp4f1LUr46320eXswgTl9TuMhlzhgwyr E2+WCL8RZB57OaEwCxRJuVZMtW6X4JgyNU9DQtY9M0g2UqTJQd4siuMfhn609TG8uIaO y86bMPXx1KSe/JfpoudUZttR/AZqBwo3Nn/hj3Oo7Vni1A1honDqFI+psbDYOErMz+UJ zX0FKdOA92RPhOJC+V5SHPGu0F6CsLsO1MfMpvb89KZC1/diP4h0iIdIvVqh8Oh3yHQj qAew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FnMxflw8b1rSoYW2eOORHv5Q1L8wIU52OvlsaFm7rMA=; b=kG+LfUfLsinuIgDo3Mnr5v7Hjr652j84S2weHU+0WqRbjRD1ppC1RYXIIyvkclqgvW 9tMlfGtTs+JgxXsMSy4h42EqFqlLCu6FCrMt1F0783Zrmeug+xeOwjz1/kgBMRk4BYB/ yWrB7IYTDdsJsJhAeJzvadursoMLzWg89roXlyHZzlhMtHQUlRCx5FtBXTP0F10oRBLk 7bnjVcPSF0Q3DmH2NdfShfUqyJRkyuNlYl4vj2jKzrwpF66vkPj3P1sOgk7va4tGmVKJ Al2mtzSTyMsqKJhvht3pbJvifJVabqGEhBjIDkC8Ccs8dmVzmJSG1pUaRlo7cPFsRpYb 3GfA== X-Gm-Message-State: AEkooutWWAGijo/yoKifvZ7IcNkcPOgVObF046ySy7Jfn6KiQrH3aIis/L5J1GPUz19E0Q== X-Received: by 10.194.236.68 with SMTP id us4mr6086467wjc.12.1471611908831; Fri, 19 Aug 2016 06:05:08 -0700 (PDT) Received: from jessie64.buchsbaum.ddns.net (93-82-131-162.adsl.highway.telekom.at. [93.82.131.162]) by smtp.gmail.com with ESMTPSA id n7sm7038630wjf.11.2016.08.19.06.05.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 Aug 2016 06:05:08 -0700 (PDT) From: Helmut Buchsbaum To: Nicolas Ferre , Michal Simek Cc: netdev@vger.kernel.org, Cyrille Pitchen , Helmut Buchsbaum Subject: [PATCH 1/1] net: macb: disable HW checksum offload for Xilinx Zynq Date: Fri, 19 Aug 2016 15:04:58 +0200 Message-Id: <1471611898-3852-2-git-send-email-helmut.buchsbaum@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1471611898-3852-1-git-send-email-helmut.buchsbaum@gmail.com> References: <1471611898-3852-1-git-send-email-helmut.buchsbaum@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When sending UDP packets with data payload size <= 2, Zynq's GEM implementation for HW checksum offloading calculates wrong checksums. Adding a MACB_CAPS_NO_CSUM_OFFLOAD capability and turning off HW checksum offloading for Zynq solves it. Signed-off-by: Helmut Buchsbaum --- drivers/net/ethernet/cadence/macb.c | 6 ++++-- drivers/net/ethernet/cadence/macb.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index 89c0cfa..26eba1a 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -2430,7 +2430,8 @@ static int macb_init(struct platform_device *pdev) /* Set features */ dev->hw_features = NETIF_F_SG; /* Checksum offload is only available on gem with packet buffer */ - if (macb_is_gem(bp) && !(bp->caps & MACB_CAPS_FIFO_MODE)) + if (macb_is_gem(bp) && !(bp->caps & MACB_CAPS_FIFO_MODE) && + !(bp->caps & MACB_CAPS_NO_CSUM_OFFLOAD)) dev->hw_features |= NETIF_F_HW_CSUM | NETIF_F_RXCSUM; if (bp->caps & MACB_CAPS_SG_DISABLED) dev->hw_features &= ~NETIF_F_SG; @@ -2829,7 +2830,8 @@ static const struct macb_config zynqmp_config = { }; static const struct macb_config zynq_config = { - .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_NO_GIGABIT_HALF, + .caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_NO_GIGABIT_HALF | + MACB_CAPS_NO_CSUM_OFFLOAD, .dma_burst_length = 16, .clk_init = macb_clk_init, .init = macb_init, diff --git a/drivers/net/ethernet/cadence/macb.h b/drivers/net/ethernet/cadence/macb.h index b6fcf10..79193db 100644 --- a/drivers/net/ethernet/cadence/macb.h +++ b/drivers/net/ethernet/cadence/macb.h @@ -404,6 +404,7 @@ #define MACB_CAPS_NO_GIGABIT_HALF 0x00000008 #define MACB_CAPS_USRIO_DISABLED 0x00000010 #define MACB_CAPS_JUMBO 0x00000020 +#define MACB_CAPS_NO_CSUM_OFFLOAD 0x08000000 #define MACB_CAPS_FIFO_MODE 0x10000000 #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 #define MACB_CAPS_SG_DISABLED 0x40000000