Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Are there a bunch of fixes we are missing? #88

Open
wants to merge 37 commits into
base: 3.8
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
40b1df5
3.8: add patch to fix missing ADC measurements
koenkooi Oct 27, 2013
3668dab
3.8: add support for MIDI cape
koenkooi Oct 27, 2013
886378f
3.8: enable btrfs for beaglebone
koenkooi Nov 13, 2013
cf8c99a
recipes: switch recipe to zImage
koenkooi Nov 14, 2013
bafa2be
3.8: add mmc hang fix from mainline
RobertCNelson Nov 12, 2013
68d3610
ASoC: davinci: McASP: Make code generic remove hardcode
Nov 13, 2013
7f9bd3d
3.8: Cape: add MT9M114 camera cape
anithamol Nov 23, 2013
536474b
Get Ready for AIC3104 Audio Cape and Clean Audio Patches
Dec 4, 2013
e49e6bb
3.8: add lighting cape
koenkooi Dec 16, 2013
c65ca94
3.8: add omap serial baudrate hack
koenkooi Dec 17, 2013
57624df
Fixup PRU lighting patchset to use 256 slots
mranostay Dec 22, 2013
3532112
Added GRB to RGB conversion for lighting cape
mranostay Dec 22, 2013
1ed4029
Merge pull request #1 from mranostay/3.8
koenkooi Dec 22, 2013
dc5c3d1
Add spidev fixes for lighting cape
mranostay Dec 23, 2013
292a434
Merge pull request #2 from mranostay/3.8
koenkooi Dec 23, 2013
0ca56d3
3.8: add lz4(hc) compression support for btrfs
koenkooi Dec 24, 2013
dce6f4f
Fixed GRB to RGB conversion for new firmware.
mranostay Dec 28, 2013
1424333
Merge pull request #4 from mranostay/3.8
koenkooi Dec 28, 2013
8b1998b
3.8: fix camera cape aspect ratio
koenkooi Jan 2, 2014
cd28a54
3.8: add network fix from: https://groups.google.com/d/msg/beagleboar…
RobertCNelson Jan 3, 2014
a0ea2b2
3.8: add support for UPS cape
koenkooi Jan 9, 2014
9e3de62
3.8: Fix Writing to Read-Only Bit
Jan 15, 2014
49a5bd3
3.8: bunch of fixes from the community
RobertCNelson Jan 30, 2014
1f0cec7
3.8: config disable CONFIG_USB_GADGET_DEBUG, it serves only one purpo…
RobertCNelson Jan 30, 2014
fb91407
3.8: add: overlays for CBB-Serial cape from Alexander Hiam
RobertCNelson Jan 30, 2014
a890396
3.8: enable more ramdisk options
koenkooi Feb 5, 2014
bec0ed9
3.8: import a few more cape overlays
RobertCNelson Apr 8, 2014
9cfbfcf
3.8: merge in all cape changes up to bone51
RobertCNelson May 14, 2014
be56be2
patch.sh: fix whitespace in patches
koenkooi May 16, 2014
e08736b
3.8: cape: add BB-BONE-AUDI-02-00A0 and a pinmux fix on cape-universaln
RobertCNelson May 15, 2014
639758b
3.8: config: enable CONFIG_TCG_TIS_I2C_ATMEL for crypto cape
RobertCNelson May 14, 2014
6bc67bd
adc: sync with bborg repo
koenkooi May 16, 2014
131987b
patches: rediff everything
koenkooi May 16, 2014
e391eb2
patch.sh: disable whiteline fix, it breaks db.txt
koenkooi May 16, 2014
acc1501
net: update db.txt
koenkooi May 16, 2014
972332c
3.8: fix logibone cape address
koenkooi May 21, 2014
d697908
3.8: add fix for pru 2.0 compiler
koenkooi Jun 2, 2014
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
…d/mfQwHdfHyoo/SA9EnjpXoAsJ

Signed-off-by: Robert Nelson <[email protected]>
RobertCNelson authored and koenkooi committed Jan 9, 2014
commit cd28a5485744afd3fafa23b7221de0425cb2abf7
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
From f7351e25e37cdd7fab871af5f66dbebe36a3d658 Mon Sep 17 00:00:00 2001
From: Robert Nelson <[email protected]>
Date: Fri, 3 Jan 2014 10:39:30 -0600
Subject: [PATCH 7/7] net/cpsw: fix irq_disable() with threaded interrupts

https://groups.google.com/d/msg/beagleboard/mfQwHdfHyoo/SA9EnjpXoAsJ

Signed-off-by: Eugene <[email protected]>
Signed-off-by: Robert Nelson <[email protected]>
---
drivers/net/ethernet/ti/cpsw.c | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 21ba53e..9c72a69 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -342,6 +342,7 @@ struct cpsw_priv {
/* snapshot of IRQ numbers */
u32 irqs_table[4];
u32 num_irqs;
+ bool irq_enabled;
struct cpts cpts;
};

@@ -458,7 +459,10 @@ static irqreturn_t cpsw_interrupt(int irq, void *dev_id)

if (likely(netif_running(priv->ndev))) {
cpsw_intr_disable(priv);
- cpsw_disable_irq(priv);
+ if (priv->irq_enabled == true) {
+ cpsw_disable_irq(priv);
+ priv->irq_enabled = false;
+ }
napi_schedule(&priv->napi);
}

@@ -512,7 +516,10 @@ static int cpsw_poll(struct napi_struct *napi, int budget)
if ((num_total_rx + num_total_tx) < budget) {
napi_complete(napi);
cpsw_intr_enable(priv);
- cpsw_enable_irq(priv);
+ if (priv->irq_enabled == false) {
+ cpsw_enable_irq(priv);
+ priv->irq_enabled = true;
+ }
}

return num_total_rx + num_total_rx;
@@ -812,7 +819,10 @@ static int cpsw_ndo_stop(struct net_device *ndev)
struct cpsw_priv *priv = netdev_priv(ndev);

cpsw_info(priv, ifdown, "shutting down cpsw device\n");
- cpsw_disable_irq(priv);
+ if (priv->irq_enabled == true) {
+ cpsw_disable_irq(priv);
+ priv->irq_enabled = false;
+ }
netif_stop_queue(priv->ndev);
if (!priv->data.disable_napi)
napi_disable(&priv->napi);
@@ -1306,6 +1316,7 @@ static int cpsw_probe(struct platform_device *pdev)
priv->dev = &ndev->dev;
priv->msg_enable = netif_msg_init(debug_level, CPSW_DEBUG);
priv->rx_packet_max = max(rx_packet_max, 128);
+ priv->irq_enabled = false;

/*
* This may be required here for child devices.
--
1.8.5.2