diff for duplicates of <1456330151.5681.46.camel@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 26b7e67..a529d83 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,34 +4,34 @@ On Tue, 2016-02-09 at 17:56 -0800, Duc Dang wrote: > > Signed-off-by: Duc Dang <dhdang@apm.com> > --- -> drivers/pci/host/pci-xgene-msi.c | 35 ++++++++++++++++++++++++++++++++--- -> 1 file changed, 32 insertions(+), 3 deletions(-) +> ?drivers/pci/host/pci-xgene-msi.c | 35 ++++++++++++++++++++++++++++++++--- +> ?1 file changed, 32 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c > index a6456b5..466aa93 100644 > --- a/drivers/pci/host/pci-xgene-msi.c > +++ b/drivers/pci/host/pci-xgene-msi.c > @@ -24,6 +24,7 @@ -> #include <linux/pci.h> -> #include <linux/platform_device.h> -> #include <linux/of_pci.h> +> ?#include <linux/pci.h> +> ?#include <linux/platform_device.h> +> ?#include <linux/of_pci.h> > +#include <linux/acpi.h> -> -> #define MSI_IR0 0x000000 -> #define MSI_INT0 0x800000 +> ? +> ?#define MSI_IR0 0x000000 +> ?#define MSI_INT0 0x800000 > @@ -39,7 +40,7 @@ struct xgene_msi_group { -> }; -> -> struct xgene_msi { +> ?}; +> ? +> ?struct xgene_msi { > - struct device_node *node; > + struct fwnode_handle *fwnode; -> struct irq_domain *inner_domain; -> struct irq_domain *msi_domain; -> u64 msi_addr; +> ? struct irq_domain *inner_domain; +> ? struct irq_domain *msi_domain; +> ? u64 msi_addr; > @@ -249,6 +250,13 @@ static const struct irq_domain_ops msi_domain_ops = { -> .free = xgene_irq_domain_free, -> }; -> +> ? .free???= xgene_irq_domain_free, +> ?}; +> ? > +#ifdef CONFIG_ACPI > +static struct fwnode_handle *xgene_msi_get_fwnode(struct device *dev) > +{ @@ -39,38 +39,38 @@ On Tue, 2016-02-09 at 17:56 -0800, Duc Dang wrote: > +} > +#endif > + -> static int xgene_allocate_domains(struct xgene_msi *msi) -> { -> msi->inner_domain = irq_domain_add_linear(NULL, NR_MSI_VEC, +> ?static int xgene_allocate_domains(struct xgene_msi *msi) +> ?{ +> ? msi->inner_domain = irq_domain_add_linear(NULL, NR_MSI_VEC, > @@ -256,7 +264,7 @@ static int xgene_allocate_domains(struct xgene_msi *msi) -> if (!msi->inner_domain) -> return -ENOMEM; -> +> ? if (!msi->inner_domain) +> ? return -ENOMEM; +> ? > - msi->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(msi->node), > + msi->msi_domain = pci_msi_create_irq_domain(msi->fwnode, -> &xgene_msi_domain_info, -> msi->inner_domain); +> ? ????&xgene_msi_domain_info, +> ? ????msi->inner_domain); This doesn't work for me (ACPI probing on Mustang) unless I change this -to be pci_msi_create_default_irq_domain(). The problem seems to be that +to be?pci_msi_create_default_irq_domain(). The problem seems to be that the MSI probe happens after the PCIe RC is probed so there is no MSI domain at the time the PCIe root is initialized by ACPI. -> +> ? > @@ -265,6 +273,9 @@ static int xgene_allocate_domains(struct xgene_msi *msi) -> return -ENOMEM; -> } -> +> ? return -ENOMEM; +> ? } +> ? > +#ifdef CONFIG_ACPI > + pci_msi_register_fwnode_provider(&xgene_msi_get_fwnode); > +#endif -> return 0; -> } -> +> ? return 0; +> ?} +> ? > @@ -473,6 +484,13 @@ static const struct of_device_id xgene_msi_match_table[] = { -> {}, -> }; -> +> ? {}, +> ?}; +> ? > +#ifdef CONFIG_ACPI > +static const struct acpi_device_id xgene_msi_acpi_ids[] = { > + {"APMC0D0E", 0}, @@ -78,13 +78,13 @@ at the time the PCIe root is initialized by ACPI. > +}; > +#endif > + -> static int xgene_msi_probe(struct platform_device *pdev) -> { -> struct resource *res; +> ?static int xgene_msi_probe(struct platform_device *pdev) +> ?{ +> ? struct resource *res; > @@ -494,7 +512,17 @@ static int xgene_msi_probe(struct platform_device *pdev) -> goto error; -> } -> xgene_msi->msi_addr = res->start; +> ? goto error; +> ? } +> ? xgene_msi->msi_addr = res->start; > - xgene_msi->node = pdev->dev.of_node; > + > + xgene_msi->fwnode = of_node_to_fwnode(pdev->dev.of_node); @@ -97,14 +97,14 @@ at the time the PCIe root is initialized by ACPI. > + } > + } > + -> xgene_msi->num_cpus = num_possible_cpus(); -> -> rc = xgene_msi_init_allocator(xgene_msi); +> ? xgene_msi->num_cpus = num_possible_cpus(); +> ? +> ? rc = xgene_msi_init_allocator(xgene_msi); > @@ -571,6 +599,7 @@ static struct platform_driver xgene_msi_driver = { -> .driver = { -> .name = "xgene-msi", -> .of_match_table = xgene_msi_match_table, +> ? .driver = { +> ? .name = "xgene-msi", +> ? .of_match_table = xgene_msi_match_table, > + .acpi_match_table = ACPI_PTR(xgene_msi_acpi_ids), -> }, -> .probe = xgene_msi_probe, -> .remove = xgene_msi_remove, +> ? }, +> ? .probe = xgene_msi_probe, +> ? .remove = xgene_msi_remove, diff --git a/a/content_digest b/N1/content_digest index 919e19a..313600e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,8 @@ "ref\01455069384-22323-1-git-send-email-dhdang@apm.com\0" - "From\0Mark Salter <msalter@redhat.com>\0" - "Subject\0Re: [PATCH] PCI/MSI: pci-xgene-msi: Enable MSI support in ACPI boot for X-Gene v1\0" + "From\0msalter@redhat.com (Mark Salter)\0" + "Subject\0[PATCH] PCI/MSI: pci-xgene-msi: Enable MSI support in ACPI boot for X-Gene v1\0" "Date\0Wed, 24 Feb 2016 11:09:11 -0500\0" - "To\0Duc Dang <dhdang@apm.com>" - Bjorn Helgaas <bhelgaas@google.com> - " Marc Zyngier <marc.zyngier@arm.com>\0" - "Cc\0Feng Kan <fkan@apm.com>" - linux-pci@vger.kernel.org - patches@apm.com - linux-kernel@vger.kernel.org - Loc Ho <lho@apm.com> - linux-arm-kernel@lists.infradead.org - " Tanmay Inamdar <tinamdar@apm.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2016-02-09 at 17:56 -0800, Duc Dang wrote:\n" @@ -20,34 +11,34 @@ "> \n" "> Signed-off-by: Duc Dang <dhdang@apm.com>\n" "> ---\n" - "> \302\240drivers/pci/host/pci-xgene-msi.c | 35 ++++++++++++++++++++++++++++++++---\n" - "> \302\2401 file changed, 32 insertions(+), 3 deletions(-)\n" + "> ?drivers/pci/host/pci-xgene-msi.c | 35 ++++++++++++++++++++++++++++++++---\n" + "> ?1 file changed, 32 insertions(+), 3 deletions(-)\n" "> \n" "> diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c\n" "> index a6456b5..466aa93 100644\n" "> --- a/drivers/pci/host/pci-xgene-msi.c\n" "> +++ b/drivers/pci/host/pci-xgene-msi.c\n" "> @@ -24,6 +24,7 @@\n" - "> \302\240#include <linux/pci.h>\n" - "> \302\240#include <linux/platform_device.h>\n" - "> \302\240#include <linux/of_pci.h>\n" + "> ?#include <linux/pci.h>\n" + "> ?#include <linux/platform_device.h>\n" + "> ?#include <linux/of_pci.h>\n" "> +#include <linux/acpi.h>\n" - "> \302\240\n" - "> \302\240#define MSI_IR0\t\t\t0x000000\n" - "> \302\240#define MSI_INT0\t\t0x800000\n" + "> ?\n" + "> ?#define MSI_IR0\t\t\t0x000000\n" + "> ?#define MSI_INT0\t\t0x800000\n" "> @@ -39,7 +40,7 @@ struct xgene_msi_group {\n" - "> \302\240};\n" - "> \302\240\n" - "> \302\240struct xgene_msi {\n" + "> ?};\n" + "> ?\n" + "> ?struct xgene_msi {\n" "> -\tstruct device_node\t*node;\n" "> +\tstruct fwnode_handle\t*fwnode;\n" - "> \302\240\tstruct irq_domain\t*inner_domain;\n" - "> \302\240\tstruct irq_domain\t*msi_domain;\n" - "> \302\240\tu64\t\t\tmsi_addr;\n" + "> ?\tstruct irq_domain\t*inner_domain;\n" + "> ?\tstruct irq_domain\t*msi_domain;\n" + "> ?\tu64\t\t\tmsi_addr;\n" "> @@ -249,6 +250,13 @@ static const struct irq_domain_ops msi_domain_ops = {\n" - "> \302\240\t.free\302\240\302\240\302\240= xgene_irq_domain_free,\n" - "> \302\240};\n" - "> \302\240\n" + "> ?\t.free???= xgene_irq_domain_free,\n" + "> ?};\n" + "> ?\n" "> +#ifdef CONFIG_ACPI\n" "> +static struct fwnode_handle *xgene_msi_get_fwnode(struct device *dev)\n" "> +{\n" @@ -55,38 +46,38 @@ "> +}\n" "> +#endif\n" "> +\n" - "> \302\240static int xgene_allocate_domains(struct xgene_msi *msi)\n" - "> \302\240{\n" - "> \302\240\tmsi->inner_domain = irq_domain_add_linear(NULL, NR_MSI_VEC,\n" + "> ?static int xgene_allocate_domains(struct xgene_msi *msi)\n" + "> ?{\n" + "> ?\tmsi->inner_domain = irq_domain_add_linear(NULL, NR_MSI_VEC,\n" "> @@ -256,7 +264,7 @@ static int xgene_allocate_domains(struct xgene_msi *msi)\n" - "> \302\240\tif (!msi->inner_domain)\n" - "> \302\240\t\treturn -ENOMEM;\n" - "> \302\240\n" + "> ?\tif (!msi->inner_domain)\n" + "> ?\t\treturn -ENOMEM;\n" + "> ?\n" "> -\tmsi->msi_domain = pci_msi_create_irq_domain(of_node_to_fwnode(msi->node),\n" "> +\tmsi->msi_domain = pci_msi_create_irq_domain(msi->fwnode,\n" - "> \302\240\t\t\t\t\t\t\302\240\302\240\302\240\302\240&xgene_msi_domain_info,\n" - "> \302\240\t\t\t\t\t\t\302\240\302\240\302\240\302\240msi->inner_domain);\n" + "> ?\t\t\t\t\t\t????&xgene_msi_domain_info,\n" + "> ?\t\t\t\t\t\t????msi->inner_domain);\n" "\n" "This doesn't work for me (ACPI probing on Mustang) unless I change this\n" - "to be\302\240pci_msi_create_default_irq_domain(). The problem seems to be that\n" + "to be?pci_msi_create_default_irq_domain(). The problem seems to be that\n" "the MSI probe happens after the PCIe RC is probed so there is no MSI domain\n" "at the time the PCIe root is initialized by ACPI.\n" "\n" - "> \302\240\n" + "> ?\n" "> @@ -265,6 +273,9 @@ static int xgene_allocate_domains(struct xgene_msi *msi)\n" - "> \302\240\t\treturn -ENOMEM;\n" - "> \302\240\t}\n" - "> \302\240\n" + "> ?\t\treturn -ENOMEM;\n" + "> ?\t}\n" + "> ?\n" "> +#ifdef CONFIG_ACPI\n" "> +\tpci_msi_register_fwnode_provider(&xgene_msi_get_fwnode);\n" "> +#endif\n" - "> \302\240\treturn 0;\n" - "> \302\240}\n" - "> \302\240\n" + "> ?\treturn 0;\n" + "> ?}\n" + "> ?\n" "> @@ -473,6 +484,13 @@ static const struct of_device_id xgene_msi_match_table[] = {\n" - "> \302\240\t{},\n" - "> \302\240};\n" - "> \302\240\n" + "> ?\t{},\n" + "> ?};\n" + "> ?\n" "> +#ifdef CONFIG_ACPI\n" "> +static const struct acpi_device_id xgene_msi_acpi_ids[] = {\n" "> +\t{\"APMC0D0E\", 0},\n" @@ -94,13 +85,13 @@ "> +};\n" "> +#endif\n" "> +\n" - "> \302\240static int xgene_msi_probe(struct platform_device *pdev)\n" - "> \302\240{\n" - "> \302\240\tstruct resource *res;\n" + "> ?static int xgene_msi_probe(struct platform_device *pdev)\n" + "> ?{\n" + "> ?\tstruct resource *res;\n" "> @@ -494,7 +512,17 @@ static int xgene_msi_probe(struct platform_device *pdev)\n" - "> \302\240\t\tgoto error;\n" - "> \302\240\t}\n" - "> \302\240\txgene_msi->msi_addr = res->start;\n" + "> ?\t\tgoto error;\n" + "> ?\t}\n" + "> ?\txgene_msi->msi_addr = res->start;\n" "> -\txgene_msi->node = pdev->dev.of_node;\n" "> +\n" "> +\txgene_msi->fwnode = of_node_to_fwnode(pdev->dev.of_node);\n" @@ -113,16 +104,16 @@ "> +\t\t}\n" "> +\t}\n" "> +\n" - "> \302\240\txgene_msi->num_cpus = num_possible_cpus();\n" - "> \302\240\n" - "> \302\240\trc = xgene_msi_init_allocator(xgene_msi);\n" + "> ?\txgene_msi->num_cpus = num_possible_cpus();\n" + "> ?\n" + "> ?\trc = xgene_msi_init_allocator(xgene_msi);\n" "> @@ -571,6 +599,7 @@ static struct platform_driver xgene_msi_driver = {\n" - "> \302\240\t.driver = {\n" - "> \302\240\t\t.name = \"xgene-msi\",\n" - "> \302\240\t\t.of_match_table = xgene_msi_match_table,\n" + "> ?\t.driver = {\n" + "> ?\t\t.name = \"xgene-msi\",\n" + "> ?\t\t.of_match_table = xgene_msi_match_table,\n" "> +\t\t.acpi_match_table = ACPI_PTR(xgene_msi_acpi_ids),\n" - "> \302\240\t},\n" - "> \302\240\t.probe = xgene_msi_probe,\n" - "> \302\240\t.remove = xgene_msi_remove," + "> ?\t},\n" + "> ?\t.probe = xgene_msi_probe,\n" + "> ?\t.remove = xgene_msi_remove," -248078c1020a35e2b953a4606cdeaab8509e1f1b38c51e6cfbeca4f2189a887e +f35439ec30b3a70e9c0feb1b701ea63cf1e37fa0f5cc77f134c62febc75417c6
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.