from:"Neil Armstrong"

[PATCH 1/3] Add BOOT_PARTITION_ENABLE definition to MMC EXT_CSD PART_CONFIG

2013-04-19 Thread Neil Armstrong

Add bit mask for the BOOT_PARTITION_ENABLE values.

Signed-off-by: Neil Armstrong narmstr...@neotion.com
---
 include/linux/mmc/mmc.h |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 50bcde3..eb5b361 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -347,6 +347,7 @@ struct _mmc_csd {
 #define EXT_CSD_PART_CONFIG_ACC_BOOT0(0x1)
 #define EXT_CSD_PART_CONFIG_ACC_RPMB(0x3)
 #define EXT_CSD_PART_CONFIG_ACC_GP0(0x4)
+#define EXT_CSD_PART_CONFIG_EN_MASK(0x38)
 
 #define EXT_CSD_PART_SUPPORT_PART_EN(0x1)
 
-- 
1.7.0.4


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 0/3] Add boot_enable attribute to eMMC device for boot mode operation selection

2013-04-19 Thread Neil Armstrong

Since eMMC 4.3 a special boot mode operation was introduced to retrieve
data from the eMMC device with a very simple procedure. Since the Linux
kernel exports these device boot partitions, it may be useful to select
the boot partition from the user space.

The patch has been tested on a Toshiba eMMC conforming with eMMC 4.5
specifications.

Neil Armstrong (3):
  Add BOOT_PARTITION_ENABLE definition to MMC EXT_CSD PART_CONFIG
  Add boot_enable sysfs attribute to select MMC boot operation
partition
  Add Documentation for MMC boot_enable attribute

 Documentation/mmc/mmc-dev-parts.txt |6 +++
 drivers/mmc/card/block.c|   72
++-
 include/linux/mmc/mmc.h |1 +
 3 files changed, 78 insertions(+), 1 deletions(-)


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/3] Add boot_enable sysfs attribute to select MMC boot operation partition

2013-04-19 Thread Neil Armstrong

Add sysfs attribute to select the eMMC boot mode operation according to
the eMMC 4.5 specifications.
Valid values are : 0 for disabled, 1 for first boot partition, 2 for
second boot partition, 7 for user area.

Signed-off-by: Neil Armstrong narmstr...@neotion.com
---
 drivers/mmc/card/block.c |   72
+-
 1 files changed, 71 insertions(+), 1 deletions(-)

diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 5bab73b..e11c42e 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -114,6 +114,7 @@ struct mmc_blk_data {
  */
 unsigned intpart_curr;
 struct device_attribute force_ro;
+struct device_attribute boot_enable;
 struct device_attribute power_ro_lock;
 intarea_type;
 };
@@ -264,6 +265,23 @@ static ssize_t force_ro_show(struct device *dev,
struct device_attribute *attr,
 return ret;
 }
 
+static ssize_t boot_enable_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+int ret;
+struct mmc_card *card;
+struct mmc_blk_data *md = mmc_blk_get(dev_to_disk(dev));
+
+md = mmc_blk_get(dev_to_disk(dev));
+card = md-queue.card;
+
+ret = snprintf(buf, PAGE_SIZE, %d,
+(card-ext_csd.part_config 
+ EXT_CSD_PART_CONFIG_EN_MASK)  3);
+mmc_blk_put(md);
+return ret;
+}
+
 static ssize_t force_ro_store(struct device *dev, struct
device_attribute *attr,
   const char *buf, size_t count)
 {
@@ -283,6 +301,48 @@ out:
 return ret;
 }
 
+static ssize_t boot_enable_store(struct device *dev,
+  struct device_attribute *attr, const char *buf,
+  size_t count)
+{
+int ret;
+char *end;
+u8 part_config;
+struct mmc_card *card;
+struct mmc_blk_data *md = mmc_blk_get(dev_to_disk(dev));
+unsigned long set = simple_strtoul(buf, end, 0);
+if (end == buf) {
+ret = -EINVAL;
+goto out;
+}
+
+md = mmc_blk_get(dev_to_disk(dev));
+card = md-queue.card;
+
+part_config = card-ext_csd.part_config;
+
+part_config = EXT_CSD_PART_CONFIG_EN_MASK;
+part_config |= (set  3)  EXT_CSD_PART_CONFIG_EN_MASK;
+
+mmc_claim_host(card-host);
+
+ret = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
+ EXT_CSD_PART_CONFIG, part_config,
+ card-ext_csd.part_time);
+
+mmc_release_host(card-host);
+
+if (ret)
+return ret;
+
+card-ext_csd.part_config = part_config;
+
+ret = count;
+out:
+mmc_blk_put(md);
+return ret;
+}
+
 static int mmc_blk_open(struct block_device *bdev, fmode_t mode)
 {
 struct mmc_blk_data *md = mmc_blk_get(bdev-bd_disk);
@@ -2202,6 +2262,15 @@ static int mmc_add_disk(struct mmc_blk_data *md)
 if (ret)
 goto force_ro_fail;
 
+md-boot_enable.show = boot_enable_show;
+md-boot_enable.store = boot_enable_store;
+sysfs_attr_init(md-boot_enable.attr);
+md-boot_enable.attr.name = boot_enable;
+md-boot_enable.attr.mode = S_IRUGO | S_IWUSR;
+ret = device_create_file(disk_to_dev(md-disk), md-boot_enable);
+if (ret)
+goto boot_enable_fail;
+
 if ((md-area_type  MMC_BLK_DATA_AREA_BOOT) 
  card-ext_csd.boot_ro_lockable) {
 umode_t mode;
@@ -2225,6 +2294,8 @@ static int mmc_add_disk(struct mmc_blk_data *md)
 return ret;
 
 power_ro_lock_fail:
+device_remove_file(disk_to_dev(md-disk), md-boot_enable);
+boot_enable_fail:
 device_remove_file(disk_to_dev(md-disk), md-force_ro);
 force_ro_fail:
 del_gendisk(md-disk);
@@ -2434,4 +2505,3 @@ module_exit(mmc_blk_exit);
 
 MODULE_LICENSE(GPL);
 MODULE_DESCRIPTION(Multimedia Card (MMC) block device driver);
-
-- 
1.7.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 3/3] Add Documentation for MMC boot_enable attribute

2013-04-19 Thread Neil Armstrong

Add documentation on the enable_boot sysfs attribute.

Signed-off-by: Neil Armstrong narmstr...@neotion.com
---
 Documentation/mmc/mmc-dev-parts.txt |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/Documentation/mmc/mmc-dev-parts.txt
b/Documentation/mmc/mmc-dev-parts.txt
index f08d078..78228de 100644
--- a/Documentation/mmc/mmc-dev-parts.txt
+++ b/Documentation/mmc/mmc-dev-parts.txt
@@ -38,3 +38,9 @@ feature has been disabled on the card, the file will
be read-only.
 The boot partitions can also be locked permanently, but this feature is
 not accessible through sysfs in order to avoid accidental or malicious
 bricking.
+
+A special attribute named boot_enable is available to configure the
+selected partition for the eMMC 4.3+ boot operation mode.
+When selected between the two factory boot partitions and the main
+user partition, at boot time a special sequence enables makes the
+eMMC device to output the content of the selected partition.
-- 
1.7.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 0/3] Add boot_enable attribute to eMMC device for boot mode operation selection

