From nobody Tue Dec 23 12:14:34 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 05DD426E15E for ; Wed, 9 Apr 2025 14:44:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744209846; cv=none; b=LmejJMXIUSHhfxF8bWMPhKRg/+liEiLKFY32I6dwUq7DylZ0ZJCUZC/JosI56EkmMhUiySkvXK80PX0ANTbL6kF4T+MCSzNQVd4wRnX+5vHw/DHhmW47Ha114T2xRDUaICn0/NVqk+UwkQZGhvC+XqdGHDNTNQu+zT+4OqijQYc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744209846; c=relaxed/simple; bh=3KVVeyaaBucR+xq4HP+LPTfEPMLNXt/RYHslpoy8OVs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BbYpx/tpGhyQJe7a6IBTvS5MnaR+hFc7qjUtYERnQ8Gqq+rF8YM9gYpYVbcf/baHULZKs5g0DH3Y4WYx6luqpNwjiBHOIJCe3GcfiwPHzZt9jjhAAKKeNTJkAmXu1XPWGwycrWXDR2QBP5CHOWMVPe8KsZM+g4AKX2yRiioYi8Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=L0286XPV; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="L0286XPV" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744209844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=dI/uVE90Vs4dIFRxTpo8ubx3UzUF0EGLNIDuWr90bcQ=; b=L0286XPVEf8EKbzMTQfUYT6bKCGduIzgiADAkQa8l8+BXXnbjUqBbyQB1NsHSdWxVxqorH gJUAdAAVTXI2RgMyClxmWHj2FmtB27lh0CVKk7kUaLpVBcGjXAqdVBD+sbeaaVKad5Hya3 Nf1PjdVlVlXSPs6LacggckXbSKYNQeg= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-322-GZCle4ljPzij80t35XdORw-1; Wed, 09 Apr 2025 10:44:01 -0400 X-MC-Unique: GZCle4ljPzij80t35XdORw-1 X-Mimecast-MFC-AGG-ID: GZCle4ljPzij80t35XdORw_1744209839 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BF7DB180AB19; Wed, 9 Apr 2025 14:43:59 +0000 (UTC) Received: from p16v.luc.cera.cz (unknown [10.44.32.72]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 220F31801766; Wed, 9 Apr 2025 14:43:54 +0000 (UTC) From: Ivan Vecera To: netdev@vger.kernel.org Cc: Vadim Fedorenko , Arkadiusz Kubalewski , Jiri Pirko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Prathosh Satish , Lee Jones , Kees Cook , Andy Shevchenko , Andrew Morton , Michal Schmidt , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org Subject: [PATCH v2 13/14] mfd: zl3073x: Load mfg file into HW if it is present Date: Wed, 9 Apr 2025 16:42:49 +0200 Message-ID: <20250409144250.206590-14-ivecera@redhat.com> In-Reply-To: <20250409144250.206590-1-ivecera@redhat.com> References: <20250409144250.206590-1-ivecera@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" Add support for loading mfg file that can be provided by a user. The mfg file can be generated by Microchip tool and contains snippets of device configuration that is different from the one stored in the flash memory inside the chip. Signed-off-by: Ivan Vecera --- drivers/mfd/zl3073x-core.c | 110 +++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) diff --git a/drivers/mfd/zl3073x-core.c b/drivers/mfd/zl3073x-core.c index a1fb5af5b3d9f..110071b28cab9 100644 --- a/drivers/mfd/zl3073x-core.c +++ b/drivers/mfd/zl3073x-core.c @@ -4,15 +4,19 @@ #include #include #include +#include #include #include #include +#include +#include #include #include #include #include #include #include +#include #include #include #include "zl3073x.h" @@ -464,6 +468,108 @@ static void zl3073x_devlink_unregister(void *ptr) devlink_unregister(ptr); } =20 +static int zl3073x_fw_parse_line(struct zl3073x_dev *zldev, const char *li= ne) +{ +#define ZL3073X_FW_WHITESPACES_SIZE 3 +#define ZL3073X_FW_COMMAND_SIZE 1 + const char *ptr =3D line; + char *endp; + u32 delay; + u16 addr; + u8 val; + + switch (ptr[0]) { + case 'X': + /* The line looks like this: + * X , ADDR , VAL + * Where: + * - X means that is a command that needs to be executed + * - ADDR represents the addr and is always 2 bytes and the + * value is in hex, for example 0x0232 + * - VAL represents the value that is written and is always 1 + * byte and the value is in hex, for example 0x12 + */ + ptr +=3D ZL3073X_FW_COMMAND_SIZE; + ptr +=3D ZL3073X_FW_WHITESPACES_SIZE; + addr =3D simple_strtoul(ptr, &endp, 16); + + ptr =3D endp; + ptr +=3D ZL3073X_FW_WHITESPACES_SIZE; + val =3D simple_strtoul(ptr, NULL, 16); + + /* Write requested value to given register */ + return zl3073x_write_reg(zldev, addr, 1, &val); + case 'W': + /* The line looks like this: + * W , DELAY + * Where: + * - W means that is a wait command + * - DELAY represents the delay in microseconds and the value + * is in decimal + */ + ptr +=3D ZL3073X_FW_COMMAND_SIZE; + ptr +=3D ZL3073X_FW_WHITESPACES_SIZE; + delay =3D simple_strtoul(ptr, NULL, 10); + + fsleep(delay); + break; + default: + break; + } + + return 0; +} + +#define ZL3073X_MFG_FILE "microchip/zl3073x.mfg" + +static void zl3073x_fw_load(struct zl3073x_dev *zldev) +{ + const struct firmware *fw; + const char *ptr, *end; + char buf[128]; + int rc; + + rc =3D firmware_request_nowarn(&fw, ZL3073X_MFG_FILE, zldev->dev); + if (rc) + return; + + dev_info(zldev->dev, "Applying mfg file %s...\n", ZL3073X_MFG_FILE); + + guard(zl3073x)(zldev); + + ptr =3D fw->data; + end =3D ptr + fw->size; + while (ptr < end) { + /* Get next end of the line or end of buffer */ + char *eol =3D strnchrnul(ptr, end - ptr, '\n'); + size_t len =3D eol - ptr; + + /* Check line length */ + if (len >=3D sizeof(buf)) { + dev_err(zldev->dev, "Line in firmware is too long\n"); + return; + } + + /* Copy line from buffer */ + memcpy(buf, ptr, len); + buf[len] =3D '\0'; + + /* Parse and process the line */ + rc =3D zl3073x_fw_parse_line(zldev, buf); + if (rc) { + dev_err(zldev->dev, + "Failed to parse firmware line: %pe\n", + ERR_PTR(rc)); + break; + } + + /* Move to next line */ + ptr =3D eol + 1; + } + + release_firmware(fw); +} + /** * zl3073x_dev_init - initialize zl3073x device * @zldev: pointer to zl3073x device @@ -505,6 +611,9 @@ int zl3073x_dev_init(struct zl3073x_dev *zldev, u8 dev_= id) /* Use chip ID and given dev ID as clock ID */ zldev->clock_id =3D ((u64)id << 8) | dev_id; =20 + /* Load mfg file if present */ + zl3073x_fw_load(zldev); + dev_info(zldev->dev, "ChipID(%X), ChipRev(%X), FwVer(%u)\n", id, revision, fw_ver); dev_info(zldev->dev, "Custom config version: %lu.%lu.%lu.%lu\n", @@ -528,3 +637,4 @@ EXPORT_SYMBOL_NS_GPL(zl3073x_dev_init, "ZL3073X"); MODULE_AUTHOR("Ivan Vecera "); MODULE_DESCRIPTION("Microchip ZL3073x core driver"); MODULE_LICENSE("GPL"); +MODULE_FIRMWARE(ZL3073X_MFG_FILE); --=20 2.48.1