AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-25 04:50:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

usb: usb251xb: Add USB251x specific port count setting

Browse Source 
USB251xb as well as USB2517 datasheet states, that all these
hubs differ by number of ports declared as the last digit in the
model name. So USB2512 got two ports, USB2513 - three, and so on.
Such setting must be reflected in the device specific data
structure and corresponding dts property should be checked whether
it doesn't get out of available ports.

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Serge Semin 2017-10-22 23:38:05 +03:00 committed by Greg Kroah-Hartman
parent 7fcf558471
commit 384811286f
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/usb/misc/usb251xb.c
View File

@ -153,46 +153,55 @@ struct usb251xb {
struct usb251xb_data {
u16 product_id;
u8 port_cnt;
char product_str[USB251XB_STRING_BUFSIZE / 2]; /* ASCII string */
};
static const struct usb251xb_data usb2512b_data = {
.product_id = 0x2512,
.port_cnt = 2,
.product_str = "USB2512B",
};
static const struct usb251xb_data usb2512bi_data = {
.product_id = 0x2512,
.port_cnt = 2,
.product_str = "USB2512Bi",
};
static const struct usb251xb_data usb2513b_data = {
.product_id = 0x2513,
.port_cnt = 3,
.product_str = "USB2513B",
};
static const struct usb251xb_data usb2513bi_data = {
.product_id = 0x2513,
.port_cnt = 3,
.product_str = "USB2513Bi",
};
static const struct usb251xb_data usb2514b_data = {
.product_id = 0x2514,
.port_cnt = 4,
.product_str = "USB2514B",
};
static const struct usb251xb_data usb2514bi_data = {
.product_id = 0x2514,
.port_cnt = 4,
.product_str = "USB2514Bi",
};
static const struct usb251xb_data usb2517_data = {
.product_id = 0x2517,
.port_cnt = 7,
.product_str = "USB2517",
};
static const struct usb251xb_data usb2517i_data = {
.product_id = 0x2517,
.port_cnt = 7,
.product_str = "USB2517i",
};
@ -421,8 +430,11 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
for (i = 0; i < len / sizeof(u32); i++) {
u32 port = be32_to_cpu(cproperty_u32[i]);
if ((port >= 1) && (port <= 4))
if ((port >= 1) && (port <= data->port_cnt))
hub->non_rem_dev |= BIT(port);
else
dev_warn(dev, "NRD port %u doesn't exist\n",
port);
}
}
@ -432,8 +444,11 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
for (i = 0; i < len / sizeof(u32); i++) {
u32 port = be32_to_cpu(cproperty_u32[i]);
if ((port >= 1) && (port <= 4))
if ((port >= 1) && (port <= data->port_cnt))
hub->port_disable_sp |= BIT(port);
else
dev_warn(dev, "PDS port %u doesn't exist\n",
port);
}
}
@ -443,8 +458,11 @@ static int usb251xb_get_ofdata(struct usb251xb *hub,
for (i = 0; i < len / sizeof(u32); i++) {
u32 port = be32_to_cpu(cproperty_u32[i]);
if ((port >= 1) && (port <= 4))
if ((port >= 1) && (port <= data->port_cnt))
hub->port_disable_bp |= BIT(port);
else
dev_warn(dev, "PDB port %u doesn't exist\n",
port);
}
}