hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

powerpc: Make CMO paging space pool ID and page size available 

During platform setup, save off the primary/secondary paging space
pool IDs and the page size.  Added accessors in hvcall.h for these
variables.  This is needed for a subsequent fix.

Submitted-by: Robert Jennings <rcj@linux.vnet.ibm.com>

Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Robert Jennings 2008-08-16 05:07:31 +10:00 committed by Paul Mackerras
parent 22b8f9ee4a
commit 81f14997e8
2 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/powerpc/include/asm/hvcall.h
View File

@ -291,6 +291,28 @@ struct hvcall_mpp_data {
}; };
int h_get_mpp(struct hvcall_mpp_data *); int h_get_mpp(struct hvcall_mpp_data *);
#ifdef CONFIG_PPC_PSERIES
extern int CMO_PrPSP;
extern int CMO_SecPSP;
extern unsigned long CMO_PageSize;
static inline int cmo_get_primary_psp(void)
{
return CMO_PrPSP;
}
static inline int cmo_get_secondary_psp(void)
{
return CMO_SecPSP;
}
static inline unsigned long cmo_get_page_size(void)
{
return CMO_PageSize;
}
#endif /* CONFIG_PPC_PSERIES */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_HVCALL_H */ #endif /* _ASM_POWERPC_HVCALL_H */

28
arch/powerpc/platforms/pseries/setup.c
View File

@ -68,6 +68,9 @@
#include "plpar_wrappers.h" #include "plpar_wrappers.h"
#include "pseries.h" #include "pseries.h"
int CMO_PrPSP = -1;
int CMO_SecPSP = -1;
unsigned long CMO_PageSize = (ASM_CONST(1) << IOMMU_PAGE_SHIFT);
int fwnmi_active; /* TRUE if an FWNMI handler is present */ int fwnmi_active; /* TRUE if an FWNMI handler is present */
@ -325,8 +328,7 @@ void pSeries_cmo_feature_init(void)
{ {
char *ptr, *key, *value, *end; char *ptr, *key, *value, *end;
int call_status; int call_status;
int PrPSP = -1; int page_order = IOMMU_PAGE_SHIFT;
int SecPSP = -1;
pr_debug(" -> fw_cmo_feature_init()\n"); pr_debug(" -> fw_cmo_feature_init()\n");
spin_lock(&rtas_data_buf_lock); spin_lock(&rtas_data_buf_lock);
@ -365,21 +367,31 @@ void pSeries_cmo_feature_init(void)
break; break;
} }
if (0 == strcmp(key, "PrPSP")) if (0 == strcmp(key, "CMOPageSize"))
PrPSP = simple_strtol(value, NULL, 10); page_order = simple_strtol(value, NULL, 10);
else if (0 == strcmp(key, "PrPSP"))
CMO_PrPSP = simple_strtol(value, NULL, 10);
else if (0 == strcmp(key, "SecPSP")) else if (0 == strcmp(key, "SecPSP"))
SecPSP = simple_strtol(value, NULL, 10); CMO_SecPSP = simple_strtol(value, NULL, 10);
value = key = ptr + 1; value = key = ptr + 1;
} }
ptr++; ptr++;
} }
if (PrPSP != -1 || SecPSP != -1) { /* Page size is returned as the power of 2 of the page size,
* convert to the page size in bytes before returning
*/
CMO_PageSize = 1 << page_order;
pr_debug("CMO_PageSize = %lu\n", CMO_PageSize);
if (CMO_PrPSP != -1 || CMO_SecPSP != -1) {
pr_info("CMO enabled\n"); pr_info("CMO enabled\n");
pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", PrPSP, SecPSP); pr_debug("CMO enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,
CMO_SecPSP);
powerpc_firmware_features |= FW_FEATURE_CMO; powerpc_firmware_features |= FW_FEATURE_CMO;
} else } else
pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", PrPSP, SecPSP); pr_debug("CMO not enabled, PrPSP=%d, SecPSP=%d\n", CMO_PrPSP,
CMO_SecPSP);
spin_unlock(&rtas_data_buf_lock); spin_unlock(&rtas_data_buf_lock);
pr_debug(" <- fw_cmo_feature_init()\n"); pr_debug(" <- fw_cmo_feature_init()\n");
} }