Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

firewire: Add phy register defines.

Browse source 
Signed-off-by: Marc Butler <marc@adaptivecode.com>
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> (added whitespace)
This commit is contained in:
Marc Butler 2007-03-23 10:24:02 -06:00 committed by Stefan Richter
parent bbd1494580
commit ecab413359
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/firewire/fw-card.c
View file

@ -395,9 +395,9 @@ fw_card_add(struct fw_card *card,
card->link_speed = link_speed; card->link_speed = link_speed;
card->guid = guid; card->guid = guid;
/* FIXME: add #define's for phy registers. */
/* Activate link_on bit and contender bit in our self ID packets.*/ /* Activate link_on bit and contender bit in our self ID packets.*/
if (card->driver->update_phy_reg(card, 4, 0, 0x80 | 0x40) < 0) if (card->driver->update_phy_reg(card, 4, 0,
PHY_LINK_ACTIVE | PHY_CONTENDER) < 0)
return -EIO; return -EIO;
/* The subsystem grabs a reference when the card is added and /* The subsystem grabs a reference when the card is added and
@ -483,7 +483,8 @@ static struct fw_card_driver dummy_driver = {
void void
fw_core_remove_card(struct fw_card *card) fw_core_remove_card(struct fw_card *card)
{ {
card->driver->update_phy_reg(card, 4, 0x80 | 0x40, 0); card->driver->update_phy_reg(card, 4,
PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
fw_core_initiate_bus_reset(card, 1); fw_core_initiate_bus_reset(card, 1);
down_write(&fw_bus_type.subsys.rwsem); down_write(&fw_bus_type.subsys.rwsem);
@ -531,6 +532,11 @@ EXPORT_SYMBOL(fw_card_put);
int int
fw_core_initiate_bus_reset(struct fw_card *card, int short_reset) fw_core_initiate_bus_reset(struct fw_card *card, int short_reset)
{ {
return card->driver->update_phy_reg(card, short_reset ? 5 : 1, 0, 0x40); int reg = short_reset ? 5 : 1;
/* The following values happen to be the same bit. However be
* explicit for clarity. */
int bit = short_reset ? PHY_BUS_SHORT_RESET : PHY_BUS_RESET;
return card->driver->update_phy_reg(card, reg, 0, bit);
} }
EXPORT_SYMBOL(fw_core_initiate_bus_reset); EXPORT_SYMBOL(fw_core_initiate_bus_reset);

6
drivers/firewire/fw-transaction.h
View file

@ -107,6 +107,12 @@
#define PHY_PACKET_LINK_ON 0x1 #define PHY_PACKET_LINK_ON 0x1
#define PHY_PACKET_SELF_ID 0x2 #define PHY_PACKET_SELF_ID 0x2
/* Bit fields _within_ the PHY registers. */
#define PHY_LINK_ACTIVE 0x80
#define PHY_CONTENDER 0x40
#define PHY_BUS_RESET 0x40
#define PHY_BUS_SHORT_RESET 0x40
#define CSR_REGISTER_BASE 0xfffff0000000ULL #define CSR_REGISTER_BASE 0xfffff0000000ULL
/* register offsets relative to CSR_REGISTER_BASE */ /* register offsets relative to CSR_REGISTER_BASE */