Skip to contentSkip to conversation

Patch "MIPS: MSP71xx: remove odd locking in PCI config space access code" has been added to the 3.18-stable tree

DISCUSSION [email protected] 1 participant 1 message Apr 27, 2017

Subsystems (2)
Stable branch MIPS
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

MIPS: MSP71xx: remove odd locking in PCI config space access code

to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mips-msp71xx-remove-odd-locking-in-pci-config-space-access-code.patch
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 <[email protected]> know about it.

Quoted 1 line

From c4a305374bbf36414515d2ae00d588c67051e67d Mon Sep 17 00:00:00 2001

From: Sergey Ryazanov <[email protected]>
Date: Sat, 30 Aug 2014 06:06:25 +0400
Subject: MIPS: MSP71xx: remove odd locking in PCI config space access code

From: Sergey Ryazanov <[email protected]>

commit c4a305374bbf36414515d2ae00d588c67051e67d upstream.

Caller (generic PCI code) already do proper locking so no need to add another one here.

Signed-off-by Sergey Ryazanov <[email protected]>
Cc Linux MIPS <[email protected]>

Patchwork: https://patchwork.linux-mips.org/patch/7601/

Signed-off-by Ralf Baechle <[email protected]>
Cc Arnd Bergmann <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 arch/mips/pci/ops-pmcmsp.c |   12 ------------
 1 file changed, 12 deletions(-)
arch/mips/pci/ops-pmcmsp.c +0 -12
@@ -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 [email protected] are

queue-3.18/mips-msp71xx-remove-odd-locking-in-pci-config-space-access-code.patch