mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 00:20:32 +00:00
Code Issues Releases Wiki Activity

thunderbolt: Extend NVM version fields to 32-bits

Browse source 
In order to support non-Intel NVM image formats extend the NVM major and
minor version to 32-bits to better accommondate different versioning
schemes.

No functional impact.

Signed-off-by: Szuying Chen <Chloe_Chen@asmedia.com.tw>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Szuying Chen 2022-09-02 17:40:09 +08:00 committed by Mika Westerberg
parent 5172eb9a16
commit 5424e1bf16
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/thunderbolt/retimer.c
View file

@ -71,8 +71,8 @@ static int tb_retimer_nvm_add(struct tb_retimer *rt)
if (ret)
goto err_nvm;
nvm->major = val >> 16;
nvm->minor = val >> 8;
nvm->major = (val >> 16) & 0xff;
nvm->minor = (val >> 8) & 0xff;
ret = usb4_port_retimer_nvm_read(rt->port, rt->index, NVM_FLASH_SIZE,
&val, sizeof(val));

4
drivers/thunderbolt/switch.c
View file

@ -427,8 +427,8 @@ static int tb_switch_nvm_add(struct tb_switch *sw)
if (ret)
goto err_nvm;
nvm->major = val >> 16;
nvm->minor = val >> 8;
nvm->major = (val >> 16) & 0xff;
nvm->minor = (val >> 8) & 0xff;
ret = tb_nvm_add_active(nvm, nvm_size, tb_switch_nvm_read);
if (ret)

4
drivers/thunderbolt/tb.h
View file

@ -48,8 +48,8 @@
*/
struct tb_nvm {
struct device *dev;
u8 major;
u8 minor;
u32 major;
u32 minor;
int id;
struct nvmem_device *active;
struct nvmem_device *non_active;