From patchwork Wed Feb 9 05:09:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwendal Grignou X-Patchwork-Id: 12739626 X-Patchwork-Delegate: jikos@jikos.cz 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3987BC4167B for ; Wed, 9 Feb 2022 05:27:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230186AbiBIFZj (ORCPT ); Wed, 9 Feb 2022 00:25:39 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:35694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243565AbiBIFKI (ORCPT ); Wed, 9 Feb 2022 00:10:08 -0500 Received: from mail-pj1-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD539C03C1AC for ; Tue, 8 Feb 2022 21:09:58 -0800 (PST) Received: by mail-pj1-x102d.google.com with SMTP id y15-20020a17090a474f00b001b88562650aso3056140pjg.0 for ; Tue, 08 Feb 2022 21:09:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K7WjQexE7ZDpA7zHN6m2ERri6AV+Et3U5OenHKEPyrU=; b=BJ58G+X37odzzbXCgs40u/3k8glX78t4hWeURfRDVWblbuz+8DUkYrh2vdy/3wQ3jb swqNwiZ9G1mkhif2Nz4fyQr4qeJlNnWAX/SCCVkWq1uMgOBqjZrSuOiOMcwgfNAJR5Hv Fs76iR9bVic1gyeMLl0WxdxBEje/4V2f5IzU8= 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:mime-version :content-transfer-encoding; bh=K7WjQexE7ZDpA7zHN6m2ERri6AV+Et3U5OenHKEPyrU=; b=RnPKSg8U8sBltkhhLoWgrhEbTmpcRQoB0Nk0M1LEvC/LOJ2SJumiLfTRZ680ptfKjy rFk2D3jwgM78Tt3o7by9/1S6FrS2xRhXDAVNjwLLtTFHHJXo9jSB29KMp/2f+AUQ3hAY 4Cx4n7AlV/YwEPHD/GQxUQKsaeI+hl1L5Y+3OxbB1WueaoszkobkR2O6jMgs/qqEFclV B+MbPHNgCvE/N0XPOXRsvEjI3VIkWdqkNTBJyJAa6WOB5yLhcSUimClfY0JbaWYzZaSV 1QufdufFZEAjfs/UQHx4XrqgStM9noW6+blsUNdk5Rl4mve+BTx6+XO/DduwXmY/ULCd ck2Q== X-Gm-Message-State: AOAM532ax4qhTVEdhwizcLjj9KiuiTO6bYp+XNZO3Vmzz66a+n62rurf vegc3br1lxubdtfdXPbUpqMOQtJ9PxJ8HQ== X-Google-Smtp-Source: ABdhPJx3S1QquuDtFJmJhMfIZGLLbHbN5C0YLI0RtgddhImg9/QO6Qv+E3JDJW5oHwefTPf1h+5kbQ== X-Received: by 2002:a17:90a:1c90:: with SMTP id t16mr683300pjt.198.1644383398178; Tue, 08 Feb 2022 21:09:58 -0800 (PST) Received: from localhost ([2620:15c:202:201:cfa3:16c3:b442:6437]) by smtp.gmail.com with UTF8SMTPSA id rj1sm4600412pjb.49.2022.02.08.21.09.56 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Feb 2022 21:09:56 -0800 (PST) From: Gwendal Grignou To: srinivas.pandruvada@linux.intel.com, jikos@kernel.org Cc: linux-input@vger.kernel.org, Gwendal Grignou , stable@vger.kernel.org Subject: [PATCH] HID: intel-ish-hid: Use dma_alloc_coherent for firmware update Date: Tue, 8 Feb 2022 21:09:47 -0800 Message-Id: <20220209050947.2119465-1-gwendal@chromium.org> X-Mailer: git-send-email 2.35.0.263.gb82422642f-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Allocating memory with kmalloc and GPF_DMA32 is not allowed, the allocator will ignore the attribute. Instead, use dma_alloc_coherent() API as we allocate a small amount of memory to transfer firmware fragment to the ISH. On Arcada chromebook, after the patch the warning: "Unexpected gfp: 0x4 (GFP_DMA32). Fixing up to gfp: 0xcc0 (GFP_KERNEL). Fix your code!" is gone. The ISH firmware is loaded properly and we can interact with the ISH: > ectool --name cros_ish version ... Build info: arcada_ish_v2.0.3661+3c1a1c1ae0 2022-02-08 05:37:47 @localhost Tool version: v2.0.12300-900b03ec7f 2022-02-08 10:01:48 @localhost Fixes: commit 91b228107da3 ("HID: intel-ish-hid: ISH firmware loader client driver") Signed-off-by: Gwendal Grignou Cc: stable@vger.kernel.org Acked-by: Srinivas Pandruvada --- drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 29 +++------------------ 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c index e24988586710..16aa030af845 100644 --- a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c +++ b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c @@ -661,21 +661,12 @@ static int ish_fw_xfer_direct_dma(struct ishtp_cl_data *client_data, */ payload_max_size &= ~(L1_CACHE_BYTES - 1); - dma_buf = kmalloc(payload_max_size, GFP_KERNEL | GFP_DMA32); + dma_buf = dma_alloc_coherent(devc, payload_max_size, &dma_buf_phy, GFP_KERNEL); if (!dma_buf) { client_data->flag_retry = true; return -ENOMEM; } - dma_buf_phy = dma_map_single(devc, dma_buf, payload_max_size, - DMA_TO_DEVICE); - if (dma_mapping_error(devc, dma_buf_phy)) { - dev_err(cl_data_to_dev(client_data), "DMA map failed\n"); - client_data->flag_retry = true; - rv = -ENOMEM; - goto end_err_dma_buf_release; - } - ldr_xfer_dma_frag.fragment.hdr.command = LOADER_CMD_XFER_FRAGMENT; ldr_xfer_dma_frag.fragment.xfer_mode = LOADER_XFER_MODE_DIRECT_DMA; ldr_xfer_dma_frag.ddr_phys_addr = (u64)dma_buf_phy; @@ -695,14 +686,7 @@ static int ish_fw_xfer_direct_dma(struct ishtp_cl_data *client_data, ldr_xfer_dma_frag.fragment.size = fragment_size; memcpy(dma_buf, &fw->data[fragment_offset], fragment_size); - dma_sync_single_for_device(devc, dma_buf_phy, - payload_max_size, - DMA_TO_DEVICE); - - /* - * Flush cache here because the dma_sync_single_for_device() - * does not do for x86. - */ + /* Flush cache to be sure the data is in main memory. */ clflush_cache_range(dma_buf, payload_max_size); dev_dbg(cl_data_to_dev(client_data), @@ -725,15 +709,8 @@ static int ish_fw_xfer_direct_dma(struct ishtp_cl_data *client_data, fragment_offset += fragment_size; } - dma_unmap_single(devc, dma_buf_phy, payload_max_size, DMA_TO_DEVICE); - kfree(dma_buf); - return 0; - end_err_resp_buf_release: - /* Free ISH buffer if not done already, in error case */ - dma_unmap_single(devc, dma_buf_phy, payload_max_size, DMA_TO_DEVICE); -end_err_dma_buf_release: - kfree(dma_buf); + dma_free_coherent(devc, payload_max_size, dma_buf, dma_buf_phy); return rv; }