2013-04-22 Thread Neil Armstrong

On 04/22/2013 06:55 AM, Namjae Jeon wrote:
2013/4/19, Neil Armstrong narmstr...@neotion.com:
Since eMMC 4.3 a special boot mode operation was introduced to retrieve
data from the eMMC device with a very simple procedure. Since the Linux
kernel exports these device boot partitions, it may be useful to select
the boot partition from the user space.

The patch has been tested on a Toshiba eMMC conforming with eMMC 4.5
specifications.
Hi Neil.
We can be enable boot partition using mmc-utils.
See this address.
https://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/commit/?id=7bd1320b2cb38f040ab5cf017d17e283496690bf

So, I don't think this patch is useful.
If you consider to be disable boot partition, you can try to update
mmc-utils base on the address I shared.

Thanks.

Neil Armstrong (3):
Add BOOT_PARTITION_ENABLE definition to MMC EXT_CSD PART_CONFIG
Add boot_enable sysfs attribute to select MMC boot operation
partition
Add Documentation for MMC boot_enable attribute

Documentation/mmc/mmc-dev-parts.txt |6 +++
drivers/mmc/card/block.c| 72
++-
include/linux/mmc/mmc.h |1 +
3 files changed, 78 insertions(+), 1 deletions(-)

Hi,
Thanks for the reply, I was not aware of the mmc-utils tools. I think
the tool and the MMC_IOC_CMD interface should be documented in the kernel.

Please ignore my patch.

Regards,
Neil
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

[PATCH] Fix coding style issue in xlr_net.c

2014-03-28 Thread Neil Armstrong

checkpatch script returns the following warning:
WARNING: line over 80 characters
310: FILE: drivers/staging/netlogic/xlr_net.c:310:
+   void *accel_priv, select_queue_fallback_t fallback)

This patch fixes the coding style issue.

Signed-off-by: Neil Armstrong superna9...@gmail.com
---
 drivers/staging/netlogic/xlr_net.c |3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/drivers/staging/netlogic/xlr_net.c
b/drivers/staging/netlogic/xlr_net.c
index 31b269a..cef0b8a 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -307,7 +307,8 @@ static netdev_tx_t xlr_net_start_xmit(struct sk_buff
*skb,
 }

 static u16 xlr_net_select_queue(struct net_device *ndev, struct sk_buff
*skb,
-   void *accel_priv, select_queue_fallback_t 
fallback)
+   struct sk_buff *skb, void *accel_priv,
+   select_queue_fallback_t fallback)
 {
return (u16)smp_processor_id();
 }
-- 
1.7.0.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] Staging: netlogic: long lines in xlr_net.c

2014-03-28 Thread Neil Armstrong

checkpatch script returns the following warning:
WARNING: line over 80 characters
310: FILE: drivers/staging/netlogic/xlr_net.c:310:
+   void *accel_priv, select_queue_fallback_t fallback)

This patch fixes the coding style issue.

Signed-off-by: Neil Armstrong superna9...@gmail.com
---
 drivers/staging/netlogic/xlr_net.c |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/netlogic/xlr_net.c 
b/drivers/staging/netlogic/xlr_net.c
index 31b269a..5e7d271 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -306,8 +306,9 @@ static netdev_tx_t xlr_net_start_xmit(struct sk_buff *skb,
return NETDEV_TX_OK;
 }
 
-static u16 xlr_net_select_queue(struct net_device *ndev, struct sk_buff *skb,
-   void *accel_priv, select_queue_fallback_t 
fallback)
+static u16 xlr_net_select_queue(struct net_device *ndev,
+   struct sk_buff *skb, void *accel_priv,
+   select_queue_fallback_t fallback)
 {
return (u16)smp_processor_id();
 }
-- 
1.7.0.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] staging: rts5139: fix bad symbol declaration

2014-04-11 Thread Neil Armstrong

With sparse, the following error appears :
  CHECK   drivers/staging/rts5139/ms_mg.c
drivers/staging/rts5139/ms_mg.c:82:5: warning: symbol 'mg_set_tpc_para_sub' was 
not declared. Should it be static?

Rename function with correct prefix and move declaration to coherent internal 
header file.

Signed-off-by: Neil 'Superna' Armstrong superna9...@gmail.com
---
 drivers/staging/rts5139/ms.c|7 ++-
 drivers/staging/rts5139/ms_mg.c |2 +-
 drivers/staging/rts5139/ms_mg.h |1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/rts5139/ms.c b/drivers/staging/rts5139/ms.c
index 390292a..a843a2f 100644
--- a/drivers/staging/rts5139/ms.c
+++ b/drivers/staging/rts5139/ms.c
@@ -36,6 +36,7 @@
 #include rts51x_scsi.h
 #include rts51x_card.h
 #include ms.h
+#include ms_mg.h
 
 static inline void ms_set_err_code(struct rts51x_chip *chip, u8 err_code)
 {
@@ -1183,10 +1184,6 @@ static int ms_read_attribute_info(struct rts51x_chip 
*chip)
return STATUS_SUCCESS;
 }
 
-#ifdef SUPPORT_MAGIC_GATE
-int mg_set_tpc_para_sub(struct rts51x_chip *chip, int type, u8 mg_entry_num);
-#endif
-
 static int reset_ms_pro(struct rts51x_chip *chip)
 {
struct ms_info *ms_card = (chip-ms_card);
@@ -1232,7 +1229,7 @@ Retry:
 #endif
 
 #ifdef SUPPORT_MAGIC_GATE
-   retval = mg_set_tpc_para_sub(chip, 0, 0);
+   retval = rts51x_mg_set_tpc_para_sub(chip, 0, 0);
if (retval != STATUS_SUCCESS)
TRACE_RET(chip, retval);
 #endif
diff --git a/drivers/staging/rts5139/ms_mg.c b/drivers/staging/rts5139/ms_mg.c
index 00862c1..c8f2606 100644
--- a/drivers/staging/rts5139/ms_mg.c
+++ b/drivers/staging/rts5139/ms_mg.c
@@ -79,7 +79,7 @@ static int mg_send_ex_cmd(struct rts51x_chip *chip, u8 cmd, 
u8 entry_num)
return STATUS_SUCCESS;
 }
 
