Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5f475a9624 |
+17
-46
@@ -179,34 +179,6 @@ static int factory_section_read_file(char *path, void *buffer)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* factory_section_write_file - Write data of specified length to file
|
|
||||||
* @path: path of the file
|
|
||||||
* @buffer: storage of write data
|
|
||||||
* @size: length of data to write
|
|
||||||
*
|
|
||||||
* Return: length on success, negative error code otherwise.
|
|
||||||
*/
|
|
||||||
static int factory_section_write_file(char *path, void *buffer, int size)
|
|
||||||
{
|
|
||||||
int ret = 0;
|
|
||||||
struct file *fp;
|
|
||||||
|
|
||||||
bes_devel("writing %s \n", path);
|
|
||||||
|
|
||||||
fp = filp_open(path, O_TRUNC | O_CREAT | O_RDWR, S_IRUSR);
|
|
||||||
if (IS_ERR(fp)) {
|
|
||||||
bes_devel("BES2600 : can't open %s\n",path);
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = kernel_write(fp, buffer, size, &fp->f_pos);
|
|
||||||
|
|
||||||
filp_close(fp,NULL);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline int factory_parse(uint8_t *source_buf, struct factory_t *factory)
|
static inline int factory_parse(uint8_t *source_buf, struct factory_t *factory)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
@@ -898,9 +870,22 @@ static inline int factory_build(uint8_t *dest_buf, struct factory_t *factory)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Rebuild the serialised calibration blob in file_buffer from the live
|
||||||
|
* in-memory factory_save_p. Previously this function also persisted the
|
||||||
|
* blob back to FACTORY_PATH via filp_open(O_CREAT) + kernel_write(); that
|
||||||
|
* is not acceptable in mainline, so the persistence step has been removed.
|
||||||
|
*
|
||||||
|
* The in-memory factory_save_p remains authoritative for the duration of
|
||||||
|
* the session; on the next probe the firmware-class file is read back
|
||||||
|
* read-only via request_firmware(). If cross-reboot persistence of runtime
|
||||||
|
* calibration updates becomes a requirement, the expected route is a
|
||||||
|
* userspace-facing dump interface (debugfs read-only blob, or nl80211
|
||||||
|
* vendor command) that lets userspace read the serialised form and store
|
||||||
|
* it under its own privileges.
|
||||||
|
*/
|
||||||
static int bes2600_wifi_cali_table_save(u8 *file_buffer, struct factory_t *factory_save_p)
|
static int bes2600_wifi_cali_table_save(u8 *file_buffer, struct factory_t *factory_save_p)
|
||||||
{
|
{
|
||||||
int ret = 0;
|
|
||||||
int w_size;
|
int w_size;
|
||||||
u32 crc_len = sizeof(factory_data_t);
|
u32 crc_len = sizeof(factory_data_t);
|
||||||
#ifndef STANDARD_FACTORY_EFUSE_FLAG
|
#ifndef STANDARD_FACTORY_EFUSE_FLAG
|
||||||
@@ -909,13 +894,11 @@ static int bes2600_wifi_cali_table_save(u8 *file_buffer, struct factory_t *facto
|
|||||||
|
|
||||||
bes_devel("enter %s\n", __func__);
|
bes_devel("enter %s\n", __func__);
|
||||||
|
|
||||||
if (!file_buffer) {
|
if (!file_buffer)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
|
||||||
|
|
||||||
if (!factory_save_p) {
|
if (!factory_save_p)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
|
||||||
|
|
||||||
/* All initialized to space */
|
/* All initialized to space */
|
||||||
memset(file_buffer, 32, FACTORY_MAX_SIZE);
|
memset(file_buffer, 32, FACTORY_MAX_SIZE);
|
||||||
@@ -927,22 +910,10 @@ static int bes2600_wifi_cali_table_save(u8 *file_buffer, struct factory_t *facto
|
|||||||
w_size = factory_build(file_buffer, factory_save_p);
|
w_size = factory_build(file_buffer, factory_save_p);
|
||||||
|
|
||||||
if (w_size < 0 || w_size > FACTORY_MAX_SIZE) {
|
if (w_size < 0 || w_size > FACTORY_MAX_SIZE) {
|
||||||
bes_err("%s: build failed! ret = %d.", __func__, ret);
|
bes_err("%s: build failed! w_size = %d.", __func__, w_size);
|
||||||
return -ETXTBSY;
|
return -ETXTBSY;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef FACTORY_SAVE_MULTI_PATH
|
|
||||||
/* avoid trailing characters '\0' */
|
|
||||||
file_buffer[w_size] = 32;
|
|
||||||
ret = factory_section_write_file(FACTORY_PATH, file_buffer, FACTORY_MAX_SIZE);
|
|
||||||
#else
|
|
||||||
ret = factory_section_write_file(FACTORY_PATH, file_buffer, w_size);
|
|
||||||
#endif
|
|
||||||
if(ret < 0) {
|
|
||||||
bes_err("%s: write failed! ret = %d.", __func__, ret);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user