From patchwork Fri Dec 8 02:37:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 845958 X-Patchwork-Delegate: blogic@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="KMO8N8JR"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="j+gV1o0C"; 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 3ytGjc51F1z9rxm for ; Fri, 8 Dec 2017 13:37:56 +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:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=IkCK+2hGO+j60N3JyKq3BAfVkgNX8Jdur9AMKofs4zE=; b=KMO8N8JRrndA2W k5zniYJ7eUX3J8Tf9ESD5fXnWyeWrAI01oN/94xt9ORwIP+J5VpLj4Ur0tZ2GKvstdv4Qg7qYOgPs cSD24HT/kg34CpEeoPSP4DxVDQe+TpDl5X797krVTIv6OIgCW9Oz1byW6D5BMOtU/MS06UjkJTsW9 d0yNpV6160ymXVp+oyBVGLC9s0e2mbT5pwzZU9NCIhTfUdRAaxvVt979/FbSON19ZDG42bjoJreh8 A4zmiyyfyqdGTp/McCRAlFH+ip3+xZUX10NYFU1K68tfHNlxAcwvDl3rN9ofZwCO6GS+NifDBeUii xQmt5WYwC2dbgvRmUNXQ==; 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 1eN8Xs-0004nJ-Gu; Fri, 08 Dec 2017 02:37:48 +0000 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN8Xn-0004ja-Vf for lede-dev@lists.infradead.org; Fri, 08 Dec 2017 02:37:46 +0000 Received: by mail-pg0-x241.google.com with SMTP id j4so5867564pgp.1 for ; Thu, 07 Dec 2017 18:37:22 -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; bh=4eymfJUb+sfhXm+dIsdGGxo/torERjm4P9s2XAnsLoQ=; b=j+gV1o0CLPg2QdrHIZYhpIRJmrEcpY14+pL/bQSJV29IqDiSPLz8TZacHaOykw8fev XFnYUEcg8OR3XB4c/mYnZMZ4uKCSgkrnPIa++VKTY2wJq6NdexsYshTKe28z/gDKR1Qd glqveOjXATcV5bhfTyiWjU/7BN+4N4TUEVpjJoODMChP0UeBFEKPdzVGtFhjgVo/9MQo NLDHljZ1XiWxoaHVQ+11ALZ4s439G/280ASN6X/iwrTJRPwJ4PZMLco8Hsvus217zfU5 JuX3fSFwgvmMQN529JcoMiEVXUK0MVpULH8UXjTj5EOXZ/zy3qpsH2wdFIy9MgOrL4Ww C19w== 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=4eymfJUb+sfhXm+dIsdGGxo/torERjm4P9s2XAnsLoQ=; b=Q8TuZW7P21MJsF3TPYkG2PWAWxbN5zxZH+K8Z2BUjuK4iuBCfcTyT5QjXzVhsVCqIl A2GyAHeFRHCvm/TcCy7w8rG7EDTexRvQwr4pRG3tb3ovOdh5KEvOt2a9dBGZg4F+DHEY 7MSb20RukRWttTKost4j6nH5KwH09GhFOR2x0dZW79T9GmNgaCnb94RX+tpsNQj7D1Jb bubxyFUjVjif8AcUv64qIfI8zdbpRqDICXt00J/bb1kbNfIxKxDfAh82BEKuN35iyREE siwz0QjhE97EQXHwwcvdDPPY5t/0OkWxnVjn0av4EyTyJsndpy5FDlOI6pwFfA58XeMO fHIA== X-Gm-Message-State: AJaThX5oiPDMN8WTsFkfcIzh2StcdT7/MdXRxcf31kYIth6R0G9EYUXk RPeOfO/75THC5pn17R3BtLPV5sVB X-Google-Smtp-Source: AGs4zMZaUWodJhZunejGpttEJqI0vjSOto1q58zeWEczk2CG76o9W6J6nZKEOyCcPiYUxuHY8VQk9Q== X-Received: by 10.84.131.227 with SMTP id d90mr27599082pld.117.1512700641706; Thu, 07 Dec 2017 18:37:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 18:37:20 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Thu, 7 Dec 2017 18:37:11 -0800 Message-Id: <1512700637-47-1-git-send-email-rosenp@gmail.com> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171207_183744_084117_D3993AA3 X-CRM114-Status: UNSURE ( 8.58 ) X-CRM114-Notice: Please train this message. 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:241 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 1/7] ag71xx: Reorder some more structs based on warmth. 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 Should help slightly. Signed-off-by: Rosen Penev --- .../ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 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 5ead6b3..f9ef17d 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 @@ -106,13 +106,16 @@ struct ag71xx_buf { }; struct ag71xx_ring { + /* "Hot" fields in the data path. */ + unsigned int curr; + unsigned int dirty; + + /* "Cold" fields - not used in the data path. */ struct ag71xx_buf *buf; u8 *descs_cpu; dma_addr_t descs_dma; u16 desc_split; u16 order; - unsigned int curr; - unsigned int dirty; }; struct ag71xx_mdio { @@ -166,14 +169,15 @@ struct ag71xx { struct net_device *dev; struct platform_device *pdev; + /* Serialises access to regs */ spinlock_t lock; struct napi_struct napi; - u32 msg_enable; /* * From this point onwards we're not looking at per-packet fields. */ void __iomem *mac_base; + u32 msg_enable; struct ag71xx_desc *stop_desc; dma_addr_t stop_desc_dma; From patchwork Fri Dec 8 02:37:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 845959 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="KvU7x4in"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fvxQpDCY"; 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 3ytGjv1rpyz9rxm for ; Fri, 8 Dec 2017 13:38:11 +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=tUilYWAIxIi1PbtCKnL2z/ib2VI0Fn8lQpMg4L1GXQA=; b=KvU7x4in2qaFpP NFOuxbL7IbQ7esPgBrVaxzeotP3nBMx0DklCd9N3z8qvk3qjZeCrUmzaF0HT+lP34I4iE6Zy7TTIu 62841XbiCUqe507/QWeSRFt05jXmICMhVFh097DdoAEs346JaS3OgjyALf4uAtmSErd3PoMwdnMsJ VldCqjFT4dwRdm2f3WXA+qkbdWWpzZ3pe4pRYzxSHArqlF7EoJqY/Uid4bzpsLJAQDdkBg6kaoFQQ JyroGgCjlZVXDZiXALsEQo6/FUaiQSQ9bfMLW9Ii+yi8dZQnDv1HJQ7aZDJfNl3bnWcTLgstr/jxG 9PPx/Igyc3nv/n79fyMg==; 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 1eN8Y2-0004w8-AS; Fri, 08 Dec 2017 02:37:58 +0000 Received: from mail-pf0-x229.google.com ([2607:f8b0:400e:c00::229]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN8Xo-0004jj-4z for lede-dev@lists.infradead.org; Fri, 08 Dec 2017 02:37:46 +0000 Received: by mail-pf0-x229.google.com with SMTP id u19so6170728pfa.12 for ; Thu, 07 Dec 2017 18:37:23 -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=2qt3yPgKXuQt2vsjAk7vp1/4Se9EfsCZrLNfHvVr4jY=; b=fvxQpDCYz8IuF9BCaJrZOu7u58p4DwXu6MW5jLJlPZQwYolAt4bHSN338sUXMcNwwE /hunrG7T472eVUjDnMUGm1tr6Fv9aVlfLd3HPjD4l26bfyO+22a5Yg8fGIM9bVKtfXTn VH2hYxz5R2qd8LkmhLux/QrhyVv8UWiDJ4WpJUFPyMN6sAi5WYF2K1ylBbB2zQz4+ZyB khuE0Q/RwpKiUgqIxY4lZSZOwuVDpMyNLvuXYaTAFdELtCF3/OB0Gix41XzgMjyy1aCi jScjShsnAz8qUn00TyDALWnL+4Znl11yHnTH41WTZhuUUdnSeM/wHfSn43AuOw1JdeOZ 3KTw== 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=2qt3yPgKXuQt2vsjAk7vp1/4Se9EfsCZrLNfHvVr4jY=; b=nuVibrpfeUieslCzZ1KIhLhSQQYH7HedAM0PZrTKrnG1wEXkJTMDmZobLwFf7WzgAF PkH1x/6ImjKNAaZdHgFtYsxFUgYrqJWZIO3KBmUfsTNdYr0OXckYVLolkgXKH1Uz/9u5 Q3181MA0VSyUB7V0QJGh4p+4Gr40yQujQ4hCiGCGr9vw1x15Ww90sKEt3mMeD4LHDWIR puCw3fnS0ZFptlHaN0NgOjz5BFCYJaFNbNGs/hWeVS2PZ2zMulnHDmbB7bMMddhDMwtZ XKUxkAI864AGWa1JLwXJFv/k1y706JFKdM2WXzNJOI5GUGJMFw+K/7x+TtYM6fpkzT+b cTzw== X-Gm-Message-State: AJaThX6t8oFvX4/rj680M3a0WfJf8TWJmJwH/K6xp/Yahz767kxLDLBG 671T6FzojVKrbmyumuW1n9fohzHs X-Google-Smtp-Source: AGs4zMY5MehZcEDJpmpulwqYoqWf5Vh4e9QM3Csal12YOMH12v9Dmtj13VYMGjuN3+zddZFCXRq+lQ== X-Received: by 10.101.78.18 with SMTP id r18mr27653504pgt.289.1512700642879; Thu, 07 Dec 2017 18:37:22 -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.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 18:37:22 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Thu, 7 Dec 2017 18:37:12 -0800 Message-Id: <1512700637-47-2-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_183744_226663_B2E002F3 X-CRM114-Status: UNSURE ( 8.62 ) X-CRM114-Notice: Please train this message. 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:c00:0:0:0:229 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 2/7] ag71xx: add method to count ag71xx probes 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 , Ben Menchaca MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch is preparation for ag71xx usage of external, on-die resources. Since these resources are limited, we need to track how many instances we have probed. Signed-off-by: Ben Menchaca Signed-off-by: Rosen Penev dev = dev; ag->msg_enable = netif_msg_init(ag71xx_msg_level, AG71XX_DEFAULT_MSG_ENABLE); + ag->gmac_num = ag71xx_gmac_num++; spin_lock_init(&ag->lock); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac_base"); From patchwork Fri Dec 8 02:37:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 845962 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="Z1BmZx49"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Xo2NmpmL"; 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 3ytGkS2Cw6z9s74 for ; Fri, 8 Dec 2017 13:38:40 +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=bf9FgMO0hI+IRz2N88Gx26/05rQA4iEwJ2F/ULgcZSE=; b=Z1BmZx49bsayTH DRhlEfwmq7kLpoNwZxlpY9V2tCh/BhDKztmSS1VX4nMMK8fRXvv8clFf94JkSbZ6cGFYwTcipNPmN 9ZSf7MhNGCBxiDQPVh+xsg7MxKPBE3D/mA7cmg87Je9fU9kcTo2W3DPOk4M4x2X4pvkDCU0Co7Sq4 Yz4tsz70xtXwm63WnZH376B8oqQhOyM04RqCNdj315iTUyQ92EF5mN4PzhAkc/G4otSCvrBdgE8ir AwdbQY0ZGGeU5FzPHdBiFiY5r6OfwK93Ix1slnPCXXM/v5rYKABcvcdMjGDUE2qNT+FXSNIT3g+ta rEcYTx71KqBHvwm2LKtQ==; 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 1eN8Yg-0005cl-6J; Fri, 08 Dec 2017 02:38:38 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN8Xo-0004kA-VV for lede-dev@lists.infradead.org; Fri, 08 Dec 2017 02:37:49 +0000 Received: by mail-pf0-x244.google.com with SMTP id j124so6182737pfc.2 for ; Thu, 07 Dec 2017 18:37:24 -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=BbDrqMjuHwwZQ57QL5pypeYmZKciix8MHfkSNllW2xc=; b=Xo2NmpmLrh5oGWk2TaTYsN9Bv+6kNts4zD+EgO6w/Xds9PhFRT0aI7DUwuZhoEQvf9 sAU07Q4+pXczp8LFtoQjOtdR+4KPtoxyzlbTn+tRTOM9bjp/smjmZFW+pVluDSGVervP KiQlWNlNxoECeBaLgRn1kOtJVfxeZju6rtT+AJ+aDSv6VZbzxe009UX4QRj8lQauznet 59/f24otIhkZr2vLM+g4W1ZypS/Tm6LO8qYLfKnfVFjXuleBJD0D4JVDsPq1hj2NLVKz tkstLijhdScUi73ZYXW+rct4UIyMyaJkbSYFMifGKk3/Aa3e9/Njt2foRE6SnIfOpeKP 7Xzg== 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=BbDrqMjuHwwZQ57QL5pypeYmZKciix8MHfkSNllW2xc=; b=EmaEkUDH3F9SRBRPWtz7Fg48jL82XqiW5WYSMTQ4TypwLsydFWjMEogX3Oz+GpJ7o1 KscZp9mHlBRa8cGMUTONyChMZa738sLTTsT2RP0l6ZP+aBsYDv+8P74gYF4hx5yXFm+g JxdSpjAQx7F+xbCBQyLEAjK3XkQMmaa1iS7UdlIlHOoJH4JCglUOjMKnYH8iApKpCdqc MsBVNMd8fS/iwXsQJ3hNKpT0QH7pxYT4w6sniH2L15x5AuwbY18guqA4bT0aZnKheSnk 1BTc6IfJzu3ROH+hoPcvFaKe0mNQnvN5hLGfc2SUTAmgmbPkWlcju05zYRkBr6fReNzP RDCQ== X-Gm-Message-State: AJaThX6eF5Su4AjZwS13bftlF68eEt7hA9xhnkyVBlnOfH92wiqgv2Ky s1YeqMLtgZgQknLiTUmzyQ6fUajN X-Google-Smtp-Source: AGs4zMb4dpVE/028WACE9uanjAyIxCeYA1Q4UuIM0gjBAxOugH3AUsCGYBuh6lw9eLpzi6vQKw6XEA== X-Received: by 10.84.164.165 with SMTP id w34mr28055622pla.73.1512700644134; Thu, 07 Dec 2017 18:37:24 -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.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 18:37:23 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Thu, 7 Dec 2017 18:37:13 -0800 Message-Id: <1512700637-47-3-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_183745_038633_31F22CBE X-CRM114-Status: GOOD ( 10.70 ) 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:c00: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 3/7] ag71xx: optimized iomapped register access 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 , Ben Menchaca MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Seems to remove a few instructions. Original message below: From: Ben Menchaca Date: Tue, 11 Jun 2013 15:50:17 -0500 Subject: [ag71xx] optimize iomapped register access Add register accessors that remove the per-register range check that was done previously. Additionally, we separate the write from the subsequent read that is designed to flush the write; this can now be called separately. Signed-off-by: Ben Menchaca Signed-off-by: Rosen Penev --- .../drivers/net/ethernet/atheros/ag71xx/ag71xx.h | 23 +++++++++++++++++++ .../net/ethernet/atheros/ag71xx/ag71xx_main.c | 26 +++++++++++++++------- 2 files changed, 41 insertions(+), 8 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 c39beaf..39237aa 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 @@ -163,6 +163,12 @@ struct ag71xx { struct ag71xx_ring rx_ring ____cacheline_aligned; struct ag71xx_ring tx_ring ____cacheline_aligned; + void __iomem *rx_ctrl_reg; + void __iomem *rx_status_reg; + void __iomem *tx_ctrl_reg; + void __iomem *tx_status_reg; + void __iomem *int_status_reg; + unsigned int max_frame_len; unsigned int desc_pktlen_mask; unsigned int rx_buf_size; @@ -400,6 +406,17 @@ static inline void ag71xx_check_reg_offset(struct ag71xx *ag, unsigned reg) } } +static inline void ag71xx_wr_fast(void __iomem *r, u32 value) +{ + __raw_writel(value, r); +} + +static inline void ag71xx_wr_flush(void __iomem *r) +{ + (void)__raw_readl(r); +} + + static inline void ag71xx_wr(struct ag71xx *ag, unsigned reg, u32 value) { ag71xx_check_reg_offset(ag, reg); @@ -409,6 +426,12 @@ static inline void ag71xx_wr(struct ag71xx *ag, unsigned reg, u32 value) (void) __raw_readl(ag->mac_base + reg); } +static inline u32 ag71xx_rr_fast(void __iomem *r) +{ + return __raw_readl(r); +} + + static inline u32 ag71xx_rr(struct ag71xx *ag, unsigned reg) { ag71xx_check_reg_offset(ag, reg); 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 7760952..ffbe646 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 @@ -842,8 +842,8 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, DBG("%s: packet injected into TX queue\n", ag->dev->name); /* enable TX engine */ - ag71xx_wr(ag, AG71XX_REG_TX_CTRL, TX_CTRL_TXE); - + ag71xx_wr_fast(ag->tx_ctrl_reg, TX_CTRL_TXE); + ag71xx_wr_flush(ag->tx_ctrl_reg); return NETDEV_TX_OK; err_drop_unmap: @@ -994,7 +994,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush) ring->dirty += n; while (n > 0) { - ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS); + ag71xx_wr_fast(ag->tx_status_reg, TX_STATUS_PS); n--; } } @@ -1048,7 +1048,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit) break; } - ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_PR); + ag71xx_wr_fast(ag->rx_status_reg, RX_STATUS_PR); pktlen = desc->ctrl & pktlen_mask; pktlen -= ETH_FCS_LEN; @@ -1087,6 +1087,8 @@ next: ring->curr++; } + ag71xx_wr_flush(ag->rx_status_reg); + ag71xx_ring_rx_refill(ag); while ((skb = __skb_dequeue(&queue)) != NULL) { @@ -1123,13 +1125,15 @@ static int ag71xx_poll(struct napi_struct *napi, int limit) if (rx_ring->buf[rx_ring->dirty % rx_ring_size].rx_buf == NULL) goto oom; - status = ag71xx_rr(ag, AG71XX_REG_RX_STATUS); + status = ag71xx_rr_fast(ag->rx_status_reg); if (unlikely(status & RX_STATUS_OF)) { - ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_OF); + ag71xx_wr_fast(ag->rx_status_reg, RX_STATUS_OF); + ag71xx_wr_flush(ag->rx_status_reg); dev->stats.rx_fifo_errors++; /* restart RX */ - ag71xx_wr(ag, AG71XX_REG_RX_CTRL, RX_CTRL_RXE); + ag71xx_wr_fast(ag->rx_ctrl_reg, RX_CTRL_RXE); + ag71xx_wr_flush(ag->rx_ctrl_reg); } if (rx_done < limit) { @@ -1172,7 +1176,7 @@ static irqreturn_t ag71xx_interrupt(int irq, void *dev_id) struct ag71xx *ag = netdev_priv(dev); u32 status; - status = ag71xx_rr(ag, AG71XX_REG_INT_STATUS); + status = ag71xx_rr_fast(ag->int_status_reg); ag71xx_dump_intr(ag, "raw", status); if (unlikely(!status)) @@ -1320,6 +1324,12 @@ static int ag71xx_probe(struct platform_device *pdev) goto err_free_dev; } + ag->rx_ctrl_reg = ag->mac_base + AG71XX_REG_RX_CTRL; + ag->rx_status_reg = ag->mac_base + AG71XX_REG_RX_STATUS; + ag->tx_ctrl_reg = ag->mac_base + AG71XX_REG_TX_CTRL; + ag->tx_status_reg = ag->mac_base + AG71XX_REG_TX_STATUS; + ag->int_status_reg = ag->mac_base + AG71XX_REG_INT_STATUS; + dev->irq = platform_get_irq(pdev, 0); err = request_irq(dev->irq, ag71xx_interrupt, 0x0, From patchwork Fri Dec 8 02:37:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 845960 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="sjmYdDoB"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hWduo5Gw"; 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 3ytGjw6Z3Wz9rxm for ; Fri, 8 Dec 2017 13:38:12 +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=STNEWtAXB/Ay8fS8AXFYbvxYkFCgxns1yxSzHw8Je68=; b=sjmYdDoBDxmxGI YdtVg7C6xIjAAi+V5gNW0fq1kFnKMwhX5IZb+AcrClEp5su0gdtDsFDTlz3z+2SZqnZNusCTQCtBl zP5EAhtFXVwesnhKfXdNar00UGZ00wV8hxt0JlCN6aRb4FnLvuICquL4O2ubM0UFw8SnbQRZUHWvJ OsdPtu9pxeLH5VZoqATxvv0v/JqCBCOipipeMkzR/ciwYGzm511/GBL+3O9RFw3y1FCybDK1OtgQi J7HeObu3VuGGpVd+74k/P3n9OARuQc3lF4uqCidQh3fxSiCseM7JTjmpHVXlnaMJ24xv9iKj0rp8+ MDFs2fLb/vFXsV4T453Q==; 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 1eN8YE-00059j-EF; Fri, 08 Dec 2017 02:38:10 +0000 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN8Xo-0004kJ-VX for lede-dev@lists.infradead.org; Fri, 08 Dec 2017 02:37:48 +0000 Received: by mail-pf0-x244.google.com with SMTP id a90so6187437pfk.1 for ; Thu, 07 Dec 2017 18:37:25 -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=fWOyeLrQKVQ6azVecneJ2J12pCdLKgnw/DfChoSY1hs=; b=hWduo5Gwe8t6KFaSkkUTpHq2iQyci4P1ILL+PgAOAu7zUfONvrZ64Wu+MafM5oVHsd V664Gi7FO69wsFsVgeZDDtfwtEJOKtNsCMx+aIAttNsdgE03VQ6fVCRzGWQuytPkJbn7 /AIkDDeK2KkA0ferzLAmML3gFwvIj2HuvdUpiArgd8lNpSFrDOE2rfN+x/+BoC25E/2V wzfgJ+nvNetzQWIiS/y8PVOUS3N/zpy2QTq80LqbtAMfJQQsxHc0csdeSdRcEd1wpc2U lesg7j0sgE4smKTwv/NWw9JwT1mhAXQX2/X8JgLkKTlICKrTy6RwXu/CgMBzHOWvHCzE RXxw== 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=fWOyeLrQKVQ6azVecneJ2J12pCdLKgnw/DfChoSY1hs=; b=ZXjfoxvEQTmkKebp6/zUCieHf/u+dGaPWlajx+7Tb1oUIhe7mpml17MfgW3EEVVF2D AuuA1pzCa9o2VX9YNNAoc6TlSjipmsuRzmKNwpEHoMqYkYa7DhIntLdNX3a2zKbsY0U2 H91LdeFN87UOx/vWC89Ruzu7h8YpV/n4NnupuSJvuYoZNMMveP6kfOBcmKvNEkOxMa61 e9BsAHlkAK954ygSt7i6/FILgfAABlWXpELs0NfceTJa4oaEK0RJAmZmSxGEoYQG1C4p YnFTbS0/zsMPub2LTRunTcXwZj2mhHfd7PIghKiVnDqPzex2XpvfR5nQD00L8UiUileV Djow== X-Gm-Message-State: AKGB3mKMUMr/qiF6TGrejcBg1GWYS8Bdvr8qDRL0tPrg1lVpnkfs3O+/ fcPFDNy4FPM6EB0bkPovpa5PTwTB X-Google-Smtp-Source: AGs4zMbIl6cijpY4On/X9G64tEegWLYLLygn7LbXMpp+1lUjL2PARNRs7aVWUe1s7eQce8JoxKEYjQ== X-Received: by 10.84.129.46 with SMTP id 43mr3180658plb.1.1512700644961; Thu, 07 Dec 2017 18:37:24 -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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 18:37:24 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Thu, 7 Dec 2017 18:37:14 -0800 Message-Id: <1512700637-47-4-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_183745_046643_CEE86CE5 X-CRM114-Status: UNSURE ( 8.94 ) X-CRM114-Notice: Please train this message. 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:c00: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 4/7] ag71xx: Remove unnecessary goto statement. 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 Tightens up the ag71xx_ring_alloc function and makes it easier to read. Signed-off-by: Rosen Penev --- .../drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) 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 ffbe646..7518352 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 @@ -112,26 +112,17 @@ static void ag71xx_ring_free(struct ag71xx_ring *ring) static int ag71xx_ring_alloc(struct ag71xx_ring *ring) { int ring_size = BIT(ring->order); - int err; ring->descs_cpu = dma_alloc_coherent(NULL, ring_size * AG71XX_DESC_SIZE, &ring->descs_dma, GFP_ATOMIC); - if (!ring->descs_cpu) { - err = -ENOMEM; - goto err; - } - + if (!ring->descs_cpu) + return -ENOMEM; ring->buf = kzalloc(ring_size * sizeof(*ring->buf), GFP_KERNEL); - if (!ring->buf) { - err = -ENOMEM; - goto err; - } + if (!ring->buf) + return -ENOMEM; return 0; - -err: - return err; } static void ag71xx_ring_tx_clean(struct ag71xx *ag) 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); From patchwork Fri Dec 8 02:37:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 845963 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="HDa0s/CC"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Icad1pow"; 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 3ytGkk6LXkz9s7v for ; Fri, 8 Dec 2017 13:38:54 +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=SUcye7zmFMik2plJbv3uwqMq3mQiD9TLFb6bpo6taSA=; b=HDa0s/CCHFjVt4 lZp1lGT6MzLC7SttBGSbTzr4pFL4f968u3e3XBGROo5rkd4eQvWqtBABvR/EjNqGFwG1n1Z2AYswu tF1gDmMho7tJ916AbkiS/VC+l8XG/ihLHrjjcu8XW8zSIZ1SZu6Ylb/nHOrWYrklr187nHHZbDjBE uUv/6dENC+atBoM4ViTMHTtEJaJ2pwUHAy0sXdvz1OjVpc953sCJlEuBdEYQpgZHk9V88uoCDicOK oQmWEOuBwA+669RN3w1XRvq2fdKPNve5YqXU9TPsD+dxO8Xbk9AYheQmDXEcX2aS+Y1veJrKchy2I IgTvLM5mwB3UmveVXdSg==; 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 1eN8Yu-0005qs-5E; Fri, 08 Dec 2017 02:38:52 +0000 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN8Xs-0004ka-FH for lede-dev@lists.infradead.org; Fri, 08 Dec 2017 02:37:51 +0000 Received: by mail-pf0-x242.google.com with SMTP id p84so6189484pfd.3 for ; Thu, 07 Dec 2017 18:37:27 -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=h49hrv7ojKSEortHB0xdlCFdHbxfoYy5dQI+JhaKoWk=; b=Icad1powgsg4h6aTsXa4YlZxYxxqCPJt215ylO3ALkjCpnEzFRm/c+R1uI56Nhbjor NNbTPLexNjP9l0PBiHpManoTRyGI7rX77iD25JnEZjsKSLrJX68v7b3smkZ6iGrVCphL ldy8JOGz+7MFSEgX5PqakNZlzxeoz6m10Te8OU5DQO5NjC2mgEvcApf/GsBbUBaVxbY0 dva2328XwGklpOd8e8EdHAuhZvzvEzunRm9svuBiHXfPF02d7UgYFe4kfgUr0/XkQ0s3 hZwxPIHuxu8uw9CW8hXqUFf8e7MJVTMVWvifJDGDn7wXWLTjV/ua4bPupU0sCKrlZosd ekRg== 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=h49hrv7ojKSEortHB0xdlCFdHbxfoYy5dQI+JhaKoWk=; b=aaSq+a0i2C+MYBWVyQ++o918a1Bo0Q5R/5on5+5dyhYAY389MHHbDACgeCSZTbIgth KN0RYSk6CEu2Xy4QTc3bNUmfauOt+8TmVsXpXTMMhoIxzs5ohYhJFoQ1u+onOaZL850z xgE+thfcG3iiRDwOUi1nwcROL3Zu/iO5hJwYzZIIujJh2akfUFhb8X/+/5DKXLM3KhLL 4ZiUnKaQYqufJBBcjtDrgU2AaaBApsHCyY4M6xesOQs+OJXR37LxBUNI0uDtwGWuNtIc 0/+U6Y87Kp3fQsEoRmqH2Khjh5rB1/PaSgJ3u1mt6ZWmMLMf1H7I2gD+W1r1n24QVAka TpBQ== X-Gm-Message-State: AJaThX5I+9uiMVUsv4O3LfU5B1SwKPpUxBb3Lhk/Y3wK1elt3kINYk4B zj04OzbdRCh819J7FIhsPVi57pdv X-Google-Smtp-Source: AGs4zMa1NKPvgONUXZU9MvNXj7Zrl7g7z18/bWPU5ogeBOW8tzw0xLS13hVvZFMAN5QNiKiKQs83lw== X-Received: by 10.84.246.194 with SMTP id j2mr27963794plt.7.1512700647146; Thu, 07 Dec 2017 18:37:27 -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:26 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Thu, 7 Dec 2017 18:37:16 -0800 Message-Id: <1512700637-47-6-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_183748_606178_6BF27F46 X-CRM114-Status: GOOD ( 15.50 ) 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:c00:0:0:0:242 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 6/7] ag71xx: Put ring_size in ag71xx_ring struct. 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 Less verbose code. Should help when porting some of the other patches. Signed-off-by: Rosen Penev --- .../drivers/net/ethernet/atheros/ag71xx/ag71xx.h | 1 + .../net/ethernet/atheros/ag71xx/ag71xx_main.c | 40 +++++++++------------- 2 files changed, 17 insertions(+), 24 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 9964993..f85e43d 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 @@ -106,6 +106,7 @@ struct ag71xx_ring { /* "Hot" fields in the data path. */ unsigned int curr; unsigned int dirty; + u16 size; /* "Cold" fields - not used in the data path. */ struct ag71xx_buf *buf; 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 c1d754f..8ce777c 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 @@ -101,18 +101,15 @@ static inline void ag71xx_dump_intr(struct ag71xx *ag, char *label, u32 intr) static void ag71xx_ring_free(struct ag71xx_ring *ring) { - int ring_size = BIT(ring->order); kfree(ring->buf); if (ring->descs_cpu) - dma_free_coherent(NULL, ring_size * ring->desc_size, + dma_free_coherent(NULL, ring->size * ring->desc_size, ring->descs_cpu, ring->descs_dma); } static int ag71xx_ring_alloc(struct ag71xx_ring *ring) { - int ring_size = BIT(ring->order); - 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", @@ -121,12 +118,12 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring) ring->desc_size = roundup(ring->desc_size, cache_line_size()); } - ring->descs_cpu = dma_alloc_coherent(NULL, ring_size * ring->desc_size, + ring->descs_cpu = dma_alloc_coherent(NULL, ring->size * ring->desc_size, &ring->descs_dma, GFP_ATOMIC); if (!ring->descs_cpu) return -ENOMEM; - ring->buf = kzalloc(ring_size * sizeof(*ring->buf), GFP_KERNEL); + ring->buf = kzalloc(ring->size * sizeof(*ring->buf), GFP_KERNEL); if (!ring->buf) return -ENOMEM; @@ -168,15 +165,14 @@ static void ag71xx_ring_tx_clean(struct ag71xx *ag) static void ag71xx_ring_tx_init(struct ag71xx *ag) { struct ag71xx_ring *ring = &ag->tx_ring; - int ring_size = BIT(ring->order); - int ring_mask = ring_size - 1; - int i; + int i, next; - for (i = 0; i < ring_size; i++) { + for (i = 0; i < ring->size; i++) { struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i); + next = (i >= ring->size - 1) ? 0 : (i + 1); desc->next = (u32) (ring->descs_dma + - ring->desc_size * ((i + 1) & ring_mask)); + ring->desc_size * next); desc->ctrl = DESC_EMPTY; ring->buf[i].skb = NULL; @@ -193,13 +189,12 @@ static void ag71xx_ring_tx_init(struct ag71xx *ag) static void ag71xx_ring_rx_clean(struct ag71xx *ag) { struct ag71xx_ring *ring = &ag->rx_ring; - int ring_size = BIT(ring->order); int i; if (!ring->buf) return; - for (i = 0; i < ring_size; i++) + for (i = 0; i < ring->size; i++) if (ring->buf[i].rx_buf) { dma_unmap_single(&ag->dev->dev, ring->buf[i].dma_addr, ag->rx_buf_size, DMA_FROM_DEVICE); @@ -251,24 +246,24 @@ static bool ag71xx_fill_rx_buf(struct ag71xx *ag, struct ag71xx_buf *buf, static int ag71xx_ring_rx_init(struct ag71xx *ag) { struct ag71xx_ring *ring = &ag->rx_ring; - int ring_size = BIT(ring->order); int ring_mask = BIT(ring->order) - 1; - unsigned int i; + unsigned int i, next; int ret; int offset = ag71xx_buffer_offset(ag); ret = 0; - for (i = 0; i < ring_size; i++) { + for (i = 0; i < ring->size; i++) { struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i); + next = (i >= ring->size - 1) ? 0 : (i + 1); desc->next = (u32) (ring->descs_dma + - ring->desc_size * ((i + 1) & ring_mask)); + ring->desc_size * next); DBG("ag71xx: RX desc at %p, next is %08x\n", desc, desc->next); } - for (i = 0; i < ring_size; i++) { + for (i = 0; i < ring->size; i++) { struct ag71xx_desc *desc = ag71xx_ring_desc(ring, i); if (!ag71xx_fill_rx_buf(ag, &ring->buf[i], offset, @@ -790,7 +785,6 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, struct ag71xx *ag = netdev_priv(dev); struct ag71xx_ring *ring = &ag->tx_ring; int ring_mask = BIT(ring->order) - 1; - int ring_size = BIT(ring->order); struct ag71xx_desc *desc; dma_addr_t dma_addr; int i, n, ring_min; @@ -833,7 +827,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb, if (ring->desc_split) ring_min *= AG71XX_TX_RING_DS_PER_PKT; - if (ring->curr - ring->dirty >= ring_size - ring_min) { + if (ring->curr - ring->dirty >= ring->size - ring_min) { DBG("%s: tx queue full\n", dev->name); netif_stop_queue(dev); } @@ -956,7 +950,6 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush) struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); bool dma_stuck = false; int ring_mask = BIT(ring->order) - 1; - int ring_size = BIT(ring->order); int sent = 0; int bytes_compl = 0; int n = 0; @@ -1007,7 +1000,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush) return 0; netdev_completed_queue(ag->dev, sent, bytes_compl); - if ((ring->curr - ring->dirty) < (ring_size * 3) / 4) + if ((ring->curr - ring->dirty) < (ring->size * 3) / 4) netif_wake_queue(ag->dev); if (!dma_stuck) @@ -1023,7 +1016,6 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit) int offset = ag71xx_buffer_offset(ag); unsigned int pktlen_mask = ag->desc_pktlen_mask; int ring_mask = BIT(ring->order) - 1; - int ring_size = BIT(ring->order); struct sk_buff_head queue; struct sk_buff *skb; int done = 0; @@ -1042,7 +1034,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit) if (ag71xx_desc_empty(desc)) break; - if ((ring->dirty + ring_size) == ring->curr) { + if ((ring->dirty + ring->size) == ring->curr) { ag71xx_assert(0); break; } From patchwork Fri Dec 8 02:37:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rosen Penev X-Patchwork-Id: 845964 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="nKC/cJbj"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="tUloBPr6"; 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 3ytGl8624tz9s74 for ; Fri, 8 Dec 2017 13:39:16 +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=1x2rQD3zGRDWHqSh7FI1IFd2/+gb2/A/lLLTl47DJT0=; b=nKC/cJbjMakJSE JP3vQE7vJK0uRTfFKlMO2MSKeyYBJ+8Ur7VDkJB8TruU/1buslgdDucRS9h0Lsa5FTtLDLaWYjlFp JWjmaBuEpw66AZ/9QZSia9XTSKznuQizWnZyTRsYvVPJG/WzpJxysa+vCrbG+biXyJsgT286eoumr 4NZWzp75TR/K5Xlrm5cgeDR9CWWiJyw/EduwKBG7OXojIN5zeTggaKbKy/7bNWmnPRZ1HqX9m2CXe cPL5y2C2H1Gu+6DV2gtXVSFm+c+D1/DrrQdSTWylj15OBRLgPeg4vzwzdMom7yP0FBVdUcVrXC0rQ ELQyw5Ru7IW0/RqNJpUQ==; 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 1eN8Z7-00064L-Uk; Fri, 08 Dec 2017 02:39:05 +0000 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eN8Xt-0004kf-LS for lede-dev@lists.infradead.org; Fri, 08 Dec 2017 02:37:53 +0000 Received: by mail-pg0-x243.google.com with SMTP id b18so5855959pgv.10 for ; Thu, 07 Dec 2017 18:37:29 -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=n3ZB17khy25qHAiWvAg5N+LtmSW4hP2gspSvQ8ZgUos=; b=tUloBPr6G6uJ2C05sAI5hynY9a/0wTSSXqKF+YCDY+eiIVKPiThu9gtQx2B8BAoreW DOoFKvhu0o0ZmF3i49llZtoHeILtzNZ1zU4V/TehUKDOFekW57ZB7LzFmSMI9Xlq+NEu LR6/2qmlPfm6mbq5P2ddLxMrAXTaUONepblgPHajCJERFWedRIPTKV8Qm5q7sgEPwovm TGFkj/Ts186v86Npt5BNSLCnLjmhzNlOxx2BfK+LHryHCwlOmKgv9FK69y8uRq1iLObP giX4jhwVqec82mxuJnVVWurqp3znKL8fryy9V4+VYABBCTzY/URlTbYtuvNrHL3liKjY j+7w== 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=n3ZB17khy25qHAiWvAg5N+LtmSW4hP2gspSvQ8ZgUos=; b=MfUuvzdVH8/gGYouc/zMH5E1wmQ///CtFGIHnJp9IgGzr2Jj3UOa7CjcCn/e/umG+d xMal0ks0ZdySuPvuAl5FPfK0y6hHEPMRr1z24fAo6l7+brIRFv6hpiCNm+XMBsbmhiLh 4AEYTBjaCT1qjLjFG5N+eK2Pp0y6xbsYkqfxPIkkDK6DPIzUBIJVOc/EwhoAudFBihUK t9aFpBThYT2uz8Hb7nVHE+4qrtIlr2o5DfD15XlEODoSmZ5b1qiw1LrgTeiIIFoTiPrx QOg7wHzZoqPcll9HB6ZnoZbkHH0PeqQXQ/LfI6HI7V9JdlvtkNSPpbyjm9oY1Joo91a9 +C7g== X-Gm-Message-State: AJaThX7D/RNhZaRhmiYBO1QzwukGRxR4FaRq5226NTLCMZHMyNhyoK8B CDwYeA0GDi2fcgj0Wht4j9zSwszV X-Google-Smtp-Source: AGs4zMYgBdgs2/9vZS4UqxMAx7ialfz7ZCKPruWi/NeXmRyJ14EnSLVItOfUsN9p0FlmCKV0Oc8I8w== X-Received: by 10.101.71.205 with SMTP id f13mr25402303pgs.112.1512700648061; Thu, 07 Dec 2017 18:37:28 -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.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Dec 2017 18:37:27 -0800 (PST) From: Rosen Penev To: lede-dev@lists.infradead.org Date: Thu, 7 Dec 2017 18:37:17 -0800 Message-Id: <1512700637-47-7-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_183750_006516_6E07440E X-CRM114-Status: GOOD ( 15.57 ) 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:243 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 7/7] ag71xx: support for descriptors in SRAM 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 , Ben Menchaca MIME-Version: 1.0 Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org A good performance improvement. As I have not tested this, I'm keeping the Qualcomm default to no. Original commit below: From: Ben Menchaca Date: Fri, 7 Jun 2013 15:25:00 -0500 Subject: [ag71xx] support for descriptors in SRAM Adds support to the ag71xx to use SRAM for descriptors for a limited number of ag71xx instances. This is a significant performance improvement over using non-cacheable RAM (~4% overall bridging performance). Signed-off-by: Ben Menchaca Signed-off-by: Rosen Penev --- target/linux/ar71xx/config-4.4 | 1 + target/linux/ar71xx/config-4.9 | 1 + .../drivers/net/ethernet/atheros/ag71xx/Kconfig | 8 +++ .../drivers/net/ethernet/atheros/ag71xx/ag71xx.h | 1 + .../net/ethernet/atheros/ag71xx/ag71xx_main.c | 57 +++++++++++++++++++--- 5 files changed, 60 insertions(+), 8 deletions(-) diff --git a/target/linux/ar71xx/config-4.4 b/target/linux/ar71xx/config-4.4 index 3ba3853..3bfcd17 100644 --- a/target/linux/ar71xx/config-4.4 +++ b/target/linux/ar71xx/config-4.4 @@ -2,6 +2,7 @@ CONFIG_AG71XX=y CONFIG_AG71XX_AR8216_SUPPORT=y # CONFIG_AG71XX_DEBUG is not set # CONFIG_AG71XX_DEBUG_FS is not set +# CONFIG_AG71XX_SRAM_DESCRIPTORS is not set CONFIG_AR8216_PHY=y CONFIG_AR8216_PHY_LEDS=y CONFIG_ARCH_BINFMT_ELF_STATE=y diff --git a/target/linux/ar71xx/config-4.9 b/target/linux/ar71xx/config-4.9 index 1d47246..7ef78b3 100644 --- a/target/linux/ar71xx/config-4.9 +++ b/target/linux/ar71xx/config-4.9 @@ -2,6 +2,7 @@ CONFIG_AG71XX=y CONFIG_AG71XX_AR8216_SUPPORT=y # CONFIG_AG71XX_DEBUG is not set # CONFIG_AG71XX_DEBUG_FS is not set +# CONFIG_AG71XX_SRAM_DESCRIPTORS is not set CONFIG_AR8216_PHY=y CONFIG_AR8216_PHY_LEDS=y CONFIG_ARCH_BINFMT_ELF_STATE=y diff --git a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Kconfig b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Kconfig index 42d544f..b859b2b 100644 --- a/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Kconfig +++ b/target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/Kconfig @@ -8,6 +8,14 @@ config AG71XX if AG71XX +config AG71XX_SRAM_DESCRIPTORS + bool "Atheros AR71xx built-in ethernet driver SRAM descriptor rings" + default n + help + Atheros AR71xx built-in ethernet driver normally uses non-cached RAM + for descriptor rings. If set to 'y', this option puts those rings in + SRAM, improving performance. + config AG71XX_DEBUG bool "Atheros AR71xx built-in ethernet driver debugging" default n 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 f85e43d..1b2026b 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 @@ -115,6 +115,7 @@ struct ag71xx_ring { dma_addr_t descs_dma; u16 desc_split; u16 order; + void __iomem *iomem; }; struct ag71xx_mdio { 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 8ce777c..74bf524 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 @@ -13,6 +13,10 @@ #include "ag71xx.h" +#ifndef UNUSED +#define UNUSED(__x) (void)(__x) +#endif + static int ag71xx_gmac_num = 0; #if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) @@ -39,6 +43,17 @@ MODULE_PARM_DESC(msg_level, "Message level (-1=defaults,0=none,...,16=all)"); #define ETH_SWITCH_HEADER_LEN 2 +#ifdef CONFIG_AG71XX_SRAM_DESCRIPTORS +#define MAX_AG71XX_USING_SRAM 2 +#define MAX_AG71XX_SRAM_RINGS (MAX_AG71XX_USING_SRAM) * 2 +static unsigned long ag71xx_ring_bufs[MAX_AG71XX_SRAM_RINGS] = { + 0x1d000000UL, + 0x1d001000UL, + 0x1d002000UL, + 0x1d003000UL +}; +#endif /* CONFIG_AG71XX_SRAM_DESCRIPTORS */ + static int ag71xx_tx_packets(struct ag71xx *ag, bool flush); static inline unsigned int ag71xx_max_frame_len(unsigned int mtu) @@ -103,12 +118,17 @@ static void ag71xx_ring_free(struct ag71xx_ring *ring) { kfree(ring->buf); - if (ring->descs_cpu) - dma_free_coherent(NULL, ring->size * ring->desc_size, - ring->descs_cpu, ring->descs_dma); + if (ring->descs_cpu) { + if (ring->iomem) { + iounmap(ring->iomem); + } else { + dma_free_coherent(NULL, ring->size * ring->desc_size, + ring->descs_cpu, ring->descs_dma); + } + } } -static int ag71xx_ring_alloc(struct ag71xx_ring *ring) +static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int id) { ring->desc_size = sizeof(struct ag71xx_desc); if (ring->desc_size % cache_line_size()) { @@ -118,11 +138,32 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring) 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); +#ifdef CONFIG_AG71XX_SRAM_DESCRIPTORS + if (id < MAX_AG71XX_USING_SRAM) { + DBG("ag71xx: descriptors in SRAM\n"); + ring->iomem = ioremap_nocache(ag71xx_ring_bufs[id], 0x1000); + if (ring->iomem == NULL) + return -ENOMEM; + + ring->descs_cpu = (u8 *)ring->iomem; + ring->descs_dma = ((dma_addr_t)(ring->iomem) & 0x1fffffff); + goto descs_allocated; + } +#else + UNUSED(id); +#endif /* CONFIG_AG71XX_SRAM_DESCRIPTORS */ + ring->iomem = NULL; + ring->descs_cpu = dma_alloc_coherent(NULL, + ring->size * ring->desc_size, + &ring->descs_dma, + GFP_ATOMIC); + if (!ring->descs_cpu) return -ENOMEM; +#ifdef CONFIG_AG71XX_SRAM_DESCRIPTORS +descs_allocated: +#endif /* CONFIG_AG71XX_SRAM_DESCRIPTORS */ ring->buf = kzalloc(ring->size * sizeof(*ring->buf), GFP_KERNEL); if (!ring->buf) return -ENOMEM; @@ -320,13 +361,13 @@ static int ag71xx_rings_init(struct ag71xx *ag) { int ret; - ret = ag71xx_ring_alloc(&ag->tx_ring); + ret = ag71xx_ring_alloc(&ag->tx_ring, (ag->gmac_num * 2)); if (ret) return ret; ag71xx_ring_tx_init(ag); - ret = ag71xx_ring_alloc(&ag->rx_ring); + ret = ag71xx_ring_alloc(&ag->rx_ring, (ag->gmac_num * 2) + 1); if (ret) return ret;