-int mg_set_tpc_para_sub(struct rts51x_chip *chip, int type, u8 mg_entry_num)
+int rts51x_mg_set_tpc_para_sub(struct rts51x_chip *chip, int type, u8 
mg_entry_num)
 {
int retval;
u8 buf[6];
diff --git a/drivers/staging/rts5139/ms_mg.h b/drivers/staging/rts5139/ms_mg.h
index d15733a..109c712 100644
--- a/drivers/staging/rts5139/ms_mg.h
+++ b/drivers/staging/rts5139/ms_mg.h
@@ -30,6 +30,7 @@
 #include rts51x_chip.h
 #include ms.h
 
+int rts51x_mg_set_tpc_para_sub(struct rts51x_chip *chip, int type, u8 
mg_entry_num);
 int rts51x_mg_set_leaf_id(struct scsi_cmnd *srb, struct rts51x_chip *chip);
 int rts51x_mg_get_local_EKB(struct scsi_cmnd *srb, struct rts51x_chip *chip);
 int rts51x_mg_chg(struct scsi_cmnd *srb, struct rts51x_chip *chip);
-- 
1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] staging: vt6656: fix bad symbol declaration

2014-04-11 Thread Neil Armstrong

With sparse, the following error appears :
  CHECK   drivers/staging/vt6656/aes_ccmp.c
drivers/staging/vt6656/aes_ccmp.c:221:6: warning: symbol 'AESbGenCCMP' was not 
declared. Should it be static?

Add correct include header in order to have function declaration.

Signed-off-by: Neil 'Superna' Armstrong superna9...@gmail.com
---
 drivers/staging/vt6656/aes_ccmp.c |1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/vt6656/aes_ccmp.c 
b/drivers/staging/vt6656/aes_ccmp.c
index e2bfa8d..a9d5168 100644
--- a/drivers/staging/vt6656/aes_ccmp.c
+++ b/drivers/staging/vt6656/aes_ccmp.c
@@ -32,6 +32,7 @@
 
 #include device.h
 #include 80211hdr.h
+#include aes_ccmp.h
 
 /*
  * SBOX Table
-- 
1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] staging: wlan-ng: fix bad symbol declaration

2014-04-11 Thread Neil Armstrong

With sparse, the following error appears :
  CHECK   drivers/staging/wlan-ng/p80211netdev.c
drivers/staging/wlan-ng/cfg80211.c:710:6: warning: symbol 
'prism2_connect_result' was not declared. Should it be static?
drivers/staging/wlan-ng/cfg80211.c:719:6: warning: symbol 'prism2_disconnected' 
was not declared. Should it be static?
drivers/staging/wlan-ng/cfg80211.c:725:6: warning: symbol 'prism2_roamed' was 
not declared. Should it be static?

Move functions declaration to coherent internal header file.

Signed-off-by: Neil 'Superna' Armstrong superna9...@gmail.com
---
 drivers/staging/wlan-ng/prism2mgmt.h |5 +
 drivers/staging/wlan-ng/prism2sta.c  |4 
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2mgmt.h 
b/drivers/staging/wlan-ng/prism2mgmt.h
index 190d390..b62fdcb 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.h
+++ b/drivers/staging/wlan-ng/prism2mgmt.h
@@ -109,4 +109,9 @@ void prism2sta_processing_defer(struct work_struct *data);
 void prism2sta_commsqual_defer(struct work_struct *data);
 void prism2sta_commsqual_timer(unsigned long data);
 
+/* Interface callback functions, passing data back up to the cfg80211 layer */
+void prism2_connect_result(wlandevice_t *wlandev, u8 failed);
+void prism2_disconnected(wlandevice_t *wlandev);
+void prism2_roamed(wlandevice_t *wlandev);
+
 #endif
diff --git a/drivers/staging/wlan-ng/prism2sta.c 
b/drivers/staging/wlan-ng/prism2sta.c
index f9ccf23..3fd4538 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -120,10 +120,6 @@ MODULE_PARM_DESC(prism2_reset_settletime, reset settle 
time in ms);
 
 MODULE_LICENSE(Dual MPL/GPL);
 
-void prism2_connect_result(wlandevice_t *wlandev, u8 failed);
-void prism2_disconnected(wlandevice_t *wlandev);
-void prism2_roamed(wlandevice_t *wlandev);
-
 static int prism2sta_open(wlandevice_t *wlandev);
 static int prism2sta_close(wlandevice_t *wlandev);
 static void prism2sta_reset(wlandevice_t *wlandev);
-- 
1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] Staging: silicom: fix dangerous if condition in bpctl_mod.c

2014-04-01 Thread Neil Armstrong

checkpatch script returns the following warning:
ERROR: do not use assignment in if condition
+   if (((dev_num = get_dev_idx(dev-ifindex)) ==
-1) |

This patch fixes the if condition by splitting it.

Signed-off-by: Neil Armstrong superna9...@gmail.com
---
 drivers/staging/silicom/bpctl_mod.c |8 ++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/silicom/bpctl_mod.c 
b/drivers/staging/silicom/bpctl_mod.c
index 6b9365b..3b4db2a 100644
--- a/drivers/staging/silicom/bpctl_mod.c
+++ b/drivers/staging/silicom/bpctl_mod.c
@@ -220,8 +220,12 @@ static int bp_device_event(struct notifier_block *unused,
if (netif_carrier_ok(dev))
return NOTIFY_DONE;
 
-   if (((dev_num = get_dev_idx(dev-ifindex)) == -1) ||
-   (!(pbpctl_dev = bpctl_dev_arr[dev_num])))
+   dev_num = get_dev_idx(dev-ifindex);
+   if (dev_num == -1)
+   return NOTIFY_DONE;
+
+   pbpctl_dev = bpctl_dev_arr[dev_num];
+   if (!pbpctl_dev)
return NOTIFY_DONE;
 
if ((is_bypass_fn(pbpctl_dev)) == 1)
-- 
1.7.0.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 0/2] net: macb: Handle RX errors

2014-07-18 Thread Neil Armstrong

On our hardware, the MACB connected to a heavilly used AXI bus, fails to
correctly write RX descriptors.

This leds to RX ring errors that can be managed.

These patchs add RX error management according to the Cadence MACB User Guide.

The first patch separates the RX and TX rings init in order to reuse the RX 
ring init.

Neil Armstrong (2):
  net: macb: Separate rx and tx ring init function
  net: macb: Handle errors in RX path

 drivers/net/ethernet/cadence/macb.c |   88 +--
 drivers/net/ethernet/cadence/macb.h |3 +-
 2 files changed, 76 insertions(+), 15 deletions(-)
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/2] net: macb: Handle errors in RX path

