Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f909162 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Disable synchronization during initialization 



As soon as init_registers() was called, the rt2400/rt2500
would start raising beacondone interrupts. Since this is highly
premature since no beacons were provided yet, we should
initialize the synchronization register to 0.

This will make all drivers initialize it to 0 regardless
if they are raising beacondone interrupts or not, since it only
makes sense to have it completely disabled.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent adeed480

drivers/net/wireless/rt2x00/rt2400pci.c

+11 −0
Original line number Diff line number Diff line
@@ -731,6 +731,17 @@ static int rt2400pci_init_registers(struct rt2x00_dev *rt2x00dev) 
			   (rt2x00dev->rx->data_size / 128));

	rt2x00pci_register_write(rt2x00dev, CSR9, reg);



	rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

	rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);

	rt2x00_set_field32(&reg, CSR14_TSF_SYNC, 0);

	rt2x00_set_field32(&reg, CSR14_TBCN, 0);

	rt2x00_set_field32(&reg, CSR14_TCFP, 0);

	rt2x00_set_field32(&reg, CSR14_TATIMW, 0);

	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00_set_field32(&reg, CSR14_CFP_COUNT_PRELOAD, 0);

	rt2x00_set_field32(&reg, CSR14_TBCM_PRELOAD, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	rt2x00pci_register_write(rt2x00dev, CNT3, 0x3f080000);



	rt2x00pci_register_read(rt2x00dev, ARCSR0, &reg);

drivers/net/wireless/rt2x00/rt2500pci.c

+11 −0
Original line number Diff line number Diff line
@@ -824,6 +824,17 @@ static int rt2500pci_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field32(&reg, CSR11_CW_SELECT, 0);

	rt2x00pci_register_write(rt2x00dev, CSR11, reg);



	rt2x00pci_register_read(rt2x00dev, CSR14, &reg);

	rt2x00_set_field32(&reg, CSR14_TSF_COUNT, 0);

	rt2x00_set_field32(&reg, CSR14_TSF_SYNC, 0);

	rt2x00_set_field32(&reg, CSR14_TBCN, 0);

	rt2x00_set_field32(&reg, CSR14_TCFP, 0);

	rt2x00_set_field32(&reg, CSR14_TATIMW, 0);

	rt2x00_set_field32(&reg, CSR14_BEACON_GEN, 0);

	rt2x00_set_field32(&reg, CSR14_CFP_COUNT_PRELOAD, 0);

	rt2x00_set_field32(&reg, CSR14_TBCM_PRELOAD, 0);

	rt2x00pci_register_write(rt2x00dev, CSR14, reg);



	rt2x00pci_register_write(rt2x00dev, CNT3, 0);



	rt2x00pci_register_read(rt2x00dev, TXCSR8, &reg);

drivers/net/wireless/rt2x00/rt2500usb.c

+7 −0
Original line number Diff line number Diff line
@@ -801,6 +801,13 @@ static int rt2500usb_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field16(&reg, TXRX_CSR8_BBP_ID1_VALID, 0);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR8, reg);



	rt2500usb_register_read(rt2x00dev, TXRX_CSR19, &reg);

	rt2x00_set_field16(&reg, TXRX_CSR19_TSF_COUNT, 0);

	rt2x00_set_field16(&reg, TXRX_CSR19_TSF_SYNC, 0);

	rt2x00_set_field16(&reg, TXRX_CSR19_TBCN, 0);

	rt2x00_set_field16(&reg, TXRX_CSR19_BEACON_GEN, 0);

	rt2500usb_register_write(rt2x00dev, TXRX_CSR19, reg);



	rt2500usb_register_write(rt2x00dev, TXRX_CSR21, 0xe78f);

	rt2500usb_register_write(rt2x00dev, MAC_CSR9, 0xff1d);

drivers/net/wireless/rt2x00/rt61pci.c

+9 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,15 @@ static int rt61pci_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field32(&reg, TXRX_CSR8_ACK_CTS_54MBS, 42);

	rt2x00pci_register_write(rt2x00dev, TXRX_CSR8, reg);



	rt2x00pci_register_read(rt2x00dev, TXRX_CSR9, &reg);

	rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_INTERVAL, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TIMESTAMP_COMPENSATE, 0);

	rt2x00pci_register_write(rt2x00dev, TXRX_CSR9, reg);



	rt2x00pci_register_write(rt2x00dev, TXRX_CSR15, 0x0000000f);



	rt2x00pci_register_write(rt2x00dev, MAC_CSR6, 0x00000fff);

drivers/net/wireless/rt2x00/rt73usb.c

+9 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,15 @@ static int rt73usb_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field32(&reg, TXRX_CSR8_ACK_CTS_54MBS, 42);

	rt73usb_register_write(rt2x00dev, TXRX_CSR8, reg);



	rt73usb_register_read(rt2x00dev, TXRX_CSR9, &reg);

	rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_INTERVAL, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_TICKING, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TSF_SYNC, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TBTT_ENABLE, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_BEACON_GEN, 0);

	rt2x00_set_field32(&reg, TXRX_CSR9_TIMESTAMP_COMPENSATE, 0);

	rt73usb_register_write(rt2x00dev, TXRX_CSR9, reg);



	rt73usb_register_write(rt2x00dev, TXRX_CSR15, 0x0000000f);



	rt73usb_register_read(rt2x00dev, MAC_CSR6, &reg);