Message ID | 20181019165735.22511-43-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | 726a2a951bf12fe0e0c0034b3ba23e8a3e2f331c |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp3571565lji; Fri, 19 Oct 2018 10:21:27 -0700 (PDT) X-Google-Smtp-Source: ACcGV61YTDkJV1jvdU5xdtzjYUmP52FdJwGvfnZawUmkeC8StPdqVbnG3XwYl1HXlj+plGFc47IL X-Received: by 2002:ac8:1207:: with SMTP id x7-v6mr33844847qti.317.1539969687071; Fri, 19 Oct 2018 10:21:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539969687; cv=none; d=google.com; s=arc-20160816; b=lG3U7NNeA7yhfxa5GZZaBadXw8vGmLtMYXoLrnwIDF1Sg1ITQWjOnnHJzosFIbj4k4 dRsqCeay8eaNuEF5wm8YQquTyEk6Otqn0BLsKLRy+8aOkCnEsBzLrP9nP1azxMnMmEOS ukGY0q8uS8MpabbmElxO4YyCsJ3xLWFHWUvWZWb4643pbVCdtZUIXlzDNjvi3Dkbhk6/ 3NjXNBCMW+oGajx0L8OdXmzpjFYGON4/MlbOTcAKjXjvyxrY8zNFE9A0odMoJfr9KHAB KYFwNp1ewhNbbt9lH9llx3+PY3x75vG6SAZKGj2TSB/LwPVlbzD8rjd30MJvNGS6SZ+s tc3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from; bh=oBNduvNbijw/418zsUX3IaWbCWe8YA0HGAn/uukfAkg=; b=SWntRflKG4Os+yFkTNRnMsU6ckmLLqYZHjPcIAqpPgBMbljziPI0HCsb4Az43/UALC oBYOs6SKHP5MtjHRhes66ini/u035J8LP3ccQWetcOHRldmwyRQWHYUDKbgmvBUmhb4q ddwapS30Mh7zmW8FCigdbmGwdkBhTLv1qj1933wd+KRV6YOE3LODNSiuwXBih41yih// oAWvZvzbBnFC1cAdR3gtjiuzCSv/ULxaul3y2jg6EhXPPLm30+e5DG71nYn91L7IsWxr vgohbP+efzje3Ipoq60DV89xAEXeybpHsZF6jRfRP431g0+p3ZATcqKCh3nGEkWx5bHx EWYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a44si384613qvh.150.2018.10.19.10.21.26 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 19 Oct 2018 10:21:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1gDYSk-0007lL-Em for patch@linaro.org; Fri, 19 Oct 2018 13:21:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gDY6q-0002Jg-EY for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:58:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gDY6o-0003XA-Dd for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:58:48 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:51980) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1gDY6o-00020Y-4m for qemu-devel@nongnu.org; Fri, 19 Oct 2018 12:58:46 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from <pm215@archaic.org.uk>) id 1gDY6M-0006pD-In for qemu-devel@nongnu.org; Fri, 19 Oct 2018 17:58:18 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2018 17:57:32 +0100 Message-Id: <20181019165735.22511-43-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181019165735.22511-1-peter.maydell@linaro.org> References: <20181019165735.22511-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 42/45] net: cadence_gem: Announce availability of priority queues X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target-arm queue
|
expand
|
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index 17959989289..16a8455128c 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -1283,6 +1283,7 @@ static void gem_reset(DeviceState *d) int i; CadenceGEMState *s = CADENCE_GEM(d); const uint8_t *a; + uint32_t queues_mask = 0; DB_PRINT("\n"); @@ -1299,7 +1300,12 @@ static void gem_reset(DeviceState *d) s->regs[GEM_DESCONF] = 0x02500111; s->regs[GEM_DESCONF2] = 0x2ab13fff; s->regs[GEM_DESCONF5] = 0x002f2045; - s->regs[GEM_DESCONF6] = 0x00000200; + s->regs[GEM_DESCONF6] = 0x0; + + if (s->num_priority_queues > 1) { + queues_mask = MAKE_64BIT_MASK(1, s->num_priority_queues - 1); + s->regs[GEM_DESCONF6] |= queues_mask; + } /* Set MAC address */ a = &s->conf.macaddr.a[0];