d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ahci(4) driver attach to controller with 32 ports.

Browse Source 
Incorrect sign expansion in variables that supposed to be a bit fields
caused infinite loop.  Fixing this allows system properly detect maximal
possible 32 devices configured on AHCI HBA of BHyVe.  That case did not
happen in a wild before due to lack of hardware AHCI HBAs with 32 ports.

Approved by:	re (gjb@)
MFC after:	1 week
This commit is contained in:
mav 2016-07-07 22:10:10 +00:00
parent 1b626dc6a2
commit 10701d40cc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/dev/ahci/ahci.c
View File

@ -166,8 +166,8 @@ int
ahci_attach(device_t dev)
{
struct ahci_controller *ctlr = device_get_softc(dev);
int error, i, u, speed, unit;
u_int32_t version;
int error, i, speed, unit;
uint32_t u, version;
device_t child;
ctlr->dev = dev;

4
sys/dev/ahci/ahci.h
View File

@ -474,7 +474,7 @@ struct ahci_enclosure {
uint8_t status[AHCI_MAX_PORTS][4]; /* ArrayDev statuses */
int quirks;
int channels;
int ichannels;
uint32_t ichannels;
};
/* structure describing a AHCI controller */
@ -509,7 +509,7 @@ struct ahci_controller {
int quirks;
int numirqs;
int channels;
int ichannels;
uint32_t ichannels;
int ccc; /* CCC timeout */
int cccv; /* CCC vector */
int direct; /* Direct command completion */