Eric Lee / smarc-ti-linux-kernel

5
Download as
Browse Code ยป

Commit c03890ff5e24a4bf59059f2d179f427559b7330a

Authored by Johan Hovold
Committed by Greg Kroah-Hartman
1 parent 8ef42ddd9a
Exists in ti-lsk-linux-4.1.y and in 12 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.15.y

USB: io_ti: fix firmware download on big-endian machines (part 2) 

A recent patch that purported to fix firmware download on big-endian
machines failed to add the corresponding sparse annotation to the
i2c-header. This was reported by the kbuild test robot.

Adding the appropriate annotation revealed another endianess bug related
to the i2c-header Size-field in a code path that is exercised when the
firmware is actually being downloaded (and not just verified and left
untouched unless older than the firmware at hand).

This patch adds the required sparse annotation to the i2c-header and
makes sure that the Size-field is sent in little-endian byte order
during firmware download also on big-endian machines.

Note that this patch is only compile-tested, but that there is no
functional change for little-endian systems.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Cc: Ludovic Drolez <ldrolez@debian.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 2 changed files with 2 additions and 2 deletions Side-by-side Diff

drivers/usb/serial/io_ti.c
Diff comments   View file @ c03890f
... ... @@ -821,7 +821,7 @@
821 821 firmware_rec = (struct ti_i2c_firmware_rec*)i2c_header->Data;
822 822  
823 823 i2c_header->Type = I2C_DESC_TYPE_FIRMWARE_BLANK;
824   - i2c_header->Size = (__u16)buffer_size;
  824 + i2c_header->Size = cpu_to_le16(buffer_size);
825 825 i2c_header->CheckSum = cs;
826 826 firmware_rec->Ver_Major = OperationalMajorVersion;
827 827 firmware_rec->Ver_Minor = OperationalMinorVersion;
drivers/usb/serial/io_usbvend.h
Diff comments   View file @ c03890f
... ... @@ -594,7 +594,7 @@
594 594  
595 595 struct ti_i2c_desc {
596 596 __u8 Type; // Type of descriptor
597   - __u16 Size; // Size of data only not including header
  597 + __le16 Size; // Size of data only not including header
598 598 __u8 CheckSum; // Checksum (8 bit sum of data only)
599 599 __u8 Data[0]; // Data starts here
600 600 } __attribute__((packed));