Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit def9d83d authored by Gavin Shan's avatar Gavin Shan Committed by Benjamin Herrenschmidt
Browse files

powerpc/eeh: Cleanup function names in EEH aux components 



The patch does some cleanup on the function names of EEH
aux components. Currently, only couple of function names from
eeh_cache have been adjusted so that:

        * The function name has prefix "eeh_addr_cache".
        * Move around pci_addr_cache_build() in the header file
          to reflect function call sequence.

Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 29f8bf1b

arch/powerpc/include/asm/ppc-pci.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -49,10 +49,10 @@ extern unsigned long pci_probe_only; 




#ifdef CONFIG_EEH

#ifdef CONFIG_EEH





void pci_addr_cache_build(void);

void pci_addr_cache_insert_device(struct pci_dev *dev);

void pci_addr_cache_insert_device(struct pci_dev *dev);

void pci_addr_cache_remove_device(struct pci_dev *dev);

void pci_addr_cache_remove_device(struct pci_dev *dev);

void pci_addr_cache_build(void);

struct pci_dev *pci_addr_cache_get_device(unsigned long addr);

struct pci_dev *pci_get_device_by_addr(unsigned long addr);

void eeh_slot_error_detail (struct pci_dn *pdn, int severity);

void eeh_slot_error_detail (struct pci_dn *pdn, int severity);

int eeh_pci_enable(struct pci_dn *pdn, int function);

int eeh_pci_enable(struct pci_dn *pdn, int function);

int eeh_reset_pe(struct pci_dn *);

int eeh_reset_pe(struct pci_dn *);

arch/powerpc/platforms/pseries/eeh.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -511,7 +511,7 @@ unsigned long eeh_check_failure(const volatile void __iomem *token, unsigned lon 




	/* Finding the phys addr + pci device; this is pretty quick. */

	/* Finding the phys addr + pci device; this is pretty quick. */

	addr = eeh_token_to_phys((unsigned long __force) token);

	addr = eeh_token_to_phys((unsigned long __force) token);

	dev = pci_get_device_by_addr(addr);

	dev = pci_addr_cache_get_device(addr);

	if (!dev) {

	if (!dev) {

		no_device++;

		no_device++;

		return val;

		return val;

arch/powerpc/platforms/pseries/eeh_cache.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ static struct pci_io_addr_cache { 
	spinlock_t piar_lock;

	spinlock_t piar_lock;

} pci_io_addr_cache_root;

} pci_io_addr_cache_root;





static inline struct pci_dev *__pci_get_device_by_addr(unsigned long addr)

static inline struct pci_dev *__pci_addr_cache_get_device(unsigned long addr)

{

{

	struct rb_node *n = pci_io_addr_cache_root.rb_root.rb_node;

	struct rb_node *n = pci_io_addr_cache_root.rb_root.rb_node;
@@ -83,7 +83,7 @@ static inline struct pci_dev *__pci_get_device_by_addr(unsigned long addr) 
}

}





/**

/**

 * pci_get_device_by_addr - Get device, given only address

 * pci_addr_cache_get_device - Get device, given only address

 * @addr: mmio (PIO) phys address or i/o port number

 * @addr: mmio (PIO) phys address or i/o port number

 *

 *

 * Given an mmio phys address, or a port number, find a pci device

 * Given an mmio phys address, or a port number, find a pci device
@@ -92,13 +92,13 @@ static inline struct pci_dev *__pci_get_device_by_addr(unsigned long addr) 
 * from zero (that is, they do *not* have pci_io_addr added in).

 * from zero (that is, they do *not* have pci_io_addr added in).

 * It is safe to call this function within an interrupt.

 * It is safe to call this function within an interrupt.

 */

 */

struct pci_dev *pci_get_device_by_addr(unsigned long addr)

struct pci_dev *pci_addr_cache_get_device(unsigned long addr)

{

{

	struct pci_dev *dev;

	struct pci_dev *dev;

	unsigned long flags;

	unsigned long flags;





	spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);

	spin_lock_irqsave(&pci_io_addr_cache_root.piar_lock, flags);

	dev = __pci_get_device_by_addr(addr);

	dev = __pci_addr_cache_get_device(addr);

	spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);

	spin_unlock_irqrestore(&pci_io_addr_cache_root.piar_lock, flags);

	return dev;

	return dev;

}

}