2014-07-18 Thread Neil Armstrong

In certain circumstances, the MACB fails to write correct RX ring
descriptor, and lead to actually managed by BUG_ON() error cases.

Handle these two cases by returning error values, while resetting
the RX ring and RX HW path in the poll methos.

In the same time, check and handle BNA and OVR into poll method
by using the same error management.

Signed-off-by: Neil Armstrong narmstr...@neotion.com
---
 drivers/net/ethernet/cadence/macb.c |   55 +++---
 1 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.c 
b/drivers/net/ethernet/cadence/macb.c
index 20ad483..c94355d 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -755,6 +755,17 @@ static int macb_rx_frame(struct macb *bp, unsigned int 
first_frag,
macb_rx_ring_wrap(first_frag),
macb_rx_ring_wrap(last_frag), len);
 
+   if (!(desc-ctrl  MACB_BIT(RX_EOF))) {
+   netdev_vdbg(bp-dev, macb_rx_frame missing EOF\n);
+   return -EIO;
+   }
+
+   desc = macb_rx_desc(bp, first_frag);
+   if (!(desc-ctrl  MACB_BIT(RX_SOF))) {
+   netdev_vdbg(bp-dev, macb_rx_frame missing SOF\n);
+   return -EIO;
+   }
+
/*
 * The ethernet header starts NET_IP_ALIGN bytes into the
 * first buffer. Since the header is 14 bytes, this makes the
@@ -789,7 +800,10 @@ static int macb_rx_frame(struct macb *bp, unsigned int 
first_frag,
unsigned int frag_len = bp-rx_buffer_size;
 
if (offset + frag_len  len) {
-   BUG_ON(frag != last_frag);
+   if(frag != last_frag) {
+   dev_kfree_skb_any(skb);
+   return -EIO;
+   }
frag_len = len - offset;
}
skb_copy_to_linear_data_offset(skb, offset,
@@ -844,9 +858,13 @@ static int macb_rx(struct macb *bp, int budget)
 
if (ctrl  MACB_BIT(RX_EOF)) {
int dropped;
-   BUG_ON(first_frag == -1);
+   if (first_frag == -1)
+   return -EIO;
 
dropped = macb_rx_frame(bp, first_frag, tail);
+   if (dropped  0)
+   return dropped;
+
first_frag = -1;
if (!dropped) {
received++;
@@ -872,12 +890,22 @@ static int macb_poll(struct napi_struct *napi, int budget)
status = macb_readl(bp, RSR);
macb_writel(bp, RSR, status);
 
-   work_done = 0;
+   work_done = -EIO;
 
netdev_vdbg(bp-dev, poll: status = %08lx, budget = %d\n,
-  (unsigned long)status, budget);
+   (unsigned long)status, budget);
+
+   if (status  (MACB_BIT(OVR) | MACB_BIT(BNA)) ||
+   !(status  MACB_BIT(REC))) {
+   netdev_err(bp-dev, RX error, status = %02lx\n,
+   (unsigned long)status);
+   goto rx_out;
+   }
 
work_done = bp-macbgem_ops.mog_rx(bp, budget);
+   if (work_done  0)
+   goto rx_out;
+
if (work_done  budget) {
napi_complete(napi);
 
@@ -892,7 +920,24 @@ static int macb_poll(struct napi_struct *napi, int budget)
}
}
 
-   /* TODO: Handle errors */
+   return work_done;
+
+rx_out:
+   /* 
+* In case of error, disable RX and reset
+* the descriptor ring before re-enabling RX.
+*/
+   macb_writel(bp, NCR, macb_readl(bp, NCR)  ~MACB_BIT(RE));
+
+   bp-macbgem_ops.mog_init_rx_rings(bp);
+   macb_writel(bp, RBQP, bp-rx_ring_dma);
+
+   /* Re-enable RX and get notified for new packets */
+   macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE));
+
+   napi_complete(napi);
+
+   macb_writel(bp, IER, MACB_RX_INT_FLAGS);
 
return work_done;
 }
-- 
1.7.0.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 1/2] net: macb: Separate rx and tx ring init function

2014-07-18 Thread Neil Armstrong

A single method is called to initialize the TX and RX
rings. Separate the methods into distinct ones for
MACB and GEM context.

Signed-off-by: Neil Armstrong narmstr...@neotion.com
---
 drivers/net/ethernet/cadence/macb.c |   33 -
 drivers/net/ethernet/cadence/macb.h |3 ++-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.c 
b/drivers/net/ethernet/cadence/macb.c
index e9daa07..20ad483 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1219,7 +1219,14 @@ out_err:
return -ENOMEM;
 }
 
-static void gem_init_rings(struct macb *bp)
+static void gem_init_rx_rings(struct macb *bp)
+{
+   bp-rx_tail = bp-rx_prepared_head = 0;
+
+   gem_rx_refill(bp);
+}
+
+static void gem_init_tx_rings(struct macb *bp)
 {
int i;
 
@@ -1229,12 +1236,10 @@ static void gem_init_rings(struct macb *bp)
}
bp-tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
 
-   bp-rx_tail = bp-rx_prepared_head = bp-tx_head = bp-tx_tail = 0;
-
-   gem_rx_refill(bp);
+   bp-tx_head = bp-tx_tail = 0;
 }
 
-static void macb_init_rings(struct macb *bp)
+static void macb_init_rx_rings(struct macb *bp)
 {
int i;
dma_addr_t addr;
@@ -1247,13 +1252,20 @@ static void macb_init_rings(struct macb *bp)
}
bp-rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
 
+   bp-rx_tail = 0;
+}
+
+static void macb_init_tx_rings(struct macb *bp)
+{
+   int i;
+
for (i = 0; i  TX_RING_SIZE; i++) {
bp-tx_ring[i].addr = 0;
bp-tx_ring[i].ctrl = MACB_BIT(TX_USED);
}
bp-tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
 
-   bp-rx_tail = bp-tx_head = bp-tx_tail = 0;
+   bp-tx_head = bp-tx_tail = 0;
 }
 
 static void macb_reset_hw(struct macb *bp)
