xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/pci: rename instruction wrappers

Browse Source 
Use distinct (and hopefully sane) names for the pci instruction
wrappers.

Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott
2013-04-16 14:15:42 +02:00
committed by Martin Schwidefsky
parent cbcca5d070
commit b2a9e87d2c
5 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/s390/pci/pci.c
View File

@@ -176,7 +176,7 @@ static int zpci_register_airq(struct zpci_dev *zdev, unsigned int aisb,
fib->aisb = (u64) bucket->aisb + aisb / 8;
fib->aisbo = aisb & ZPCI_MSI_MASK;
rc = mpcifc_instr(req, fib);
rc = s390pci_mod_fc(req, fib);
pr_debug("%s mpcifc returned noi: %d\n", __func__, fib->noi);
free_page((unsigned long) fib);
@@ -206,7 +206,7 @@ static int mod_pci(struct zpci_dev *zdev, int fn, u8 dmaas, struct mod_pci_args
fib->iota = args->iota;
fib->fmb_addr = args->fmb_addr;
rc = mpcifc_instr(req, fib);
rc = s390pci_mod_fc(req, fib);
free_page((unsigned long) fib);
return rc;
}
@@ -280,7 +280,7 @@ static int zpci_cfg_load(struct zpci_dev *zdev, int offset, u32 *val, u8 len)
u64 data;
int rc;
rc = pcilg_instr(&data, req, offset);
rc = s390pci_load(&data, req, offset);
data = data << ((8 - len) * 8);
data = le64_to_cpu(data);
if (!rc)
@@ -298,7 +298,7 @@ static int zpci_cfg_store(struct zpci_dev *zdev, int offset, u32 val, u8 len)
data = cpu_to_le64(data);
data = data >> ((8 - len) * 8);
rc = pcistg_instr(data, req, offset);
rc = s390pci_store(data, req, offset);
return rc;
}
@@ -470,7 +470,7 @@ scan:
}
/* enable interrupts again */
sic_instr(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
/* check again to not lose initiative */
rmb();
@@ -785,7 +785,7 @@ static int __init zpci_irq_init(void)
spin_lock_init(&bucket->lock);
/* set summary to 1 to be called every time for the ISC */
*zpci_irq_si = 1;
sic_instr(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
return 0;
out_ai:

5
arch/s390/pci/pci_dma.c
View File

@@ -169,8 +169,9 @@ static int dma_update_trans(struct zpci_dev *zdev, unsigned long pa,
* needs to be redone!
*/
goto no_refresh;
rc = rpcit_instr((u64) zdev->fh << 32, start_dma_addr,
nr_pages * PAGE_SIZE);
rc = s390pci_refresh_trans((u64) zdev->fh << 32, start_dma_addr,
nr_pages * PAGE_SIZE);
no_refresh:
spin_unlock_irqrestore(&zdev->dma_table_lock, irq_flags);

18
arch/s390/pci/pci_insn.c
View File

@@ -26,7 +26,7 @@ static inline u8 __mpcifc(u64 req, struct zpci_fib *fib, u8 *status)
return cc;
}
int mpcifc_instr(u64 req, struct zpci_fib *fib)
int s390pci_mod_fc(u64 req, struct zpci_fib *fib)
{
u8 cc, status;
@@ -60,7 +60,7 @@ static inline u8 __rpcit(u64 fn, u64 addr, u64 range, u8 *status)
return cc;
}
int rpcit_instr(u64 fn, u64 addr, u64 range)
int s390pci_refresh_trans(u64 fn, u64 addr, u64 range)
{
u8 cc, status;
@@ -77,7 +77,7 @@ int rpcit_instr(u64 fn, u64 addr, u64 range)
}
/* Set Interruption Controls */
void sic_instr(u16 ctl, char *unused, u8 isc)
void set_irq_ctrl(u16 ctl, char *unused, u8 isc)
{
asm volatile (
" .insn rsy,0xeb00000000d1,%[ctl],%[isc],%[u]\n"
@@ -104,7 +104,7 @@ static inline u8 __pcilg(u64 *data, u64 req, u64 offset, u8 *status)
return cc;
}
int pcilg_instr(u64 *data, u64 req, u64 offset)
int s390pci_load(u64 *data, u64 req, u64 offset)
{
u8 cc, status;
@@ -123,7 +123,7 @@ int pcilg_instr(u64 *data, u64 req, u64 offset)
}
return (cc) ? -EIO : 0;
}
EXPORT_SYMBOL_GPL(pcilg_instr);
EXPORT_SYMBOL_GPL(s390pci_load);
/* PCI Store */
static inline u8 __pcistg(u64 data, u64 req, u64 offset, u8 *status)
@@ -143,7 +143,7 @@ static inline u8 __pcistg(u64 data, u64 req, u64 offset, u8 *status)
return cc;
}
int pcistg_instr(u64 data, u64 req, u64 offset)
int s390pci_store(u64 data, u64 req, u64 offset)
{
u8 cc, status;
@@ -158,7 +158,7 @@ int pcistg_instr(u64 data, u64 req, u64 offset)
__func__, cc, status, req, offset);
return (cc) ? -EIO : 0;
}
EXPORT_SYMBOL_GPL(pcistg_instr);
EXPORT_SYMBOL_GPL(s390pci_store);
/* PCI Store Block */
static inline u8 __pcistb(const u64 *data, u64 req, u64 offset, u8 *status)
@@ -176,7 +176,7 @@ static inline u8 __pcistb(const u64 *data, u64 req, u64 offset, u8 *status)
return cc;
}
int pcistb_instr(const u64 *data, u64 req, u64 offset)
int s390pci_store_block(const u64 *data, u64 req, u64 offset)
{
u8 cc, status;
@@ -191,4 +191,4 @@ int pcistb_instr(const u64 *data, u64 req, u64 offset)
__func__, cc, status, req, offset);
return (cc) ? -EIO : 0;
}
EXPORT_SYMBOL_GPL(pcistb_instr);
EXPORT_SYMBOL_GPL(s390pci_store_block);