diff for duplicates of <1493303340209136@kroah.com> diff --git a/a/content_digest b/N1/content_digest index d4a884d..60fd948 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,8 +6,8 @@ gregkh@linuxfoundation.org linux-mips@linux-mips.org " ralf@linux-mips.org\0" - "Cc\0<stable@vger.kernel.org>" - " <stable-commits@vger.kernel.org>\0" + "Cc\0stable@vger.kernel.org" + " stable-commits@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -25,4 +25,4 @@ "If you, or anyone else, feels it should not be added to the stable tree,\n" please let <stable@vger.kernel.org> know about it. -596ec81c8d166f36bdd841fc642f8b06628605c783fdffa8327f0ef88b007086 +150d1219dfb1fd0d2c6956d60b4a5631404ce3d3ef21444b3c1a8491d8d46d82
diff --git a/a/1.txt b/N2/1.txt index 8652b1d..cc81276 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,3 +12,83 @@ and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. + + +>From c4a305374bbf36414515d2ae00d588c67051e67d Mon Sep 17 00:00:00 2001 +From: Sergey Ryazanov <ryazanov.s.a@gmail.com> +Date: Sat, 30 Aug 2014 06:06:25 +0400 +Subject: MIPS: MSP71xx: remove odd locking in PCI config space access code + +From: Sergey Ryazanov <ryazanov.s.a@gmail.com> + +commit c4a305374bbf36414515d2ae00d588c67051e67d upstream. + +Caller (generic PCI code) already do proper locking so no need to add +another one here. + +Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> +Cc: Linux MIPS <linux-mips@linux-mips.org> +Patchwork: https://patchwork.linux-mips.org/patch/7601/ +Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Cc: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + arch/mips/pci/ops-pmcmsp.c | 12 ------------ + 1 file changed, 12 deletions(-) + +--- a/arch/mips/pci/ops-pmcmsp.c ++++ b/arch/mips/pci/ops-pmcmsp.c +@@ -193,8 +193,6 @@ static void pci_proc_init(void) + } + #endif /* CONFIG_PROC_FS && PCI_COUNTERS */ + +-static DEFINE_SPINLOCK(bpci_lock); +- + /***************************************************************************** + * + * STRUCT: pci_io_resource +@@ -368,7 +366,6 @@ int msp_pcibios_config_access(unsigned c + struct msp_pci_regs *preg = (void *)PCI_BASE_REG; + unsigned char bus_num = bus->number; + unsigned char dev_fn = (unsigned char)devfn; +- unsigned long flags; + unsigned long intr; + unsigned long value; + static char pciirqflag; +@@ -401,10 +398,7 @@ int msp_pcibios_config_access(unsigned c + } + + #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) +- local_irq_save(flags); + vpe_status = dvpe(); +-#else +- spin_lock_irqsave(&bpci_lock, flags); + #endif + + /* +@@ -457,9 +451,6 @@ int msp_pcibios_config_access(unsigned c + + #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) + evpe(vpe_status); +- local_irq_restore(flags); +-#else +- spin_unlock_irqrestore(&bpci_lock, flags); + #endif + + return -1; +@@ -467,9 +458,6 @@ int msp_pcibios_config_access(unsigned c + + #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL) + evpe(vpe_status); +- local_irq_restore(flags); +-#else +- spin_unlock_irqrestore(&bpci_lock, flags); + #endif + + return PCIBIOS_SUCCESSFUL; + + +Patches currently in stable-queue which might be from ryazanov.s.a@gmail.com are + +queue-3.18/mips-msp71xx-remove-odd-locking-in-pci-config-space-access-code.patch diff --git a/a/content_digest b/N2/content_digest index d4a884d..ca927d6 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -23,6 +23,86 @@ "and it can be found in the queue-3.18 subdirectory.\n" "\n" "If you, or anyone else, feels it should not be added to the stable tree,\n" - please let <stable@vger.kernel.org> know about it. + "please let <stable@vger.kernel.org> know about it.\n" + "\n" + "\n" + ">From c4a305374bbf36414515d2ae00d588c67051e67d Mon Sep 17 00:00:00 2001\n" + "From: Sergey Ryazanov <ryazanov.s.a@gmail.com>\n" + "Date: Sat, 30 Aug 2014 06:06:25 +0400\n" + "Subject: MIPS: MSP71xx: remove odd locking in PCI config space access code\n" + "\n" + "From: Sergey Ryazanov <ryazanov.s.a@gmail.com>\n" + "\n" + "commit c4a305374bbf36414515d2ae00d588c67051e67d upstream.\n" + "\n" + "Caller (generic PCI code) already do proper locking so no need to add\n" + "another one here.\n" + "\n" + "Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>\n" + "Cc: Linux MIPS <linux-mips@linux-mips.org>\n" + "Patchwork: https://patchwork.linux-mips.org/patch/7601/\n" + "Signed-off-by: Ralf Baechle <ralf@linux-mips.org>\n" + "Cc: Arnd Bergmann <arnd@arndb.de>\n" + "Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" + "\n" + "---\n" + " arch/mips/pci/ops-pmcmsp.c | 12 ------------\n" + " 1 file changed, 12 deletions(-)\n" + "\n" + "--- a/arch/mips/pci/ops-pmcmsp.c\n" + "+++ b/arch/mips/pci/ops-pmcmsp.c\n" + "@@ -193,8 +193,6 @@ static void pci_proc_init(void)\n" + " }\n" + " #endif /* CONFIG_PROC_FS && PCI_COUNTERS */\n" + " \n" + "-static DEFINE_SPINLOCK(bpci_lock);\n" + "-\n" + " /*****************************************************************************\n" + " *\n" + " * STRUCT: pci_io_resource\n" + "@@ -368,7 +366,6 @@ int msp_pcibios_config_access(unsigned c\n" + " \tstruct msp_pci_regs *preg = (void *)PCI_BASE_REG;\n" + " \tunsigned char bus_num = bus->number;\n" + " \tunsigned char dev_fn = (unsigned char)devfn;\n" + "-\tunsigned long flags;\n" + " \tunsigned long intr;\n" + " \tunsigned long value;\n" + " \tstatic char pciirqflag;\n" + "@@ -401,10 +398,7 @@ int msp_pcibios_config_access(unsigned c\n" + " \t}\n" + " \n" + " #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)\n" + "-\tlocal_irq_save(flags);\n" + " \tvpe_status = dvpe();\n" + "-#else\n" + "-\tspin_lock_irqsave(&bpci_lock, flags);\n" + " #endif\n" + " \n" + " \t/*\n" + "@@ -457,9 +451,6 @@ int msp_pcibios_config_access(unsigned c\n" + " \n" + " #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)\n" + " \t\tevpe(vpe_status);\n" + "-\t\tlocal_irq_restore(flags);\n" + "-#else\n" + "-\t\tspin_unlock_irqrestore(&bpci_lock, flags);\n" + " #endif\n" + " \n" + " \t\treturn -1;\n" + "@@ -467,9 +458,6 @@ int msp_pcibios_config_access(unsigned c\n" + " \n" + " #if defined(CONFIG_PMC_MSP7120_GW) || defined(CONFIG_PMC_MSP7120_EVAL)\n" + " \tevpe(vpe_status);\n" + "-\tlocal_irq_restore(flags);\n" + "-#else\n" + "-\tspin_unlock_irqrestore(&bpci_lock, flags);\n" + " #endif\n" + " \n" + " \treturn PCIBIOS_SUCCESSFUL;\n" + "\n" + "\n" + "Patches currently in stable-queue which might be from ryazanov.s.a@gmail.com are\n" + "\n" + queue-3.18/mips-msp71xx-remove-odd-locking-in-pci-config-space-access-code.patch -596ec81c8d166f36bdd841fc642f8b06628605c783fdffa8327f0ef88b007086 +5408c0cf0e8fe925186ff962c5a27172cced89ef6944d837ce4aee2057400056
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.