From patchwork Fri Dec 8 02:37:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 845961 X-Patchwork-Delegate: nbd@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="GXaJSSVG"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Go9kMD3Z"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ytGkP1lzlz9s74 for ; Fri, 8 Dec 2017 13:38:37 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hMm5bkGbMc6jYyEnYxBPo4DvhmB9aVWlbvXi0uRb18I=; b=GXaJSSVGuyY3RS 8aTURxEKdQCMlukHGclXO+HpzcAoNIB3kn3W+A9Co3Zj7Eo0bfQK7U2SOZyIYrucwkRr2cNfOb87X L2O9D0cyaer/3vLLViKSVHijTc4sJmb6ExvJ95dqezac8gHmfkMFNNOsq3R+0e94cQCteRbpKBs/T T6aOHCWgZfxcJ0bavAvfVuEW8bSfjL7eDBDiPB3HMZ9dNvLJ+nJGiTJzGc+3kA5YAmZBe+eNER/OR w4GFAquXVzHyX8UdPQi3RFM8sqBipSTTtykg7hJLDGpHUHZzniEX6Zze/hqYDfU+IxinM49J/sTpD NttyYirweg8hLyyUjhBg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eN8YS-0005PI-UK; Fri, 08 Dec 2017 02:38:24 +0000 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN8Xq-0004kR-O1 for lede-dev@lists.infradead.org; Fri, 08 Dec 2017 02:37:49 +0000 Received: by mail-pg0-x244.google.com with SMTP id j9so5850772pgc.11 for ; Thu, 07 Dec 2017 18:37:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Kz0XYslT0s43wd/MCaeTGNgpQ3KP6NcVaUcRl32Tqy8=; b=Go9kMD3Z0CMS0V4CajcRs1XWXQn7XZEwRrnZLw33iad4TRl2GEs4N4Wwrfssme5ld0 ET+eBIYvi+vqNvEQkYZLQTHy8fZt2k7XF4CyVNtdf7oqcSPrNOD/w676wIx1j2OhYo2X VU0lfc/Mafx+OS3eu8+uixwQtFeXoHrTSJWU+rzoUVnKi19EyLFSXJXhgN72gh7U1zFt 2J6x9n1pRnZ4Terz6A/W+Hh3lps0hmvFUbOrAqP97hm4Vah5aI2UQz5/h/HaiLfkBFdK oT4IaPu/EEWQxEkU2Wb8vg8d8DwTzNMaJhPoHl5X/Pcc19IFNACAP9DF2TpnT5O3bufC yT9A== 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:in-reply-to :references; bh=Kz0XYslT0s43wd/MCaeTGNgpQ3KP6NcVaUcRl32Tqy8=; b=nXuG73YyBsaT1VnF/UxPtSXHHdnnInRvV0PvlDV7gqIQc8s6WfzfSWiQwoyki2sfmk BaHZB+I/uY/QtaKC1/VZCLG5HqeByFyrH2FrUnD1hOQsLwlnhgthGjOLOvk2s9yQwzt5 IUbOtqqsWieGMnG7eaF8Wfw3BDpFBsU90jw6jah3BjVDjm+jnSRq67aS7wFrUG7IRr+k 1Op9/WTc3u+IjartcBjrNmPQd8s0Bn3Lbt7jBxGTRhG1MkZn1KKmb2r8yAe+U6PMa1cX wzpnFqJHApzvM4RMnk95vsORTM1UvNlapGYi2n29/G+LqaXJu6eupDB5z+QUuKm2sb3O 9jfA== X-Gm-Message-State: AJaThX6+Zte2YhRdQWocSKYWSa/ILHoc1waEE34CbYZB7C6xgxHqU+FS DAb201Vtzs/1bB04dF7nx1YmXbC0 X-Google-Smtp-Source: AGs4zMad5H5WP8jRPdPHs1Ozjv6My3b51HOci4ZPa8CYHKKZ//4mlrfSmxmA6d/2II5wcExZg6sVTw== X-Received: by 10.84.252.4 with SMTP id x4mr27028462pll.99.1512700645813; Thu, 07 Dec 2017 18:37:25 -0800 (PST) Received: from DESKTOP-CEH0M93.lan ([2001:470:1f05:c3e:6ddd:19cc:fe85:6bad]) by smtp.gmail.com with ESMTPSA id j62sm11282750pfc.18.2017.12.07.18.37.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 18:37:25 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Thu, 7 Dec 2017 18:37:15 -0800 Message-Id: <1512700637-47-5-git-send-email-rosenp@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512700637-47-1-git-send-email-rosenp@gmail.com> References: <1512700637-47-1-git-send-email-rosenp@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171207_183746_938152_DA84917E X-CRM114-Status: GOOD ( 12.98 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:400e:c05:0:0:0:244 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (rosenp[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain Subject: [LEDE-DEV] [PATCH 5/7] ag71xx: Replace AG71XX_DESC_SIZE macro with a struct member. X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rosen Penev MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Moves the code more in line with QCA code. Also reduces variable to a u16 instead of s32. QCA code has the roundup component behind a Makefile config. Not sure if enabled by default so I opted to keep current behavior. Signed-off-by: Rosen Penev --- .../files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h | 6 ++---- .../drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c | 2 +- .../drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 16 ++++++++++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h index 39237aa..9964993 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h @@ -90,9 +90,6 @@ struct ag71xx_desc { u32 pad; } __attribute__((aligned(4))); -#define AG71XX_DESC_SIZE roundup(sizeof(struct ag71xx_desc), \ - L1_CACHE_BYTES) - struct ag71xx_buf { union { struct sk_buff *skb; @@ -112,6 +109,7 @@ struct ag71xx_ring { /* "Cold" fields - not used in the data path. */ struct ag71xx_buf *buf; + u16 desc_size; u8 *descs_cpu; dma_addr_t descs_dma; u16 desc_split; @@ -230,7 +228,7 @@ static inline int ag71xx_desc_empty(struct ag71xx_desc *desc) static inline struct ag71xx_desc * ag71xx_ring_desc(struct ag71xx_ring *ring, int idx) { - return (struct ag71xx_desc *) &ring->descs_cpu[idx * AG71XX_DESC_SIZE]; + return (struct ag71xx_desc *) &ring->descs_cpu[idx * ring->desc_size]; } static inline int diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c index c86803c..143689b 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_debugfs.c @@ -186,7 +186,7 @@ static ssize_t read_file_ring(struct file *file, char __user *user_buf, for (i = 0; i < ring_size; i++) { struct ag71xx_buf *ab = &ring->buf[i]; struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i); - u32 desc_dma = ((u32) ring->descs_dma) + i * AG71XX_DESC_SIZE; + u32 desc_dma = ((u32) ring->descs_dma) + i * ring->desc_size; len += snprintf(buf + len, buflen - len, "%3d %c%c%c %08x %08x %08x %08x %c %10lu\n", diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index 7518352..c1d754f 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -105,7 +105,7 @@ static void ag71xx_ring_free(struct ag71xx_ring *ring) kfree(ring->buf); if (ring->descs_cpu) - dma_free_coherent(NULL, ring_size * AG71XX_DESC_SIZE, + dma_free_coherent(NULL, ring_size * ring->desc_size, ring->descs_cpu, ring->descs_dma); } @@ -113,7 +113,15 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring) { int ring_size = BIT(ring->order); - ring->descs_cpu = dma_alloc_coherent(NULL, ring_size * AG71XX_DESC_SIZE, + ring->desc_size = sizeof(struct ag71xx_desc); + if (ring->desc_size % cache_line_size()) { + DBG("ag71xx: ring %p, desc size %u rounded to %u\n", + ring, ring->desc_size, + roundup(ring->desc_size, cache_line_size())); + ring->desc_size = roundup(ring->desc_size, cache_line_size()); + } + + ring->descs_cpu = dma_alloc_coherent(NULL, ring_size * ring->desc_size, &ring->descs_dma, GFP_ATOMIC); if (!ring->descs_cpu) return -ENOMEM; @@ -168,7 +176,7 @@ static void ag71xx_ring_tx_init(struct ag71xx *ag) struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i); desc->next = (u32) (ring->descs_dma + - AG71XX_DESC_SIZE * ((i + 1) & ring_mask)); + ring->desc_size * ((i + 1) & ring_mask)); desc->ctrl = DESC_EMPTY; ring->buf[i].skb = NULL; @@ -254,7 +262,7 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag) struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i); desc->next = (u32) (ring->descs_dma + - AG71XX_DESC_SIZE * ((i + 1) & ring_mask)); + ring->desc_size * ((i + 1) & ring_mask)); DBG("ag71xx: RX desc at %p, next is %08x\n", desc, desc->next);