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

Commit 01263e88 authored by Geoff Levand's avatar Geoff Levand Committed by Paul Mackerras
Browse files

[POWERPC] PS3: Remove unused os-area params 



Updates for PS3 os-area startup params
o Remove some unused PS3 os-area startup params from struct saved_params.
o Rename ps3_os_area_init() to ps3_os_area_save_params().
o Zero mirrored header after saving params.

Signed-off-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent ca94297f

arch/powerpc/platforms/ps3/os-area.c

+19 −25
Original line number Diff line number Diff line
@@ -114,27 +114,12 @@ struct os_area_params { 
#define SECONDS_FROM_1970_TO_2000 946684800LL



/**

 * struct saved_params - Static working copies of data from the 'Other OS' area.

 *

 * For the convinience of the guest, the HV makes a copy of the 'Other OS' area

 * in flash to a high address in the boot memory region and then puts that RAM

 * address and the byte count into the repository for retreval by the guest.

 * We copy the data we want into a static variable and allow the memory setup

 * by the HV to be claimed by the lmb manager.

 * struct saved_params - Static working copies of data from the PS3 'os area'.

 */



struct saved_params {

	/* param 0 */

	s64 rtc_diff;

	unsigned int av_multi_out;

	unsigned int ctrl_button;

	/* param 1 */

	u8 static_ip_addr[4];

	u8 network_mask[4];

	u8 default_gateway[4];

	/* param 2 */

	u8 dns_primary[4];

	u8 dns_secondary[4];

} static saved_params;



#define dump_header(_a) _dump_header(_a, __func__, __LINE__)
@@ -201,7 +186,17 @@ static int __init verify_header(const struct os_area_header *header) 
	return 0;

}



int __init ps3_os_area_init(void)

/**

 * ps3_os_area_save_params - Copy data from os area mirror to @saved_params.

 *

 * For the convenience of the guest, the HV makes a copy of the os area in

 * flash to a high address in the boot memory region and then puts that RAM

 * address and the byte count into the repository for retreval by the guest.

 * We copy the data we want into a static variable and allow the memory setup

 * by the HV to be claimed by the lmb manager.

 */



void __init ps3_os_area_save_params(void)

{

	int result;

	u64 lpar_addr;
@@ -209,12 +204,14 @@ int __init ps3_os_area_init(void) 
	struct os_area_header *header;

	struct os_area_params *params;



	pr_debug(" -> %s:%d\n", __func__, __LINE__);



	result = ps3_repository_read_boot_dat_info(&lpar_addr, &size);



	if (result) {

		pr_debug("%s:%d ps3_repository_read_boot_dat_info failed\n",

			__func__, __LINE__);

		return result;

		return;

	}



	header = (struct os_area_header *)__va(lpar_addr);
@@ -226,7 +223,7 @@ int __init ps3_os_area_init(void) 
	if (result) {

		pr_debug("%s:%d verify_header failed\n", __func__, __LINE__);

		dump_header(header);

		return -EIO;

		return;

	}



	dump_header(header);
@@ -234,13 +231,10 @@ int __init ps3_os_area_init(void) 


	saved_params.rtc_diff = params->rtc_diff;

	saved_params.av_multi_out = params->av_multi_out;

	saved_params.ctrl_button = params->ctrl_button;

	memcpy(saved_params.static_ip_addr, params->static_ip_addr, 4);

	memcpy(saved_params.network_mask, params->network_mask, 4);

	memcpy(saved_params.default_gateway, params->default_gateway, 4);

	memcpy(saved_params.dns_secondary, params->dns_secondary, 4);



	return result;

	memset(header, 0, sizeof(*header));



	pr_debug(" <- %s:%d\n", __func__, __LINE__);

}



/**

arch/powerpc/platforms/ps3/platform.h

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ int ps3_set_rtc_time(struct rtc_time *time); 


/* os area */



int __init ps3_os_area_init(void);

void __init ps3_os_area_save_params(void);

u64 ps3_os_area_rtc_diff(void);



/* spu */

arch/powerpc/platforms/ps3/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ static int __init ps3_probe(void) 


	powerpc_firmware_features |= FW_FEATURE_PS3_POSSIBLE;



	ps3_os_area_init();

	ps3_os_area_save_params();

	ps3_mm_init();

	ps3_mm_vas_create(&htab_size);

	ps3_hpte_init(htab_size);