All of lore.kernel.org
 help / color / mirror / Atom feed

diff for duplicates of <a8b5b75f-2660-e216-033a-77808e2afb76@gmail.com>

diff --git a/a/1.txt b/N1/1.txt
index 094d226..5430931 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -2,7 +2,7 @@ On 3/7/19 10:48 AM, Robin Murphy wrote:
 > On 2019-03-07 9:37 am, Marek Vasut wrote:
 >> On 3/7/19 10:32 AM, Robin Murphy wrote:
 >>> On 2019-03-07 12:04 am, marek.vasut@gmail.com wrote:
->>>> From: Marek Vasut <marek.vasut+renesas@gmail.com>
+>>>> From: Marek Vasut <marek.vasut+renesas at gmail.com>
 >>>>
 >>>> Since commit 6c2fb2ea7636 ("of/device: Set bus DMA mask as
 >>>> appropriate"),
@@ -22,21 +22,21 @@ On 3/7/19 10:48 AM, Robin Murphy wrote:
 >>>> 32bit
 >>>> limit.
 >>>>
->>>> Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
->>>> Cc: Christoph Hellwig <hch@lst.de>
->>>> Cc: Geert Uytterhoeven <geert+renesas@glider.be>
->>>> Cc: Jens Axboe <axboe@fb.com>
->>>> Cc: Jens Axboe <axboe@kernel.dk>
->>>> Cc: Keith Busch <keith.busch@intel.com>
->>>> Cc: Robin Murphy <robin.murphy@arm.com>
->>>> Cc: Sagi Grimberg <sagi@grimberg.me>
->>>> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com>
->>>> Cc: linux-renesas-soc@vger.kernel.org
->>>> To: linux-ide@vger.kernel.org
->>>> To: linux-nvme@lists.infradead.org
+>>>> Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>
+>>>> Cc: Christoph Hellwig <hch at lst.de>
+>>>> Cc: Geert Uytterhoeven <geert+renesas at glider.be>
+>>>> Cc: Jens Axboe <axboe at fb.com>
+>>>> Cc: Jens Axboe <axboe at kernel.dk>
+>>>> Cc: Keith Busch <keith.busch at intel.com>
+>>>> Cc: Robin Murphy <robin.murphy at arm.com>
+>>>> Cc: Sagi Grimberg <sagi at grimberg.me>
+>>>> Cc: Wolfram Sang <wsa+renesas at sang-engineering.com>
+>>>> Cc: linux-renesas-soc at vger.kernel.org
+>>>> To: linux-ide at vger.kernel.org
+>>>> To: linux-nvme at lists.infradead.org
 >>>> ---
->>>>    drivers/ata/ahci.c | 7 +++++++
->>>>    1 file changed, 7 insertions(+)
+>>>> ?? drivers/ata/ahci.c | 7 +++++++
+>>>> ?? 1 file changed, 7 insertions(+)
 >>>>
 >>>> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
 >>>> index 021ce46e2e57..2acce056dd8c 100644
@@ -44,14 +44,14 @@ On 3/7/19 10:48 AM, Robin Murphy wrote:
 >>>> +++ b/drivers/ata/ahci.c
 >>>> @@ -926,6 +926,13 @@ static int ahci_configure_dma_masks(struct
 >>>> pci_dev *pdev, int using_dac)
->>>>        if (pdev->dma_mask && pdev->dma_mask < DMA_BIT_MASK(32))
->>>>            return 0;
->>>>    +    /*
->>>> +     * The upstream device could have applied DMA constraints already,
->>>> +     * respect those and do not change the DMA masks.
->>>> +     */
->>>> +    if (pdev->dev.dma_mask && pdev->dev.coherent_dma_mask)
->>>> +        return 0;
+>>>> ?????? if (pdev->dma_mask && pdev->dma_mask < DMA_BIT_MASK(32))
+>>>> ?????????? return 0;
+>>>> ?? +??? /*
+>>>> +???? * The upstream device could have applied DMA constraints already,
+>>>> +???? * respect those and do not change the DMA masks.
+>>>> +???? */
+>>>> +??? if (pdev->dev.dma_mask && pdev->dev.coherent_dma_mask)
+>>>> +??????? return 0;
 >>>
 >>> At least for DT platforms, the device masks are always going to be set
 >>> to some initial value, which will most commonly just be the 32-bit
diff --git a/a/content_digest b/N1/content_digest
index 4f81982..973457c 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -11,30 +11,14 @@
   "ref\00079e44e90-b16a-5315-e02f-101a2ebbb6a0\@arm.com\0"
 ]
 [
-  "From\0Marek Vasut <marek.vasut\@gmail.com>\0"
+  "From\0marek.vasut\@gmail.com (Marek Vasut)\0"
 ]
 [
-  "Subject\0Re: [PATCH 1/2] [RFC] ata: ahci: Respect bus DMA constraints\0"
+  "Subject\0[PATCH 1/2] [RFC] ata: ahci: Respect bus DMA constraints\0"
 ]
 [
   "Date\0Thu, 7 Mar 2019 12:14:06 +0100\0"
 ]
