V4L/DVB (13496): pvrusb2: Support manual extraction of 16KB FX2 firmware

This pvrusb2 change is in support of an existing feature used to help
identify and locate newer vendor supplied firmware.  This change makes
the feature work for the newer larger firmware size.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 15 insertions, 10 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
index 010018bc8383..ae977668c496 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c
@@ -252,11 +252,15 @@ static int pvr2_debugifc_do1cmd(struct pvr2_hdw *hdw,const char *buf,
                         scnt = debugifc_isolate_word(buf,count,&wptr,&wlen);
                         if (scnt && wptr) {
                                 count -= scnt; buf += scnt;
-                                if (debugifc_match_keyword(wptr,wlen,"prom")) {
-                                        pvr2_hdw_cpufw_set_enabled(hdw,!0,!0);
-                                } else if (debugifc_match_keyword(wptr,wlen,
-                                                                  "ram")) {
-                                        pvr2_hdw_cpufw_set_enabled(hdw,0,!0);
+                                if (debugifc_match_keyword(wptr, wlen,
+                                                           "prom")) {
+                                        pvr2_hdw_cpufw_set_enabled(hdw, 2, !0);
+                                } else if (debugifc_match_keyword(wptr, wlen,
+                                                                  "ram8k")) {
+                                        pvr2_hdw_cpufw_set_enabled(hdw, 0, !0);
+                                } else if (debugifc_match_keyword(wptr, wlen,
+                                                                  "ram16k")) {
+                                        pvr2_hdw_cpufw_set_enabled(hdw, 1, !0);
                                 } else {
                                         return -EINVAL;
                                 }
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index 9be04772c723..bd05ec7b1cbe 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -3514,7 +3514,7 @@ static u8 *pvr2_full_eeprom_fetch(struct pvr2_hdw *hdw)
 
 
 void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
-                                int prom_flag,
+                                int mode,
                                 int enable_flag)
 {
         int ret;
@@ -3537,11 +3537,12 @@ void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *hdw,
                         break;
                 }
 
-                hdw->fw_cpu_flag = (prom_flag == 0);
+                hdw->fw_cpu_flag = (mode != 2);
                 if (hdw->fw_cpu_flag) {
+                        hdw->fw_size = (mode == 1) ? 0x4000 : 0x2000;
                         pvr2_trace(PVR2_TRACE_FIRMWARE,
-                                   "Preparing to suck out CPU firmware");
-                        hdw->fw_size = 0x2000;
+                                   "Preparing to suck out CPU firmware"
+                                   " (size=%u)", hdw->fw_size);
                         hdw->fw_buffer = kzalloc(hdw->fw_size,GFP_KERNEL);
                         if (!hdw->fw_buffer) {
                                 hdw->fw_size = 0;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 7b6940554e9a..56e70eae20c1 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -219,7 +219,7 @@ int pvr2_hdw_get_stdenum_value(struct pvr2_hdw *hdw,struct v4l2_standard *std,
    this may prevent the device from running (and leaving this mode may
    imply a device reset). */
 void pvr2_hdw_cpufw_set_enabled(struct pvr2_hdw *,
-                                int prom_flag,
+                                int mode, /* 0=8KB FX2, 1=16KB FX2, 2=PROM */
                                 int enable_flag);
 
 /* Return true if we're in a mode for retrieval CPU firmware */