@@ -1554,7 +1566,8 @@ static int macb_open(struct net_device *dev)
 
napi_enable(bp-napi);
 
-   bp-macbgem_ops.mog_init_rings(bp);
+   bp-macbgem_ops.mog_init_rx_rings(bp);
+   bp-macbgem_ops.mog_init_tx_rings(bp);
macb_init_hw(bp);
 
/* schedule a link state check */
@@ -1901,12 +1914,14 @@ static int __init macb_probe(struct platform_device 
*pdev)
if (macb_is_gem(bp)) {
bp-macbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers;
bp-macbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers;
-   bp-macbgem_ops.mog_init_rings = gem_init_rings;
+   bp-macbgem_ops.mog_init_rx_rings = gem_init_rx_rings;
+   bp-macbgem_ops.mog_init_tx_rings = gem_init_tx_rings;
bp-macbgem_ops.mog_rx = gem_rx;
} else {
bp-macbgem_ops.mog_alloc_rx_buffers = macb_alloc_rx_buffers;
bp-macbgem_ops.mog_free_rx_buffers = macb_free_rx_buffers;
-   bp-macbgem_ops.mog_init_rings = macb_init_rings;
+   bp-macbgem_ops.mog_init_rx_rings = macb_init_rx_rings;
+   bp-macbgem_ops.mog_init_tx_rings = macb_init_tx_rings;
bp-macbgem_ops.mog_rx = macb_rx;
}
 
diff --git a/drivers/net/ethernet/cadence/macb.h 
b/drivers/net/ethernet/cadence/macb.h
index 51c0244..8016d08 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -550,7 +550,8 @@ struct macb;
 struct macb_or_gem_ops {
int (*mog_alloc_rx_buffers)(struct macb *bp);
void(*mog_free_rx_buffers)(struct macb *bp);
-   void(*mog_init_rings)(struct macb *bp);
+   void(*mog_init_rx_rings)(struct macb *bp);
+   void(*mog_init_tx_rings)(struct macb *bp);
int (*mog_rx)(struct macb *bp, int budget);
 };
 
-- 
1.7.0.4
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 1/2] net: macb: Separate rx and tx ring init function

2014-07-18 Thread Neil Armstrong

Le 18/07/2014 12:10, Varka Bhadram a écrit :
 On 07/18/2014 03:22 PM, Neil Armstrong wrote:
 A single method is called to initialize the TX and RX
 rings. Separate the methods into distinct ones for
 MACB and GEM context.

 Signed-off-by: Neil Armstrong narmstr...@neotion.com
 ---
   drivers/net/ethernet/cadence/macb.c |   33 
 -
   drivers/net/ethernet/cadence/macb.h |3 ++-
   2 files changed, 26 insertions(+), 10 deletions(-)

 diff --git a/drivers/net/ethernet/cadence/macb.c 
 b/drivers/net/ethernet/cadence/macb.c
 index e9daa07..20ad483 100644
 --- a/drivers/net/ethernet/cadence/macb.c
 +++ b/drivers/net/ethernet/cadence/macb.c
 @@ -1219,7 +1219,14 @@ out_err:
  return -ENOMEM;
   }
   
 -static void gem_init_rings(struct macb *bp)
 +static void gem_init_rx_rings(struct macb *bp)
 +{
 +bp-rx_tail = bp-rx_prepared_head = 0;
 +
 +gem_rx_refill(bp);
 +}
 +
 +static void gem_init_tx_rings(struct macb *bp)
   {
  int i;
   
 @@ -1229,12 +1236,10 @@ static void gem_init_rings(struct macb *bp)
  }
  bp-tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
   
 -bp-rx_tail = bp-rx_prepared_head = bp-tx_head = bp-tx_tail = 0;
 -
 -gem_rx_refill(bp);
 +bp-tx_head = bp-tx_tail = 0;
 
 This is not the preferred way of doing it
 
 multiple assignments should be avoided
Should I change it ? I only moved the lines, the logic hasn't changed.
 
   }
   
 -static void macb_init_rings(struct macb *bp)
 +static void macb_init_rx_rings(struct macb *bp)
   {
  int i;
  dma_addr_t addr;
 @@ -1247,13 +1252,20 @@ static void macb_init_rings(struct macb *bp)
  }
  bp-rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
   
 +bp-rx_tail = 0;
 +}
 +
 +static void macb_init_tx_rings(struct macb *bp)
 +{
 +int i;
 +
  for (i = 0; i  TX_RING_SIZE; i++) {
  bp-tx_ring[i].addr = 0;
  bp-tx_ring[i].ctrl = MACB_BIT(TX_USED);
  }
  bp-tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
   
 -bp-rx_tail = bp-tx_head = bp-tx_tail = 0;
 +bp-tx_head = bp-tx_tail = 0;
 
 Dto...
Idem, it was like this before.
 
   }
   
   static void macb_reset_hw(struct macb *bp)
 @@ -1554,7 +1566,8 @@ static int macb_open(struct net_device *dev)
   
  napi_enable(bp-napi);
   
 -bp-macbgem_ops.mog_init_rings(bp);
 +bp-macbgem_ops.mog_init_rx_rings(bp);
 +bp-macbgem_ops.mog_init_tx_rings(bp);
  macb_init_hw(bp);
   
  /* schedule a link state check */
 @@ -1901,12 +1914,14 @@ static int __init macb_probe(struct platform_device 
 *pdev)
  if (macb_is_gem(bp)) {
  bp-macbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers;
  bp-macbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers;
 -bp-macbgem_ops.mog_init_rings = gem_init_rings;
 +bp-macbgem_ops.mog_init_rx_rings = gem_init_rx_rings;
 +bp-macbgem_ops.mog_init_tx_rings = gem_init_tx_rings;
  bp-macbgem_ops.mog_rx = gem_rx;
  } else {
  bp-macbgem_ops.mog_alloc_rx_buffers = macb_alloc_rx_buffers;
  bp-macbgem_ops.mog_free_rx_buffers = macb_free_rx_buffers;
 -bp-macbgem_ops.mog_init_rings = macb_init_rings;
 +bp-macbgem_ops.mog_init_rx_rings = macb_init_rx_rings;
 +bp-macbgem_ops.mog_init_tx_rings = macb_init_tx_rings;
  bp-macbgem_ops.mog_rx = macb_rx;
  }
   
 diff --git a/drivers/net/ethernet/cadence/macb.h 
 b/drivers/net/ethernet/cadence/macb.h
 index 51c0244..8016d08 100644
 --- a/drivers/net/ethernet/cadence/macb.h
 +++ b/drivers/net/ethernet/cadence/macb.h
 @@ -550,7 +550,8 @@ struct macb;
   struct macb_or_gem_ops {
  int (*mog_alloc_rx_buffers)(struct macb *bp);
  void(*mog_free_rx_buffers)(struct macb *bp);
 -void(*mog_init_rings)(struct macb *bp);
 +void(*mog_init_rx_rings)(struct macb *bp);
 +void(*mog_init_tx_rings)(struct macb *bp);
  int (*mog_rx)(struct macb *bp, int budget);
   };
   
 
 

