[media] drxk: change it to use request_firmware_nowait()

The firmware blob may not be available when the driver probes.

Instead of blocking the whole kernel use request_firmware_nowait() and
continue without firmware.

This shouldn't be that bad on drx-k devices, as they all seem to have an
internal firmware. So, only the firmware update will take a little longer
to happen.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index 60b868faeacfaf372f617ae31885727f701faa32..4cb8d1e83fb0ab82f6147bfef7b52a698092e140 100644 (file)
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -5968,29 +5968,9 @@ error:
        return status;
 }
 
-static int load_microcode(struct drxk_state *state, const char *mc_name)
-{
-       const struct firmware *fw = NULL;
-       int err = 0;
-
-       dprintk(1, "\n");
-
-       err = request_firmware(&fw, mc_name, state->i2c->dev.parent);
-       if (err < 0) {
-               printk(KERN_ERR
-                      "drxk: Could not load firmware file %s.\n", mc_name);
-               printk(KERN_INFO
-                      "drxk: Copy %s to your hotplug directory!\n", mc_name);
-               return err;
-       }
-       err = DownloadMicrocode(state, fw->data, fw->size);
-       release_firmware(fw);
-       return err;
-}
-
 static int init_drxk(struct drxk_state *state)
 {
-       int status = 0;
+       int status = 0, n = 0;
        enum DRXPowerMode powerMode = DRXK_POWER_DOWN_OFDM;
        u16 driverVersion;
 
@@ -6073,8 +6053,12 @@ static int init_drxk(struct drxk_state *state)
                if (status < 0)
                        goto error;
 
-               if (state->microcode_name)
-                       load_microcode(state, state->microcode_name);
+               if (state->fw) {
+                       status = DownloadMicrocode(state, state->fw->data,
+                                                  state->fw->size);
+                       if (status < 0)
+                               goto error;
+               }
 
                /* disable token-ring bus through OFDM block for possible ucode upload */
                status = write16(state, SIO_OFDM_SH_OFDM_RING_ENABLE__A, SIO_OFDM_SH_OFDM_RING_ENABLE_OFF);
@@ -6167,6 +6151,20 @@ static int init_drxk(struct drxk_state *state)
                        state->m_DrxkState = DRXK_POWERED_DOWN;
                } else
                        state->m_DrxkState = DRXK_STOPPED;
+
+               /* Initialize the supported delivery systems */
+               n = 0;
+               if (state->m_hasDVBC) {
+                       state->frontend.ops.delsys[n++] = SYS_DVBC_ANNEX_A;
+                       state->frontend.ops.delsys[n++] = SYS_DVBC_ANNEX_C;
+                       strlcat(state->frontend.ops.info.name, " DVB-C",
+                               sizeof(state->frontend.ops.info.name));
+               }
+               if (state->m_hasDVBT) {
+                       state->frontend.ops.delsys[n++] = SYS_DVBT;
+                       strlcat(state->frontend.ops.info.name, " DVB-T",
+                               sizeof(state->frontend.ops.info.name));
+               }
        }
 error:
        if (status < 0)
@@ -6175,11 +6173,44 @@ error:
        return status;
 }
 
+static void load_firmware_cb(const struct firmware *fw,
+                            void *context)
+{
+       struct drxk_state *state = context;
+
+       if (!fw) {
+               printk(KERN_ERR
+                      "drxk: Could not load firmware file %s.\n",
+                       state->microcode_name);
+               printk(KERN_INFO
+                      "drxk: Copy %s to your hotplug directory!\n",
+                       state->microcode_name);
+               state->microcode_name = NULL;
+
+               /*
+                * As firmware is now load asynchronous, it is not possible
+                * anymore to fail at frontend attach. We might silently
+                * return here, and hope that the driver won't crash.
+                * We might also change all DVB callbacks to return -ENODEV
+                * if the device is not initialized.
+                * As the DRX-K devices have their own internal firmware,
+                * let's just hope that it will match a firmware revision
+                * compatible with this driver and proceed.
+                */
+       }
+       state->fw = fw;
+
+       init_drxk(state);
+}
+
 static void drxk_release(struct dvb_frontend *fe)
 {
        struct drxk_state *state = fe->demodulator_priv;
 
        dprintk(1, "\n");
+       if (state->fw)
+               release_firmware(state->fw);
+
        kfree(state);
 }
 
@@ -6371,10 +6402,9 @@ static struct dvb_frontend_ops drxk_ops = {
 struct dvb_frontend *drxk_attach(const struct drxk_config *config,
                                 struct i2c_adapter *i2c)
 {
-       int n;
-
        struct drxk_state *state = NULL;
        u8 adr = config->adr;
+       int status;
 
        dprintk(1, "\n");
        state = kzalloc(sizeof(struct drxk_state), GFP_KERNEL);
@@ -6425,22 +6455,21 @@ struct dvb_frontend *drxk_attach(const struct drxk_config *config,
        state->frontend.demodulator_priv = state;
 
        init_state(state);
-       if (init_drxk(state) < 0)
-               goto error;
 
-       /* Initialize the supported delivery systems */
-       n = 0;
-       if (state->m_hasDVBC) {
-               state->frontend.ops.delsys[n++] = SYS_DVBC_ANNEX_A;
-               state->frontend.ops.delsys[n++] = SYS_DVBC_ANNEX_C;
-               strlcat(state->frontend.ops.info.name, " DVB-C",
-                       sizeof(state->frontend.ops.info.name));
-       }
-       if (state->m_hasDVBT) {
-               state->frontend.ops.delsys[n++] = SYS_DVBT;
-               strlcat(state->frontend.ops.info.name, " DVB-T",
-                       sizeof(state->frontend.ops.info.name));
-       }
+       /* Load firmware and initialize DRX-K */
+       if (state->microcode_name) {
+               status = request_firmware_nowait(THIS_MODULE, 1,
+                                             state->microcode_name,
+                                             state->i2c->dev.parent,
+                                             GFP_KERNEL,
+                                             state, load_firmware_cb);
+               if (status < 0) {
+                       printk(KERN_ERR
+                       "drxk: failed to request a firmware\n");
+                       return NULL;
+               }
+       } else if (init_drxk(state) < 0)
+               goto error;
 
        printk(KERN_INFO "drxk: frontend initialized.\n");
        return &state->frontend;

diff --git a/drivers/media/dvb/frontends/drxk_hard.h b/drivers/media/dvb/frontends/drxk_hard.h
index 4bbf841de83a77b90d70e092922ff8d88aa36682..36677cdc01d8718bb7cebcc9e0ba795f08ed0c30 100644 (file)
--- a/drivers/media/dvb/frontends/drxk_hard.h
+++ b/drivers/media/dvb/frontends/drxk_hard.h
@@ -338,7 +338,10 @@ struct drxk_state {
        bool    antenna_dvbt;
        u16     antenna_gpio;
 
+       /* Firmware */
        const char *microcode_name;
+       struct completion fw_wait_load;
+       const struct firmware *fw;
 };
 
 #define NEVER_LOCK 0