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

Commit 16475b09 authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Log RT/RF chipset information correctly. 



Some drivers (rt2800* most notably) cannot set the RF and RT chipset in
the correct order to have the information logging in rt2x00_set_chip
be correct.
Fix this by decoupling the setting of the chipset information from the
logging of the chipset information so that drivers can determine
themselves when all information is set.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cce5fc45

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1341,6 +1341,7 @@ static int rt2400pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);

	rt2x00pci_register_read(rt2x00dev, CSR0, &reg);

	rt2x00_set_chip_rf(rt2x00dev, value, reg);

	rt2x00_print_chip(rt2x00dev);



	if (!rt2x00_rf(&rt2x00dev->chip, RF2420) &&

	    !rt2x00_rf(&rt2x00dev->chip, RF2421)) {

drivers/net/wireless/rt2x00/rt2500pci.c

+1 −0
Original line number Diff line number Diff line
@@ -1505,6 +1505,7 @@ static int rt2500pci_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);

	rt2x00pci_register_read(rt2x00dev, CSR0, &reg);

	rt2x00_set_chip_rf(rt2x00dev, value, reg);

	rt2x00_print_chip(rt2x00dev);



	if (!rt2x00_rf(&rt2x00dev->chip, RF2522) &&

	    !rt2x00_rf(&rt2x00dev->chip, RF2523) &&

drivers/net/wireless/rt2x00/rt2500usb.c

+1 −0
Original line number Diff line number Diff line
@@ -1409,6 +1409,7 @@ static int rt2500usb_init_eeprom(struct rt2x00_dev *rt2x00dev) 
	value = rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RF_TYPE);

	rt2500usb_register_read(rt2x00dev, MAC_CSR0, &reg);

	rt2x00_set_chip(rt2x00dev, RT2570, value, reg);

	rt2x00_print_chip(rt2x00dev);



	if (!rt2x00_check_rev(&rt2x00dev->chip, 0x000ffff0, 0) ||

	    rt2x00_check_rev(&rt2x00dev->chip, 0x0000000f, 0)) {

drivers/net/wireless/rt2x00/rt2800lib.c

+1 −0
Original line number Diff line number Diff line
@@ -1854,6 +1854,7 @@ int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev) 
			return -ENODEV;

		}

	}

	rt2x00_print_chip(rt2x00dev);



	if (!rt2x00_rf(&rt2x00dev->chip, RF2820) &&

	    !rt2x00_rf(&rt2x00dev->chip, RF2850) &&

drivers/net/wireless/rt2x00/rt2x00.h

+7 −4
Original line number Diff line number Diff line
@@ -906,10 +906,6 @@ static inline void rt2x00_eeprom_write(struct rt2x00_dev *rt2x00dev, 
static inline void rt2x00_set_chip(struct rt2x00_dev *rt2x00dev,

				   const u16 rt, const u16 rf, const u32 rev)

{

	INFO(rt2x00dev,

	     "Chipset detected - rt: %04x, rf: %04x, rev: %08x.\n",

	     rt, rf, rev);



	rt2x00dev->chip.rt = rt;

	rt2x00dev->chip.rf = rf;

	rt2x00dev->chip.rev = rev;
@@ -927,6 +923,13 @@ static inline void rt2x00_set_chip_rf(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_chip(rt2x00dev, rt2x00dev->chip.rt, rf, rev);

}



static inline void rt2x00_print_chip(struct rt2x00_dev *rt2x00dev)

{

	INFO(rt2x00dev,

	     "Chipset detected - rt: %04x, rf: %04x, rev: %08x.\n",

	     rt2x00dev->chip.rt, rt2x00dev->chip.rf, rt2x00dev->chip.rev);

}



static inline char rt2x00_rt(const struct rt2x00_chip *chipset, const u16 chip)

{

	return (chipset->rt == chip);