Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/954041/?format=api
{ "id": 954041, "url": "http://patchwork.ozlabs.org/api/patches/954041/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1533574847-19294-57-git-send-email-aleksandar.markovic@rt-rk.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1533574847-19294-57-git-send-email-aleksandar.markovic@rt-rk.com>", "list_archive_url": null, "date": "2018-08-06T17:00:23", "name": "[v7,56/80] mips_malta: Add basic nanoMIPS boot code for MIPS' Malta", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "db3c70eb7d57a8c25d8747b3d48ac356d4be9b71", "submitter": { "id": 68635, "url": "http://patchwork.ozlabs.org/api/people/68635/?format=api", "name": "Aleksandar Markovic", "email": "aleksandar.markovic@rt-rk.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1533574847-19294-57-git-send-email-aleksandar.markovic@rt-rk.com/mbox/", "series": [ { "id": 59520, "url": "http://patchwork.ozlabs.org/api/series/59520/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=59520", "date": "2018-08-06T16:59:27", "name": "Add nanoMIPS support to QEMU", "version": 7, "mbox": "http://patchwork.ozlabs.org/series/59520/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/954041/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/954041/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=rt-rk.com" ], "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 41klGm6rZ4z9s0R\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 7 Aug 2018 03:37:52 +1000 (AEST)", "from localhost ([::1]:35364 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1fmjS2-00010A-HN\n\tfor incoming@patchwork.ozlabs.org; Mon, 06 Aug 2018 13:37:50 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:41466)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <aleksandar.markovic@rt-rk.com>) id 1fmjGT-0007c3-NA\n\tfor qemu-devel@nongnu.org; Mon, 06 Aug 2018 13:25:54 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <aleksandar.markovic@rt-rk.com>) id 1fmjGS-00025I-9u\n\tfor qemu-devel@nongnu.org; Mon, 06 Aug 2018 13:25:53 -0400", "from mx2.rt-rk.com ([89.216.37.149]:45526 helo=mail.rt-rk.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <aleksandar.markovic@rt-rk.com>)\n\tid 1fmjGR-00023W-Su\n\tfor qemu-devel@nongnu.org; Mon, 06 Aug 2018 13:25:52 -0400", "from localhost (localhost [127.0.0.1])\n\tby mail.rt-rk.com (Postfix) with ESMTP id A06EB1A213A;\n\tMon, 6 Aug 2018 19:25:50 +0200 (CEST)", "from rtrkw774-lin.domain.local (rtrkw774-lin.domain.local\n\t[10.10.13.43])\n\tby mail.rt-rk.com (Postfix) with ESMTPSA id 7CF801A2036;\n\tMon, 6 Aug 2018 19:25:50 +0200 (CEST)" ], "X-Virus-Scanned": "amavisd-new at rt-rk.com", "From": "Aleksandar Markovic <aleksandar.markovic@rt-rk.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 6 Aug 2018 19:00:23 +0200", "Message-Id": "<1533574847-19294-57-git-send-email-aleksandar.markovic@rt-rk.com>", "X-Mailer": "git-send-email 2.7.4", "In-Reply-To": "<1533574847-19294-1-git-send-email-aleksandar.markovic@rt-rk.com>", "References": "<1533574847-19294-1-git-send-email-aleksandar.markovic@rt-rk.com>", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 3.x [fuzzy]", "X-Received-From": "89.216.37.149", "Subject": "[Qemu-devel] [PATCH v7 56/80] mips_malta: Add basic nanoMIPS boot\n\tcode for MIPS' Malta", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "peter.maydell@linaro.org, thuth@redhat.com, pburton@wavecomp.com,\n\tsmarkovic@wavecomp.com, riku.voipio@iki.fi,\n\trichard.henderson@linaro.org, laurent@vivier.eu,\n\tarmbru@redhat.com, arikalo@wavecomp.com,\n\tphilippe.mathieu.daude@gmail.com, amarkovic@wavecomp.com,\n\tpjovanovic@wavecomp.com, aurelien@aurel32.net", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: Matthew Fortune <matthew.fortune@mips.com>\n\nAdded very very basic nanoMIPS boot code but this is hacked in\nunconditionally currently.\n\nSigned-off-by: Yongbok Kim <yongbok.kim@mips.com>\nSigned-off-by: Aleksandar Markovic <amarkovic@wavecomp.com>\nSigned-off-by: Stefan Markovic <smarkovic@wavecomp.com>\n---\n hw/mips/mips_malta.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++-----\n 1 file changed, 69 insertions(+), 6 deletions(-)", "diff": "diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c\nindex 3467451..4bc9036 100644\n--- a/hw/mips/mips_malta.c\n+++ b/hw/mips/mips_malta.c\n@@ -620,6 +620,58 @@ static void network_init(PCIBus *pci_bus)\n a2 - 32-bit address of the environment variables table\n a3 - RAM size in bytes\n */\n+static void write_bootloader_nanomips(uint8_t *base, int64_t run_addr,\n+ int64_t kernel_entry)\n+{\n+ uint16_t *p;\n+\n+ /* Small bootloader */\n+ p = (uint16_t *)base;\n+\n+#define NM_HI1(VAL) (((VAL) >> 16) & 0x1f)\n+#define NM_HI2(VAL) \\\n+ (((VAL) & 0xf000) | (((VAL) >> 19) & 0xffc) | (((VAL) >> 31) & 0x1))\n+#define NM_LO(VAL) ((VAL) & 0xfff)\n+\n+ stw_p(p++, 0x2800); stw_p(p++, 0x001c); /* bc to_here */\n+ stw_p(p++, 0x8000); stw_p(p++, 0xc000); /* nop */\n+ stw_p(p++, 0x8000); stw_p(p++, 0xc000); /* nop */\n+ stw_p(p++, 0x8000); stw_p(p++, 0xc000); /* nop */\n+ stw_p(p++, 0x8000); stw_p(p++, 0xc000); /* nop */\n+ stw_p(p++, 0x8000); stw_p(p++, 0xc000); /* nop */\n+ stw_p(p++, 0x8000); stw_p(p++, 0xc000); /* nop */\n+ stw_p(p++, 0x8000); stw_p(p++, 0xc000); /* nop */\n+\n+ /* to_here: */\n+ stw_p(p++, 0x0080); stw_p(p++, 0x0002); /* li a0,2 */\n+ stw_p(p++, 0xe3a0 | NM_HI1(ENVP_ADDR - 64));\n+ stw_p(p++, NM_HI2(ENVP_ADDR - 64));\n+ /* lui sp,%hi(ENVP_ADDR - 64) */\n+ stw_p(p++, 0x83bd); stw_p(p++, NM_LO(ENVP_ADDR - 64));\n+ /* ori sp,sp,%lo(ENVP_ADDR - 64) */\n+ stw_p(p++, 0xe0a0 | NM_HI1(ENVP_ADDR));\n+ stw_p(p++, NM_HI2(ENVP_ADDR));\n+ /* lui a1,%hi(ENVP_ADDR) */\n+ stw_p(p++, 0x80a5); stw_p(p++, NM_LO(ENVP_ADDR));\n+ /* ori a1,a1,%lo(ENVP_ADDR) */\n+ stw_p(p++, 0xe0c0 | NM_HI1(ENVP_ADDR + 8));\n+ stw_p(p++, NM_HI2(ENVP_ADDR + 8));\n+ /* lui a2,%hi(ENVP_ADDR + 8) */\n+ stw_p(p++, 0x80c6); stw_p(p++, NM_LO(ENVP_ADDR + 8));\n+ /* ori a2,a2,%lo(ENVP_ADDR + 8) */\n+ stw_p(p++, 0xe0e0 | NM_HI1(loaderparams.ram_low_size));\n+ stw_p(p++, NM_HI2(loaderparams.ram_low_size));\n+ /* lui a3,%hi(loaderparams.ram_low_size) */\n+ stw_p(p++, 0x80e7); stw_p(p++, NM_LO(loaderparams.ram_low_size));\n+ /* ori a3,a3,%lo(loaderparams.ram_low_size) */\n+ stw_p(p++, 0xe320 | NM_HI1(kernel_entry));\n+ stw_p(p++, NM_HI2(kernel_entry));\n+ /* lui t9,%hi(kernel_entry) */\n+ stw_p(p++, 0x8339); stw_p(p++, NM_LO(kernel_entry));\n+ /* ori t9,t9,%lo(kernel_entry) */\n+ stw_p(p++, 0x4bf9); stw_p(p++, 0x0000);\n+ /* jalrc t8 */\n+}\n \n static void write_bootloader(uint8_t *base, int64_t run_addr,\n int64_t kernel_entry)\n@@ -813,10 +865,16 @@ static int64_t load_kernel (void)\n NULL, (uint64_t *)&kernel_entry, NULL,\n (uint64_t *)&kernel_high, big_endian, EM_MIPS, 1, 0);\n if (kernel_size < 0) {\n- error_report(\"could not load kernel '%s': %s\",\n- loaderparams.kernel_filename,\n- load_elf_strerror(kernel_size));\n- exit(1);\n+ kernel_size = load_elf(loaderparams.kernel_filename,\n+ cpu_mips_kseg0_to_phys, NULL,\n+ (uint64_t *)&kernel_entry, NULL,\n+ (uint64_t *)&kernel_high, big_endian, EM_NANOMIPS, 1, 0);\n+ if (kernel_size < 0) {\n+ error_report(\"could not load kernel '%s': %s\",\n+ loaderparams.kernel_filename,\n+ load_elf_strerror(kernel_size));\n+ exit(1);\n+ }\n }\n \n /* Check where the kernel has been linked */\n@@ -1096,8 +1154,13 @@ void mips_malta_init(MachineState *machine)\n loaderparams.initrd_filename = initrd_filename;\n kernel_entry = load_kernel();\n \n- write_bootloader(memory_region_get_ram_ptr(bios),\n- bootloader_run_addr, kernel_entry);\n+ if (!cpu_supports_isa(machine->cpu_type, ISA_NANOMIPS32)) {\n+ write_bootloader(memory_region_get_ram_ptr(bios),\n+ bootloader_run_addr, kernel_entry);\n+ } else {\n+ write_bootloader_nanomips(memory_region_get_ram_ptr(bios),\n+ bootloader_run_addr, kernel_entry);\n+ }\n if (kvm_enabled()) {\n /* Write the bootloader code @ the end of RAM, 1MB reserved */\n write_bootloader(memory_region_get_ram_ptr(ram_low_preio) +\n", "prefixes": [ "v7", "56/80" ] }