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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26254C4167B for ; Mon, 27 Nov 2023 20:19:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233248AbjK0UTT (ORCPT ); Mon, 27 Nov 2023 15:19:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233192AbjK0UTN (ORCPT ); Mon, 27 Nov 2023 15:19:13 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F508D63 for ; Mon, 27 Nov 2023 12:19:18 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4079ed65471so36954955e9.1 for ; Mon, 27 Nov 2023 12:19:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701116356; x=1701721156; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4jPqJAoT2VW6Xw934SGmT3qvNdjOvu6oesgMdO97hOc=; b=E4YRU50hf5D3ULeyXW7RwbeHESMQJkGkw5MsIYJFfJ0FSEYZn8hsf0xRmcBKOARdWQ iYr7tSEWa3PXGVaOmRMt85NfzJdMI8xTdbDzsGEZNeeZBOqy5jBrsvIZsdhfD5e0wL/k SdD/R0/NReeVA2oIY1wMUP4eJ04RbkPfsKgiYxqlXZD5M7mZFSTVsXHTOslYzCrmr8tn r575CM6N2Tmnz+AY0xKwIYEaHGuuGwIvplNWyZ3FHyoJ5QwCpTy9MZsZVU/lHElcXyHm Gj1Q9wzM5D0DuQbFMkBsCMPyszaPOie5Xl4AN3K7boNhKEQ39KpcWMjWkDNmG+mc9IM+ EKhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701116356; x=1701721156; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4jPqJAoT2VW6Xw934SGmT3qvNdjOvu6oesgMdO97hOc=; b=C2UOrNxujdm7zY6ogZwLcW3f4RKzjXPQKfXjzWFVgtp1HWlI8qJ77E1O0DT+IpocJa mSEBodehDB1tb6sUc39Eh/qTXmg83S1R71/A+65iM0nUzNk68XrDfNF0Ub1jW2oGR6kg eFwnvoPD0jHlP7PcWIwgnqAWQRUVP8I5dz63jcQZozYaZrgLELXLIOH4XqXisX7ItxN/ FUscULcdD7znR0qBhZ3kWdmeVvGM6/QhdlnvhnZ+IijW5Ba+q4/83sMqIttHeQmzP94s KdSjW830hUgbZ+4s2f/bfusBZgbPP193M71W1zi6oBiPzofwcDSBXnKk+BCkpBI1R1WR Cm6Q== X-Gm-Message-State: AOJu0YwxbZ0UC7vqmuQpwf9vlE2SC7sNk+IMwiS9hNGhQjg25xUESgv4 Yv9EEMN3pg9q0lyZwCG7Lkg= X-Google-Smtp-Source: AGHT+IFyEhlAz+prj6XrNUV/HDNZx1kcLYt4zLJZnwh2YL4M4ml/C2Usw+67k6n+JzM3kmbNzTRyvA== X-Received: by 2002:a05:600c:3213:b0:408:cd96:7164 with SMTP id r19-20020a05600c321300b00408cd967164mr10621661wmp.9.1701116356438; Mon, 27 Nov 2023 12:19:16 -0800 (PST) Received: from mfe-desktop.Sonatest.net (ipagstaticip-d73c7528-4de5-0861-800b-03d8b15e3869.sdsl.bell.ca. [174.94.156.236]) by smtp.googlemail.com with ESMTPSA id k32-20020a05600c1ca000b0040839fcb217sm15224619wms.8.2023.11.27.12.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Nov 2023 12:19:16 -0800 (PST) From: marc.ferland@gmail.com X-Google-Original-From: marc.ferland@sonatest.com To: krzysztof.kozlowski@linaro.org Cc: gregkh@linuxfoundation.org, marc.ferland@sonatest.com, jeff.dagenais@gmail.com, rdunlap@infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] w1: ds2433: introduce a configuration structure Date: Mon, 27 Nov 2023 15:18:54 -0500 Message-Id: <20231127201856.3836178-4-marc.ferland@sonatest.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231127201856.3836178-1-marc.ferland@sonatest.com> References: <20231117192909.98944-1-marc.ferland@sonatest.com> <20231127201856.3836178-1-marc.ferland@sonatest.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marc Ferland Add a ds2433_config structure for parameters that are different between the ds2433 and the ds28ec20. The goal is to reuse the same code for both chips. A pointer to this config structure is added to w1_f23_data and the CONFIG_W1_SLAVE_DS2433_CRC ifdefs are adjusted since now both driver configurations (with or without crc support) will make use of w1_f23_data. Also, the 'memory' buffer is now dynamically allocated based on the size specififed in the config structure to help support memories of different sizes. Signed-off-by: Marc Ferland --- drivers/w1/slaves/w1_ds2433.c | 47 ++++++++++++++++++++++++++--------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index e18523ef8c45..7d4d9fc1a9c4 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c @@ -25,7 +25,7 @@ #define W1_EEPROM_DS2433 0x23 #define W1_EEPROM_SIZE 512 -#define W1_PAGE_COUNT 16 + #define W1_PAGE_SIZE 32 #define W1_PAGE_BITS 5 #define W1_PAGE_MASK 0x1F @@ -35,9 +35,24 @@ #define W1_F23_READ_SCRATCH 0xAA #define W1_F23_COPY_SCRATCH 0x55 +struct ds2433_config { + size_t eeprom_size; /* eeprom size in bytes */ + unsigned int page_count; /* number of 256 bits pages */ + unsigned int tprog; /* time in ms for page programming */ +}; + +static const struct ds2433_config config_f23 = { + .eeprom_size = W1_EEPROM_SIZE, + .page_count = 16, + .tprog = 5, +}; + struct w1_f23_data { - u8 memory[W1_EEPROM_SIZE]; +#ifdef CONFIG_W1_SLAVE_DS2433_CRC + u8 *memory; u32 validcrc; +#endif + const struct ds2433_config *cfg; }; /* @@ -96,7 +111,7 @@ static ssize_t eeprom_read(struct file *filp, struct kobject *kobj, u8 wrbuf[3]; #endif - count = w1_f23_fix_count(off, count, W1_EEPROM_SIZE); + count = w1_f23_fix_count(off, count, bin_attr->size); if (!count) return 0; @@ -151,9 +166,7 @@ static ssize_t eeprom_read(struct file *filp, struct kobject *kobj, */ static int w1_f23_write(struct w1_slave *sl, int addr, int len, const u8 *data) { -#ifdef CONFIG_W1_SLAVE_DS2433_CRC struct w1_f23_data *f23 = sl->family_data; -#endif u8 wrbuf[4]; u8 rdbuf[W1_PAGE_SIZE + 3]; u8 es = (addr + len - 1) & 0x1f; @@ -189,8 +202,8 @@ static int w1_f23_write(struct w1_slave *sl, int addr, int len, const u8 *data) wrbuf[3] = es; w1_write_block(sl->master, wrbuf, 4); - /* Sleep for 5 ms to wait for the write to complete */ - msleep(5); + /* Sleep for tprog ms to wait for the write to complete */ + msleep(f23->cfg->tprog); /* Reset the bus to wake up the EEPROM (this may not be needed) */ w1_reset_bus(sl->master); @@ -207,7 +220,7 @@ static ssize_t eeprom_write(struct file *filp, struct kobject *kobj, struct w1_slave *sl = kobj_to_w1_slave(kobj); int addr, len, idx; - count = w1_f23_fix_count(off, count, W1_EEPROM_SIZE); + count = w1_f23_fix_count(off, count, bin_attr->size); if (!count) return 0; @@ -269,24 +282,34 @@ static const struct attribute_group *w1_f23_groups[] = { static int w1_f23_add_slave(struct w1_slave *sl) { -#ifdef CONFIG_W1_SLAVE_DS2433_CRC struct w1_f23_data *data; data = kzalloc(sizeof(struct w1_f23_data), GFP_KERNEL); if (!data) return -ENOMEM; + + data->cfg = &config_f23; + +#ifdef CONFIG_W1_SLAVE_DS2433_CRC + data->memory = kzalloc(data->cfg->eeprom_size, GFP_KERNEL); + if (!data->memory) { + kfree(data); + return -ENOMEM; + } +#endif /* CONFIG_W1_SLAVE_DS2433_CRC */ sl->family_data = data; -#endif /* CONFIG_W1_SLAVE_DS2433_CRC */ return 0; } static void w1_f23_remove_slave(struct w1_slave *sl) { + struct w1_f23_data *data = sl->family_data; #ifdef CONFIG_W1_SLAVE_DS2433_CRC - kfree(sl->family_data); + kfree(data->memory); +#endif /* CONFIG_W1_SLAVE_DS2433_CRC */ + kfree(data); sl->family_data = NULL; -#endif /* CONFIG_W1_SLAVE_DS2433_CRC */ } static const struct w1_family_ops w1_f23_fops = { -- 2.34.1