UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Fix the random PID check 

- Fix the disable controller logic in the designware driver
 - Fix I3C entry in MAINTAINERS
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJcuuS8AAoJEGXtNgF+CLcAfpgQAKxA8KhkR5UpCtSbOfNMXdun
 lbPfq4gHd/JR9l0z7GXd4sg8c+602mFNA4rL7w986TCdkHxDrOc5hr5jeqgRjCk+
 Dj8ZtL0oqwpSpf2WlDpkQmj0/53RSKFJwKq06QH3M1nmOak9pWqwNhZAFEquIjwc
 qJYLU1O9So/W5NzVtu6JF/Rf3Oq22IlIKdfUfw5E2c7j3YGG+HpZDs8nyuYranCN
 hAkZKHcV9EtidYF4zDtTobcod41L47uNzczrMgPy3GxdOkbtn/A8OE8vwmbaSKw4
 FgwOMY2GLFl+21IqQ3saaQpbvzjAxL6wfk47tvQ90jxe1xwYoqXVZ/+FR89Rzajd
 /0iyIJ3Ai1x7Vb6kDXM9EE6WOynzI9x2C5qAmwolEviLXmV64f0P1zCDQU9We2mX
 aamEvQ/K61yVLqnDbGVu+scaUnsyqKdRfmoe+JEOF55UrJECdxrcn6NsgXux3DHg
 BIfe00oqg7urKe4CKhELY/44c+H7CSiahCXqHEFGwiXOUzEiHv3f1tWkXcUM4y8L
 iuCRjUT4Mv3lmmPBQQSU/nigimvEwswSthCDvjcVX3jGjPFK7mRTZ0tRUnD5dvTa
 KBClx74JgShqjPLkXsHhQbUaxqf/jJePAxRmPZkCc0DFDol6pkDaKeKmVB8hPar/
 pUoIqqExCFlqrQpBgAmD
 =RUzG
 -----END PGP SIGNATURE-----

Merge tag 'i3c/fixes-for-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux

Pill i3c fixes from Boris Brezillon:

 - fix the random PID check

 - fix the disable controller logic in the designware driver

 - fix I3C entry in MAINTAINERS

* tag 'i3c/fixes-for-5.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  MAINTAINERS: Fix the I3C entry
  i3c: dw: Fix dw_i3c_master_disable controller by using correct mask
  i3c: Fix the verification of random PID
This commit is contained in:
Linus Torvalds 2019-04-20 10:43:37 -07:00
parent 4b609f1e26 709a53e194
commit 34396bdfd2
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -7333,7 +7333,6 @@ F: Documentation/devicetree/bindings/i3c/
F: Documentation/driver-api/i3c F: Documentation/driver-api/i3c
F: drivers/i3c/ F: drivers/i3c/
F: include/linux/i3c/ F: include/linux/i3c/
F: include/dt-bindings/i3c/
I3C DRIVER FOR SYNOPSYS DESIGNWARE I3C DRIVER FOR SYNOPSYS DESIGNWARE
M: Vitor Soares <vitor.soares@synopsys.com> M: Vitor Soares <vitor.soares@synopsys.com>

5
drivers/i3c/master.c
View File

@ -1980,7 +1980,6 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master,
{ {
struct i3c_dev_boardinfo *boardinfo; struct i3c_dev_boardinfo *boardinfo;
struct device *dev = &master->dev; struct device *dev = &master->dev;
struct i3c_device_info info = { };
enum i3c_addr_slot_status addrstatus; enum i3c_addr_slot_status addrstatus;
u32 init_dyn_addr = 0; u32 init_dyn_addr = 0;
@ -2012,8 +2011,8 @@ of_i3c_master_add_i3c_boardinfo(struct i3c_master_controller *master,
boardinfo->pid = ((u64)reg[1] << 32) | reg[2]; boardinfo->pid = ((u64)reg[1] << 32) | reg[2];
if ((info.pid & GENMASK_ULL(63, 48)) || if ((boardinfo->pid & GENMASK_ULL(63, 48)) ||
I3C_PID_RND_LOWER_32BITS(info.pid)) I3C_PID_RND_LOWER_32BITS(boardinfo->pid))
return -EINVAL; return -EINVAL;
boardinfo->init_dyn_addr = init_dyn_addr; boardinfo->init_dyn_addr = init_dyn_addr;

2
drivers/i3c/master/dw-i3c-master.c
View File

@ -300,7 +300,7 @@ to_dw_i3c_master(struct i3c_master_controller *master)
static void dw_i3c_master_disable(struct dw_i3c_master *master) static void dw_i3c_master_disable(struct dw_i3c_master *master)
{ {
writel(readl(master->regs + DEVICE_CTRL) & DEV_CTRL_ENABLE, writel(readl(master->regs + DEVICE_CTRL) & ~DEV_CTRL_ENABLE,
master->regs + DEVICE_CTRL); master->regs + DEVICE_CTRL);
} }