Commit c03d361c authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/resource' 

- Add resource_set_size() to set resource size when start has already been
  set (Ilpo Järvinen)

- Add resource_set_range() helper to set both resource start and size (Ilpo
  Järvinen)

- Use IS_ALIGNED() and resource_size() in quirk_s3_64M() instead of
  open-coding them (Ilpo Järvinen)

- Add ALIGN_DOWN_IF_NONZERO() to avoid code duplication when distributing
  resources across devices (Ilpo Järvinen)

- Improve pdev_sort_resources() warning message to be more specific (Ilpo
  Järvinen)

* pci/resource:
  PCI: Improve pdev_sort_resources() warning message
  PCI: Add ALIGN_DOWN_IF_NONZERO() helper
  PCI: Use align and resource helpers, and SZ_* in quirk_s3_64M()
  PCI: Use resource_set_{range,size}() helpers
  resource: Add resource set range and size helpers
parents d985e2be 19f73e93

drivers/pci/controller/pci-tegra.c

+1 −1
Original line number Diff line number Diff line
@@ -1460,7 +1460,7 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie) 
	pcie->cs = *res;



	/* constrain configuration space to 4 KiB */

	pcie->cs.end = pcie->cs.start + SZ_4K - 1;

	resource_set_size(&pcie->cs, SZ_4K);



	pcie->cfg = devm_ioremap_resource(dev, &pcie->cs);

	if (IS_ERR(pcie->cfg)) {

drivers/pci/controller/pci-thunder-pem.c

+2 −2
Original line number Diff line number Diff line
@@ -400,9 +400,9 @@ static int thunder_pem_acpi_init(struct pci_config_window *cfg) 
		 * Reserve 64K size PEM specific resources. The full 16M range

		 * size is required for thunder_pem_init() call.

		 */

		res_pem->end = res_pem->start + SZ_64K - 1;

		resource_set_size(res_pem, SZ_64K);

		thunder_pem_reserve_range(dev, root->segment, res_pem);

		res_pem->end = res_pem->start + SZ_16M - 1;

		resource_set_size(res_pem, SZ_16M);



		/* Reserve PCI configuration space as well. */

		thunder_pem_reserve_range(dev, root->segment, &cfg->res);

drivers/pci/ecam.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ struct pci_config_window *pci_ecam_create(struct device *dev, 
	bus_range_max = resource_size(cfgres) >> bus_shift;

	if (bus_range > bus_range_max) {

		bus_range = bus_range_max;

		cfg->busr.end = busr->start + bus_range - 1;

		resource_set_size(&cfg->busr, bus_range);

		dev_warn(dev, "ECAM area %pR can only accommodate %pR (reduced from %pR desired)\n",

			 cfgres, &cfg->busr, busr);

	}

drivers/pci/iov.c

+3 −3
Original line number Diff line number Diff line
@@ -327,8 +327,8 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id) 
		virtfn->resource[i].name = pci_name(virtfn);

		virtfn->resource[i].flags = res->flags;

		size = pci_iov_resource_size(dev, i + PCI_IOV_RESOURCES);

		virtfn->resource[i].start = res->start + size * id;

		virtfn->resource[i].end = virtfn->resource[i].start + size - 1;

		resource_set_range(&virtfn->resource[i],

				   res->start + size * id, size);

		rc = request_resource(res, &virtfn->resource[i]);

		BUG_ON(rc);

	}
@@ -804,7 +804,7 @@ static int sriov_init(struct pci_dev *dev, int pos) 
			goto failed;

		}

		iov->barsz[i] = resource_size(res);

		res->end = res->start + resource_size(res) * total - 1;

		resource_set_size(res, resource_size(res) * total);

		pci_info(dev, "%s %pR: contains BAR %d for %d VFs\n",

			 res_name, res, i, total);

		i += bar64;

drivers/pci/pci.c

+1 −2
Original line number Diff line number Diff line
@@ -6679,8 +6679,7 @@ static void pci_request_resource_alignment(struct pci_dev *dev, int bar, 
	} else {

		r->flags &= ~IORESOURCE_SIZEALIGN;

		r->flags |= IORESOURCE_STARTALIGN;

		r->start = align;

		r->end = r->start + size - 1;

		resource_set_range(r, align, size);

	}

	r->flags |= IORESOURCE_UNSET;

}