From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEsRZ-0006iS-Vl for qemu-devel@nongnu.org; Mon, 20 Jun 2016 02:12:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bEsRU-0002dr-R7 for qemu-devel@nongnu.org; Mon, 20 Jun 2016 02:12:20 -0400 Received: from mx2.suse.de ([195.135.220.15]:38882) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bEsRU-0002dk-FV for qemu-devel@nongnu.org; Mon, 20 Jun 2016 02:12:16 -0400 References: <1466403224-16604-1-git-send-email-caoj.fnst@cn.fujitsu.com> <1466403224-16604-7-git-send-email-caoj.fnst@cn.fujitsu.com> From: Hannes Reinecke Message-ID: <5767893E.9030403@suse.de> Date: Mon, 20 Jun 2016 08:12:14 +0200 MIME-Version: 1.0 In-Reply-To: <1466403224-16604-7-git-send-email-caoj.fnst@cn.fujitsu.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v9 06/13] megasas: change msi/msix property type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cao jin , qemu-devel@nongnu.org Cc: Paolo Bonzini , "Michael S. Tsirkin" , Markus Armbruster , Marcel Apfelbaum On 06/20/2016 08:13 AM, Cao jin wrote: > From bit to enum OnOffAuto. >=20 > cc: Hannes Reinecke > cc: Paolo Bonzini > cc: Michael S. Tsirkin > cc: Markus Armbruster > cc: Marcel Apfelbaum >=20 > Reviewed-by: Markus Armbruster > Signed-off-by: Cao jin > --- > hw/scsi/megasas.c | 28 +++++++++++----------------- > 1 file changed, 11 insertions(+), 17 deletions(-) >=20 > diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c > index a9ffc32..7a4301b 100644 > --- a/hw/scsi/megasas.c > +++ b/hw/scsi/megasas.c > @@ -48,11 +48,7 @@ > =20 > #define MEGASAS_FLAG_USE_JBOD 0 > #define MEGASAS_MASK_USE_JBOD (1 << MEGASAS_FLAG_USE_JBOD) > -#define MEGASAS_FLAG_USE_MSI 1 > -#define MEGASAS_MASK_USE_MSI (1 << MEGASAS_FLAG_USE_MSI) > -#define MEGASAS_FLAG_USE_MSIX 2 > -#define MEGASAS_MASK_USE_MSIX (1 << MEGASAS_FLAG_USE_MSIX) > -#define MEGASAS_FLAG_USE_QUEUE64 3 > +#define MEGASAS_FLAG_USE_QUEUE64 1 > #define MEGASAS_MASK_USE_QUEUE64 (1 << MEGASAS_FLAG_USE_QUEUE64) > =20 > static const char *mfi_frame_desc[] =3D { > @@ -96,6 +92,8 @@ typedef struct MegasasState { > int busy; > int diag; > int adp_reset; > + OnOffAuto msi; > + OnOffAuto msix; > =20 > MegasasCmd *event_cmd; > int event_locale; > @@ -159,12 +157,12 @@ static bool megasas_use_queue64(MegasasState *s) > =20 > static bool megasas_use_msi(MegasasState *s) > { > - return s->flags & MEGASAS_MASK_USE_MSI; > + return s->msi !=3D ON_OFF_AUTO_OFF; > } > =20 > static bool megasas_use_msix(MegasasState *s) > { > - return s->flags & MEGASAS_MASK_USE_MSIX; > + return s->msix !=3D ON_OFF_AUTO_OFF; > } > =20 > static bool megasas_is_jbod(MegasasState *s) > @@ -2352,12 +2350,12 @@ static void megasas_scsi_realize(PCIDevice *dev= , Error **errp) > =20 > if (megasas_use_msi(s) && > msi_init(dev, 0x50, 1, true, false)) { > - s->flags &=3D ~MEGASAS_MASK_USE_MSI; > + s->msi =3D ON_OFF_AUTO_OFF; > } > if (megasas_use_msix(s) && > msix_init(dev, 15, &s->mmio_io, b->mmio_bar, 0x2000, > &s->mmio_io, b->mmio_bar, 0x3800, 0x68)) { > - s->flags &=3D ~MEGASAS_MASK_USE_MSIX; > + s->msix =3D ON_OFF_AUTO_OFF; > } > if (pci_is_express(dev)) { > pcie_endpoint_cap_init(dev, 0xa0); > @@ -2425,10 +2423,8 @@ static Property megasas_properties_gen1[] =3D { > MEGASAS_DEFAULT_FRAMES), > DEFINE_PROP_STRING("hba_serial", MegasasState, hba_serial), > DEFINE_PROP_UINT64("sas_address", MegasasState, sas_addr, 0), > - DEFINE_PROP_BIT("use_msi", MegasasState, flags, > - MEGASAS_FLAG_USE_MSI, false), > - DEFINE_PROP_BIT("use_msix", MegasasState, flags, > - MEGASAS_FLAG_USE_MSIX, false), > + DEFINE_PROP_ON_OFF_AUTO("msi", MegasasState, msi, ON_OFF_AUTO_AUTO= ), > + DEFINE_PROP_ON_OFF_AUTO("msix", MegasasState, msix, ON_OFF_AUTO_AU= TO), > DEFINE_PROP_BIT("use_jbod", MegasasState, flags, > MEGASAS_FLAG_USE_JBOD, false), > DEFINE_PROP_END_OF_LIST(), > @@ -2441,10 +2437,8 @@ static Property megasas_properties_gen2[] =3D { > MEGASAS_GEN2_DEFAULT_FRAMES), > DEFINE_PROP_STRING("hba_serial", MegasasState, hba_serial), > DEFINE_PROP_UINT64("sas_address", MegasasState, sas_addr, 0), > - DEFINE_PROP_BIT("use_msi", MegasasState, flags, > - MEGASAS_FLAG_USE_MSI, true), > - DEFINE_PROP_BIT("use_msix", MegasasState, flags, > - MEGASAS_FLAG_USE_MSIX, true), > + DEFINE_PROP_ON_OFF_AUTO("msi", MegasasState, msi, ON_OFF_AUTO_AUTO= ), > + DEFINE_PROP_ON_OFF_AUTO("msix", MegasasState, msix, ON_OFF_AUTO_AU= TO), > DEFINE_PROP_BIT("use_jbod", MegasasState, flags, > MEGASAS_FLAG_USE_JBOD, false), > DEFINE_PROP_END_OF_LIST(), >=20 Reviewed-by: Hannes Reinecke Cheers, Hannes --=20 Dr. Hannes Reinecke Teamlead Storage & Networking hare@suse.de +49 911 74053 688 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N=FCrnberg GF: F. Imend=F6rffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton HRB 21284 (AG N=FCrnberg)