From patchwork Sat Mar 25 16:18:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 95985 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp532155qgd; Sat, 25 Mar 2017 09:19:20 -0700 (PDT) X-Received: by 10.84.230.131 with SMTP id e3mr18891256plk.100.1490458760615; Sat, 25 Mar 2017 09:19:20 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r3si6723034pli.62.2017.03.25.09.19.20; Sat, 25 Mar 2017 09:19:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751343AbdCYQTU (ORCPT + 5 others); Sat, 25 Mar 2017 12:19:20 -0400 Received: from mail-pf0-f178.google.com ([209.85.192.178]:34125 "EHLO mail-pf0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbdCYQTU (ORCPT ); Sat, 25 Mar 2017 12:19:20 -0400 Received: by mail-pf0-f178.google.com with SMTP id p189so8000310pfp.1 for ; Sat, 25 Mar 2017 09:19:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IT6as62xM3A0yVHJHzGnsgVAuPGKco1oVx+KKVZ+qoc=; b=UoaN/NO/vLJVwRAGjRyl4S3VIfPVeoSXPp4VkV+QHLqCfzaFOzvlh7MtewiNXj7jrR SZEyZTZ/kvdEEC9ebAW7JZkfCVACcMAB5E8nEs1r1skAhVHazAFreKbzP+aS+BVEqpkt bnYA/v6XcbMFHQpegIwM7MP5WNDVB4CU7OyHw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IT6as62xM3A0yVHJHzGnsgVAuPGKco1oVx+KKVZ+qoc=; b=EcuXx2wI3al7DA0cIPUTRa4VkTxjAuIgCzdQGuOJk22YYePej7vbgDwtYrUqnPGm7k SSpwrFQQVjkCYOSnxfb2OS40UKGh4m91xrn54LaTsdP+qv9hh9G1KQP4i28Sw5JUDNB3 LK2LQsYSDbKjlp/CB2RLfSwoy75/y0P0SLgRY8o2Bm4imAwhe2Zx++Yfx0OMBa2ncaV3 8MFDxsbqLqP9ukLRUkUMKsoSXu4M6c7wv0oa8DEdh+d3WmKjJ86ulFlK8sx4TxzbcZMh IeyOsH+OVSntAP/HVZHV5lA+bdUr23QxHhqoZRKYlpQ/9gP/n9H2jg+Eu7LlC1riT7na dP9g== X-Gm-Message-State: AFeK/H0Ymrjl8T3gjB1W7Us9EKfMO1sRy/d0EmKzA41G4rGysDbUKJliyosEDAD5MTUQCRxq X-Received: by 10.99.50.70 with SMTP id y67mr15185823pgy.109.1490458758641; Sat, 25 Mar 2017 09:19:18 -0700 (PDT) Received: from phantom.lan ([106.51.225.38]) by smtp.gmail.com with ESMTPSA id q194sm11469541pfq.43.2017.03.25.09.19.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Mar 2017 09:19:17 -0700 (PDT) From: Sumit Semwal To: stable@vger.kernel.org Cc: Bjorn Helgaas , Sasha Levin , Greg Kroah-Hartman , Sumit Semwal Subject: [PATCH for-4.4 08/19] PCI: Decouple IORESOURCE_ROM_ENABLE and PCI_ROM_ADDRESS_ENABLE Date: Sat, 25 Mar 2017 21:48:08 +0530 Message-Id: <1490458699-24484-9-git-send-email-sumit.semwal@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1490458699-24484-1-git-send-email-sumit.semwal@linaro.org> References: <1490458699-24484-1-git-send-email-sumit.semwal@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Helgaas [ Upstream commit 7a6d312b50e63f598f5b5914c4fd21878ac2b595 ] Remove the assumption that IORESOURCE_ROM_ENABLE == PCI_ROM_ADDRESS_ENABLE. PCI_ROM_ADDRESS_ENABLE is the ROM enable bit defined by the PCI spec, so if we're reading or writing a BAR register value, that's what we should use. IORESOURCE_ROM_ENABLE is a corresponding bit in struct resource flags. Signed-off-by: Bjorn Helgaas Reviewed-by: Gavin Shan Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sumit Semwal --- drivers/pci/probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 71d9a6d..b83df94 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -226,7 +226,8 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, mask64 = (u32)PCI_BASE_ADDRESS_MEM_MASK; } } else { - res->flags |= (l & IORESOURCE_ROM_ENABLE); + if (l & PCI_ROM_ADDRESS_ENABLE) + res->flags |= IORESOURCE_ROM_ENABLE; l64 = l & PCI_ROM_ADDRESS_MASK; sz64 = sz & PCI_ROM_ADDRESS_MASK; mask64 = (u32)PCI_ROM_ADDRESS_MASK;