diff for duplicates of <1503402091.7032.9.camel@baylibre.com> diff --git a/a/1.txt b/N1/1.txt index 33425c5..33cddeb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,8 +13,8 @@ I'll respin w/o it > > Reviewed-by: Kevin Hilman <khilman@baylibre.com> > > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> > > --- -> > ?drivers/mmc/host/meson-gx-mmc.c | 5 +++-- -> > ?1 file changed, 3 insertions(+), 2 deletions(-) +> > drivers/mmc/host/meson-gx-mmc.c | 5 +++-- +> > 1 file changed, 3 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx- > > mmc.c @@ -22,30 +22,30 @@ I'll respin w/o it > > --- a/drivers/mmc/host/meson-gx-mmc.c > > +++ b/drivers/mmc/host/meson-gx-mmc.c > > @@ -727,6 +727,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) -> > ????????struct mmc_command *cmd; -> > ????????struct mmc_data *data; -> > ????????u32 irq_en, status, raw_status; -> > +???????unsigned long flag; -> > ????????irqreturn_t ret = IRQ_HANDLED; +> > struct mmc_command *cmd; +> > struct mmc_data *data; +> > u32 irq_en, status, raw_status; +> > + unsigned long flag; +> > irqreturn_t ret = IRQ_HANDLED; > > -> > ????????if (WARN_ON(!host)) +> > if (WARN_ON(!host)) > > @@ -739,7 +740,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) > > -> > ????????data = cmd->data; +> > data = cmd->data; > > -> > -???????spin_lock(&host->lock); -> > +???????spin_lock_irqsave(&host->lock, flag); -> > ????????irq_en = readl(host->regs + SD_EMMC_IRQ_EN); -> > ????????raw_status = readl(host->regs + SD_EMMC_STATUS); -> > ????????status = raw_status & irq_en; +> > - spin_lock(&host->lock); +> > + spin_lock_irqsave(&host->lock, flag); +> > irq_en = readl(host->regs + SD_EMMC_IRQ_EN); +> > raw_status = readl(host->regs + SD_EMMC_STATUS); +> > status = raw_status & irq_en; > > @@ -806,7 +807,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) -> > ????????if (ret == IRQ_HANDLED) -> > ????????????????meson_mmc_request_done(host->mmc, cmd->mrq); +> > if (ret == IRQ_HANDLED) +> > meson_mmc_request_done(host->mmc, cmd->mrq); > > -> > -???????spin_unlock(&host->lock); -> > +???????spin_unlock_irqrestore(&host->lock, flag); -> > ????????return ret; -> > ?} +> > - spin_unlock(&host->lock); +> > + spin_unlock_irqrestore(&host->lock, flag); +> > return ret; +> > } > > > > -- > > 2.9.5 diff --git a/a/content_digest b/N1/content_digest index 4371298..0c7eb71 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,16 @@ "ref\020170821160301.21899-1-jbrunet@baylibre.com\0" "ref\020170821160301.21899-5-jbrunet@baylibre.com\0" "ref\0CAPDyKFpoOc+1WMqLMOwhGkifP-Zp3GS7wTSkHmBUk4Pf0Dh+DQ@mail.gmail.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH v2 04/16] mmc: meson-gx: use _irqsave variant of spinlock\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH v2 04/16] mmc: meson-gx: use _irqsave variant of spinlock\0" "Date\0Tue, 22 Aug 2017 13:41:31 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Ulf Hansson <ulf.hansson@linaro.org>\0" + "Cc\0Kevin Hilman <khilman@baylibre.com>" + Carlo Caione <carlo@caione.org> + linux-mmc@vger.kernel.org <linux-mmc@vger.kernel.org> + open list:ARM/Amlogic Meson... <linux-amlogic@lists.infradead.org> + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + " linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On Tue, 2017-08-22 at 13:08 +0200, Ulf Hansson wrote:\n" @@ -22,8 +28,8 @@ "> > Reviewed-by: Kevin Hilman <khilman@baylibre.com>\n" "> > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>\n" "> > ---\n" - "> > ?drivers/mmc/host/meson-gx-mmc.c | 5 +++--\n" - "> > ?1 file changed, 3 insertions(+), 2 deletions(-)\n" + "> > \302\240drivers/mmc/host/meson-gx-mmc.c | 5 +++--\n" + "> > \302\2401 file changed, 3 insertions(+), 2 deletions(-)\n" "> > \n" "> > diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-\n" "> > mmc.c\n" @@ -31,30 +37,30 @@ "> > --- a/drivers/mmc/host/meson-gx-mmc.c\n" "> > +++ b/drivers/mmc/host/meson-gx-mmc.c\n" "> > @@ -727,6 +727,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)\n" - "> > ????????struct mmc_command *cmd;\n" - "> > ????????struct mmc_data *data;\n" - "> > ????????u32 irq_en, status, raw_status;\n" - "> > +???????unsigned long flag;\n" - "> > ????????irqreturn_t ret = IRQ_HANDLED;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct mmc_command *cmd;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct mmc_data *data;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240u32 irq_en, status, raw_status;\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240unsigned long flag;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240irqreturn_t ret = IRQ_HANDLED;\n" "> > \n" - "> > ????????if (WARN_ON(!host))\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (WARN_ON(!host))\n" "> > @@ -739,7 +740,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)\n" "> > \n" - "> > ????????data = cmd->data;\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240data = cmd->data;\n" "> > \n" - "> > -???????spin_lock(&host->lock);\n" - "> > +???????spin_lock_irqsave(&host->lock, flag);\n" - "> > ????????irq_en = readl(host->regs + SD_EMMC_IRQ_EN);\n" - "> > ????????raw_status = readl(host->regs + SD_EMMC_STATUS);\n" - "> > ????????status = raw_status & irq_en;\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240spin_lock(&host->lock);\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240spin_lock_irqsave(&host->lock, flag);\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240irq_en = readl(host->regs + SD_EMMC_IRQ_EN);\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240raw_status = readl(host->regs + SD_EMMC_STATUS);\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240status = raw_status & irq_en;\n" "> > @@ -806,7 +807,7 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id)\n" - "> > ????????if (ret == IRQ_HANDLED)\n" - "> > ????????????????meson_mmc_request_done(host->mmc, cmd->mrq);\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (ret == IRQ_HANDLED)\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240meson_mmc_request_done(host->mmc, cmd->mrq);\n" "> > \n" - "> > -???????spin_unlock(&host->lock);\n" - "> > +???????spin_unlock_irqrestore(&host->lock, flag);\n" - "> > ????????return ret;\n" - "> > ?}\n" + "> > -\302\240\302\240\302\240\302\240\302\240\302\240\302\240spin_unlock(&host->lock);\n" + "> > +\302\240\302\240\302\240\302\240\302\240\302\240\302\240spin_unlock_irqrestore(&host->lock, flag);\n" + "> > \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240return ret;\n" + "> > \302\240}\n" "> > \n" "> > --\n" "> > 2.9.5\n" @@ -63,4 +69,4 @@ "> Kind regards\n" > Uffe -87aff1bcfaa9f6b13eac65d88b85aec6e209526eacf73939085d27806d552d8d +54c25c96c4b0b799587604629e617a36591ecbf30c014c5f767a6b4c061877a5
diff --git a/a/content_digest b/N2/content_digest index 4371298..ac8d082 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,7 +4,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH v2 04/16] mmc: meson-gx: use _irqsave variant of spinlock\0" "Date\0Tue, 22 Aug 2017 13:41:31 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2017-08-22 at 13:08 +0200, Ulf Hansson wrote:\n" @@ -63,4 +63,4 @@ "> Kind regards\n" > Uffe -87aff1bcfaa9f6b13eac65d88b85aec6e209526eacf73939085d27806d552d8d +952f694e9e5c5dd005ce0cc05d44e21aa545f0123833e3f6c2c5407a703b14d9
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.