From nobody Sat Sep 28 22:38:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548700765958604.0636725314514; Mon, 28 Jan 2019 10:39:25 -0800 (PST) Received: from localhost ([127.0.0.1]:36770 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goBoa-0000Cy-Uu for importer@patchew.org; Mon, 28 Jan 2019 13:39:25 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41182) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goBNd-00039T-Pb for qemu-devel@nongnu.org; Mon, 28 Jan 2019 13:11:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goBNc-0000YX-LW for qemu-devel@nongnu.org; Mon, 28 Jan 2019 13:11:33 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:35836) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1goBNc-0000Ih-Cr for qemu-devel@nongnu.org; Mon, 28 Jan 2019 13:11:32 -0500 Received: by mail-wr1-x431.google.com with SMTP id 96so19193366wrb.2 for ; Mon, 28 Jan 2019 10:11:14 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b18sm97910681wrw.83.2019.01.28.10.11.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 10:11:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=GCnlMeweuIJvpl2JL6nATLlnfPOZB2vDzvUEhxD4dTw=; b=F2j9aIP3/l65PlSZl7Fav1WnStv/v+Zp/pQHvC7YxqNvbcpZChz2DIBUrIN2AIOjeZ o65oZ3KCMYhu9TxqQnJ2LF0sbmX1mvlUXxyMq4fD/1CoJuXzSMM7JkCEfAjGrVUsoyQu pMODrAqGqCZEmZ5IVFQO47zyFpuMBvk9htS1I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GCnlMeweuIJvpl2JL6nATLlnfPOZB2vDzvUEhxD4dTw=; b=ZavxFHBBVSjpHeQTcerCdBmXUBvfBuE1iBmnjwMDr3dt7ZJTYQDFzqo2j+8wA8uNPx hoeBwj/FCuy7S9SrMOgjJYSeTogHTlT3M6V4qwSx3WD14SSmHKR3cfFk6UT51e5WEyki ux/bVg4qlkvTc0N7BIUzUOdBWC4WtMHq3PxvpSYTcJbtF/rhIMevbduG3eMzIQzAyvFX V/cuf+XonFAByjF3wQBBtTzselkAubDM7WZmWTgpbjlAergBoyvFq/3qMmBdptjRt9FQ EuunAd1hcd0nOljQP7VUsNzSby7PSHxR3wGSIka4YRlWn0x9xLzGn0dqAfUUeEttZREA m8OA== X-Gm-Message-State: AJcUukeF6PgT+We3Kd5Ya3piYPN8JPIzbKa3Ii8TaDTayEEIrh1s2fuL CSl39L4/ITYSY8LL79mmi0YxUy/cEnSG5g== X-Google-Smtp-Source: ALg8bN7EQEUPlXsa36S55w6e+xRAk1GMqME48sf45AcDhlpqou681Y2nGR/fxifOZB2e3yKd1xu4SQ== X-Received: by 2002:a5d:548d:: with SMTP id h13mr21663809wrv.80.1548699073769; Mon, 28 Jan 2019 10:11:13 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 28 Jan 2019 18:10:40 +0000 Message-Id: <20190128181047.20781-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190128181047.20781-1-peter.maydell@linaro.org> References: <20190128181047.20781-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::431 Subject: [Qemu-devel] [PULL 19/26] aspeed/smc: define registers for all possible CS X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: C=C3=A9dric Le Goater The model should expose one control register per possible CS. When testing the validity of the register number in the read operation, replace 's->num_cs' by 'ctrl->max_slaves' which represents the maximum number of flash devices a controller can handle. Signed-off-by: C=C3=A9dric Le Goater Reviewed-by: Joel Stanley Message-id: 20190124140519.13838-3-clg@kaod.org Signed-off-by: Peter Maydell --- hw/ssi/aspeed_smc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 7af808c33c5..6045ca11b96 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -665,7 +665,7 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr ad= dr, unsigned int size) addr =3D=3D s->r_ce_ctrl || addr =3D=3D R_INTR_CTRL || (addr >=3D R_SEG_ADDR0 && addr < R_SEG_ADDR0 + s->ctrl->max_slaves= ) || - (addr >=3D s->r_ctrl0 && addr < s->r_ctrl0 + s->num_cs)) { + (addr >=3D s->r_ctrl0 && addr < s->r_ctrl0 + s->ctrl->max_slaves))= { return s->regs[addr]; } else { qemu_log_mask(LOG_UNIMP, "%s: not implemented: 0x%" HWADDR_PRIx "\= n", --=20 2.20.1