From nobody Wed Dec 17 21:46:24 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592486899; cv=none; d=zohomail.com; s=zohoarc; b=Z4HpUEUAGbuiP0c1nzJQ5aLNmgII8HsKa4JZnRTfevotqXXTiLHBPAEOTzJF8Txk0BDAUw5hoVn1txRutxgf7AqLNpLOo8OoFJZ2HluL5DS30sW+BIyJ+zVX4GeFoVtPqEZFi7Tz68JBG4aAQpJYQhkEPks4rVzXcS58xj5NqKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592486899; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=49TrhWLyQHkix4obFR6PR7exRax6E/YU1zWcuxXe1s0=; b=EVZPjC3vox80xTAbIN5CFB514Cq/myU7vimXHM2qWo+ja9UcCTdlZwTuSvZOXJyvfG8a2FJLSJgps7y/SoWY0DT6FNcwHWpMuppaTlWPVmsgr5uZCRIBnfkdRZHlGWThYU4bYy9jqP9PZKeYOvlmc6yObMULZtaR0mxZJgrkcV0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592486899531935.4837185561303; Thu, 18 Jun 2020 06:28:19 -0700 (PDT) Received: from localhost ([::1]:56216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jluaY-00083o-9Q for importer@patchew.org; Thu, 18 Jun 2020 09:28:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40616) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jluVR-0006jx-Rm for qemu-devel@nongnu.org; Thu, 18 Jun 2020 09:23:01 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:55213 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jluVQ-0005oB-1N for qemu-devel@nongnu.org; Thu, 18 Jun 2020 09:23:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-wE3p1lvwMXOt9WaIbcpK7A-1; Thu, 18 Jun 2020 09:22:57 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D4736DB67; Thu, 18 Jun 2020 13:22:47 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-109.pek2.redhat.com [10.72.12.109]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9D9F15BAC0; Thu, 18 Jun 2020 13:22:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592486579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=49TrhWLyQHkix4obFR6PR7exRax6E/YU1zWcuxXe1s0=; b=Sg8C7mOsMhIRnowVrdM63M2AulFndCrX8s7QNr+vtESUI5J+c6GipNLlN4qRnia+hJQFGk wu0Ahii0AbdCuUZ/ZhAlqoq3a62XVmlRva0Ft/N4eCNCfPZatA3KqsAZ926mhx8lZ/tFp/ 8luTrwHP8mi0fU7gqiKsri4RTS2kRj4= X-MC-Unique: wE3p1lvwMXOt9WaIbcpK7A-1 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Subject: [PULL V2 15/33] net: cadence_gem: Set ISR according to queue in use Date: Thu, 18 Jun 2020 21:21:30 +0800 Message-Id: <1592486508-6135-16-git-send-email-jasowang@redhat.com> In-Reply-To: <1592486508-6135-1-git-send-email-jasowang@redhat.com> References: <1592486508-6135-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=jasowang@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/18 01:21:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sai Pavan Boddu , Jason Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Sai Pavan Boddu Set ISR according to queue in use, added interrupt support for all queues. Signed-off-by: Sai Pavan Boddu Reviewed-by: Edgar E. Iglesias Signed-off-by: Jason Wang --- hw/net/cadence_gem.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 72e7cf9..2e183b5 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -451,6 +451,16 @@ static inline void rx_desc_set_sar(uint32_t *desc, int= sar_idx) /* The broadcast MAC address: 0xFFFFFFFFFFFF */ static const uint8_t broadcast_addr[] =3D { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, = 0xFF }; =20 +static void gem_set_isr(CadenceGEMState *s, int q, uint32_t flag) +{ + if (q =3D=3D 0) { + s->regs[GEM_ISR] |=3D flag & ~(s->regs[GEM_IMR]); + } else { + s->regs[GEM_INT_Q1_STATUS + q - 1] |=3D flag & + ~(s->regs[GEM_INT_Q1_MASK + q - 1]); + } +} + /* * gem_init_register_masks: * One time initialization. @@ -906,7 +916,7 @@ static void gem_get_rx_desc(CadenceGEMState *s, int q) if (rx_desc_get_ownership(s->rx_desc[q]) =3D=3D 1) { DB_PRINT("descriptor 0x%" HWADDR_PRIx " owned by sw.\n", desc_addr= ); s->regs[GEM_RXSTATUS] |=3D GEM_RXSTATUS_NOBUF; - s->regs[GEM_ISR] |=3D GEM_INT_RXUSED & ~(s->regs[GEM_IMR]); + gem_set_isr(s, q, GEM_INT_RXUSED); /* Handle interrupt consequences */ gem_update_int_status(s); } @@ -1080,7 +1090,7 @@ static ssize_t gem_receive(NetClientState *nc, const = uint8_t *buf, size_t size) gem_receive_updatestats(s, buf, size); =20 s->regs[GEM_RXSTATUS] |=3D GEM_RXSTATUS_FRMRCVD; - s->regs[GEM_ISR] |=3D GEM_INT_RXCMPL & ~(s->regs[GEM_IMR]); + gem_set_isr(s, q, GEM_INT_RXCMPL); =20 /* Handle interrupt consequences */ gem_update_int_status(s); @@ -1231,13 +1241,7 @@ static void gem_transmit(CadenceGEMState *s) DB_PRINT("TX descriptor next: 0x%08x\n", s->tx_desc_addr[q= ]); =20 s->regs[GEM_TXSTATUS] |=3D GEM_TXSTATUS_TXCMPL; - s->regs[GEM_ISR] |=3D GEM_INT_TXCMPL & ~(s->regs[GEM_IMR]); - - /* Update queue interrupt status */ - if (s->num_priority_queues > 1) { - s->regs[GEM_INT_Q1_STATUS + q] |=3D - GEM_INT_TXCMPL & ~(s->regs[GEM_INT_Q1_MASK + q= ]); - } + gem_set_isr(s, q, GEM_INT_TXCMPL); =20 /* Handle interrupt consequences */ gem_update_int_status(s); @@ -1287,7 +1291,10 @@ static void gem_transmit(CadenceGEMState *s) =20 if (tx_desc_get_used(desc)) { s->regs[GEM_TXSTATUS] |=3D GEM_TXSTATUS_USED; - s->regs[GEM_ISR] |=3D GEM_INT_TXUSED & ~(s->regs[GEM_IMR]); + /* IRQ TXUSED is defined only for queue 0 */ + if (q =3D=3D 0) { + gem_set_isr(s, 0, GEM_INT_TXUSED); + } gem_update_int_status(s); } } --=20 2.5.0