From patchwork Wed May 18 19:11:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Thierry X-Patchwork-Id: 12854003 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3BDD4C433F5 for ; Wed, 18 May 2022 19:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=n0MCfBiXN2Tzp45w26+BeDCJ5DOWTH2tIHKpi8YSJZo=; b=il4zLgRfz8RBv5 QyPZPMfqciXfRREimsG4Gdn73b5RZPG5x8tEA5ekya2w9LQJZMcfDLKtX8w39w2uTZtPBQSzin15R 77754g4/rh1rXk3KlMDcSNRo1u71CMNdXOCc7M0bW8dWwRrIPkdhVXjKj1Zg1vQDcrfkUwd0jhK6h nS/Vd8OAhTMe9fp6lj+3MBaYu/3HSp3r7n582oFZzUZe0gf94/70DA4/g63iK4ppZrIByFEBzjFa9 i7HSd9HdJuIUv/lUrwEJdOnsEDOmGUGQmtV6iVdxXbj1ZTwe3p7bIWGuYwRy8gw+oxuDbDvYdC6xt km6hLsdAStXDKBfFY+kA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrP5V-003Xyc-Qy; Wed, 18 May 2022 19:12:01 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nrP5S-003Xx8-Su for linux-arm-kernel@lists.infradead.org; Wed, 18 May 2022 19:12:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652901113; 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=ZYl5My+boABlwBkdtI4YSYtJJMplcDoxFVjF4RinUQo=; b=Qx2Qzyvr2ILqIvEQuZuBndqyXg5pmfl/8I6OIpOkqpyKK5LVS57L8MQfUyktF22KIvJe8L HbjHRo8jY527KPu0JkBPMAYz4ApArvwvHg9M/ZEFWu6oEyiSwEdM2smOeIvot3KxE9gYpf j91fVrEYIoR59q7HaV8xbkik3eaMXG0= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-294-Yu7l29hdOf6q_kRgugU-8w-1; Wed, 18 May 2022 15:11:52 -0400 X-MC-Unique: Yu7l29hdOf6q_kRgugU-8w-1 Received: by mail-qv1-f72.google.com with SMTP id n20-20020a0cc194000000b00461e72ac689so2338720qvh.9 for ; Wed, 18 May 2022 12:11:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZYl5My+boABlwBkdtI4YSYtJJMplcDoxFVjF4RinUQo=; b=nZStzKHNU606HCFFlFZ9Hx2qQs69euq0QA1TOFHzvdanyQTv0HLmRiQQR/FBUA9ROh j2fvehvEATIKz97Ip6hAPePsR+9ZEdJuR2sRaRMTaa8JIcJuKaOl2bKM6yro8LY9KkKc pqoybZciXv34qt3VYyydLnnwdA4MRi/cVqTS3pesxCUOWc8sz+WN2mIJJL9LJ5/hwBQO HUTd+ES1csv9kXgrDIB1/dXQeUlgsgRWvki+dsVWh12fxoYwsxChhO7DDiWNhRSJyjx+ DlRJRyZAzuLCxdmloM6URBtjbTbzL7KeqUppb9Lnn8EFMaY9xDdwh3n7/SFR/Or0HCUP S0Aw== X-Gm-Message-State: AOAM531v5Sdjyb+PJ5j7K7Foc5QYm8LAo3uqSreEUjt34grgPx56RGw5 6RuynEIM31yjMHFBV9ZxLO4MatgQ/r8681TexUkyFynnYTUSQe5aDdE4JP84ZYfi5b0RCkUBss8 jYjiTwEABS5fYI9+rXZ0ifX56Scxon7zNjQQ= X-Received: by 2002:a05:620a:20c1:b0:6a0:4217:b2cc with SMTP id f1-20020a05620a20c100b006a04217b2ccmr727819qka.280.1652901111965; Wed, 18 May 2022 12:11:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwlcy622B6oNjP/prwulbM4e6dmSbgOzdw8xUrP7TW1MBXOvQTd9IJCEvG4gI3cVvBklIrMNA== X-Received: by 2002:a05:620a:20c1:b0:6a0:4217:b2cc with SMTP id f1-20020a05620a20c100b006a04217b2ccmr727803qka.280.1652901111774; Wed, 18 May 2022 12:11:51 -0700 (PDT) Received: from fedora.hitronhub.home (modemcable200.11-22-96.mc.videotron.ca. [96.22.11.200]) by smtp.gmail.com with ESMTPSA id z190-20020a37b0c7000000b006a32d491f92sm39183qke.39.2022.05.18.12.11.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 12:11:51 -0700 (PDT) From: Adrien Thierry To: Nicolas Saenz Julienne , Greg Kroah-Hartman Cc: Stefan Wahren , Adrien Thierry , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-staging@lists.linux.dev Subject: [PATCH v2 1/9] staging: vchiq_arm: add reference to vchiq device in vchiq_state Date: Wed, 18 May 2022 15:11:12 -0400 Message-Id: <20220518191126.60396-2-athierry@redhat.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220518191126.60396-1-athierry@redhat.com> References: <20220518191126.60396-1-athierry@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=athierry@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220518_121159_031600_569D2492 X-CRM114-Status: GOOD ( 16.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a reference to the vchiq device in the vchiq_state structure. This allows the device structure to be passed around, which will be useful in order to get rid of the global g_dev structure. This change will also make it possible to use standard kernel logging macros instead of the custom ones. Signed-off-by: Adrien Thierry --- Changes since v1: - added more info to commit message drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 +- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.c | 4 +++- .../staging/vc04_services/interface/vchiq_arm/vchiq_core.h | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 0596ac61e286..e6e0737c85fc 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -519,7 +519,7 @@ int vchiq_platform_init(struct platform_device *pdev, struct vchiq_state *state) *(char **)&g_fragments_base[i * g_fragments_size] = NULL; sema_init(&g_free_fragments_sema, MAX_FRAGMENTS); - err = vchiq_init_state(state, vchiq_slot_zero); + err = vchiq_init_state(state, vchiq_slot_zero, dev); if (err) return err; diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c index 8f99272dbd6f..0d5c39d7c6e2 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -2142,7 +2142,7 @@ vchiq_init_slots(void *mem_base, int mem_size) } int -vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero) +vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero, struct device *dev) { struct vchiq_shared_state *local; struct vchiq_shared_state *remote; @@ -2169,6 +2169,8 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero) memset(state, 0, sizeof(struct vchiq_state)); + state->dev = dev; + /* * initialize shared state pointers */ diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h index 82b7bd7b54b2..352017ff5309 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h @@ -315,6 +315,7 @@ struct vchiq_slot_zero { }; struct vchiq_state { + struct device *dev; int id; int initialised; enum vchiq_connstate conn_state; @@ -458,7 +459,7 @@ extern struct vchiq_slot_zero * vchiq_init_slots(void *mem_base, int mem_size); extern int -vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero); +vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero, struct device *dev); extern enum vchiq_status vchiq_connect_internal(struct vchiq_state *state, struct vchiq_instance *instance);