Received: by 2002:a05:6358:16cc:b0:ea:6187:17c9 with SMTP id r12csp2385340rwl; Mon, 26 Dec 2022 14:03:41 -0800 (PST) X-Google-Smtp-Source: AMrXdXuDIiGLXogR7RlhhTwObQnazhpMwip8Qd+CS58KlkmQHClCFWR32YP7bJKztD36WcQY6Z7N X-Received: by 2002:a17:906:60cb:b0:84b:b481:6188 with SMTP id f11-20020a17090660cb00b0084bb4816188mr7380303ejk.64.1672092221107; Mon, 26 Dec 2022 14:03:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672092221; cv=none; d=google.com; s=arc-20160816; b=CeEAMWat4hutp9aiqV/HZ1h4J+hA5u0iyROcc0dLL+cdilSs16WP15zmb2fQ8sMH6l +a83oQsppnKgjNCG9HEBb3axE+k5gMLoLQ5SFDEzNF1l6iuDeeOevs/Xdj2cpO/09UiG NMPRC4GE5qiddUQgkXu/jNdle0PISsSl9rTIyrX8d6m8KiwdZJLi1bJlLWpGQ1eZXVbH uTdRx80U4icdioPX2skWB1sUsC/e0BL//i7isxOqi/Z10hAkxNjL90VZQ46t0QiL911D C0jS/2CaW6LF4NmsWU0NONR4SG8+xEDz6R4vxrq0m4J8N0wFJ52V9OO48JJvcv8RggC1 u+5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=gaLfkoYdAczAXmP4zTc3e9DWG88p3wmbWwfOB42t2Q8=; b=Uq23r4VZT3IAXuoS1OgtgaYALVi9mGTJwO3lRewc0+FogVKnoIkFggVUZrxQYsRWNW /cyOip0qM5e3rSGSZLOlva/sgxjlQGrhYA4sj1YXLBL47O6YmDMNvewMxiBiPujxvb25 9GN8IUkv2QQqCeZJ+uOSIkB9B7xzbZWK5IjZHGaqnCXpwy1Xi2saakCbaTWLMLCKK/Sa 7Hpe4E1bL3wO7XZB2SgHzKwWgRF3spRnu8Q3mz6nk83LasFAq+C4ed0gxSxsHPoxSROT ncMeydyYsNy7HqLGsqohT3stncp82x7/ft17G3N5hgDZ/k1YtH0NoF8XBjgjdZhshnbV OYJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Dx8kdvSS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sb18-20020a1709076d9200b007f5e85a454csi10202054ejc.356.2022.12.26.14.03.26; Mon, 26 Dec 2022 14:03:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Dx8kdvSS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232278AbiLZVci (ORCPT + 66 others); Mon, 26 Dec 2022 16:32:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229652AbiLZVcg (ORCPT ); Mon, 26 Dec 2022 16:32:36 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8BC5025E6 for ; Mon, 26 Dec 2022 13:32:34 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1FA17B80D13 for ; Mon, 26 Dec 2022 21:32:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5F9B2C433D2; Mon, 26 Dec 2022 21:32:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672090351; bh=lwU9Kl8Xzc7F+A8wpvvCU4Lqw994MKfruNw8F1fJBAY=; h=From:To:Cc:Subject:Date:From; b=Dx8kdvSS7UVJRZ9LP1ka/5k1EZ4Xn3FfN2JNxuPMOxtPjjkCpGAStgMuhSqjsJv1z 9AgHCgybCvfKR/dLSfsX1X4fE4TF64lwBzPb9SaPT7tuqQoVsdj5AQJdBEJJ7Ti/Cq TqjrJhUxYXKXhiKpO/qXU+HDEm0VXnpcq/H51iSu2ZMZPfuTlHSnkrLEIP2Hct/Aj8 5EYcA05q2LJgZz7NLHDITU3w+pmmJ/vicyqAZ1nicaNzjM8kfbKzOresBaaSbGF7PK EYrkXMyQ9aREFrgwhIMxJcu5j2dcMv+Rj2bQKOrsKJin9ulD3HFP0FkaJa+5auO0pm pA3kCyY7JPjfg== From: Oded Gabbay To: airlied@gmail.com, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] habanalabs/uapi: move uapi file to drm Date: Mon, 26 Dec 2022 23:32:26 +0200 Message-Id: <20221226213227.26953-1-ogabbay@kernel.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the habanalabs.h uapi file from include/uapi/misc to include/uapi/drm, and rename it to habanalabs_accel.h. This is required before moving the actual driver to the accel subsystem. Update MAINTAINERS file accordingly. Signed-off-by: Oded Gabbay --- MAINTAINERS | 2 +- drivers/misc/habanalabs/Kconfig | 2 +- drivers/misc/habanalabs/common/command_buffer.c | 2 +- drivers/misc/habanalabs/common/command_submission.c | 2 +- drivers/misc/habanalabs/common/device.c | 2 +- drivers/misc/habanalabs/common/habanalabs.h | 2 +- drivers/misc/habanalabs/common/habanalabs_ioctl.c | 2 +- drivers/misc/habanalabs/common/memory.c | 2 +- drivers/misc/habanalabs/common/state_dump.c | 2 +- drivers/misc/habanalabs/gaudi/gaudiP.h | 2 +- drivers/misc/habanalabs/gaudi/gaudi_coresight.c | 3 ++- drivers/misc/habanalabs/gaudi2/gaudi2P.h | 2 +- drivers/misc/habanalabs/gaudi2/gaudi2_coresight.c | 2 +- drivers/misc/habanalabs/goya/goyaP.h | 2 +- drivers/misc/habanalabs/goya/goya_coresight.c | 2 +- include/uapi/{misc/habanalabs.h => drm/habanalabs_accel.h} | 0 16 files changed, 16 insertions(+), 15 deletions(-) rename include/uapi/{misc/habanalabs.h => drm/habanalabs_accel.h} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index f61eb221415b..ce47d05693d9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9049,7 +9049,7 @@ F: Documentation/ABI/testing/debugfs-driver-habanalabs F: Documentation/ABI/testing/sysfs-driver-habanalabs F: drivers/misc/habanalabs/ F: include/trace/events/habanalabs.h -F: include/uapi/misc/habanalabs.h +F: include/uapi/drm/habanalabs_accel.h HACKRF MEDIA DRIVER M: Antti Palosaari diff --git a/drivers/misc/habanalabs/Kconfig b/drivers/misc/habanalabs/Kconfig index bd01d0d940c0..585235531b9b 100644 --- a/drivers/misc/habanalabs/Kconfig +++ b/drivers/misc/habanalabs/Kconfig @@ -19,7 +19,7 @@ config HABANA_AI the user to submit workloads to the devices. The user-space interface is described in - include/uapi/misc/habanalabs.h + include/uapi/drm/habanalabs_accel.h If unsure, say N. diff --git a/drivers/misc/habanalabs/common/command_buffer.c b/drivers/misc/habanalabs/common/command_buffer.c index 24100501f8ca..6263d01cb9c1 100644 --- a/drivers/misc/habanalabs/common/command_buffer.c +++ b/drivers/misc/habanalabs/common/command_buffer.c @@ -5,7 +5,7 @@ * All Rights Reserved. */ -#include +#include #include "habanalabs.h" #include diff --git a/drivers/misc/habanalabs/common/command_submission.c b/drivers/misc/habanalabs/common/command_submission.c index 1543ef993f8e..f6ee10334235 100644 --- a/drivers/misc/habanalabs/common/command_submission.c +++ b/drivers/misc/habanalabs/common/command_submission.c @@ -5,7 +5,7 @@ * All Rights Reserved. */ -#include +#include #include "habanalabs.h" #include diff --git a/drivers/misc/habanalabs/common/device.c b/drivers/misc/habanalabs/common/device.c index 71f958a2e91b..6620580e9ba8 100644 --- a/drivers/misc/habanalabs/common/device.c +++ b/drivers/misc/habanalabs/common/device.c @@ -7,7 +7,7 @@ #define pr_fmt(fmt) "habanalabs: " fmt -#include +#include #include "habanalabs.h" #include diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h index c609b2e44ad3..7b6f10033ee9 100644 --- a/drivers/misc/habanalabs/common/habanalabs.h +++ b/drivers/misc/habanalabs/common/habanalabs.h @@ -11,7 +11,7 @@ #include "../include/common/cpucp_if.h" #include "../include/common/qman_if.h" #include "../include/hw_ip/mmu/mmu_general.h" -#include +#include #include #include diff --git a/drivers/misc/habanalabs/common/habanalabs_ioctl.c b/drivers/misc/habanalabs/common/habanalabs_ioctl.c index 4d642987ad02..079483421e12 100644 --- a/drivers/misc/habanalabs/common/habanalabs_ioctl.c +++ b/drivers/misc/habanalabs/common/habanalabs_ioctl.c @@ -7,7 +7,7 @@ #define pr_fmt(fmt) "habanalabs: " fmt -#include +#include #include "habanalabs.h" #include diff --git a/drivers/misc/habanalabs/common/memory.c b/drivers/misc/habanalabs/common/memory.c index a2d24c9a3d1e..1c38fab39337 100644 --- a/drivers/misc/habanalabs/common/memory.c +++ b/drivers/misc/habanalabs/common/memory.c @@ -5,7 +5,7 @@ * All Rights Reserved. */ -#include +#include #include "habanalabs.h" #include "../include/hw_ip/mmu/mmu_general.h" diff --git a/drivers/misc/habanalabs/common/state_dump.c b/drivers/misc/habanalabs/common/state_dump.c index 74726907c95e..3a9931f24259 100644 --- a/drivers/misc/habanalabs/common/state_dump.c +++ b/drivers/misc/habanalabs/common/state_dump.c @@ -6,7 +6,7 @@ */ #include -#include +#include #include "habanalabs.h" /** diff --git a/drivers/misc/habanalabs/gaudi/gaudiP.h b/drivers/misc/habanalabs/gaudi/gaudiP.h index 4fbcf3f0afe5..3d88d56c8eb3 100644 --- a/drivers/misc/habanalabs/gaudi/gaudiP.h +++ b/drivers/misc/habanalabs/gaudi/gaudiP.h @@ -8,7 +8,7 @@ #ifndef GAUDIP_H_ #define GAUDIP_H_ -#include +#include #include "../common/habanalabs.h" #include "../include/common/hl_boot_if.h" #include "../include/gaudi/gaudi_packets.h" diff --git a/drivers/misc/habanalabs/gaudi/gaudi_coresight.c b/drivers/misc/habanalabs/gaudi/gaudi_coresight.c index 08108f5fed67..3455b14554c6 100644 --- a/drivers/misc/habanalabs/gaudi/gaudi_coresight.c +++ b/drivers/misc/habanalabs/gaudi/gaudi_coresight.c @@ -11,7 +11,8 @@ #include "../include/gaudi/gaudi_masks.h" #include "../include/gaudi/gaudi_reg_map.h" -#include +#include + #define SPMU_SECTION_SIZE MME0_ACC_SPMU_MAX_OFFSET #define SPMU_EVENT_TYPES_OFFSET 0x400 #define SPMU_MAX_COUNTERS 6 diff --git a/drivers/misc/habanalabs/gaudi2/gaudi2P.h b/drivers/misc/habanalabs/gaudi2/gaudi2P.h index b4383c199bbb..ed09864c2dfc 100644 --- a/drivers/misc/habanalabs/gaudi2/gaudi2P.h +++ b/drivers/misc/habanalabs/gaudi2/gaudi2P.h @@ -8,7 +8,7 @@ #ifndef GAUDI2P_H_ #define GAUDI2P_H_ -#include +#include #include "../common/habanalabs.h" #include "../include/common/hl_boot_if.h" #include "../include/gaudi2/gaudi2.h" diff --git a/drivers/misc/habanalabs/gaudi2/gaudi2_coresight.c b/drivers/misc/habanalabs/gaudi2/gaudi2_coresight.c index 1df7a59e4101..1dfbe293ecec 100644 --- a/drivers/misc/habanalabs/gaudi2/gaudi2_coresight.c +++ b/drivers/misc/habanalabs/gaudi2/gaudi2_coresight.c @@ -5,7 +5,7 @@ * All Rights Reserved. */ #include "gaudi2_coresight_regs.h" -#include +#include #define GAUDI2_PLDM_CORESIGHT_TIMEOUT_USEC (CORESIGHT_TIMEOUT_USEC * 2000) #define SPMU_MAX_COUNTERS 6 diff --git a/drivers/misc/habanalabs/goya/goyaP.h b/drivers/misc/habanalabs/goya/goyaP.h index d6ec43d6f6b0..5df3d30b91fd 100644 --- a/drivers/misc/habanalabs/goya/goyaP.h +++ b/drivers/misc/habanalabs/goya/goyaP.h @@ -8,7 +8,7 @@ #ifndef GOYAP_H_ #define GOYAP_H_ -#include +#include #include "../common/habanalabs.h" #include "../include/common/hl_boot_if.h" #include "../include/goya/goya_packets.h" diff --git a/drivers/misc/habanalabs/goya/goya_coresight.c b/drivers/misc/habanalabs/goya/goya_coresight.c index 2c5133cfae65..e7ac3046cfaa 100644 --- a/drivers/misc/habanalabs/goya/goya_coresight.c +++ b/drivers/misc/habanalabs/goya/goya_coresight.c @@ -10,7 +10,7 @@ #include "../include/goya/asic_reg/goya_regs.h" #include "../include/goya/asic_reg/goya_masks.h" -#include +#include #define GOYA_PLDM_CORESIGHT_TIMEOUT_USEC (CORESIGHT_TIMEOUT_USEC * 100) diff --git a/include/uapi/misc/habanalabs.h b/include/uapi/drm/habanalabs_accel.h similarity index 100% rename from include/uapi/misc/habanalabs.h rename to include/uapi/drm/habanalabs_accel.h -- 2.34.1