From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 76BB1C001E0 for ; Thu, 10 Aug 2023 14:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:CC:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yJICsOkq+wsGOu0x+8Kdgq+9UCT76CdcO5neVb0xYmk=; b=f8FkhTU1WEPo16 WbW9sZKTpjA0VWy5nUuDCEQMa+DHHNpHpUNklghhvzoTEk6k8MBl5PZUksVGIQ7zich4s4qqGNwtP VmRZ0SVFAwk85Sq8kX6ivPf3kmqvFuXp1z41YTKHyU+8uLi4yrhxHiPgDs7wWLWaE8BNCwwQrZSE3 xL0yzIZ+wpZ6bhJ6r6FOsPldEQNtDwuHx1GlHfVtM+MR8lCPqpOcxUlBnwy6iKZTO+QTIEdaie4NI hmNFrllFYdeoRps/miLKOkyX0ISTTcUPUiGbixEROiMhPCNLKFcE9pUd4vjTCE0gxuODvG3A0I4KB EaZWm9zbNOXC0M81069g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qU71Z-007vZO-37; Thu, 10 Aug 2023 14:52:29 +0000 Received: from mx07-00178001.pphosted.com ([185.132.182.106]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qU71X-007vXr-01 for linux-arm-kernel@lists.infradead.org; Thu, 10 Aug 2023 14:52:28 +0000 Received: from pps.filterd (m0288072.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.22/8.17.1.22) with ESMTP id 37ACHBbv008415; Thu, 10 Aug 2023 16:52:13 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h= message-id:date:mime-version:subject:to:cc:references:from :in-reply-to:content-type:content-transfer-encoding; s= selector1; bh=uxD1byUTfrhwfQBYzxSaLD/QBU94QFTUviGR6L3yWtk=; b=OM 94/Fm4Z3mD/XrR7SpHIi8b4+CRVQTx4On2KNdshYzJ/c+SzNoM3Qn08cGc3CIrMg /RlRRbo0BO4/d0vx9msdrFYVc0cG1kX4AdL+kT2bSCt+JH35kLaU1FDO+vGdoHnh +94ZlKg9U/MRTrKZCZMycBOElY+9dR731ie/Od5RX7/pb/ankpiJ0atgh8DE8AB5 qNVRx8JooAT8JdZNgXbTsYBxWn45VpashSwx87JKW9P739e4ndKqoKaQEm2bcSru ndaIq/eNkmesbWYDGkHevAa0WQ4r465ZhdRSt5NCfpoURtZsZGn8Kt7xyVxmZEkl 8uiY65WweVbMdT3zP9lw== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3scdv7pw6k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 10 Aug 2023 16:52:13 +0200 (MEST) Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 72F1A100053; Thu, 10 Aug 2023 16:52:03 +0200 (CEST) Received: from Webmail-eu.st.com (eqndag1node4.st.com [10.75.129.133]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 68C8C222CB3; Thu, 10 Aug 2023 16:52:03 +0200 (CEST) Received: from [10.201.21.122] (10.201.21.122) by EQNDAG1NODE4.st.com (10.75.129.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Thu, 10 Aug 2023 16:52:02 +0200 Message-ID: Date: Thu, 10 Aug 2023 16:52:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: [PATCH net-next v3 06/10] net: stmmac: xgmac: support per-channel irq Content-Language: en-US To: Jisheng Zhang , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Giuseppe Cavallaro , Jose Abreu CC: , , , , References: <20230809165007.1439-1-jszhang@kernel.org> <20230809165007.1439-7-jszhang@kernel.org> From: Alexandre TORGUE In-Reply-To: <20230809165007.1439-7-jszhang@kernel.org> X-Originating-IP: [10.201.21.122] X-ClientProxiedBy: EQNCAS1NODE3.st.com (10.75.129.80) To EQNDAG1NODE4.st.com (10.75.129.133) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-08-10_12,2023-08-10_01,2023-05-22_02 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230810_075227_361370_E33D1776 X-CRM114-Status: GOOD ( 17.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 8/9/23 18:50, Jisheng Zhang wrote: > The IP supports per channel interrupt, add support for this usage case. > > Signed-off-by: Jisheng Zhang > --- > .../net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 ++ > .../ethernet/stmicro/stmmac/dwxgmac2_dma.c | 33 +++++++++++-------- > 2 files changed, 22 insertions(+), 13 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h > index 81cbb13a101d..12e1228ccf2a 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h > +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h > @@ -327,6 +327,8 @@ > > /* DMA Registers */ > #define XGMAC_DMA_MODE 0x00003000 > +#define XGMAC_INTM GENMASK(13, 12) > +#define XGMAC_INTM_MODE1 0x1 > #define XGMAC_SWR BIT(0) > #define XGMAC_DMA_SYSBUS_MODE 0x00003004 > #define XGMAC_WR_OSR_LMT GENMASK(29, 24) > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c > index b5ba4e0cca55..ef25af92d6cc 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c > +++ b/drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c > @@ -31,6 +31,13 @@ static void dwxgmac2_dma_init(void __iomem *ioaddr, > value |= XGMAC_EAME; > > writel(value, ioaddr + XGMAC_DMA_SYSBUS_MODE); > + > + if (dma_cfg->perch_irq_en) { > + value = readl(ioaddr + XGMAC_DMA_MODE); > + value &= ~XGMAC_INTM; > + value |= FIELD_PREP(XGMAC_INTM, XGMAC_INTM_MODE1); > + writel(value, ioaddr + XGMAC_DMA_MODE); > + } > } > > static void dwxgmac2_dma_init_chan(struct stmmac_priv *priv, > @@ -365,20 +372,20 @@ static int dwxgmac2_dma_interrupt(struct stmmac_priv *priv, > } > > /* TX/RX NORMAL interrupts */ > - if (likely(intr_status & XGMAC_NIS)) { No longer need to check NIS bit ? > - if (likely(intr_status & XGMAC_RI)) { > - u64_stats_update_begin(&rx_q->rxq_stats.syncp); > - rx_q->rxq_stats.rx_normal_irq_n++; > - u64_stats_update_end(&rx_q->rxq_stats.syncp); > - ret |= handle_rx; > - } > - if (likely(intr_status & (XGMAC_TI | XGMAC_TBU))) { > - u64_stats_update_begin(&tx_q->txq_stats.syncp); > - tx_q->txq_stats.tx_normal_irq_n++; > - u64_stats_update_end(&tx_q->txq_stats.syncp); > - ret |= handle_tx; > - } > + if (likely(intr_status & XGMAC_RI)) { > + u64_stats_update_begin(&rx_q->rxq_stats.syncp); > + rx_q->rxq_stats.rx_normal_irq_n++; > + u64_stats_update_end(&rx_q->rxq_stats.syncp); > + ret |= handle_rx; > + } > + if (likely(intr_status & XGMAC_TI)) { > + u64_stats_update_begin(&tx_q->txq_stats.syncp); > + tx_q->txq_stats.tx_normal_irq_n++; > + u64_stats_update_end(&tx_q->txq_stats.syncp); > + ret |= handle_tx; > } > + if (unlikely(intr_status & XGMAC_TBU)) > + ret |= handle_tx; > > /* Clear interrupts */ > writel(intr_en & intr_status, ioaddr + XGMAC_DMA_CH_STATUS(chan)); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel