From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.kernel.org ([198.145.29.136]:57821 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750954AbcCLM03 (ORCPT ); Sat, 12 Mar 2016 07:26:29 -0500 Date: Sat, 12 Mar 2016 06:26:22 -0600 From: Bjorn Helgaas To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, Matthew Garrett , Tony Luck , DRI , Fenghua Yu , Intel Graphics Development , linux-kernel@vger.kernel.org, Ralf Baechle , Andy Lutomirski , Bruno =?iso-8859-1?Q?Pr=E9mont?= , Daniel Stone , Alex Deucher , Linus Torvalds , Ville =?iso-8859-1?Q?Syrj=E4l=E4?= Subject: Re: [PATCH v1 00/12] PCI: Rework shadow ROM handling Message-ID: <20160312122622.GC27552@localhost> References: <20160303164533.3025.82439.stgit@bhelgaas-glaptop2.roam.corp.google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20160303164533.3025.82439.stgit@bhelgaas-glaptop2.roam.corp.google.com> Sender: linux-pci-owner@vger.kernel.org List-ID: On Thu, Mar 03, 2016 at 10:53:50AM -0600, Bjorn Helgaas wrote: > The purpose of this series is to: > ... > - Move arch-specific shadow ROM location knowledge, e.g., > 0xC0000-0xDFFFF, from PCI core to arch code. > ... > Bjorn Helgaas (12): > PCI: Mark shadow copy of VGA ROM as IORESOURCE_PCI_FIXED > PCI: Don't assign or reassign immutable resources > PCI: Don't enable/disable ROM BAR if we're using a RAM shadow copy > PCI: Set ROM shadow location in arch code, not in PCI core I propose to add the patch below at this point in the series. > PCI: Clean up pci_map_rom() whitespace > ia64/PCI: Use temporary struct resource * to avoid repetition > ia64/PCI: Use ioremap() instead of open-coded equivalent > ia64/PCI: Keep CPU physical (not virtual) addresses in shadow ROM resource > MIPS: Loongson 3: Use temporary struct resource * to avoid repetition > MIPS: Loongson 3: Keep CPU physical (not virtual) addresses in shadow ROM resource > PCI: Remove unused IORESOURCE_ROM_COPY and IORESOURCE_ROM_BIOS_COPY > PCI: Simplify sysfs ROM cleanup commit ac0c302a919ba7b68dbf274babdc08c83df6f532 Author: Bjorn Helgaas Date: Sat Mar 12 05:48:08 2016 -0600 PCI: Remove arch-specific IORESOURCE_ROM_SHADOW size from sysfs When pci_create_sysfs_dev_files() created the "rom" sysfs file, it set the sysfs file size to the actual size of a ROM BAR, or if there was no ROM BAR but the platform provided a shadow copy in RAM, to 0x20000. 0x20000 is an arch-specific length that should not be baked into the PCI core. Every place that sets IORESOURCE_ROM_SHADOW also sets the size of the PCI_ROM_RESOURCE, so use the resource length always. Signed-off-by: Bjorn Helgaas diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 95d9e7b..51d4dad 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1356,7 +1356,7 @@ error: int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) { int retval; - int rom_size = 0; + int rom_size; struct bin_attribute *attr; if (!sysfs_initialized) @@ -1373,12 +1373,8 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) if (retval) goto err_config_file; - if (pci_resource_len(pdev, PCI_ROM_RESOURCE)) - rom_size = pci_resource_len(pdev, PCI_ROM_RESOURCE); - else if (pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW) - rom_size = 0x20000; - /* If the device has a ROM, try to expose it in sysfs. */ + rom_size = pci_resource_len(pdev, PCI_ROM_RESOURCE); if (rom_size) { attr = kzalloc(sizeof(*attr), GFP_ATOMIC); if (!attr) { From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Helgaas Subject: Re: [PATCH v1 00/12] PCI: Rework shadow ROM handling Date: Sat, 12 Mar 2016 06:26:22 -0600 Message-ID: <20160312122622.GC27552@localhost> References: <20160303164533.3025.82439.stgit@bhelgaas-glaptop2.roam.corp.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Content-Disposition: inline In-Reply-To: <20160303164533.3025.82439.stgit@bhelgaas-glaptop2.roam.corp.google.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Bjorn Helgaas Cc: Fenghua Yu , Tony Luck , linux-pci@vger.kernel.org, Intel Graphics Development , linux-kernel@vger.kernel.org, DRI , Andy Lutomirski , Bruno =?iso-8859-1?Q?Pr=E9mont?= , Ralf Baechle , Alex Deucher , Linus Torvalds List-Id: dri-devel@lists.freedesktop.org T24gVGh1LCBNYXIgMDMsIDIwMTYgYXQgMTA6NTM6NTBBTSAtMDYwMCwgQmpvcm4gSGVsZ2FhcyB3 cm90ZToKPiBUaGUgcHVycG9zZSBvZiB0aGlzIHNlcmllcyBpcyB0bzoKPiAuLi4KCj4gICAtIE1v dmUgYXJjaC1zcGVjaWZpYyBzaGFkb3cgUk9NIGxvY2F0aW9uIGtub3dsZWRnZSwgZS5nLiwKPiAg ICAgMHhDMDAwMC0weERGRkZGLCBmcm9tIFBDSSBjb3JlIHRvIGFyY2ggY29kZS4KPiAuLi4KCj4g Qmpvcm4gSGVsZ2FhcyAoMTIpOgo+ICAgICAgIFBDSTogTWFyayBzaGFkb3cgY29weSBvZiBWR0Eg Uk9NIGFzIElPUkVTT1VSQ0VfUENJX0ZJWEVECj4gICAgICAgUENJOiBEb24ndCBhc3NpZ24gb3Ig cmVhc3NpZ24gaW1tdXRhYmxlIHJlc291cmNlcwo+ICAgICAgIFBDSTogRG9uJ3QgZW5hYmxlL2Rp c2FibGUgUk9NIEJBUiBpZiB3ZSdyZSB1c2luZyBhIFJBTSBzaGFkb3cgY29weQo+ICAgICAgIFBD STogU2V0IFJPTSBzaGFkb3cgbG9jYXRpb24gaW4gYXJjaCBjb2RlLCBub3QgaW4gUENJIGNvcmUK CkkgcHJvcG9zZSB0byBhZGQgdGhlIHBhdGNoIGJlbG93IGF0IHRoaXMgcG9pbnQgaW4gdGhlIHNl cmllcy4KCj4gICAgICAgUENJOiBDbGVhbiB1cCBwY2lfbWFwX3JvbSgpIHdoaXRlc3BhY2UKPiAg ICAgICBpYTY0L1BDSTogVXNlIHRlbXBvcmFyeSBzdHJ1Y3QgcmVzb3VyY2UgKiB0byBhdm9pZCBy ZXBldGl0aW9uCj4gICAgICAgaWE2NC9QQ0k6IFVzZSBpb3JlbWFwKCkgaW5zdGVhZCBvZiBvcGVu LWNvZGVkIGVxdWl2YWxlbnQKPiAgICAgICBpYTY0L1BDSTogS2VlcCBDUFUgcGh5c2ljYWwgKG5v dCB2aXJ0dWFsKSBhZGRyZXNzZXMgaW4gc2hhZG93IFJPTSByZXNvdXJjZQo+ICAgICAgIE1JUFM6 IExvb25nc29uIDM6IFVzZSB0ZW1wb3Jhcnkgc3RydWN0IHJlc291cmNlICogdG8gYXZvaWQgcmVw ZXRpdGlvbgo+ICAgICAgIE1JUFM6IExvb25nc29uIDM6IEtlZXAgQ1BVIHBoeXNpY2FsIChub3Qg dmlydHVhbCkgYWRkcmVzc2VzIGluIHNoYWRvdyBST00gcmVzb3VyY2UKPiAgICAgICBQQ0k6IFJl bW92ZSB1bnVzZWQgSU9SRVNPVVJDRV9ST01fQ09QWSBhbmQgSU9SRVNPVVJDRV9ST01fQklPU19D T1BZCj4gICAgICAgUENJOiBTaW1wbGlmeSBzeXNmcyBST00gY2xlYW51cAoKY29tbWl0IGFjMGMz MDJhOTE5YmE3YjY4ZGJmMjc0YmFiZGMwOGM4M2RmNmY1MzIKQXV0aG9yOiBCam9ybiBIZWxnYWFz IDxiaGVsZ2Fhc0Bnb29nbGUuY29tPgpEYXRlOiAgIFNhdCBNYXIgMTIgMDU6NDg6MDggMjAxNiAt MDYwMAoKICAgIFBDSTogUmVtb3ZlIGFyY2gtc3BlY2lmaWMgSU9SRVNPVVJDRV9ST01fU0hBRE9X IHNpemUgZnJvbSBzeXNmcwogICAgCiAgICBXaGVuIHBjaV9jcmVhdGVfc3lzZnNfZGV2X2ZpbGVz KCkgY3JlYXRlZCB0aGUgInJvbSIgc3lzZnMgZmlsZSwgaXQgc2V0IHRoZQogICAgc3lzZnMgZmls ZSBzaXplIHRvIHRoZSBhY3R1YWwgc2l6ZSBvZiBhIFJPTSBCQVIsIG9yIGlmIHRoZXJlIHdhcyBu byBST00gQkFSCiAgICBidXQgdGhlIHBsYXRmb3JtIHByb3ZpZGVkIGEgc2hhZG93IGNvcHkgaW4g UkFNLCB0byAweDIwMDAwLiAgMHgyMDAwMCBpcyBhbgogICAgYXJjaC1zcGVjaWZpYyBsZW5ndGgg dGhhdCBzaG91bGQgbm90IGJlIGJha2VkIGludG8gdGhlIFBDSSBjb3JlLgogICAgCiAgICBFdmVy eSBwbGFjZSB0aGF0IHNldHMgSU9SRVNPVVJDRV9ST01fU0hBRE9XIGFsc28gc2V0cyB0aGUgc2l6 ZSBvZiB0aGUKICAgIFBDSV9ST01fUkVTT1VSQ0UsIHNvIHVzZSB0aGUgcmVzb3VyY2UgbGVuZ3Ro IGFsd2F5cy4KICAgIAogICAgU2lnbmVkLW9mZi1ieTogQmpvcm4gSGVsZ2FhcyA8YmhlbGdhYXNA Z29vZ2xlLmNvbT4KCmRpZmYgLS1naXQgYS9kcml2ZXJzL3BjaS9wY2ktc3lzZnMuYyBiL2RyaXZl cnMvcGNpL3BjaS1zeXNmcy5jCmluZGV4IDk1ZDllN2IuLjUxZDRkYWQgMTAwNjQ0Ci0tLSBhL2Ry aXZlcnMvcGNpL3BjaS1zeXNmcy5jCisrKyBiL2RyaXZlcnMvcGNpL3BjaS1zeXNmcy5jCkBAIC0x MzU2LDcgKzEzNTYsNyBAQCBlcnJvcjoKIGludCBfX211c3RfY2hlY2sgcGNpX2NyZWF0ZV9zeXNm c19kZXZfZmlsZXMoc3RydWN0IHBjaV9kZXYgKnBkZXYpCiB7CiAJaW50IHJldHZhbDsKLQlpbnQg cm9tX3NpemUgPSAwOworCWludCByb21fc2l6ZTsKIAlzdHJ1Y3QgYmluX2F0dHJpYnV0ZSAqYXR0 cjsKIAogCWlmICghc3lzZnNfaW5pdGlhbGl6ZWQpCkBAIC0xMzczLDEyICsxMzczLDggQEAgaW50 IF9fbXVzdF9jaGVjayBwY2lfY3JlYXRlX3N5c2ZzX2Rldl9maWxlcyhzdHJ1Y3QgcGNpX2RldiAq cGRldikKIAlpZiAocmV0dmFsKQogCQlnb3RvIGVycl9jb25maWdfZmlsZTsKIAotCWlmIChwY2lf cmVzb3VyY2VfbGVuKHBkZXYsIFBDSV9ST01fUkVTT1VSQ0UpKQotCQlyb21fc2l6ZSA9IHBjaV9y ZXNvdXJjZV9sZW4ocGRldiwgUENJX1JPTV9SRVNPVVJDRSk7Ci0JZWxzZSBpZiAocGRldi0+cmVz b3VyY2VbUENJX1JPTV9SRVNPVVJDRV0uZmxhZ3MgJiBJT1JFU09VUkNFX1JPTV9TSEFET1cpCi0J CXJvbV9zaXplID0gMHgyMDAwMDsKLQogCS8qIElmIHRoZSBkZXZpY2UgaGFzIGEgUk9NLCB0cnkg dG8gZXhwb3NlIGl0IGluIHN5c2ZzLiAqLworCXJvbV9zaXplID0gcGNpX3Jlc291cmNlX2xlbihw ZGV2LCBQQ0lfUk9NX1JFU09VUkNFKTsKIAlpZiAocm9tX3NpemUpIHsKIAkJYXR0ciA9IGt6YWxs b2Moc2l6ZW9mKCphdHRyKSwgR0ZQX0FUT01JQyk7CiAJCWlmICghYXR0cikgewpfX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBs aXN0CkludGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVz a3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK