diff for duplicates of <52612D1C.4070701@intel.com> diff --git a/a/1.txt b/N1/1.txt index 96f23f4..39e4f2c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,19 +33,16 @@ On 10/18/2013 04:33 AM, Bjorn Helgaas wrote: >>>> @@ -244,7 +245,7 @@ static acpi_status >>>> resource_to_window(struct acpi_resource *resource, * - >>>> producers, i.e., the address space is routed downstream, * ->>>> not consumed by the bridge itself */ - status = ->>>> acpi_resource_to_address64(resource, addr); + status = ->>>> acpi_dev_resource_address_space_full(ares, addr, res); if ->>>> (ACPI_SUCCESS(status) && (addr->resource_type == ->>>> ACPI_MEMORY_RANGE || addr->resource_type == ACPI_IO_RANGE) && +>>>> not consumed by the bridge itself */ - status >>>> acpi_resource_to_address64(resource, addr); + status >>>> acpi_dev_resource_address_space_full(ares, addr, res); if +>>>> (ACPI_SUCCESS(status) && (addr->resource_type = +>>>> ACPI_MEMORY_RANGE || addr->resource_type = ACPI_IO_RANGE) && >>>> @@ -255,51 +256,54 @@ static acpi_status >>>> resource_to_window(struct acpi_resource *resource, return >>>> AE_ERROR; } >>>> >>>> -static acpi_status count_window(struct acpi_resource >>>> *resource, void *data) +static acpi_status count_window(struct ->>>> acpi_resource *ares, void *data) { unsigned int *windows = ->>>> (unsigned int *) data; struct acpi_resource_address64 addr; + +>>>> acpi_resource *ares, void *data) { unsigned int *windows >>>> (unsigned int *) data; struct acpi_resource_address64 addr; + >>>> struct resource res; acpi_status status; >>>> >>>> - status = resource_to_window(resource, &addr); + status @@ -57,24 +54,20 @@ On 10/18/2013 04:33 AM, Bjorn Helgaas wrote: >>>> -static acpi_status add_window(struct acpi_resource *res, void >>>> *data) +static acpi_status add_window(struct acpi_resource >>>> *ares, void *data) { struct pci_root_info *info = data; - ->>>> struct resource *resource; + struct resource *resource = ->>>> &info->res[info->res_num]; struct acpi_resource_address64 ->>>> addr; acpi_status status; - unsigned long flags, offset = ->>>> 0; + unsigned long offset = 0; struct resource *root; +>>>> struct resource *resource; + struct resource *resource >>>> &info->res[info->res_num]; struct acpi_resource_address64 +>>>> addr; acpi_status status; - unsigned long flags, offset >>>> 0; + unsigned long offset = 0; struct resource *root; >>>> >>>> /* Return AE_OK for non-window resources to keep scanning for >>>> more */ - status = resource_to_window(res, &addr); + >>>> status = resource_to_window(ares, &addr, resource); if >>>> (!ACPI_SUCCESS(status)) return AE_OK; >>>> ->>>> - if (addr.resource_type == ACPI_MEMORY_RANGE) { - +>>>> - if (addr.resource_type = ACPI_MEMORY_RANGE) { - >>>> flags = IORESOURCE_MEM; + if (resource->flags & ->>>> IORESOURCE_MEM) { root = &iomem_resource; offset = ->>>> addr.translation_offset; - } else if (addr.resource_type == +>>>> IORESOURCE_MEM) { root = &iomem_resource; offset >>>> addr.translation_offset; - } else if (addr.resource_type = >>>> ACPI_IO_RANGE) { - flags = IORESOURCE_IO; + } ->>>> else if (resource->flags & IORESOURCE_IO) { root = ->>>> &ioport_resource; offset = add_io_space(info, &addr); if ->>>> (offset == ~0) return AE_OK; + + /* + * +>>>> else if (resource->flags & IORESOURCE_IO) { root >>>> &ioport_resource; offset = add_io_space(info, &addr); if +>>>> (offset = ~0) return AE_OK; + + /* + * >>>> io space address translation offset depends + * on >>>> the return value of add_io_space(). So + * >>>> Repopulate resource->start and end here. @@ -176,8 +169,3 @@ add_io_space() seems to think _TTP is always set, right? > > Bjorn > - --- -To unsubscribe from this list: send the line "unsubscribe linux-ia64" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 91a0286..50e36da 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\0CAErSpo7P+n5c2uUoodT=LOjE3UH3LBcjifbj8reXzAeWydsoLA@mail.gmail.com\0" "From\0Lan Tianyu <tianyu.lan@intel.com>\0" "Subject\0Re: [Resend PATCH 5/5] IA64/PCI/ACPI: Rework PCI root bridge ACPI resource conversion\0" - "Date\0Fri, 18 Oct 2013 20:44:12 +0800\0" + "Date\0Fri, 18 Oct 2013 12:44:12 +0000\0" "To\0Bjorn Helgaas <bhelgaas@google.com>\0" "Cc\0Tony Luck <tony.luck@intel.com>" Len Brown <lenb@kernel.org> @@ -53,19 +53,16 @@ ">>>> @@ -244,7 +245,7 @@ static acpi_status\n" ">>>> resource_to_window(struct acpi_resource *resource, * -\n" ">>>> producers, i.e., the address space is routed downstream, *\n" - ">>>> not consumed by the bridge itself */ - status =\n" - ">>>> acpi_resource_to_address64(resource, addr); + status =\n" - ">>>> acpi_dev_resource_address_space_full(ares, addr, res); if\n" - ">>>> (ACPI_SUCCESS(status) && (addr->resource_type ==\n" - ">>>> ACPI_MEMORY_RANGE || addr->resource_type == ACPI_IO_RANGE) &&\n" + ">>>> not consumed by the bridge itself */ - status >>>> acpi_resource_to_address64(resource, addr); + status >>>> acpi_dev_resource_address_space_full(ares, addr, res); if\n" + ">>>> (ACPI_SUCCESS(status) && (addr->resource_type =\n" + ">>>> ACPI_MEMORY_RANGE || addr->resource_type = ACPI_IO_RANGE) &&\n" ">>>> @@ -255,51 +256,54 @@ static acpi_status\n" ">>>> resource_to_window(struct acpi_resource *resource, return\n" ">>>> AE_ERROR; }\n" ">>>>\n" ">>>> -static acpi_status count_window(struct acpi_resource\n" ">>>> *resource, void *data) +static acpi_status count_window(struct\n" - ">>>> acpi_resource *ares, void *data) { unsigned int *windows =\n" - ">>>> (unsigned int *) data; struct acpi_resource_address64 addr; +\n" + ">>>> acpi_resource *ares, void *data) { unsigned int *windows >>>> (unsigned int *) data; struct acpi_resource_address64 addr; +\n" ">>>> struct resource res; acpi_status status;\n" ">>>>\n" ">>>> - status = resource_to_window(resource, &addr); + status\n" @@ -77,24 +74,20 @@ ">>>> -static acpi_status add_window(struct acpi_resource *res, void\n" ">>>> *data) +static acpi_status add_window(struct acpi_resource\n" ">>>> *ares, void *data) { struct pci_root_info *info = data; -\n" - ">>>> struct resource *resource; + struct resource *resource =\n" - ">>>> &info->res[info->res_num]; struct acpi_resource_address64\n" - ">>>> addr; acpi_status status; - unsigned long flags, offset =\n" - ">>>> 0; + unsigned long offset = 0; struct resource *root;\n" + ">>>> struct resource *resource; + struct resource *resource >>>> &info->res[info->res_num]; struct acpi_resource_address64\n" + ">>>> addr; acpi_status status; - unsigned long flags, offset >>>> 0; + unsigned long offset = 0; struct resource *root;\n" ">>>>\n" ">>>> /* Return AE_OK for non-window resources to keep scanning for\n" ">>>> more */ - status = resource_to_window(res, &addr); +\n" ">>>> status = resource_to_window(ares, &addr, resource); if\n" ">>>> (!ACPI_SUCCESS(status)) return AE_OK;\n" ">>>>\n" - ">>>> - if (addr.resource_type == ACPI_MEMORY_RANGE) { -\n" + ">>>> - if (addr.resource_type = ACPI_MEMORY_RANGE) { -\n" ">>>> flags = IORESOURCE_MEM; + if (resource->flags &\n" - ">>>> IORESOURCE_MEM) { root = &iomem_resource; offset =\n" - ">>>> addr.translation_offset; - } else if (addr.resource_type ==\n" + ">>>> IORESOURCE_MEM) { root = &iomem_resource; offset >>>> addr.translation_offset; - } else if (addr.resource_type =\n" ">>>> ACPI_IO_RANGE) { - flags = IORESOURCE_IO; + }\n" - ">>>> else if (resource->flags & IORESOURCE_IO) { root =\n" - ">>>> &ioport_resource; offset = add_io_space(info, &addr); if\n" - ">>>> (offset == ~0) return AE_OK; + + /* + *\n" + ">>>> else if (resource->flags & IORESOURCE_IO) { root >>>> &ioport_resource; offset = add_io_space(info, &addr); if\n" + ">>>> (offset = ~0) return AE_OK; + + /* + *\n" ">>>> io space address translation offset depends + * on\n" ">>>> the return value of add_io_space(). So + *\n" ">>>> Repopulate resource->start and end here.\n" @@ -195,11 +188,6 @@ "> hasn't turned out to be particularly easy to understand.\n" ">\n" "> Bjorn\n" - ">\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-ia64\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + > -a4d1259faa4dc9602be3a77a3e40ce86a15f6e262bc124f1139a5d18f7616b71 +9dea8c2b1a6e361439451d7d256f9a4c371e7580851d6c34740bcd1eff9dbfbe
diff --git a/a/1.txt b/N2/1.txt index 96f23f4..c80024a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -176,8 +176,3 @@ add_io_space() seems to think _TTP is always set, right? > > Bjorn > - --- -To unsubscribe from this list: send the line "unsubscribe linux-ia64" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N2/content_digest index 91a0286..bd39133 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -195,11 +195,6 @@ "> hasn't turned out to be particularly easy to understand.\n" ">\n" "> Bjorn\n" - ">\n" - "\n" - "--\n" - "To unsubscribe from this list: send the line \"unsubscribe linux-ia64\" in\n" - "the body of a message to majordomo@vger.kernel.org\n" - More majordomo info at http://vger.kernel.org/majordomo-info.html + > -a4d1259faa4dc9602be3a77a3e40ce86a15f6e262bc124f1139a5d18f7616b71 +113c25129f8b1b9b85c3fc65b061ba8bac1a5b2efdb66ad70e8157a728076601
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.