From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 572E5C33CB3 for ; Wed, 15 Jan 2020 17:13:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C0D82465A for ; Wed, 15 Jan 2020 17:13:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RKQXheZO" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729033AbgAORNW (ORCPT ); Wed, 15 Jan 2020 12:13:22 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:56546 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726418AbgAORNV (ORCPT ); Wed, 15 Jan 2020 12:13:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579108400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xgDCwoSsZofYUqp3deu/ABXjeAAns8TVCZUAmC4n62E=; b=RKQXheZOd5Aa5hRJ5YjwOwZOUOYAivJqtBIJSOsBBWkqH8P6bC1tYkRdhXyaEW57vJl9LR zhWOjjH+ytyc+VNwWfymFT1woFkjtr14xHw3TkLfFeNe8HNOS1sSHGKsuUdkKpyskYu7me vjqrvFPhEq6YTphaq3nfvjUVbJrZT9A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-nLYNWoLiPLuDsOMRCGV8rg-1; Wed, 15 Jan 2020 12:13:16 -0500 X-MC-Unique: nLYNWoLiPLuDsOMRCGV8rg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7C091005510; Wed, 15 Jan 2020 17:13:14 +0000 (UTC) Received: from [10.36.117.108] (ovpn-117-108.ams2.redhat.com [10.36.117.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A7065E1AD; Wed, 15 Jan 2020 17:13:11 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH v2 12/16] arm/arm64: ITS: commands To: Andrew Jones Cc: eric.auger.pro@gmail.com, maz@kernel.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andre.przywara@arm.com, peter.maydell@linaro.org, yuzenghui@huawei.com, alexandru.elisei@arm.com, thuth@redhat.com References: <20200110145412.14937-1-eric.auger@redhat.com> <20200110145412.14937-13-eric.auger@redhat.com> <20200113180042.ud53um575jsra2uf@kamzik.brq.redhat.com> From: Auger Eric Message-ID: <96a89ee2-adc5-093b-baf8-57b45bc84b29@redhat.com> Date: Wed, 15 Jan 2020 18:13:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20200113180042.ud53um575jsra2uf@kamzik.brq.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi Drew, On 1/13/20 7:00 PM, Andrew Jones wrote: > On Fri, Jan 10, 2020 at 03:54:08PM +0100, Eric Auger wrote: >> Implement main ITS commands. The code is largely inherited from >> the ITS driver. >> >> Signed-off-by: Eric Auger >> >> --- >> >> v1 -> v2: >> - removed its_print_cmd_state >> --- >> arm/Makefile.common | 2 +- >> lib/arm/asm/gic-v3-its.h | 35 +++ >> lib/arm/gic-v3-its-cmd.c | 453 +++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 489 insertions(+), 1 deletion(-) >> create mode 100644 lib/arm/gic-v3-its-cmd.c >> >> diff --git a/arm/Makefile.common b/arm/Makefile.common >> index 1aae5a3..7cc0f04 100644 >> --- a/arm/Makefile.common >> +++ b/arm/Makefile.common >> @@ -52,7 +52,7 @@ cflatobjs += lib/arm/psci.o >> cflatobjs += lib/arm/smp.o >> cflatobjs += lib/arm/delay.o >> cflatobjs += lib/arm/gic.o lib/arm/gic-v2.o lib/arm/gic-v3.o >> -cflatobjs += lib/arm/gic-v3-its.o >> +cflatobjs += lib/arm/gic-v3-its.o lib/arm/gic-v3-its-cmd.o >> >> OBJDIRS += lib/arm >> >> diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h >> index 0497a78..463174f 100644 >> --- a/lib/arm/asm/gic-v3-its.h >> +++ b/lib/arm/asm/gic-v3-its.h >> @@ -58,6 +58,24 @@ >> #define GITS_MAX_DEVICES 8 >> #define GITS_MAX_COLLECTIONS 8 >> >> +/* >> + * ITS commands >> + */ >> +#define GITS_CMD_MAPD 0x08 >> +#define GITS_CMD_MAPC 0x09 >> +#define GITS_CMD_MAPTI 0x0a >> +/* older GIC documentation used MAPVI for this command */ >> +#define GITS_CMD_MAPVI GITS_CMD_MAPTI >> +#define GITS_CMD_MAPI 0x0b >> +#define GITS_CMD_MOVI 0x01 >> +#define GITS_CMD_DISCARD 0x0f >> +#define GITS_CMD_INV 0x0c >> +#define GITS_CMD_MOVALL 0x0e >> +#define GITS_CMD_INVALL 0x0d >> +#define GITS_CMD_INT 0x03 >> +#define GITS_CMD_CLEAR 0x04 >> +#define GITS_CMD_SYNC 0x05 >> + >> struct its_typer { >> unsigned int ite_size; >> unsigned int eventid_bits; >> @@ -122,5 +140,22 @@ extern void its_enable_defaults(void); >> extern struct its_device *its_create_device(u32 dev_id, int nr_ites); >> extern struct its_collection *its_create_collection(u32 col_id, u32 target_pe); >> >> +extern void its_send_mapd(struct its_device *dev, int valid); >> +extern void its_send_mapc(struct its_collection *col, int valid); >> +extern void its_send_mapti(struct its_device *dev, u32 irq_id, >> + u32 event_id, struct its_collection *col); >> +extern void its_send_int(struct its_device *dev, u32 event_id); >> +extern void its_send_inv(struct its_device *dev, u32 event_id); >> +extern void its_send_discard(struct its_device *dev, u32 event_id); >> +extern void its_send_clear(struct its_device *dev, u32 event_id); >> +extern void its_send_invall(struct its_collection *col); >> +extern void its_send_movi(struct its_device *dev, >> + struct its_collection *col, u32 id); >> +extern void its_send_sync(struct its_collection *col); >> + >> +#define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) >> +#define ITS_FLAGS_WORKAROUND_CAVIUM_22375 (1ULL << 1) >> +#define ITS_FLAGS_WORKAROUND_CAVIUM_23144 (1ULL << 2) >> + >> #endif /* !__ASSEMBLY__ */ >> #endif /* _ASMARM_GIC_V3_ITS_H_ */ >> diff --git a/lib/arm/gic-v3-its-cmd.c b/lib/arm/gic-v3-its-cmd.c >> new file mode 100644 >> index 0000000..9c6cbc6 >> --- /dev/null >> +++ b/lib/arm/gic-v3-its-cmd.c >> @@ -0,0 +1,453 @@ >> +/* >> + * Copyright (C) 2016, Red Hat Inc, Eric Auger > > 2016? > >> + * >> + * Most of the code is copy-pasted from: >> + * drivers/irqchip/irq-gic-v3-its.c >> + * This work is licensed under the terms of the GNU LGPL, version 2. >> + */ >> +#include >> +#include >> + >> +#define ITS_ITT_ALIGN SZ_256 >> + >> +static const char * const its_cmd_string[] = { >> + [GITS_CMD_MAPD] = "MAPD", >> + [GITS_CMD_MAPC] = "MAPC", >> + [GITS_CMD_MAPTI] = "MAPTI", >> + [GITS_CMD_MAPI] = "MAPI", >> + [GITS_CMD_MOVI] = "MOVI", >> + [GITS_CMD_DISCARD] = "DISCARD", >> + [GITS_CMD_INV] = "INV", >> + [GITS_CMD_MOVALL] = "MOVALL", >> + [GITS_CMD_INVALL] = "INVALL", >> + [GITS_CMD_INT] = "INT", >> + [GITS_CMD_CLEAR] = "CLEAR", >> + [GITS_CMD_SYNC] = "SYNC", >> +}; >> + >> +struct its_cmd_desc { >> + union { >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_inv_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_int_cmd; >> + >> + struct { >> + struct its_device *dev; >> + bool valid; >> + } its_mapd_cmd; >> + >> + struct { >> + struct its_collection *col; >> + bool valid; >> + } its_mapc_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 phys_id; >> + u32 event_id; >> + u32 col_id; >> + } its_mapti_cmd; >> + >> + struct { >> + struct its_device *dev; >> + struct its_collection *col; >> + u32 event_id; >> + } its_movi_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_discard_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_clear_cmd; >> + >> + struct { >> + struct its_collection *col; >> + } its_invall_cmd; >> + >> + struct { >> + struct its_collection *col; >> + } its_sync_cmd; >> + }; >> +}; >> + >> +typedef void (*its_cmd_builder_t)(struct its_cmd_block *, >> + struct its_cmd_desc *); >> + >> +/* ITS COMMANDS */ >> + >> +static void its_encode_cmd(struct its_cmd_block *cmd, u8 cmd_nr) >> +{ >> + cmd->raw_cmd[0] &= ~0xffUL; >> + cmd->raw_cmd[0] |= cmd_nr; >> +} >> + >> +static void its_encode_devid(struct its_cmd_block *cmd, u32 devid) >> +{ >> + cmd->raw_cmd[0] &= BIT_ULL(32) - 1; >> + cmd->raw_cmd[0] |= ((u64)devid) << 32; >> +} >> + >> +static void its_encode_event_id(struct its_cmd_block *cmd, u32 id) >> +{ >> + cmd->raw_cmd[1] &= ~0xffffffffUL; >> + cmd->raw_cmd[1] |= id; >> +} >> + >> +static void its_encode_phys_id(struct its_cmd_block *cmd, u32 phys_id) >> +{ >> + cmd->raw_cmd[1] &= 0xffffffffUL; >> + cmd->raw_cmd[1] |= ((u64)phys_id) << 32; >> +} >> + >> +static void its_encode_size(struct its_cmd_block *cmd, u8 size) >> +{ >> + cmd->raw_cmd[1] &= ~0x1fUL; >> + cmd->raw_cmd[1] |= size & 0x1f; >> +} >> + >> +static void its_encode_itt(struct its_cmd_block *cmd, u64 itt_addr) >> +{ >> + cmd->raw_cmd[2] &= ~0xffffffffffffUL; >> + cmd->raw_cmd[2] |= itt_addr & 0xffffffffff00UL; >> +} >> + >> +static void its_encode_valid(struct its_cmd_block *cmd, int valid) >> +{ >> + cmd->raw_cmd[2] &= ~(1UL << 63); >> + cmd->raw_cmd[2] |= ((u64)!!valid) << 63; >> +} >> + >> +static void its_encode_target(struct its_cmd_block *cmd, u64 target_addr) >> +{ >> + cmd->raw_cmd[2] &= ~(0xfffffffffUL << 16); >> + cmd->raw_cmd[2] |= (target_addr & (0xffffffffUL << 16)); >> +} > > Did you trying compiling arm (as opposed to arm64)? I see this file and > the other ITS files are added to arm/Makefile.common, but I'd expect this > to be a problem here, since it's UL instead of ULL. No I didn't. I will check this. > >> + >> +static void its_encode_collection(struct its_cmd_block *cmd, u16 col) >> +{ >> + cmd->raw_cmd[2] &= ~0xffffUL; >> + cmd->raw_cmd[2] |= col; >> +} >> + >> +static inline void its_fixup_cmd(struct its_cmd_block *cmd) >> +{ >> + /* Let's fixup BE commands */ >> + cmd->raw_cmd[0] = cpu_to_le64(cmd->raw_cmd[0]); >> + cmd->raw_cmd[1] = cpu_to_le64(cmd->raw_cmd[1]); >> + cmd->raw_cmd[2] = cpu_to_le64(cmd->raw_cmd[2]); >> + cmd->raw_cmd[3] = cpu_to_le64(cmd->raw_cmd[3]); >> +} >> + >> +static u64 its_cmd_ptr_to_offset(struct its_cmd_block *ptr) >> +{ >> + return (ptr - its_data.cmd_base) * sizeof(*ptr); >> +} >> + >> +static struct its_cmd_block *its_post_commands(void) >> +{ >> + u64 wr = its_cmd_ptr_to_offset(its_data.cmd_write); >> + >> + writeq(wr, its_data.base + GITS_CWRITER); >> + return its_data.cmd_write; >> +} >> + >> + >> +/* We just assume the queue is large enough */ > > Assert when the assuming is wrong? OK > >> +static struct its_cmd_block *its_allocate_entry(void) >> +{ >> + struct its_cmd_block *cmd; >> + >> + cmd = its_data.cmd_write++; >> + return cmd; >> +} >> + >> +static void its_wait_for_range_completion(struct its_cmd_block *from, >> + struct its_cmd_block *to) >> +{ >> + u64 rd_idx, from_idx, to_idx; >> + u32 count = 1000000; /* 1s! */ >> + >> + from_idx = its_cmd_ptr_to_offset(from); >> + to_idx = its_cmd_ptr_to_offset(to); >> + while (1) { >> + rd_idx = readq(its_data.base + GITS_CREADR); >> + if (rd_idx >= to_idx || rd_idx < from_idx) >> + break; >> + >> + count--; >> + if (!count) { >> + unsigned int cmd_id = from->raw_cmd[0] & 0xFF; >> + >> + report(false, "%s timeout!", >> + cmd_id <= 0xF ? its_cmd_string[cmd_id] : >> + "Unexpected"); > > assert_msg, not report OK > >> + return; >> + } >> + cpu_relax(); >> + udelay(1); >> + } >> +} >> + >> +static void its_send_single_command(its_cmd_builder_t builder, >> + struct its_cmd_desc *desc) >> +{ >> + struct its_cmd_block *cmd, *next_cmd; >> + >> + cmd = its_allocate_entry(); >> + builder(cmd, desc); >> + next_cmd = its_post_commands(); >> + >> + its_wait_for_range_completion(cmd, next_cmd); >> +} >> + >> + >> +static void its_build_mapd_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + unsigned long itt_addr; >> + u8 size = 12; //TODO ilog2(desc->its_mapd_cmd.dev->nr_ites); >> + >> + itt_addr = (unsigned long)desc->its_mapd_cmd.dev->itt; >> + itt_addr = ALIGN(itt_addr, ITS_ITT_ALIGN); >> + >> + its_encode_cmd(cmd, GITS_CMD_MAPD); >> + its_encode_devid(cmd, desc->its_mapd_cmd.dev->device_id); >> + its_encode_size(cmd, size - 1); >> + its_encode_itt(cmd, itt_addr); >> + its_encode_valid(cmd, desc->its_mapd_cmd.valid); >> + >> + its_fixup_cmd(cmd); >> + report_info("MAPD devid=%d size = 0x%x itt=0x%lx valid=%d", >> + desc->its_mapd_cmd.dev->device_id, >> + size, itt_addr, desc->its_mapd_cmd.valid); > > printf("ITS: ...\n", ...), not report_info OK Thanks Eric > >> + >> +} >> + >> +static void its_build_mapc_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_MAPC); >> + its_encode_collection(cmd, desc->its_mapc_cmd.col->col_id); >> + its_encode_target(cmd, desc->its_mapc_cmd.col->target_address); >> + its_encode_valid(cmd, desc->its_mapc_cmd.valid); >> + >> + its_fixup_cmd(cmd); >> + report_info("MAPC col_id=%d target_addr = 0x%lx valid=%d", >> + desc->its_mapc_cmd.col->col_id, >> + desc->its_mapc_cmd.col->target_address, >> + desc->its_mapc_cmd.valid); >> +} >> + >> +static void its_build_mapti_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_MAPTI); >> + its_encode_devid(cmd, desc->its_mapti_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_mapti_cmd.event_id); >> + its_encode_phys_id(cmd, desc->its_mapti_cmd.phys_id); >> + its_encode_collection(cmd, desc->its_mapti_cmd.col_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("MAPTI dev_id=%d event_id=%d -> phys_id=%d, col_id=%d", >> + desc->its_mapti_cmd.dev->device_id, >> + desc->its_mapti_cmd.event_id, >> + desc->its_mapti_cmd.phys_id, >> + desc->its_mapti_cmd.col_id); >> +} >> + >> +static void its_build_invall_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_INVALL); >> + its_encode_collection(cmd, desc->its_invall_cmd.col->col_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("INVALL col_id=%d", desc->its_invall_cmd.col->col_id); >> +} >> + >> +static void its_build_clear_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_CLEAR); >> + its_encode_devid(cmd, desc->its_clear_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_clear_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("CLEAR col_id=%d", desc->its_invall_cmd.col->col_id); >> +} >> + >> +static void its_build_discard_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_DISCARD); >> + its_encode_devid(cmd, desc->its_discard_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_discard_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("DISCARD col_id=%d", desc->its_invall_cmd.col->col_id); >> +} >> + >> +static void its_build_inv_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_INV); >> + its_encode_devid(cmd, desc->its_inv_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_inv_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("INV dev_id=%d event_id=%d", >> + desc->its_inv_cmd.dev->device_id, >> + desc->its_inv_cmd.event_id); >> +} >> + >> +static void its_build_int_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_INT); >> + its_encode_devid(cmd, desc->its_int_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_int_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("INT dev_id=%d event_id=%d", >> + desc->its_int_cmd.dev->device_id, >> + desc->its_int_cmd.event_id); >> +} >> + >> +static void its_build_sync_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_SYNC); >> + its_encode_target(cmd, desc->its_sync_cmd.col->target_address); >> + its_fixup_cmd(cmd); >> + report_info("SYNC target_addr = 0x%lx", >> + desc->its_sync_cmd.col->target_address); >> +} >> + >> +static void its_build_movi_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_MOVI); >> + its_encode_devid(cmd, desc->its_movi_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_movi_cmd.event_id); >> + its_encode_collection(cmd, desc->its_movi_cmd.col->col_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("MOVI dev_id=%d event_id = %d col_id=%d", >> + desc->its_movi_cmd.dev->device_id, >> + desc->its_movi_cmd.event_id, >> + desc->its_movi_cmd.col->col_id); >> +} >> + >> +void its_send_mapd(struct its_device *dev, int valid) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_mapd_cmd.dev = dev; >> + desc.its_mapd_cmd.valid = !!valid; >> + >> + its_send_single_command(its_build_mapd_cmd, &desc); >> +} >> + >> +void its_send_mapc(struct its_collection *col, int valid) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_mapc_cmd.col = col; >> + desc.its_mapc_cmd.valid = !!valid; >> + >> + its_send_single_command(its_build_mapc_cmd, &desc); >> +} >> + >> +void its_send_mapti(struct its_device *dev, u32 irq_id, >> + u32 event_id, struct its_collection *col) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_mapti_cmd.dev = dev; >> + desc.its_mapti_cmd.phys_id = irq_id; >> + desc.its_mapti_cmd.event_id = event_id; >> + desc.its_mapti_cmd.col_id = col->col_id; >> + >> + its_send_single_command(its_build_mapti_cmd, &desc); >> +} >> + >> +void its_send_int(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_int_cmd.dev = dev; >> + desc.its_int_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_int_cmd, &desc); >> +} >> + >> +void its_send_movi(struct its_device *dev, >> + struct its_collection *col, u32 id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_movi_cmd.dev = dev; >> + desc.its_movi_cmd.col = col; >> + desc.its_movi_cmd.event_id = id; >> + >> + its_send_single_command(its_build_movi_cmd, &desc); >> +} >> + >> +void its_send_invall(struct its_collection *col) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_invall_cmd.col = col; >> + >> + its_send_single_command(its_build_invall_cmd, &desc); >> +} >> + >> +void its_send_inv(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_inv_cmd.dev = dev; >> + desc.its_inv_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_inv_cmd, &desc); >> +} >> + >> +void its_send_discard(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_discard_cmd.dev = dev; >> + desc.its_discard_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_discard_cmd, &desc); >> +} >> + >> +void its_send_clear(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_clear_cmd.dev = dev; >> + desc.its_clear_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_clear_cmd, &desc); >> +} >> + >> +void its_send_sync(struct its_collection *col) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_sync_cmd.col = col; >> + >> + its_send_single_command(its_build_sync_cmd, &desc); >> +} >> + >> -- >> 2.20.1 >> > > Thanks, > drew > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2AF09C33CB6 for ; Wed, 15 Jan 2020 17:14:14 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DBAF02467A for ; Wed, 15 Jan 2020 17:14:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RKQXheZO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DBAF02467A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irmF9-0006s2-Re for qemu-devel@archiver.kernel.org; Wed, 15 Jan 2020 12:14:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42997) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irmEN-0006Gj-1l for qemu-devel@nongnu.org; Wed, 15 Jan 2020 12:13:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irmEK-000735-O4 for qemu-devel@nongnu.org; Wed, 15 Jan 2020 12:13:22 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:28543 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irmEK-00072T-IB for qemu-devel@nongnu.org; Wed, 15 Jan 2020 12:13:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579108400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xgDCwoSsZofYUqp3deu/ABXjeAAns8TVCZUAmC4n62E=; b=RKQXheZOd5Aa5hRJ5YjwOwZOUOYAivJqtBIJSOsBBWkqH8P6bC1tYkRdhXyaEW57vJl9LR zhWOjjH+ytyc+VNwWfymFT1woFkjtr14xHw3TkLfFeNe8HNOS1sSHGKsuUdkKpyskYu7me vjqrvFPhEq6YTphaq3nfvjUVbJrZT9A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-nLYNWoLiPLuDsOMRCGV8rg-1; Wed, 15 Jan 2020 12:13:16 -0500 X-MC-Unique: nLYNWoLiPLuDsOMRCGV8rg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7C091005510; Wed, 15 Jan 2020 17:13:14 +0000 (UTC) Received: from [10.36.117.108] (ovpn-117-108.ams2.redhat.com [10.36.117.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A7065E1AD; Wed, 15 Jan 2020 17:13:11 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH v2 12/16] arm/arm64: ITS: commands To: Andrew Jones References: <20200110145412.14937-1-eric.auger@redhat.com> <20200110145412.14937-13-eric.auger@redhat.com> <20200113180042.ud53um575jsra2uf@kamzik.brq.redhat.com> From: Auger Eric Message-ID: <96a89ee2-adc5-093b-baf8-57b45bc84b29@redhat.com> Date: Wed, 15 Jan 2020 18:13:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20200113180042.ud53um575jsra2uf@kamzik.brq.redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, kvm@vger.kernel.org, maz@kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andre.przywara@arm.com, yuzenghui@huawei.com, alexandru.elisei@arm.com, kvmarm@lists.cs.columbia.edu, eric.auger.pro@gmail.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Drew, On 1/13/20 7:00 PM, Andrew Jones wrote: > On Fri, Jan 10, 2020 at 03:54:08PM +0100, Eric Auger wrote: >> Implement main ITS commands. The code is largely inherited from >> the ITS driver. >> >> Signed-off-by: Eric Auger >> >> --- >> >> v1 -> v2: >> - removed its_print_cmd_state >> --- >> arm/Makefile.common | 2 +- >> lib/arm/asm/gic-v3-its.h | 35 +++ >> lib/arm/gic-v3-its-cmd.c | 453 +++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 489 insertions(+), 1 deletion(-) >> create mode 100644 lib/arm/gic-v3-its-cmd.c >> >> diff --git a/arm/Makefile.common b/arm/Makefile.common >> index 1aae5a3..7cc0f04 100644 >> --- a/arm/Makefile.common >> +++ b/arm/Makefile.common >> @@ -52,7 +52,7 @@ cflatobjs += lib/arm/psci.o >> cflatobjs += lib/arm/smp.o >> cflatobjs += lib/arm/delay.o >> cflatobjs += lib/arm/gic.o lib/arm/gic-v2.o lib/arm/gic-v3.o >> -cflatobjs += lib/arm/gic-v3-its.o >> +cflatobjs += lib/arm/gic-v3-its.o lib/arm/gic-v3-its-cmd.o >> >> OBJDIRS += lib/arm >> >> diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h >> index 0497a78..463174f 100644 >> --- a/lib/arm/asm/gic-v3-its.h >> +++ b/lib/arm/asm/gic-v3-its.h >> @@ -58,6 +58,24 @@ >> #define GITS_MAX_DEVICES 8 >> #define GITS_MAX_COLLECTIONS 8 >> >> +/* >> + * ITS commands >> + */ >> +#define GITS_CMD_MAPD 0x08 >> +#define GITS_CMD_MAPC 0x09 >> +#define GITS_CMD_MAPTI 0x0a >> +/* older GIC documentation used MAPVI for this command */ >> +#define GITS_CMD_MAPVI GITS_CMD_MAPTI >> +#define GITS_CMD_MAPI 0x0b >> +#define GITS_CMD_MOVI 0x01 >> +#define GITS_CMD_DISCARD 0x0f >> +#define GITS_CMD_INV 0x0c >> +#define GITS_CMD_MOVALL 0x0e >> +#define GITS_CMD_INVALL 0x0d >> +#define GITS_CMD_INT 0x03 >> +#define GITS_CMD_CLEAR 0x04 >> +#define GITS_CMD_SYNC 0x05 >> + >> struct its_typer { >> unsigned int ite_size; >> unsigned int eventid_bits; >> @@ -122,5 +140,22 @@ extern void its_enable_defaults(void); >> extern struct its_device *its_create_device(u32 dev_id, int nr_ites); >> extern struct its_collection *its_create_collection(u32 col_id, u32 target_pe); >> >> +extern void its_send_mapd(struct its_device *dev, int valid); >> +extern void its_send_mapc(struct its_collection *col, int valid); >> +extern void its_send_mapti(struct its_device *dev, u32 irq_id, >> + u32 event_id, struct its_collection *col); >> +extern void its_send_int(struct its_device *dev, u32 event_id); >> +extern void its_send_inv(struct its_device *dev, u32 event_id); >> +extern void its_send_discard(struct its_device *dev, u32 event_id); >> +extern void its_send_clear(struct its_device *dev, u32 event_id); >> +extern void its_send_invall(struct its_collection *col); >> +extern void its_send_movi(struct its_device *dev, >> + struct its_collection *col, u32 id); >> +extern void its_send_sync(struct its_collection *col); >> + >> +#define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) >> +#define ITS_FLAGS_WORKAROUND_CAVIUM_22375 (1ULL << 1) >> +#define ITS_FLAGS_WORKAROUND_CAVIUM_23144 (1ULL << 2) >> + >> #endif /* !__ASSEMBLY__ */ >> #endif /* _ASMARM_GIC_V3_ITS_H_ */ >> diff --git a/lib/arm/gic-v3-its-cmd.c b/lib/arm/gic-v3-its-cmd.c >> new file mode 100644 >> index 0000000..9c6cbc6 >> --- /dev/null >> +++ b/lib/arm/gic-v3-its-cmd.c >> @@ -0,0 +1,453 @@ >> +/* >> + * Copyright (C) 2016, Red Hat Inc, Eric Auger > > 2016? > >> + * >> + * Most of the code is copy-pasted from: >> + * drivers/irqchip/irq-gic-v3-its.c >> + * This work is licensed under the terms of the GNU LGPL, version 2. >> + */ >> +#include >> +#include >> + >> +#define ITS_ITT_ALIGN SZ_256 >> + >> +static const char * const its_cmd_string[] = { >> + [GITS_CMD_MAPD] = "MAPD", >> + [GITS_CMD_MAPC] = "MAPC", >> + [GITS_CMD_MAPTI] = "MAPTI", >> + [GITS_CMD_MAPI] = "MAPI", >> + [GITS_CMD_MOVI] = "MOVI", >> + [GITS_CMD_DISCARD] = "DISCARD", >> + [GITS_CMD_INV] = "INV", >> + [GITS_CMD_MOVALL] = "MOVALL", >> + [GITS_CMD_INVALL] = "INVALL", >> + [GITS_CMD_INT] = "INT", >> + [GITS_CMD_CLEAR] = "CLEAR", >> + [GITS_CMD_SYNC] = "SYNC", >> +}; >> + >> +struct its_cmd_desc { >> + union { >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_inv_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_int_cmd; >> + >> + struct { >> + struct its_device *dev; >> + bool valid; >> + } its_mapd_cmd; >> + >> + struct { >> + struct its_collection *col; >> + bool valid; >> + } its_mapc_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 phys_id; >> + u32 event_id; >> + u32 col_id; >> + } its_mapti_cmd; >> + >> + struct { >> + struct its_device *dev; >> + struct its_collection *col; >> + u32 event_id; >> + } its_movi_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_discard_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_clear_cmd; >> + >> + struct { >> + struct its_collection *col; >> + } its_invall_cmd; >> + >> + struct { >> + struct its_collection *col; >> + } its_sync_cmd; >> + }; >> +}; >> + >> +typedef void (*its_cmd_builder_t)(struct its_cmd_block *, >> + struct its_cmd_desc *); >> + >> +/* ITS COMMANDS */ >> + >> +static void its_encode_cmd(struct its_cmd_block *cmd, u8 cmd_nr) >> +{ >> + cmd->raw_cmd[0] &= ~0xffUL; >> + cmd->raw_cmd[0] |= cmd_nr; >> +} >> + >> +static void its_encode_devid(struct its_cmd_block *cmd, u32 devid) >> +{ >> + cmd->raw_cmd[0] &= BIT_ULL(32) - 1; >> + cmd->raw_cmd[0] |= ((u64)devid) << 32; >> +} >> + >> +static void its_encode_event_id(struct its_cmd_block *cmd, u32 id) >> +{ >> + cmd->raw_cmd[1] &= ~0xffffffffUL; >> + cmd->raw_cmd[1] |= id; >> +} >> + >> +static void its_encode_phys_id(struct its_cmd_block *cmd, u32 phys_id) >> +{ >> + cmd->raw_cmd[1] &= 0xffffffffUL; >> + cmd->raw_cmd[1] |= ((u64)phys_id) << 32; >> +} >> + >> +static void its_encode_size(struct its_cmd_block *cmd, u8 size) >> +{ >> + cmd->raw_cmd[1] &= ~0x1fUL; >> + cmd->raw_cmd[1] |= size & 0x1f; >> +} >> + >> +static void its_encode_itt(struct its_cmd_block *cmd, u64 itt_addr) >> +{ >> + cmd->raw_cmd[2] &= ~0xffffffffffffUL; >> + cmd->raw_cmd[2] |= itt_addr & 0xffffffffff00UL; >> +} >> + >> +static void its_encode_valid(struct its_cmd_block *cmd, int valid) >> +{ >> + cmd->raw_cmd[2] &= ~(1UL << 63); >> + cmd->raw_cmd[2] |= ((u64)!!valid) << 63; >> +} >> + >> +static void its_encode_target(struct its_cmd_block *cmd, u64 target_addr) >> +{ >> + cmd->raw_cmd[2] &= ~(0xfffffffffUL << 16); >> + cmd->raw_cmd[2] |= (target_addr & (0xffffffffUL << 16)); >> +} > > Did you trying compiling arm (as opposed to arm64)? I see this file and > the other ITS files are added to arm/Makefile.common, but I'd expect this > to be a problem here, since it's UL instead of ULL. No I didn't. I will check this. > >> + >> +static void its_encode_collection(struct its_cmd_block *cmd, u16 col) >> +{ >> + cmd->raw_cmd[2] &= ~0xffffUL; >> + cmd->raw_cmd[2] |= col; >> +} >> + >> +static inline void its_fixup_cmd(struct its_cmd_block *cmd) >> +{ >> + /* Let's fixup BE commands */ >> + cmd->raw_cmd[0] = cpu_to_le64(cmd->raw_cmd[0]); >> + cmd->raw_cmd[1] = cpu_to_le64(cmd->raw_cmd[1]); >> + cmd->raw_cmd[2] = cpu_to_le64(cmd->raw_cmd[2]); >> + cmd->raw_cmd[3] = cpu_to_le64(cmd->raw_cmd[3]); >> +} >> + >> +static u64 its_cmd_ptr_to_offset(struct its_cmd_block *ptr) >> +{ >> + return (ptr - its_data.cmd_base) * sizeof(*ptr); >> +} >> + >> +static struct its_cmd_block *its_post_commands(void) >> +{ >> + u64 wr = its_cmd_ptr_to_offset(its_data.cmd_write); >> + >> + writeq(wr, its_data.base + GITS_CWRITER); >> + return its_data.cmd_write; >> +} >> + >> + >> +/* We just assume the queue is large enough */ > > Assert when the assuming is wrong? OK > >> +static struct its_cmd_block *its_allocate_entry(void) >> +{ >> + struct its_cmd_block *cmd; >> + >> + cmd = its_data.cmd_write++; >> + return cmd; >> +} >> + >> +static void its_wait_for_range_completion(struct its_cmd_block *from, >> + struct its_cmd_block *to) >> +{ >> + u64 rd_idx, from_idx, to_idx; >> + u32 count = 1000000; /* 1s! */ >> + >> + from_idx = its_cmd_ptr_to_offset(from); >> + to_idx = its_cmd_ptr_to_offset(to); >> + while (1) { >> + rd_idx = readq(its_data.base + GITS_CREADR); >> + if (rd_idx >= to_idx || rd_idx < from_idx) >> + break; >> + >> + count--; >> + if (!count) { >> + unsigned int cmd_id = from->raw_cmd[0] & 0xFF; >> + >> + report(false, "%s timeout!", >> + cmd_id <= 0xF ? its_cmd_string[cmd_id] : >> + "Unexpected"); > > assert_msg, not report OK > >> + return; >> + } >> + cpu_relax(); >> + udelay(1); >> + } >> +} >> + >> +static void its_send_single_command(its_cmd_builder_t builder, >> + struct its_cmd_desc *desc) >> +{ >> + struct its_cmd_block *cmd, *next_cmd; >> + >> + cmd = its_allocate_entry(); >> + builder(cmd, desc); >> + next_cmd = its_post_commands(); >> + >> + its_wait_for_range_completion(cmd, next_cmd); >> +} >> + >> + >> +static void its_build_mapd_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + unsigned long itt_addr; >> + u8 size = 12; //TODO ilog2(desc->its_mapd_cmd.dev->nr_ites); >> + >> + itt_addr = (unsigned long)desc->its_mapd_cmd.dev->itt; >> + itt_addr = ALIGN(itt_addr, ITS_ITT_ALIGN); >> + >> + its_encode_cmd(cmd, GITS_CMD_MAPD); >> + its_encode_devid(cmd, desc->its_mapd_cmd.dev->device_id); >> + its_encode_size(cmd, size - 1); >> + its_encode_itt(cmd, itt_addr); >> + its_encode_valid(cmd, desc->its_mapd_cmd.valid); >> + >> + its_fixup_cmd(cmd); >> + report_info("MAPD devid=%d size = 0x%x itt=0x%lx valid=%d", >> + desc->its_mapd_cmd.dev->device_id, >> + size, itt_addr, desc->its_mapd_cmd.valid); > > printf("ITS: ...\n", ...), not report_info OK Thanks Eric > >> + >> +} >> + >> +static void its_build_mapc_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_MAPC); >> + its_encode_collection(cmd, desc->its_mapc_cmd.col->col_id); >> + its_encode_target(cmd, desc->its_mapc_cmd.col->target_address); >> + its_encode_valid(cmd, desc->its_mapc_cmd.valid); >> + >> + its_fixup_cmd(cmd); >> + report_info("MAPC col_id=%d target_addr = 0x%lx valid=%d", >> + desc->its_mapc_cmd.col->col_id, >> + desc->its_mapc_cmd.col->target_address, >> + desc->its_mapc_cmd.valid); >> +} >> + >> +static void its_build_mapti_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_MAPTI); >> + its_encode_devid(cmd, desc->its_mapti_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_mapti_cmd.event_id); >> + its_encode_phys_id(cmd, desc->its_mapti_cmd.phys_id); >> + its_encode_collection(cmd, desc->its_mapti_cmd.col_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("MAPTI dev_id=%d event_id=%d -> phys_id=%d, col_id=%d", >> + desc->its_mapti_cmd.dev->device_id, >> + desc->its_mapti_cmd.event_id, >> + desc->its_mapti_cmd.phys_id, >> + desc->its_mapti_cmd.col_id); >> +} >> + >> +static void its_build_invall_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_INVALL); >> + its_encode_collection(cmd, desc->its_invall_cmd.col->col_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("INVALL col_id=%d", desc->its_invall_cmd.col->col_id); >> +} >> + >> +static void its_build_clear_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_CLEAR); >> + its_encode_devid(cmd, desc->its_clear_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_clear_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("CLEAR col_id=%d", desc->its_invall_cmd.col->col_id); >> +} >> + >> +static void its_build_discard_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_DISCARD); >> + its_encode_devid(cmd, desc->its_discard_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_discard_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("DISCARD col_id=%d", desc->its_invall_cmd.col->col_id); >> +} >> + >> +static void its_build_inv_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_INV); >> + its_encode_devid(cmd, desc->its_inv_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_inv_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("INV dev_id=%d event_id=%d", >> + desc->its_inv_cmd.dev->device_id, >> + desc->its_inv_cmd.event_id); >> +} >> + >> +static void its_build_int_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_INT); >> + its_encode_devid(cmd, desc->its_int_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_int_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("INT dev_id=%d event_id=%d", >> + desc->its_int_cmd.dev->device_id, >> + desc->its_int_cmd.event_id); >> +} >> + >> +static void its_build_sync_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_SYNC); >> + its_encode_target(cmd, desc->its_sync_cmd.col->target_address); >> + its_fixup_cmd(cmd); >> + report_info("SYNC target_addr = 0x%lx", >> + desc->its_sync_cmd.col->target_address); >> +} >> + >> +static void its_build_movi_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_MOVI); >> + its_encode_devid(cmd, desc->its_movi_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_movi_cmd.event_id); >> + its_encode_collection(cmd, desc->its_movi_cmd.col->col_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("MOVI dev_id=%d event_id = %d col_id=%d", >> + desc->its_movi_cmd.dev->device_id, >> + desc->its_movi_cmd.event_id, >> + desc->its_movi_cmd.col->col_id); >> +} >> + >> +void its_send_mapd(struct its_device *dev, int valid) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_mapd_cmd.dev = dev; >> + desc.its_mapd_cmd.valid = !!valid; >> + >> + its_send_single_command(its_build_mapd_cmd, &desc); >> +} >> + >> +void its_send_mapc(struct its_collection *col, int valid) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_mapc_cmd.col = col; >> + desc.its_mapc_cmd.valid = !!valid; >> + >> + its_send_single_command(its_build_mapc_cmd, &desc); >> +} >> + >> +void its_send_mapti(struct its_device *dev, u32 irq_id, >> + u32 event_id, struct its_collection *col) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_mapti_cmd.dev = dev; >> + desc.its_mapti_cmd.phys_id = irq_id; >> + desc.its_mapti_cmd.event_id = event_id; >> + desc.its_mapti_cmd.col_id = col->col_id; >> + >> + its_send_single_command(its_build_mapti_cmd, &desc); >> +} >> + >> +void its_send_int(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_int_cmd.dev = dev; >> + desc.its_int_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_int_cmd, &desc); >> +} >> + >> +void its_send_movi(struct its_device *dev, >> + struct its_collection *col, u32 id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_movi_cmd.dev = dev; >> + desc.its_movi_cmd.col = col; >> + desc.its_movi_cmd.event_id = id; >> + >> + its_send_single_command(its_build_movi_cmd, &desc); >> +} >> + >> +void its_send_invall(struct its_collection *col) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_invall_cmd.col = col; >> + >> + its_send_single_command(its_build_invall_cmd, &desc); >> +} >> + >> +void its_send_inv(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_inv_cmd.dev = dev; >> + desc.its_inv_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_inv_cmd, &desc); >> +} >> + >> +void its_send_discard(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_discard_cmd.dev = dev; >> + desc.its_discard_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_discard_cmd, &desc); >> +} >> + >> +void its_send_clear(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_clear_cmd.dev = dev; >> + desc.its_clear_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_clear_cmd, &desc); >> +} >> + >> +void its_send_sync(struct its_collection *col) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_sync_cmd.col = col; >> + >> + its_send_single_command(its_build_sync_cmd, &desc); >> +} >> + >> -- >> 2.20.1 >> > > Thanks, > drew > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3154C33CB2 for ; Wed, 15 Jan 2020 17:13:29 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 8156524690 for ; Wed, 15 Jan 2020 17:13:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="RKQXheZO" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8156524690 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id F36D84B16F; Wed, 15 Jan 2020 12:13:28 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@redhat.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iVOdNMuVIbKy; Wed, 15 Jan 2020 12:13:25 -0500 (EST) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 160054B0F7; Wed, 15 Jan 2020 12:13:25 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 38A854B0CA for ; Wed, 15 Jan 2020 12:13:23 -0500 (EST) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZqFvLJkF21iG for ; Wed, 15 Jan 2020 12:13:20 -0500 (EST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 7375C4B0F7 for ; Wed, 15 Jan 2020 12:13:20 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579108400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xgDCwoSsZofYUqp3deu/ABXjeAAns8TVCZUAmC4n62E=; b=RKQXheZOd5Aa5hRJ5YjwOwZOUOYAivJqtBIJSOsBBWkqH8P6bC1tYkRdhXyaEW57vJl9LR zhWOjjH+ytyc+VNwWfymFT1woFkjtr14xHw3TkLfFeNe8HNOS1sSHGKsuUdkKpyskYu7me vjqrvFPhEq6YTphaq3nfvjUVbJrZT9A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204-nLYNWoLiPLuDsOMRCGV8rg-1; Wed, 15 Jan 2020 12:13:16 -0500 X-MC-Unique: nLYNWoLiPLuDsOMRCGV8rg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7C091005510; Wed, 15 Jan 2020 17:13:14 +0000 (UTC) Received: from [10.36.117.108] (ovpn-117-108.ams2.redhat.com [10.36.117.108]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A7065E1AD; Wed, 15 Jan 2020 17:13:11 +0000 (UTC) Subject: Re: [kvm-unit-tests PATCH v2 12/16] arm/arm64: ITS: commands To: Andrew Jones References: <20200110145412.14937-1-eric.auger@redhat.com> <20200110145412.14937-13-eric.auger@redhat.com> <20200113180042.ud53um575jsra2uf@kamzik.brq.redhat.com> From: Auger Eric Message-ID: <96a89ee2-adc5-093b-baf8-57b45bc84b29@redhat.com> Date: Wed, 15 Jan 2020 18:13:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20200113180042.ud53um575jsra2uf@kamzik.brq.redhat.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Cc: thuth@redhat.com, kvm@vger.kernel.org, maz@kernel.org, qemu-devel@nongnu.org, qemu-arm@nongnu.org, andre.przywara@arm.com, kvmarm@lists.cs.columbia.edu, eric.auger.pro@gmail.com X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu Hi Drew, On 1/13/20 7:00 PM, Andrew Jones wrote: > On Fri, Jan 10, 2020 at 03:54:08PM +0100, Eric Auger wrote: >> Implement main ITS commands. The code is largely inherited from >> the ITS driver. >> >> Signed-off-by: Eric Auger >> >> --- >> >> v1 -> v2: >> - removed its_print_cmd_state >> --- >> arm/Makefile.common | 2 +- >> lib/arm/asm/gic-v3-its.h | 35 +++ >> lib/arm/gic-v3-its-cmd.c | 453 +++++++++++++++++++++++++++++++++++++++ >> 3 files changed, 489 insertions(+), 1 deletion(-) >> create mode 100644 lib/arm/gic-v3-its-cmd.c >> >> diff --git a/arm/Makefile.common b/arm/Makefile.common >> index 1aae5a3..7cc0f04 100644 >> --- a/arm/Makefile.common >> +++ b/arm/Makefile.common >> @@ -52,7 +52,7 @@ cflatobjs += lib/arm/psci.o >> cflatobjs += lib/arm/smp.o >> cflatobjs += lib/arm/delay.o >> cflatobjs += lib/arm/gic.o lib/arm/gic-v2.o lib/arm/gic-v3.o >> -cflatobjs += lib/arm/gic-v3-its.o >> +cflatobjs += lib/arm/gic-v3-its.o lib/arm/gic-v3-its-cmd.o >> >> OBJDIRS += lib/arm >> >> diff --git a/lib/arm/asm/gic-v3-its.h b/lib/arm/asm/gic-v3-its.h >> index 0497a78..463174f 100644 >> --- a/lib/arm/asm/gic-v3-its.h >> +++ b/lib/arm/asm/gic-v3-its.h >> @@ -58,6 +58,24 @@ >> #define GITS_MAX_DEVICES 8 >> #define GITS_MAX_COLLECTIONS 8 >> >> +/* >> + * ITS commands >> + */ >> +#define GITS_CMD_MAPD 0x08 >> +#define GITS_CMD_MAPC 0x09 >> +#define GITS_CMD_MAPTI 0x0a >> +/* older GIC documentation used MAPVI for this command */ >> +#define GITS_CMD_MAPVI GITS_CMD_MAPTI >> +#define GITS_CMD_MAPI 0x0b >> +#define GITS_CMD_MOVI 0x01 >> +#define GITS_CMD_DISCARD 0x0f >> +#define GITS_CMD_INV 0x0c >> +#define GITS_CMD_MOVALL 0x0e >> +#define GITS_CMD_INVALL 0x0d >> +#define GITS_CMD_INT 0x03 >> +#define GITS_CMD_CLEAR 0x04 >> +#define GITS_CMD_SYNC 0x05 >> + >> struct its_typer { >> unsigned int ite_size; >> unsigned int eventid_bits; >> @@ -122,5 +140,22 @@ extern void its_enable_defaults(void); >> extern struct its_device *its_create_device(u32 dev_id, int nr_ites); >> extern struct its_collection *its_create_collection(u32 col_id, u32 target_pe); >> >> +extern void its_send_mapd(struct its_device *dev, int valid); >> +extern void its_send_mapc(struct its_collection *col, int valid); >> +extern void its_send_mapti(struct its_device *dev, u32 irq_id, >> + u32 event_id, struct its_collection *col); >> +extern void its_send_int(struct its_device *dev, u32 event_id); >> +extern void its_send_inv(struct its_device *dev, u32 event_id); >> +extern void its_send_discard(struct its_device *dev, u32 event_id); >> +extern void its_send_clear(struct its_device *dev, u32 event_id); >> +extern void its_send_invall(struct its_collection *col); >> +extern void its_send_movi(struct its_device *dev, >> + struct its_collection *col, u32 id); >> +extern void its_send_sync(struct its_collection *col); >> + >> +#define ITS_FLAGS_CMDQ_NEEDS_FLUSHING (1ULL << 0) >> +#define ITS_FLAGS_WORKAROUND_CAVIUM_22375 (1ULL << 1) >> +#define ITS_FLAGS_WORKAROUND_CAVIUM_23144 (1ULL << 2) >> + >> #endif /* !__ASSEMBLY__ */ >> #endif /* _ASMARM_GIC_V3_ITS_H_ */ >> diff --git a/lib/arm/gic-v3-its-cmd.c b/lib/arm/gic-v3-its-cmd.c >> new file mode 100644 >> index 0000000..9c6cbc6 >> --- /dev/null >> +++ b/lib/arm/gic-v3-its-cmd.c >> @@ -0,0 +1,453 @@ >> +/* >> + * Copyright (C) 2016, Red Hat Inc, Eric Auger > > 2016? > >> + * >> + * Most of the code is copy-pasted from: >> + * drivers/irqchip/irq-gic-v3-its.c >> + * This work is licensed under the terms of the GNU LGPL, version 2. >> + */ >> +#include >> +#include >> + >> +#define ITS_ITT_ALIGN SZ_256 >> + >> +static const char * const its_cmd_string[] = { >> + [GITS_CMD_MAPD] = "MAPD", >> + [GITS_CMD_MAPC] = "MAPC", >> + [GITS_CMD_MAPTI] = "MAPTI", >> + [GITS_CMD_MAPI] = "MAPI", >> + [GITS_CMD_MOVI] = "MOVI", >> + [GITS_CMD_DISCARD] = "DISCARD", >> + [GITS_CMD_INV] = "INV", >> + [GITS_CMD_MOVALL] = "MOVALL", >> + [GITS_CMD_INVALL] = "INVALL", >> + [GITS_CMD_INT] = "INT", >> + [GITS_CMD_CLEAR] = "CLEAR", >> + [GITS_CMD_SYNC] = "SYNC", >> +}; >> + >> +struct its_cmd_desc { >> + union { >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_inv_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_int_cmd; >> + >> + struct { >> + struct its_device *dev; >> + bool valid; >> + } its_mapd_cmd; >> + >> + struct { >> + struct its_collection *col; >> + bool valid; >> + } its_mapc_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 phys_id; >> + u32 event_id; >> + u32 col_id; >> + } its_mapti_cmd; >> + >> + struct { >> + struct its_device *dev; >> + struct its_collection *col; >> + u32 event_id; >> + } its_movi_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_discard_cmd; >> + >> + struct { >> + struct its_device *dev; >> + u32 event_id; >> + } its_clear_cmd; >> + >> + struct { >> + struct its_collection *col; >> + } its_invall_cmd; >> + >> + struct { >> + struct its_collection *col; >> + } its_sync_cmd; >> + }; >> +}; >> + >> +typedef void (*its_cmd_builder_t)(struct its_cmd_block *, >> + struct its_cmd_desc *); >> + >> +/* ITS COMMANDS */ >> + >> +static void its_encode_cmd(struct its_cmd_block *cmd, u8 cmd_nr) >> +{ >> + cmd->raw_cmd[0] &= ~0xffUL; >> + cmd->raw_cmd[0] |= cmd_nr; >> +} >> + >> +static void its_encode_devid(struct its_cmd_block *cmd, u32 devid) >> +{ >> + cmd->raw_cmd[0] &= BIT_ULL(32) - 1; >> + cmd->raw_cmd[0] |= ((u64)devid) << 32; >> +} >> + >> +static void its_encode_event_id(struct its_cmd_block *cmd, u32 id) >> +{ >> + cmd->raw_cmd[1] &= ~0xffffffffUL; >> + cmd->raw_cmd[1] |= id; >> +} >> + >> +static void its_encode_phys_id(struct its_cmd_block *cmd, u32 phys_id) >> +{ >> + cmd->raw_cmd[1] &= 0xffffffffUL; >> + cmd->raw_cmd[1] |= ((u64)phys_id) << 32; >> +} >> + >> +static void its_encode_size(struct its_cmd_block *cmd, u8 size) >> +{ >> + cmd->raw_cmd[1] &= ~0x1fUL; >> + cmd->raw_cmd[1] |= size & 0x1f; >> +} >> + >> +static void its_encode_itt(struct its_cmd_block *cmd, u64 itt_addr) >> +{ >> + cmd->raw_cmd[2] &= ~0xffffffffffffUL; >> + cmd->raw_cmd[2] |= itt_addr & 0xffffffffff00UL; >> +} >> + >> +static void its_encode_valid(struct its_cmd_block *cmd, int valid) >> +{ >> + cmd->raw_cmd[2] &= ~(1UL << 63); >> + cmd->raw_cmd[2] |= ((u64)!!valid) << 63; >> +} >> + >> +static void its_encode_target(struct its_cmd_block *cmd, u64 target_addr) >> +{ >> + cmd->raw_cmd[2] &= ~(0xfffffffffUL << 16); >> + cmd->raw_cmd[2] |= (target_addr & (0xffffffffUL << 16)); >> +} > > Did you trying compiling arm (as opposed to arm64)? I see this file and > the other ITS files are added to arm/Makefile.common, but I'd expect this > to be a problem here, since it's UL instead of ULL. No I didn't. I will check this. > >> + >> +static void its_encode_collection(struct its_cmd_block *cmd, u16 col) >> +{ >> + cmd->raw_cmd[2] &= ~0xffffUL; >> + cmd->raw_cmd[2] |= col; >> +} >> + >> +static inline void its_fixup_cmd(struct its_cmd_block *cmd) >> +{ >> + /* Let's fixup BE commands */ >> + cmd->raw_cmd[0] = cpu_to_le64(cmd->raw_cmd[0]); >> + cmd->raw_cmd[1] = cpu_to_le64(cmd->raw_cmd[1]); >> + cmd->raw_cmd[2] = cpu_to_le64(cmd->raw_cmd[2]); >> + cmd->raw_cmd[3] = cpu_to_le64(cmd->raw_cmd[3]); >> +} >> + >> +static u64 its_cmd_ptr_to_offset(struct its_cmd_block *ptr) >> +{ >> + return (ptr - its_data.cmd_base) * sizeof(*ptr); >> +} >> + >> +static struct its_cmd_block *its_post_commands(void) >> +{ >> + u64 wr = its_cmd_ptr_to_offset(its_data.cmd_write); >> + >> + writeq(wr, its_data.base + GITS_CWRITER); >> + return its_data.cmd_write; >> +} >> + >> + >> +/* We just assume the queue is large enough */ > > Assert when the assuming is wrong? OK > >> +static struct its_cmd_block *its_allocate_entry(void) >> +{ >> + struct its_cmd_block *cmd; >> + >> + cmd = its_data.cmd_write++; >> + return cmd; >> +} >> + >> +static void its_wait_for_range_completion(struct its_cmd_block *from, >> + struct its_cmd_block *to) >> +{ >> + u64 rd_idx, from_idx, to_idx; >> + u32 count = 1000000; /* 1s! */ >> + >> + from_idx = its_cmd_ptr_to_offset(from); >> + to_idx = its_cmd_ptr_to_offset(to); >> + while (1) { >> + rd_idx = readq(its_data.base + GITS_CREADR); >> + if (rd_idx >= to_idx || rd_idx < from_idx) >> + break; >> + >> + count--; >> + if (!count) { >> + unsigned int cmd_id = from->raw_cmd[0] & 0xFF; >> + >> + report(false, "%s timeout!", >> + cmd_id <= 0xF ? its_cmd_string[cmd_id] : >> + "Unexpected"); > > assert_msg, not report OK > >> + return; >> + } >> + cpu_relax(); >> + udelay(1); >> + } >> +} >> + >> +static void its_send_single_command(its_cmd_builder_t builder, >> + struct its_cmd_desc *desc) >> +{ >> + struct its_cmd_block *cmd, *next_cmd; >> + >> + cmd = its_allocate_entry(); >> + builder(cmd, desc); >> + next_cmd = its_post_commands(); >> + >> + its_wait_for_range_completion(cmd, next_cmd); >> +} >> + >> + >> +static void its_build_mapd_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + unsigned long itt_addr; >> + u8 size = 12; //TODO ilog2(desc->its_mapd_cmd.dev->nr_ites); >> + >> + itt_addr = (unsigned long)desc->its_mapd_cmd.dev->itt; >> + itt_addr = ALIGN(itt_addr, ITS_ITT_ALIGN); >> + >> + its_encode_cmd(cmd, GITS_CMD_MAPD); >> + its_encode_devid(cmd, desc->its_mapd_cmd.dev->device_id); >> + its_encode_size(cmd, size - 1); >> + its_encode_itt(cmd, itt_addr); >> + its_encode_valid(cmd, desc->its_mapd_cmd.valid); >> + >> + its_fixup_cmd(cmd); >> + report_info("MAPD devid=%d size = 0x%x itt=0x%lx valid=%d", >> + desc->its_mapd_cmd.dev->device_id, >> + size, itt_addr, desc->its_mapd_cmd.valid); > > printf("ITS: ...\n", ...), not report_info OK Thanks Eric > >> + >> +} >> + >> +static void its_build_mapc_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_MAPC); >> + its_encode_collection(cmd, desc->its_mapc_cmd.col->col_id); >> + its_encode_target(cmd, desc->its_mapc_cmd.col->target_address); >> + its_encode_valid(cmd, desc->its_mapc_cmd.valid); >> + >> + its_fixup_cmd(cmd); >> + report_info("MAPC col_id=%d target_addr = 0x%lx valid=%d", >> + desc->its_mapc_cmd.col->col_id, >> + desc->its_mapc_cmd.col->target_address, >> + desc->its_mapc_cmd.valid); >> +} >> + >> +static void its_build_mapti_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_MAPTI); >> + its_encode_devid(cmd, desc->its_mapti_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_mapti_cmd.event_id); >> + its_encode_phys_id(cmd, desc->its_mapti_cmd.phys_id); >> + its_encode_collection(cmd, desc->its_mapti_cmd.col_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("MAPTI dev_id=%d event_id=%d -> phys_id=%d, col_id=%d", >> + desc->its_mapti_cmd.dev->device_id, >> + desc->its_mapti_cmd.event_id, >> + desc->its_mapti_cmd.phys_id, >> + desc->its_mapti_cmd.col_id); >> +} >> + >> +static void its_build_invall_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_INVALL); >> + its_encode_collection(cmd, desc->its_invall_cmd.col->col_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("INVALL col_id=%d", desc->its_invall_cmd.col->col_id); >> +} >> + >> +static void its_build_clear_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_CLEAR); >> + its_encode_devid(cmd, desc->its_clear_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_clear_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("CLEAR col_id=%d", desc->its_invall_cmd.col->col_id); >> +} >> + >> +static void its_build_discard_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_DISCARD); >> + its_encode_devid(cmd, desc->its_discard_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_discard_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("DISCARD col_id=%d", desc->its_invall_cmd.col->col_id); >> +} >> + >> +static void its_build_inv_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_INV); >> + its_encode_devid(cmd, desc->its_inv_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_inv_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("INV dev_id=%d event_id=%d", >> + desc->its_inv_cmd.dev->device_id, >> + desc->its_inv_cmd.event_id); >> +} >> + >> +static void its_build_int_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_INT); >> + its_encode_devid(cmd, desc->its_int_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_int_cmd.event_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("INT dev_id=%d event_id=%d", >> + desc->its_int_cmd.dev->device_id, >> + desc->its_int_cmd.event_id); >> +} >> + >> +static void its_build_sync_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_SYNC); >> + its_encode_target(cmd, desc->its_sync_cmd.col->target_address); >> + its_fixup_cmd(cmd); >> + report_info("SYNC target_addr = 0x%lx", >> + desc->its_sync_cmd.col->target_address); >> +} >> + >> +static void its_build_movi_cmd(struct its_cmd_block *cmd, >> + struct its_cmd_desc *desc) >> +{ >> + its_encode_cmd(cmd, GITS_CMD_MOVI); >> + its_encode_devid(cmd, desc->its_movi_cmd.dev->device_id); >> + its_encode_event_id(cmd, desc->its_movi_cmd.event_id); >> + its_encode_collection(cmd, desc->its_movi_cmd.col->col_id); >> + >> + its_fixup_cmd(cmd); >> + report_info("MOVI dev_id=%d event_id = %d col_id=%d", >> + desc->its_movi_cmd.dev->device_id, >> + desc->its_movi_cmd.event_id, >> + desc->its_movi_cmd.col->col_id); >> +} >> + >> +void its_send_mapd(struct its_device *dev, int valid) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_mapd_cmd.dev = dev; >> + desc.its_mapd_cmd.valid = !!valid; >> + >> + its_send_single_command(its_build_mapd_cmd, &desc); >> +} >> + >> +void its_send_mapc(struct its_collection *col, int valid) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_mapc_cmd.col = col; >> + desc.its_mapc_cmd.valid = !!valid; >> + >> + its_send_single_command(its_build_mapc_cmd, &desc); >> +} >> + >> +void its_send_mapti(struct its_device *dev, u32 irq_id, >> + u32 event_id, struct its_collection *col) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_mapti_cmd.dev = dev; >> + desc.its_mapti_cmd.phys_id = irq_id; >> + desc.its_mapti_cmd.event_id = event_id; >> + desc.its_mapti_cmd.col_id = col->col_id; >> + >> + its_send_single_command(its_build_mapti_cmd, &desc); >> +} >> + >> +void its_send_int(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_int_cmd.dev = dev; >> + desc.its_int_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_int_cmd, &desc); >> +} >> + >> +void its_send_movi(struct its_device *dev, >> + struct its_collection *col, u32 id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_movi_cmd.dev = dev; >> + desc.its_movi_cmd.col = col; >> + desc.its_movi_cmd.event_id = id; >> + >> + its_send_single_command(its_build_movi_cmd, &desc); >> +} >> + >> +void its_send_invall(struct its_collection *col) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_invall_cmd.col = col; >> + >> + its_send_single_command(its_build_invall_cmd, &desc); >> +} >> + >> +void its_send_inv(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_inv_cmd.dev = dev; >> + desc.its_inv_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_inv_cmd, &desc); >> +} >> + >> +void its_send_discard(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_discard_cmd.dev = dev; >> + desc.its_discard_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_discard_cmd, &desc); >> +} >> + >> +void its_send_clear(struct its_device *dev, u32 event_id) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_clear_cmd.dev = dev; >> + desc.its_clear_cmd.event_id = event_id; >> + >> + its_send_single_command(its_build_clear_cmd, &desc); >> +} >> + >> +void its_send_sync(struct its_collection *col) >> +{ >> + struct its_cmd_desc desc; >> + >> + desc.its_sync_cmd.col = col; >> + >> + its_send_single_command(its_build_sync_cmd, &desc); >> +} >> + >> -- >> 2.20.1 >> > > Thanks, > drew > _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm