ehea: 64K page support fix
Subsystems (2)
PATCH 2/2 ehea: 64K page support fix
This patch fixes the 64K page support
Signed-off-by Jan-Bernd Themann <[email protected]>
--- drivers/net/ehea/ehea.h | 2 +- drivers/net/ehea/ehea_phyp.h | 14 +++++++++++++- drivers/net/ehea/ehea_qmr.c | 13 +++++++------ 3 files changed, 21 insertions(+), 8 deletions(-)
drivers/net/ehea/ehea.h +1 -1
@@ -39,7 +39,7 @@ #include <asm/abs_addr.h>#include <asm/io.h> #define DRV_NAME "ehea" -#define DRV_VERSION "EHEA_0034" +#define DRV_VERSION "EHEA_0040"#define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR)
drivers/net/ehea/ehea_phyp.h +13 -1
@@ -81,15 +81,27 @@ #define NELR_PORTSTATE_CHG EHEA_BMASK_IBstatic inline void hcp_epas_ctor (struct h_epas *epas,u64 paddr_kernel,u64 paddr_user) { +#ifdef CONFIG_PPC_64K_PAGES +/* To support 64k pages we must round to 64k page boundary */ + epas->kernel.addr = +ioremap ((paddr_kernel &0xFFFFFFFFFFFF0000 ),PAGE_SIZE ) + + (paddr_kernel &0xFFFF ); +#else epas->kernel.addr =ioremap (paddr_kernel,PAGE_SIZE ); +#endif epas->user.addr = paddr_user; }static inline void hcp_epas_dtor (struct h_epas *epas) { +#ifdef CONFIG_PPC_64K_PAGES +if (epas->kernel.addr) +iounmap ((void __iomem *)((u64 )epas->kernel.addr & +0xFFFFFFFFFFFF0000 )); +#else if (epas->kernel.addr)iounmap (epas->kernel.addr); - +#endif epas->user.addr =0 ; epas->kernel.addr =0 ; }
drivers/net/ehea/ehea_qmr.c +7 -6
@@ -512,7 +512,7 @@ int ehea_reg_mr_adapter(struct ehea_adap start =KERNELBASE ; end = (u64 )high_memory; - nr_pages = (end - start) /PAGE_SIZE ; + nr_pages = (end - start) /EHEA_PAGESIZE ; pt =kzalloc (PAGE_SIZE ,GFP_KERNEL );if (!pt) {
@@ -538,9 +538,9 @@ int ehea_reg_mr_adapter(struct ehea_adapif (nr_pages >1 ) {u64 num_pages =min (nr_pages, (u64 )512 );for (i =0 ; i < num_pages; i++) - pt[i] =virt_to_abs ((void *)(((u64 )start) - + ((k++) * -PAGE_SIZE ))); + pt[i] =virt_to_abs ((void *)(((u64 )start) + + ((k++) * +EHEA_PAGESIZE ))); hret = ehea_h_register_rpage_mr(adapter->handle, adapter->mr.handle, 0,
@@ -548,8 +548,9 @@ int ehea_reg_mr_adapter(struct ehea_adap num_pages); nr_pages -= num_pages; }else { -u64 abs_adr =virt_to_abs ((void *)(((u64 )start) - + (k *PAGE_SIZE ))); +u64 abs_adr =virt_to_abs ((void *)(((u64 )start) + + (k *EHEA_PAGESIZE ))); + hret =ehea_h_register_rpage_mr (adapter->handle, adapter->mr.handle,0 ,0 , abs_adr,1 );
Hi,
drivers/net/ehea/ehea_phyp.h #define NELR_PORTSTATE_CHG EHEA_BMASK_IB · line 91
Quoted 8 lines
drivers/net/ehea/ehea_phyp.h +7
-0+#ifdef CONFIG_PPC_64K_PAGES +/* To support 64k pages we must round to 64k page boundary */ + epas->kernel.addr = +ioremap ((paddr_kernel &0xFFFFFFFFFFFF0000 ),PAGE_SIZE ) + + (paddr_kernel &0xFFFF ); +#else epas->kernel.addr =ioremap (paddr_kernel,PAGE_SIZE ); +#endif
Cant you just use PAGE_MASK, ~PAGE_MASK and remove the ifdefs completely?
Anton
Hi,
that is right, I'll send a new patch
Thanks,
Jan-Bernd
Quoted 17 lines · Anton Blanchard
Hi,
drivers/net/ehea/ehea_phyp.h #define NELR_PORTSTATE_CHG EHEA_BMASK_IB · line 91
Quoted 8 lines
drivers/net/ehea/ehea_phyp.h +7
-0+#ifdef CONFIG_PPC_64K_PAGES +/* To support 64k pages we must round to 64k page boundary */ + epas->kernel.addr = +ioremap ((paddr_kernel &0xFFFFFFFFFFFF0000 ),PAGE_SIZE ) + + (paddr_kernel &0xFFFF ); +#else epas->kernel.addr =ioremap (paddr_kernel,PAGE_SIZE ); +#endif Cant you just use
PAGE_MASK, ~PAGE_MASK and remove the ifdefs completely?Anton