From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754162AbbCKOmQ (ORCPT <rfc822;w@1wt.eu>);
	Wed, 11 Mar 2015 10:42:16 -0400
Received: from userp1040.oracle.com ([156.151.31.81]:44627 "EHLO
	userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751830AbbCKOmP (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 11 Mar 2015 10:42:15 -0400
Date: Wed, 11 Mar 2015 10:42:05 -0400
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To: Jan Beulich <JBeulich@suse.com>
Cc: David Vrabel <david.vrabel@citrix.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>,
        xen-devel <xen-devel@lists.xenproject.org>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/2] xen-pciback: also support disabling of bus-mastering
 and memory-write-invalidate
Message-ID: <20150311144205.GA14096@l.oracle.com>
References: <5500569002000078000688DA@mail.emea.novell.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <5500569002000078000688DA@mail.emea.novell.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-Source-IP: ucsinet22.oracle.com [156.151.31.94]
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Mar 11, 2015 at 01:52:00PM +0000, Jan Beulich wrote:
> It's not clear to me why only the enabling operation got handled so
> far.

Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> ---
>  drivers/xen/xen-pciback/conf_space_header.c |   16 +++++++++++++++-
>  1 file changed, 15 insertions(+), 1 deletion(-)
> 
> --- 4.0-rc3-xen-pciback.orig/drivers/xen/xen-pciback/conf_space_header.c
> +++ 4.0-rc3-xen-pciback/drivers/xen/xen-pciback/conf_space_header.c
> @@ -88,9 +88,15 @@ static int command_write(struct pci_dev 
>  			printk(KERN_DEBUG DRV_NAME ": %s: set bus master\n",
>  			       pci_name(dev));
>  		pci_set_master(dev);
> +	} else if (dev->is_busmaster && !is_master_cmd(value)) {
> +		if (unlikely(verbose_request))
> +			printk(KERN_DEBUG DRV_NAME ": %s: clear bus master\n",
> +			       pci_name(dev));
> +		pci_clear_master(dev);
>  	}
>  
> -	if (value & PCI_COMMAND_INVALIDATE) {
> +	if (!(cmd->val & PCI_COMMAND_INVALIDATE) &&
> +	    (value & PCI_COMMAND_INVALIDATE)) {
>  		if (unlikely(verbose_request))
>  			printk(KERN_DEBUG
>  			       DRV_NAME ": %s: enable memory-write-invalidate\n",
> @@ -101,6 +107,13 @@ static int command_write(struct pci_dev 
>  				pci_name(dev), err);
>  			value &= ~PCI_COMMAND_INVALIDATE;
>  		}
> +	} else if ((cmd->val & PCI_COMMAND_INVALIDATE) &&
> +		   !(value & PCI_COMMAND_INVALIDATE)) {
> +		if (unlikely(verbose_request))
> +			printk(KERN_DEBUG
> +			       DRV_NAME ": %s: disable memory-write-invalidate\n",
> +			       pci_name(dev));
> +		pci_clear_mwi(dev);
>  	}
>  
>  	cmd->val = value;
> 
> 
>