From patchwork Thu Nov 29 08:08:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kunihiko Hayashi X-Patchwork-Id: 152372 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2088423ljp; Thu, 29 Nov 2018 00:08:48 -0800 (PST) X-Google-Smtp-Source: AFSGD/WEOoOkoT5qkeLRVWqplMSlT08KYZRRoa2I6epOfT1AzU0LO7d+U40CaQhfye0TrdRCbReu X-Received: by 2002:a17:902:a6:: with SMTP id a35mr479827pla.201.1543478927990; Thu, 29 Nov 2018 00:08:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543478927; cv=none; d=google.com; s=arc-20160816; b=ljEUqanZBP6iZVj3Z63Fmeynb6I4a3RZJkP+bTWxDvnzm31O7Yq8bzH2wwZ8sEvVFX qrQdgLdyeDnu/+PuuRmg3eAed+N0Tv2dyk0uLzjcCFHmpTTrwqu5kruWY21dHdX1LrtW cmGbCujJ6dIJh+VdYqdbWJBu1NEaFikw1OCfGjWiPFpSPk8W1ahSHo4wRaHyV3AblFRR EDsgzv6o1057lsv1GPECQLuj1AtplCf2ubnjwo3pi2wKoz2zlLoA7r834g6MOI+miezO t1XFK3xDUB15QBEg5j/TTagjkpzWY8yaI5qmxuukEDTDjSYuRDEiaaH6C1Y018VyDaPb ysyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=vsYvpOSVLZJmorybimrin8emv5mt7GIT5+BwrP8vhcM=; b=GND0E2NUctn80w6TUHk13ZLmrX1elvBVrs+mQt2caOBBvH8jsURyI+C1JjHxQChGOz gVhsAq9NyV2NdgkZQJpyfVYsmAYQdGQ1WGLhF6fNoSHpKRT+nD6d/n83PctN9Vk4Jm0j yk0TDBycg4l/RZFjq1bv8dFhQIEJ8sbVSbUIGdRjtDYwB1GtD/aAXZVyKcopAKN4wUWN p7l6asyqYHHrbRbr6eMCPXxecKvHYlLYPpR96lrIliPxN4H+s8r+fSbSpqAQDvH2Yui5 rkx/tHOYPLdjCKZsHvWTanZC93wYlzaeQp1IGCSs51M+Tkls09xwEQLJW8B9Hax576Vr F6jw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a18si1320288pgj.77.2018.11.29.00.08.47; Thu, 29 Nov 2018 00:08:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728004AbeK2TNQ (ORCPT + 32 others); Thu, 29 Nov 2018 14:13:16 -0500 Received: from mx.socionext.com ([202.248.49.38]:4132 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727944AbeK2TNQ (ORCPT ); Thu, 29 Nov 2018 14:13:16 -0500 Received: from unknown (HELO kinkan-ex.css.socionext.com) ([172.31.9.52]) by mx.socionext.com with ESMTP; 29 Nov 2018 17:08:44 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by kinkan-ex.css.socionext.com (Postfix) with ESMTP id D6491180BCB; Thu, 29 Nov 2018 17:08:44 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Thu, 29 Nov 2018 17:08:44 +0900 Received: from plum.e01.socionext.com (unknown [10.213.132.32]) by kinkan.css.socionext.com (Postfix) with ESMTP id 38EC81A03A2; Thu, 29 Nov 2018 17:08:44 +0900 (JST) From: Kunihiko Hayashi To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH net 1/3] net: ethernet: ave: Increase descriptors to improve performance Date: Thu, 29 Nov 2018 17:08:36 +0900 Message-Id: <1543478918-13883-2-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543478918-13883-1-git-send-email-hayashi.kunihiko@socionext.com> References: <1543478918-13883-1-git-send-email-hayashi.kunihiko@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org To improve performance, this increases Rx descriptor to 256, Tx descriptor to 64, and adjusts NAPI weight to NAPI_POLL_WEIGHT. Signed-off-by: Kunihiko Hayashi --- drivers/net/ethernet/socionext/sni_ave.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c index 8c1e120..598b963 100644 --- a/drivers/net/ethernet/socionext/sni_ave.c +++ b/drivers/net/ethernet/socionext/sni_ave.c @@ -185,8 +185,8 @@ NETIF_MSG_TX_ERR) /* Parameter for descriptor */ -#define AVE_NR_TXDESC 32 /* Tx descriptor */ -#define AVE_NR_RXDESC 64 /* Rx descriptor */ +#define AVE_NR_TXDESC 64 /* Tx descriptor */ +#define AVE_NR_RXDESC 256 /* Rx descriptor */ #define AVE_DESC_OFS_CMDSTS 0 #define AVE_DESC_OFS_ADDRL 4 @@ -1694,9 +1694,10 @@ static int ave_probe(struct platform_device *pdev) pdev->name, pdev->id); /* Register as a NAPI supported driver */ - netif_napi_add(ndev, &priv->napi_rx, ave_napi_poll_rx, priv->rx.ndesc); + netif_napi_add(ndev, &priv->napi_rx, ave_napi_poll_rx, + NAPI_POLL_WEIGHT); netif_tx_napi_add(ndev, &priv->napi_tx, ave_napi_poll_tx, - priv->tx.ndesc); + NAPI_POLL_WEIGHT); platform_set_drvdata(pdev, ndev); From patchwork Thu Nov 29 08:08:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kunihiko Hayashi X-Patchwork-Id: 152373 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2088443ljp; Thu, 29 Nov 2018 00:08:49 -0800 (PST) X-Google-Smtp-Source: AFSGD/XmoYEVyGx1Y2X9AiRN1zpm6FbEXbpzq+bCOdChLzXLbKBscmFET6ubeRY7g4FQmdS/5BS5 X-Received: by 2002:a17:902:b48b:: with SMTP id y11mr489258plr.200.1543478929350; Thu, 29 Nov 2018 00:08:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543478929; cv=none; d=google.com; s=arc-20160816; b=tjQqShxaznC/n97NZn7EjzXq4KHVrsTKRd1wigyK2exgG1P7RAU84g4NQQQgrkzgKn x4fp42KlazB74mqxjHOZs/H7gTeeJtqPOnadQMrO+ztfceugcBZBGpQPXZHOy/ueZGsf 5cwz5llV2SCW6bngLFkCC3riMAx1TrjcMO/8MDli3n9684CMGRt5jsOLw6nY21Y+n+v9 KU8DCz3VvDgGKmXQu7znfOecHGXsh8nuPNNJ5LT37eM1ewvHYo+7mMFPyFKBYvetHOaK kZ/Nw02/+n6NwWLKP9t1iR/sXpueGGalx7fvoOfYVjPJC5XNxWPR53QwiutX2PnaqfPz CUjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=TJfZcJDHbTkf6DYzC7h+3CdpbodRUdhUJAdzqXLTOKA=; b=nLpZ7v26g/OrxwmyODk1Xj65YVKfgMvrUmbAE1asgAXHPUziLWA2WKEYC1TbawFWpN BCqR7clQz96JndbITMMfXoQYuL2Iaa8Y32Eu4GQ2Rr8+luuyYeCv8CcfNaS3ITRFHLGv YJig4cG08GgriDy40tZJp7HMgfSP5JNuBDo7GgmC+Jzm3IdSQMwoybKC0mJ8C5MW0/rf SeQjTcLf9uTCkaUyH57FwhPu4gLjBCpFslCmAfQ4MjA32RbCYnzbSesgvueWwkQnrsl2 HxQo3ntEi5rVOKXOjR7094edHcGG5CI0BdN24WMDa9OvcrUAlnV7jUTxryAV6MFpYG6C B8FQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a18si1320288pgj.77.2018.11.29.00.08.49; Thu, 29 Nov 2018 00:08:49 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728033AbeK2TNS (ORCPT + 32 others); Thu, 29 Nov 2018 14:13:18 -0500 Received: from mx.socionext.com ([202.248.49.38]:4139 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727944AbeK2TNS (ORCPT ); Thu, 29 Nov 2018 14:13:18 -0500 Received: from unknown (HELO iyokan-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 29 Nov 2018 17:08:45 +0900 Received: from mail.mfilter.local (m-filter-1 [10.213.24.61]) by iyokan-ex.css.socionext.com (Postfix) with ESMTP id BE32960062; Thu, 29 Nov 2018 17:08:45 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Thu, 29 Nov 2018 17:08:45 +0900 Received: from plum.e01.socionext.com (unknown [10.213.132.32]) by kinkan.css.socionext.com (Postfix) with ESMTP id 4CBB61A03A2; Thu, 29 Nov 2018 17:08:45 +0900 (JST) From: Kunihiko Hayashi To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH net 2/3] net: ethernet: ave: Replace NET_IP_ALIGN with AVE_FRAME_HEADROOM Date: Thu, 29 Nov 2018 17:08:37 +0900 Message-Id: <1543478918-13883-3-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543478918-13883-1-git-send-email-hayashi.kunihiko@socionext.com> References: <1543478918-13883-1-git-send-email-hayashi.kunihiko@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In commit 26a4676faa1a ("arm64: mm: define NET_IP_ALIGN to 0"), AVE controller affects this modification because the controller forces to ignore lower 2bits of buffer start address, and make 2-byte headroom, that is, data reception starts from (buffer + 2). This patch defines AVE_FRAME_HEADROOM macro as hardware-specific value, and replaces NET_IP_ALIGN with it. Signed-off-by: Kunihiko Hayashi --- drivers/net/ethernet/socionext/sni_ave.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c index 598b963..6710151 100644 --- a/drivers/net/ethernet/socionext/sni_ave.c +++ b/drivers/net/ethernet/socionext/sni_ave.c @@ -194,6 +194,7 @@ /* Parameter for ethernet frame */ #define AVE_MAX_ETHFRAME 1518 +#define AVE_FRAME_HEADROOM 2 /* Parameter for interrupt */ #define AVE_INTM_COUNT 20 @@ -577,12 +578,13 @@ static int ave_rxdesc_prepare(struct net_device *ndev, int entry) skb = priv->rx.desc[entry].skbs; if (!skb) { - skb = netdev_alloc_skb_ip_align(ndev, - AVE_MAX_ETHFRAME); + skb = netdev_alloc_skb(ndev, AVE_MAX_ETHFRAME); if (!skb) { netdev_err(ndev, "can't allocate skb for Rx\n"); return -ENOMEM; } + skb->data += AVE_FRAME_HEADROOM; + skb->tail += AVE_FRAME_HEADROOM; } /* set disable to cmdsts */ @@ -595,12 +597,12 @@ static int ave_rxdesc_prepare(struct net_device *ndev, int entry) * - Rx buffer begins with 2 byte headroom, and data will be put from * (buffer + 2). * To satisfy this, specify the address to put back the buffer - * pointer advanced by NET_IP_ALIGN by netdev_alloc_skb_ip_align(), - * and expand the map size by NET_IP_ALIGN. + * pointer advanced by AVE_FRAME_HEADROOM, and expand the map size + * by AVE_FRAME_HEADROOM. */ ret = ave_dma_map(ndev, &priv->rx.desc[entry], - skb->data - NET_IP_ALIGN, - AVE_MAX_ETHFRAME + NET_IP_ALIGN, + skb->data - AVE_FRAME_HEADROOM, + AVE_MAX_ETHFRAME + AVE_FRAME_HEADROOM, DMA_FROM_DEVICE, &paddr); if (ret) { netdev_err(ndev, "can't map skb for Rx\n"); From patchwork Thu Nov 29 08:08:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kunihiko Hayashi X-Patchwork-Id: 152374 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2088549ljp; Thu, 29 Nov 2018 00:08:56 -0800 (PST) X-Google-Smtp-Source: AFSGD/VY+6ssZVLNNKJ5iMTPqshkrr0PHj7IH+5zhLkZU2plk3AhFB/io+hNwG4XnUMtn60yEAZs X-Received: by 2002:a17:902:126:: with SMTP id 35mr510309plb.132.1543478935875; Thu, 29 Nov 2018 00:08:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543478935; cv=none; d=google.com; s=arc-20160816; b=KZLO9LkKb7SJeFnD5UTw9DiVec6cOjKMalL/jEWLuGhvUtYVxKKTI+75Iu1j1Z1JPF bcaaeIFAwPsrM748STymnNSvgJ0iNWRbk8M6IkwRq7apiqPpr6uTw0ljSCMidpprx7Sr fai/3M8FhsR3Uy3aE/CVkWpBLA9IK/6j2C1FdSpa5hGVDJ9uESmnv9SXQhSdReStYnJk qtBW/F9+/sd5kxaIY59QVrrIjwRrkMfDKzNH48OECnA9hKdoQTY5Uv94rvkLDbcqSMHy z94Ikl2tkaxpTLH2Ta9KRxhLtdykPooZoqDLPwSGddGpd0whhM7pwSfRlI+6Mvq5mUwP 2JRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=3Knmzek76Pj+fgAqbOxAqCZ3arXgu18LT5GY6t5XptA=; b=XwnM7LL/MFb68kLGTgEVXR5tIr8w/+zOWfcl4dEJSrhJCYHPoRbQHaLjxHBaC0Mxvn 8ITMRErj1Q3tJmmxpp+G4qDbXMLDe4hQGc2dPJVSBmkZSoRES6eIxyDQX2rLJn3VoEpm 9KIydu9RiLWd5NKGwtvIWI7xQA3sqoMwcthTV/ZZn8Nw+GJ2jh9R1lG2k2ua1dx8sWdB PcaDKNt8PZhpQl25qbn1aT23Vt1Opczfcg/u+N7JNFWeuzuw8Y5hJuNTQw7qGgR6qwV1 sp1bzPVFe5WKHW7mhIys6eQqjt8evL0Ghq9+I2Cqc5Og8QG+NsJOTpuXdt6Aex5OYJqP AWvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e17si1398768pgj.142.2018.11.29.00.08.55; Thu, 29 Nov 2018 00:08:55 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728061AbeK2TNZ (ORCPT + 32 others); Thu, 29 Nov 2018 14:13:25 -0500 Received: from mx.socionext.com ([202.248.49.38]:4141 "EHLO mx.socionext.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727322AbeK2TNS (ORCPT ); Thu, 29 Nov 2018 14:13:18 -0500 Received: from unknown (HELO iyokan-ex.css.socionext.com) ([172.31.9.54]) by mx.socionext.com with ESMTP; 29 Nov 2018 17:08:46 +0900 Received: from mail.mfilter.local (m-filter-2 [10.213.24.62]) by iyokan-ex.css.socionext.com (Postfix) with ESMTP id E743360062; Thu, 29 Nov 2018 17:08:46 +0900 (JST) Received: from 172.31.9.51 (172.31.9.51) by m-FILTER with ESMTP; Thu, 29 Nov 2018 17:08:46 +0900 Received: from plum.e01.socionext.com (unknown [10.213.132.32]) by kinkan.css.socionext.com (Postfix) with ESMTP id 5A3211A03A2; Thu, 29 Nov 2018 17:08:46 +0900 (JST) From: Kunihiko Hayashi To: "David S. Miller" Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Kunihiko Hayashi Subject: [PATCH net 3/3] net: ethernet: ave: Add MODULE_AUTHOR and MAINTAINERS entry Date: Thu, 29 Nov 2018 17:08:38 +0900 Message-Id: <1543478918-13883-4-git-send-email-hayashi.kunihiko@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543478918-13883-1-git-send-email-hayashi.kunihiko@socionext.com> References: <1543478918-13883-1-git-send-email-hayashi.kunihiko@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add missing MODULE_AUTHOR of ave driver and an entry to MAINTAINERS. Signed-off-by: Kunihiko Hayashi --- MAINTAINERS | 7 +++++++ drivers/net/ethernet/socionext/sni_ave.c | 1 + 2 files changed, 8 insertions(+) -- 2.7.4 diff --git a/MAINTAINERS b/MAINTAINERS index 380e43f..0bbab10 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -13824,6 +13824,13 @@ F: drivers/md/raid* F: include/linux/raid/ F: include/uapi/linux/raid/ +SOCIONEXT (SNI) AVE NETWORK DRIVER +M: Kunihiko Hayashi +L: netdev@vger.kernel.org +S: Maintained +F: drivers/net/ethernet/socionext/sni_ave.c +F: Documentation/devicetree/bindings/net/socionext,uniphier-ave4.txt + SOCIONEXT (SNI) NETSEC NETWORK DRIVER M: Jassi Brar L: netdev@vger.kernel.org diff --git a/drivers/net/ethernet/socionext/sni_ave.c b/drivers/net/ethernet/socionext/sni_ave.c index 6710151..2c66c0e 100644 --- a/drivers/net/ethernet/socionext/sni_ave.c +++ b/drivers/net/ethernet/socionext/sni_ave.c @@ -1974,5 +1974,6 @@ static struct platform_driver ave_driver = { }; module_platform_driver(ave_driver); +MODULE_AUTHOR("Kunihiko Hayashi "); MODULE_DESCRIPTION("Socionext UniPhier AVE ethernet driver"); MODULE_LICENSE("GPL v2");