mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-24 09:13:37 +01:00
Apply patch supplied by Jonathan Chen: use the correct arguments to
pci_enable_io(). We need to use SYS_RES_IOPORT/SYS_RES_MEMORY instead of PCIM_CMD_PORTEN/PCIM_CMD_MEMEN.
This commit is contained in:
parent
ccdee0d9f4
commit
75ff968cd5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=79472
@ -1776,8 +1776,8 @@ static int dc_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef DC_USEIOSPACE
|
||||
|
@ -530,8 +530,8 @@ static int lge_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef LGE_USEIOSPACE
|
||||
|
@ -833,8 +833,8 @@ static int nge_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef NGE_USEIOSPACE
|
||||
|
@ -699,8 +699,8 @@ static int sf_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef SF_USEIOSPACE
|
||||
|
@ -1217,8 +1217,8 @@ static int sk_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef SK_USEIOSPACE
|
||||
|
@ -1482,7 +1482,7 @@ static int ti_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
if (!(command & PCIM_CMD_MEMEN)) {
|
||||
|
@ -672,8 +672,8 @@ static int vr_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef VR_USEIOSPACE
|
||||
|
@ -1776,8 +1776,8 @@ static int dc_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef DC_USEIOSPACE
|
||||
|
@ -534,8 +534,8 @@ static int pcn_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef PCN_USEIOSPACE
|
||||
|
@ -835,8 +835,8 @@ static int rl_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef RL_USEIOSPACE
|
||||
|
@ -699,8 +699,8 @@ static int sf_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef SF_USEIOSPACE
|
||||
|
@ -756,8 +756,8 @@ static int sis_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef SIS_USEIOSPACE
|
||||
|
@ -1217,8 +1217,8 @@ static int sk_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef SK_USEIOSPACE
|
||||
|
@ -945,8 +945,8 @@ static int ste_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef STE_USEIOSPACE
|
||||
|
@ -1482,7 +1482,7 @@ static int ti_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
if (!(command & PCIM_CMD_MEMEN)) {
|
||||
|
@ -1131,8 +1131,8 @@ static int tl_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef TL_USEIOSPACE
|
||||
|
@ -672,8 +672,8 @@ static int vr_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef VR_USEIOSPACE
|
||||
|
@ -846,8 +846,8 @@ static int wb_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef WB_USEIOSPACE
|
||||
|
@ -1305,8 +1305,8 @@ static int xl_attach(dev)
|
||||
* Map control/status registers.
|
||||
*/
|
||||
pci_enable_busmaster(dev);
|
||||
pci_enable_io(dev, PCIM_CMD_PORTEN);
|
||||
pci_enable_io(dev, PCIM_CMD_MEMEN);
|
||||
pci_enable_io(dev, SYS_RES_IOPORT);
|
||||
pci_enable_io(dev, SYS_RES_MEMORY);
|
||||
command = pci_read_config(dev, PCIR_COMMAND, 4);
|
||||
|
||||
#ifdef XL_USEIOSPACE
|
||||
|
Loading…
Reference in New Issue
Block a user