From patchwork Tue Jul 14 23:29:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 495343 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 26F9314077B for ; Wed, 15 Jul 2015 09:29:46 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=IjGAvRBU; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753051AbbGNX3b (ORCPT ); Tue, 14 Jul 2015 19:29:31 -0400 Received: from mail-oi0-f53.google.com ([209.85.218.53]:33456 "EHLO mail-oi0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753025AbbGNX3a (ORCPT ); Tue, 14 Jul 2015 19:29:30 -0400 Received: by oige126 with SMTP id e126so17286957oig.0 for ; Tue, 14 Jul 2015 16:29:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=n/7wiOsSvKnvD94bZ8CjQTuLHQGAuNIgGAVccg7wkN0=; b=IjGAvRBUg3iI9ikfDjWFYgFTV7qKRrpNpr+CHmrsV/n96Yuj1Dmsi434aYpXBENCDe M0PyuSlKFhdiZ4IpnTtN7CL8Q9InpNHFQyUNYDraBk+J5toOK0FiKvm7wb51UisGZSUG 2D7GTvq/9FCw8R3u5Byvqe+AZ7yrsroFgBRPxJpTM7Y01tGwG/sLpMcMFE/vLHh0b+vJ lsqtgKWHbPNu6Jtyrhm3enStVWU5ztO4yQQK++BmdeBMVNbsiCD5rG+Ndn51PZhr1gZf QsfAIcRgcnK/t8IfRWaTj/BdgqmE1tvq90IIWCxBmKEKfEiRia46gpc7Qk0gpvQITm4l Vcfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-type:content-disposition:in-reply-to :user-agent; bh=n/7wiOsSvKnvD94bZ8CjQTuLHQGAuNIgGAVccg7wkN0=; b=IzfHB0+omxyrib/zbyTpXXYBpeQ5FEZ277zj7LquRu1xT6fuaZI8OoVc6d0HCcgDqs lClnah9qDi1OVN5Lc79OSRudiGmHvvtm6G4azkHKB4TTxYeGz47ke7tu91emRAnPe+SB jck+fJ3vh565fscsNNsjrk18s1DIZBbnG86fIyBlB2PCBff3N32cSRjqSlPeELaMNVsF kbWtH3be8uxYLRY2aWLsfQUspSgH7UoPk9m9mEv8vuYGpAaiLPFOs52KNNiD4KKzj1t8 eFNFpClvWPmNVXYDDcqUYOE0Apziu/xEokFmm2wqwoRIln+npIm0743JwhU8T1BFx8n9 8xrA== X-Gm-Message-State: ALoCoQkATOO6Y348n9w1/hxVQ8Of5N810XkqGqPnmU2EGbgy8pOqBxOo+grdjFipMR6ck2B+BtBx X-Received: by 10.182.131.230 with SMTP id op6mr898062obb.84.1436916569475; Tue, 14 Jul 2015 16:29:29 -0700 (PDT) Received: from google.com ([69.71.1.1]) by smtp.gmail.com with ESMTPSA id sn2sm1378897obc.11.2015.07.14.16.29.26 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 14 Jul 2015 16:29:27 -0700 (PDT) Date: Tue, 14 Jul 2015 18:29:24 -0500 From: Bjorn Helgaas To: "Michael S. Tsirkin" Cc: linux-kernel@vger.kernel.org, Rajat Jain , "Chen, Gong" , Guenter Roeck , =?us-ascii?B?PT9VVEYtOD9xP1JhZmE9QzU9ODI9MjBNaT1DNT04MmVja2k/PQ==?= , linux-api@vger.kernel.org, linux-pci@vger.kernel.org Subject: Re: [PATCH] pci_regs: reintroduce PCI_MSIX_FLAGS_BIRMASK Message-ID: <20150714232924.GS24416@google.com> References: <1435745608-21217-1-git-send-email-mst@redhat.com> <20150713181025-mutt-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20150713181025-mutt-send-email-mst@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Mon, Jul 13, 2015 at 06:11:38PM +0300, Michael S. Tsirkin wrote: > On Wed, Jul 01, 2015 at 12:14:10PM +0200, Michael S. Tsirkin wrote: > > This partially reverts commit 09a2c73ddfc7f173237fc7209a65b34dd5bcb5ed. > > PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition > > > > That commit dropped a symbol from an exported header claiming "no one > > uses it". This isn't how Linux normally approaches userspace API though, > > and in fact QEMU build fails if trying to use updated headers from linux > > 3.12 and up. > > > > Sure, userspace can be fixed to use the new symbol, but the cost > > of keeping the old one around is fairly low, too. > > > > Signed-off-by: Michael S. Tsirkin Sorry, I lost the original message somehow, so I can't reply to it. I applied this by hand to my for-linus branch for v4.2, thanks! commit c9ddbac9c89110f77cb0fa07e634aaf1194899aa Author: Michael S. Tsirkin Date: Tue Jul 14 18:27:46 2015 -0500 PCI: Restore PCI_MSIX_FLAGS_BIRMASK definition 09a2c73ddfc7 ("PCI: Remove unused PCI_MSIX_FLAGS_BIRMASK definition") removed PCI_MSIX_FLAGS_BIRMASK from an exported header because it was unused in the kernel. But that breaks user programs that were using it (QEMU in particular). Restore the PCI_MSIX_FLAGS_BIRMASK definition. [bhelgaas: changelog] Signed-off-by: Michael S. Tsirkin Signed-off-by: Bjorn Helgaas CC: stable@vger.kernel.org # v3.13+ --- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h index efe3443..413417f 100644 --- a/include/uapi/linux/pci_regs.h +++ b/include/uapi/linux/pci_regs.h @@ -319,6 +319,7 @@ #define PCI_MSIX_PBA 8 /* Pending Bit Array offset */ #define PCI_MSIX_PBA_BIR 0x00000007 /* BAR index */ #define PCI_MSIX_PBA_OFFSET 0xfffffff8 /* Offset into specified BAR */ +#define PCI_MSIX_FLAGS_BIRMASK PCI_MSIX_PBA_BIR /* deprecated */ #define PCI_CAP_MSIX_SIZEOF 12 /* size of MSIX registers */ /* MSI-X Table entry format */