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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 1D3E5C433B4 for ; Thu, 8 Apr 2021 03:48:00 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 9FAC6610C7 for ; Thu, 8 Apr 2021 03:47:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9FAC6610C7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=hiyiV8DOPerUDohYTZxAdAMpVzvCnDC4e7y00p3eAX0=; b=Xws4RqlD4WdXIlsvYohas0q7c NcF0a37eDM/o85yM67nWvR33msF6qaZTWWYHKH41ydiPmhhwCk1j1I+LpWp5SpVIrujRp7015jUtw lhX/qYniEm0AyK6koL9WJ5/Jb/BHagmb+S68Y/tEAfZGUrQyWJxdRE0XFPJjxVVf8GtJ4VGsJlttm +q6F6bqaHbFXrJB/UTWDnaI0ZhEvyI9EDexXoxn7rOjJeGfsL2bidMLMMoMyn6Fm+g5as4TqbNqYq pa725n9KvnLrYlgiQgnPencrRgu+B0psbjteTcaw9D33taltILkjO2artiVEs66jOpHEroHvzK7tX wbIdEcUuw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lULc1-006jSE-Sl; Thu, 08 Apr 2021 03:45:47 +0000 Received: from mail-yb1-xb2d.google.com ([2607:f8b0:4864:20::b2d]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lULbw-006jRu-Tl for linux-arm-kernel@lists.infradead.org; Thu, 08 Apr 2021 03:45:42 +0000 Received: by mail-yb1-xb2d.google.com with SMTP id g38so1060418ybi.12 for ; Wed, 07 Apr 2021 20:45:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YpXyY82hIb+Th5j4vFZ0f7bQvdjavP/oC7bA+N+HLRo=; b=ntVXVu5L0RneQrc8Q9HMMHsvxVKwZByhF8LxTqOp1KeHAgcVvIydsECmWIZGlPMWyW ms1UmlAXKu0cXHftCqFuQDWgIUMOwpPAh1VRp57wK7mpx60sSJxlQrfvy/NbBfXM0AWG iKE5yAMn56HRQ9ri9gTU0oqqeYgZoHvrLGuFCnYBLuG/vQHw+DvKpG1GPPndh/bHMDRm PzzunMdViWXxI2zTJ5iJeLtJloIzteDo05cRuleVowX84okO4xLlKW9mzIsCWrB7/h7A JTwX+CSuNOv4iLDX+w7vzJG+ZjtfD2NzHTQzOintSNy3JuCqxGACjVR+yJ5FDtldA+c2 h7Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YpXyY82hIb+Th5j4vFZ0f7bQvdjavP/oC7bA+N+HLRo=; b=Wt8j1aJa3h0nD8BcbZhACXI/G2UP4XByOmMoDTdyVZ4xF4W//okVXbIZN93GFlsMiE g/4LgMyTxtyAkYHaIn67gODkGA7HDrR26cxwlyxDw8ZkRELgoR1HKl7G5aHF4KC76XI9 W+0IZKnSB1YWe3pYOeC4Zecq1+Cp8gVM5ogT4dEmkIF/TwDAa7H4H9ThfXjWRqn0YziI 5rr55le8Sz/hd6s3WbL5eIsnsIY7Vz3qBxSs9frifq8GgQUN9AzlipqmV66zTZmrkF7U I7cfD/KGYPMG5xaVBnsoaNUnuxS6LFDz0VVT1a9IWwomOF3foj96LeRdDTkuGWM+Ez7+ 4FQg== X-Gm-Message-State: AOAM5327J17mvODn5Qpfe/3ruIbVufAKScPpX8XY3S6dhhMu+yvkLYbb O1UFTl8rYW1kEAPzX9dxWpRLMaqli3HDWHR9SK8= X-Google-Smtp-Source: ABdhPJxrDGN21/BbNTfevzT0w6+H9gdFlLh3L/VOrZ8aqLPhftv9Ya6tsKrE4JScC+D0oB4InTW/a6BztUY6iXpk1WE= X-Received: by 2002:a25:f304:: with SMTP id c4mr8455726ybs.236.1617853538936; Wed, 07 Apr 2021 20:45:38 -0700 (PDT) MIME-Version: 1.0 References: <20201105212116.411422-1-peter.hilber@opensynergy.com> <20201105212116.411422-11-peter.hilber@opensynergy.com> In-Reply-To: <20201105212116.411422-11-peter.hilber@opensynergy.com> From: Viresh Kumar Date: Thu, 8 Apr 2021 09:15:28 +0530 Message-ID: Subject: Re: [RFC PATCH v2 10/10] firmware: arm_scmi: Add virtio transport To: Peter Hilber Cc: Linux ARM , DTML , virtualization@lists.linux-foundation.org, virtio-dev@lists.oasis-open.org, Igor Skalkin , Rob Herring , Linux Kernel Mailing List , Sudeep Holla , souvik.chakravarty@arm.com, alex.bennee@linaro.org, jean-philippe@linaro.org, mikhail.golubev@opensynergy.com, anton.yakovlev@opensynergy.com, "Michael S. Tsirkin" , Jason Wang , Vincent Guittot X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210408_044541_143720_E681BD66 X-CRM114-Status: GOOD ( 17.85 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Nov 6, 2020 at 2:59 AM Peter Hilber wrote: > +static int scmi_vio_probe(struct virtio_device *vdev) > +{ > + struct device *dev = &vdev->dev; > + struct scmi_vio_channel **vioch; > + bool have_vq_rx; > + int vq_cnt; > + int i; > + struct virtqueue *vqs[VIRTIO_SCMI_VQ_MAX_CNT]; > + > + vioch = devm_kcalloc(dev, VIRTIO_SCMI_VQ_MAX_CNT, sizeof(*vioch), > + GFP_KERNEL); > + if (!vioch) > + return -ENOMEM; > + > + have_vq_rx = virtio_has_feature(vdev, VIRTIO_SCMI_F_P2A_CHANNELS); > + vq_cnt = have_vq_rx ? VIRTIO_SCMI_VQ_MAX_CNT : 1; > + > + for (i = 0; i < vq_cnt; i++) { > + vioch[i] = devm_kzalloc(dev, sizeof(**vioch), GFP_KERNEL); > + if (!vioch[i]) > + return -ENOMEM; > + } > + > + if (have_vq_rx) > + vioch[VIRTIO_SCMI_VQ_RX]->is_rx = true; > + > + if (virtio_find_vqs(vdev, vq_cnt, vqs, scmi_vio_complete_callbacks, > + scmi_vio_vqueue_names, NULL)) { > + dev_err(dev, "Failed to get %d virtqueue(s)\n", vq_cnt); > + return -1; > + } > + dev_info(dev, "Found %d virtqueue(s)\n", vq_cnt); > + > + for (i = 0; i < vq_cnt; i++) { > + spin_lock_init(&vioch[i]->lock); > + vioch[i]->vqueue = vqs[i]; > + vioch[i]->vqueue->priv = vioch[i]; The vqueue->priv field is used by core, you can't update it else notifications won't work. > + } > + > + vdev->priv = vioch; > + > + virtio_device_ready(vdev); > + > + return 0; > +} diff --git a/drivers/firmware/arm_scmi/virtio.c b/drivers/firmware/arm_scmi/virtio.c index f70aa72f34f1..b1af77341b30 100644 --- a/drivers/firmware/arm_scmi/virtio.c +++ b/drivers/firmware/arm_scmi/virtio.c @@ -80,7 +80,8 @@ static int scmi_vio_populate_vq_rx(struct scmi_vio_channel *vioch, static void scmi_vio_complete_cb(struct virtqueue *vqueue) { - struct scmi_vio_channel *vioch = vqueue->priv; + struct scmi_vio_channel **_vioch = vqueue->vdev->priv; + struct scmi_vio_channel *vioch = _vioch[vqueue->index]; unsigned long iflags; unsigned int length; @@ -454,7 +455,6 @@ static int scmi_vio_probe(struct virtio_device *vdev) for (i = 0; i < vq_cnt; i++) { spin_lock_init(&vioch[i]->lock); vioch[i]->vqueue = vqs[i]; - vioch[i]->vqueue->priv = vioch[i]; } vdev->priv = vioch; _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel