Re: [PATCH v6 2/8] firmware: add offset to request_firmware_into_buf
Hi Scott,
I love your patch! Yet something to improve:
[auto build test ERROR on next-20200605]
[cannot apply to char-misc/char-misc-testing driver-core/driver-core-testing
kselftest/next integrity/next-integrity linus/master v5.7 v5.7-rc7 v5.7-rc6
v5.7]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]
url:
https://github.com/0day-ci/linux/commits/Scott-Branden/firmware-add-partial-read-support-in-request_firmware_into_buf/20200606-070430
base:af30725c132e2e5c5369b60369ff0771fde7d4ff
config: nios2-allyesconfig (attached as .config)
compiler: nios2-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget
https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O
~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross
ARCH=nios2
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot
All errors (new ones prefixed by >>, old ones prefixed by <<):
drivers/i2c/i2c-slave-eeprom.c: In function 'i2c_slave_init_eeprom_data':
>> drivers/i2c/i2c-slave-eeprom.c:131:9: error: too few arguments to function
>> 'request_firmware_into_buf'
131 | ret = request_firmware_into_buf(&fw, eeprom_data, &client->dev,
| ^
In file included from drivers/i2c/i2c-slave-eeprom.c:20:
include/linux/firmware.h:55:5: note: declared here
55 | int request_firmware_into_buf(const struct firmware **firmware_p,
| ^
vim +/request_firmware_into_buf +131 drivers/i2c/i2c-slave-eeprom.c
389be323cfac38 Wolfram Sang 2014-11-18 122
e804f0a78e9e43 Björn Ardö 2020-04-24 123 static int
i2c_slave_init_eeprom_data(struct eeprom_data *eeprom, struct i2c_client
*client,
e804f0a78e9e43 Björn Ardö 2020-04-24 124
unsigned int size)
e804f0a78e9e43 Björn Ardö 2020-04-24 125 {
e804f0a78e9e43 Björn Ardö 2020-04-24 126 const struct firmware *fw;
e804f0a78e9e43 Björn Ardö 2020-04-24 127 const char *eeprom_data;
e804f0a78e9e43 Björn Ardö 2020-04-24 128 int ret =
device_property_read_string(&client->dev, "firmware-name", &eeprom_data);
e804f0a78e9e43 Björn Ardö 2020-04-24 129
e804f0a78e9e43 Björn Ardö 2020-04-24 130 if (!ret) {
e804f0a78e9e43 Björn Ardö 2020-04-24 @131 ret =
request_firmware_into_buf(&fw, eeprom_data, &client->dev,
e804f0a78e9e43 Björn Ardö 2020-04-24 132
eeprom->buffer, size);
e804f0a78e9e43 Björn Ardö 2020-04-24 133 if (ret)
e804f0a78e9e43 Björn Ardö 2020-04-24 134 return ret;
e804f0a78e9e43 Björn Ardö 2020-04-24 135 release_firmware(fw);
e804f0a78e9e43 Björn Ardö 2020-04-24 136 } else {
e804f0a78e9e43 Björn Ardö 2020-04-24 137 /* An empty eeprom
typically has all bits set to 1 */
e804f0a78e9e43 Björn Ardö 2020-04-24 138 memset(eeprom->buffer,
0xff, size);
e804f0a78e9e43 Björn Ardö 2020-04-24 139 }
e804f0a78e9e43 Björn Ardö 2020-04-24 140 return 0;
e804f0a78e9e43 Björn Ardö 2020-04-24 141 }
e804f0a78e9e43 Björn Ardö 2020-04-24 142
:: The code at line 131 was first introduced by commit
:: e804f0a78e9e43f0105e1bc3e264894b3898e970 i2c: slave-eeprom: Make it
possible to pre-load eeprom data
:: TO: Björn Ardö
:: CC: Wolfram Sang
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-...@lists.01.org
.config.gz
Description: application/gzip
[PATCH v6 2/8] firmware: add offset to request_firmware_into_buf
Add offset to request_firmware_into_buf to allow for portions
of firmware file to be read into a buffer. Necessary where firmware
needs to be loaded in portions from file in memory constrained systems.
Signed-off-by: Scott Branden
---
drivers/base/firmware_loader/firmware.h | 5 +++
drivers/base/firmware_loader/main.c | 53 +
drivers/soc/qcom/mdt_loader.c | 7 +++-
include/linux/firmware.h| 8 +++-
lib/test_firmware.c | 4 +-
5 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/drivers/base/firmware_loader/firmware.h
b/drivers/base/firmware_loader/firmware.h
index 933e2192fbe8..c9b6ba8d29d8 100644
--- a/drivers/base/firmware_loader/firmware.h
+++ b/drivers/base/firmware_loader/firmware.h
@@ -32,6 +32,8 @@
* @FW_OPT_FALLBACK_PLATFORM: Enable fallback to device fw copy embedded in
* the platform's main firmware. If both this fallback and the sysfs
* fallback are enabled, then this fallback will be tried first.
+ * @FW_OPT_PARTIAL: Allow partial read of firmware instead of needing to read
+ * entire file.
*/
enum fw_opt {
FW_OPT_UEVENT = BIT(0),
@@ -41,6 +43,7 @@ enum fw_opt {
FW_OPT_NOCACHE = BIT(4),
FW_OPT_NOFALLBACK_SYSFS = BIT(5),
FW_OPT_FALLBACK_PLATFORM= BIT(6),
+ FW_OPT_PARTIAL = BIT(7),
};
enum fw_status {
@@ -68,6 +71,8 @@ struct fw_priv {
void *data;
size_t size;
size_t allocated_size;
+ size_t offset;
+ enum kernel_pread_opt opt;
#ifdef CONFIG_FW_LOADER_PAGED_BUF
bool is_paged_buf;
struct page **pages;
diff --git a/drivers/base/firmware_loader/main.c
b/drivers/base/firmware_loader/main.c
index ca871b13524e..93e7fee42cd4 100644
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -167,7 +167,9 @@ static int fw_cache_piggyback_on_request(const char *name);
static struct fw_priv *__allocate_fw_priv(const char *fw_name,
struct firmware_cache *fwc,
- void *dbuf, size_t size)
+ void *dbuf, size_t size,
+ size_t offset,
+ enum kernel_pread_opt opt)
{
struct fw_priv *fw_priv;
@@ -185,6 +187,8 @@ static struct fw_priv *__allocate_fw_priv(const char
*fw_name,
fw_priv->fwc = fwc;
fw_priv->data = dbuf;
fw_priv->allocated_size = size;
+ fw_priv->offset = offset;
+ fw_priv->opt = opt;
fw_state_init(fw_priv);
#ifdef CONFIG_FW_LOADER_USER_HELPER
INIT_LIST_HEAD(&fw_priv->pending_list);
@@ -210,9 +214,11 @@ static struct fw_priv *__lookup_fw_priv(const char
*fw_name)
static int alloc_lookup_fw_priv(const char *fw_name,
struct firmware_cache *fwc,
struct fw_priv **fw_priv, void *dbuf,
- size_t size, u32 opt_flags)
+ size_t size, u32 opt_flags,
+ size_t offset)
{
struct fw_priv *tmp;
+ enum kernel_pread_opt pread_opt;
spin_lock(&fwc->lock);
if (!(opt_flags & FW_OPT_NOCACHE)) {
@@ -226,7 +232,12 @@ static int alloc_lookup_fw_priv(const char *fw_name,
}
}
- tmp = __allocate_fw_priv(fw_name, fwc, dbuf, size);
+ if (opt_flags & FW_OPT_PARTIAL)
+ pread_opt = KERNEL_PREAD_PART;
+ else
+ pread_opt = KERNEL_PREAD_WHOLE;
+
+ tmp = __allocate_fw_priv(fw_name, fwc, dbuf, size, offset, pread_opt);
if (tmp) {
INIT_LIST_HEAD(&tmp->list);
if (!(opt_flags & FW_OPT_NOCACHE))
@@ -495,8 +506,10 @@ fw_get_filesystem_firmware(struct device *device, struct
fw_priv *fw_priv,
fw_priv->size = 0;
/* load firmware files from the mount namespace of init */
- rc = kernel_read_file_from_path_initns(path, &buffer,
- &size, msize, id);
+ rc = kernel_pread_file_from_path_initns(path, &buffer,
+ &size, fw_priv->offset,
+ msize,
+ fw_priv->opt, id);
if (rc) {
if (rc != -ENOENT)
dev_warn(device, "loading %s failed with error
%d\n",
@@ -683,7 +696,7 @@ int assign_fw(struct firmware *fw, struct device *device,
u32 opt_flags)
static int
_request_firmware_prepare(struct firmware **firmware_p, const char *name,
struct device *device, void *dbuf, size_t size,
- u32 opt_flags)
+
