Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ehea: Remove uses of virt_to_abs() and abs_to_virt()

abs_to_virt() simply calls __va() and we'd like to get rid of it,
so replace all abs_to_virt() uses with __va().

Similarly virt_to_abs() just calls __pa().

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

authored by

Michael Ellerman and committed by
Benjamin Herrenschmidt
67e1dbcb 48817c58

+13 -14
-1
drivers/net/ethernet/ibm/ehea/ehea.h
··· 35 35 #include <linux/if_vlan.h> 36 36 37 37 #include <asm/ibmebus.h> 38 - #include <asm/abs_addr.h> 39 38 #include <asm/io.h> 40 39 41 40 #define DRV_NAME "ehea"
+6 -6
drivers/net/ethernet/ibm/ehea/ehea_phyp.c
··· 141 141 qp_category, /* R5 */ 142 142 qp_handle, /* R6 */ 143 143 sel_mask, /* R7 */ 144 - virt_to_abs(cb_addr), /* R8 */ 144 + __pa(cb_addr), /* R8 */ 145 145 0, 0); 146 146 } 147 147 ··· 415 415 (u64) cat, /* R5 */ 416 416 qp_handle, /* R6 */ 417 417 sel_mask, /* R7 */ 418 - virt_to_abs(cb_addr), /* R8 */ 418 + __pa(cb_addr), /* R8 */ 419 419 0, 0, 0, 0); /* R9-R12 */ 420 420 421 421 *inv_attr_id = outs[0]; ··· 528 528 { 529 529 u64 hret, cb_logaddr; 530 530 531 - cb_logaddr = virt_to_abs(cb_addr); 531 + cb_logaddr = __pa(cb_addr); 532 532 533 533 hret = ehea_plpar_hcall_norets(H_QUERY_HEA, 534 534 adapter_handle, /* R4 */ ··· 545 545 void *cb_addr) 546 546 { 547 547 u64 port_info; 548 - u64 cb_logaddr = virt_to_abs(cb_addr); 548 + u64 cb_logaddr = __pa(cb_addr); 549 549 u64 arr_index = 0; 550 550 551 551 port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat) ··· 567 567 unsigned long outs[PLPAR_HCALL9_BUFSIZE]; 568 568 u64 port_info; 569 569 u64 arr_index = 0; 570 - u64 cb_logaddr = virt_to_abs(cb_addr); 570 + u64 cb_logaddr = __pa(cb_addr); 571 571 572 572 port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat) 573 573 | EHEA_BMASK_SET(H_MEHEAPORT_PN, port_num); ··· 621 621 return ehea_plpar_hcall_norets(H_ERROR_DATA, 622 622 adapter_handle, /* R4 */ 623 623 ressource_handle, /* R5 */ 624 - virt_to_abs(rblock), /* R6 */ 624 + __pa(rblock), /* R6 */ 625 625 0, 0, 0, 0); /* R7-R12 */ 626 626 }
+7 -7
drivers/net/ethernet/ibm/ehea/ehea_qmr.c
··· 163 163 goto out_kill_hwq; 164 164 } 165 165 166 - rpage = virt_to_abs(vpage); 166 + rpage = __pa(vpage); 167 167 hret = ehea_h_register_rpage(adapter->handle, 168 168 0, EHEA_CQ_REGISTER_ORIG, 169 169 cq->fw_handle, rpage, 1); ··· 290 290 goto out_kill_hwq; 291 291 } 292 292 293 - rpage = virt_to_abs(vpage); 293 + rpage = __pa(vpage); 294 294 295 295 hret = ehea_h_register_rpage(adapter->handle, 0, 296 296 EHEA_EQ_REGISTER_ORIG, ··· 395 395 pr_err("hw_qpageit_get_inc failed\n"); 396 396 goto out_kill_hwq; 397 397 } 398 - rpage = virt_to_abs(vpage); 398 + rpage = __pa(vpage); 399 399 hret = ehea_h_register_rpage(adapter->handle, 400 400 0, h_call_q_selector, 401 401 qp->fw_handle, rpage, 1); ··· 790 790 if (!ehea_bmap) 791 791 return EHEA_INVAL_ADDR; 792 792 793 - index = virt_to_abs(caddr) >> SECTION_SIZE_BITS; 793 + index = __pa(caddr) >> SECTION_SIZE_BITS; 794 794 top = (index >> EHEA_TOP_INDEX_SHIFT) & EHEA_INDEX_MASK; 795 795 if (!ehea_bmap->top[top]) 796 796 return EHEA_INVAL_ADDR; ··· 812 812 unsigned long ret = idx; 813 813 ret |= dir << EHEA_DIR_INDEX_SHIFT; 814 814 ret |= top << EHEA_TOP_INDEX_SHIFT; 815 - return abs_to_virt(ret << SECTION_SIZE_BITS); 815 + return __va(ret << SECTION_SIZE_BITS); 816 816 } 817 817 818 818 static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt, ··· 822 822 void *pg; 823 823 u64 j, m, hret; 824 824 unsigned long k = 0; 825 - u64 pt_abs = virt_to_abs(pt); 825 + u64 pt_abs = __pa(pt); 826 826 827 827 void *sectbase = ehea_calc_sectbase(top, dir, idx); 828 828 ··· 830 830 831 831 for (m = 0; m < EHEA_MAX_RPAGE; m++) { 832 832 pg = sectbase + ((k++) * EHEA_PAGESIZE); 833 - pt[m] = virt_to_abs(pg); 833 + pt[m] = __pa(pg); 834 834 } 835 835 hret = ehea_h_register_rpage_mr(adapter->handle, mr->handle, 0, 836 836 0, pt_abs, EHEA_MAX_RPAGE);