-[
-  "To\0Robin Murphy <robin.murphy\@arm.com>",
-  " linux-ide\@vger.kernel.org",
-  " linux-nvme\@lists.infradead.org\0"
-]
-[
-  "Cc\0Marek Vasut <marek.vasut+renesas\@gmail.com>",
-  " Christoph Hellwig <hch\@lst.de>",
-  " Geert Uytterhoeven <geert+renesas\@glider.be>",
-  " Jens Axboe <axboe\@fb.com>",
-  " Jens Axboe <axboe\@kernel.dk>",
-  " Keith Busch <keith.busch\@intel.com>",
-  " Sagi Grimberg <sagi\@grimberg.me>",
-  " Wolfram Sang <wsa+renesas\@sang-engineering.com>",
-  " linux-renesas-soc\@vger.kernel.org\0"
-]
 [
   "\0000:1\0"
 ]
@@ -46,7 +30,7 @@
   "> On 2019-03-07 9:37 am, Marek Vasut wrote:\n",
   ">> On 3/7/19 10:32 AM, Robin Murphy wrote:\n",
   ">>> On 2019-03-07 12:04 am, marek.vasut\@gmail.com wrote:\n",
-  ">>>> From: Marek Vasut <marek.vasut+renesas\@gmail.com>\n",
+  ">>>> From: Marek Vasut <marek.vasut+renesas at gmail.com>\n",
   ">>>>\n",
   ">>>> Since commit 6c2fb2ea7636 (\"of/device: Set bus DMA mask as\n",
   ">>>> appropriate\"),\n",
@@ -66,21 +50,21 @@
   ">>>> 32bit\n",
   ">>>> limit.\n",
   ">>>>\n",
