On Fri, Jan 27, 2012 at 6:49 PM, Yinghai Lu <yinghai@xxxxxxxxxx> wrote:
> Try to allocate from parent bus busn_res. if can not find any big enough, will try
> to extend parent bus top. even the extending is through allocating, after allocating
> will pad the range to parent buses top.
>
> When extending happens, We will record the parent_res, so could use it as stopper
> for really extend/shrink top later.
>
> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
> ---
> drivers/pci/probe.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 files changed, 117 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
> index 3e62f45..83df3fb 100644
> --- a/drivers/pci/probe.c
> +++ b/drivers/pci/probe.c
> @@ -674,6 +674,123 @@ static void __devinit pci_bus_shrink_top(struct pci_bus *parent,
> }
> }
>
> +static resource_size_t __devinit find_res_top_free_size(struct resource *res)
I think what this does is "find the largest available area in 'res'."
That *sounds* sort of useful (and like something that could go
somewhere more generic than drivers/pci/probe.c), but there's no
locking, so we don't have any assurance that the area we find will
*remain* available.
Since the caller should deal with failure anyway (if the largest
available area is no longer available by the time it gets around to
allocating it), it seems like it'd be better to fold this into the
caller somehow.
> +{
> + int ret = -ENOMEM;
> + resource_size_t n_size;
> + struct resource tmp_res;
> +
> + /*
> + * find out number below res->end, that we can use at first
> + * res->start can not be used.
> + */
> + n_size = resource_size(res) - 1;
> + memset(&tmp_res, 0, sizeof(struct resource));
> + while (n_size > 0) {
> + ret = allocate_resource(res, &tmp_res, n_size,
> + res->end - n_size + 1, res->end,
> + 1, NULL, NULL);
> + if (ret == 0) {
> + /* release busn_res */
Comments like this that repeat exactly what the next line of code does
without adding any useful information are unnecessary and distracting.
> + release_resource(&tmp_res);
> + break;
> + }
> + n_size--;
> + }
> +
> + return n_size;
> +}
> +
> +static int __devinit pci_bridge_probe_busn_res(struct pci_bus *bus,
> + struct pci_dev *dev, struct resource *busn_res,
> + resource_size_t needed_size, struct resource **p)
> +{
> + int ret = -ENOMEM;
> + resource_size_t n_size;
> + struct pci_bus *parent;
> + struct resource *parent_res;
> + resource_size_t tmp = bus->busn_res.end + 1;
> + int free_sz = -1;
> +
> + parent_res = NULL;
> +
> +again:
> + /*
> + * find bigest range in bus->busn_res that we can use in the middle
> + * and we can not use bus->busn_res.start.
> + */
> + n_size = resource_size(&bus->busn_res) - 1;
> + memset(busn_res, 0, sizeof(struct resource));
> + dev_printk(KERN_DEBUG, &dev->dev,
> + "find free busn in busn_res: %06llx-%06llx\n",
> + (unsigned long long)bus->busn_res.start,
> + (unsigned long long)bus->busn_res.end);
> + while (n_size >= needed_size) {
> + ret = allocate_resource(&bus->busn_res, busn_res, n_size,
> + bus->busn_res.start + 1, bus->busn_res.end,
> + 1, NULL, NULL);
> + if (ret == 0) {
> + /* release res */
> + release_resource(busn_res);
> +
> + return ret;
> + }
> + n_size--;
> + }
> +
> + /* try extend the top of parent buss */
> + if (free_sz < 0) {
> + free_sz = find_res_top_free_size(&bus->busn_res);
> + dev_printk(KERN_DEBUG, &dev->dev,
> + "found free busn %d in busn_res: %06llx-%06llx top\n",
> + free_sz,
> + (unsigned long long)bus->busn_res.start,
> + (unsigned long long)bus->busn_res.end);
> + }
> + n_size = free_sz;
> +
> + /* check if extend could cross domain boundary */
> + if ((bus->busn_res.end & 0xff) == 0xff)
> + goto reduce_needed_size;
> + if ((0x100 - (tmp & 0xff)) < (needed_size - n_size))
> + goto reduce_needed_size;
> +
> + /* find exteded range */
> + memset(busn_res, 0, sizeof(struct resource));
> + parent = bus->parent;
> + while (parent) {
> + ret = allocate_resource(&parent->busn_res, busn_res,
> + needed_size - n_size,
> + tmp, tmp + needed_size - n_size - 1,
> + 1, NULL, NULL);
> + if (ret == 0)
> + break;
> + parent = parent->parent;
> + }
> +
> +reduce_needed_size:
> + if (ret != 0) {
> + needed_size--;
> + if (!needed_size)
> + return ret;
> +
> + goto again;
> + }
> +
> + /* save parent_res, we need it as stopper later */
> + parent_res = busn_res->parent;
> + /* release busn_res */
> + release_resource(busn_res);
> + busn_res->start -= n_size;
> +
> + /* extend parent bus top*/
> + pci_bus_extend_top(bus, needed_size - n_size, parent_res);
> +
> + *p = parent_res;
> +
> + return ret;
> +}
> +
> /*
> * If it's a bridge, configure it and scan the bus behind it.
> * For CardBus bridges, we don't scan behind as the devices will
> --
> 1.7.7
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
