From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7E19718FDB4 for ; Wed, 10 Jul 2024 10:23:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720606994; cv=none; b=kUwncvqU/OKE/FGlRtQzK+5AkU7tE+X1EnRIV2IQ3mj+yiteJbrCLKcgNOe82rBUiMlEh7bhqflKjOZAsT0rtzdCZGaOxydUiSxCd9WjI/1J0ug1WYUZlAaGl19QfvjNTpuuh0UEd5IUTeFBPCLLvijw5W8zDKBLZg3c5vgoXZU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720606994; c=relaxed/simple; bh=29bMgJfh02XAAbMgonEBUzZFjdVcxplyXO2mJEZgq+w=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=r9S2OpR7WtAcctjXuw1PG7OW1ZpwU3ApYRh1RQcADhE/su7TKrZGza6FucgOcYHVD7jVxRM3m3NtLaQOOH0T+SegEi2hvYOpZ519Whp2Em9CoQ/sGOh4w7qX9+gW9CN8mhfzK/uUAKOq682N1kNoaGWXcVWokuC9G87OWpAn/yo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=UKGGuK1y; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="UKGGuK1y" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1720606992; x=1752142992; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=29bMgJfh02XAAbMgonEBUzZFjdVcxplyXO2mJEZgq+w=; b=UKGGuK1yLeM77tG1y4PaEzfF4/siZKRSg8s6f868xfHJnTkOTpafpZTr g1Zw5szmIcfHSDoFiuyWAip1Fz2KWqkCTT3XkAVtegORhXMDEa7p+A6UW 1YwvbRp+G9khQ7zMseO9dTWNws/Tn+4+dzK0trpVFMmxAqTK496xrj44B O7wJOg5zTARPG/3L3Dn8Cze1BRzTcPfjwduzbXHvvY/2EBnKJjXs4t5jx kUdbmYwCNo9rNGBMG8vy6L6OYbsJThEqT/gnDlEbBSOHNCjzZBQgwjzRv d/AjHLxIej4sSu2KOiNvu3pffKoAG8JoShdWMHS81UmhlgjgmPJ9KM8TZ A==; X-CSE-ConnectionGUID: 1Ac83QVqTiqzCIF5SBdW/g== X-CSE-MsgGUID: v0dgzz9US96UP+rrA16uiQ== X-IronPort-AV: E=McAfee;i="6700,10204,11128"; a="12472048" X-IronPort-AV: E=Sophos;i="6.09,197,1716274800"; d="scan'208";a="12472048" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2024 03:23:10 -0700 X-CSE-ConnectionGUID: LE3PwP3yQICOP5LWQmb+Og== X-CSE-MsgGUID: Kze/xY6XTE+qCLGo8zTgpQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,197,1716274800"; d="scan'208";a="48050490" Received: from jlawryno-mobl.ger.corp.intel.com (HELO [10.246.19.58]) ([10.246.19.58]) by fmviesa007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jul 2024 03:23:08 -0700 Message-ID: <35a7963e-e92b-4c73-b03d-a846e93adf5a@linux.intel.com> Date: Wed, 10 Jul 2024 12:23:06 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3] accel/ivpu: Add missing MODULE_FIRMWARE metadata To: "Alexander F. Lent" , Stanislaw Gruszka , Oded Gabbay , Jeffrey Hugo , Daniel Vetter , Andrzej Kacprowski , Krystian Pradzynski Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20240709-fix-ivpu-firmware-metadata-v3-1-55f70bba055b@xanderlent.com> Content-Language: en-US From: Jacek Lawrynowicz Organization: Intel Technology Poland sp. z o.o. - ul. Slowackiego 173, 80-298 Gdansk - KRS 101882 - NIP 957-07-52-316 In-Reply-To: <20240709-fix-ivpu-firmware-metadata-v3-1-55f70bba055b@xanderlent.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Reviewed-by: Jacek Lawrynowicz On 09.07.2024 13:54, Alexander F. Lent wrote: > Modules that load firmware from various paths at runtime must declare > those paths at compile time, via the MODULE_FIRMWARE macro, so that the > firmware paths are included in the module's metadata. > > The accel/ivpu driver loads firmware but lacks this metadata, > preventing dracut from correctly locating firmware files. Fix it. > > Fixes: 9ab43e95f922 ("accel/ivpu: Switch to generation based FW names") > Fixes: 02d5b0aacd05 ("accel/ivpu: Implement firmware parsing and booting") > Signed-off-by: Alexander F. Lent > --- > Hi Jacek, > > Thanks for catching the error, and for the more succinct comment. > Please find v3 attached. > --- > Changes in v3: > - Simplify comment, per review. > - Fix typo in 40xx firmware path, per review. > - Link to v2: https://lore.kernel.org/r/20240708-fix-ivpu-firmware-metadata-v2-1-78b953172026@xanderlent.com > > Changes in v2: > - Only annotate the module with the production firmware paths, per review. > - Drop macros for de-duping firmware fileames, just use string literals, per review. > - Link to v1: https://lore.kernel.org/r/20240705-fix-ivpu-firmware-metadata-v1-1-704b73852d92@xanderlent.com > --- > drivers/accel/ivpu/ivpu_fw.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/accel/ivpu/ivpu_fw.c b/drivers/accel/ivpu/ivpu_fw.c > index 1457300828bf..ef717802a3c8 100644 > --- a/drivers/accel/ivpu/ivpu_fw.c > +++ b/drivers/accel/ivpu/ivpu_fw.c > @@ -58,6 +58,10 @@ static struct { > { IVPU_HW_40XX, "intel/vpu/vpu_40xx_v0.0.bin" }, > }; > > +/* Production fw_names from the table above */ > +MODULE_FIRMWARE("intel/vpu/vpu_37xx_v0.0.bin"); > +MODULE_FIRMWARE("intel/vpu/vpu_40xx_v0.0.bin"); > + > static int ivpu_fw_request(struct ivpu_device *vdev) > { > int ret = -ENOENT; > > --- > base-commit: 22a40d14b572deb80c0648557f4bd502d7e83826 > change-id: 20240704-fix-ivpu-firmware-metadata-3d02bd60768d > > Best regards,