-  ">>>> Signed-off-by: Marek Vasut <marek.vasut+renesas\@gmail.com>\n",
-  ">>>> Cc: Christoph Hellwig <hch\@lst.de>\n",
-  ">>>> Cc: Geert Uytterhoeven <geert+renesas\@glider.be>\n",
-  ">>>> Cc: Jens Axboe <axboe\@fb.com>\n",
-  ">>>> Cc: Jens Axboe <axboe\@kernel.dk>\n",
-  ">>>> Cc: Keith Busch <keith.busch\@intel.com>\n",
-  ">>>> Cc: Robin Murphy <robin.murphy\@arm.com>\n",
-  ">>>> Cc: Sagi Grimberg <sagi\@grimberg.me>\n",
-  ">>>> Cc: Wolfram Sang <wsa+renesas\@sang-engineering.com>\n",
-  ">>>> Cc: linux-renesas-soc\@vger.kernel.org\n",
-  ">>>> To: linux-ide\@vger.kernel.org\n",
-  ">>>> To: linux-nvme\@lists.infradead.org\n",
+  ">>>> Signed-off-by: Marek Vasut <marek.vasut+renesas at gmail.com>\n",
+  ">>>> Cc: Christoph Hellwig <hch at lst.de>\n",
+  ">>>> Cc: Geert Uytterhoeven <geert+renesas at glider.be>\n",
+  ">>>> Cc: Jens Axboe <axboe at fb.com>\n",
+  ">>>> Cc: Jens Axboe <axboe at kernel.dk>\n",
+  ">>>> Cc: Keith Busch <keith.busch at intel.com>\n",
+  ">>>> Cc: Robin Murphy <robin.murphy at arm.com>\n",
+  ">>>> Cc: Sagi Grimberg <sagi at grimberg.me>\n",
+  ">>>> Cc: Wolfram Sang <wsa+renesas at sang-engineering.com>\n",
+  ">>>> Cc: linux-renesas-soc at vger.kernel.org\n",
+  ">>>> To: linux-ide at vger.kernel.org\n",
+  ">>>> To: linux-nvme at lists.infradead.org\n",
   ">>>> ---\n",
-  ">>>> \302\240\302\240 drivers/ata/ahci.c | 7 +++++++\n",
-  ">>>> \302\240\302\240 1 file changed, 7 insertions(+)\n",
+  ">>>> ?? drivers/ata/ahci.c | 7 +++++++\n",
+  ">>>> ?? 1 file changed, 7 insertions(+)\n",
   ">>>>\n",
   ">>>> diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c\n",
   ">>>> index 021ce46e2e57..2acce056dd8c 100644\n",
@@ -88,14 +72,14 @@
   ">>>> +++ b/drivers/ata/ahci.c\n",
   ">>>> \@\@ -926,6 +926,13 \@\@ static int ahci_configure_dma_masks(struct\n",
   ">>>> pci_dev *pdev, int using_dac)\n",
-  ">>>> \302\240\302\240\302\240\302\240\302\240\302\240 if (pdev->dma_mask && pdev->dma_mask < DMA_BIT_MASK(32))\n",
-  ">>>> \302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240 return 0;\n",
-  ">>>> \302\240\302\240 +\302\240\302\240\302\240 /*\n",
-  ">>>> +\302\240\302\240\302\240\302\240 * The upstream device could have applied DMA constraints already,\n",
-  ">>>> +\302\240\302\240\302\240\302\240 * respect those and do not change the DMA masks.\n",
-  ">>>> +\302\240\302\240\302\240\302\240 */\n",
-  ">>>> +\302\240\302\240\302\240 if (pdev->dev.dma_mask && pdev->dev.coherent_dma_mask)\n",
-  ">>>> +\302\240\302\240\302\240\302\240\302\240\302\240\302\240 return 0;\n",
+  ">>>> ?????? if (pdev->dma_mask && pdev->dma_mask < DMA_BIT_MASK(32))\n",
+  ">>>> ?????????? return 0;\n",
+  ">>>> ?? +??? /*\n",
+  ">>>> +???? * The upstream device could have applied DMA constraints already,\n",
+  ">>>> +???? * respect those and do not change the DMA masks.\n",
+  ">>>> +???? */\n",
+  ">>>> +??? if (pdev->dev.dma_mask && pdev->dev.coherent_dma_mask)\n",
+  ">>>> +??????? return 0;\n",
   ">>>\n",
   ">>> At least for DT platforms, the device masks are always going to be set\n",
   ">>> to some initial value, which will most commonly just be the 32-bit\n",
@@ -122,4 +106,4 @@
   "Marek Vasut"
 ]
 
-8dea256915aa13553918949ce4872c222515cf72774b4e6dc359285951413b5a
+72c93d293581bc19a71cf8c7ea5041a02099c146629507a27c67eb0f4ced3221
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.