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

Commit 9e00caae authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/pci: provide ZPCI_ADDR macro 



Provide and use a ZPCI_ADDR macro as the complement of ZPCI_IDX
to get rid of some constants in the code.

Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Reviewed-by: default avatarGerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c2e1fcf3

arch/s390/include/asm/pci_io.h

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ struct zpci_iomap_entry { 


extern struct zpci_iomap_entry *zpci_iomap_start;



#define ZPCI_ADDR(idx) (ZPCI_IOMAP_ADDR_BASE | ((u64) idx << 48))

#define ZPCI_IDX(addr)								\

	(((__force u64) addr & ZPCI_IOMAP_ADDR_IDX_MASK) >> 48)

#define ZPCI_OFFSET(addr)							\

arch/s390/pci/pci.c

+3 −7
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ void __iomem *pci_iomap_range(struct pci_dev *pdev, 
			      unsigned long max)

{

	struct zpci_dev *zdev =	to_zpci(pdev);

	u64 addr;

	int idx;



	if ((bar & 7) != bar)
@@ -284,8 +283,7 @@ void __iomem *pci_iomap_range(struct pci_dev *pdev, 
	BUG_ON(!zpci_iomap_start[idx].count);

	spin_unlock(&zpci_iomap_lock);



	addr = ZPCI_IOMAP_ADDR_BASE | ((u64) idx << 48);

	return (void __iomem *) addr + offset;

	return (void __iomem *) ZPCI_ADDR(idx) + offset;

}

EXPORT_SYMBOL(pci_iomap_range);
@@ -297,9 +295,8 @@ EXPORT_SYMBOL(pci_iomap); 


void pci_iounmap(struct pci_dev *pdev, void __iomem *addr)

{

	unsigned int idx;

	unsigned int idx = ZPCI_IDX(addr);



	idx = (((__force u64) addr) & ~ZPCI_IOMAP_ADDR_BASE) >> 48;

	spin_lock(&zpci_iomap_lock);

	/* Detect underrun */

	BUG_ON(!zpci_iomap_start[idx].count);
@@ -611,8 +608,7 @@ static int zpci_setup_bus_resources(struct zpci_dev *zdev, 
		if (zdev->bars[i].val & 4)

			flags |= IORESOURCE_MEM_64;



		addr = ZPCI_IOMAP_ADDR_BASE + ((u64) entry << 48);



		addr = ZPCI_ADDR(entry);

		size = 1UL << zdev->bars[i].size;



		res = __alloc_res(zdev, addr, size, flags);