diff for duplicates of <5550A8EA.8000704@linaro.org> diff --git a/a/1.txt b/N1/1.txt index 370f2ee..9e0473e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -87,13 +87,13 @@ hanjun > - > - min = addr->address.minimum; > - max = min + addr->address.address_length - 1; -> - if (addr->info.io.translation_type == ACPI_SPARSE_TRANSLATION) +> - if (addr->info.io.translation_type = ACPI_SPARSE_TRANSLATION) > + if (res->flags & IORESOURCE_IO_SPARSE) > sparse = 1; > - > - space_nr = new_space(addr->address.translation_offset, sparse); > + space_nr = new_space(entry->offset, sparse); -> if (space_nr == ~0) +> if (space_nr = ~0) > goto free_resource; > > + name = (char *)(iospace + 1); @@ -152,7 +152,7 @@ hanjun > +static bool resource_is_pcicfg_ioport(struct resource *res) > +{ > + return (res->flags & IORESOURCE_IO) && -> + res->start == 0xCF8 && res->end == 0xCFF; +> + res->start = 0xCF8 && res->end = 0xCFF; > } > > -static acpi_status resource_to_window(struct acpi_resource *resource, @@ -173,8 +173,8 @@ hanjun > - */ > - status = acpi_resource_to_address64(resource, addr); > - if (ACPI_SUCCESS(status) && -> - (addr->resource_type == ACPI_MEMORY_RANGE || -> - addr->resource_type == ACPI_IO_RANGE) && +> - (addr->resource_type = ACPI_MEMORY_RANGE || +> - addr->resource_type = ACPI_IO_RANGE) && > - addr->address.address_length) > - return AE_OK; > - @@ -208,15 +208,15 @@ hanjun > - if (!ACPI_SUCCESS(status)) > - return AE_OK; > - -> - if (addr.resource_type == ACPI_MEMORY_RANGE) { +> - if (addr.resource_type = ACPI_MEMORY_RANGE) { > - flags = IORESOURCE_MEM; > - root = &iomem_resource; > - offset = addr.address.translation_offset; -> - } else if (addr.resource_type == ACPI_IO_RANGE) { +> - } else if (addr.resource_type = ACPI_IO_RANGE) { > - flags = IORESOURCE_IO; > - root = &ioport_resource; > - offset = add_io_space(info, &addr); -> - if (offset == ~0) +> - if (offset = ~0) > - return AE_OK; > - } else > - return AE_OK; @@ -255,7 +255,7 @@ hanjun > + if (ret < 0) > + dev_warn(&device->dev, > + "failed to parse _CRS method, error code %d\n", ret); -> + else if (ret == 0) +> + else if (ret = 0) > + dev_dbg(&device->dev, > + "no IO and memory resources present in _CRS\n"); > + else @@ -282,7 +282,7 @@ hanjun > + struct resource *res1, *res2, *root = NULL; > + struct resource_entry *tmp, *entry, *entry2; > + -> + BUG_ON((type & (IORESOURCE_MEM | IORESOURCE_IO)) == 0); +> + BUG_ON((type & (IORESOURCE_MEM | IORESOURCE_IO)) = 0); > + root = (type & IORESOURCE_MEM) ? &iomem_resource : &ioport_resource; > + > + list_splice_init(resources, &list); @@ -445,16 +445,14 @@ hanjun > - acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window, > - &info->res_num); > - if (info->res_num) { -> - info->res = -> - kzalloc_node(sizeof(*info->res) * info->res_num, +> - info->res > - kzalloc_node(sizeof(*info->res) * info->res_num, > - GFP_KERNEL, info->controller->node); > - if (!info->res) { > - kfree(name); > - return -ENOMEM; > - } > - -> - info->res_offset = -> - kzalloc_node(sizeof(*info->res_offset) * info->res_num, +> - info->res_offset > - kzalloc_node(sizeof(*info->res_offset) * info->res_num, > - GFP_KERNEL, info->controller->node); > - if (!info->res_offset) { > - kfree(name); diff --git a/a/content_digest b/N1/content_digest index 198b07b..90a8ffb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01430793970-11159-3-git-send-email-jiang.liu@linux.intel.com\0" "From\0Hanjun Guo <hanjun.guo@linaro.org>\0" "Subject\0Re: [RFC v2 2/7] ia64/PCI/ACPI: Use common ACPI resource parsing interface for host bridge\0" - "Date\0Mon, 11 May 2015 21:04:42 +0800\0" + "Date\0Mon, 11 May 2015 13:04:42 +0000\0" "To\0Jiang Liu <jiang.liu@linux.intel.com>" Rafael J . Wysocki <rjw@rjwysocki.net> Bjorn Helgaas <bhelgaas@google.com> @@ -110,13 +110,13 @@ "> -\n" "> -\tmin = addr->address.minimum;\n" "> -\tmax = min + addr->address.address_length - 1;\n" - "> -\tif (addr->info.io.translation_type == ACPI_SPARSE_TRANSLATION)\n" + "> -\tif (addr->info.io.translation_type = ACPI_SPARSE_TRANSLATION)\n" "> +\tif (res->flags & IORESOURCE_IO_SPARSE)\n" "> \t\tsparse = 1;\n" "> -\n" "> -\tspace_nr = new_space(addr->address.translation_offset, sparse);\n" "> +\tspace_nr = new_space(entry->offset, sparse);\n" - "> \tif (space_nr == ~0)\n" + "> \tif (space_nr = ~0)\n" "> \t\tgoto free_resource;\n" ">\n" "> +\tname = (char *)(iospace + 1);\n" @@ -175,7 +175,7 @@ "> +static bool resource_is_pcicfg_ioport(struct resource *res)\n" "> +{\n" "> +\treturn (res->flags & IORESOURCE_IO) &&\n" - "> +\t\tres->start == 0xCF8 && res->end == 0xCFF;\n" + "> +\t\tres->start = 0xCF8 && res->end = 0xCFF;\n" "> }\n" ">\n" "> -static acpi_status resource_to_window(struct acpi_resource *resource,\n" @@ -196,8 +196,8 @@ "> -\t */\n" "> -\tstatus = acpi_resource_to_address64(resource, addr);\n" "> -\tif (ACPI_SUCCESS(status) &&\n" - "> -\t (addr->resource_type == ACPI_MEMORY_RANGE ||\n" - "> -\t addr->resource_type == ACPI_IO_RANGE) &&\n" + "> -\t (addr->resource_type = ACPI_MEMORY_RANGE ||\n" + "> -\t addr->resource_type = ACPI_IO_RANGE) &&\n" "> -\t addr->address.address_length)\n" "> -\t\treturn AE_OK;\n" "> -\n" @@ -231,15 +231,15 @@ "> -\tif (!ACPI_SUCCESS(status))\n" "> -\t\treturn AE_OK;\n" "> -\n" - "> -\tif (addr.resource_type == ACPI_MEMORY_RANGE) {\n" + "> -\tif (addr.resource_type = ACPI_MEMORY_RANGE) {\n" "> -\t\tflags = IORESOURCE_MEM;\n" "> -\t\troot = &iomem_resource;\n" "> -\t\toffset = addr.address.translation_offset;\n" - "> -\t} else if (addr.resource_type == ACPI_IO_RANGE) {\n" + "> -\t} else if (addr.resource_type = ACPI_IO_RANGE) {\n" "> -\t\tflags = IORESOURCE_IO;\n" "> -\t\troot = &ioport_resource;\n" "> -\t\toffset = add_io_space(info, &addr);\n" - "> -\t\tif (offset == ~0)\n" + "> -\t\tif (offset = ~0)\n" "> -\t\t\treturn AE_OK;\n" "> -\t} else\n" "> -\t\treturn AE_OK;\n" @@ -278,7 +278,7 @@ "> +\tif (ret < 0)\n" "> +\t\tdev_warn(&device->dev,\n" "> +\t\t\t \"failed to parse _CRS method, error code %d\\n\", ret);\n" - "> +\telse if (ret == 0)\n" + "> +\telse if (ret = 0)\n" "> +\t\tdev_dbg(&device->dev,\n" "> +\t\t\t\"no IO and memory resources present in _CRS\\n\");\n" "> +\telse\n" @@ -305,7 +305,7 @@ "> +\tstruct resource *res1, *res2, *root = NULL;\n" "> +\tstruct resource_entry *tmp, *entry, *entry2;\n" "> +\n" - "> +\tBUG_ON((type & (IORESOURCE_MEM | IORESOURCE_IO)) == 0);\n" + "> +\tBUG_ON((type & (IORESOURCE_MEM | IORESOURCE_IO)) = 0);\n" "> +\troot = (type & IORESOURCE_MEM) ? &iomem_resource : &ioport_resource;\n" "> +\n" "> +\tlist_splice_init(resources, &list);\n" @@ -468,16 +468,14 @@ "> -\tacpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,\n" "> -\t\t\t&info->res_num);\n" "> -\tif (info->res_num) {\n" - "> -\t\tinfo->res =\n" - "> -\t\t\tkzalloc_node(sizeof(*info->res) * info->res_num,\n" + "> -\t\tinfo->res > -\t\t\tkzalloc_node(sizeof(*info->res) * info->res_num,\n" "> -\t\t\t\t GFP_KERNEL, info->controller->node);\n" "> -\t\tif (!info->res) {\n" "> -\t\t\tkfree(name);\n" "> -\t\t\treturn -ENOMEM;\n" "> -\t\t}\n" "> -\n" - "> -\t\tinfo->res_offset =\n" - "> -\t\t\tkzalloc_node(sizeof(*info->res_offset) * info->res_num,\n" + "> -\t\tinfo->res_offset > -\t\t\tkzalloc_node(sizeof(*info->res_offset) * info->res_num,\n" "> -\t\t\t\t\tGFP_KERNEL, info->controller->node);\n" "> -\t\tif (!info->res_offset) {\n" "> -\t\t\tkfree(name);\n" @@ -565,4 +563,4 @@ "> \t}\n" > -4a6cb835fee2be30f11eb3dd1e385b4ccee0b3329f12fe70baa4e767d9bd4537 +1d4a9f0734fb1da5c76e016e926b0c7e048e85b218f2a6f8489c75703b3c0201
diff --git a/a/1.txt b/N2/1.txt index 370f2ee..5a8d566 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,4 +1,4 @@ -On 2015年05月05日 10:46, Jiang Liu wrote: +On 2015?05?05? 10:46, Jiang Liu wrote: > Use common ACPI resource parsing interface to parse ACPI resources for > PCI host bridge, so we could share more code between IA64 and x86. > Later we will consolidate arch specific implementations into ACPI core. diff --git a/a/content_digest b/N2/content_digest index 198b07b..4fc46e6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,27 +1,12 @@ "ref\01430793970-11159-1-git-send-email-jiang.liu@linux.intel.com\0" "ref\01430793970-11159-3-git-send-email-jiang.liu@linux.intel.com\0" - "From\0Hanjun Guo <hanjun.guo@linaro.org>\0" - "Subject\0Re: [RFC v2 2/7] ia64/PCI/ACPI: Use common ACPI resource parsing interface for host bridge\0" + "From\0hanjun.guo@linaro.org (Hanjun Guo)\0" + "Subject\0[RFC v2 2/7] ia64/PCI/ACPI: Use common ACPI resource parsing interface for host bridge\0" "Date\0Mon, 11 May 2015 21:04:42 +0800\0" - "To\0Jiang Liu <jiang.liu@linux.intel.com>" - Rafael J . Wysocki <rjw@rjwysocki.net> - Bjorn Helgaas <bhelgaas@google.com> - Marc Zyngier <marc.zyngier@arm.com> - Yijing Wang <wangyijing@huawei.com> - Tony Luck <tony.luck@intel.com> - Fenghua Yu <fenghua.yu@intel.com> - " Yinghai Lu <yinghai@kernel.org>\0" - "Cc\0Lv Zheng <lv.zheng@intel.com>" - lenb @ kernel . org <lenb@kernel.org> - LKML <linux-kernel@vger.kernel.org> - linux-pci@vger.kernel.org - linux-acpi@vger.kernel.org - x86 @ kernel . org <x86@kernel.org> - linux-arm-kernel@lists.infradead.org - " linux-ia64@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "On 2015\345\271\26405\346\234\21005\346\227\245 10:46, Jiang Liu wrote:\n" + "On 2015?05?05? 10:46, Jiang Liu wrote:\n" "> Use common ACPI resource parsing interface to parse ACPI resources for\n" "> PCI host bridge, so we could share more code between IA64 and x86.\n" "> Later we will consolidate arch specific implementations into ACPI core.\n" @@ -565,4 +550,4 @@ "> \t}\n" > -4a6cb835fee2be30f11eb3dd1e385b4ccee0b3329f12fe70baa4e767d9bd4537 +9cad3073e2e2051d62fd14874fe8c01fe92d677ca9b6327f9787c1c7fd775d01
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.