diff for duplicates of <56796600.3010407@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 2b3c9c8..6e342d1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -78,7 +78,7 @@ On 12/20/2015 12:15 PM, Yoshihiro Kaneko wrote: > - ravb_write(ndev, RIC2_QFE0 | RIC2_QFE1 | RIC2_RFFE, RIC2); > - /* Frame transmitted, timestamp FIFO updated */ > - ravb_write(ndev, TIC_FTE0 | TIC_FTE1 | TIC_TFUE, TIC); -> + if (priv->chip_id = RCAR_GEN2) { +> + if (priv->chip_id == RCAR_GEN2) { > + /* Frame receive */ > + ravb_write(ndev, RIC0_FRE0 | RIC0_FRE1, RIC0); > + /* Disable FIFO full warning */ @@ -109,7 +109,7 @@ enabled (by a boot loader perhaps)? I don't think you actually want it... > if (eis & EIS_QFS) { > ris2 = ravb_read(ndev, RIS2); > - ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF), RIS2); -> + if (priv->chip_id = RCAR_GEN2) +> + if (priv->chip_id == RCAR_GEN2) > + ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF), RIS2); > + else > + ravb_write(ndev, RID2_QFD0 | RID2_RFFD, RID2); @@ -166,10 +166,10 @@ you're clearing the QFF0/RFFF interrupts, for gen3 you're disabling them, no? > - goto out_napi_off; > - } > - -> - if (priv->chip_id = RCAR_GEN3) { +> - if (priv->chip_id == RCAR_GEN3) { > - error = request_irq(priv->emac_irq, ravb_interrupt, > - IRQF_SHARED, ndev->name, ndev); -> + if (priv->chip_id = RCAR_GEN2) { +> + if (priv->chip_id == RCAR_GEN2) { > + error = request_irq(ndev->irq, ravb_interrupt, IRQF_SHARED, > + ndev->name, ndev); > if (error) { @@ -237,7 +237,7 @@ you're clearing the QFF0/RFFF interrupts, for gen3 you're disabling them, no? > - ravb_write(ndev, 0, RIC2); > - ravb_write(ndev, 0, TIC); > - -> + if (priv->chip_id = RCAR_GEN2) { +> + if (priv->chip_id == RCAR_GEN2) { > + ravb_write(ndev, 0, RIC0); > + ravb_write(ndev, 0, RIC2); > + ravb_write(ndev, 0, TIC); @@ -285,7 +285,7 @@ atomicity here AFAIU. > struct ravb_private *priv = netdev_priv(ndev); > > - ravb_write(ndev, 0, GIC); -> + if (priv->chip_id = RCAR_GEN2) +> + if (priv->chip_id == RCAR_GEN2) > + ravb_write(ndev, 0, GIC); > + else > + ravb_write(ndev, GID_ALL, GID); diff --git a/a/content_digest b/N1/content_digest index 6680992..b8b23a1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01450602948-6777-1-git-send-email-ykaneko0929@gmail.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH/RFC v2 net-next] ravb: Add dma queue interrupt support\0" - "Date\0Tue, 22 Dec 2015 15:02:24 +0000\0" + "Date\0Tue, 22 Dec 2015 18:02:24 +0300\0" "To\0Yoshihiro Kaneko <ykaneko0929@gmail.com>" " netdev@vger.kernel.org\0" "Cc\0David S. Miller <davem@davemloft.net>" @@ -90,7 +90,7 @@ "> -\travb_write(ndev, RIC2_QFE0 | RIC2_QFE1 | RIC2_RFFE, RIC2);\n" "> -\t/* Frame transmitted, timestamp FIFO updated */\n" "> -\travb_write(ndev, TIC_FTE0 | TIC_FTE1 | TIC_TFUE, TIC);\n" - "> +\tif (priv->chip_id = RCAR_GEN2) {\n" + "> +\tif (priv->chip_id == RCAR_GEN2) {\n" "> +\t\t/* Frame receive */\n" "> +\t\travb_write(ndev, RIC0_FRE0 | RIC0_FRE1, RIC0);\n" "> +\t\t/* Disable FIFO full warning */\n" @@ -121,7 +121,7 @@ "> \tif (eis & EIS_QFS) {\n" "> \t\tris2 = ravb_read(ndev, RIS2);\n" "> -\t\travb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF), RIS2);\n" - "> +\t\tif (priv->chip_id = RCAR_GEN2)\n" + "> +\t\tif (priv->chip_id == RCAR_GEN2)\n" "> +\t\t\travb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF), RIS2);\n" "> +\t\telse\n" "> +\t\t\travb_write(ndev, RID2_QFD0 | RID2_RFFD, RID2);\n" @@ -178,10 +178,10 @@ "> -\t\tgoto out_napi_off;\n" "> -\t}\n" "> -\n" - "> -\tif (priv->chip_id = RCAR_GEN3) {\n" + "> -\tif (priv->chip_id == RCAR_GEN3) {\n" "> -\t\terror = request_irq(priv->emac_irq, ravb_interrupt,\n" "> -\t\t\t\t IRQF_SHARED, ndev->name, ndev);\n" - "> +\tif (priv->chip_id = RCAR_GEN2) {\n" + "> +\tif (priv->chip_id == RCAR_GEN2) {\n" "> +\t\terror = request_irq(ndev->irq, ravb_interrupt, IRQF_SHARED,\n" "> +\t\t\t\t ndev->name, ndev);\n" "> \t\tif (error) {\n" @@ -249,7 +249,7 @@ "> -\travb_write(ndev, 0, RIC2);\n" "> -\travb_write(ndev, 0, TIC);\n" "> -\n" - "> +\tif (priv->chip_id = RCAR_GEN2) {\n" + "> +\tif (priv->chip_id == RCAR_GEN2) {\n" "> +\t\travb_write(ndev, 0, RIC0);\n" "> +\t\travb_write(ndev, 0, RIC2);\n" "> +\t\travb_write(ndev, 0, TIC);\n" @@ -297,7 +297,7 @@ "> \tstruct ravb_private *priv = netdev_priv(ndev);\n" ">\n" "> -\travb_write(ndev, 0, GIC);\n" - "> +\tif (priv->chip_id = RCAR_GEN2)\n" + "> +\tif (priv->chip_id == RCAR_GEN2)\n" "> +\t\travb_write(ndev, 0, GIC);\n" "> +\telse\n" "> +\t\travb_write(ndev, GID_ALL, GID);\n" @@ -308,4 +308,4 @@ "\n" MBR, Sergei -211a0ec3f96a5de3c759c0998a7a3be68b9c2ee646473f62436a2800e08833a3 +a816d002f107a9cf8bf5bafd3dfd03ed933d494383ff0cb4893b8d35b14b9b04
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.