From mboxrd@z Thu Jan 1 00:00:00 1970 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 7644F1ABC36 for ; Thu, 4 Jul 2024 11:10:10 +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=1720091412; cv=none; b=s1gJC32j6ydiopeCOK59d2GIabcMg6Wr+89k1MLmqP3IcKzOfZNv7Idu4AS2i/wQpekQaDGXiJy5YaPaqjKAu0fqXFaPhg/ZXkIJqkXgRcPEehDIidUBsCT0+QCBaAkG6hUZzEeC1f207cFeETwjksti7IVJdm312XzjWFvg03Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720091412; c=relaxed/simple; bh=n//nYnVEcrM4ey4ic4TtEU7EnlIC5kaDGhab75eIi1U=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=NSfHzgVEPBctv3j5AagG3qdTLW3DhUp9HsF9z39cQUPNpGj2Z4FX4lnF3RAI15kvW7JmRY+CCv0CKqPWoL3GqBMWR5QMcNA112JXy0CTxDvVgPeP8vcFlSFWYFfEAV6nRIUORCvG+DdO3MKZvYeo3Ak8Yv04OgK+ZUb79oU432c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none 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=C8a8zA64; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none 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="C8a8zA64" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1720091409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HbA0OgM0zV38UNrbMl2ytxTXmxX6AyzNUh1Kz0BMsR0=; b=C8a8zA64K1478aKdO1AdqEd84B1IIfAY9A8l7RKu10uUCytk10u8pLOcWFNEae/cDlON5g 9R0Az6hdjfgZdSPXEtEDgaNp/Fv4qDi4JABZxSLIiG40byKYDscgiLF9pxaoInt+9P78Ko pOsQCWwjVvks2OmEDXkzBMXeolPVtS0= Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-692-yhPAz8-JPOmDXcRcwTjNQw-1; Thu, 04 Jul 2024 07:10:06 -0400 X-MC-Unique: yhPAz8-JPOmDXcRcwTjNQw-1 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a7293303843so49692166b.3 for ; Thu, 04 Jul 2024 04:10:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720091405; x=1720696205; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=HbA0OgM0zV38UNrbMl2ytxTXmxX6AyzNUh1Kz0BMsR0=; b=VmKZy3KPEquxW4qgB6zqFk9jiNgBjbxwnMyS/pSseKip8PXMlk3C2Re52eTyEFmmO4 2I1/uiAtB3YibnEHYOlyV9p/KdzwKLxe1TWckl/Izjl5ZyYcW2p/3cwl9UE/ZbkTgP18 f2HV138G/0yeDwIGqXNPSDyl+EreU0WUTdNz0+4rt+TLExDK0UyeDcFLeDM8ekM40FCv TjYkIrVjPsvifJ5TFqumVAggWsNQ+C8cOeR4vgrkQd9j83dzKsvv0H8K3jWLGmWoBLFP EnNkGss4RQUes/1RI965KbvmGb8l1EBJbxeTLKoX/f2ozhXvsU0albxYcQaE1rIMsnuW ngrw== X-Forwarded-Encrypted: i=1; AJvYcCXikq/YjX39x/M8lrIYhUCACMHoTMZm55zZW/mBv3or/xkK/05DOM21cDsjmOjju65ml4JEV/KBZncy5Fj93qfa3OE3skU/BCTf X-Gm-Message-State: AOJu0YwBHu8pccoR0wG1e9hURJF4msidTaMg2eBoxI+9LFRYaR3Nnvyn gQP9Y0pbQGJ39gaCgbokQMtGVIkS7jUuKZ75m6sH+7uMAO7pFyrFimOQEGNZxoumpAnOTePVHqZ odQA5e3ezLXqq3nu633CghsroKzUquqEouacM6u5L7vQdyrsw8a4vHTrIug== X-Received: by 2002:a17:907:3f1d:b0:a72:8296:ca12 with SMTP id a640c23a62f3a-a77ba4cca5dmr93083966b.36.1720091404948; Thu, 04 Jul 2024 04:10:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDZi5daN4Z6QZyZwIJ4mHAMKRvD76nGrEOVA+EkuglUVPVUAVhJh9bbzKR1ggDZs/vDJ4++g== X-Received: by 2002:a17:907:3f1d:b0:a72:8296:ca12 with SMTP id a640c23a62f3a-a77ba4cca5dmr93081666b.36.1720091404402; Thu, 04 Jul 2024 04:10:04 -0700 (PDT) Received: from ?IPV6:2001:1c00:c32:7800:5bfa:a036:83f0:f9ec? (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab0900f1sm585347266b.168.2024.07.04.04.10.03 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 04 Jul 2024 04:10:03 -0700 (PDT) Message-ID: Date: Thu, 4 Jul 2024 13:10:02 +0200 Precedence: bulk X-Mailing-List: linux-i2c@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v5 6/6] platform/x86: dell-smo8800: Add support for probing for the accelerometer i2c address To: =?UTF-8?Q?Pali_Roh=C3=A1r?= , =?UTF-8?Q?Ilpo_J=C3=A4rvinen?= , Andy Shevchenko , Paul Menzel , Wolfram Sang Cc: eric.piel@tremplin-utc.net, Marius Hoch , Dell.Client.Kernel@dell.com, Kai Heng Feng , platform-driver-x86@vger.kernel.org, Jean Delvare , Andi Shyti , linux-i2c@vger.kernel.org References: <20240703110512.21401-1-hdegoede@redhat.com> <20240703110512.21401-7-hdegoede@redhat.com> Content-Language: en-US, nl From: Hans de Goede In-Reply-To: <20240703110512.21401-7-hdegoede@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi, On 7/3/24 1:05 PM, Hans de Goede wrote: > Unfortunately the SMOxxxx ACPI device does not contain the i2c-address > of the accelerometer. So a DMI product-name to address mapping table > is used. > > At support to have the kernel probe for the i2c-address for modesl > which are not on the list. > > The new probing code sits behind a new probe_i2c_addr module parameter, > which is disabled by default because probing might be dangerous. > > Link: https://lore.kernel.org/linux-i2c/4820e280-9ca4-4d97-9d21-059626161bfc@molgen.mpg.de/ > Signed-off-by: Hans de Goede > --- > drivers/platform/x86/dell/dell-lis3lv02d.c | 136 ++++++++++++++++++++- > 1 file changed, 133 insertions(+), 3 deletions(-) > > diff --git a/drivers/platform/x86/dell/dell-lis3lv02d.c b/drivers/platform/x86/dell/dell-lis3lv02d.c > index ab02ad93758a..5e4b24ec02f1 100644 > --- a/drivers/platform/x86/dell/dell-lis3lv02d.c > +++ b/drivers/platform/x86/dell/dell-lis3lv02d.c > @@ -15,6 +15,8 @@ > #include > #include "dell-smo8800-ids.h" > > +#define LIS3_WHO_AM_I 0x0f > + > #define DELL_LIS3LV02D_DMI_ENTRY(product_name, i2c_addr) \ > { \ > .matches = { \ > @@ -57,6 +59,121 @@ static u8 i2c_addr; > static struct i2c_client *i2c_dev; > static bool notifier_registered; > > +static bool probe_i2c_addr; > +module_param(probe_i2c_addr, bool, 0444); > +MODULE_PARM_DESC(probe_i2c_addr, "Probe the i801 I2C bus for the accelerometer on models where the address is unknown, this may be dangerous."); > + > +/* > + * This is the kernel version of the single register device sanity checks from > + * the i2c_safety_check function from lm_sensors sensor-detect script: > + * This is meant to prevent access to 1-register-only devices, > + * which are designed to be accessed with SMBus receive byte and SMBus send > + * byte transactions (i.e. short reads and short writes) and treat SMBus > + * read byte as a real write followed by a read. The device detection > + * routines would write random values to the chip with possibly very nasty > + * results for the hardware. Note that this function won't catch all such > + * chips, as it assumes that reads and writes relate to the same register, > + * but that's the best we can do. > + */ > +static int i2c_safety_check(struct i2c_adapter *adap, u8 addr) > +{ > + union i2c_smbus_data smbus_data; > + int err; > + u8 data; > + > + /* > + * First receive a byte from the chip, and remember it. This > + * also checks if there is a device at the address at all. > + */ > + err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, 0, > + I2C_SMBUS_BYTE, &smbus_data); > + if (err < 0) > + return err; > + > + data = smbus_data.byte; > + > + /* > + * Receive a byte again; very likely to be the same for > + * 1-register-only devices. > + */ > + err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, 0, > + I2C_SMBUS_BYTE, &smbus_data); > + if (err < 0) > + return err; > + > + if (smbus_data.byte != data) > + return 0; /* Not a 1-register-only device. */ > + > + /* > + * Then try a standard byte read, with a register offset equal to > + * the read byte; for 1-register-only device this should read > + * the same byte value in return. > + */ > + err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, data, > + I2C_SMBUS_BYTE_DATA, &smbus_data); > + if (err < 0) > + return err; > + > + if (smbus_data.byte != data) > + return 0; /* Not a 1-register-only device. */ > + > + /* > + * Then try a standard byte read, with a slightly different register > + * offset; this should again read the register offset in return. > + */ > + err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, data ^ 0x01, > + I2C_SMBUS_BYTE_DATA, &smbus_data); > + if (err < 0) > + return err; > + > + if (smbus_data.byte != (data ^ 0x01)) > + return 0; /* Not a 1-register-only device. */ > + > + /* > + * Apparently this is a 1-register-only device, restore the original > + * register value and leave it alone. > + */ > + i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_WRITE, data, > + I2C_SMBUS_BYTE, NULL); > + pr_warn("I2C safety check for address 0x%02x failed, skipping\n", addr); > + return -ENODEV; > +} > + > +static int detect_lis3lv02d(struct i2c_adapter *adap, u8 addr, > + struct i2c_board_info *info) > +{ > + union i2c_smbus_data smbus_data; > + int err; > + > + pr_info("Probing for lis3lv02d on address 0x%02x\n", addr); > + err = i2c_safety_check(adap, addr); > + if (err < 0) > + return err; > + > + err = i2c_smbus_xfer(adap, addr, 0, I2C_SMBUS_READ, LIS3_WHO_AM_I, > + I2C_SMBUS_BYTE_DATA, &smbus_data); > + if (err < 0) { > + pr_warn("Failed to read who-am-i register: %d\n", err); > + return err; > + } > + > + /* valid who-am-i values are from drivers/misc/lis3lv02d/lis3lv02d.c */ > + switch (smbus_data.byte) { > + case 0x32: > + case 0x33: > + case 0x3a: > + case 0x3b: > + break; > + default: > + pr_warn("Unknown who-am-i register value 0x%02x\n", smbus_data.byte); > + return -ENODEV; > + } > + > + pr_debug("Detected lis3lv02d on address 0x%02x\n", addr); > + info->addr = addr; > + return 0; > +} > + > static bool i2c_adapter_is_main_i801(struct i2c_adapter *adap) > { > /* > @@ -93,7 +210,17 @@ static void instantiate_i2c_client(struct work_struct *work) > if (!adap) > return; > > - info.addr = i2c_addr; > + if (i2c_addr) { > + info.addr = i2c_addr; > + } else { > + /* First try address 0x29 (most used) and then try 0x1d */ > + if (detect_lis3lv02d(adap, 0x29, &info) != 0 && > + detect_lis3lv02d(adap, 0x1d, &info) != 0) { > + pr_warn("failed to probe for lis3lv02d I2C address\n"); > + goto out_put_adapter; > + } > + } > + > strscpy(info.type, "lis3lv02d", I2C_NAME_SIZE); > > i2c_dev = i2c_new_client_device(adap, &info); > @@ -104,6 +231,7 @@ static void instantiate_i2c_client(struct work_struct *work) > pr_debug("registered lis3lv02d on address 0x%02x\n", info.addr); > } > > +out_put_adapter: > i2c_put_adapter(adap); > } > static DECLARE_WORK(i2c_work, instantiate_i2c_client); > @@ -167,12 +295,14 @@ static int __init dell_lis3lv02d_init(void) > put_device(dev); > > lis3lv02d_dmi_id = dmi_first_match(lis3lv02d_devices); > - if (!lis3lv02d_dmi_id) { > + if (!lis3lv02d_dmi_id && !probe_i2c_addr) { > pr_warn("accelerometer is present on SMBus but its address is unknown, skipping registration\n"); > + pr_info("Pass dell_lis3lv02d.probe_i2c_addr=1 on the kernel commandline to probe, this may be dangerous!\n"); > return 0; > } > > - i2c_addr = (long)lis3lv02d_dmi_id->driver_data; > + if (lis3lv02d_dmi_id) > + i2c_addr = (long)lis3lv02d_dmi_id->driver_data; > > /* > * Register i2c-bus notifier + queue initial scan for lis3lv02d