From patchwork Wed Jan 30 09:10:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1033365 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="BpEIcL57"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43qHdt0Dpyz9s9h; Wed, 30 Jan 2019 20:10:42 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1goltF-0005G2-Bi; Wed, 30 Jan 2019 09:10:37 +0000 Received: from mail-pf1-f196.google.com ([209.85.210.196]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1goltD-0005FV-Gm for kernel-team@lists.ubuntu.com; Wed, 30 Jan 2019 09:10:35 +0000 Received: by mail-pf1-f196.google.com with SMTP id y126so11136920pfb.4 for ; Wed, 30 Jan 2019 01:10:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Jj82qoXbHA0vw1FZgJHOPPdw4QBSeOz/lI7fHmOJHRk=; b=BpEIcL570MqSNUsZ0/7fwCP+IwRI7ZblrHR3WX2SmVbQqD2yiHqeswvaI5sIdmkzS4 O3BtZdJKlCnsXYji1NRB2IT+7x+QR63FyiiAUBlJXnRMBeibrDOFUIJ0nSflc1tlqfXA A++VjTC3F1l9bB/OMw0IZwYKWQ9F+hbKY3fcV7ixCH9B5sSSN3jOlToES5r91bjy0PLM cITe2P2Q0i7/Epv8oNifW8ylIf0c7oNFgsxqhxzO43RMwUZ2aftytZDQkxdpMvj2yKIJ xqqeXNUSp8T4RP3XAchlSgxNZeaREctTcMcqW4ARB1w9ba62o1fSMBBIkW1/lmUgn0Lv qwUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Jj82qoXbHA0vw1FZgJHOPPdw4QBSeOz/lI7fHmOJHRk=; b=fCF5JSNGjW34x+BxoKhL61jXhyAJSiB/IRts552NzVTu0aK/xPYLKp+Z/bRwwTmtJg TNutELq/YGRtbhAzwMCStMYxUX9liuc5hXZTIOMzk/k5REoofVtslBydFnoOq+3wwSfX 2vHT/s8Li6YXrziIUNa6wR/tiEjbNZaWxiED7J80KR6ytpyoDIc/ASB5nZI5nf8ejFka tPihBjNTFZlDmQI89wLBu22eq07p7ZKBdMbPp5JXfQ85vUgfpq0A5tJsfoNuwPVtvH1n IIOOnXak4UaCIrgo86S1cqcLKdNNvt352vmXsAZlzt5gnSPG59fEmDRbptr9GkUe9g7X EISw== X-Gm-Message-State: AJcUukd2lpMhZkuvyk+KWNBoPdVqpwG2Z1M4EV1mT5PF25Cc47lFIu7u I942ViY5a0dgdxHKerQQV2XAjV/ahYI= X-Google-Smtp-Source: ALg8bN6G5diX0gWavi6MtXtpPO6i0QJtJ6cn3vQyq4+c+Pbin45ZJF6gEMT73KvCp3FOZxj5vzG3ug== X-Received: by 2002:a63:5d20:: with SMTP id r32mr27109652pgb.329.1548839433451; Wed, 30 Jan 2019 01:10:33 -0800 (PST) Received: from localhost (114-32-69-186.HINET-IP.hinet.net. [114.32.69.186]) by smtp.gmail.com with ESMTPSA id f67sm2028643pff.29.2019.01.30.01.10.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jan 2019 01:10:32 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/3][SRU][B][C][D] UBUNTU: SAUCE: platform/x86: dell-uart-backlight: add missing status command Date: Wed, 30 Jan 2019 17:10:24 +0800 Message-Id: <20190130091026.14290-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190130091026.14290-1-acelan.kao@canonical.com> References: <20190130091026.14290-1-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1813877 DELL_UART_GET_SCALAR has been declared in drivers/platform/x86/dell-uart-backlight.h, but its definition is missing. It won't lead to issues on old AIO platforms, since this command is newly introduced and is not supported by all old AIOs. Signed-off-by: AceLan Kao --- drivers/platform/x86/dell-uart-backlight.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/platform/x86/dell-uart-backlight.c b/drivers/platform/x86/dell-uart-backlight.c index ce9a5e200af8..f957da1a452a 100644 --- a/drivers/platform/x86/dell-uart-backlight.c +++ b/drivers/platform/x86/dell-uart-backlight.c @@ -52,6 +52,18 @@ static struct dell_uart_bl_cmd uart_cmd[] = { .cmd = {0x6A, 0x06, 0x8F}, .tx_len = 3, }, + /* + * Get Scalar Status: Tool uses this command to check if scalar IC controls brightness. + * Command: 0x6A 0x1F 0x8F (Length:3 Type: 0x0A, Cmd:0x1F Checksum:0x76) + * Return data: 0x04 0x1F Data checksum + * (Data = 0: scalar cannot adjust brightness, Data = 1: scalar can adjust brightness) + */ + [DELL_UART_GET_SCALAR] = { + .cmd = {0x6A,0x1F,0x76}, + .ret = {0x04,0x1F,0x00,0x00}, + .tx_len = 3, + .rx_len = 4, + }, /* * Get Brightness level: Application uses this command for scaler to * get brightness. From patchwork Wed Jan 30 09:10:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1033366 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="imIgHPIW"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43qHdx0Hdfz9s9h; Wed, 30 Jan 2019 20:10:45 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1goltI-0005HM-JS; Wed, 30 Jan 2019 09:10:40 +0000 Received: from mail-pf1-f196.google.com ([209.85.210.196]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1goltG-0005GF-Fl for kernel-team@lists.ubuntu.com; Wed, 30 Jan 2019 09:10:38 +0000 Received: by mail-pf1-f196.google.com with SMTP id r136so11135277pfc.6 for ; Wed, 30 Jan 2019 01:10:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=IjFjI6Nz0oTi7lZBCtaNuphSuZZ6v75Rn8z9H6rtSEg=; b=imIgHPIW457xWrolwrG/Na53H1aSXX02Xzmd6hzbBlygtmk2qtUr1rVCQclEKvNle4 RrDA65lUt4OHvefRyUgUoeffX5X++b7i2bVy988lJSHNW5FIeRQb6cKO89wf1jkgW4ZD E3/aYKpX+2gLDgoCjmvQi12778gWBixyTdqnmftOS5UPZulKjO1L2loj5pCZXqIX1HRZ KiOiJGx7fOndIn1/IOX2t2zrkgs0d1kPr82BqpRPKgKlSFCxqzV9tpZcJDSb5Iw+slYy TfhE50dxqcVcdq7F/ty1EAn+7XbattBOvgFlVHFayZ9pGkmxMclG2Zi+8q6+NlX4NEZ4 TUxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=IjFjI6Nz0oTi7lZBCtaNuphSuZZ6v75Rn8z9H6rtSEg=; b=OqJNrqE4J2/khAxiHd5zAoELcoUfFS3v4l4xVftDJkAmLZ/GpigP3BF3nC3/AcbDEK vepGZglk8ogFsPBuEf9RHUdOgHAESQU6s8UMZ8J1j4r/VNwNmWEMeF6mO2t1VXaa4RY6 0DIlC3e0dLag6cDu/+kvwIIQBLWQ9hisMy+Mo/WzqgKsTXvimI0+GlVM7Y5i9zQ/tzWJ ZedKD0DFrNUy0wy7VjPnjEJ0BXsWckvHtDeRmmQ8A0Qn81Bo+HlzPa7RUQrNJXmQ1e4+ JSVIHxndQUZmjNYtRe/4LWrSkvbJ+5OvliekdRgmX0kyBhd2vKaq2YobOC1uVyBfFLMq PRtw== X-Gm-Message-State: AJcUukfTN1lGrpYHCVPOgrk5evoUYqD7PNQa7ljJwPaoRTDrGRXtbVWc Hw4YYtW1CmEoslk9PiS6O9hDJuZQmkQ= X-Google-Smtp-Source: ALg8bN5qmJL4T/7sxb+fQPuE0jI+h/e2MblnkzM6L9zi4j1Pt2Y+TZEBMGxOF27YQZSsyCHleNI2jg== X-Received: by 2002:a62:4886:: with SMTP id q6mr30524528pfi.182.1548839436595; Wed, 30 Jan 2019 01:10:36 -0800 (PST) Received: from localhost (114-32-69-186.HINET-IP.hinet.net. [114.32.69.186]) by smtp.gmail.com with ESMTPSA id k191sm1456875pgd.9.2019.01.30.01.10.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jan 2019 01:10:35 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 2/3][SRU][B][C][D] UBUNTU: SAUCE: platform/x86: dell-uart-backlight: load driver by scalar status Date: Wed, 30 Jan 2019 17:10:25 +0800 Message-Id: <20190130091026.14290-3-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190130091026.14290-1-acelan.kao@canonical.com> References: <20190130091026.14290-1-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1813877 Leverage the scalar status command to determinate whether the driver should be loaded or not. Signed-off-by: AceLan Kao --- drivers/platform/x86/dell-uart-backlight.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/platform/x86/dell-uart-backlight.c b/drivers/platform/x86/dell-uart-backlight.c index f957da1a452a..a1ec0067291f 100644 --- a/drivers/platform/x86/dell-uart-backlight.c +++ b/drivers/platform/x86/dell-uart-backlight.c @@ -382,14 +382,11 @@ static int dell_uart_bl_add(struct acpi_device *dev) mutex_init(&dell_pdata->brightness_mutex); if (!dell_uart_get_scalar_status(dell_pdata)) { - udelay(50); - /* try another command to make sure there is no scalar IC */ - if (dell_uart_show_firmware_ver(dell_pdata) <= 0) { - pr_debug("Scalar is not in charge of brightness adjustment.\n"); - kzfree(dell_pdata); - return -1; - } + pr_debug("Scalar is not in charge of brightness adjustment.\n"); + kzfree(dell_pdata); + return -1; } + dell_uart_show_firmware_ver(dell_pdata); memset(&props, 0, sizeof(struct backlight_properties)); props.type = BACKLIGHT_PLATFORM; From patchwork Wed Jan 30 09:10:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AceLan Kao X-Patchwork-Id: 1033367 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uagasNvt"; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43qHf06g81z9s9h; Wed, 30 Jan 2019 20:10:48 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1goltL-0005JV-Up; Wed, 30 Jan 2019 09:10:43 +0000 Received: from mail-pg1-f194.google.com ([209.85.215.194]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1goltJ-0005HK-Cx for kernel-team@lists.ubuntu.com; Wed, 30 Jan 2019 09:10:41 +0000 Received: by mail-pg1-f194.google.com with SMTP id g189so10080596pgc.5 for ; Wed, 30 Jan 2019 01:10:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=RA+xib69xX40qyKhRKncf2vsUVPPXH0Umo2qLuVzZA8=; b=uagasNvtAdeUoRNO9bj/K/YgU4WoUuGiFBtHUtPNK1vIdWsswbA2dc7P4ZhQBo5ir3 HnRjweuYwLvnW1c3pCggf3TEDcDWScwIiQa476Ey65IqHC+YKb8VwamFb1O1/qvyVsRg YoLtoAJU8bmHHOjtSx+AiAxngDa2IrREGO5pVUab5XmjmQ0+mAcQL9jjKSZOwTp09q9u oVjeNxaPBmmXFHTN/pLP1u3EflzJX8xOobsLqx7HKJG70U87WItlNByewilC+TurWug6 zfpYJb3erWvHfi0pehA5tZvPKExcx2hTqpion+bPeNGHJHXtQz8NNGdw8slsnH4BOjDw TFTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=RA+xib69xX40qyKhRKncf2vsUVPPXH0Umo2qLuVzZA8=; b=PHFOwjCdKQGpehoY6Tizj4GfwYRyVKzXFylIoUNyncDhROxKOtr3KnlyCS3bdAlOb+ 6uhKWKTak+ZCibC6UjsDJ+caA12QQL+TOk10YaHLFmib49YuN7r2/xhBUDdNMF1IgFqJ dPq/vctDOjbUAFaxD/o/qTOq87OAp532868WJ2j5f6sqpZ9DjWCz6RUbbczPvFxIIQTr oXkaH5LRKsImZm85Bfg5iX+MH+dbfXs+PjtGKMdpoNUYqFwjeaQO1c/+MncPbtcwBBjI zQcaIfQJwxkkxjRasbtG98VS8vKfdVDiIUSW6UHlJ2i7ggup3YCYfbbcgISzNaIcKnm9 5tQg== X-Gm-Message-State: AJcUukffYzqclkkLGO68pnuuYiFTf8a9NGo5nWnbO4HreucpzulryCDy IbxDhy1slR2Pb2Jk3RwwgD1GV/R13ck= X-Google-Smtp-Source: ALg8bN7szPWcq+FdNfcnBR6OdwOXJtx+5lm5rxOhlIVsttJOFnRRo+kfTNo2f7LDu3REg+MRD6rUrg== X-Received: by 2002:a63:d208:: with SMTP id a8mr26415582pgg.77.1548839439589; Wed, 30 Jan 2019 01:10:39 -0800 (PST) Received: from localhost (114-32-69-186.HINET-IP.hinet.net. [114.32.69.186]) by smtp.gmail.com with ESMTPSA id k24sm1731289pfj.13.2019.01.30.01.10.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Jan 2019 01:10:38 -0800 (PST) From: AceLan Kao To: kernel-team@lists.ubuntu.com Subject: [PATCH 3/3][SRU][B][C][D] UBUNTU: SAUCE: platform/x86: dell-uart-backlight: add force parameter Date: Wed, 30 Jan 2019 17:10:26 +0800 Message-Id: <20190130091026.14290-4-acelan.kao@canonical.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190130091026.14290-1-acelan.kao@canonical.com> References: <20190130091026.14290-1-acelan.kao@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1813877 Add force parameter to force load the driver if the platform doesn't provide a working scalar status command. Signed-off-by: AceLan Kao --- drivers/platform/x86/dell-uart-backlight.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/dell-uart-backlight.c b/drivers/platform/x86/dell-uart-backlight.c index a1ec0067291f..f81fc01606d0 100644 --- a/drivers/platform/x86/dell-uart-backlight.c +++ b/drivers/platform/x86/dell-uart-backlight.c @@ -40,6 +40,10 @@ unsigned int (*io_serial_in)(struct uart_port *p, int offset); int (*uart_write)(struct tty_struct *tty, const unsigned char *buf, int count); int (*uart_chars_in_buffer)(struct tty_struct *tty); +static bool force; +module_param(force, bool, 0444); +MODULE_PARM_DESC(force, "load the driver regardless of the scalar status"); + static struct dell_uart_bl_cmd uart_cmd[] = { /* * Get Firmware Version: Tool uses this command to get firmware version. @@ -381,7 +385,7 @@ static int dell_uart_bl_add(struct acpi_device *dev) mutex_init(&dell_pdata->brightness_mutex); - if (!dell_uart_get_scalar_status(dell_pdata)) { + if (!force && !dell_uart_get_scalar_status(dell_pdata)) { pr_debug("Scalar is not in charge of brightness adjustment.\n"); kzfree(dell_pdata); return -1;