Do I need to make a corrective patch for multiple assignments before ?
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 2/2 v2] net: macb: Handle errors in RX path

2014-07-18 Thread Neil Armstrong

In certain circumstances, the MACB fails to write correct RX ring
descriptor, and lead to actually managed by BUG_ON() error cases.

Handle these two cases by returning error values, while resetting
the RX ring and RX HW path in the poll methos.

In the same time, check and handle BNA and OVR into poll method
by using the same error management.

Signed-off-by: Neil Armstrong narmstr...@neotion.com
---
 drivers/net/ethernet/cadence/macb.c |   54 +++---
 1 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.c 
b/drivers/net/ethernet/cadence/macb.c
index 20ad483..f88ebc9 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -755,6 +755,17 @@ static int macb_rx_frame(struct macb *bp, unsigned int 
first_frag,
macb_rx_ring_wrap(first_frag),
macb_rx_ring_wrap(last_frag), len);
 
+   if (!(desc-ctrl  MACB_BIT(RX_EOF))) {
+   netdev_vdbg(bp-dev, macb_rx_frame missing EOF\n);
+   return -EIO;
+   }
+
+   desc = macb_rx_desc(bp, first_frag);
+   if (!(desc-ctrl  MACB_BIT(RX_SOF))) {
+   netdev_vdbg(bp-dev, macb_rx_frame missing SOF\n);
+   return -EIO;
+   }
+
/*
 * The ethernet header starts NET_IP_ALIGN bytes into the
 * first buffer. Since the header is 14 bytes, this makes the
@@ -789,7 +800,10 @@ static int macb_rx_frame(struct macb *bp, unsigned int 
first_frag,
unsigned int frag_len = bp-rx_buffer_size;
 
if (offset + frag_len  len) {
-   BUG_ON(frag != last_frag);
+   if (frag != last_frag) {
+   dev_kfree_skb_any(skb);
+   return -EIO;
+   }
frag_len = len - offset;
}
skb_copy_to_linear_data_offset(skb, offset,
@@ -844,9 +858,13 @@ static int macb_rx(struct macb *bp, int budget)
 
if (ctrl  MACB_BIT(RX_EOF)) {
int dropped;
-   BUG_ON(first_frag == -1);
+   if (first_frag == -1)
+   return -EIO;
 
dropped = macb_rx_frame(bp, first_frag, tail);
+   if (dropped  0)
+   return dropped;
+
first_frag = -1;
if (!dropped) {
received++;
@@ -872,12 +890,22 @@ static int macb_poll(struct napi_struct *napi, int budget)
status = macb_readl(bp, RSR);
macb_writel(bp, RSR, status);
 
-   work_done = 0;
+   work_done = -EIO;
 
netdev_vdbg(bp-dev, poll: status = %08lx, budget = %d\n,
-  (unsigned long)status, budget);
+   (unsigned long)status, budget);
+
+   if (status  (MACB_BIT(OVR) | MACB_BIT(BNA)) ||
+   !(status  MACB_BIT(REC))) {
+   netdev_err(bp-dev, RX error, status = %02lx\n,
+  (unsigned long)status);
+   goto rx_out;
+   }
 
work_done = bp-macbgem_ops.mog_rx(bp, budget);
+   if (work_done  0)
+   goto rx_out;
+
if (work_done  budget) {
napi_complete(napi);
 
@@ -892,7 +920,23 @@ static int macb_poll(struct napi_struct *napi, int budget)
}
}
 
-   /* TODO: Handle errors */
+   return work_done;
+
+rx_out:
+   /* In case of error, disable RX and reset
+* the descriptor ring before re-enabling RX.
+*/
+   macb_writel(bp, NCR, macb_readl(bp, NCR)  ~MACB_BIT(RE));
+
+   bp-macbgem_ops.mog_init_rx_rings(bp);
+   macb_writel(bp, RBQP, bp-rx_ring_dma);
+
+   /* Re-enable RX and get notified for new packets */
+   macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE));
+
+   napi_complete(napi);
+
+   macb_writel(bp, IER, MACB_RX_INT_FLAGS);
 
return work_done;
 }
-- 
1.7.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 1/2] net: macb: Separate rx and tx ring init function

2014-07-18 Thread Neil Armstrong

A single method is called to initialize the TX and RX rings.
Separate the methods into distinct ones for MACB and GEM contexts.
Also remove the multiple assignments from the original code.

Signed-off-by: Neil Armstrong narmstr...@neotion.com
---
 drivers/net/ethernet/cadence/macb.c |   36 ++
 drivers/net/ethernet/cadence/macb.h |3 +-
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.c 
b/drivers/net/ethernet/cadence/macb.c
index e9daa07..4d73110 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -1219,7 +1219,15 @@ out_err:
return -ENOMEM;
 }
 
-static void gem_init_rings(struct macb *bp)
+static void gem_init_rx_rings(struct macb *bp)
+{
+   bp-rx_tail = 0;
+   bp-rx_prepared_head = 0;
+
+   gem_rx_refill(bp);
+}
+
+static void gem_init_tx_rings(struct macb *bp)
 {
int i;
 
@@ -1229,12 +1237,11 @@ static void gem_init_rings(struct macb *bp)
}
bp-tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
 
-   bp-rx_tail = bp-rx_prepared_head = bp-tx_head = bp-tx_tail = 0;
-
-   gem_rx_refill(bp);
+   bp-tx_head = 0;
+   bp-tx_tail = 0;
 }
 
-static void macb_init_rings(struct macb *bp)
+static void macb_init_rx_rings(struct macb *bp)
 {
int i;
dma_addr_t addr;
@@ -1247,13 +1254,21 @@ static void macb_init_rings(struct macb *bp)
}
bp-rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
 
