Re: ❌ FAIL: Test report for kernel 5.6.14-79935d9.cki (stable-queue)

[Sasha Levin <sashal@kernel.org>]

On Mon, May 25, 2020 at 05:44:25PM +0200, Greg KH wrote:
>On Mon, May 25, 2020 at 11:23:47AM -0400, Veronika Kabatova wrote:
>>
>>
>> ----- Original Message -----
>> > From: "CKI Project" <cki-project@redhat.com>
>> > To: "Linux Stable maillist" <stable@vger.kernel.org>
>> > Sent: Monday, May 25, 2020 5:22:14 PM
>> > Subject: ❌ FAIL: Test report for kernel 5.6.14-79935d9.cki (stable-queue)
>> >
>> >
>> > Hello,
>> >
>> > We ran automated tests on a recent commit from this kernel tree:
>> >
>> >        Kernel repo:
>> >        https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
>> >             Commit: 79935d99370b - x86/unwind/orc: Fix
>> >             unwind_get_return_address_ptr() for inactive tasks
>> >
>> > The results of these automated tests are provided below.
>> >
>> >     Overall result: FAILED (see details below)
>> >              Merge: OK
>> >            Compile: FAILED
>> >
>> > All kernel binaries, config files, and logs are available for download here:
>> >
>> >   https://cki-artifacts.s3.us-east-2.amazonaws.com/index.html?prefix=datawarehouse/2020/05/25/580491
>> >
>> > We attempted to compile the kernel for multiple architectures, but the
>> > compile
>> > failed on one or more architectures:
>> >
>> >            aarch64: FAILED (see build-aarch64.log.xz attachment)
>> >
>>
>> Hi,
>>
>> this looks like a bug in the revert.
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=queue/5.6&id=1d69ec1bac630983a00b62f155503c53559b3c14
>>
>> attempts to revert the following commit:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git/commit/?h=queue/5.6&id=5caf6102e32ead7ed5d21b5309c1a4a7d70e6a9f
>>
>> but the bus.c changes are not reverted, only bus.h.
>
>Yeah, that's not right, it should not be applied to the tree at that
>point in time.  I'll go drop it now, thanks.

I still can't explain this behavior:

$ git show a9d68cbd4f8834d126ebdd3097a1dee1c5973fdf
commit a9d68cbd4f8834d126ebdd3097a1dee1c5973fdf
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Wed Apr 1 08:03:28 2020 +0200

     Revert "amba: Initialize dma_parms for amba devices"
     
     This reverts commit 5caf6102e32ead7ed5d21b5309c1a4a7d70e6a9f.  It still
     needs some more work and that will happen for the next release cycle,
     not this one.
     
     Cc: <stable@vger.kernel.org>
     Cc: Russell King <linux@armlinux.org.uk>
     Cc: Christoph Hellwig <hch@lst.de>
     Cc: Ludovic Barre <ludovic.barre@st.com>
     Cc: Linus Walleij <linus.walleij@linaro.org>
     Cc: Arnd Bergmann <arnd@arndb.de>
     Cc: Ulf Hansson <ulf.hansson@linaro.org>
     Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 5e61783ce92d..fe1523664816 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -374,8 +374,6 @@ static int amba_device_try_add(struct amba_device *dev, struct resource *parent)
         WARN_ON(dev->irq[0] == (unsigned int)-1);
         WARN_ON(dev->irq[1] == (unsigned int)-1);
  
-       dev->dev.dma_parms = &dev->dma_parms;
-
         ret = request_resource(parent, &dev->res);
         if (ret)
                 goto err_out;
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 0bbfd647f5c6..26f0ecf401ea 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -65,7 +65,6 @@ struct amba_device {
         struct device           dev;
         struct resource         res;
         struct clk              *pclk;
-       struct device_dma_parameters dma_parms;
         unsigned int            periphid;
         unsigned int            cid;
         struct amba_cs_uci_id   uci;
$ git cherry-pick a9d68cbd4f8834d126ebdd3097a1dee1c5973fdf
Auto-merging drivers/amba/bus.c
[queue-5.6 f8d6a52860ef] Revert "amba: Initialize dma_parms for amba devices"
  Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  Date: Wed Apr 1 08:03:28 2020 +0200
  1 file changed, 1 deletion(-)
$ git show
commit f8d6a52860ef85fdf14a06cf5429aea145bfb62e (HEAD -> queue-5.6)
Author: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date:   Wed Apr 1 08:03:28 2020 +0200

     Revert "amba: Initialize dma_parms for amba devices"
     
     This reverts commit 5caf6102e32ead7ed5d21b5309c1a4a7d70e6a9f.  It still
     needs some more work and that will happen for the next release cycle,
     not this one.
     
     Cc: <stable@vger.kernel.org>
     Cc: Russell King <linux@armlinux.org.uk>
     Cc: Christoph Hellwig <hch@lst.de>
     Cc: Ludovic Barre <ludovic.barre@st.com>
     Cc: Linus Walleij <linus.walleij@linaro.org>
     Cc: Arnd Bergmann <arnd@arndb.de>
     Cc: Ulf Hansson <ulf.hansson@linaro.org>
     Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h
index 0bbfd647f5c6..26f0ecf401ea 100644
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
@@ -65,7 +65,6 @@ struct amba_device {
         struct device           dev;
         struct resource         res;
         struct clk              *pclk;
-       struct device_dma_parameters dma_parms;
         unsigned int            periphid;
         unsigned int            cid;
         struct amba_cs_uci_id   uci;

-- 
Thanks,
Sasha