Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1623597/?format=api
{ "id": 1623597, "url": "http://patchwork.ozlabs.org/api/patches/1623597/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/patch/20220428113143.9918-1-pali@kernel.org/", "project": { "id": 18, "url": "http://patchwork.ozlabs.org/api/projects/18/?format=api", "name": "U-Boot", "link_name": "uboot", "list_id": "u-boot.lists.denx.de", "list_email": "u-boot@lists.denx.de", "web_url": null, "scm_url": null, "webscm_url": null, "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20220428113143.9918-1-pali@kernel.org>", "list_archive_url": null, "date": "2022-04-28T11:31:43", "name": "powerpc: mpc85xx: Fix compilation with CONFIG_WDT", "commit_ref": "549bb6b2376b81f30b9492afeff5d6cdf7523eeb", "pull_url": null, "state": "accepted", "archived": false, "hash": "0d78037128718537e8dbe505ae473f3817a635ad", "submitter": { "id": 78810, "url": "http://patchwork.ozlabs.org/api/people/78810/?format=api", "name": "Pali Rohár", "email": "pali@kernel.org" }, "delegate": { "id": 55230, "url": "http://patchwork.ozlabs.org/api/users/55230/?format=api", "username": "freenix", "first_name": "Peng", "last_name": "Fan", "email": "van.freenix@gmail.com" }, "mbox": "http://patchwork.ozlabs.org/project/uboot/patch/20220428113143.9918-1-pali@kernel.org/mbox/", "series": [ { "id": 297358, "url": "http://patchwork.ozlabs.org/api/series/297358/?format=api", "web_url": "http://patchwork.ozlabs.org/project/uboot/list/?series=297358", "date": "2022-04-28T11:31:43", "name": "powerpc: mpc85xx: Fix compilation with CONFIG_WDT", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/297358/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1623597/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1623597/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<u-boot-bounces@lists.denx.de>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "bilbo.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256\n header.s=k20201202 header.b=V9XaSpSP;\n\tdkim-atps=neutral", "ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org", "phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de", "phobos.denx.de;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=kernel.org header.i=@kernel.org header.b=\"V9XaSpSP\";\n\tdkim-atps=neutral", "phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=kernel.org", "phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org" ], "Received": [ "from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (4096 bits))\n\t(No client certificate requested)\n\tby bilbo.ozlabs.org (Postfix) with ESMTPS id 4KptlD0tDjz9s0r\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 28 Apr 2022 21:32:40 +1000 (AEST)", "from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 2F67183DCA;\n\tThu, 28 Apr 2022 13:32:34 +0200 (CEST)", "by phobos.denx.de (Postfix, from userid 109)\n id DC70683D6B; Thu, 28 Apr 2022 13:32:31 +0200 (CEST)", "from dfw.source.kernel.org (dfw.source.kernel.org\n [IPv6:2604:1380:4641:c500::1])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 3677483E9E\n for <u-boot@lists.denx.de>; Thu, 28 Apr 2022 13:32:29 +0200 (CEST)", "from smtp.kernel.org (relay.kernel.org [52.25.139.140])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by dfw.source.kernel.org (Postfix) with ESMTPS id 7276761F67;\n Thu, 28 Apr 2022 11:32:27 +0000 (UTC)", "by smtp.kernel.org (Postfix) with ESMTPSA id 0E2EBC385B8;\n Thu, 28 Apr 2022 11:32:26 +0000 (UTC)", "by pali.im (Postfix)\n id 388F68A0; Thu, 28 Apr 2022 13:32:23 +0200 (CEST)" ], "X-Spam-Checker-Version": "SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de", "X-Spam-Level": "", "X-Spam-Status": "No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,\n SPF_PASS autolearn=ham autolearn_force=no version=3.4.2", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;\n s=k20201202; t=1651145546;\n bh=q7nhXqx2Atw7WCe7wocJZvDwksp9l3kqN2hENXNzxck=;\n h=From:To:Cc:Subject:Date:From;\n b=V9XaSpSPip966beCQ41fAiZjcAFN0gr+DwOvyKVuvmTD+l6misoHEsmkJGFizAuOi\n +OeY/f0LoSjaVt6QYZUCAiymNMTxspujgygjBR+uFNDrqIfraH6LLsGrwmRgvBvt7K\n chtL8KAwbs6l+pLTPJooF7Ll71Do3HC56bis1Iyj/TueK//APGIkErbgXhd9CpWjL0\n x6hUreP11ZJU/WBCbS7yaCdzQd6mHMmJ2ifP7JRTNjlMCnwqqjT5b1mVedIht47O1D\n n/OcoBVy6w/nPug/Cq+8Xc+gh4oSHyot/cUhjEX2zydIzeAzHCQh1JT+hLiDG28NzT\n EhJ5NZRR1YL/g==", "From": "=?utf-8?q?Pali_Roh=C3=A1r?= <pali@kernel.org>", "To": "Priyanka Jain <priyanka.jain@nxp.com>, Wolfgang Denk <wd@denx.de>,\n Sinan Akman <sinan@writeme.com>", "Cc": "u-boot@lists.denx.de", "Subject": "[PATCH] powerpc: mpc85xx: Fix compilation with CONFIG_WDT", "Date": "Thu, 28 Apr 2022 13:31:43 +0200", "Message-Id": "<20220428113143.9918-1-pali@kernel.org>", "X-Mailer": "git-send-email 2.20.1", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "u-boot@lists.denx.de", "X-Mailman-Version": "2.1.39", "Precedence": "list", "List-Id": "U-Boot discussion <u-boot.lists.denx.de>", "List-Unsubscribe": "<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>", "List-Archive": "<https://lists.denx.de/pipermail/u-boot/>", "List-Post": "<mailto:u-boot@lists.denx.de>", "List-Help": "<mailto:u-boot-request@lists.denx.de?subject=help>", "List-Subscribe": "<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>", "Errors-To": "u-boot-bounces@lists.denx.de", "Sender": "\"U-Boot\" <u-boot-bounces@lists.denx.de>", "X-Virus-Scanned": "clamav-milter 0.103.5 at phobos.denx.de", "X-Virus-Status": "Clean" }, "content": "When CONFIG_WDT is enabled then non-DM watchdog code cannot be used due to\nconflicting functions like watchdog_reset(). So disable compilation of\nmpc85xx watchdog_reset() function when CONFIG_WDT is enabled.\n\nSigned-off-by: Pali Rohár <pali@kernel.org>\n---\n arch/powerpc/cpu/mpc85xx/cpu.c | 2 ++\n 1 file changed, 2 insertions(+)", "diff": "diff --git a/arch/powerpc/cpu/mpc85xx/cpu.c b/arch/powerpc/cpu/mpc85xx/cpu.c\nindex 261f79e40585..226a26ba320a 100644\n--- a/arch/powerpc/cpu/mpc85xx/cpu.c\n+++ b/arch/powerpc/cpu/mpc85xx/cpu.c\n@@ -348,6 +348,7 @@ __weak unsigned long get_tbclk(void)\n }\n \n \n+#ifndef CONFIG_WDT\n #if defined(CONFIG_WATCHDOG)\n #define WATCHDOG_MASK (TCR_WP(63) | TCR_WRC(3) | TCR_WIE)\n void\n@@ -376,6 +377,7 @@ watchdog_reset(void)\n \t\tenable_interrupts();\n }\n #endif\t/* CONFIG_WATCHDOG */\n+#endif\n \n /*\n * Initializes on-chip MMC controllers.\n", "prefixes": [] }