+   bp-rx_tail = 0;
+}
+
+static void macb_init_tx_rings(struct macb *bp)
+{
+   int i;
+
for (i = 0; i  TX_RING_SIZE; i++) {
bp-tx_ring[i].addr = 0;
bp-tx_ring[i].ctrl = MACB_BIT(TX_USED);
}
bp-tx_ring[TX_RING_SIZE - 1].ctrl |= MACB_BIT(TX_WRAP);
 
-   bp-rx_tail = bp-tx_head = bp-tx_tail = 0;
+   bp-tx_head = 0;
+   bp-tx_tail = 0;
 }
 
 static void macb_reset_hw(struct macb *bp)
@@ -1554,7 +1569,8 @@ static int macb_open(struct net_device *dev)
 
napi_enable(bp-napi);
 
-   bp-macbgem_ops.mog_init_rings(bp);
+   bp-macbgem_ops.mog_init_rx_rings(bp);
+   bp-macbgem_ops.mog_init_tx_rings(bp);
macb_init_hw(bp);
 
/* schedule a link state check */
@@ -1901,12 +1917,14 @@ static int __init macb_probe(struct platform_device 
*pdev)
if (macb_is_gem(bp)) {
bp-macbgem_ops.mog_alloc_rx_buffers = gem_alloc_rx_buffers;
bp-macbgem_ops.mog_free_rx_buffers = gem_free_rx_buffers;
-   bp-macbgem_ops.mog_init_rings = gem_init_rings;
+   bp-macbgem_ops.mog_init_rx_rings = gem_init_rx_rings;
+   bp-macbgem_ops.mog_init_tx_rings = gem_init_tx_rings;
bp-macbgem_ops.mog_rx = gem_rx;
} else {
bp-macbgem_ops.mog_alloc_rx_buffers = macb_alloc_rx_buffers;
bp-macbgem_ops.mog_free_rx_buffers = macb_free_rx_buffers;
-   bp-macbgem_ops.mog_init_rings = macb_init_rings;
+   bp-macbgem_ops.mog_init_rx_rings = macb_init_rx_rings;
+   bp-macbgem_ops.mog_init_tx_rings = macb_init_tx_rings;
bp-macbgem_ops.mog_rx = macb_rx;
}
 
diff --git a/drivers/net/ethernet/cadence/macb.h 
b/drivers/net/ethernet/cadence/macb.h
index 51c0244..8016d08 100644
--- a/drivers/net/ethernet/cadence/macb.h
+++ b/drivers/net/ethernet/cadence/macb.h
@@ -550,7 +550,8 @@ struct macb;
 struct macb_or_gem_ops {
int (*mog_alloc_rx_buffers)(struct macb *bp);
void(*mog_free_rx_buffers)(struct macb *bp);
-   void(*mog_init_rings)(struct macb *bp);
+   void(*mog_init_rx_rings)(struct macb *bp);
+   void(*mog_init_tx_rings)(struct macb *bp);
int (*mog_rx)(struct macb *bp, int budget);
 };
 
-- 
1.7.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 2/2] net: macb: Handle errors in RX path

2014-07-18 Thread Neil Armstrong

In certain circumstances, the MACB fails to write correct RX ring
descriptor, and lead to actually managed by BUG_ON() error cases.

Handle these two cases by returning error values, while resetting
the RX ring and RX HW path in the poll methos.

In the same time, check and handle BNA and OVR into poll method
by using the same error management.

Signed-off-by: Neil Armstrong narmstr...@neotion.com
---
 drivers/net/ethernet/cadence/macb.c |   54 +++---
 1 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/cadence/macb.c 
b/drivers/net/ethernet/cadence/macb.c
index 4d73110..81429df 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -755,6 +755,17 @@ static int macb_rx_frame(struct macb *bp, unsigned int 
first_frag,
macb_rx_ring_wrap(first_frag),
macb_rx_ring_wrap(last_frag), len);
 
+   if (!(desc-ctrl  MACB_BIT(RX_EOF))) {
+   netdev_vdbg(bp-dev, macb_rx_frame missing EOF\n);
+   return -EIO;
+   }
+
+   desc = macb_rx_desc(bp, first_frag);
+   if (!(desc-ctrl  MACB_BIT(RX_SOF))) {
+   netdev_vdbg(bp-dev, macb_rx_frame missing SOF\n);
+   return -EIO;
+   }
+
/*
 * The ethernet header starts NET_IP_ALIGN bytes into the
 * first buffer. Since the header is 14 bytes, this makes the
@@ -789,7 +800,10 @@ static int macb_rx_frame(struct macb *bp, unsigned int 
first_frag,
unsigned int frag_len = bp-rx_buffer_size;
 
if (offset + frag_len  len) {
-   BUG_ON(frag != last_frag);
+   if (frag != last_frag) {
+   dev_kfree_skb_any(skb);
+   return -EIO;
+   }
frag_len = len - offset;
}
skb_copy_to_linear_data_offset(skb, offset,
@@ -844,9 +858,13 @@ static int macb_rx(struct macb *bp, int budget)
 
if (ctrl  MACB_BIT(RX_EOF)) {
int dropped;
-   BUG_ON(first_frag == -1);
+   if (first_frag == -1)
+   return -EIO;
 
dropped = macb_rx_frame(bp, first_frag, tail);
+   if (dropped  0)
+   return dropped;
+
first_frag = -1;
if (!dropped) {
received++;
@@ -872,12 +890,22 @@ static int macb_poll(struct napi_struct *napi, int budget)
status = macb_readl(bp, RSR);
macb_writel(bp, RSR, status);
 
-   work_done = 0;
+   work_done = -EIO;
 
netdev_vdbg(bp-dev, poll: status = %08lx, budget = %d\n,
-  (unsigned long)status, budget);
+   (unsigned long)status, budget);
+
+   if (status  (MACB_BIT(OVR) | MACB_BIT(BNA)) ||
+   !(status  MACB_BIT(REC))) {
+   netdev_err(bp-dev, RX error, status = %02lx\n,
+  (unsigned long)status);
+   goto rx_out;
+   }
 
work_done = bp-macbgem_ops.mog_rx(bp, budget);
+   if (work_done  0)
+   goto rx_out;
+
if (work_done  budget) {
napi_complete(napi);
 
@@ -892,7 +920,23 @@ static int macb_poll(struct napi_struct *napi, int budget)
}
}
 
-   /* TODO: Handle errors */
+   return work_done;
+
+rx_out:
+   /* In case of error, disable RX and reset
+* the descriptor ring before re-enabling RX.
+*/
+   macb_writel(bp, NCR, macb_readl(bp, NCR)  ~MACB_BIT(RE));
+
+   bp-macbgem_ops.mog_init_rx_rings(bp);
+   macb_writel(bp, RBQP, bp-rx_ring_dma);
+
+   /* Re-enable RX and get notified for new packets */
+   macb_writel(bp, NCR, macb_readl(bp, NCR) | MACB_BIT(RE));
+
+   napi_complete(napi);
+
+   macb_writel(bp, IER, MACB_RX_INT_FLAGS);
 
