From patchwork Fri Aug 5 09:22:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szuying Chen X-Patchwork-Id: 12937100 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 B4A76C00140 for ; Fri, 5 Aug 2022 09:22:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240334AbiHEJW7 (ORCPT ); Fri, 5 Aug 2022 05:22:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233773AbiHEJW6 (ORCPT ); Fri, 5 Aug 2022 05:22:58 -0400 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1158A7390A; Fri, 5 Aug 2022 02:22:57 -0700 (PDT) Received: by mail-pf1-x433.google.com with SMTP id f30so1373101pfq.4; Fri, 05 Aug 2022 02:22:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=JbjDpSL5kcD6YGpvFFd/4hCkhDqySWpfqtFx9gtUV5E=; b=B7qpz6dlfWvUb2OT1JozE0J9MXzgA/bmphHXTaDxRk0gGMJrBPf6j6baOHHT3WqKTh q6ODQVmMKIexHntuq5IB8pQtXJJw1HqHV2O3t1uWGbgR7Ed7BdBPPWC5371rUd4kvart E5FvWMBax7zPKCi8F1ctNiayzy4GnZc1Bw5/KfGGBR7ke7DYGTrySCjJgM1QTtmQlBxr xi/k9V/9UAP6vAy04+9btMP+hLGCWcKK9yL9Qn51gXtFRAOtw38wMc7xEJYDcK9hq4wx sijdOk9zBoE850PckFswOeqvmj6oVgGs5x+Q1idCq1s6wR7JzT0xKCzi+74Tf7RoBdYP Td8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=JbjDpSL5kcD6YGpvFFd/4hCkhDqySWpfqtFx9gtUV5E=; b=WRjPmGd/u++yN74QFKvNkbRbl6wPJlZ9xF5oik5f5qjao6L8S2q/dzfXgc5ZCI7Flk Hcy7F5MuF7aa1gkU3sj61hLrDC0uPXMifPkQ20IZyVi3721Cavx4geEdPOq1JNtt/2U8 xuHeFwhHeOxXzIvbRz/meu5FB8UUkyUf1VmixTLQdATBplUDUh0mXrJ6YbqTN238/mx4 zsqD2ottb/rGyQrXlK7CTzvKHXJZURcEFzI/gM1JgC8VISUsWH5NQfKdvcYl1veDq7eQ WiM+2vuEuEZxi+FonUsrAfweHDuBpl03XrH9ZIXArPYcp704var7JpUliUUwKRSQ8klJ 09bw== X-Gm-Message-State: ACgBeo2eniP4FTAyjwvIPpeuXOVphPHHwMFOLcaEDnWj0CWJVo+guMX0 Npw+MdlBfPap5he38/l7apkRb1XhZj89aSpK X-Google-Smtp-Source: AA6agR4+vHdbHEOGoS6N8lO8FdwUlxJObC0h4deIK2o1cD5P1VsdiwS9qtz6pDcs9jXuglvxbClwRQ== X-Received: by 2002:a05:6a00:8cf:b0:522:93a6:46e9 with SMTP id s15-20020a056a0008cf00b0052293a646e9mr6057653pfu.62.1659691376466; Fri, 05 Aug 2022 02:22:56 -0700 (PDT) Received: from sw.. (220-128-98-63.hinet-ip.hinet.net. [220.128.98.63]) by smtp.gmail.com with ESMTPSA id y3-20020aa793c3000000b005289fad1bbesm2545717pff.94.2022.08.05.02.22.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Aug 2022 02:22:56 -0700 (PDT) From: Szuying Chen X-Google-Original-From: Szuying Chen To: andreas.noever@gmail.com, michael.jamet@intel.com, mika.westerberg@linux.intel.com, YehezkelShB@gmail.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Yd_Tseng@asmedia.com.tw, Richard_Hsu@asmedia.com.tw, Chloe_Chen@asmedia.com.tw Subject: [PATCH] thunderbolt: thunderbolt: add vendor's NVM formats Date: Fri, 5 Aug 2022 17:22:24 +0800 Message-Id: <20220805092224.2536-1-Chloe_Chen@asmedia.com.tw> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The patch add tb_nvm_quirks() contain an array that has functions pointers to tb_nvm_vendor_apply(). And tb_nvm_vendor_apply() that recognize supported vendor works in one of the following cases: Case 0:enable nvm's attribute by setting no_nvm_upgrade flag to create nvm_authenticate file node. Case 1:add active/non-active NVM devices. Case 2:update firmware to non-ative NVM device. Signed-off-by: Szuying Chen Reported-by: kernel test robot Reported-by: kernel test robot --- drivers/thunderbolt/nvm.c | 163 +++++++++++++++++++++++++++++++++++ drivers/thunderbolt/switch.c | 12 +++ drivers/thunderbolt/tb.h | 12 +++ 3 files changed, 187 insertions(+) -- 2.34.1 diff --git a/drivers/thunderbolt/nvm.c b/drivers/thunderbolt/nvm.c index b3f310389378..d5f283889da8 100644 --- a/drivers/thunderbolt/nvm.c +++ b/drivers/thunderbolt/nvm.c @@ -9,10 +9,173 @@ #include #include #include +#include #include "tb.h" static DEFINE_IDA(nvm_ida); +static int tb_switch_nvm_read(void *priv, unsigned int offset, void *val, + size_t bytes) +{ + struct tb_nvm *nvm = priv; + struct tb_switch *sw = tb_to_switch(nvm->dev); + int ret; + + pm_runtime_get_sync(&sw->dev); + + if (!mutex_trylock(&sw->tb->lock)) { + ret = restart_syscall(); + goto out; + } + + ret = usb4_switch_nvm_read(sw, offset, val, bytes); + mutex_unlock(&sw->tb->lock); + +out: + pm_runtime_mark_last_busy(&sw->dev); + pm_runtime_put_autosuspend(&sw->dev); + + return ret; +} + +static int tb_switch_nvm_write(void *priv, unsigned int offset, void *val, + size_t bytes) +{ + struct tb_nvm *nvm = priv; + struct tb_switch *sw = tb_to_switch(nvm->dev); + int ret; + + if (!mutex_trylock(&sw->tb->lock)) + return restart_syscall(); + + /* + * Since writing the NVM image might require some special steps, + * for example when CSS headers are written, we cache the image + * locally here and handle the special cases when the user asks + * us to authenticate the image. + */ + ret = tb_nvm_write_buf(nvm, offset, val, bytes); + mutex_unlock(&sw->tb->lock); + + return ret; +} + +static int tb_nvm_vendor_apply(struct tb_switch *sw, unsigned int handle) +{ + int ret = 0; + + switch (handle) { + case 0: + if (sw->no_nvm_upgrade) + sw->no_nvm_upgrade = false; + + break; + + case 1: + struct tb_nvm *nvm; + u32 val; + u32 nvm_size; + + nvm = tb_nvm_alloc(&sw->dev); + if (IS_ERR(nvm)) { + ret = PTR_ERR(nvm); + break; + } + + ret = usb4_switch_nvm_read(sw, NVM_Date, &val, sizeof(val)); + if (ret) + break; + + nvm->vendor.date = (((u8)val) << 0x10 | ((u8)(val >> 0x8)) << 0x8 | (u8)(val >> 0x10)); + ret = usb4_switch_nvm_read(sw, NVM_CUSTOMER_ID, &val, sizeof(val)); + if (ret) + break; + + nvm->vendor.customerID = (((u8)val) << 0x8 | ((u8)(val >> 0x8))); + nvm->vendor.version = (u8)(val >> 0x10); + nvm_size = SZ_512K; + ret = tb_nvm_add_active(nvm, nvm_size, tb_switch_nvm_read); + if (ret) + break; + + ret = tb_nvm_add_non_active(nvm, NVM_MAX_SIZE, tb_switch_nvm_write); + if (ret) + break; + + sw->nvm = nvm; + break; + + case 2: + unsigned int image_size; + const u8 *buf = sw->nvm->buf; + + if (!buf) { + ret = -EINVAL; + break; + } + image_size = sw->nvm->buf_data_size; + if (image_size < NVM_MIN_SIZE || image_size > NVM_MAX_SIZE) { + ret = -EINVAL; + break; + } + ret = usb4_switch_nvm_write(sw, 0, buf, image_size); + if (!ret) + sw->nvm->flushed = true; + + break; + + default: + break; + } + + if ((handle == 1) && (ret != 0)) + tb_nvm_free(sw->nvm); + + return ret; +} + +struct tb_nvm_id { + u16 hw_vendor_id; + u16 hw_device_id; + u16 vendor; + u16 device; + int (*hook)(struct tb_switch *sw, unsigned int handle); +}; + +static const struct tb_nvm_id tb_nvm_vendors[] = { + /* ASMedia software CM firmware upgrade */ + { 0x174c, 0x2428, 0x174c, 0x0009, tb_nvm_vendor_apply }, +}; + +/** + * tb_nvm_quirks() - support vendor's NVM format + * @sw: Thunderbolt switch + */ +int tb_nvm_quirks(struct tb_switch *sw, unsigned int handle) +{ + int res, i; + bool NoVendor = true; + + for (i = 0; i < ARRAY_SIZE(tb_nvm_vendors); i++) { + const struct tb_nvm_id *q = &tb_nvm_vendors[i]; + + if (q->hw_vendor_id && q->hw_vendor_id != sw->config.vendor_id) + continue; + if (q->hw_device_id && q->hw_device_id != sw->config.device_id) + continue; + if (q->vendor && q->vendor != sw->vendor) + continue; + if (q->device && q->device != sw->device) + continue; + + res = q->hook(sw, handle); + NoVendor = false; + } + if (NoVendor) + return -ENODEV; + else + return res; +} /** * tb_nvm_alloc() - Allocate new NVM structure diff --git a/drivers/thunderbolt/switch.c b/drivers/thunderbolt/switch.c index 561e1d77240e..a654b6951bef 100644 --- a/drivers/thunderbolt/switch.c +++ b/drivers/thunderbolt/switch.c @@ -114,6 +114,10 @@ static int nvm_validate_and_write(struct tb_switch *sw) if (image_size < NVM_MIN_SIZE || image_size > NVM_MAX_SIZE) return -EINVAL; + ret = tb_nvm_quirks(sw, 2); + if (ret != -ENODEV) + return ret; + /* * FARB pointer must point inside the image and must at least * contain parts of the digital section we will be reading here. @@ -390,6 +394,11 @@ static int tb_switch_nvm_add(struct tb_switch *sw) if (!nvm_readable(sw)) return 0; + /* Vendor's NVM formats definition */ + ret = tb_nvm_quirks(sw, 1); + if (ret != -ENODEV) + return ret; + /* * The NVM format of non-Intel hardware is not known so * currently restrict NVM upgrade for Intel hardware. We may @@ -1953,6 +1962,8 @@ static ssize_t nvm_version_show(struct device *dev, ret = -ENODATA; else if (!sw->nvm) ret = -EAGAIN; + else if (sw->config.vendor_id == 0x174C) + ret = sprintf(buf, "%06x_%04x_%02x\n", sw->nvm->vendor.date, sw->nvm->vendor.customerID, sw->nvm->vendor.version); else ret = sprintf(buf, "%x.%x\n", sw->nvm->major, sw->nvm->minor); @@ -2860,6 +2871,7 @@ int tb_switch_add(struct tb_switch *sw) tb_sw_dbg(sw, "uid: %#llx\n", sw->uid); tb_check_quirks(sw); + tb_nvm_quirks(sw, 0); ret = tb_switch_set_uuid(sw); if (ret) { diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h index a831faa50f65..9dd1ba7b07b6 100644 --- a/drivers/thunderbolt/tb.h +++ b/drivers/thunderbolt/tb.h @@ -27,6 +27,16 @@ #define NVM_VERSION 0x08 #define NVM_FLASH_SIZE 0x45 +/* ASMedia specific NVM offsets */ +#define NVM_Date 0x1C +#define NVM_CUSTOMER_ID 0x28 + +struct tb_nvm_vendor { + int date; + u16 customerID; + u8 version; +}; + /** * struct tb_nvm - Structure holding NVM information * @dev: Owner of the NVM @@ -56,6 +66,7 @@ struct tb_nvm { size_t buf_data_size; bool authenticating; bool flushed; + struct tb_nvm_vendor vendor; }; enum tb_nvm_write_ops { @@ -735,6 +746,7 @@ static inline void tb_domain_put(struct tb *tb) put_device(&tb->dev); } +int tb_nvm_quirks(struct tb_switch *sw, unsigned int handle); struct tb_nvm *tb_nvm_alloc(struct device *dev); int tb_nvm_add_active(struct tb_nvm *nvm, size_t size, nvmem_reg_read_t reg_read); int tb_nvm_write_buf(struct tb_nvm *nvm, unsigned int offset, void *val,