From patchwork Mon Apr 22 23:12:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 2474921 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E83693FD40 for ; Mon, 22 Apr 2013 23:12:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753870Ab3DVXME (ORCPT ); Mon, 22 Apr 2013 19:12:04 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:35641 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753063Ab3DVXMD (ORCPT ); Mon, 22 Apr 2013 19:12:03 -0400 Received: by mail-ie0-f173.google.com with SMTP id k5so15080iea.18 for ; Mon, 22 Apr 2013 16:12:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding; bh=v9XWTne9JQIQjsfY2D/QZECwln2CvgQ4B2XTlvT3ho8=; b=SsburAtLJxtH2UP/17h8GHn6LQshh8vhd5m1pNe0dN981WCRt8421193w65usRvDeG SIBZp4Y3e5jj0aYj6VKpoKx6MeZS5FeDKpgxRSnohLNZ88/zDfCiAqqpNoc55T2VeBaf didr7TB3bnb0PWuAnb4NKlDkQI3V+FZG6rIPHjofNro+ntA+sDB0yYoibdQyzZT500k/ e+P4ZUmQyFPF5tiMVADeFPl82tcvqqswOfOaODgjSQXLZam2qU66Rlw24yPFfY6Cs02c mqcc9w88yf20Ks8QpbhQdYtPCkRtHUyET/oD0vl7xLxf9NdSEFck4tyLqpH8behmsFgr pZCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:subject:to:from:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-type :content-transfer-encoding:x-gm-message-state; bh=v9XWTne9JQIQjsfY2D/QZECwln2CvgQ4B2XTlvT3ho8=; b=Zz+Be+bqpkVth+pZwdWN1vg3DICU+N4lLMGHcSdorzpe9RlhsQvtYcFPwHz4LHoegr 6JSYTbgbLAyCeCgoAQXEfRREJ/4ienVW0ZFpEvMV3AwpkP8rTvxTOsS7ydAz3zbPba2u 8OuyFMTIyeUkJFYEligDhPMuwzw+rVZnVS6TnD4rBseV1GvPWWuu1fysMMnuYU1wv9uk dgxE2l9cVwXRSyGMbNTmlbP6sk3aKgVDtL9j9D1L4DFmFuY5qPsXoIhgZEcbwrhe+FjI 7VRQb/Q15eL8d7eKcnbT8JPelVkWbZ40/jZ99pDwhB665KVey7dFt0He1lf0C025mPpB WJQQ== X-Received: by 10.50.110.104 with SMTP id hz8mr9125991igb.41.1366672323163; Mon, 22 Apr 2013 16:12:03 -0700 (PDT) Received: from localhost ([172.29.120.215]) by mx.google.com with ESMTPS id xd4sm19717014igb.3.2013.04.22.16.12.02 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 22 Apr 2013 16:12:02 -0700 (PDT) Subject: [PATCH v4 16/22] PCI: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK To: linux-pci@vger.kernel.org From: Bjorn Helgaas Cc: Gavin Shan Date: Mon, 22 Apr 2013 17:12:01 -0600 Message-ID: <20130422231201.32621.97345.stgit@bhelgaas-glaptop> In-Reply-To: <20130422230012.32621.15224.stgit@bhelgaas-glaptop> References: <20130422230012.32621.15224.stgit@bhelgaas-glaptop> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQn+zxgZztl9au0sS5/ZgXf7ZoMlId0qolWq9aPuCW/6RMu9u0wQpWGIwU+CnhGDaq+lzgoXMY631fo0hz1PbKjo6b/5PanMVJA8I5Ts3QlIvSVO667qf9Qh3B+pglkWllSGLqkP8SSxOF8U/Z04GPKXPZKZVvoukH5bOCJyxHI+MAa5M5Ndjcx3Ziks2JX3fPz9220Av+gkeECNe3L6pIGfrUP6K9XUNOpC9fJ53kTXvQ97TB0= Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org PCI_MSIX_FLAGS_BIRMASK is mis-named because the BIR mask is in the Table Offset register, not the flags ("Message Control" per spec) register. Signed-off-by: Bjorn Helgaas --- drivers/pci/msi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 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/drivers/pci/msi.c b/drivers/pci/msi.c index afdc388..f8a1f39 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -605,8 +605,8 @@ static void __iomem *msix_map_region(struct pci_dev *dev, unsigned nr_entries) pci_read_config_dword(dev, dev->msix_cap + PCI_MSIX_TABLE, &table_offset); - bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK); - table_offset &= ~PCI_MSIX_FLAGS_BIRMASK; + bir = (u8)(table_offset & PCI_MSIX_TABLE_BIR); + table_offset &= PCI_MSIX_TABLE_OFFSET; phys_addr = pci_resource_start(dev, bir) + table_offset; return ioremap_nocache(phys_addr, nr_entries * PCI_MSIX_ENTRY_SIZE);