return work_done;
 }
-- 
1.7.0.4

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v2 0/2] net: macb: Handle RX errors

2014-07-18 Thread Neil Armstrong

On our hardware, the MACB connected to a heavilly used AXI bus, fails to
correctly write RX descriptors.

This leds to RX ring errors that can be managed.

These patchs add RX error management according to the Cadence MACB User Guide.

The first patch separates the RX and TX rings init in order to reuse the RX 
ring init.

v2: fix multiple assignments in first patch, fix checkpatch errors in second 
patch.

Neil Armstrong (2):
  net: macb: Separate rx and tx ring init function
  net: macb: Handle errors in RX path

 drivers/net/ethernet/cadence/macb.c |   90 +-
 drivers/net/ethernet/cadence/macb.h |3 +-
 2 files changed, 78 insertions(+), 15 deletions(-)


--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH RFC] usb: gadget: dwc2: make driver run on a version 3.10a instance of DWC_OTG

2014-08-13 Thread Neil Armstrong

We are trying to make a driver run on our PCD only instance of Synopsys
DWC_OTG IP with the following parameters :
- Dedicated Fifos : Yes
- Descriptor DMA : Yes
- PHY : 8bit UTMI+ (may need also support for ULPI)
- Endpoints : 6 (7 with ep0)
- Periodic IN Endpoints : 0
- IN Endpoints : 3 (4 with ep0)
- EP repartition : INOUT, IN, OUT, IN , OUT, IN, OUT
- DFifo Depth : 1844

I do not know what is the original s3c hsotg IP config, but to
correctly support the Dedicated Fifos you need to attribute a FIFO
index for each IN endpoints, and on the 3.10a release we only have
4 TX FIFOS, so we just cannot give the EP number as fifo index.

It impacts the FIFO repartition, it is not perfect since we do
not take into account the Isochronous needs, so it needs some
rework.

To managed these FIFOs, I load from the registers the EP
repartition, HW fifo depth and HW revision.
It also impacts that hw_cfg must be done before init call.

Same for the num_of_eps value, in the Synopsys documentation,
it specifies it is the count of non-ep0 endpoints, but the
driver for loops where like :
for(i = 1 ; i  hsotg-num_of_eps ; ++i)
which is absolutely invalid and ignores the last EP.

We never managed to make the driver work in FIFO mode, but in DMA
mode it works like a charm, and to support all the gadget drivers,
we implemented a silly Bounce Buffer mode.

The PHY configuration was also rewritten according to the
documentation.

Fo the descripto DMA mode, I tried to add missing parts, but I get stuck
with weird HW beheviours

Signed-off-by: Neil Armstrong narmstr...@neotion.com
---
 drivers/usb/dwc2/core.h   |   14 +++
 drivers/usb/dwc2/gadget.c |  267 +++--
 2 files changed, 221 insertions(+), 60 deletions(-)

This is mainly an RFC in order to make this driver run with recent HW.
This is why the patch is not 100% clean.

diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 1efd10c..21c136e 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -102,6 +102,7 @@ struct s3c_hsotg_req;
  * @dir_in: Set to true if this endpoint is of the IN direction, which
  *  means that it is sending data to the Host.
  * @index: The index for the endpoint registers.
+ * @txfnum: The TX fifo index.
  * @mc: Multi Count - number of transactions per microframe
  * @interval - Interval for periodic endpoints
  * @name: The name array passed to the USB core.
@@ -142,6 +143,7 @@ struct s3c_hsotg_ep {
 
 unsigned char   dir_in;
 unsigned char   index;
+unsigned inttxfnum;
 unsigned char   mc;
 unsigned char   interval;
 
@@ -167,6 +169,10 @@ struct s3c_hsotg_ep {
  * @phyif: PHY interface width
  * @dedicated_fifos: Set if the hardware has dedicated IN-EP fifos.
  * @num_of_eps: Number of available EPs (excluding EP0)
+ * @dfifo_depth: depth of HW DFIFO
+ * @dir_of_eps: direction of each endpoint
+ * @hw_major: Hardware Major number
+ * @hw_minor: Hardware minor ID
  * @debug_root: root directrory for debugfs.
  * @debug_file: main status file for debugfs.
  * @debug_fifo: FIFO status file for debugfs.
@@ -195,7 +201,12 @@ struct s3c_hsotg {
 
 u32 phyif;
 unsigned intdedicated_fifos:1;
+unsigned intdfifo_depth;
 unsigned char   num_of_eps;
+unsigned intdma_enable:1;
+unsigned char   dir_of_eps[16];
+unsigned inthw_major;
+unsigned inthw_minor[3];
 
 struct dentry   *debug_root;
 struct dentry   *debug_file;
@@ -224,6 +235,9 @@ struct s3c_hsotg_req {
 struct list_headqueue;
 unsigned char   in_progress;
 unsigned char   mapped;
+unsignedbounced_dma;
+dma_addr_t  bounce_phys;
+void* bounce;
 };
 
 #define call_gadget(_hs, _entry) \
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 392b373..1f3f9b9 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -89,7 +89,7 @@ static void s3c_hsotg_dump(struct s3c_hsotg *hsotg);
  */
 static inline bool using_dma(struct s3c_hsotg *hsotg)
 {
-return false;/* support is not complete */
+return hsotg-dma_enable;
 }
 
 /**
@@ -163,17 +163,30 @@ static void s3c_hsotg_ctrl_epint(struct s3c_hsotg *hsotg,
  */
 static void s3c_hsotg_init_fifo(struct s3c_hsotg *hsotg)
 {
+unsigned int rxfifo_size;
 unsigned int ep;
 unsigned int addr;
 unsigned int size;
+unsigned int txfifonum;
 int timeout;
 u32 val;
 
-/* set FIFO sizes to 2048/1024 */
+rxfifo_size = (4 * 1) + 6; // (4 * number of control endpoint + 6)
+rxfifo_size += (1024 / 4) + 1; // (largest packet / 4) + 1
+rxfifo_size += 2; // for ep0 as OUT endpoint
+for (ep = 1; ep = hsotg-num_of_eps; ep++)
+if(hsotg-dir_of_eps[ep]  1)
+rxfifo_size += 2; // OUT endpoint

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 5017 matches

Mail list logo