From owner-svn-src-head@freebsd.org Fri Dec 14 22:23:48 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A0B8132270C for ; Fri, 14 Dec 2018 22:23:48 +0000 (UTC) (envelope-from mw@semihalf.com) Received: from mail-it1-x12a.google.com (mail-it1-x12a.google.com [IPv6:2607:f8b0:4864:20::12a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E5F566E4AB for ; Fri, 14 Dec 2018 22:23:47 +0000 (UTC) (envelope-from mw@semihalf.com) Received: by mail-it1-x12a.google.com with SMTP id h193so11820853ita.5 for ; Fri, 14 Dec 2018 14:23:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=t8MRFKpim491jiw3+sC1ceE9qZes8VXy0uemyz77Jdg=; b=cyNE6Kj5vEBGmSM6g2jJYxGg3rf1iWxfJ3m6qmOmV4Q759BxaZcLqmEEHU2aDuJLAq /phWi6q5+4QpDvpFwDfdPQmc0+apyzqWoRaDjJggg/tnaeOr2m5bPE+QNXEB9dnNL3s2 t541XzktPqri+iDMcR5wC50Jhp6kLu9Sq5NLgR3ztvUWf8ILLq6YUxGIhLyEqKldv9l/ EhF7mlJW8x3nCRIzcqgVgEvaC/BWi5dVp+4wzLPZ9KD98JKzdrX/Zbntob7fiWhPVFg6 Jw3XpgwpaGG3ARnxw3FLpfAAUwDGyutNNt/eGjjEZeA2vEiNZJ3pFicEOqJA6RvMWpXD HD8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=t8MRFKpim491jiw3+sC1ceE9qZes8VXy0uemyz77Jdg=; b=nqn4FRh9uQ19so+G6xvmJjzaZ5VZbXyzV1eJrHxnImxY3VAJMFdP6om8EPHVWoaOzl VnbqgwTuMTzgqW5Q6gmopuagUBig4UQz3lDhBKyiyGGNXmM2tVlGh/Pmz5h6+P+q4v0v KzRcmFJa5BrE+OcEDZzcBYQIJ5PeAUQvYuooGt0z21fEOmfFzA5gTG/6ZyIjlTItG0gz JlzOP+f/5uT02LSH6JEEJQgi631hxKpOegy/zVYnL5xA+Glnv/Hi4C0GTvKvo7X3wq6z fDhgHMDGP/aJdb219Ex+9grnLonSoB3wVzKFW5q+TFdLN9+DofZCgMjeUiKDQnnKIWM/ PdFA== X-Gm-Message-State: AA+aEWaVmjE4IrrDZhwzA2YZVasmlY/qN1xdDUt1Jb+85DDEC80d047F SOKBJDniTSU/1bGRyMF9cBDfGTMi+h23fxHvAQHcM3Ywm4o= X-Google-Smtp-Source: AFSGD/UR+30MvpEHxqG6RFQAzUwLQFhO9eRTKH/Lqsub34p6SSDR0Ub8Zn5CX/LdnU4X+n2FtBAEjvjKORjpvZdmvy0= X-Received: by 2002:a02:5ec9:: with SMTP id h192mr4383800jab.112.1544826227237; Fri, 14 Dec 2018 14:23:47 -0800 (PST) MIME-Version: 1.0 References: <201812141743.wBEHhZar096560@repo.freebsd.org> In-Reply-To: From: Marcin Wojtas Date: Fri, 14 Dec 2018 23:23:35 +0100 Message-ID: Subject: Re: svn commit: r342085 - head/sys/dev/tpm To: jhb@freebsd.org Cc: Marcin Wojtas , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: E5F566E4AB X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-1.00)[-0.996,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Dec 2018 22:23:48 -0000 Hi John, pt., 14 gru 2018 o 18:57 John Baldwin napisa=C5=82(a): > > On 12/14/18 9:43 AM, Marcin Wojtas wrote: > > Author: mw > > Date: Fri Dec 14 17:43:35 2018 > > New Revision: 342085 > > URL: https://svnweb.freebsd.org/changeset/base/342085 > > > > Log: > > Fix TPM driver compilation from r342084 > > > > Include recent ACPI_ID_PROBE API change. > > > > Modified: > > head/sys/dev/tpm/tpm_crb.c > > head/sys/dev/tpm/tpm_tis.c > > > > Modified: head/sys/dev/tpm/tpm_crb.c > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/sys/dev/tpm/tpm_crb.c Fri Dec 14 16:14:36 2018 (= r342084) > > +++ head/sys/dev/tpm/tpm_crb.c Fri Dec 14 17:43:35 2018 (= r342085) > > @@ -107,7 +107,7 @@ tpmcrb_acpi_probe(device_t dev) > > int rid =3D 0; > > uint32_t caps; > > > > - if (ACPI_ID_PROBE(device_get_parent(dev), dev, tpmcrb_ids) =3D=3D= NULL) > > + if (ACPI_ID_PROBE(device_get_parent(dev), dev, tpmcrb_ids, NULL) = =3D=3D NULL) > > return (ENXIO); > > I think it doesn't return a pointer anymore either. I think you want to = use > its return value as the return value from probe to honor the relative pri= ority > of CID vs HID matches, so something like: > > int error; > > error =3D ACPI_ID_PROBE(...); > if (error > 0) > return (error); > > ... > > return (error); > > Instead of 'return (BUS_GENERIC_PROBE)' or some such. > Thank you for pointing this, I addressed your remark in r342104. Best regards, Marcin