From patchwork Thu Jan 18 21:00:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 125035 Delivered-To: patch@linaro.org Received: by 10.46.64.27 with SMTP id n27csp294724lja; Thu, 18 Jan 2018 13:01:22 -0800 (PST) X-Google-Smtp-Source: ACJfBov8NlIJqPox2pvx3Jt4QA22e8W3aKB8Lwak1rxTY4jllUmiSrkaydO98CniUpZvFy0fP9WB X-Received: by 10.99.125.78 with SMTP id m14mr2609367pgn.383.1516309282412; Thu, 18 Jan 2018 13:01:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516309282; cv=none; d=google.com; s=arc-20160816; b=0QMRLOoiOv5SLDosnzP4WM3jkRoGASvvPEqSfSaqdn34Z/nl+8yf8tXblN5jBwRRf9 Fkpsktglm+N8ya26la1k2unDuo82sNJfR0YWvjYHUBhZoPJ8LVJ4Cu/bGEGsvdGWcqRG vrKpnsyusGcnPr3U7v3v7V5l8oLrMUBZ7kK0xssx8/1Xys7Lfs/iqjZy2I98e9AYzt+C lNFZIMtSqufGMsOjRnxmSlVYU/lYb12qT/NVVbO03OgVnhVGNPRTbOXRhn6dXAU+DoRc B6a1AHlWuwZ8LLHiGJa23q0k1uMT9gdWaj1CDvqCFayKSgfB+JXhoMqFvb2esEoH1K32 +3+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=dHkUQDTkPgkWKgN/7rMBdwjKwyhIiU1/sBmRExVCbcA=; b=v1aEpkSdkvMdRb5eycOe9GoWVQ2H4KXMwJsGQfwwZg6nwk1VdJ7EfzTAEqCaEOfr4S z93cCmBk8XfG9oTJb1/uyMhnGTNBHYRz7Lkwr0vx+OdLg0ffwNFzMj7BadKVzLH+ehUc xZI8u+ReOtTUdF1dk1BwDYG5NTrHvHIWlbcqjjTNc6k6XZ+8iHVUREfPa/Agd/8PLFtW JWqZFuT9VPg62fiVcJrlYB/jediU51rSrljPdUKZRgbadUClKSGu0A3MxogEAcWa3dyn 4wDN+FqeURTAQJ8CM4Fypd/Dbe9fv/5PPOTKJBLZIGFoctn8JFeiVpRlskq2fd//IlN4 Rgng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=nq/9gCnJ; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c16si4933770pgu.706.2018.01.18.13.01.22; Thu, 18 Jan 2018 13:01:22 -0800 (PST) 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=@microsoft.com header.s=selector1 header.b=nq/9gCnJ; 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=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753956AbeARVBV (ORCPT + 10 others); Thu, 18 Jan 2018 16:01:21 -0500 Received: from mail-by2nam01on0100.outbound.protection.outlook.com ([104.47.34.100]:31312 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754848AbeARVBR (ORCPT ); Thu, 18 Jan 2018 16:01:17 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=dHkUQDTkPgkWKgN/7rMBdwjKwyhIiU1/sBmRExVCbcA=; b=nq/9gCnJ3ljKm/A7N37XggDgW3Y/b7Mzncy2zSs4eK+HEBg2E8/79oIDe1z4l8PnQGbP5p3w8Rul1utHvAswrSg6Tx73PpH7sQKABfrTOS0HcBCsIw0VWOmoALhVXgQ8d4K2LHSTdPohHpAdY/DvP70nYv7e73asfXhnkVXE4ro= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0805.namprd21.prod.outlook.com (10.167.105.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.428.7; Thu, 18 Jan 2018 21:01:13 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::6485:b98:d15e:9da7%2]) with mapi id 15.20.0428.008; Thu, 18 Jan 2018 21:01:13 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Sumit Semwal , Bjorn Helgaas , Sasha Levin Subject: [added to the 4.1 stable tree] PCI: Decouple IORESOURCE_ROM_ENABLE and PCI_ROM_ADDRESS_ENABLE Thread-Topic: [added to the 4.1 stable tree] PCI: Decouple IORESOURCE_ROM_ENABLE and PCI_ROM_ADDRESS_ENABLE Thread-Index: AQHTkJ9PhW335dB2502+cwX86tnuTA== Date: Thu, 18 Jan 2018 21:00:03 +0000 Message-ID: <20180118205908.3220-76-alexander.levin@microsoft.com> References: <20180118205908.3220-1-alexander.levin@microsoft.com> In-Reply-To: <20180118205908.3220-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [167.220.98.9] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB0805; 6:3dDa36L3HDIJWHHTq1RJdPmsoHyVmGL7c0EWZAssuUFGkcjxTNRyFP0wwKciXjh0F5gZN78sVirCO2A55sn+DTm/+ipZGuFtxuMc1pEGD8CTDAt0jaK02SGDb5xIi0KoslC4Q93B29zwIhmWvJs/ENneNwHDtlSRXNbnA2F/4qPu8p8ZOtYRX1U22UDal0Ri2jZHDo8TJO9710yXRNNdTyP1dEsiWngklR/uvpYePN10Hn5D/kTrgTjgbF2fQdeG1pOgXWls9wm3j72E0iPHN0B5meaczfHjuF+jlcLg68tDvk1pVZRGk1i5CE2E3fuDCkRcpdyRAZgJnHHHlH63FtNUEpbRb5AUuhlfVCCfvHBlCBng0YbCDGKTP6V4XZdR; 5:3Rhk4XEOCRZzKSgiYcnTlR+FLP6gZM0n9n7otBgJRZGod+TMAsydBCeyrgUXO6QdLDUzUb6JryaUB8R7VmqzzQPII+LCIC6j/WlysczDskwxqTH4WJngAoAGNZvb5jB4hDhyQuGW4ELXqdAnb3md6Icf94HprrrO5Xw/oH0W0vU=; 24:48dktBmN2sT+2BbO5jN+YRNkk3i2v0CEfaK2v4CpgSi9LhMpAvixDPa/RBlRUz8W6R7zLCIkkDOpKVlqecGjGzkjNjlLT4htp9xyLgwGTLw=; 7:sgVfbuANC+7TADzTqxzRSZYI7SWF6Q5/F7mgEoAXatPQ5FXH0X/o0fVfcMnHkbOSw/nhXDlbmEUqu0TCLmhnCmYWROoTuzYSRaXX4e13Ck1vdMTXaPmUazPzmnXIP5b3a4GoC6Z0cJsUK6r/RGdEeCekW9sHp1RH2wSTleCvtvNfA26q2CFI69t/8PtFf77CWqxauPv1P6Dd400uuESiSSTABcg995ptrRuecei3Q3gE4B0ENmyBC+eqfvxmfJNj x-ms-office365-filtering-correlation-id: 94484828-cb53-4af7-84e8-08d55eb69bfb x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(3008032)(4534125)(4602075)(4627221)(201703031133081)(201702281549075)(48565401081)(2017052603307)(7193020); SRVR:DM5PR2101MB0805; x-ms-traffictypediagnostic: DM5PR2101MB0805: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(211936372134217)(153496737603132)(104084551191319); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(61425038)(6040495)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3231046)(2400067)(944501161)(3002001)(6055026)(61426038)(61427038)(6041282)(20161123560045)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:DM5PR2101MB0805; BCL:0; PCL:0; RULEID:(100000803126)(100110400120); SRVR:DM5PR2101MB0805; x-forefront-prvs: 05568D1FF7 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(39380400002)(366004)(376002)(346002)(396003)(189003)(199004)(2906002)(2900100001)(6512007)(86362001)(305945005)(97736004)(68736007)(10090500001)(2501003)(6666003)(7736002)(105586002)(5250100002)(2950100002)(5660300001)(6116002)(36756003)(6486002)(26005)(86612001)(54906003)(4326008)(3280700002)(3846002)(6346003)(6436002)(3660700001)(10290500003)(478600001)(107886003)(76176011)(66066001)(1076002)(81156014)(99286004)(81166006)(106356001)(53936002)(102836004)(22452003)(110136005)(59450400001)(14454004)(316002)(72206003)(25786009)(6506007)(8676002)(8936002)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0805; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: +CflKL4HGApy5PQ+I876YbCXkWzu4qSNEPcFYbFrnGokz1F7opHaHDbwSkfxg0eLHdViwJADg8aso6IFYY9KUg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94484828-cb53-4af7-84e8-08d55eb69bfb X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Jan 2018 21:00:03.5409 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0805 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sumit Semwal This patch has been added to the stable tree. If you have any objections, please let us know. -- 2.11.0 =============== [ 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 --- drivers/pci/probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 5754d7b48c1f..c7dc06636bf6 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -223,7 +223,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;