From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys465-0008Ml-P8 for qemu-devel@nongnu.org; Tue, 12 May 2015 02:55:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ys461-0008U3-4R for qemu-devel@nongnu.org; Tue, 12 May 2015 02:55:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40447) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ys460-0008Ty-VF for qemu-devel@nongnu.org; Tue, 12 May 2015 02:55:17 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id AA86BAC7A0 for ; Tue, 12 May 2015 06:55:15 +0000 (UTC) Message-ID: <1431413713.26522.26.camel@nilsson.home.kraxel.org> From: Gerd Hoffmann Date: Tue, 12 May 2015 08:55:13 +0200 In-Reply-To: <1431352157-40283-20-git-send-email-pbonzini@redhat.com> References: <1431352157-40283-1-git-send-email-pbonzini@redhat.com> <1431352157-40283-20-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 19/31] q35: add config space wmask for SMRAM and ESMRAMC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini Cc: lersek@redhat.com, qemu-devel@nongnu.org, mst@redhat.com On Mo, 2015-05-11 at 15:49 +0200, Paolo Bonzini wrote: > From: Gerd Hoffmann [ more verbose commit message for squashing in ] Not all bits in SMRAM and ESMRAMC can be changed by the guest. Add wmask defines accordingly and set them in mch_reset(). > Signed-off-by: Gerd Hoffmann > Signed-off-by: Paolo Bonzini > --- > hw/pci-host/q35.c | 2 ++ > include/hw/pci-host/q35.h | 9 +++++++++ > 2 files changed, 11 insertions(+) > > diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c > index 8471d7a..df0032e 100644 > --- a/hw/pci-host/q35.c > +++ b/hw/pci-host/q35.c > @@ -352,6 +352,8 @@ static void mch_reset(DeviceState *qdev) > > d->config[MCH_HOST_BRIDGE_SMRAM] = MCH_HOST_BRIDGE_SMRAM_DEFAULT; > d->config[MCH_HOST_BRIDGE_ESMRAMC] = MCH_HOST_BRIDGE_ESMRAMC_DEFAULT; > + d->wmask[MCH_HOST_BRIDGE_SMRAM] = MCH_HOST_BRIDGE_SMRAM_WMASK; > + d->wmask[MCH_HOST_BRIDGE_ESMRAMC] = MCH_HOST_BRIDGE_ESMRAMC_WMASK; > > mch_update(mch); > } > diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h > index d3c7bbb..01b8492 100644 > --- a/include/hw/pci-host/q35.h > +++ b/include/hw/pci-host/q35.h > @@ -140,6 +140,11 @@ typedef struct Q35PCIHost { > #define MCH_HOST_BRIDGE_UPPER_SYSTEM_BIOS_END 0x100000 > #define MCH_HOST_BRIDGE_SMRAM_DEFAULT \ > MCH_HOST_BRIDGE_SMRAM_C_BASE_SEG > +#define MCH_HOST_BRIDGE_SMRAM_WMASK \ > + (MCH_HOST_BRIDGE_SMRAM_D_OPEN | \ > + MCH_HOST_BRIDGE_SMRAM_D_CLS | \ > + MCH_HOST_BRIDGE_SMRAM_D_LCK | \ > + MCH_HOST_BRIDGE_SMRAM_G_SMRAME) > > #define MCH_HOST_BRIDGE_ESMRAMC 0x9e > #define MCH_HOST_BRIDGE_ESMRAMC_H_SMRAME ((uint8_t)(1 << 7)) > @@ -156,6 +161,10 @@ typedef struct Q35PCIHost { > (MCH_HOST_BRIDGE_ESMRAMC_SM_CACHE | \ > MCH_HOST_BRIDGE_ESMRAMC_SM_L1 | \ > MCH_HOST_BRIDGE_ESMRAMC_SM_L2) > +#define MCH_HOST_BRIDGE_ESMRAMC_WMASK \ > + (MCH_HOST_BRIDGE_ESMRAMC_H_SMRAME | \ > + MCH_HOST_BRIDGE_ESMRAMC_TSEG_SZ_MASK | \ > + MCH_HOST_BRIDGE_ESMRAMC_T_EN) > > /* D1:F0 PCIE* port*/ > #define MCH_PCIE_DEV 1