brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-07-06 03:06:16 +09:00
Code Issues Projects Releases Wiki Activity

CACHE: net: asix: Fix asix driver to work with data cache on

Browse Source 
The asix driver did not align buffers, therefore it didn't work
with data cache enabled. Fix this.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Joe Hershberger <joe.hershberger@gmail.com>
Acked-by: Joe Hershberger <joe.hershberger@gmail.com>
This commit is contained in:
Marek Vasut 2012-06-24 14:17:56 +00:00 committed by Joe Hershberger
parent cc5f552283
commit c59ab0921f
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/usb/eth/asix.c
View File

@ -168,27 +168,28 @@ static inline int asix_set_hw_mii(struct ueth_data *dev)
static int asix_mdio_read(struct ueth_data *dev, int phy_id, int loc) static int asix_mdio_read(struct ueth_data *dev, int phy_id, int loc)
{ {
__le16 res; ALLOC_CACHE_ALIGN_BUFFER(__le16, res, 1);
asix_set_sw_mii(dev); asix_set_sw_mii(dev);
asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id, (__u16)loc, 2, &res); asix_read_cmd(dev, AX_CMD_READ_MII_REG, phy_id, (__u16)loc, 2, res);
asix_set_hw_mii(dev); asix_set_hw_mii(dev);
debug("asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n", debug("asix_mdio_read() phy_id=0x%02x, loc=0x%02x, returns=0x%04x\n",
phy_id, loc, le16_to_cpu(res)); phy_id, loc, le16_to_cpu(*res));
return le16_to_cpu(res); return le16_to_cpu(*res);
} }
static void static void
asix_mdio_write(struct ueth_data *dev, int phy_id, int loc, int val) asix_mdio_write(struct ueth_data *dev, int phy_id, int loc, int val)
{ {
__le16 res = cpu_to_le16(val); ALLOC_CACHE_ALIGN_BUFFER(__le16, res, 1);
*res = cpu_to_le16(val);
debug("asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n", debug("asix_mdio_write() phy_id=0x%02x, loc=0x%02x, val=0x%04x\n",
phy_id, loc, val); phy_id, loc, val);
asix_set_sw_mii(dev); asix_set_sw_mii(dev);
asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, &res); asix_write_cmd(dev, AX_CMD_WRITE_MII_REG, phy_id, (__u16)loc, 2, res);
asix_set_hw_mii(dev); asix_set_hw_mii(dev);
} }
@ -210,7 +211,8 @@ static int asix_sw_reset(struct ueth_data *dev, u8 flags)
static inline int asix_get_phy_addr(struct ueth_data *dev) static inline int asix_get_phy_addr(struct ueth_data *dev)
{ {
u8 buf[2]; ALLOC_CACHE_ALIGN_BUFFER(u8, buf, 2);
int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf); int ret = asix_read_cmd(dev, AX_CMD_READ_PHY_ID, 0, 0, 2, buf);
debug("asix_get_phy_addr()\n"); debug("asix_get_phy_addr()\n");
@ -242,13 +244,14 @@ static int asix_write_medium_mode(struct ueth_data *dev, u16 mode)
static u16 asix_read_rx_ctl(struct ueth_data *dev) static u16 asix_read_rx_ctl(struct ueth_data *dev)
{ {
__le16 v; ALLOC_CACHE_ALIGN_BUFFER(__le16, v, 1);
int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, &v);
int ret = asix_read_cmd(dev, AX_CMD_READ_RX_CTL, 0, 0, 2, v);
if (ret < 0) if (ret < 0)
debug("Error reading RX_CTL register: %02x\n", ret); debug("Error reading RX_CTL register: %02x\n", ret);
else else
ret = le16_to_cpu(v); ret = le16_to_cpu(*v);
return ret; return ret;
} }
@ -313,7 +316,7 @@ static int mii_nway_restart(struct ueth_data *dev)
static int asix_init(struct eth_device *eth, bd_t *bd) static int asix_init(struct eth_device *eth, bd_t *bd)
{ {
int embd_phy; int embd_phy;
unsigned char buf[ETH_ALEN]; ALLOC_CACHE_ALIGN_BUFFER(unsigned char, buf, ETH_ALEN);
u16 rx_ctl; u16 rx_ctl;
struct ueth_data *dev = (struct ueth_data *)eth->priv; struct ueth_data *dev = (struct ueth_data *)eth->priv;
int timeout = 0; int timeout = 0;
@ -425,7 +428,8 @@ static int asix_send(struct eth_device *eth, void *packet, int length)
int err; int err;
u32 packet_len; u32 packet_len;
int actual_len; int actual_len;
unsigned char msg[PKTSIZE + sizeof(packet_len)]; ALLOC_CACHE_ALIGN_BUFFER(unsigned char, msg,
PKTSIZE + sizeof(packet_len));
debug("** %s(), len %d\n", __func__, length); debug("** %s(), len %d\n", __func__, length);
@ -452,7 +456,7 @@ static int asix_send(struct eth_device *eth, void *packet, int length)
static int asix_recv(struct eth_device *eth) static int asix_recv(struct eth_device *eth)
{ {
struct ueth_data *dev = (struct ueth_data *)eth->priv; struct ueth_data *dev = (struct ueth_data *)eth->priv;
static unsigned char recv_buf[AX_RX_URB_SIZE]; ALLOC_CACHE_ALIGN_BUFFER(unsigned char, recv_buf, AX_RX_URB_SIZE);
unsigned char *buf_ptr; unsigned char *buf_ptr;
int err; int err;
int actual_len; int actual_len;