From patchwork Tue Jun 19 16:54:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 931768 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 419Dmm12nhz9s1B for ; Wed, 20 Jun 2018 03:03:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030232AbeFSRCu (ORCPT ); Tue, 19 Jun 2018 13:02:50 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:39198 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966768AbeFSRCg (ORCPT ); Tue, 19 Jun 2018 13:02:36 -0400 Received: by mail-pl0-f65.google.com with SMTP id f1-v6so171357plt.6 for ; Tue, 19 Jun 2018 10:02:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=m0/g9RHLZXNS8aWMcbA9cJ/cwoo4enqkKSdVjDpDIHs=; b=oGnsQEpbZ0dyAPnVxK0x7KP2yabYrQo7abc0+MiE2PnZMHq61RegOKiFpPUuCpGtj9 M8qEN0t0gIz9jEWNNMYD5O93At6OwPFq/DyEmrsgcy3DM1fVxq1XVbZ2SpnpMfi3fx+F hOTI8BfcU548ykIsvJY8tvBjWZkUUiksUKGxb03u8CtB2yY2T46wj2CWHVo9AJa73Ly8 R9sQk1kahsSa1rzO4exOln1lJQruw+lFjnBKylDLjF5deEL7Tu7oXxckl0PNowP5aYiO BnnZqTObca5B7LxuAvIl7McZkRR+akFZBwyKoHFrVzih8+LdiMILmmKVOY5C90ty93J4 11gQ== X-Gm-Message-State: APt69E3fQe9z6GGokmiIRJLG4pVZANjS1X+u6wLKb8/Db0t1WKSYbS2Q I0hZxZsqGfjwltP5bcDuMe3Pkz7pFXA= X-Google-Smtp-Source: ADUXVKJEz2LvOaDeA+KoPGWMrpMcDzv7hiCbe//Oso0vyKcizw+W7vJVX0yZGMBiodqUNrAhi+z6cw== X-Received: by 2002:a17:902:654c:: with SMTP id d12-v6mr19615561pln.8.1529427756269; Tue, 19 Jun 2018 10:02:36 -0700 (PDT) Received: from localhost ([207.114.172.147]) by smtp.gmail.com with ESMTPSA id z28-v6sm235209pfl.169.2018.06.19.10.02.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 10:02:35 -0700 (PDT) From: Moritz Fischer To: davem@davemloft.net Cc: keescook@chromium.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Moritz Fischer Subject: [PATCH] net: nixge: Add __packed attribute to DMA descriptor struct Date: Tue, 19 Jun 2018 09:54:53 -0700 Message-Id: <20180619165453.31894-1-mdf@kernel.org> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add __packed attribute to DMA descriptor structure in order to make sure that the DMA engine's alignemnt requirements are met. Fixes commit 492caffa8a1a ("net: ethernet: nixge: Add support for National Instruments XGE netdev") Signed-off-by: Moritz Fischer --- Hi David, this addresses an issue where padding occured breaking the alignment in the array the descriptors are allocated in coherent memory. This was discovered when we tried to bring up the driver via a PCIe bridge on x86. Thanks, Moritz --- drivers/net/ethernet/ni/nixge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index 09f674ec0f9e..fea0e994324b 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c @@ -122,7 +122,7 @@ struct nixge_hw_dma_bd { u32 sw_id_offset; u32 reserved5; u32 reserved6; -}; +} __packed; struct nixge_tx_skb { struct sk_buff *skb;